大屏统计修改

zd-api/zd-laboratory-api/src/main/java/com/zd/laboratory/api/entity/LabSubjectControllerVO.java

@@ -95,6 +95,18 @@ public class LabSubjectControllerVO extends LabSubjectEntity {
 
     private String safeUserNameAdminPhone;
 
+    @ApiModelProperty("楼栋名称")
+    private String buildName;
+
+    @ApiModelProperty(value = "楼层名称")
+    private String floorName;
+
+    @ApiModelProperty(value = "房间名称")
+    private String roomName;
+
+    @ApiModelProperty(value = "预案名称")
+    private String riskName;
+
     @ApiModel("安全信息")
     public static class SafeInfo {
         @ApiModelProperty("安全警示标示--字典")
@@ -479,4 +491,36 @@ public class LabSubjectControllerVO extends LabSubjectEntity {
     public void setCardInfoCount(Integer cardInfoCount) {
         this.cardInfoCount = cardInfoCount;
     }
+
+    public String getBuildName() {
+        return buildName;
+    }
+
+    public void setBuildName(String buildName) {
+        this.buildName = buildName;
+    }
+
+    public String getFloorName() {
+        return floorName;
+    }
+
+    public void setFloorName(String floorName) {
+        this.floorName = floorName;
+    }
+
+    public String getRoomName() {
+        return roomName;
+    }
+
+    public void setRoomName(String roomName) {
+        this.roomName = roomName;
+    }
+
+    public String getRiskName() {
+        return riskName;
+    }
+
+    public void setRiskName(String riskName) {
+        this.riskName = riskName;
+    }
 }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/bigview/BigViewController.java

@@ -8,6 +8,8 @@ import com.zd.common.core.web.controller.BaseController;
 import com.zd.laboratory.api.entity.LabSubjectEntity;
 import com.zd.laboratory.api.entity.LabSubjectControllerVO;
 import com.zd.laboratory.domain.LabHazardSubjectRelation;
+import com.zd.laboratory.domain.LabRiskPlanAbnormalGroup;
+import com.zd.laboratory.domain.LabSubject;
 import com.zd.laboratory.domain.bigview.HardwareState;
 import com.zd.laboratory.domain.bigview.HazardTotal;
 import com.zd.laboratory.domain.bigview.SenseState;
@@ -81,6 +83,12 @@ public class BigViewController extends BaseController {
     @Autowired
     private TokenService tokenService;
 
+    @Autowired
+    private ILabRiskPlanAbnormalGroupService groupService;
+
+    @Autowired
+    ILabSubjectService subjectService;
+
     /**
      * echarts-条形图：设备概览
      *
@@ -415,4 +423,42 @@ public class BigViewController extends BaseController {
         List<LabCheckOptionStatisticsVo> list =labCheckOptionService.selectSubjectListList(statisticsVo);
         return ResultData.success(list);
     }
+
+
+    @ApiOperation("大屏-校级-预警通知")
+    @GetMapping("/warningNotice")
+    public ResultData warningNotice() {
+        List<LabSubjectControllerVO> list = new ArrayList<>();
+        //查询预警的实验室数量
+        LabRiskPlanAbnormalGroup group = new LabRiskPlanAbnormalGroup();
+        group.setStatus(1L);
+        List <LabRiskPlanAbnormalGroupVO> groupVOList = groupService.selectLabRiskPlanAbnormalGroupList(group);
+
+        List<LabSubjectVO> subList = new ArrayList<>();
+        //查询实验室详情
+        if(groupVOList!=null && groupVOList.size()>0){
+            for (LabRiskPlanAbnormalGroupVO vo:groupVOList) {
+                LabSubjectVO labSubject = new LabSubjectVO();
+                labSubject.setId(vo.getSubjectId());
+                List<LabSubjectVO> labSubjects = subjectService.selectLabSubjectListAuthByPc(labSubject);
+                labSubjects.get(0).setRemark(vo.getGroupName());
+                subList.add(labSubjects.size()>0?labSubjects.get(0):null);
+            }
+        }
+
+        //获取硬件信息
+        list = subjectManagerService.completeMainSubInfo(subList);
+        //组装楼栋、楼层、房间号、预案名称
+        for (LabSubjectControllerVO vo:list) {
+            for (LabSubjectVO suvo:subList) {
+                if(vo.getId().equals(suvo.getId())){
+                    vo.setBuildName(suvo.getBuildName());
+                    vo.setFloorName(suvo.getFloorName());
+                    vo.setRoomName(suvo.getRoomName());
+                    vo.setRiskName(suvo.getRemark());
+                }
+            }
+        }
+        return ResultData.success(list);
+    }
 }

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

@@ -51,7 +51,6 @@
         <result property="updateTime" column="update_time"/>
         <result property="updateBy" column="update_by"/>
         <result property="remark" column="remark"/>
-        <result property="buildName" column="build_name"/>
         <result property="subDept" column="sub_dept"/>
         <result property="buildId" column="build_id"/>
         <result property="dangerName" column="danger_name"/>
@@ -425,7 +424,7 @@
     </select>
 
     <select id="selectLabSubjectVOListByPc" parameterType="com.zd.laboratory.domain.LabSubject"
-            resultMap="LabSubjectResultVO">
+            resultType="com.zd.laboratory.domain.vo.LabSubjectVO">
         select t.id,
         t.name,
         t.floor_id,
@@ -467,7 +466,6 @@
         t.inspect_skipped,
         t.inspect_check_count,
         t.inspect_sign_time,
-        t.details,
         t.hardware_type
         from lab_subject t
         left join sys_user su on su.user_id = t.admin_id AND su.`del_flag`=0