设备详情V1

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

@@ -58,8 +58,8 @@ public class BusDeviceAlarmTest {
     public void test003(){
         DeviceAlarmQuery query = new DeviceAlarmQuery();
         query.setHositalName("驼人医疗器械有限公司");
-        query.setTenantId("1");
-        // System.out.println(controller.deviceUse(query));
+     //   query.setTenantId("1");
+        System.out.println(controller.deviceUse("1",query));
     }
 
     @Test
@@ -91,7 +91,7 @@ public class BusDeviceAlarmTest {
 //        busDeviceAlarmEntity.setAlarm(Boolean.TRUE);
         // busDeviceAlarmEntity.setAlarmState(DeviceAlarmEnum.Bubble);
         //busDeviceAlarmEntity.setWarnAnalgesicPoor(1==1);
-        busDeviceAlarmEntity.setRunState(DeviceStatusEnum.NoSignal);
+        //busDeviceAlarmEntity.setRunState(DeviceStatusEnum.NoSignal);
         //busDeviceAlarmEntity.setWarnFlow(FlowStatusEnum.Lowest);
         System.out.println(controller.deviceUseDetail("1",busDeviceAlarmEntity));
     }

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

@@ -18,8 +18,7 @@ import java.util.Map;
 @ApiModel("设备数量")
 @Data
 public class DeviceUse implements Serializable {
-    @ApiModelProperty(value = "医院id",hidden = true)
-    @JsonIgnore
+    @ApiModelProperty(value = "医院id")
     private String tenantId;
 
     /**