2022-09-16 疏散应急指示灯相关功能。

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

@@ -31,6 +31,9 @@ public class EvacuationLine {
     @ApiModelProperty("楼层id")
     private Long floorId;
 
+    @ApiModelProperty("楼栋id")
+    private Long buildId;
+
     public Integer getType() {
         return type;
     }
@@ -102,4 +105,12 @@ public class EvacuationLine {
     public void setFloorId(Long floorId) {
         this.floorId = floorId;
     }
+
+    public Long getBuildId() {
+        return buildId;
+    }
+
+    public void setBuildId(Long buildId) {
+        this.buildId = buildId;
+    }
 }

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

@@ -254,7 +254,7 @@ public class MqttConfig {
                 }
 
                 // TODO
-                MessageBody messageBody = JSONObject.parseObject(messageStr, MessageBody.class);
+//                MessageBody messageBody = JSONObject.parseObject(messageStr, MessageBody.class);
 
 //                mqttResHandler.deal(JSONUtil.toBean(msg,com.ffy.mqtt.model.Message.class));
                 List<LabMessageEvent> labMessageEvents = labMessMap.get(receivedTopic);

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

@@ -95,6 +95,8 @@ public class LabExitLineServiceImpl implements ILabExitLineService
         labExitLineJoin.setSubjectId(subId);
         labExitLineJoin.setLightDirection(dire);
         List<LabExitLineJoinVO> labExitLineJoinVOList = labExitLineJoinMapper.selectLabExitLineIntelligentGuidance(labExitLineJoin);
+        //todo 这里临时调用一下处理LightId的办法，以后如果变动，需要重新设计调整，这个方法就不用了。
+        changeLightId(labExitLineJoinVOList);
         if(dire==0){
             boolean leftLight=false,rightLight=false;
             for(LabExitLineJoinVO labExitLineJoinVO:labExitLineJoinVOList){
@@ -112,6 +114,28 @@ public class LabExitLineServiceImpl implements ILabExitLineService
         return labExitLineJoinVOList;
     }
 
+
+    private void changeLightId(List<LabExitLineJoinVO> labExitLineJoinVOList){
+        Optional.ofNullable(labExitLineJoinVOList).orElseGet(Collections::emptyList)
+                .stream()
+                .forEach(a->{
+                    if(a.getLightId().longValue()==7){
+                        a.setLightId(1L);
+                    }else if(a.getLightId().longValue()==8){
+                        a.setLightId(2L);
+                    }else if(a.getLightId().longValue()==9){
+                        a.setLightId(3L);
+                    }else if(a.getLightId().longValue()==10){
+                        a.setLightId(4L);
+                    }else if(a.getLightId().longValue()==11){
+                        a.setLightId(5L);
+                    }else if(a.getLightId().longValue()==12){
+                        a.setLightId(6L);
+                    }
+                });
+
+    }
+
     /**
      * 查询逃生线路主列表
      *
@@ -524,8 +548,10 @@ public class LabExitLineServiceImpl implements ILabExitLineService
             evacuationLine.setSubId(keyLength);
             LabSubjectVO labSubject = labSubjectMapper.selectLabSubjectVoById(Long.parseLong(keyLength));
             evacuationLine.setDeptId(labSubject.getDeptId());
+            evacuationLine.setDeptName(labSubject.getDeptName());
             evacuationLine.setFloorId(labSubject.getFloorId());
             evacuationLine.setSubName(labSubject.getName());
+            evacuationLine.setBuildId(labSubject.getBuildId());
             evacuationLine.setBuildName(labSubject.getBuildName());
             evacuationLine.setFloorName(labSubject.getFloorName());
             return evacuationLine;

zd-modules/zd-modules-laboratory/src/main/resources/mapper/laboratory/LabRiskPlanAbnormalGroupMapper.xml

@@ -63,6 +63,8 @@
         gp.create_by,
         gp.update_time,
         (SELECT CONCAT(s.name,s.room) FROM lab_subject s WHERE s.id = subject_id) subject_name,
+        (SELECT s.dept_id FROM lab_subject s WHERE s.id = gp.subject_id) deptId,
+        (SELECT d.dept_name FROM lab_subject s,sys_dept d WHERE s.id = gp.subject_id AND s.dept_id = d.dept_id) deptName,
         (SELECT s.build_id FROM lab_subject s WHERE s.id = subject_id) build_id,
         (SELECT d.dept_name FROM lab_subject s,sys_dept d WHERE s.id = gp.subject_id AND s.build_id = d.dept_id) buildName,
         (SELECT b.name FROM lab_building b,lab_subject s WHERE b.id = s.floor_id AND s.id = gp.subject_id) floorName,

zd-modules/zd-modules-laboratory/src/main/resources/mapper/laboratory/LabSubjectMapper.xml

@@ -120,8 +120,9 @@
 
     <sql id="selectLabSubjectVo">
         select
-            id, name, floor_id,layout_id,build_id,sub_dept,level, check_out,check_in,room,
-            dept_id, dept_name, admin_id, is_del, create_time, user_id,
+            id, name, floor_id,layout_id,build_id,sub_dept,level, check_out,check_in,room,dept_id,
+            (SELECT d.dept_name FROM sys_dept d WHERE s.dept_id = d.dept_id) dept_name,
+            admin_id, is_del, create_time, user_id,
             create_by, update_time, update_by, remark, sub_dept,
             check_out, check_in, safe_user_id, safe_signs, hazard_category, risk_measure,
             outfire, qr_code,safe_user_id, skipped, check_count,sign_time,