李进 пре 2 година
родитељ
комит
fd09886a16

+ 5 - 0
device-api-service/src/main/java/com/xy/entity/DeviceStatus.java

@@ -141,6 +141,11 @@ public class DeviceStatus {
      */
     private Integer cameraRSecondState;
 
+    /**
+     * 锁机状态
+     */
+    private Integer deviceState;
+
     /**
      * 更新时间
      */

+ 7 - 0
device-api-service/src/main/java/com/xy/mapper/DeviceStatusMapper.java

@@ -2,6 +2,7 @@ package com.xy.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.xy.entity.DeviceStatus;
+import com.xy.mapper.entity.DeviceStatusCount;
 
 /**
  * <p>
@@ -13,4 +14,10 @@ import com.xy.entity.DeviceStatus;
  */
 public interface DeviceStatusMapper extends BaseMapper<DeviceStatus> {
 
+    /**
+     * 统计状态数量
+     *
+     * @return
+     */
+    DeviceStatusCount statusCount();
 }

+ 36 - 0
device-api-service/src/main/java/com/xy/mapper/entity/DeviceStatusCount.java

@@ -0,0 +1,36 @@
+package com.xy.mapper.entity;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+public class DeviceStatusCount {
+
+    /**
+     * 运营状态数量
+     */
+    private Integer busyState;
+
+    /**
+     * 联网状态数量
+     */
+    private Integer netState;
+
+    /**
+     * 锁机状态数量
+     */
+    private Integer deviceState;
+
+    /**
+     * 激活状态数量
+     */
+    private Integer activeState;
+
+
+    /**
+     * 温控仪状态数量
+     */
+    private Integer tempState;
+
+}

+ 8 - 0
device-api-service/src/main/java/com/xy/service/DeviceStatusServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xy.dto.DeviceStatusDto;
 import com.xy.entity.DeviceStatus;
 import com.xy.mapper.DeviceStatusMapper;
+import com.xy.mapper.entity.DeviceStatusCount;
 import com.xy.utils.Emptys;
 import com.xy.utils.MybatisPlusQuery;
 import com.xy.utils.R;
@@ -63,4 +64,11 @@ public class DeviceStatusServiceImpl extends ServiceImpl<DeviceStatusMapper, Dev
         List<DeviceStatus> list = list(lambdaQueryWrapper);
         return R.ok(copy(DeviceStatusDto.Vo.class, list));
     }
+
+    @PostMapping("statusCount")
+    @ApiOperation("统计状态数量")
+    public R<DeviceStatusCount> statusCount() {
+        DeviceStatusCount deviceStatusCount = baseMapper.statusCount();
+        return R.ok(deviceStatusCount);
+    }
 }

+ 16 - 0
device-api-service/src/main/resources/mapper/DeviceStatusMapper.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xy.mapper.DeviceStatusMapper">
+
+    <!-- 统计状态数量 -->
+    <select id="statusCount" resultType="com.xy.mapper.entity.DeviceStatusCount">
+        select
+        (select count(*) busy_state from device_info where busy_state = 1) busyState,
+        (select count(*) net_state from device_status where net_state = 0) netState,
+        (select count(*) device_state from device_status where device_state = 1) deviceState,
+        (select count(*) active_state from device_info where active_state = 1) activeState,
+
+        (select count(*) temp_state from device_status where temp_state = 1) tempState
+        from dual
+    </select>
+</mapper>

+ 3 - 0
device-api/src/main/java/com/xy/dto/DeviceStatusDto.java

@@ -112,6 +112,9 @@ public class DeviceStatusDto {
         @ApiModelProperty("右柜副摄像头状态")
         private Integer cameraRSecondState;
 
+        @ApiModelProperty("锁机状态")
+        private Integer deviceState;
+
         @ApiModelProperty("更新时间")
         @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
         private LocalDateTime updateTime;