xuxiaofei лет назад: 2
Родитель
Сommit
2601e848b3
13 измененных файлов с 32 добавлено и 21 удалено
  1. 2 0
      zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/domain/vo/LabBlacklistVO.java
  2. 2 0
      zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/domain/vo/LabExitLineJoinVO.java
  3. 4 0
      zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/domain/vo/LabNegativeListRecordsVO.java
  4. 2 0
      zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/domain/vo/LabNegativelistVO.java
  5. 0 11
      zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/domain/vo/LabRiskPlanAbnormalGroupVO.java
  6. 1 4
      zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/domain/vo/LabRiskPlanSubVo.java
  7. 2 0
      zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/domain/vo/LabSubjectDetailVO.java
  8. 8 0
      zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/domain/vo/LabSubjectVO.java
  9. 0 3
      zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/event/SensorNewStatusListener.java
  10. 0 2
      zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/event/SubFunctionListener.java
  11. 5 0
      zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/mapper/LabGradeManageMapper.java
  12. 5 0
      zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/mapper/LabGradeManageRuleMapper.java
  13. 1 1
      zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/mqtt/config/MqttConfig.java

+ 2 - 0
zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/domain/vo/LabBlacklistVO.java

@@ -92,10 +92,12 @@ public class LabBlacklistVO extends LabBlacklist {
         this.blackNum = blackNum;
     }
 
+    @Override
     public String getCreditScore() {
         return creditScore;
     }
 
+    @Override
     public void setCreditScore(String creditScore) {
         this.creditScore = creditScore;
     }

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

@@ -3,6 +3,7 @@ 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
@@ -51,6 +52,7 @@ public class LabExitLineJoinVO extends LabExitLineJoin {
         return lightId;
     }
 
+    @Override
     public void setLightId(Long lightId) {
         this.lightId = lightId;
     }

+ 4 - 0
zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/domain/vo/LabNegativeListRecordsVO.java

@@ -41,10 +41,12 @@ public class LabNegativeListRecordsVO extends LabNegativeListRecords
 
 
 
+    @Override
     public String getUserName() {
         return userName;
     }
 
+    @Override
     public void setUserName(String userName) {
         this.userName = userName;
     }
@@ -96,10 +98,12 @@ public class LabNegativeListRecordsVO extends LabNegativeListRecords
         this.orderType = orderType;
     }
 
+    @Override
     public Long getJoinUserId() {
         return joinUserId;
     }
 
+    @Override
     public void setJoinUserId(Long joinUserId) {
         this.joinUserId = joinUserId;
     }

+ 2 - 0
zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/domain/vo/LabNegativelistVO.java

@@ -75,10 +75,12 @@ public class LabNegativelistVO extends LabNegativelistHistory {
         this.joinUserId = joinUserId;
     }
 
+    @Override
     public Integer getViolationType() {
         return violationType;
     }
 
+    @Override
     public void setViolationType(Integer violationType) {
         this.violationType = violationType;
     }

+ 0 - 11
zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/domain/vo/LabRiskPlanAbnormalGroupVO.java

