1、冷源系统一键启停修复；

2、温湿度系统优化逻辑；
3、能耗优化；

mh-admin/src/test/java/com/mh/MHApplicationTest.java

@@ -2,6 +2,7 @@ package com.mh;
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
+import com.mh.common.core.domain.entity.DeviceReport;
 import com.mh.common.core.domain.entity.SysParams;
 import com.mh.common.core.domain.entity.SysUser;
 import com.mh.common.core.domain.entity.WeatherData;
@@ -9,6 +10,7 @@ import com.mh.common.utils.DateUtils;
 import com.mh.common.utils.StringUtils;
 import com.mh.quartz.task.DealDataTask;
 import com.mh.quartz.task.GetWeatherDataTask;
+import com.mh.system.mapper.device.DataProcessMapper;
 import com.mh.system.service.ISysParamsService;
 import com.mh.system.service.ISysUserService;
 import com.mh.system.service.device.IDeviceQrManageService;
@@ -92,4 +94,26 @@ public class MHApplicationTest {
 //            }
 //        }
     }
+
+    @Autowired
+    private DataProcessMapper dataProcessMapper;
+
+    @Test
+    public void insertDataHour() {
+        DeviceReport data = new DeviceReport();
+        data.setId(315286L);
+        data.setDeviceNum("39001260");
+        data.setDeviceCode("39001260");
+        data.setDeviceType("5");
+        data.setLastValue("388063.97");
+        data.setLastTime(DateUtils.stringToDate("2025-04-19 10:00:00", "yyyy-MM-dd HH:mm:ss"));
+        data.setCurTime(DateUtils.stringToDate("2025-04-19 10:00:00", "yyyy-MM-dd HH:mm:ss"));
+        data.setCurValue("388063.99");
+        data.setUsedValue("0.02");
+        data.setCalcValue("0.02");
+        data.setRatio(1);
+        data.setGrade(0);
+        System.out.println(data);
+        dataProcessMapper.insertTable(data, "data_hour2025");
+    }
 }

mh-common/src/main/java/com/mh/common/core/domain/dto/HouseGroupDTO.java

@@ -11,12 +11,14 @@ import java.util.List;
 public class HouseGroupDTO {
     private String houseId;
     private String houseName;
+    private int orderNum;
     private List<DeviceDTO> deviceList = new ArrayList<>();
 
     // 分组构造器
     public HouseGroupDTO(TempHumidityDTO data) {
         this.houseId = data.getHouseId();
         this.houseName = data.getHouseName();
+        this.orderNum = data.getOrderNum();
     }
 
     // 合并设备的方法
@@ -29,6 +31,14 @@ public class HouseGroupDTO {
         this.deviceList.add(new DeviceDTO(data));
     }
 
+    public int getOrderNum() {
+        return orderNum;
+    }
+
+    public void setOrderNum(int orderNum) {
+        this.orderNum = orderNum;
+    }
+
     public String getHouseId() {
         return houseId;
     }
@@ -61,4 +71,5 @@ public class HouseGroupDTO {
                 .append("deviceList", deviceList)
                 .toString();
     }
+
 }

mh-common/src/main/java/com/mh/common/core/domain/vo/CollectionParamsManageVO.java

@@ -49,7 +49,7 @@ public class CollectionParamsManageVO {
     }
 
     public void setCurValue(BigDecimal curValue) {
-        this.curValue = curValue.setScale(1, BigDecimal.ROUND_HALF_UP);
+        this.curValue = curValue.setScale(2, BigDecimal.ROUND_HALF_UP);
     }
 
     @Override

mh-framework/src/main/java/com/mh/framework/dealdata/impl/DataProcessServiceImpl.java

