异味处理

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/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";