设备使用详情

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

@@ -2,7 +2,11 @@ package com.coffee.admin;
 
 import com.coffee.bus.controller.BusDeviceController;
 import com.coffee.bus.controller.BusDeviceHistoryController;
+import com.coffee.bus.entity.BusDeviceAlarmEntity;
 import com.coffee.bus.entity.BusDeviceEntity;
+import com.coffee.bus.enums.DeviceAlarmEnum;
+import com.coffee.bus.enums.DeviceStatusEnum;
+import com.coffee.bus.enums.FlowStatusEnum;
 import com.coffee.bus.mapper.BusDeviceAlarmMapper;
 import com.coffee.bus.service.LocalBusDeviceAlarmService;
 import com.coffee.bus.service.dto.DeviceAlarmQuery;
@@ -55,6 +59,40 @@ public class BusDeviceAlarmTest {
         DeviceAlarmQuery query = new DeviceAlarmQuery();
         query.setHositalName("驼人医疗器械有限公司");
         query.setTenantId("1");
-//        System.out.println(controller.deviceUse(query));
+        // System.out.println(controller.deviceUse(query));
+    }
+
+    @Test
+    public void test004(){
+
+        BusDeviceAlarmEntity busDeviceAlarmEntity = new BusDeviceAlarmEntity();
+//        busDeviceAlarmEntity.setAlarm(Boolean.TRUE);
+        // busDeviceAlarmEntity.setAlarmState(DeviceAlarmEnum.Bubble);
+        //busDeviceAlarmEntity.setWarnAnalgesicPoor(1==1);
+        busDeviceAlarmEntity.setRunState(DeviceStatusEnum.NoSignal);
+//        busDeviceAlarmEntity.setWarnFlow(FlowStatusEnum.Lowest);
+        System.out.println(busDeviceAlarmMapper.selectDeviceCount(busDeviceAlarmEntity));
+    }
+    @Test
+    public void test005(){
+
+        BusDeviceAlarmEntity busDeviceAlarmEntity = new BusDeviceAlarmEntity();
+//        busDeviceAlarmEntity.setAlarm(Boolean.TRUE);
+        // busDeviceAlarmEntity.setAlarmState(DeviceAlarmEnum.Bubble);
+        //busDeviceAlarmEntity.setWarnAnalgesicPoor(1==1);
+        busDeviceAlarmEntity.setRunState(DeviceStatusEnum.NoSignal);
+        //busDeviceAlarmEntity.setWarnFlow(FlowStatusEnum.Lowest);
+        System.out.println(service.selectUseDetail(busDeviceAlarmEntity));
+    }
+    @Test
+    public void test006(){
+
+        BusDeviceAlarmEntity busDeviceAlarmEntity = new BusDeviceAlarmEntity();
+//        busDeviceAlarmEntity.setAlarm(Boolean.TRUE);
+        // busDeviceAlarmEntity.setAlarmState(DeviceAlarmEnum.Bubble);
+        //busDeviceAlarmEntity.setWarnAnalgesicPoor(1==1);
+        busDeviceAlarmEntity.setRunState(DeviceStatusEnum.NoSignal);
+        //busDeviceAlarmEntity.setWarnFlow(FlowStatusEnum.Lowest);
+        System.out.println(controller.deviceUseDetail("1",busDeviceAlarmEntity));
     }
 }

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

@@ -4,10 +4,12 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.mapper.Mapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.coffee.bus.entity.BusDeviceAlarmEntity;
 import com.coffee.bus.entity.BusDeviceHistoryEntity;
 import com.coffee.bus.service.LocalBusDeviceAlarmService;
 import com.coffee.bus.service.LocalBusDeviceHistoryService;
 import com.coffee.bus.service.dto.DeviceAlarmQuery;
+import com.coffee.bus.service.dto.DeviceCountResult;
 import com.coffee.bus.service.dto.DeviceHistoryQuery;
 import com.coffee.bus.service.dto.DeviceUse;
 import com.coffee.common.crud.BaseService;
@@ -63,6 +65,16 @@ public class BusDeviceHistoryController extends BaseCrudController<BusDeviceHist
         return R.success(deviceAlarmService.selectCountAlarm(query));
     }
 
