代码漏洞修改

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabSecurityApplyController.java

@@ -241,9 +241,7 @@ public class LabSecurityApplyController extends BaseController
     @GetMapping(value = "/getDetails")
     public ResultData  getDetails( Long id)
     {
-        Map<String, Object> map =new HashMap<>();
-        map = getDetailsById(id);
-        return ResultData.success(map);
+        return ResultData.success(getDetailsById(id));
     }
 
     /**

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabSubjectController.java

@@ -89,7 +89,7 @@ public class LabSubjectController extends BaseController {
     private RemoteAirBottleService remoteAirBottleService;
 
 
-    /***
+    /**
      * 查询实验室列表
      * @param labSubject
      * @return

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabXxpUserAuthController.java

@@ -231,8 +231,7 @@ public class LabXxpUserAuthController extends BaseController
             //判断是否当天值班
             for(Map<String,Object> dutyMap:list){
                 String userObj=String.valueOf(dutyMap.get("userId"));
-                if(StringUtils.isNotEmpty(userObj) && StringUtils.isNotNull(userObj)
-                        && Long.parseLong(userObj)==userId){
+                if(StringUtils.isNotEmpty(userObj) && Long.parseLong(userObj)==userId){
                     isDutyUser=1;
                     break;
                 }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/domain/LabPhotoInspection.java

@@ -25,27 +25,6 @@ public class LabPhotoInspection extends BaseEntity {
      */
     @ApiModelProperty(value = "${comment}")
     private Long id;
-// 废弃
-//    /**
-//     * 进出记录表id
-//     */
-//    @ApiModelProperty("进出记录表id")
-//    @Excel(name = "进出记录表id")
-//    private Long accessId;
-// 废弃
-//    /**
-//     * 附件对应标题（参照字典表）
-//     */
-//    @ApiModelProperty("附件对应标题（参照字典表）")
-//    @Excel(name = "附件对应标题", readConverterExp = "参=照字典表")
-//    private Integer annexTitle;
-// 废弃
-//    /**
-//     * 附件url地址
-//     */
-//    @ApiModelProperty("附件url地址")
-//    @Excel(name = "附件url地址")
-//    private String annexUrl;
 
     /**
      * 部门id
@@ -130,16 +109,6 @@ public class LabPhotoInspection extends BaseEntity {
         return id;
     }
 
-//
-//    public void setAnnexTitle(Integer annexTitle) {
-//        this.annexTitle = annexTitle;
-//    }
-//
-//    public Integer getAnnexTitle() {
-//        return annexTitle;
-//    }
-
-
 
     public void setDeptId(Long deptId) {
         this.deptId = deptId;

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/domain/LabSubject.java

@@ -95,13 +95,15 @@ public class LabSubject extends BaseEntity implements QCInterface {
     private Long userName;
     /**
      * 是否是实验室
+     * private Long isSubject;
      */
-    private Long isSubject;
+
 
     /**
      * 实验室顺序
+     * private Long subOrder;
      */
-    private Long subOrder;
+
     /**
      * 仅仅为了回显， 后面考虑移除
      */

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

