概况统计相关

device-api-service/src/main/java/com/xy/mapper/DeviceDataMapper.java

@@ -2,6 +2,7 @@ package com.xy.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.xy.dto.DeviceDataDto;
+import com.xy.dto.DeviceFaultInfoDto;
 import com.xy.entity.DeviceData;
 import org.apache.ibatis.annotations.Param;
 
@@ -23,4 +24,12 @@ public interface DeviceDataMapper extends BaseMapper<DeviceData> {
             , @Param("endDateInt") Integer endDateInt
             , @Param("type") String type
     );
+
+    /**
+     * 根据事件编码分组统计故障已解决、未解决设备数
+     * @return {@link DeviceFaultInfoDto.CountByDeviceVO}
+     */
+    List<DeviceFaultInfoDto.CountByDeviceVO> deviceFaultInfoCount(  );
+
 }
+

device-api-service/src/main/java/com/xy/service/DeviceFaultInfoServiceImpl.java

@@ -3,6 +3,7 @@ package com.xy.service;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -17,7 +18,9 @@ import com.xy.dto.be.MercDto;
 import com.xy.entity.DeviceFaultInfo;
 import com.xy.entity.DeviceFaultLog;
 import com.xy.entity.DeviceInfo;
+import com.xy.entity.SysCodeConfigureRedis;
 import com.xy.error.CommRuntimeException;
+import com.xy.mapper.DeviceDataMapper;
 import com.xy.mapper.DeviceFaultInfoMapper;
 import com.xy.service.be.MercService;
 import com.xy.utils.*;
@@ -57,7 +60,27 @@ public class DeviceFaultInfoServiceImpl extends ServiceImpl<DeviceFaultInfoMappe
     private final DeviceInfoServiceImpl deviceInfoService;
     private final DeviceFaultInfoFlowServiceImpl deviceFaultInfoFlowService;
     private final SysWorkUserService sysWorkUserService;
+    private final DeviceDataMapper deviceDataMapper;
 
+    @PostMapping("countToDo")
+    @ApiOperation("待处理设备故障统计")
+    public R<Long> countToDo() {
+        long count = count(Wrappers.<DeviceFaultInfo>lambdaQuery().eq(DeviceFaultInfo::getState, 0));
+        return R.ok(count);
+    }
+
+    @PostMapping("countByDevice")
+    @ApiOperation("按故障类型统计设备数")
+    public R<List<DeviceFaultInfoDto.CountByDeviceVO>> countByDevice() {
+        List<DeviceFaultInfoDto.CountByDeviceVO> list = deviceDataMapper.deviceFaultInfoCount();
+        list.forEach(d->{
+            SysCodeConfigureRedis s = SysCodeConfigureUtils.get(d.getEventCode());
+            if(s!=null){
+                d.setEventName(s.getTitle());
+            }
+        });
+        return R.ok(list);
+    }
     @PostMapping("obj")
     @ApiOperation("对象查询")
     public R<DeviceFaultInfoDto.Vo> obj(@RequestBody DeviceFaultInfoDto.Vo vo) {

device-api-service/src/main/resources/mapper/DeviceDataMapper.xml

@@ -9,4 +9,20 @@
           and date_value BETWEEN #{beginDateInt} and #{endDateInt}
         GROUP BY date_value
     </select>
+
+
+    <select id="deviceFaultInfoCount" resultType="com.xy.dto.DeviceFaultInfoDto$CountByDeviceVO">
+            SELECT
+            event_code eventCode,
+            sum( state = '0'  ) todoNum,
+            sum( state = '1'   ) doneNum
+        FROM
+            device_fault_info
+        GROUP BY
+            event_code
+
+
+    </select>
+
+
 </mapper>

device-api/src/main/java/com/xy/dto/DeviceFaultInfoDto.java

@@ -53,6 +53,19 @@ public class DeviceFaultInfoDto {
 
     }
 
+    @Data
+    @Accessors(chain = true)
+    public static class CountByDeviceVO {
+        @ApiModelProperty(value = "事件编码")
+        private String eventCode;
+        @ApiModelProperty(value = "事件名称")
+        private String eventName;
+        @ApiModelProperty(value = "待解决数量")
+        private String todoNum;
+        @ApiModelProperty(value = "已解决数量")
+        private String doneNum;
+    }
+
     @Data
     @Accessors(chain = true)
     public static class Vo {