feat(record): 修改母排报警记录统计方法

- 将 RecordBusbarAlarmMapper 接口中的 recordBusbarAlarmCount 方法返回类型改为 List<RecordBusbarAlarmCountResult>
- 更新 RecordBusbarAlarmServiceImpl 中的 recordBusbarAlarmCount 方法实现
- 修改数据库映射文件 RecordBusbarAlarmMapper.xml 中的 SQL 语句

ruoyi-ems/src/main/java/com/ruoyi/ems/base/service/impl/EmsBaseMonitorInfoServiceImpl.java

@@ -206,6 +206,7 @@ public class EmsBaseMonitorInfoServiceImpl implements IEmsBaseMonitorInfoService
      * @param energyType 需要查询的能源类型。
      * @return 返回指定能源类型的数量。
      */
+    @Override
     public int getEnergyTypeCount(String energyType){
         return emsBaseMonitorInfoMapper.getEnergyTypeCount(energyType);
     }

ruoyi-ems/src/main/java/com/ruoyi/ems/record/service/impl/TWTempertureDataServiceImpl.java

@@ -120,6 +120,7 @@ public class TWTempertureDataServiceImpl implements ITWTempertureDataService
      * @param tWTempertureData
      * @return
      */
+    @Override
     public List<TWTempertureData> selectLastTWTempertureDataList(TWTempertureData tWTempertureData) {
         // 按monitorName分组并获取每个分组的最新记录
         return tWTempertureDataMapper.selectLastTWTempertureDataList(tWTempertureData);
@@ -130,6 +131,7 @@ public class TWTempertureDataServiceImpl implements ITWTempertureDataService
    * @param tWTempertureData 需要查询的温度数据对象。
    * @return 如果数据库中存在对应的温度数据，返回包含最新数据的列表；如果不存在或查询过程中发生异常，返回空列表。
    */
+  @Override
   public List<TWTempertureData> selectLastTWTempertureData(TWTempertureData tWTempertureData) {
       try {
           // 从数据库中查询温度数据列表
@@ -168,14 +170,14 @@ public class TWTempertureDataServiceImpl implements ITWTempertureDataService
   }
 
 
-/**
+    /**
      * 将源对象中指定字段的值设置到目标对象的相应字段中，如果该值不为空且目标对象的对应字段为空。
      *
      * @param source 源对象，从中获取字段值
      * @param target 目标对象，将字段值设置到此对象中
      * @param fieldName 要操作的字段名称
      */
-private void setIfNotNull(TWTempertureData source, TWTempertureData target, String fieldName) {
+    private void setIfNotNull(TWTempertureData source, TWTempertureData target, String fieldName) {
         try {
             // 获取源对象中指定字段的getter方法
             Method getMethod = TWTempertureData.class.getMethod("get" + capitalize(fieldName));
@@ -191,14 +193,14 @@ private void setIfNotNull(TWTempertureData source, TWTempertureData target, Stri
             // 捕获并打印异常信息
             e.printStackTrace();
         }
-}
+    }
 
-/**
+    /**
      * 设置PM值。
      * @param source 源TWTempertureData对象，用于提供PM值。
      * @param target 目标TWTempertureData对象，用于接收PM值。
      */
-private void setPmValues(TWTempertureData source, TWTempertureData target) {
+    private void setPmValues(TWTempertureData source, TWTempertureData target) {
         setIfNotNull(source, target, "pm1");
         if (target.getPm1() == null) {
             setIfNotNull(source, target, "pm2");
@@ -206,21 +208,21 @@ private void setPmValues(TWTempertureData source, TWTempertureData target) {
         if (target.getPm2() == null) {
             setIfNotNull(source, target, "pm10");
         }
-}
+    }
 
-/**
+    /**
      * 将字符串的首字母大写。
      *
      * @param str 要处理的字符串
      * @return 首字母大写的字符串，如果输入为空或长度为0，则返回原字符串
      */
-private String capitalize(String str) {
+    private String capitalize(String str) {
         // 如果字符串为null或者长度为0，直接返回原字符串
         if (str == null || str.length() == 0) {
             return str;
         }
         // 将字符串的第一个字符转换为大写，并与剩余部分拼接后返回
         return str.substring(0, 1).toUpperCase() + str.substring(1);
-}
+    }
 
 }

ruoyi-module/src/main/java/com/ruoyi/base/controller/BaseBusbarInfoController.java

@@ -101,4 +101,13 @@ public class BaseBusbarInfoController extends BaseController
     {
         return toAjax(baseBusbarInfoService.deleteBaseBusbarInfoByObjIds(objIds));
     }
+
+    /**
+     * 统计母排数量
+     */
+    @PostMapping("/countCabinet")
+    public AjaxResult countCabinet() {
+        return success(baseBusbarInfoService.countBaseBusbarInfo());
+    }
+
 }

ruoyi-module/src/main/java/com/ruoyi/base/controller/BaseCabinetInfoController.java

@@ -127,4 +127,13 @@ public class BaseCabinetInfoController extends BaseController
         return success(list);
     }
 
+    /**
+     * 统计电柜数量
+     * */
+    @PostMapping("/countCabinet")
+    public int countCabinet() {
+        return baseCabinetInfoService.countBaseCabinetInfo();
+    }
+
+
 }

ruoyi-module/src/main/java/com/ruoyi/base/mapper/BaseBusbarInfoMapper.java

@@ -58,4 +58,6 @@ public interface BaseBusbarInfoMapper
      * @return 结果
      */
     public int deleteBaseBusbarInfoByObjIds(Long[] objIds);
+
+    public int countBaseBusbarInfo();
 }

