Merge remote-tracking branch 'origin/dbdx' into dbdx

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/onemachine/domain/SingInUser.java

@@ -1,12 +1,7 @@
 package com.zd.laboratory.onemachine.domain;
 
-import cn.hutool.core.collection.CollUtil;
-import com.zd.laboratory.domain.LabApproval;
-import com.zd.laboratory.domain.LabSecurityApply;
-import com.zd.laboratory.domain.vo.LabApprovalVO;
 import com.zd.laboratory.domain.vo.LabSecurityApplyVO;
 import com.zd.model.entity.SysUser;
-import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/ILabOperateHardwareService.java

@@ -2,10 +2,7 @@ package com.zd.laboratory.service;
 
 import com.zd.laboratory.api.entity.SensorFunctionStatus;
 import com.zd.laboratory.api.vo.SenseValVO;
-import com.zd.model.enums.HardwareTypeEnum;
-
 import java.util.List;
-import java.util.Map;
 
 /**
  * Controller

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabBlacklistServiceImpl.java

@@ -19,8 +19,6 @@ import com.zd.laboratory.service.ILabBlacklistService;
 import com.zd.laboratory.service.ILabViolationService;
 import com.zd.model.domain.R;
 import com.zd.model.domain.per.PerPrefix;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -48,9 +46,6 @@ public class LabBlacklistServiceImpl implements ILabBlacklistService {
     private LabMessageContentMapper labMessageContentMapper;
     @Autowired
     private ILabViolationService iLabViolationService;
-
-    private static final Logger log = LoggerFactory.getLogger(LabBlacklistServiceImpl.class);
-
     /**
      * 设置黑名单用户
      *

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabExitLineServiceImpl.java

@@ -394,9 +394,7 @@ public class LabExitLineServiceImpl implements ILabExitLineService
      */
     @Override
     public List<LabExitLineJoinVO> doChange(Long subId, Integer type) {
-
-        List<LabExitLineJoinVO> lineJoins = new ArrayList <>();
-        return lineJoins;
+        return new ArrayList <>();
     }
 
 

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabGradeManageRecordServiceImpl.java

@@ -34,6 +34,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+
 import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 import java.util.*;
@@ -240,7 +241,6 @@ public class LabGradeManageRecordServiceImpl implements ILabGradeManageRecordSer
                 queryRecord.setCycleCount(ruleUser.getCycleCount());
 
                 // 2.7 获取实验室方式变动- 此处要修改
-                //LabGradeManage manage = labGradeManageMapper.selectLabGradeManageById(ruleUser.getGradeManageId());
                 List<Long> subIds = labGradeManageMapper.selectSubIdsByManageId(ruleUser.getGradeManageId());
                 if (subIds.size() == 0) {
                     continue;
@@ -256,9 +256,6 @@ public class LabGradeManageRecordServiceImpl implements ILabGradeManageRecordSer
                     }
                 }
 
