代码漏洞修改

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/device/DeviceRemoteController.java

@@ -5,7 +5,6 @@ import com.zd.common.core.utils.ReUtil;
 import com.zd.laboratory.api.entity.CabinetLock;
 import com.zd.laboratory.api.entity.CabinetV2Lock;
 import com.zd.laboratory.netty.NettyPushMsgService;
-import com.zd.laboratory.socket.runner.TCPServer;
 import com.zd.laboratory.socket.service.SocketService;
 import com.zd.laboratory.utils.CRCCHECK;
 import com.zd.model.domain.ResultData;
@@ -19,7 +18,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
-import java.io.OutputStream;
 
 /**
  * 设备远程控制接口

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/domain/dto/LabBuildFloorLayoutDTO.java

@@ -6,7 +6,7 @@ import lombok.Data;
 import java.math.BigDecimal;
 
 /**
- * @Description TODO
+ * @Description
  * @Author hzw
  * @Date 2022/12/11 18:15
  * @Version 2.0

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/domain/dto/LabRiskPlanInfoDTO.java

@@ -4,7 +4,7 @@ import com.zd.laboratory.domain.LabRiskPlanLevel;
 import lombok.Data;
 
 /**
- * @Description TODO
+ * @Description
  * @Author hzw
  * @Date 2022/12/9 14:40
  * @Version 2.0

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/domain/dto/QueryLogInfoParam.java

@@ -3,7 +3,7 @@ package com.zd.laboratory.domain.dto;
 import lombok.Data;
 
 /**
- * @Description TODO
+ * @Description
  * @Author hzw
  * @Date 2022/12/28 9:59
  * @Version 2.0

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/domain/dto/RiskPlanLogInfoDTO.java

@@ -4,7 +4,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
- * @Description TODO
+ * @Description
  * @Author hzw
  * @Date 2022/12/27 19:32
  * @Version 2.0

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/domain/dto/RiskPlanTriggerInfo.java

@@ -3,7 +3,7 @@ package com.zd.laboratory.domain.dto;
 import lombok.Data;
 
 /**
- * @Description TODO
+ * @Description
  * @Author hzw
  * @Date 2022/12/12 18:24
  * @Version 2.0

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/domain/vo/LabExitLineJoinVO.java

@@ -3,7 +3,6 @@ package com.zd.laboratory.domain.vo;
 import com.zd.laboratory.domain.LabExitLineJoin;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import kotlin.jvm.Volatile;
 
 /**
  * Controller

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/domain/vo/LabRiskPlanSubVoInfo.java

@@ -6,7 +6,7 @@ import lombok.Data;
 import java.util.List;
 
 /**
- * @Description TODO
+ * @Description
  * @Author hzw
  * @Date 2022/12/10 13:49
  * @Version 2.0

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/domain/vo/RiskPlanSubjectRelationVo.java

@@ -6,7 +6,7 @@ import lombok.Data;
 import java.util.List;
 
 /**
- * @Description TODO
+ * @Description
  * @Author hzw
  * @Date 2022/12/2 14:38
  * @Version 2.0

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/domain/vo/TriggerRiskPlanInfo.java

@@ -4,7 +4,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
- * @Description TODO
+ * @Description
  * @Author hzw
  * @Date 2022/12/9 14:20
  * @Version 2.0

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/event/RedisExpiredRelayListener.java

@@ -1,6 +1,5 @@
 package com.zd.laboratory.event;
 
-import com.zd.common.core.redis.RedisService;
 import com.zd.common.core.utils.SpringUtils;
 import com.zd.laboratory.constant.RelayConstants;
 import com.zd.laboratory.mqtt.entiy.LabRelayStatus;

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/event/SubFunctionEvent.java

@@ -1,6 +1,5 @@
 package com.zd.laboratory.event;
 
-import com.zd.laboratory.mqtt.entiy.EquipmentStatus;
 import org.springframework.context.ApplicationEvent;
 
 /**

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/event/SubFunctionListener.java

@@ -5,8 +5,6 @@ import com.zd.laboratory.api.vo.SubFunction;
 import com.zd.laboratory.mqtt.service.impl.SubMessageSendManager;
 import com.zd.laboratory.service.ILabSensorService;
 import com.zd.laboratory.service.impl.LabSubjectManagerService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationListener;
 import org.springframework.stereotype.Component;

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/mapper/LabRiskPlanLevelMapper.java

@@ -8,14 +8,14 @@ import org.apache.ibatis.annotations.Param;
 import java.util.List;
 
 /**
-  * @Description TODO
+  * @Description
   * @Author hzw
   * @Date 2022/11/29 16:13
   * @Version 2.0
-  */ 
+  */
 @Mapper
 public interface LabRiskPlanLevelMapper extends BaseMapper<LabRiskPlanLevel> {
     int batchInsert(@Param("list") List<LabRiskPlanLevel> list);
 
     LabRiskPlanLevel queryRiskPlanLevelByLevelIds(String levelIds);
-}
+}

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/mapper/LabSensorHazardRelationMapper.java