ruoyi-module/src/main/java/com/ruoyi/base/mapper/BaseCabinetInfoMapper.java

@@ -58,4 +58,6 @@ public interface BaseCabinetInfoMapper
      * @return 结果
      */
     public int deleteBaseCabinetInfoByObjIds(Long[] objIds);
+
+    public int countBaseCabinetInfo();
 }

ruoyi-module/src/main/java/com/ruoyi/base/service/IBaseBusbarInfoService.java

@@ -58,4 +58,6 @@ public interface IBaseBusbarInfoService
      * @return 结果
      */
     public int deleteBaseBusbarInfoByObjId(Long objId);
+
+    public int countBaseBusbarInfo();
 }

ruoyi-module/src/main/java/com/ruoyi/base/service/IBaseCabinetInfoService.java

@@ -68,4 +68,6 @@ public interface IBaseCabinetInfoService
      * @return 所有电柜信息信息
      */
     public List<baseCabinetInfoTreeSelects> selectCabinetInfoTreeList(BaseCabinetInfo baseCabinetInfo);
+
+    public int countBaseCabinetInfo();
 }

ruoyi-module/src/main/java/com/ruoyi/base/service/impl/BaseBusbarInfoServiceImpl.java

@@ -154,4 +154,9 @@ public class BaseBusbarInfoServiceImpl implements IBaseBusbarInfoService
     {
         return baseBusbarInfoMapper.deleteBaseBusbarInfoByObjId(objId);
     }
+
+    @Override
+    public int countBaseBusbarInfo(){
+        return baseBusbarInfoMapper.countBaseBusbarInfo();
+    }
 }

ruoyi-module/src/main/java/com/ruoyi/base/service/impl/BaseCabinetInfoServiceImpl.java

@@ -118,11 +118,17 @@ public class BaseCabinetInfoServiceImpl implements IBaseCabinetInfoService
      *
      * @return 所有电柜信息信息
      */
+    @Override
     public List<baseCabinetInfoTreeSelects> selectCabinetInfoTreeList(BaseCabinetInfo baseCabinetInfo){
         List<BaseCabinetInfo> baseCabinetInfos = baseCabinetInfoMapper.selectBaseCabinetInfoList(baseCabinetInfo);
         return baseCabinetInfos.stream().map(baseCabinetInfoTreeSelects::new).collect(Collectors.toList());
     }
 
+    @Override
+    public int countBaseCabinetInfo(){
+        return baseCabinetInfoMapper.countBaseCabinetInfo();
+    }
+
 /*
     */
 /**

ruoyi-module/src/main/java/com/ruoyi/record/mapper/RecordBusbarAlarmMapper.java

@@ -2,6 +2,7 @@ package com.ruoyi.record.mapper;
 
 import java.util.List;
 import com.ruoyi.record.domain.RecordBusbarAlarm;
+import com.ruoyi.record.domain.VO.RecordBusbarAlarmCountResult;
 
 /**
  * 巡检报警记录Mapper接口
@@ -58,4 +59,6 @@ public interface RecordBusbarAlarmMapper
      * @return 结果
      */
     public int deleteRecordBusbarAlarmByObjIds(Long[] objIds);
