设备使用更新 v3

coffee-admin/src/test/java/com/coffee/admin/BusDeviceAlarmTest.java

@@ -52,6 +52,9 @@ public class BusDeviceAlarmTest {
 
     @Test
     public void test003(){
-        System.out.println(controller.deviceUse(new DeviceAlarmQuery()));
+        DeviceAlarmQuery query = new DeviceAlarmQuery();
+        query.setHositalName("驼人医疗器械有限公司");
+        query.setTenantId("1");
+        System.out.println(controller.deviceUse(query));
     }
 }

coffee-system/src/main/java/com/coffee/bus/service/LocalBusDeviceAlarmService.java

@@ -77,10 +77,18 @@ public class LocalBusDeviceAlarmService extends BaseService<BusDeviceAlarmMapper
     @Transactional(rollbackFor = Exception.class)
     public List<DeviceUse> selectCountAlarm(DeviceAlarmQuery query){
         QueryWrapper<BusHospitalEntity> busHospitalEntityQueryWrapper = new QueryWrapper<>();
+        if(busHospitalEntityQueryWrapper.getEntity() == null) {
+            BusHospitalEntity hospitalEntity = new BusHospitalEntity();
+            busHospitalEntityQueryWrapper.setEntity(hospitalEntity);
+        }
         if(query.getHositalName()!=null){
             busHospitalEntityQueryWrapper.getEntity().setName(query.getHositalName());
         }
+        if(query.getTenantId()!=null){
+            busHospitalEntityQueryWrapper.getEntity().setId(query.getTenantId());
+        }
         List<BusHospitalEntity> hospitalEntities = hospitalMapper.selectList(busHospitalEntityQueryWrapper);
+
         List<DeviceUse> deviceUseList = new ArrayList<>();
 
         // 获取 报警所有信息数量
@@ -93,10 +101,18 @@ public class LocalBusDeviceAlarmService extends BaseService<BusDeviceAlarmMapper
             Map<String, String> map = alarmMap.get(deviceAlarmResult.getTenantId());
             if(map == null){
                 map = new HashMap<>();
+                for (DeviceAlarmEnum deviceAlarmEnum:
+                DeviceAlarmEnum.values()) {
+                    map.put(deviceAlarmEnum.toString(),"0");
+                }
             }
-            map.put(deviceAlarmResult.toString(),deviceAlarmResult.getAlarmCount());
+            map.put(deviceAlarmResult.getAlarmState().toString(),deviceAlarmResult.getAlarmCount());
             alarmMap.put(deviceAlarmResult.getTenantId(),map);
         }
+
+
+
+
         // 获取告警信息
         List<DeviceWarnCountResult> warnResults = busDeviceAlarmMapper.selectWarnCount(query);
         //处理告警信息
@@ -105,6 +121,10 @@ public class LocalBusDeviceAlarmService extends BaseService<BusDeviceAlarmMapper
             Map<String, String> map = alarmMap.get(deviceWarnCountResult.getTenantId());
             if(map == null){
                 map = new HashMap<>();
+                for (DeviceAlarmEnum deviceAlarmEnum:
+                        DeviceAlarmEnum.values()) {
+                    map.put(deviceAlarmEnum.toString(),"0");
+                }
             }
             map.put("warnWillFinished",deviceWarnCountResult.getWarnWillFinished());
             map.put("warnLowBattery",deviceWarnCountResult.getWarnLowBattery());
@@ -113,13 +133,27 @@ public class LocalBusDeviceAlarmService extends BaseService<BusDeviceAlarmMapper
 
             alarmMap.put(deviceWarnCountResult.getTenantId(),map);
         }
-        System.out.println("++"+alarmMap.get(1));
+
         // 遍历医院
         for (BusHospitalEntity hospital:hospitalEntities
              ) {
             DeviceUse deviceUse = new DeviceUse();
+            deviceUse.setTenantId(hospital.getId());
             deviceUse.setAddress(hospital.getAddress());
             deviceUse.setName(hospital.getName());
+            Map<String, String> map = alarmMap.get(hospital.getId());
+            if (map == null){
+                map = new HashMap<>();
+                for (DeviceAlarmEnum deviceAlarmEnum:
+                        DeviceAlarmEnum.values()) {
+                    map.put(deviceAlarmEnum.toString(),"0");
+                }
+                map.put("warnWillFinished","0");
+                map.put("warnLowBattery","0");
+                map.put("warnAnalgesicPoor","0");
+
+            }
+            deviceUse.setMap(map);
             deviceUseList.add(deviceUse);
         }
 

coffee-system/src/main/java/com/coffee/bus/service/dto/DeviceAlarmQuery.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.coffee.bus.enums.DeviceAlarmEnum;
 import com.coffee.bus.enums.DeviceTypeEnum;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -30,6 +31,7 @@ public class DeviceAlarmQuery implements Serializable {
     @ApiModelProperty(value = "设备唯一编码")
     private String deviceId;
 
+    @Length(max = 255,message = "医院名称长度不得超过255个字节")
     @ApiModelProperty(value = "医院名称")
     private String hositalName;
 
@@ -56,7 +58,8 @@ public class DeviceAlarmQuery implements Serializable {
     @ApiModelProperty(value = "设备类型")
     private Integer type;
 
-    @ApiModelProperty(value = "医院ID")
+    @ApiModelProperty(value = "医院id",hidden = true)
+    @JsonIgnore
     private String tenantId;
 
 }

coffee-system/src/main/java/com/coffee/bus/service/dto/DeviceUse.java

@@ -1,6 +1,7 @@
 package com.coffee.bus.service.dto;
 
 import com.coffee.bus.enums.DeviceAlarmEnum;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import jnr.ffi.annotations.In;
@@ -22,6 +23,10 @@ import java.util.Map;
 @ApiModel("设备数量")
 @Data
 public class DeviceUse implements Serializable {
+    @ApiModelProperty(value = "医院id",hidden = true)
+    @JsonIgnore
+    private String tenantId;
+
     /**
      * 医院地址
      */
@@ -36,6 +41,6 @@ public class DeviceUse implements Serializable {
 
 
     @ApiModelProperty(value = "报警数量")
-    private List<DeviceAlarmCountResult> list;
+    private Map<String,String> map;
 
 }