@@ -26,12 +26,6 @@ public class LabMessageContentDTO implements Serializable {
      */
     private Long id;
 
-//    /** 消息类型（参考字典表 如：文字，富文本） */
-//    @NotNull(groups = ValidGroup.Crud.Create.class,message = "消息类型不能为空")
-//    @EnumString(value = MessTypeEnum.class, message="消息类型错误！")
-//    @Excel(name = "消息类型", readConverterExp = "参考MessTypeEnum")
-//    private Integer messType;
-
     /**
      * 发送方式（参考字典表）
      */

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

@@ -80,7 +80,7 @@ public class HaikangUserVo extends BaseEntity {
 
     public String getVerifyMode() {
         if(StringUtils.isNotBlank(verifyMode)){
-            //return UserVerifyMode.valueOf(verifyMode).getValue();
+
         }
         return null;
     }

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

@@ -82,10 +82,12 @@ public class LabApprovalVO extends LabApproval {
         this.effectiveTime = effectiveTime;
     }
 
+    @Override
     public String getConfigureName() {
         return configureName;
     }
 
+    @Override
     public void setConfigureName(String configureName) {
         this.configureName = configureName;
     }

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

@@ -147,11 +147,12 @@ public class LabViolationVO extends LabViolation {
 
    private String endTimeStr;
 
-
+    @Override
     public Long getCreact_id() {
         return creact_id;
     }
 
+    @Override
     public void setCreact_id(Long creact_id) {
         this.creact_id = creact_id;
     }
@@ -252,10 +253,12 @@ public class LabViolationVO extends LabViolation {
         this.appPageSize = appPageSize;
     }
 
+    @Override
     public String getStuNo() {
         return stuNo;
     }
 
+    @Override
     public void setStuNo(String stuNo) {
         this.stuNo = stuNo;
     }

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

@@ -12,7 +12,6 @@ import io.swagger.annotations.ApiModelProperty;
 @ApiModel("待办工作")
 public class ToDoWork {
 
-    //    private Long id;
     @ApiModelProperty("内容")
     private String content;
     @ApiModelProperty("用户ID")

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

@@ -28,10 +28,7 @@ public class LabMessageListener implements ApplicationListener<SensorLabMessageE
     @Override
     public void onApplicationEvent(SensorLabMessageEvent sensorLabMessageEvent) {
         SubFunction<SensorFunctionStatus> message = sensorLabMessageEvent.getMessage();
-        //log.info("监听传感器入口——实验室Id======{}",message.getSubId());
-        //log.info("监听传感器入口——传感器param==={}", JSON.toJSONString(message));
-        //触发事件
-        //没有实验室Id 不处理
+        //触发事件,没有实验室Id 不处理
         if (message.getSubId() == null) {
             log.error("无实验室id，不予处理！");
             return;

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

@@ -10,7 +10,6 @@ import com.zd.laboratory.mqtt.entiy.EquipmentStatus;
  */
 public class OnecStatusEvent extends HardwareStatusEvent{
 
-//    public EquipmentStatus source;
     public OnecStatusEvent(EquipmentStatus source) {
         super(source);
     }

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

@@ -49,7 +49,6 @@ public class RedisExpiredAndAddListener extends KeyExpirationEventMessageListene
 
     @Override
     public void onMessage(Message message, byte[] bytes) {
-//        String topic = new String(bytes);
         String expiredKey = new String(message.getBody());
         String s = StrUtil.subBefore(expiredKey, ":", false);
         Optional.ofNullable(s)

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

@@ -124,29 +124,19 @@ public class RedisExpiredPhotographListener extends KeyExpirationEventMessageLis
                 algorithmWarningBo.setSubName(warningNoticeLog.getSubName());
                 algorithmWarningBo.setId(warningNoticeLog.getId());
                 algorithmWarningBo.setFileUrl(fileR.getData().getUrl());
-                //algorithmWarningBo.setFileUrl("d:\\test.jpg");
                 log.info("调用算法服务识别！");
                 ResultData resultData = remoteForwardService.warningCheck(algorithmWarningBo);
                 log.info("调用算法服务返回结果：result={}",JSON.toJSONString(resultData));
                 if (HttpStatus.SUCCESS != resultData.getCode()) {
                 //算法调用 默认返回成功！
-                //if (HttpStatus.SUCCESS != 200) {
                     return;
                 }
                 AlgorithmWarningVo algorithmWarningVo = JSON.parseObject(JSONObject.toJSONString(resultData.getData()), AlgorithmWarningVo.class);
 
-                //==========================test code 算法调用 默认返回异常假数据=========================
-                //AlgorithmWarningVo algorithmWarningVo = new AlgorithmWarningVo();
-                //algorithmWarningVo.setOriginalImage("/statics/2023/06/27/8897e540-481d-4731-a199-29bb1a9ad30f.jpg");
-                //algorithmWarningVo.setIsAlert(Boolean.TRUE);
-                //algorithmWarningVo.setId(warningNoticeLog.getId());
-                //==========================test code 算法调用 默认返回异常假数据=========================
-
                 WarningDetail warningDetail = new WarningDetail();
                 warningDetail.setLogId(warningNoticeLog.getId());
                 warningDetail.setSubId(warningNoticeLog.getSubId());
                 //预警类型(1预案抓拍 2穿戴抓拍)
-                //warningDetail.setType(2);
                 warningDetail.setPhotoUrl(fileR.getData().getUrl());
                 if(algorithmWarningVo.getIsAlert()){
                     warningDetail.setCallbackPhotoUrl(algorithmWarningVo.getResultImage());
@@ -184,7 +174,6 @@ public class RedisExpiredPhotographListener extends KeyExpirationEventMessageLis
                             warningNoticeLogDto.setWarningType(1);
                             warningNoticeLogDto.setWarningContent("未穿戴实验服");
                             warningNoticeLogDto.setWarningTime(LocalDateTime.now());
-                            //warningNoticeLogDto.setWarningWay("1,2,3");
                             //查询到实验室负责人id 安全责任人id
                             List<CheckSubjectDto> subjectInfoList = labSubjectService.findSubjectInfoList(String.valueOf(warningNoticeLog.getSubId()));
                             if (subjectInfoList.size() > 0) {
@@ -291,4 +280,4 @@ public class RedisExpiredPhotographListener extends KeyExpirationEventMessageLis
             }
         }
     }
-}
+}

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

@@ -22,8 +22,6 @@ public class RedisExpiredRelayListener extends KeyExpirationEventMessageListener
 
     private static final Logger logger = LoggerFactory.getLogger(RedisExpiredRelayListener.class);
 
-    private RedisService redisService = SpringUtils.getBean(RedisService.class);
-
     public RedisExpiredRelayListener(RedisMessageListenerContainer listenerContainer) {
         super(listenerContainer);
     }

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

@@ -11,7 +11,6 @@ import org.springframework.context.ApplicationEvent;
  */
 public class RelayHardwareStatusEvent extends HardwareStatusEvent{
 
-//    public EquipmentStatus source;
     public RelayHardwareStatusEvent(EquipmentStatus source) {
         super(source);
     }

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

@@ -11,8 +11,6 @@ import org.springframework.context.ApplicationEvent;
  */
 public class SubFunctionEvent extends ApplicationEvent {
 
-//    public EquipmentStatus source;
-
     /**
      * 云盒ID
      * @param num

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

@@ -10,7 +10,6 @@ import com.zd.laboratory.mqtt.entiy.EquipmentStatus;
  */
 public class VideoHardwareStatusEvent extends HardwareStatusEvent{
 
-//    public EquipmentStatus source;
     public VideoHardwareStatusEvent(EquipmentStatus source) {
         super(source);
     }