Merge branch 'master' into lcy

ruoyi-demo/src/main/java/com/ruoyi/demo/controller/EquipmentController.java

@@ -170,8 +170,8 @@ public class EquipmentController {
      */
     @GetMapping("/getEquipmentCount")
     public R getEquipmentCount(){
-        int count = equipmentService.getEquipmentCount();
-        return R.ok(count);
+        HashMap equipmentCount = equipmentService.getEquipmentCount();
+        return R.ok(equipmentCount);
     }
 
     /**

ruoyi-demo/src/main/java/com/ruoyi/demo/converter/LocalDateTimeConverter.java

@@ -0,0 +1,21 @@
+package com.ruoyi.demo.converter;
+
+import org.springframework.core.convert.converter.Converter;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+
+/*1.String 转换 LocalDateTime*/
+@Component
+public class LocalDateTimeConverter implements Converter<String, LocalDateTime> {
+    @Override
+    public LocalDateTime convert(String s) {
+        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        LocalDateTime parse = LocalDateTime.parse(s, dateTimeFormatter);
+        LocalDateTime localDateTime1 = parse.atZone(ZoneId.of("Asia/Shanghai")).toLocalDateTime();
+        return localDateTime1;
+    }
+
+}

ruoyi-demo/src/main/java/com/ruoyi/demo/service/EquipmentService.java

@@ -33,7 +33,7 @@ public interface EquipmentService {
 
     void updateEquipmentPlan(PlanItemVo planItemVo);
 
-    int getEquipmentCount();
+    HashMap getEquipmentCount();
 
     HashMap getEquipmentList(EquipmentVo equipmentVo);
 

ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/EquipmentServiceImpl.java

@@ -293,8 +293,19 @@ public class EquipmentServiceImpl implements EquipmentService {
     }
 
     @Override
-    public int getEquipmentCount() {
-        return Math.toIntExact(equipmentMapper.selectCount(null));
+    public HashMap getEquipmentCount() {
+        QueryWrapper<Equipment> queryWrapper = new QueryWrapper<>();
+        queryWrapper.select("state","count(*) as onState");
+        queryWrapper.groupBy("state");
+        List<Equipment> equipment = equipmentMapper.selectList(queryWrapper);
+        HashMap<String, Integer> objectObjectHashMap = new HashMap<>();
+        int total = 0;
+        for (Equipment equipment1 : equipment) {
+            objectObjectHashMap.put(String.valueOf(equipment1.getState()),equipment1.getOnState());
+            total+=equipment1.getOnState();
+        }
+        objectObjectHashMap.put("total",total);
+        return objectObjectHashMap;
     }
 
     @Override