@@ -88,7 +88,7 @@ public class DataProcessServiceImpl implements DataProcessService {
         for (CollectionParamsManage entity : collect) {
             BigDecimal temp = new BigDecimal(String.valueOf(data.getParams().getCurrentTemperature().getValue()));
             BigDecimal humidity = new BigDecimal(String.valueOf(data.getParams().getCurrentHumidity().getValue()));
-            if ((data.getId()+"1").equals(String.valueOf(entity.getMtNum()))) {
+            if (("1"+data.getId()).equals(String.valueOf(entity.getMtNum()))) {
                 CollectionParamsManage collectionParamsManage = new CollectionParamsManage();
                 collectionParamsManage = entity;
                 try {
@@ -99,7 +99,7 @@ public class DataProcessServiceImpl implements DataProcessService {
                 }
                 collectionParamsManage.setCurTime(curTime);
                 entities.add(collectionParamsManage);
-            } else if ((data.getId()+"2").equals(String.valueOf(entity.getMtNum()))) {
+            } else if (("2"+data.getId()).equals(String.valueOf(entity.getMtNum()))) {
                 CollectionParamsManage collectionParamsManage = new CollectionParamsManage();
                 collectionParamsManage = entity;
                 try {
@@ -422,6 +422,9 @@ public class DataProcessServiceImpl implements DataProcessService {
                 case "hour":
                     tableName = tableName + DateUtils.dateToString(data.getCurTime(), "yyyy");
                     num = dataProcessMapper.selectDataByHH(tableName, data.getCurTime(), data.getDeviceNum());
+                    if (num == 0) {
+                        log.info("插入小时数据：{}", data.toString());
+                    }
                     break;
             }
             if (num == 0) {

mh-quartz/src/main/java/com/mh/quartz/task/DealDataTask.java

@@ -272,6 +272,7 @@ public class DealDataTask {
                     .sorted(Comparator.comparing(temMap -> temMap.keySet().iterator().next()))
                     .collect(Collectors.toList());
             //计算上次值，当前值
+            log.info("计算小时表数据:{}", sortedList);
             hourList = calcListData(hourList, key, "hour", sortedList);
         }
         //批量插入小时报表

mh-system/src/main/java/com/mh/system/mapper/device/CollectionParamsManageMapper.java

@@ -147,7 +147,7 @@ public interface CollectionParamsManageMapper extends BaseMapper<CollectionParam
             " cpm.cur_time, " +
             " cpm.id as cpm_id, " +
             " dl.status, " +
-            " cpm.order_num, " +
+            " hi.order_num, " +
             " cpm.param_type, " +
             " case " +
             "  when ar.create_time >= CURRENT_DATE " +
@@ -162,13 +162,14 @@ public interface CollectionParamsManageMapper extends BaseMapper<CollectionParam
             " csr.house_id = hi.id " +
             "join device_ledger dl on " +
             " dl.id = cpm.device_ledger_id " +
-            "join alarm_records ar on  " +
+            "left join alarm_records ar on  " +
             " ar.cpm_id = cpm.id " +
             "where " +
             " csr.floor_id = #{floorId} " +
             " and hi.floor_id = #{floorId} " +
             " and cpm.param_type = #{paramType} " +
-            " and cpm.system_type = #{systemType}; ")
+            " and cpm.system_type = #{systemType}" +
+            " order by hi.order_num ; ")
     List<TempHumidityDTO> selectByParamType(@Param("systemType") String systemType,
                                             @Param("floorId") String floorId,
                                             @Param("paramType") String paramType);

mh-system/src/main/java/com/mh/system/mapper/device/DataProcessMapper.java

@@ -104,16 +104,16 @@ public interface DataProcessMapper {
     @Select("select * from ${tableName} where grade = 0 order by cur_time desc")
     List<DeviceReport> queryUntreatedData(String tableName);
 
-    @Select("select count(1) from ${tableName} where device_num = #{deviceNum} and EXTRACT(YEAR FROM AGE(cur_time, #{curTime})) = 0;")
+    @Select("select count(1) from ${tableName} where device_num = #{deviceNum} and EXTRACT(YEAR FROM cur_time) = EXTRACT(YEAR FROM #{curTime}::timestamp);")
     Integer selectDataByYY(@Param("tableName") String tableName,@Param("curTime") Date curTime,@Param("deviceNum")String deviceNum);
 
-    @Select("select count(1) from ${tableName} where device_num = #{deviceNum} and EXTRACT(MONTH FROM AGE(cur_time, #{curTime})) = 0;")
+    @Select("select count(1) from ${tableName} where device_num = #{deviceNum} and DATE_TRUNC('month', cur_time) = DATE_TRUNC('month', #{curTime}::timestamp);")
     Integer selectDataByMM(@Param("tableName") String tableName,@Param("curTime") Date curTime,@Param("deviceNum")String deviceNum);
 
-    @Select("select count(1) from ${tableName} where device_num = #{deviceNum} and EXTRACT(DAY FROM AGE(cur_time, #{curTime})) = 0;")
+    @Select("select count(1) from ${tableName} where device_num = #{deviceNum} and DATE(cur_time) = DATE(#{curTime}::timestamp)")
     Integer selectDataByDD(@Param("tableName") String tableName,@Param("curTime") Date curTime,@Param("deviceNum")String deviceNum);
 
-    @Select("select count(1) from ${tableName} where device_num = #{deviceNum} and EXTRACT(HOUR FROM AGE(cur_time, #{curTime})) = 0; ")
+    @Select("select count(1) from ${tableName} where device_num = #{deviceNum} and DATE_TRUNC('hour', cur_time) = DATE_TRUNC('hour', #{curTime}::timestamp); ")
     Integer selectDataByHH(@Param("tableName") String tableName,@Param("curTime") Date curTime,@Param("deviceNum")String deviceNum);
 
     @Insert("insert into ${tableName}(device_num, device_code, device_type, last_value, last_time, cur_value,cur_time,calc_value,used_value,ratio,grade) " +
@@ -132,19 +132,19 @@ public interface DataProcessMapper {
     void insertTable(@Param("data") DeviceReport data, @Param("tableName") String tableName);
 
     @Update("update ${tableName} set cur_time = #{data.curTime},cur_value = #{data.curValue}::numeric,calc_value = (#{data.curValue}::numeric - last_value)*ratio,used_value = #{data.curValue}::numeric - last_value " +
-            "where device_num = #{data.deviceNum} and EXTRACT(MONTH FROM AGE(cur_time, #{data.curTime})) = 0 ")
+            "where device_num = #{data.deviceNum} and DATE_TRUNC('month', cur_time) = DATE_TRUNC('month', #{data.curTime}::timestamp); ")
     void updateTableMM(@Param("data") DeviceReport data, @Param("tableName") String tableName);
 
     @Update("update ${tableName} set cur_time = #{data.curTime},cur_value = #{data.curValue}::numeric,calc_value = (#{data.curValue}::numeric - last_value)*ratio,used_value = #{data.curValue}::numeric - last_value " +
-            "where device_num = #{data.deviceNum} and EXTRACT(YEAR FROM AGE(cur_time, #{data.curTime})) = 0 ")
+            "where device_num = #{data.deviceNum} and EXTRACT(YEAR FROM cur_time) = EXTRACT(YEAR FROM #{data.curTime}::timestamp); ")
     void updateTableYY(@Param("data") DeviceReport data, @Param("tableName") String tableName);
 
     @Update("update ${tableName} set cur_time = #{data.curTime},cur_value = #{data.curValue}::numeric,calc_value = (#{data.curValue}::numeric - last_value)*ratio,used_value = #{data.curValue}::numeric - last_value " +
-            "where device_num = #{data.deviceNum} and EXTRACT(DAY FROM AGE(cur_time, #{data.curTime})) = 0 ")
+            "where device_num = #{data.deviceNum} and DATE(cur_time) = DATE(#{data.curTime}::timestamp) ")
     void updateTableDD(@Param("data") DeviceReport data, @Param("tableName") String tableName);
 
     @Update("update ${tableName} set cur_time = #{data.curTime},cur_value = #{data.curValue}::numeric,calc_value = (#{data.curValue}::numeric - last_value)*ratio,used_value = #{data.curValue}::numeric - last_value " +
-            "where device_num = #{data.deviceNum} and EXTRACT(HOUR FROM AGE(cur_time, #{data.curTime})) = 0 ")
+            "where device_num = #{data.deviceNum} and DATE_TRUNC('hour', cur_time) = DATE_TRUNC('hour', #{data.curTime}::timestamp); ")
     void updateTableHH(@Param("data") DeviceReport data, @Param("tableName") String tableName);
 
     /**
@@ -155,7 +155,7 @@ public interface DataProcessMapper {
      * @param grade
      */
     @Update("<script>" +
-            "update ${tableName} set grade = #{grade} where Id in(" +
+            "update ${tableName} set grade = #{grade} where id in(" +
             "<foreach collection ='ids' item='id' index = 'index' separator=','>" +
             "#{id}" +
             "</foreach>" +

mh-system/src/main/java/com/mh/system/mapper/energy/EnergyMapper.java

@@ -48,15 +48,15 @@ public interface EnergyMapper {
             "where  " +
             "  dm.cur_time >= #{startTime}::timestamp " +
             "  AND dm.cur_time <= #{endTime}::timestamp " +
-            "  and device_num in (  " +
+            "  and dm.device_num in (  " +
             "  select  " +
-            "    device_num  " +
+            "    cpm.mt_num  " +
             "  from  " +
             "    collection_params_manage cpm  " +
             "  join device_ledger dl   " +
             "on  " +
             "    cpm.device_ledger_id = dl.id  " +
-            "    and dl.device_type in ('5', '6') and cpm.grade = 40 " +
+            "    and dl.device_type in ('5', '6') and cpm.grade = 40 and cpm.terminal_device_type = '15' " +
             "<if test='systemType != null and systemType != \"\"'>" +
             "    and cpm.system_type = #{systemType} " +
             "</if>" +
@@ -99,15 +99,15 @@ public interface EnergyMapper {
             "where  " +
             "  dm.cur_time &gt;= #{startTime}::timestamp " +
             "  AND dm.cur_time &lt;= #{endTime}::timestamp " +
-            "  and device_num in (  " +
+            "  and dm.device_num in (  " +
             "  select  " +
-            "    device_num  " +
+            "    cpm.mt_num  " +
             "  from  " +
             "    collection_params_manage cpm  " +
             "  join device_ledger dl   " +
             "on  " +
             "    cpm.device_ledger_id = dl.id  " +
-            "    and dl.device_type in ('5', '6') and cpm.grade = 40 " +
+            "    and dl.device_type in ('5', '6') and cpm.grade = 40 and cpm.terminal_device_type = '15' " +
             "<if test='systemType != null and systemType != \"\"'>" +
             "    and cpm.system_type = #{systemType} " +
             "</if>" +
@@ -167,15 +167,16 @@ public interface EnergyMapper {
             "where  " +
             "  dm.cur_time &gt;= #{startTime}::timestamp " +
             "  AND dm.cur_time &lt;= #{endTime}::timestamp " +
-            "  and device_num in (  " +
+            "  and dm.device_num in (  " +
             "  select  " +
-            "    device_num  " +
+            "    cpm.mt_num  " +
             "  from  " +
             "    collection_params_manage cpm  " +
             "  join device_ledger dl   " +
             "on  " +
             "    cpm.device_ledger_id = dl.id  " +
             "    and dl.device_type in ('5', '6') and cpm.grade = 40 " +
+            "    and cpm.terminal_device_type = '15' " +
             "<if test='systemType != null and systemType != \"\"'>" +
             "    and cpm.system_type = #{systemType} " +
             "</if>" +

mh-system/src/main/java/com/mh/system/mapper/energy/EnergyQueryMapper.java

@@ -48,15 +48,15 @@ public interface EnergyQueryMapper {
             "where  " +
             "  dm.cur_time >= #{startTime}::timestamp " +
             "  AND dm.cur_time <= #{endTime}::timestamp " +
-            "  and device_num in (  " +
+            "  and dh.device_num in (  " +
             "  select  " +
-            "    device_num  " +
+            "    cpm.mt_num  " +
             "  from  " +
             "    collection_params_manage cpm  " +
             "  join device_ledger dl   " +
             "on  " +
             "    cpm.device_ledger_id = dl.id  " +
-            "    and dl.device_type in ('5', '6')  " +
+            "    and dl.device_type in ('5', '6') and cpm.terminal_device_type = '15' " +
             "<if test='systemType != null and systemType != \"\"'> " +
             "    and cpm.system_type = #{systemType} " +
             "</if>" +
@@ -99,15 +99,15 @@ public interface EnergyQueryMapper {
             "where  " +
             "  dm.cur_time &gt;= #{startTime}::timestamp " +
             "  AND dm.cur_time &lt;= #{endTime}::timestamp " +
-            "  and device_num in (  " +
+            "  and dm.device_num in (  " +
             "  select  " +
-            "    device_num  " +
+            "    cpm.mt_num  " +
             "  from  " +
             "    collection_params_manage cpm  " +
             "  join device_ledger dl   " +
             "on  " +
             "    cpm.device_ledger_id = dl.id  " +
-            "    and dl.device_type in ('5', '6')  " +
+            "    and dl.device_type in ('5', '6') and cpm.terminal_device_type = '15' " +
             "<if test='systemType != null and systemType != \"\"'> " +
             "    and cpm.system_type = #{systemType} " +
             "</if>" +
@@ -169,15 +169,15 @@ public interface EnergyQueryMapper {
             "where  " +
             "  dm.cur_time &gt;= #{startTime}::timestamp " +
             "  AND dm.cur_time &lt;= #{endTime}::timestamp " +
-            "  and device_num in (  " +
+            "  and dm.device_num in (  " +
             "  select  " +
-            "    device_num  " +
+            "    cpm.mt_num  " +
             "  from  " +
             "    collection_params_manage cpm  " +
             "  join device_ledger dl   " +
             "on  " +
             "    cpm.device_ledger_id = dl.id  " +
-            "    and dl.device_type in ('5', '6')  " +
+            "    and dl.device_type in ('5', '6') and cpm.terminal_device_type = '15' " +
             "<if test='systemType != null and systemType != \"\"'> " +
             "    and cpm.system_type = #{systemType} " +
             "</if>" +

mh-system/src/main/java/com/mh/system/service/device/impl/IndoorTempMonitorServiceImpl.java

@@ -48,8 +48,16 @@ public class IndoorTempMonitorServiceImpl implements IIndoorTempMonitorService {
     public List<HouseGroupDTO> getIndoorTempByFloor(String systemType, String floorId) throws JsonProcessingException {
         // 查询采集类型是温度的参数,采集参数是12
         List<TempHumidityDTO> collectionParamsManages = collectionParamsManageMapper.selectByParamType(systemType, floorId, "12");
+        // 遍历重新设置otherName为温度
+        for (TempHumidityDTO tempHumidityDTO : collectionParamsManages) {
+            tempHumidityDTO.setOtherName("温度");
+        }
         // 湿度采集参数：32
         List<TempHumidityDTO> humidityDTOS = collectionParamsManageMapper.selectByParamType(systemType, floorId, "32");
+        // 遍历重新设置otherName为湿度
+        for (TempHumidityDTO tempHumidityDTO : humidityDTOS) {
+            tempHumidityDTO.setOtherName("湿度");
+        }
         // 合并collectionParamsManages和humidityDTOS
         collectionParamsManages.addAll(humidityDTOS);
         return convert(collectionParamsManages);
@@ -63,11 +71,13 @@ public class IndoorTempMonitorServiceImpl implements IIndoorTempMonitorService {
      * @throws JsonProcessingException
      */
     public static List<HouseGroupDTO> convert(List<TempHumidityDTO> dataList) throws JsonProcessingException {
+        // 先按orderNum升序排序原始数据
+        dataList.sort(Comparator.comparingInt(TempHumidityDTO::getOrderNum));
+
         // 使用复合键分组（houseId + houseName）
         Map<String, HouseGroupDTO> groupedMap = dataList.stream()
                 .collect(Collectors.groupingBy(
                         data -> {
-                            // 添加日志以检查每条数据的 houseId 和 houseName
                             log.info("Processing data: houseId={}, houseName={}", data.getHouseId(), data.getHouseName());
                             return data.getHouseId() + "|" + data.getHouseName();
                         },
@@ -86,10 +96,13 @@ public class IndoorTempMonitorServiceImpl implements IIndoorTempMonitorService {
                         )
                 ));
 
-        // 转换为有序列表（按首次出现顺序）
-        return new ArrayList<>(groupedMap.values());
+        // 转换为有序列表（按orderNum升序）
+        return groupedMap.values().stream()
+                .sorted(Comparator.comparingInt(HouseGroupDTO::getOrderNum))
+                .collect(Collectors.toList());
     }
 
+
     @Override
     public List<IndoorTempVO> getIndoorTempHisByFloorAndHouseId(String systemType, String floorId, String houseId) {
         return List.of();

mh-system/src/main/java/com/mh/system/service/energy/impl/EnergyAnalyzeServiceImpl.java

@@ -83,6 +83,8 @@ public class EnergyAnalyzeServiceImpl implements EnergyAnalyzeService {
         // 开始进行分组
         // 通过device_manage的grade进行分组，分为四类：0-9：冷水机，10-19：冷冻泵，20-29：冷却泵，30-39：冷却塔
         HashMap<String, BigDecimal> result = deviceTypeEnergyEntities.stream()
+                // 过滤叼总表的数据（deviceType=15）
+                .filter(deviceTypeEnergyEntity -> !deviceTypeEnergyEntity.getDeviceType().equals("15"))
                 .collect(Collectors.groupingBy(DeviceTypeEnergy::getDeviceTypeRange))
                 .entrySet().stream().collect(Collectors.toMap(
                         Map.Entry<String, List<DeviceTypeEnergy>>::getKey,

mh-system/src/main/resources/mapper/system/EnergyMapper.xml

@@ -104,7 +104,7 @@
               <if test="systemType != null and systemType != '' ">
                   and cpm.system_type = #{systemType}
               </if>
-            and cpm.grade = 40 )
+            and cpm.grade = 40 and cpm.terminal_device_type = '15' )
       </if>
       GROUP BY device_type, TO_CHAR(cur_time, 'YYYY-MM-DD HH24:MI:SS'), EXTRACT(YEAR FROM cur_time)
       <include refid="commonGroupSql" />
@@ -140,7 +140,7 @@
               <if test="systemType != null and systemType != '' ">
                   and cpm.system_type = #{systemType}
               </if>
-            and cpm.grade = 40 )
+            and cpm.grade = 40 and cpm.terminal_device_type = '15' )
       </if>
       GROUP BY device_type, TO_CHAR(cur_time, 'YYYY-MM-DD HH24:MI:SS'), EXTRACT(YEAR FROM cur_time)
       <include refid="commonGroupSql" />
@@ -175,7 +175,7 @@
               <if test="systemType != null and systemType != '' ">
                   and cpm.system_type = #{systemType}
               </if>
-            and cpm.grade = 40 )
+            and cpm.grade = 40 and cpm.terminal_device_type = '15' )
       </if>
       GROUP BY device_type, TO_CHAR(cur_time, 'YYYY-MM-DD HH24:MI:SS'), EXTRACT(YEAR FROM cur_time)
       <include refid="commonGroupSql" />
@@ -210,7 +210,7 @@
               <if test="systemType != null and systemType != '' ">
                   and cpm.system_type = #{systemType}
               </if>
-            and cpm.grade = 40 )
+            and cpm.grade = 40 and cpm.terminal_device_type = '15' )
       </if>
       GROUP BY device_type, TO_CHAR(cur_time, 'YYYY-MM-DD HH24:MI:SS'), EXTRACT(YEAR FROM cur_time)
       <include refid="commonGroupSql" />
@@ -252,7 +252,7 @@
               <if test="systemType != null and systemType != '' ">
                   and cpm.system_type = #{systemType}
               </if>
-              and cpm.grade = 40 )
+              and cpm.grade = 40 and cpm.terminal_device_type = '15' )
           GROUP BY
           device_type,
           SUBSTRING(TO_CHAR(cur_time, 'YYYY-MM-DD HH24:MI:SS') FROM 1 FOR ${len}),
@@ -281,7 +281,7 @@
               <if test="systemType != null and systemType != '' ">
                   and cpm.system_type = #{systemType}
               </if>
-            and cpm.grade = 40 )
+            and cpm.grade = 40 and cpm.terminal_device_type = '15' )
           GROUP BY
           device_type,
           SUBSTRING(TO_CHAR(cur_time, 'YYYY-MM-DD HH24:MI:SS') FROM 1 FOR ${len}),
@@ -311,7 +311,7 @@
               <if test="systemType != null and systemType != '' ">
                   and cpm.system_type = #{systemType}
               </if>
-            and cpm.grade = 40 )
+            and cpm.grade = 40 and cpm.terminal_device_type = '15' )
           GROUP BY
           device_type,
           SUBSTRING(TO_CHAR(cur_time, 'YYYY-MM-DD HH24:MI:SS') FROM 1 FOR ${len}),
@@ -340,7 +340,7 @@
               <if test="systemType != null and systemType != '' ">
                   and cpm.system_type = #{systemType}
               </if>
-            and cpm.grade = 40 )
+            and cpm.grade = 40 and cpm.terminal_device_type = '15' )
           GROUP BY
           device_type,
           SUBSTRING(TO_CHAR(cur_time, 'YYYY-MM-DD HH24:MI:SS') FROM 1 FOR ${len}),
@@ -391,7 +391,7 @@
           <if test="systemType != null and systemType != '' ">
               and cpm.system_type = #{systemType}
           </if>
-          and cpm.grade = 40 )
+          and cpm.grade = 40 and cpm.terminal_device_type = '15' )
       </if>
       GROUP BY TO_CHAR(cur_time, 'YYYY-MM-DD HH24:MI:SS'), EXTRACT(YEAR FROM cur_time)
       <if test="timeType!= null and timeType!= '' and timeType == 'month'">