+    @PostMapping("/deviceUseDetail")
+    @SaCheckPermission("bus:device:useDetail")
+    @ApiOperation(value = "设备使用详情",notes = "权限：【bus:device:useDetail】")
+    public R<List<DeviceCountResult>> deviceUseDetail(@RequestAttribute(value = "tenantId",required = false)@ApiParam(hidden = true) String tenantId, @RequestBody @Validated BusDeviceAlarmEntity query){
+        if(!StrUtil.isNullOrUndefined(tenantId)){
+            query.setTenantId(tenantId);
+        }
+        return R.success(deviceAlarmService.selectUseDetail(query));
+    }
+
     @Override
     public BaseService<? extends Mapper<BusDeviceHistoryEntity>, BusDeviceHistoryEntity, String> getService() {
         return historyService;

coffee-system/src/main/java/com/coffee/bus/mapper/BusDeviceAlarmMapper.java

@@ -5,10 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.coffee.bus.entity.BusClinicEntity;
 import com.coffee.bus.entity.BusDeviceAlarmEntity;
-import com.coffee.bus.service.dto.AlarmQuery;
-import com.coffee.bus.service.dto.DeviceAlarmCountResult;
-import com.coffee.bus.service.dto.DeviceAlarmQuery;
-import com.coffee.bus.service.dto.DeviceWarnCountResult;
+import com.coffee.bus.service.dto.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -30,4 +27,6 @@ public interface BusDeviceAlarmMapper extends BaseMapper<BusDeviceAlarmEntity> {
     List<DeviceAlarmCountResult> selectAlarmCount(@Param("query") DeviceAlarmQuery query);
 
     List<DeviceWarnCountResult> selectWarnCount(@Param("query") DeviceAlarmQuery query);
+
+    List<DeviceCountResult> selectDeviceCount(@Param("query") BusDeviceAlarmEntity query);
 }

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

@@ -161,5 +161,14 @@ public class LocalBusDeviceAlarmService extends BaseService<BusDeviceAlarmMapper
         return deviceUseList;
 
     }
+    /**
+     * 查看报警数量
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public List<DeviceCountResult> selectUseDetail(BusDeviceAlarmEntity query){
+
+        return busDeviceAlarmMapper.selectDeviceCount(query);
+
+    }
 
 }

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

@@ -0,0 +1,26 @@
+package com.coffee.bus.service.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author zsl
+ * @version 1.0.0
+ * @ClassName DeviceCountResult.java
+ * @Description TODO
+ * @createTime 2022/6/910:36
+ */
+
+@Data
+@ApiModel("设备详情查询结果")
+public class DeviceCountResult implements Serializable {
+
+    @ApiModelProperty(value = "设备ID")
+    private String deviceId;
+
+    @ApiModelProperty(value = "报警数量")
+    private String alarmCount;
+}

coffee-system/src/main/resources/mapper/bus/BusDeviceAlarmMapper.xml

@@ -61,4 +61,37 @@
         da.alarm_state
     </select>
 
+    <select id="selectDeviceCount" parameterType="com.coffee.bus.entity.BusDeviceAlarmEntity" resultType="com.coffee.bus.service.dto.DeviceCountResult">
+        SELECT
+        da.device_id,
+        COUNT(1) as alarm_count
+        FROM
+        bus_device_alarm AS da
+        WHERE
+        1=1
+        <if test="query.alarm != null">
+            and da.alarm = #{query.alarm}
+        </if>
+        <if test="query.runState != null">
+            and da.run_state = #{query.runState}
+        </if>
+        <if test="query.alarmState != null">
+            and da.alarm_state = #{query.alarmState}
+        </if>
+        <if test="query.warnWillFinished != null">
+            and da.warn_will_finished = #{query.warnWillFinished}
+        </if>
+        <if test="query.warnAnalgesicPoor != null">
+            and da.warn_analgesic_poor = #{query.warnAnalgesicPoor}
+        </if>
+        <if test="query.warnLowBattery != null">
+            and da.warn_low_battery = #{query.warnLowBattery}
+        </if>
+        <if test="query.warnFlow != null">
+            and da.warn_flow = #{query.warnFlow}
+        </if>
+        GROUP BY
+        da.device_id
+    </select>
+
 </mapper>