-                //List<Long> users = new ArrayList<>();
-
-//                String userPosition = null;
                 if (ruleUser.getType() == 3) {
                     List<Long> users = Arrays.asList(ruleUser.getUserIds().split(",")).stream().map(s -> (Long.parseLong(s.trim()))).collect(Collectors.toList());
 
@@ -266,59 +263,19 @@ public class LabGradeManageRecordServiceImpl implements ILabGradeManageRecordSer
                     for (Long subId : subIds) {
                         queryRecord.setSubId(subId);
                         for (Long userId : users) {
-//                            queryRecord.setJoinUserId(userId);
-//                            executedCount = labGradeManageRecordMapper.selectCountByUserRecord(queryRecord);
-//                            if(executedCount > 0){
-//                                continue;
-//                            }
 
                             putUserData(ruleUser, subId, userId, insertRecordList, "选择人员");
 
-//                            LabGradeManageRecord labGradeManageRecord = new LabGradeManageRecord();
-//                            labGradeManageRecord.setCreateTime(DateUtils.getNowDate());
-//                            labGradeManageRecord.setUserId(-1L);
-//                            labGradeManageRecord.setCreateBy("-1");
-//                            labGradeManageRecord.setRuleId(ruleUser.getGradeManageRuleId());
-//                            labGradeManageRecord.setRuleUserId(ruleUser.getId());
-//                            labGradeManageRecord.setJoinUserId(userId);
-//                            labGradeManageRecord.setSubId(subId);
-//                            // 未执行
-//                            labGradeManageRecord.setStatus(0);
-//                            labGradeManageRecord.setUserPosition(userPosition);
-//                            labGradeManageRecord.setCycleCount(ruleUser.getCycleCount());
-//                            labGradeManageRecord.setRuleType(ruleUser.getRuleType());
-//                            labGradeManageRecord.setRuleName(ruleUser.getRuleName());
-//                            labGradeManageRecord.setEndDate(ruleUser.getEndDate());
-//
-//                            insertRecordList.add(labGradeManageRecord);
                         }
                     }
                 } else if (ruleUser.getType() == 1) {
                     // 查询实验室负责人
-                    // users = labSubjectMapper.selectAdminIds(subIds);
                     List<Map<String, Long>> datas = labSubjectMapper.selectLabAdminByIds(subIds);
                     subIds.forEach(s -> {
                         datas.forEach(d -> {
                             // adminId, id as subId
                             if (s.equals(d.get("subId")) && d.get("adminId") != null) {
                                 putUserData(ruleUser, d.get("subId"), d.get("adminId"), insertRecordList, "实验室负责人");
-//                                LabGradeManageRecord labGradeManageRecord = new LabGradeManageRecord();
-//                                labGradeManageRecord.setCreateTime(DateUtils.getNowDate());
-//                                labGradeManageRecord.setUserId(-1L);
-//                                labGradeManageRecord.setCreateBy("-1");
-//                                labGradeManageRecord.setRuleId(ruleUser.getGradeManageRuleId());
-//                                labGradeManageRecord.setRuleUserId(ruleUser.getId());
-//                                labGradeManageRecord.setJoinUserId(d.get("adminId"));
-//                                labGradeManageRecord.setSubId(s);
-//                                // 未执行
-//                                labGradeManageRecord.setStatus(0);
-//                                labGradeManageRecord.setUserPosition("实验室负责人");
-//                                labGradeManageRecord.setCycleCount(c);
-//                                labGradeManageRecord.setRuleType(ruleUser.getRuleType());
-//                                labGradeManageRecord.setRuleName(ruleUser.getRuleName());
-//                                labGradeManageRecord.setEndDate(ruleUser.getEndDate());
-//
-//                                insertRecordList.add(labGradeManageRecord);
                             }
                         });
                     });
@@ -330,23 +287,6 @@ public class LabGradeManageRecordServiceImpl implements ILabGradeManageRecordSer
                             //  userId, subject_id as subId
                             if (s.equals(d.get("subId")) && d.get("userId") != null) {
                                 putUserData(ruleUser, d.get("subId"), d.get("userId"), insertRecordList, "当天进入实验室人员");
-//                                LabGradeManageRecord labGradeManageRecord = new LabGradeManageRecord();
-//                                labGradeManageRecord.setCreateTime(DateUtils.getNowDate());
-//                                labGradeManageRecord.setUserId(-1L);
-//                                labGradeManageRecord.setCreateBy("-1");
-//                                labGradeManageRecord.setRuleId(ruleUser.getGradeManageRuleId());
-//                                labGradeManageRecord.setRuleUserId(ruleUser.getId());
-//                                labGradeManageRecord.setJoinUserId(d.get("userId"));
-//                                labGradeManageRecord.setSubId(s);
-//                                // 未执行
-//                                labGradeManageRecord.setStatus(0);
-//                                labGradeManageRecord.setUserPosition("当天进入实验室人员");
-//                                labGradeManageRecord.setCycleCount(c);
-//                                labGradeManageRecord.setRuleType(ruleUser.getRuleType());
-//                                labGradeManageRecord.setRuleName(ruleUser.getRuleName());
-//                                labGradeManageRecord.setEndDate(ruleUser.getEndDate());
-//
-//                                insertRecordList.add(labGradeManageRecord);
                             }
                         });
                     });