@@ -8,11 +8,11 @@ import org.apache.ibatis.annotations.Param;
 import java.util.List;
 
 /**
-  * @Description TODO
+  * @Description
   * @Author hzw
   * @Date 2022/12/1 16:59
   * @Version 2.0
-  */ 
+  */
 @Mapper
 public interface LabSensorHazardRelationMapper extends BaseMapper<LabSensorHazardRelation> {
     int updateBatch(List<LabSensorHazardRelation> list);
@@ -21,4 +21,4 @@ public interface LabSensorHazardRelationMapper extends BaseMapper<LabSensorHazar
 
     List<LabSensorHazardRelation> getSensorHazardList(@Param("riskPlanId") Long riskPlanId, @Param("id") Long id);
 
-}
+}

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/mqtt/config/MqttConfig.java

@@ -260,7 +260,7 @@ public class MqttConfig {
                     ReturnMessageProcessing(message, receivedTopic);
                 }
             } catch (Exception e) {
-                //e.printStackTrace();
+                logger.error("消息处理器2异常："+e);
             }
         };
     }

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

@@ -65,21 +65,7 @@ public class SingInUser {
                 .orElseGet(()->null);
 
     }
-    /*public SingInUser(SysUser user, List<LabApprovalVO> labApprovals) {
-        this.userId = user.getUserId();
-        this.userName = user.getUserName();
-        this.nickName = user.getNickName();
-        this.type = user.getUserType();
-        this.deptId = user.getDeptId();
-        this.avatar=user.getAvatar();
-        this.expirationDate=Optional.ofNullable(labApprovals)
-                .filter(a->a.size()>0)
-                .map(a->a.get(0))
-                .filter(a->a.getRecordContent().equals(1))
-                .map(a->a.getExpirationDate())
-                .orElseGet(()->null);
 
-    }*/
     public String getAvatar() {
         return avatar;
     }

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

@@ -7,7 +7,7 @@ import com.zd.model.domain.ResultData;
 import java.util.List;
 
 /**
- * @Description TODO
+ * @Description
  * @Author hzw
  * @Date 2022/11/29 16:13
  * @Version 2.0

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

@@ -5,11 +5,11 @@ import com.zd.laboratory.domain.LabSensorHazardRelation;
 
 import java.util.List;
     /**
-  * @Description TODO
+  * @Description
   * @Author hzw
   * @Date 2022/12/1 16:59
   * @Version 2.0
-  */ 
+  */
 public interface LabSensorHazardRelationService extends IService<LabSensorHazardRelation>{
 
 

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

@@ -22,7 +22,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.util.List;
 
 /**
- * @Description TODO
+ * @Description
  * @Author hzw
  * @Date 2022/11/29 16:13
  * @Version 2.0

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

@@ -8,11 +8,11 @@ import org.springframework.stereotype.Service;
 
 import java.util.List;
 /**
-  * @Description TODO
+  * @Description
   * @Author hzw
   * @Date 2022/12/1 16:59
   * @Version 2.0
-  */ 
+  */
 @Service
 public class LabSensorHazardRelationServiceImpl extends ServiceImpl<LabSensorHazardRelationMapper, LabSensorHazardRelation> implements LabSensorHazardRelationService{