@@ -17,9 +17,6 @@ import java.util.List;
 @ApiModel("风险预案组Vo")
 public class LabRiskPlanAbnormalGroupVO extends LabRiskPlanAbnormalGroup {
 
-    /*@ApiModelProperty(value = "实验室名称")
-    private String subjectName;*/
-
     @ApiModelProperty(value = "学校id")
     private String buildId;
 
@@ -49,14 +46,6 @@ public class LabRiskPlanAbnormalGroupVO extends LabRiskPlanAbnormalGroup {
 
     private List<LabHardware> hardwareList;
 
-    /*public String getSubjectName() {
-        return subjectName;
-    }
-
-    public void setSubjectName(String subjectName) {
-        this.subjectName = subjectName;
-    }*/
-
     public List <LabHardware> getHardwareList() {
         return hardwareList;
     }

+ 1 - 4
zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/domain/vo/LabRiskPlanSubVo.java

@@ -41,9 +41,6 @@ public class LabRiskPlanSubVo {
     @ApiModelProperty(name = "当前用户id")
     private Long userId;
 
-//    @ApiModelProperty(name = "传感器类型字符串")
-//    private String types;
-
     @ApiModelProperty(name = "传感器危险源关联列表")
     private List<LabSensorHazardRelation> labSensorHazardRelations;
-}
+}

+ 2 - 0
zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/domain/vo/LabSubjectDetailVO.java

@@ -114,10 +114,12 @@ public class LabSubjectDetailVO extends LabSubject {
         this.hardwares = hardwares;
     }
 
+    @Override
     public String getAdminName() {
         return adminName;
     }
 
+    @Override
     public void setAdminName(String adminName) {
         this.adminName = adminName;
     }

+ 8 - 0
zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/domain/vo/LabSubjectVO.java

@@ -164,10 +164,12 @@ public class LabSubjectVO extends LabSubject {
         this.labSensorHazardRelations = labSensorHazardRelations;
     }
 
+    @Override
     public String getAdminName() {
         return adminName;
     }
 
+    @Override
     public void setAdminName(String adminName) {
         this.adminName = adminName;
     }
@@ -184,10 +186,12 @@ public class LabSubjectVO extends LabSubject {
 
     public void setBuilding(String building) {        this.building = building;    }
 
+    @Override
     public String getSubDept() {
         return subDept;
     }
 
+    @Override
     public void setSubDept(String subDept) {
         this.subDept = subDept;
     }
@@ -329,10 +333,12 @@ public class LabSubjectVO extends LabSubject {
         this.subjectId = subjectId;
     }
 
+    @Override
     public String getMoldName() {
         return moldName;
     }
 
+    @Override
     public void setMoldName(String moldName) {
         this.moldName = moldName;
     }
@@ -387,10 +393,12 @@ public class LabSubjectVO extends LabSubject {
         this.floorName = floorName;
     }
 
+    @Override
     public String getRoomName() {
         return roomName;
     }
 
+    @Override
     public void setRoomName(String roomName) {
         this.roomName = roomName;
     }

+ 0 - 3
zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/event/SensorNewStatusListener.java

@@ -9,8 +9,6 @@ import com.zd.laboratory.service.ILabSensorService;
 import com.zd.laboratory.service.impl.LabSubjectManagerService;
 import com.zd.model.constant.CacheConstants;
 import com.zd.model.constant.CacheDevice;
-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;
@@ -26,7 +24,6 @@ import java.util.concurrent.TimeUnit;
 @Component
 public class SensorNewStatusListener implements ApplicationListener<SensorNewStatusEvent> {
 
-    private static final Logger logger = LoggerFactory.getLogger(SensorNewStatusListener.class);
 
     @Autowired
     private ILabSensorService labSensorService;

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

@@ -22,7 +22,6 @@ import java.util.List;
 @Component
 public class SubFunctionListener implements ApplicationListener <SubFunctionEvent> {
 
-    private static final Logger log = LoggerFactory.getLogger(SubFunctionListener.class);
 
     @Autowired
     SubMessageSendManager subMessageSendManager;
@@ -40,7 +39,6 @@ public class SubFunctionListener implements ApplicationListener <SubFunctionEven
         //根据编号获取实验室ID
         Long subId = labSensorService.getCacheSubByGateway(num);
         if(subId==null) return;
-//        List<SensorFunctionStatus> list = labSubjectManagerService.querySenseFunctionBySubId(subId);
         List<SensorFunctionStatus> list = labSubjectManagerService.querySenseNewFunctionBySubId(subId);
         SubFunction subFunction= new SubFunction();
         subFunction.setFunctionStatuses(list);

+ 5 - 0
zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/mapper/LabGradeManageMapper.java

@@ -64,6 +64,11 @@ public interface LabGradeManageMapper
 
     int selectCountBySubId(@Param("subId") String subId, @Param("id") Long id);
 
+    /****
+     *
+     * @param userId
+     * @return
+     */
     @Deprecated
     String selectSubIdsByUserId(Long userId);
 

+ 5 - 0
zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/mapper/LabGradeManageRuleMapper.java

@@ -98,5 +98,10 @@ public interface LabGradeManageRuleMapper
                                                                             @Param("userId") Long userId,
                                                                             @Param("subId") Long subId);
 
+    /****
+     * xx
+     * @param ruleUserId
+     * @return
+     */
     List<LabGradeManageWorkDetailVO> selectMyLabGradeManageWorkDetailByMessage(@Param("ruleUserId") Long ruleUserId);
 }

+ 1 - 1
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) {
-                logger.error("消息通道异常");
+                //e.printStackTrace();
             }
         };
     }