+
+    public  List<RecordBusbarAlarmCountResult> recordBusbarAlarmCount(RecordBusbarAlarm recordBusbarAlarm);
 }

ruoyi-module/src/main/java/com/ruoyi/record/service/IRecordBusbarAlarmService.java

@@ -2,6 +2,7 @@ package com.ruoyi.record.service;
 
 import java.util.List;
 import com.ruoyi.record.domain.RecordBusbarAlarm;
+import com.ruoyi.record.domain.VO.RecordBusbarAlarmCountResult;
 
 /**
  * 巡检报警记录Service接口
@@ -59,5 +60,5 @@ public interface IRecordBusbarAlarmService
      */
     public int deleteRecordBusbarAlarmByObjId(Long objId);
 
-    int recordBusbarAlarmCount(RecordBusbarAlarm recordBusbarAlarm);
+    public List<RecordBusbarAlarmCountResult> recordBusbarAlarmCount(RecordBusbarAlarm recordBusbarAlarm);
 }

ruoyi-module/src/main/java/com/ruoyi/record/service/impl/RecordBusbarAlarmServiceImpl.java

@@ -1,6 +1,8 @@
 package com.ruoyi.record.service.impl;
 
 import java.util.List;
+
+import com.ruoyi.record.domain.VO.RecordBusbarAlarmCountResult;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.record.mapper.RecordBusbarAlarmMapper;
@@ -90,4 +92,10 @@ public class RecordBusbarAlarmServiceImpl implements IRecordBusbarAlarmService
     {
         return recordBusbarAlarmMapper.deleteRecordBusbarAlarmByObjId(objId);
     }
+
+
+    @Override
+    public  List<RecordBusbarAlarmCountResult> recordBusbarAlarmCount(RecordBusbarAlarm recordBusbarAlarm){
+        return recordBusbarAlarmMapper.recordBusbarAlarmCount(recordBusbarAlarm);
+    }
 }

ruoyi-module/src/main/resources/mapper/base/BaseBusbarInfoMapper.xml

@@ -140,4 +140,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{objId}
         </foreach>
     </delete>
+
+
+    <select id="recordBusbarAlarmCount" resultType="java.lang.Integer">
+            select count(*) from base_busbar_info
+    </select>
+
+
 </mapper>

ruoyi-module/src/main/resources/mapper/base/BaseCabinetInfoMapper.xml

@@ -117,4 +117,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{objId}
         </foreach>
     </delete>
+
+    <select id="countBaseCabinetInfo" resultType="Integer">
+        select count(1) from base_cabinet_info
+    </select>
+
 </mapper>

ruoyi-module/src/main/resources/mapper/record/RecordBusbarAlarmMapper.xml

@@ -114,7 +114,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
 
-    <select id="selectRecordBusbarAlarmListByDay" parameterType="RecordBusbarAlarm" resultMap="RecordBusbarAlarmCountResult">
+    <select id="recordBusbarAlarmCount" parameterType="RecordBusbarAlarm" resultMap="RecordBusbarAlarmCountResult">
         SELECT
             DATE(record_time) AS record_date,
             COUNT(*) AS alarm_count
@@ -125,4 +125,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         GROUP BY
             DATE(record_time)
     </select>
+
 </mapper>

ruoyi-ui/src/api/base/baseBusbarInfo.js

@@ -42,3 +42,13 @@ export function delBaseBusbarInfo(objId) {
     method: 'delete'
   })
 }
+
+/**
+ * 统计母排数量
+ * */
+export function countBusbar() {
+  return request({
+      url: '/base/baseBusbarInfo/countBusbar',
+      method: 'post'
+    })
+}

ruoyi-ui/src/api/base/baseCabinetInfo.js

@@ -51,3 +51,13 @@ export function getBaseCabinetInfoTree(data) {
     data: data
   })
 }
+
+/**
+ * 统计电柜数量
+ * */
+export function countCabinet() {
+  return request({
+    url: '/base/baseCabinetInfo/countCabinet',
+    method: 'post'
+  })
+}