@@ -358,23 +298,6 @@ public class LabGradeManageRecordServiceImpl implements ILabGradeManageRecordSer
                             //  userId, subject_id as subId
                             if (s.equals(d.get("subId")) && d.get("userId") != null) {
                                 putUserData(ruleUser, d.get("subId"), d.get("userId"), insertRecordList, "实验室准入人员");
-//                                LabGradeManageRecord labGradeManageRecord = new LabGradeManageRecord();
-//                                labGradeManageRecord.setCreateTime(DateUtils.getNowDate());
-//                                labGradeManageRecord.setUserId(-1L);
-//                                labGradeManageRecord.setCreateBy("-1");
-//                                labGradeManageRecord.setRuleId(ruleUser.getGradeManageRuleId());
-//                                labGradeManageRecord.setRuleUserId(ruleUser.getId());
-//                                labGradeManageRecord.setJoinUserId(d.get("userId"));
-//                                labGradeManageRecord.setSubId(s);
-//                                // 未执行
-//                                labGradeManageRecord.setStatus(0);
-//                                labGradeManageRecord.setUserPosition("实验室准入人员");
-//                                labGradeManageRecord.setCycleCount(c);
-//                                labGradeManageRecord.setRuleType(ruleUser.getRuleType());
-//                                labGradeManageRecord.setRuleName(ruleUser.getRuleName());
-//                                labGradeManageRecord.setEndDate(ruleUser.getEndDate());
-//
-//                                insertRecordList.add(labGradeManageRecord);
                             }
                         });
                     });
@@ -383,15 +306,6 @@ public class LabGradeManageRecordServiceImpl implements ILabGradeManageRecordSer
                     continue;
                 }
 
-                /*List<LabGradeManageRecord> recordList = labGradeManageRecordMapper.selectByRuleIds(ruleIds);
-                for (LabGradeManageRecord record : recordList) {
-                    // 还需要知道工作执行到哪个周期了
-                    if(ruleUser.getGradeManageRuleId().equals(record.getRuleId())
-                            && users.contains(record.getJoinUserId())
-                            && cycleCount == record.getCycleCount()){
-                        users.remove(record.getJoinUserId());
-                    }
-                }*/
             }
 
             if (insertRecordList.size() > 0) {
@@ -399,16 +313,6 @@ public class LabGradeManageRecordServiceImpl implements ILabGradeManageRecordSer
                 labGradeManageRecordMapper.insertBatch(insertRecordList);
             }
 
-
-            /*List<LabGradeManageRecord> expiredList = labGradeManageRecordMapper.selectExpired();
-            if(expiredList.size() > 0){
-                Map<Long, List<LabGradeManageRecord>> map = expiredList.stream().collect(Collectors.groupingBy(LabGradeManageRecord::getJoinUserId));
-
-                map.forEach((k,v) -> {
-                    commonSend.send(MqttConstants.LAB_MANAGE_WORK+k, new MessageBody("您有" + v.size() + "条管控工作过期未完成，请尽快完成。", 2));
-                });
-            }*/
-
             //即将过期提醒 - 前十个小时(更改为工作产生进行通知：见 @link insertLabGradeManageRuled)
 
             // 周期结束 变更为下个周期

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabGradeManageRuleServiceImpl.java

@@ -150,8 +150,6 @@ public class LabGradeManageRuleServiceImpl implements ILabGradeManageRuleService
 
                     if(labGradeManageRuleUser.getType() == 3 && StringUtils.isNotBlank(labGradeManageRuleUser.getUserIds())){
                         userIds.addAll(Arrays.asList(labGradeManageRuleUser.getUserIds() .split(",")).stream().map(s -> (Long.parseLong(s.trim()))).collect(Collectors.toList()));
-                    }else if(labGradeManageRuleUser.getType() == 1){
-                        //userIds.addAll(labSubjectMapper.selectAdminIds(labGradeManage.getSubs()));
                     }
                 }
 