@@ -429,7 +429,7 @@
           <if test="systemType != null and systemType != '' ">
               and cpm.system_type = #{systemType}
           </if>
-          and cpm.grade = 40 )
+          and cpm.grade = 40 and cpm.terminal_device_type = '15' )
       </if>
       GROUP BY EXTRACT(YEAR FROM cur_time)
       <if test="timeType!= null and timeType!= '' and timeType == 'month'">
@@ -490,7 +490,7 @@
             <if test="systemType != null and systemType != '' ">
                 and cpm.system_type = #{systemType}
             </if>
-            and cpm.grade = 40 )
+            and cpm.grade = 40 and cpm.terminal_device_type = '15' )
         </if>
         group by
         substring(to_char(cur_time, 'YYYY-MM-DD HH24:MI:SS') from 1 for ${len}),
@@ -530,7 +530,7 @@
             <if test="systemType != null and systemType != '' ">
                 and cpm.system_type = #{systemType}
             </if>
-            and cpm.grade = 40 )
+            and cpm.grade = 40 and cpm.terminal_device_type = '15' )
         </if>
         group by
         extract(year from cur_time)
@@ -581,7 +581,7 @@
         <if test="systemType != null and systemType != '' ">
             and cpm.system_type = #{systemType}
         </if>
-        and cpm.grade = 40 )
+        and cpm.grade = 40 and cpm.terminal_device_type = '15' )
         group by
         substring(to_char(cur_time, 'YYYY-MM-DD HH24:MI:SS') from 1 for ${len}),
         extract(year from cur_time)
