大屏统计修改

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/controller/DbStatisticsController.java

@@ -94,6 +94,7 @@ public class DbStatisticsController extends BaseController {
     @ApiOperation(value = "实验室排名统计")
     public ResultData subjectGroup(DbStockBo bo) {
         //集合查询
+        startPage();
         List<DbStockVo> list =  dbStockService.selectSubjectListGroupBy(bo);
         return ResultData.success(list);
     }

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/domain/vo/DbStockVo.java

@@ -60,5 +60,12 @@ public class DbStockVo implements Serializable {
     @ApiModelProperty("使用记录")
     private List<DbUsageRecord> dbUsageRecordList;
 
+    @ApiModelProperty("实验室类别")
+    private String subjectType;
 
+    @ApiModelProperty("实验室级别")
+    private String subjectLevel;
+
+    @ApiModelProperty("数量")
+    private Integer totalNum;
 }

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

@@ -341,32 +341,37 @@ public class LabHazardController extends BaseController {
         //按学院分组
         Map<String, List<LabHazardSubjectRelation>> bottleConfigMap = list.stream().collect(Collectors.groupingBy(LabHazardSubjectRelation::getDeptName));
 
-        Map<String, List<LabHazardSubjectRelation>> backMap = new HashMap<>();
+        //Map<String, List<LabHazardSubjectRelation>> backMap = new HashMap<>();
+
+        List<LabHazardSubjectRelation> backtList = new ArrayList<>();
+
         if(!bottleConfigMap.isEmpty()){
             for (Map.Entry entry : bottleConfigMap.entrySet()) {
+                LabHazardSubjectRelation relation1 = new LabHazardSubjectRelation();
                 List<LabHazardSubjectRelation> hazardtList = new ArrayList<>();
                 Object Key = entry.getKey();
                 //Object value = entry.getValue();
+                relation1.setDeptName(Key+"");
+                // 循环字典
                 for (SysDictData dicData:dictDataList) {
                     LabHazardSubjectRelation re = new LabHazardSubjectRelation();
+                    re.setTotalNum(0);
+                    re.setHazardTypeModeName(dicData.getDictLabel());
+                    // 循环数据源
                     for (LabHazardSubjectRelation lsr:list) {
-                        //System.out.println("DeptName:"+lsr.getDeptName()+" key:"+ Key.toString() +" DictValue"+ dicData.getDictValue()+"  HazardTypeMode"+lsr.getHazardTypeMode());
-                        if(Key.equals(lsr.getDeptName()) && dicData.getDictLabel().equals(lsr.getHazardTypeModeName())){
+                        if(Key.toString().equals(lsr.getDeptName()) && dicData.getDictLabel().equals(lsr.getHazardTypeModeName())){
                             re.setTotalNum(lsr.getTotalNum());
-                            re.setHazardTypeModeName(dicData.getDictLabel());
-                        }else {
-                            re.setTotalNum(0);
-                            re.setHazardTypeModeName(dicData.getDictLabel());
                         }
                     }
                     hazardtList.add(re);
                 }
-                backMap.put(Key+"",hazardtList);
+                relation1.setRelationList(hazardtList);
+                backtList.add(relation1);
             }
         }
 
-        map.put("hazard",dictDataList);
-        map.put("backMap",backMap);
+        //map.put("hazard",dictDataList);
+        //map.put("backMap",backMap);
 
         /*if(!bottleConfigMap.isEmpty()){
             for (Map.Entry entry : bottleConfigMap.entrySet()) {
@@ -390,7 +395,7 @@ public class LabHazardController extends BaseController {
         }
         map.put("hazard",dictDataList);
         map.put("list",backList);*/
-        return ResultData.success(map);
+        return ResultData.success(backtList);
     }
 
     /**

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

@@ -1,6 +1,7 @@
 package com.zd.laboratory.controller;
 
 import cn.hutool.core.util.StrUtil;
+import com.zd.common.core.utils.StringUtils;
 import com.zd.model.domain.DTO.UserPhoneInfo;
 import com.zd.common.core.annotation.Log;
 import com.zd.common.core.annotation.PreAuthorize;
@@ -248,7 +249,10 @@ public class LabSubjectController extends BaseController {
     @Log(title = "实验室", businessType = BusinessType.UPDATE)
     @PostMapping("/editSort")
     public ResultData editSort(@RequestBody LabSubject labSubject) {
-        return ResultData.success();
+        if(StringUtils.isNull(labSubject) || StringUtils.isNull(labSubject.getId())){
+            ResultData.fail("参数异常！");
+        }
+        return ResultData.success(labSubjectService.editSort(labSubject));
     }
 
 

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

@@ -218,7 +218,9 @@ public class WarningNoticeLogController extends AbstractController {
         queryWrapper.eq(WarningNoticeLog::getWarningType,3);
         //queryWrapper.gt(WarningNoticeLog::getCreateTime,LocalDateTime.now().minusMonths(1)).lt(WarningNoticeLog::getCreateTime,LocalDateTime.now()).orderByDesc(WarningNoticeLog::getCreateTime);
         queryWrapper.between(WarningNoticeLog::getCreateTime,LocalDateTime.now().minusMonths(1),LocalDateTime.now()).orderByDesc(WarningNoticeLog::getCreateTime);
-        return ResultData.success(warningNoticeLogService.list(queryWrapper));
+        Page page = warningNoticeLogService.page(new Page(1, 20),queryWrapper);
+        List<WarningNoticeLog> records = page.getRecords();
+        return ResultData.success(records);
     }
 
 }

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

@@ -510,7 +510,7 @@ public class BigViewController extends BaseController {
                     if(vo.getId().equals(suvo.getId())){
                         vo.setBuildName(suvo.getBuildName());
                         vo.setFloorName(suvo.getFloorName());
-                        vo.setRoomName(suvo.getRoomName());
+                        vo.setRoom(suvo.getRoom());
                         vo.setRiskName(suvo.getRiskName());
                         vo.setRemark("1");//预案
                     }
@@ -532,7 +532,7 @@ public class BigViewController extends BaseController {
                 subjectControllerVO.setName(warning.getSubName());
                 subjectControllerVO.setBuildName(warning.getBuildName());
                 subjectControllerVO.setFloorName(warning.getFloorName());
-                subjectControllerVO.setRoomName(warning.getRoomNum());
+                subjectControllerVO.setRoom(warning.getRoomNum());
                 subjectControllerVO.setRemark("2");//气瓶
                 subjectControllerVO.setRiskName(warning.getWarningContent()+": "+warning.getName());
                 list.add(subjectControllerVO);

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

@@ -7,6 +7,8 @@ import com.zd.model.enums.HazardTypeEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
+import java.util.List;
+
 /**
  * 危险源和实验室关联对象 lab_hazard_subject_relation
  *
@@ -130,6 +132,8 @@ public class LabHazardSubjectRelation extends BaseEntity {
      */
     private Integer totalNum;
 
+    List<LabHazardSubjectRelation> relationList;
+
     public HazardTypeEnum getHazardType() {
         return hazardType;
     }
@@ -251,4 +255,12 @@ public class LabHazardSubjectRelation extends BaseEntity {
     public void setTotalNum(Integer totalNum) {
         this.totalNum = totalNum;
     }
+
+    public List<LabHazardSubjectRelation> getRelationList() {
+        return relationList;
+    }
+
+    public void setRelationList(List<LabHazardSubjectRelation> relationList) {
+        this.relationList = relationList;
+    }
 }

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

@@ -2,6 +2,7 @@ package com.zd.laboratory.domain;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
@@ -146,6 +147,7 @@ public class WarningNoticeLog extends Model<WarningNoticeLog> {
 
     @ApiModelProperty("创建时间")
     @TableField(fill = FieldFill.INSERT)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime createTime;
 
     @ApiModelProperty("修改人名称")

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

@@ -409,4 +409,11 @@ public interface ILabSubjectService {
      * @return
      */
     List<UserPhoneInfo> selectAdminAndSafeAdminById(Long subId);
+
+    /***
+     * 实验室排序修改
+     * @param labSubject
+     * @return
+     */
+    int  editSort(LabSubject labSubject);
 }

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

@@ -1010,4 +1010,14 @@ public class LabSubjectServiceImpl implements ILabSubjectService {
         }
         return userPhoneInfoList;
     }
+
+    /***
+     * 实验室排序修改
+     * @param labSubject
+     * @return
+     */
+    @Override
+    public int editSort(LabSubject labSubject) {
+        return labSubjectMapper.updateLabSubject(labSubject);
+    }
 }