@@ -165,14 +163,5 @@ public class LabGradeManageRuleServiceImpl implements ILabGradeManageRuleService
         if(allRuleUseList.size() > 0){
             labGradeManageRuleUserMapper.insertBatch(allRuleUseList);
         }
-
-        // 生成工作通知
-        /*userWork.forEach((k,v) -> {
-            v.forEach(u ->{
-                commonSend.send(MqttConstants.LAB_MANAGE_WORK+u,
-                    new MessageBody("您当前有" + k + "条管控工作需完成，请点击查看详情。", 1));}
-            );
-        });*/
-
     }
 }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabGradeManageRuleUserServiceImpl.java

@@ -1,16 +1,15 @@
 package com.zd.laboratory.service.impl;
 
-import java.util.List;
-
 import com.zd.common.core.utils.DateUtils;
-import com.zd.common.core.utils.SecurityUtils;
 import com.zd.common.core.utils.SaveUtil;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.zd.laboratory.mapper.LabGradeManageRuleUserMapper;
+import com.zd.common.core.utils.SecurityUtils;
 import com.zd.laboratory.domain.LabGradeManageRuleUser;
+import com.zd.laboratory.mapper.LabGradeManageRuleUserMapper;
 import com.zd.laboratory.service.ILabGradeManageRuleUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
 
 /**
  * 分级管控确认人员Service业务层处理
@@ -67,7 +66,6 @@ public class LabGradeManageRuleUserServiceImpl implements ILabGradeManageRuleUse
      */
     @Override
     public int updateLabGradeManageRuleUser(LabGradeManageRuleUser labGradeManageRuleUser) {
-        // labGradeManageRuleUser.setUpdateTime(DateUtils.getNowDate());
         labGradeManageRuleUser.setUpdateBy(SecurityUtils.getUsername());
         return labGradeManageRuleUserMapper.updateLabGradeManageRuleUser(labGradeManageRuleUser);
     }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabGradeManageServiceImpl.java

@@ -1,29 +1,26 @@
 package com.zd.laboratory.service.impl;
 
-import java.util.List;
-
-import com.zd.model.domain.per.PerPrefix;
+import com.zd.common.core.annotation.DataScope;
 import com.zd.common.core.exception.ServiceException;
+import com.zd.common.core.security.TokenService;
 import com.zd.common.core.utils.DateUtils;
 import com.zd.common.core.utils.SecurityUtils;
-import com.zd.common.core.annotation.DataScope;
-import com.zd.common.core.security.TokenService;
-import com.zd.common.core.utils.SaveUtil;
-
+import com.zd.laboratory.domain.LabGradeManage;
 import com.zd.laboratory.domain.LabGradeManageRule;
 import com.zd.laboratory.domain.LabSubject;
+import com.zd.laboratory.mapper.LabGradeManageMapper;
 import com.zd.laboratory.mapper.LabGradeManageRuleMapper;
 import com.zd.laboratory.mapper.LabGradeManageRuleUserMapper;
 import com.zd.laboratory.mapper.LabSubjectMapper;
 import com.zd.laboratory.service.ILabGradeManageRuleService;