@@ -610,7 +610,7 @@
         <if test="systemType != null and systemType != '' ">
             and cpm.system_type = #{systemType}
         </if>
-        and cpm.grade = 40 )
+        and cpm.grade = 40 and cpm.terminal_device_type = '15' )
         group by
         substring(to_char(cur_time, 'YYYY-MM-DD HH24:MI:SS') from 1 for ${len}),
         extract(year from cur_time)
@@ -640,7 +640,7 @@
         <if test="systemType != null and systemType != '' ">
             and cpm.system_type = #{systemType}
         </if>
-        and cpm.grade = 40 )
+        and cpm.grade = 40 and cpm.terminal_device_type = '15' )
         group by
         extract(year from cur_time)
         <include refid="commonLastGroupSql"/>
@@ -667,7 +667,7 @@
         <if test="systemType != null and systemType != '' ">
             and cpm.system_type = #{systemType}
         </if>
-        and cpm.grade = 40 )
+        and cpm.grade = 40 and cpm.terminal_device_type = '15' )
         group by
         extract(year from cur_time)
         <include refid="commonLastGroupSql"/>
@@ -854,6 +854,7 @@
             cpm.device_ledger_id = dl.id
             and dl.device_type = '5'
             and cpm.grade = 140
+            and cpm.terminal_device_type = '15'
         )
         group by
             device_type,
@@ -880,6 +881,7 @@
               cpm.device_ledger_id = dl.id
               and dl.device_type = '6'
               and cpm.grade = 140
+              and cpm.terminal_device_type = '15'
             )
         group by
             device_type,