add 设备使用管理数量统计

coffee-system/src/main/java/com/coffee/bus/controller/BusDeviceManualController.java

@@ -1,6 +1,7 @@
 package com.coffee.bus.controller;
 
 import cn.dev33.satoken.SaManager;
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.stp.StpLogic;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.mapper.Mapper;
@@ -40,6 +41,7 @@ public class BusDeviceManualController {
     private final LocalBusDeviceManualService deviceManualService;
 
     @PostMapping("/edit")
+    @SaCheckPermission("device:manual:edit")
     @ApiOperation(value = "编辑病人信息",notes = "编辑病人信息,权限【device:manual:edit】")
     public R edit(@RequestBody DeviceManualVo entity){
 //        deviceManualService.update(entity.getManual(),entity.getClinic());
@@ -47,6 +49,7 @@ public class BusDeviceManualController {
     }
 
     @PostMapping("/save")
+    @SaCheckPermission("device:manual:save")
     @ApiOperation(value = "新增病人信息",notes = "新增病人信息,权限【device:manual:save】")
     public R save(@RequestBody DeviceManualVo entity){
         deviceManualService.save(entity.getManual(),entity.getClinic());
@@ -54,6 +57,7 @@ public class BusDeviceManualController {
     }
 
     @PostMapping("/no_page")
+    @SaCheckPermission("device:manual:query")
     @ApiOperation(value = "查询其他监控输注列表，不分页",notes = "新增病人信息,权限【device:manual:query】")
     public R<List<ManualMonitorResult>> list(@RequestBody ManualMonitorQuery query){
         return R.success(deviceManualService.selectMonitor(query));

coffee-system/src/main/java/com/coffee/bus/controller/BusDeviceRunningController.java

@@ -80,6 +80,7 @@ public class BusDeviceRunningController implements BaseQueryController<BusDevice
     }
 
 
+    
 
 
     /**

coffee-system/src/main/java/com/coffee/bus/entity/BusDeviceAlarmEntity.java

@@ -1,7 +1,10 @@
 package com.coffee.bus.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.coffee.bus.enums.DeviceAlarmEnum;
+import com.coffee.bus.enums.FlowStatusEnum;
 import com.coffee.common.entity.TenantGenericEntity;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import io.swagger.annotations.ApiModel;

coffee-system/src/main/java/com/coffee/bus/entity/BusHospitalEntity.java

@@ -69,6 +69,45 @@ public class BusHospitalEntity implements RecordModifierEntity, RecordCreationEn
     @TableField(typeHandler = FastjsonTypeHandler.class )
     private GeoPoint coordinate;
 
+    @TableField(typeHandler = FastjsonTypeHandler.class)
+    private Script script;
+
+    @ApiModelProperty("设备数量")
+    private Integer deviceCount;
+
+    @ApiModelProperty("气泡报警数量")
+    private Integer bubbleCount;
+
+    @ApiModelProperty("堵塞报警数量")
+    private Integer jamCount;
+
+    @ApiModelProperty("极限报警数量")
+    private Integer limitCount;
+
+    @ApiModelProperty("未装药盒报警数量")
+    private Integer noBoxCount;
+
+    @ApiModelProperty("电机失控报警数量")
+    private Integer outOfControlCount;
+
+    @ApiModelProperty("镇痛不足提醒数量")
+    private Integer warnAnalgesicPoorCount;
+
+    @ApiModelProperty(" 不在服务区数量")
+    private Integer noSignalCount;
+
+    @ApiModelProperty(" 机械报警数量")
+    private Integer machineCount;
+
+    @ApiModelProperty("电量耗尽报警数量")
+    private Integer lowBatteryCount;
+
+    @ApiModelProperty("低输注报警数量")
+    private Integer lowestCount;
+
+    @ApiModelProperty("返厂维护报警数量")
+    private Integer maintainCount;
+
     @TableField(fill = FieldFill.INSERT)
     private String createBy;
 
@@ -85,9 +124,6 @@ public class BusHospitalEntity implements RecordModifierEntity, RecordCreationEn
     @TableLogic(value = "0",delval = "1")
     private Integer isDelete;
 
-    @TableField(typeHandler = FastjsonTypeHandler.class)
-    private Script script;
-
     @Data
     public static class  GeoPoint{
         private String lon;

coffee-system/src/main/java/com/coffee/bus/entity/common/CommonDeviceParam.java

@@ -4,20 +4,11 @@ import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.coffee.bus.enums.DeviceAlarmEnum;
 import com.coffee.bus.enums.DeviceStatusEnum;
-import com.coffee.bus.enums.DeviceTypeEnum;
 import com.coffee.bus.enums.FlowStatusEnum;
-import com.coffee.common.entity.TenantGenericEntity;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
-import javax.validation.constraints.DecimalMax;
-import javax.validation.constraints.DecimalMin;
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import java.math.BigDecimal;
-
 /**
  * @author lifang
  * @version 1.0.0
@@ -38,16 +29,19 @@ public class CommonDeviceParam<PK,TN>  extends DeviceProperties<PK,TN>  {
     private DeviceAlarmEnum alarm;
 
     @ApiModelProperty(value = "输注即将结束提醒",readOnly = true)
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private Boolean warnWillFinished;
 
     @ApiModelProperty(value = "镇痛不足提醒",readOnly = true)
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private Boolean warnAnalgesicPoor;
 
     @ApiModelProperty(value = "电量偏低提醒",readOnly = true)
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private Boolean warnLowBattery;
 
     @ApiModelProperty(value = "加减档提示",readOnly = true)
-    @TableField(updateStrategy = FieldStrategy.DEFAULT)
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private FlowStatusEnum warnFlow;
 
 }

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

@@ -175,7 +175,12 @@ public class LocalBusPatientService extends BaseService<BusPatientMapper, BusPat
      * @param tenantId 医院id
      * @return
      */
-    public PatientMonitorResult lookMonitorByPatientCode(String patientCode,String tenantId){
-        return this.baseMapper.findByPatientCode(tenantId,patientCode);
+    public PatientMonitorResult lookMonitorByPatientCode(String patientCode,String tenantId) {
+        try {
+            return this.baseMapper.findByPatientCode(tenantId, patientCode);
+        } catch (Exception e) {
+            log.error("根据病号查询临床失败,",e.getMessage());
+            return null;
+        }
     }
 }

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

@@ -0,0 +1,31 @@
+package com.coffee.bus.service.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author lifang
+ * @version 1.0.0
+ * @ClassName DeviceStatusStatsCountResult.java
+ * @Description 设备状态数量统计结果
+ * @createTime 2022年05月08日 18:21:00
+ */
+@ApiModel("设备状态数量统计结果")
+@Data
+public class DeviceStatusStatsCountResult {
+    @ApiModelProperty("全部数量")
+    private int totalCount;
+
+    @ApiModelProperty("运行数量")
+    private int runningCount;
+
+    @ApiModelProperty("待结束数量")
+    private int waitingFinish;
+
+    @ApiModelProperty("报警数量")
+    private int alarmCount;
+
+    @ApiModelProperty("提醒数量")
+    private int warnCount;
+}