-import com.zd.laboratory.service.ILabGradeManageRuleUserService;
+import com.zd.laboratory.service.ILabGradeManageService;
+import com.zd.model.domain.per.PerPrefix;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.zd.laboratory.mapper.LabGradeManageMapper;
-import com.zd.laboratory.domain.LabGradeManage;
-import com.zd.laboratory.service.ILabGradeManageService;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.List;
+
 /**
  * 分级管控管理Service业务层处理
  *
@@ -84,7 +81,6 @@ public class LabGradeManageServiceImpl implements ILabGradeManageService {
     @Override
     public LabGradeManage insertLabGradeManage(LabGradeManage labGradeManage) {
         // 校验同一个实验室只能设置一次
-        //checkSubConfig(labGradeManage.getSubs(),null);
 
         labGradeManage.setCreateBy(SecurityUtils.getUsername());
         labGradeManage.setUserId(SecurityUtils.getUserId());
@@ -108,7 +104,6 @@ public class LabGradeManageServiceImpl implements ILabGradeManageService {
     @Override
     public LabGradeManage updateLabGradeManage(LabGradeManage labGradeManage) {
         // 校验同一个实验室只能设置一次
-        //checkSubConfig(labGradeManage.getSubs(),labGradeManage.getId());
 
         labGradeManage.setUpdateTime(DateUtils.getNowDate());
         labGradeManage.setUpdateBy(SecurityUtils.getUsername());
@@ -118,6 +113,11 @@ public class LabGradeManageServiceImpl implements ILabGradeManageService {
         return labGradeManage;
     }
 
+    /**
+     *
+     * @param subs
+     * @param id
+     */
     @Deprecated
     private void checkSubConfig(List<String> subs, Long id) {
 

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabOperateHardwareServiceImpl.java

@@ -4,12 +4,10 @@ import com.zd.laboratory.api.entity.SensorFunctionStatus;
 import com.zd.laboratory.api.vo.SenseValVO;
 import com.zd.laboratory.config.HardwareFunctionStatusConfig;
 import com.zd.laboratory.service.ILabOperateHardwareService;
-import com.zd.model.enums.HardwareTypeEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * Controller

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabRiskPlanServiceImpl.java

@@ -392,9 +392,6 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
 
     private void labRiskPlanLevel(LabRiskPlan labRiskPlan) {
         List<LabRiskPlanHardwareRelation> labRiskPlanRiskPlanHardwareList = labRiskPlan.getRiskPlanHardwareList();
-        /*if(CollectionUtils.isEmpty(labRiskPlanRiskPlanHardwareList)) {
-            throw new ServiceException("硬件不能为空！");
-        }*/
 
         List<LabRiskPlanSensorRelation> labRiskPlanSensorRelationList = labRiskPlan.getRiskPlanSensorList();
         if (CollectionUtils.isEmpty(labRiskPlanSensorRelationList)) {

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/SubQueryManager.java

@@ -73,7 +73,7 @@ public class SubQueryManager {
     public List<SubDiyVO> querySubs(List<Long> subIds, SubQueryConfig subQueryConfig) {
         //根据ids 等查询条件获取实验室
         List<LabSubjectVO> labSubjectVOS = null;
-        if(subQueryConfig.getBaseInfo()==false) {
+        if(!subQueryConfig.getBaseInfo()) {
             //不查基础信息则不能查地址 以后可以考虑分开， 不要依赖基础信息
             subQueryConfig.setAddr(true);
             labSubjectVOS = subIds.stream().distinct().map(a -> {

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/socket/constant/JXCTPacket.java

@@ -57,8 +57,6 @@ public class JXCTPacket {
             throw new AnalysisException("帧尾错误");
         }
         crc = data.substring(dataLen - 8, dataLen - 4);
-        byte[] crcData = SocketUtils.str2byte(data.substring(0, dataLen - 8));
-        String dataCrc = SocketUtils.getHexString(SocketUtils.crc16(crcData, crcData.length), 4);
         header = data.substring(0, 4);
         length = Integer.parseInt(data.substring(4, 6), 16);
         deviceNumber = data.substring(6, 18);

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/socket/runner/SocketRunner.java

@@ -1,14 +1,13 @@
 
 package com.zd.laboratory.socket.runner;
 
-import cn.hutool.core.collection.ConcurrentHashSet;
+
 import com.zd.laboratory.socket.properties.SocketProperties;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
-
 import java.io.IOException;
 import java.net.ServerSocket;
 import java.net.Socket;

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/socket/runner/TCPServer.java

@@ -6,7 +6,6 @@ import com.zd.laboratory.socket.constant.JXCTPacket;
 import com.zd.laboratory.socket.constant.SocketTypes;
 import com.zd.laboratory.socket.service.BaseRouter;
 import com.zd.laboratory.socket.service.SocketService;
-import com.zd.laboratory.socket.vo.TransmissionVo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import java.io.*;

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/utils/HexUtils.java

@@ -2,10 +2,6 @@ package com.zd.laboratory.utils;
 
 import com.zd.common.core.utils.ReUtil;
 
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-
 public class HexUtils {
     //包头一
     private static final String  HEAD_ONE="FF";