diff --git a/mh-admin/src/main/java/com/mh/web/controller/energy/SysEnergyConsumptionController.java b/mh-admin/src/main/java/com/mh/web/controller/energy/SysEnergyConsumptionController.java
index 463ed63..02e6a95 100644
--- a/mh-admin/src/main/java/com/mh/web/controller/energy/SysEnergyConsumptionController.java
+++ b/mh-admin/src/main/java/com/mh/web/controller/energy/SysEnergyConsumptionController.java
@@ -26,7 +26,7 @@ public class SysEnergyConsumptionController extends BaseController {
     private IEnergyService energyService;
 
     /**
-     * 获取系统能耗分析
+     * 获取系统瞬时能耗分析
      * @param vo
      * @return
      */
diff --git a/mh-system/src/main/java/com/mh/system/mapper/energy/EnergyMapper.java b/mh-system/src/main/java/com/mh/system/mapper/energy/EnergyMapper.java
index d81e49b..1dd0320 100644
--- a/mh-system/src/main/java/com/mh/system/mapper/energy/EnergyMapper.java
+++ b/mh-system/src/main/java/com/mh/system/mapper/energy/EnergyMapper.java
@@ -26,35 +26,95 @@ public interface EnergyMapper {
      * @return
      */
     @Select("<script>" +
-            "select sum(calc_value) as curValue,device_type as deviceType,convert(varchar(${len}), cur_time, 120) as timeStr from ${lastTableName} dt " +
-            " where cur_time >= concat(#{startTime},' 00:00:00') and cur_time  &lt;= concat(#{endTime},' 23:59:59') " +
-            "<if test='paramType != null and paramType != \"\"'>" +
-            "   and device_type = #{paramType}" +
-            "</if>" +
-            " and exists ( " +
-            " select " +
-            "   1 " +
-            " from " +
-            "   device_manage " +
-            " where " +
-            "   device_num = dt.device_num and grade &lt; 50 and grade >=40 " +
-            " )" +
-            " group by device_type,convert(varchar(${len}), cur_time, 120) " +
+            "select  " +
+            "  sum(dm.calc_value) as curValue,  " +
+            "  CASE dm.device_type  " +
+            "       WHEN '5' THEN 'meter'  " +
+            "       WHEN '6' THEN 'cloud'  " +
+            "       ELSE 'Unknown'  " +
+            "  END as deviceType," +
+            "  TO_CHAR(dm.cur_time, " +
+            "    <choose>" +
+            "      <when test='len == 4'>'YYYY'</when>" +
+            "      <when test='len == 7'>'YYYY-MM'</when>" +
+            "      <when test='len == 10'>'YYYY-MM-DD'</when>" +
+            "      <when test='len == 13'>'YYYY-MM-DD HH24'</when>" +
+            "      <when test='len == 16'>'YYYY-MM-DD HH24:MI'</when>" +
+            "      <otherwise>'YYYY-MM-DD HH24:MI:SS'</otherwise>" +
+            "    </choose>" +
+            "  ) AS timeStr " +
+            "from  " +
+            "  ${lastTableName} dm  " +
+            "where  " +
+            "  dm.cur_time &gt;= #{startTime}::timestamp " +
+            "  AND dm.cur_time &lt;= #{endTime}::timestamp " +
+            "  and device_num in (  " +
+            "  select  " +
+            "    device_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 " +
+            ")  " +
+            "group by  " +
+            "  device_type,  " +
+            "  TO_CHAR(dm.cur_time, " +
+            "    <choose>" +
+            "      <when test='len == 4'>'YYYY'</when>" +
+            "      <when test='len == 7'>'YYYY-MM'</when>" +
+            "      <when test='len == 10'>'YYYY-MM-DD'</when>" +
+            "      <when test='len == 13'>'YYYY-MM-DD HH24'</when>" +
+            "      <when test='len == 16'>'YYYY-MM-DD HH24:MI'</when>" +
+            "      <otherwise>'YYYY-MM-DD HH24:MI:SS'</otherwise>" +
+            "    </choose>" +
+            "  ) " +
             "union all " +
-            "select sum(calc_value) as curValue,device_type as deviceType,convert(varchar(${len}), cur_time, 120) as timeStr from ${curTableName} dy " +
-            " where cur_time >= concat(#{startTime},' 00:00:00') and cur_time  &lt;= concat(#{endTime},' 23:59:59') " +
-            "<if test='paramType != null and paramType != \"\"'>" +
-            "   and device_type = #{paramType}" +
-            "</if>" +
-            " and exists ( " +
-            " select " +
-            "   1 " +
-            " from " +
-            "   device_manage " +
-            " where " +
-            "   device_num = dy.device_num and grade &lt; 50 and grade >=40 " +
-            " )" +
-            " group by device_type,convert(varchar(${len}), cur_time, 120)" +
+            "select  " +
+            "  sum(dm.calc_value) as curValue,  " +
+            "  CASE dm.device_type  " +
+            "       WHEN '5' THEN 'meter'  " +
+            "       WHEN '6' THEN 'cloud'  " +
+            "       ELSE 'Unknown'  " +
+            "  END as deviceType," +
+            "  TO_CHAR(dm.cur_time, " +
+            "    <choose>" +
+            "      <when test='len == 4'>'YYYY'</when>" +
+            "      <when test='len == 7'>'YYYY-MM'</when>" +
+            "      <when test='len == 10'>'YYYY-MM-DD'</when>" +
+            "      <when test='len == 13'>'YYYY-MM-DD HH24'</when>" +
+            "      <when test='len == 16'>'YYYY-MM-DD HH24:MI'</when>" +
+            "      <otherwise>'YYYY-MM-DD HH24:MI:SS'</otherwise>" +
+            "    </choose>" +
+            "  ) AS timeStr " +
+            "from  " +
+            "  ${curTableName} dm  " +
+            "where  " +
+            "  dm.cur_time &gt;= #{startTime}::timestamp " +
+            "  AND dm.cur_time &lt;= #{endTime}::timestamp " +
+            "  and device_num in (  " +
+            "  select  " +
+            "    device_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 " +
+            ")  " +
+            "group by  " +
+            "  device_type,  " +
+            "  TO_CHAR(dm.cur_time, " +
+            "    <choose>" +
+            "      <when test='len == 4'>'YYYY'</when>" +
+            "      <when test='len == 7'>'YYYY-MM'</when>" +
+            "      <when test='len == 10'>'YYYY-MM-DD'</when>" +
+            "      <when test='len == 13'>'YYYY-MM-DD HH24'</when>" +
+            "      <when test='len == 16'>'YYYY-MM-DD HH24:MI'</when>" +
+            "      <otherwise>'YYYY-MM-DD HH24:MI:SS'</otherwise>" +
+            "    </choose>" +
+            "  ) " +
             "</script>")
     List<ConsumptionAnalyze> queryManyTable(@Param("startTime") String startTime,
                                             @Param("endTime") String endTime,
@@ -72,20 +132,52 @@ public interface EnergyMapper {
      * @return
      */
     @Select("<script>" +
-            "select sum(calc_value) as curValue,device_type as deviceType,convert(varchar(${len}), cur_time, 120) as timeStr from ${lastTableName} dy " +
-            " where cur_time >= #{startTime} and cur_time  &lt;= #{endTime} " +
-            "<if test='paramType != null and paramType != \"\"'>" +
-            "   and device_type = #{paramType}" +
-            "</if>" +
-            " and exists ( " +
-            " select " +
-            "   1 " +
-            " from " +
-            "   device_manage " +
-            " where " +
-            "   device_num = dy.device_num and grade &lt; 50 and grade >=40 " +
-            " )" +
-            " group by device_type,convert(varchar(${len}), cur_time, 120)" +
+            "select  " +
+            "  sum(dm.calc_value) as curValue,  " +
+            "  CASE dm.device_type  " +
+            "       WHEN '5' THEN 'meter'  " +
+            "       WHEN '6' THEN 'cloud'  " +
+            "       ELSE 'Unknown'  " +
+            "  END as deviceType," +
+            "  TO_CHAR(dm.cur_time, " +
+            "    <choose>" +
+            "      <when test='len == 4'>'YYYY'</when>" +
+            "      <when test='len == 7'>'YYYY-MM'</when>" +
+            "      <when test='len == 10'>'YYYY-MM-DD'</when>" +
+            "      <when test='len == 13'>'YYYY-MM-DD HH24'</when>" +
+            "      <when test='len == 16'>'YYYY-MM-DD HH24:MI'</when>" +
+            "      <otherwise>'YYYY-MM-DD HH24:MI:SS'</otherwise>" +
+            "    </choose>" +
+            "  ) AS timeStr " +
+            "from  " +
+            "  ${lastTableName} dm  " +
+            "where  " +
+            "  dm.cur_time &gt;= #{startTime}::timestamp " +
+            "  AND dm.cur_time &lt;= #{endTime}::timestamp " +
+            "  and device_num in (  " +
+            "  select  " +
+            "    device_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 " +
+            ")  " +
+            "group by  " +
+            "  device_type,  " +
+            "  TO_CHAR(dm.cur_time, " +
+            "    <choose>" +
+            "      <when test='len == 4'>'YYYY'</when>" +
+            "      <when test='len == 7'>'YYYY-MM'</when>" +
+            "      <when test='len == 10'>'YYYY-MM-DD'</when>" +
+            "      <when test='len == 13'>'YYYY-MM-DD HH24'</when>" +
+            "      <when test='len == 16'>'YYYY-MM-DD HH24:MI'</when>" +
+            "      <otherwise>'YYYY-MM-DD HH24:MI:SS'</otherwise>" +
+            "    </choose>" +
+            "  ) " +
+            "order by  " +
+            "  timeStr " +
             "</script>")
     List<ConsumptionAnalyze> queryOneTable(@Param("startTime") String startTime,
                                            @Param("endTime") String endTime,
diff --git a/mh-system/src/main/java/com/mh/system/service/energy/impl/EnergyServiceImpl.java b/mh-system/src/main/java/com/mh/system/service/energy/impl/EnergyServiceImpl.java
index 1545e4d..8c8ad14 100644
--- a/mh-system/src/main/java/com/mh/system/service/energy/impl/EnergyServiceImpl.java
+++ b/mh-system/src/main/java/com/mh/system/service/energy/impl/EnergyServiceImpl.java
@@ -13,6 +13,8 @@ import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.*;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutionException;
@@ -157,7 +159,7 @@ public class EnergyServiceImpl implements IEnergyService {
                     consumptionAnalyzeEntities = energyMapper.queryManyTable(vo.getStartTime(), vo.getEndTime(), lastTableName.get(), curTableName.get(), getTimeLen(vo.getTimeType()), null);
                 }
             }
-            if (null == consumptionAnalyzeEntities || consumptionAnalyzeEntities.size() == 0) {
+            if (null == consumptionAnalyzeEntities || consumptionAnalyzeEntities.isEmpty()) {
                 latch.countDown();
                 return null;
             }
@@ -232,24 +234,9 @@ public class EnergyServiceImpl implements IEnergyService {
                     .collect(Collectors.groupingBy(ConsumptionAnalyze::getDeviceType, HashMap::new, Collectors
                             .collectingAndThen(Collectors.toList(),
                                     list -> list.stream().sorted(Comparator.comparing(ConsumptionAnalyze::getTimeStr)).collect(Collectors.toList()))));
-//            List<ConsumptionAnalyzeEntity> meterLineData = new ArrayList<>();
-//            List<ConsumptionAnalyzeEntity> coldLineData = new ArrayList<>();
-//            List<ConsumptionAnalyzeEntity> copLineData = new ArrayList<>();
             List<ConsumptionAnalyze> efrColdLineData = new ArrayList<>();
             List<ConsumptionAnalyze> efrMeterLineData = new ArrayList<>();
             for (Map.Entry<String, List<ConsumptionAnalyze>> nmap : collectLine.entrySet()) {
-//                // 获取电表的值
-//                if (nmap.getKey().equalsIgnoreCase("meter")) {
-//                    meterLineData = nmap.getValue();
-//                }
-//                // 获取冷量计的值
-//                if (nmap.getKey().equalsIgnoreCase("cloud")) {
-//                    coldLineData = nmap.getValue();
-//                }
-//                // 获取cop的值
-//                if (nmap.getKey().equalsIgnoreCase("cop")) {
-//                    copLineData = nmap.getValue();
-//                }
                 // 获取瞬时冷量计的值
                 if (nmap.getKey().equalsIgnoreCase("efrCloud")) {
                     efrColdLineData = nmap.getValue();
@@ -262,12 +249,7 @@ public class EnergyServiceImpl implements IEnergyService {
             String[] lineTimeStrArr = efrMeterLineData.stream()
                     .map(ConsumptionAnalyze::getTimeStr)
                     .toArray(String[]::new);
-//            String[] lineMeterArr = meterLineData.stream()
-//                    .map(ConsumptionAnalyzeEntity::getCurValue)
-//                    .toArray(String[]::new);
             String[] lineInstantaneousMeterArr = getArr(efrMeterLineData, lineTimeStrArr);
-//            String[] lineColdArr = getArr(coldLineData, lineTimeStrArr);
-//            String[] lineCopArr = getArr(copLineData, lineTimeStrArr);
             String[] lineEfrColdArr = getArr(efrColdLineData, lineTimeStrArr);
             String[] lineCopArr = new String[efrMeterLineData.size()];
             // 计算瞬时COP=制冷量/耗电量
@@ -285,8 +267,6 @@ public class EnergyServiceImpl implements IEnergyService {
             // 折现图数据
             Map<String, Object> map = new HashMap<>();
             map.put("lineTimeStrArr", lineTimeStrArr);
-//            map.put("lineMeterArr", lineMeterArr);
-//            map.put("lineColdArr", lineColdArr);
             map.put("lineCopArr", lineCopArr);
             map.put("lineInstantaneousColdArr", lineEfrColdArr);
             map.put("lineInstantaneousMeterArr", lineInstantaneousMeterArr);
@@ -370,9 +350,10 @@ public class EnergyServiceImpl implements IEnergyService {
         String endTime = vo.getEndTime();
         String deviceType = vo.getParamType();
         if ("cop".equalsIgnoreCase(vo.getParamType())) {
-            lastTableName = "data_min_cop";
-            curTableName = "data_min_cop";
-            deviceType = "system";
+            return calcCopYoyData(vo);
+//            lastTableName = "data_min_cop";
+//            curTableName = "data_min_cop";
+//            deviceType = "system";
         } else {
             lastTableName = lastTableName+startTime.substring(0,4);
             curTableName = curTableName+endTime.substring(0,4);
@@ -408,6 +389,146 @@ public class EnergyServiceImpl implements IEnergyService {
         return getConsumptionDTOHttpResult(consumptionAnalyzeEntities, "yoy");
     }
 
+    private AjaxResult calcCopYoyData(EnergyConsumptionVO vo) {
+        // 获取冷量读数
+        vo.setParamType("cloud");
+        AjaxResult cloudData = yoy(vo);
+        EnergyConsumptionDTO cloudEnergyData = (EnergyConsumptionDTO) cloudData.get("data");
+        if (cloudEnergyData == null) {
+            return AjaxResult.error();
+        }
+        // 获取电量读数
+        vo.setParamType("meter");
+        AjaxResult meterData = yoy(vo);
+        EnergyConsumptionDTO meterEnergyData = (EnergyConsumptionDTO) meterData.get("data");;
+        if (meterEnergyData == null) {
+            return AjaxResult.error();
+        }
+        // 计算COP值
+        return getEnergyConsumptionDTOHttpResult(meterEnergyData, cloudEnergyData);
+    }
+
+    private static AjaxResult getEnergyConsumptionDTOHttpResult(EnergyConsumptionDTO meterEnergyData, EnergyConsumptionDTO cloudEnergyData) {
+        // 计算COP值
+        EnergyConsumptionDTO energyConsumptionDTO = new EnergyConsumptionDTO();
+        //
+        // 获取冷量数据
+        List<Map<String, Object>> cloudListData = cloudEnergyData.getData();
+        String[] cloudCurData = new String[cloudListData.size()];
+        String[] cloudLastData = new String[cloudListData.size()];
+        for (Map<String, Object> cloudListDatum : cloudListData) {
+            if (cloudListDatum.get("curValue") != null) {
+                cloudCurData = (String[]) cloudListDatum.get("curValue");
+                if (cloudCurData == null) {
+                    cloudCurData = new String[cloudListData.size()];
+                }
+            }
+            if (cloudListDatum.get("lastValue") != null) {
+                cloudLastData = (String[]) cloudListDatum.get("curValue");
+                if (cloudLastData == null) {
+                    cloudLastData = new String[cloudListData.size()];
+                }
+            }
+        }
+        // 获取电量数据
+        List<Map<String, Object>> meterListData = meterEnergyData.getData();
+        String[] meterCurData = new String[meterListData.size()];
+        String[] meterLastData = new String[meterListData.size()];
+        for (Map<String, Object> meterListDatum : meterListData) {
+            if (meterListDatum.get("curValue") != null) {
+                meterCurData = (String[]) meterListDatum.get("curValue");
+                if (meterCurData == null) {
+                    meterCurData = new String[meterListData.size()];
+                }
+            }
+            if (meterListDatum.get("lastValue") != null) {
+                meterLastData = (String[]) meterListDatum.get("curValue");
+                if (meterLastData == null) {
+                    meterLastData = new String[meterListData.size()];
+                }
+            }
+        }
+
+        // 初始化数据参数，当其中某个参数为空时，初始化数据为0
+        String[] timeA = cloudEnergyData.getTimes();
+        String[] timeB = meterEnergyData.getTimes();
+        List<String> timeAList = new ArrayList<>(Arrays.asList(timeA));
+        List<String> cloudCurDataList = new ArrayList<>(Arrays.asList(cloudCurData));
+        List<String> cloudLastDataList = new ArrayList<>(Arrays.asList(cloudLastData));
+        List<String> timeBList = new ArrayList<>(Arrays.asList(timeB));
+        List<String> meterCurDataList = new ArrayList<>(Arrays.asList(meterCurData));
+        List<String> meterLastDataList = new ArrayList<>(Arrays.asList(meterLastData));
+
+        if (timeAList.size() < timeBList.size()) {
+            for (String time : timeBList) {
+                if (!timeAList.contains(time)) {
+                    timeAList.add(time);
+                    cloudCurDataList.add("0");
+                }
+            }
+            meterEnergyData.setTimes(timeAList.toArray(new String[0]));
+            cloudCurData = cloudCurDataList.toArray(new String[0]);
+            cloudLastData = cloudLastDataList.toArray(new String[0]);
+        } else if (timeBList.size() < timeAList.size()) {
+            for (String time : timeAList) {
+                if (!timeBList.contains(time)) {
+                    timeBList.add(time);
+                    meterCurDataList.add("0");
+                    meterLastDataList.add("0");
+                }
+            }
+            meterEnergyData.setTimes(timeBList.toArray(new String[0]));
+            meterCurData = meterCurDataList.toArray(new String[0]);
+            meterLastData = meterLastDataList.toArray(new String[0]);
+        }
+        energyConsumptionDTO.setTitles(meterEnergyData.getTitles());
+        energyConsumptionDTO.setTimes(meterEnergyData.getTimes());
+        energyConsumptionDTO.setLineTimes(meterEnergyData.getLineTimes());
+
+        // 直接两个相除，保留两位小数
+        if (cloudCurData.length == meterCurData.length) {
+            String[] copMap = new String[meterCurData.length];
+            String[] copLastMap = new String[meterCurData.length];
+            String[] yoyMap = new String[meterCurData.length];
+            for (int i = 0; i < meterCurData.length; i++) {
+                String curValue = StringUtils.isBlank(cloudCurData[i]) ? "0" : cloudCurData[i];
+                String lastValue = cloudLastData == null || StringUtils.isBlank(cloudLastData[i]) ? "0" : cloudLastData[i];
+                String curMeterValue = StringUtils.isBlank(meterCurData[i]) ? "0" : meterCurData[i];
+                String lastMeterValue = meterLastData == null || StringUtils.isBlank(meterLastData[i]) ? "0" : meterLastData[i];
+                String curCop = "0.00";
+                if (StringUtils.isBlank(curMeterValue) || new BigDecimal(curMeterValue).compareTo(BigDecimal.ZERO) == 0) {
+                    curCop = "0.00";
+                } else {
+                    curCop = new BigDecimal(curValue).divide(new BigDecimal(curMeterValue), 2, RoundingMode.HALF_UP).toString();
+                }
+                String lastCop = "0.00";
+                if (StringUtils.isBlank(lastMeterValue) || new BigDecimal(lastMeterValue).compareTo(BigDecimal.ZERO) == 0) {
+                    lastCop = "0.00";
+                } else {
+                    lastCop = new BigDecimal(lastValue).divide(new BigDecimal(lastMeterValue), 2, RoundingMode.HALF_UP).toString();
+                }
+                // 同比操作
+                String yoy = "0.00%";
+                if (new BigDecimal(lastCop).compareTo(BigDecimal.ZERO) == 0) {
+                    yoy = "0.00%";
+                } else {
+                    yoy = new BigDecimal(curCop).subtract(new BigDecimal(lastCop)).divide(new BigDecimal(lastCop), 2, RoundingMode.HALF_UP).multiply(new BigDecimal(100)).toString() + "%";
+                }
+                copMap[i] = curCop;
+                copLastMap[i] = lastCop;
+                yoyMap[i] = yoy;
+            }
+            energyConsumptionDTO.setData(Arrays.asList(
+                    new HashMap<String, Object>() {{
+                        put("curValue", copMap);
+                        put("lastValue", copLastMap);
+                        put("yoy", yoyMap);
+                    }}
+            ));
+        }
+        return AjaxResult.success(energyConsumptionDTO);
+    }
+
     @Override
     public AjaxResult mom(EnergyConsumptionVO vo) {
         List<ConsumptionAnalyze> consumptionAnalyzeEntities = null;
@@ -420,8 +541,9 @@ public class EnergyServiceImpl implements IEnergyService {
             String tableName = "data_"+vo.getTimeType();
             // 计算COP值(后期有一个表存储)
             if (!StringUtils.isBlank(vo.getParamType()) && vo.getParamType().equalsIgnoreCase("cop")) {
-                tableName = "data_min_cop";
-                deviceType = "system";
+//                tableName = "data_min_cop";
+//                deviceType = "system";
+                return calcCopMomData(vo);
             }
             consumptionAnalyzeEntities = energyMapper.queryMonthAndYearMom(vo.getStartTime(), vo.getEndTime(), startTime, endTime, tableName, getTimeLen(vo.getTimeType()), deviceType, vo.getTimeType());
         } else {
@@ -430,9 +552,10 @@ public class EnergyServiceImpl implements IEnergyService {
             String tableName2 = "data_"+vo.getTimeType()+vo.getEndTime().substring(0, 4);
             // 计算COP值(后期有一个表存储)
             if (!StringUtils.isBlank(vo.getParamType()) && vo.getParamType().equalsIgnoreCase("cop")) {
-                tableName1 = "data_min_cop";
-                tableName2 = "data_min_cop";
-                deviceType = "system";
+//                tableName1 = "data_min_cop";
+//                tableName2 = "data_min_cop";
+//                deviceType = "system";
+                return calcCopMomData(vo);
             }
             if (tableName1.equalsIgnoreCase(tableName2)) {
                 // 单表查询
@@ -445,6 +568,25 @@ public class EnergyServiceImpl implements IEnergyService {
         return getConsumptionDTOHttpResult(consumptionAnalyzeEntities, "mom");
     }
 
+    private AjaxResult calcCopMomData(EnergyConsumptionVO vo) {
+        // 获取冷量读数
+        vo.setParamType("cloud");
+        AjaxResult cloudData = mom(vo);
+        EnergyConsumptionDTO cloudEnergyData = (EnergyConsumptionDTO) cloudData.get("data");
+        if (cloudEnergyData == null) {
+            return AjaxResult.error();
+        }
+        // 获取电量读数
+        vo.setParamType("meter");
+        AjaxResult meterData = mom(vo);
+        EnergyConsumptionDTO meterEnergyData = (EnergyConsumptionDTO) meterData.get("data");
+        if (meterEnergyData == null) {
+            return AjaxResult.error();
+        }
+
+        return getEnergyConsumptionDTOHttpResult(meterEnergyData, cloudEnergyData);
+    }
+
     @Override
     public AjaxResult yoyMom(EnergyConsumptionVO vo) {
         // 多线程分别求出yoy和mom
diff --git a/mh-system/src/main/resources/mapper/system/EnergyMapper.xml b/mh-system/src/main/resources/mapper/system/EnergyMapper.xml
index c7f438e..6b5eca9 100644
--- a/mh-system/src/main/resources/mapper/system/EnergyMapper.xml
+++ b/mh-system/src/main/resources/mapper/system/EnergyMapper.xml
@@ -16,36 +16,36 @@
 
   <sql id="commonSelectSql">
     <if test="timeType != null and timeType != '' and timeType == 'month'" >
-        ,month(cur_time) as monthStr
+        ,EXTRACT(MONTH FROM cur_time) as monthStr
     </if>
     <if test="timeType != null and timeType != '' and timeType == 'day'" >
-        ,month(cur_time) as monthStr,day(cur_time) as dayStr
+        ,EXTRACT(MONTH FROM cur_time) as monthStr,EXTRACT(DAY FROM cur_time) as dayStr
     </if>
     <if test="timeType != null and timeType != '' and timeType == 'hour'" >
-        ,month(cur_time) as monthStr,day(cur_time) as dayStr,datepart(hour, cur_time) as hourStr
+        ,EXTRACT(MONTH FROM cur_time) as monthStr,EXTRACT(DAY FROM cur_time) as dayStr,EXTRACT(HOUR FROM cur_time) as hourStr
     </if>
   </sql>
 
     <sql id="commonLastGroupSql">
         <if test="timeType != null and timeType != '' and timeType == 'month'" >
-            ,month(cur_time)
+            ,EXTRACT(MONTH FROM cur_time)
         </if>
         <if test="timeType != null and timeType != '' and timeType == 'day'" >
-            ,month(dateadd(day,1,cur_time)),day(dateadd(day,1,cur_time))
+            ,EXTRACT(MONTH FROM (cur_time + INTERVAL '1 day')), EXTRACT(DAY FROM (cur_time + INTERVAL '1 day'))
         </if>
         <if test="timeType != null and timeType != '' and timeType == 'hour'" >
-            ,month(dateadd(hour,1,cur_time)),day(dateadd(hour,1,cur_time)),datepart(hour, dateadd(hour,1,cur_time))
+            ,EXTRACT(MONTH FROM (cur_time + INTERVAL '1 hour')), EXTRACT(DAY FROM (cur_time + INTERVAL '1 hour')), EXTRACT(HOUR FROM (cur_time + INTERVAL '1 hour'))
         </if>
     </sql>
     <sql id="commonLastSelectSql">
         <if test="timeType != null and timeType != '' and timeType == 'month'" >
-            ,month(cur_time) as monthStr
+            ,EXTRACT(MONTH FROM cur_time) as monthStr
         </if>
         <if test="timeType != null and timeType != '' and timeType == 'day'" >
-            ,month(dateadd(day,1,cur_time)) as monthStr,day(dateadd(day,1,cur_time)) as dayStr
+            ,EXTRACT(MONTH FROM (cur_time + INTERVAL '1 day')) as monthStr,EXTRACT(DAY FROM (cur_time + INTERVAL '1 day')) as dayStr
         </if>
         <if test="timeType != null and timeType != '' and timeType == 'hour'" >
-            ,month(dateadd(hour,1,cur_time)) as monthStr,day(dateadd(hour,1,cur_time)) as dayStr,datepart(hour, dateadd(hour,1,cur_time)) as hourStr
+            ,EXTRACT(MONTH FROM (cur_time + INTERVAL '1 hour')) as monthStr,EXTRACT(DAY FROM (cur_time + INTERVAL '1 hour')) as dayStr,EXTRACT(HOUR FROM (cur_time + INTERVAL '1 hour')) as hourStr
         </if>
     </sql>
 
@@ -63,298 +63,405 @@
   </sql>
 
   <select id="queryOneTableYoy" resultType="com.mh.common.core.domain.entity.ConsumptionAnalyze">
-    select b.timeStr,b.deviceType,b.sumValue as curValue, a.sumValue as lastValue,
-    case when a.sumValue > 0 then concat(convert(decimal(18,2),(b.sumValue - a.sumValue)/a.sumValue*100),'%') else '同期无数据' end yoy from ( 
-    select
+      SELECT
+      b.timeStr,
+      b.deviceType,
+      b.sumValue AS curValue,
+      a.sumValue AS lastValue,
+      CASE
+      WHEN a.sumValue > 0 THEN CONCAT(CAST((b.sumValue - a.sumValue) / a.sumValue * 100 AS NUMERIC(18, 2)), '%')
+      ELSE '同期无数据'
+      END AS yoy
+      FROM (
+      SELECT
       <choose>
           <when test="paramType != null and paramType != '' and paramType == 'system' ">
-              convert(decimal(15,2),isnull(avg(case when calc_value != 0 then calc_value else null end),0)*1.0) as sumValue,
+              CAST(COALESCE(AVG(CASE WHEN calc_value!= 0 THEN calc_value ELSE NULL END), 0) * 1.0 AS NUMERIC(15, 2)) AS sumValue,
           </when>
           <otherwise>
-              sum(calc_value) as sumValue,
+              SUM(calc_value) AS sumValue,
           </otherwise>
       </choose>
-        device_type as deviceType,convert(varchar(${len}), cur_time, 120) as timeStr,
-    year(cur_time) as yearStr
-    <include refid="commonSelectSql" />
-    from ${lastTableName} dh 
-    where cur_time >= #{yoyStartTime} and cur_time &lt;= #{yoyEndTime}
-        and calc_value is not null
-      <if test='paramType != null and paramType != "" and paramType != "system" '>
-          and exists(select 1 from device_manage dm where dm.grade between 40 and 50 and dm.device_num = dh.device_num)
+      device_type AS deviceType,
+      TO_CHAR(cur_time, 'YYYY-MM-DD HH24:MI:SS') AS timeStr,
+      EXTRACT(YEAR FROM cur_time) AS yearStr
+      <include refid="commonSelectSql" />
+      FROM ${lastTableName} dh
+      WHERE cur_time >= #{yoyStartTime} AND cur_time &lt;= #{yoyEndTime}
+      AND calc_value IS NOT NULL
+      <if test='paramType!= null and paramType!= "" and paramType!= "system" '>
+          and dh.device_num in (
+          select
+            cpm.mt_num
+          from
+            collection_params_manage cpm
+          join device_ledger dl on
+            cpm.device_ledger_id = dl.id
+              <if test="paramType != null and paramType != '' ">
+                  and dl.device_type = #{paramType}
+              </if>
+            and cpm.grade = 40 )
       </if>
-    <if test='paramType != null and paramType != "" '>
-       and device_type = #{paramType}
-    </if>
-    group by device_type,convert(varchar(${len}), cur_time, 120),year(cur_time)
-    <include refid="commonGroupSql" />
-    ) a right join ( 
-    select
+      GROUP BY device_type, TO_CHAR(cur_time, 'YYYY-MM-DD HH24:MI:SS'), EXTRACT(YEAR FROM cur_time)
+      <include refid="commonGroupSql" />
+      UNION ALL
+      SELECT
       <choose>
-          <when test="paramType != null and paramType != '' and paramType == 'system' ">
-              convert(decimal(15,2),isnull(avg(case when calc_value != 0 then calc_value else null end),0)*1.0) as sumValue,
+          <when test="paramType!= null and paramType!= '' and paramType == 'system' ">
+              CAST(COALESCE(AVG(CASE WHEN calc_value!= 0 THEN calc_value ELSE NULL END), 0) * 1.0 AS NUMERIC(15, 2)) AS sumValue,
           </when>
           <otherwise>
-              sum(calc_value) as sumValue,
+              SUM(calc_value) AS sumValue,
           </otherwise>
       </choose>
-        device_type as deviceType,convert(varchar(${len}), cur_time, 120) as timeStr,
-    year(cur_time) as yearStr
-    <include refid="commonSelectSql" />
-    from ${curTableName} dh 
-    where cur_time >= #{startTime} and cur_time &lt;= #{endTime}
-      and calc_value is not null
-      <if test='paramType != null and paramType != "" and paramType != "system" '>
-          and exists(select 1 from device_manage dm where dm.grade between 40 and 50 and dm.device_num = dh.device_num)
+      device_type AS deviceType,
+      TO_CHAR(cur_time, 'YYYY-MM-DD HH24:MI:SS') AS timeStr,
+      EXTRACT(YEAR FROM cur_time) AS yearStr
+      <include refid="commonSelectSql" />
+      FROM ${curTableName} dh
+      WHERE cur_time >= #{startTime} AND cur_time &lt;= #{endTime}
+      AND calc_value IS NOT NULL
+      <if test='paramType!= null and paramType!= "" and paramType!= "system" '>
+          and dh.device_num in (
+          select
+            cpm.mt_num
+          from
+            collection_params_manage cpm
+          join device_ledger dl on
+            cpm.device_ledger_id = dl.id
+              <if test="paramType != null and paramType != '' ">
+                  and dl.device_type = #{paramType}
+              </if>
+            and cpm.grade = 40 )
       </if>
-    <if test='paramType != null and paramType != "" '>
-       and device_type = #{paramType}
-    </if>
-    group by device_type,convert(varchar(${len}), cur_time, 120),year(cur_time)
-    <include refid="commonGroupSql" />
-    ) b on a.yearStr+1 = b.yearStr
-    <include refid="commonYOYWhereSql"/>
+      GROUP BY device_type, TO_CHAR(cur_time, 'YYYY-MM-DD HH24:MI:SS'), EXTRACT(YEAR FROM cur_time)
+      <include refid="commonGroupSql" />
+      ) a RIGHT JOIN (
+      SELECT
+      <choose>
+          <when test="paramType!= null and paramType!= '' and paramType == 'system' ">
+              CAST(COALESCE(AVG(CASE WHEN calc_value!= 0 THEN calc_value ELSE NULL END), 0) * 1.0 AS NUMERIC(15, 2)) AS sumValue,
+          </when>
+          <otherwise>
+              SUM(calc_value) AS sumValue,
+          </otherwise>
+      </choose>
+      device_type AS deviceType,
+      TO_CHAR(cur_time, 'YYYY-MM-DD HH24:MI:SS') AS timeStr,
+      EXTRACT(YEAR FROM cur_time) AS yearStr
+      <include refid="commonSelectSql" />
+      FROM ${lastTableName} dh
+      WHERE cur_time >= #{startTime} AND cur_time &lt;= #{endTime}
+      AND calc_value IS NOT NULL
+      <if test='paramType!= null and paramType!= "" and paramType!= "system" '>
+          and dh.device_num in (
+          select
+            cpm.mt_num
+          from
+            collection_params_manage cpm
+          join device_ledger dl on
+            cpm.device_ledger_id = dl.id
+              <if test="paramType != null and paramType != '' ">
+                  and dl.device_type = #{paramType}
+              </if>
+            and cpm.grade = 40 )
+      </if>
+      GROUP BY device_type, TO_CHAR(cur_time, 'YYYY-MM-DD HH24:MI:SS'), EXTRACT(YEAR FROM cur_time)
+      <include refid="commonGroupSql" />
+      UNION ALL
+      SELECT
+      <choose>
+          <when test="paramType!= null and paramType!= '' and paramType == 'system' ">
+              CAST(COALESCE(AVG(CASE WHEN calc_value!= 0 THEN calc_value ELSE NULL END), 0) * 1.0 AS NUMERIC(15, 2)) AS sumValue,
+          </when>
+          <otherwise>
+              SUM(calc_value) AS sumValue,
+          </otherwise>
+      </choose>
+      device_type AS deviceType,
+      TO_CHAR(cur_time, 'YYYY-MM-DD HH24:MI:SS') AS timeStr,
+      EXTRACT(YEAR FROM cur_time) AS yearStr
+      <include refid="commonSelectSql" />
+      FROM ${curTableName} dh
+      WHERE cur_time >= #{startTime} AND cur_time &lt;= #{endTime}
+      AND calc_value IS NOT NULL
+      <if test='paramType!= null and paramType!= "" and paramType!= "system" '>
+          and dh.device_num in (
+          select
+            cpm.mt_num
+          from
+            collection_params_manage cpm
+          join device_ledger dl on
+            cpm.device_ledger_id = dl.id
+              <if test="paramType != null and paramType != '' ">
+                  and dl.device_type = #{paramType}
+              </if>
+            and cpm.grade = 40 )
+      </if>
+      GROUP BY device_type, TO_CHAR(cur_time, 'YYYY-MM-DD HH24:MI:SS'), EXTRACT(YEAR FROM cur_time)
+      <include refid="commonGroupSql" />
+      ) b ON (a.yearStr::integer + 1) = b.yearStr
+      <include refid="commonYOYWhereSql"/>
   </select>
 
   <select id="queryManyTableYoy" resultType="com.mh.common.core.domain.entity.ConsumptionAnalyze">
-    select b.timeStr,b.deviceType,b.sumValue as curValue, a.sumValue as lastValue,
-    case when a.sumValue > 0 then concat(convert(decimal(18,2),(b.sumValue - a.sumValue)/a.sumValue*100),'%') else '同期无数据' end yoy from (
-    select sum(calc_value) as sumValue,device_type as deviceType,convert(varchar(${len}), cur_time, 120) as timeStr,
-    year(cur_time) as yearStr
-    <include refid="commonSelectSql" />
-    from ${yoyLastTableName} dh
-    where cur_time >= #{yoyStartTime} and cur_time &lt;= #{yoyEndTime}
-      and exists(select 1 from device_manage dm where dm.grade between 40 and 50 and dm.device_num = dh.device_num)
-    <if test="paramType != null and paramType != '' ">
-       and device_type = #{paramType}
-    </if>
-    group by device_type,convert(varchar(${len}), cur_time, 120),year(cur_time)
-    <include refid="commonGroupSql" />
-    union all
-    select sum(calc_value) as sumValue,device_type as deviceType,convert(varchar(${len}), cur_time, 120) as timeStr,
-    year(cur_time) as yearStr
-    <include refid="commonSelectSql" />
-    from ${yoyCurTableName} dh
-    where cur_time >= #{yoyStartTime} and cur_time &lt;= #{yoyEndTime}
-      and exists(select 1 from device_manage dm where dm.grade between 40 and 50 and dm.device_num = dh.device_num)
-    <if test="paramType != null and paramType != '' ">
-    and device_type = #{paramType}
-    </if>
-    group by device_type,convert(varchar(${len}), cur_time, 120),year(cur_time)
-    <include refid="commonGroupSql" />
-    ) a right join (
-    select sum(calc_value) as sumValue,device_type as deviceType,convert(varchar(${len}), cur_time, 120) as timeStr,
-    year(cur_time) as yearStr
-    <include refid="commonSelectSql" />
-    from ${lastTableName} dh
-    where cur_time >= #{startTime} and cur_time &lt;= #{endTime}
-      and exists(select 1 from device_manage dm where dm.grade between 40 and 50 and dm.device_num = dh.device_num)
-    <if test="paramType != null and paramType != '' ">
-    and device_type = #{paramType}
-    </if>
-    group by device_type,convert(varchar(${len}), cur_time, 120),year(cur_time)
-    <include refid="commonGroupSql" />
-    union all
-    select sum(calc_value) as sumValue,device_type as deviceType,convert(varchar(${len}), cur_time, 120) as timeStr,
-    year(cur_time) as yearStr
-    <include refid="commonSelectSql" />
-    from ${curTableName} dh
-    where cur_time >= #{startTime} and cur_time &lt;= #{endTime}
-      and exists(select 1 from device_manage dm where dm.grade between 40 and 50 and dm.device_num = dh.device_num)
-    <if test="paramType != null and paramType != '' ">
-        and device_type = #{paramType}
-    </if>
-    group by device_type,convert(varchar(${len}), cur_time, 120),year(cur_time)
-    <include refid="commonGroupSql" />
-    ) b on a.yearStr+1 = b.yearStr
-    <include refid="commonYOYWhereSql"/>
+          SELECT
+          b.timeStr,
+          b.deviceType,
+          b.sumValue AS curValue,
+          a.sumValue AS lastValue,
+          CASE
+          WHEN a.sumValue > 0
+          THEN CONCAT( ( (b.sumValue - a.sumValue) / a.sumValue * 100 )::NUMERIC(18,2), '%' )
+          ELSE '同期无数据'
+          END AS yoy
+          FROM (
+          -- 子查询 a（去年同期数据）
+          SELECT
+          SUM(calc_value) AS sumValue,
+          device_type AS deviceType,
+          SUBSTRING(TO_CHAR(cur_time, 'YYYY-MM-DD HH24:MI:SS') FROM 1 FOR ${len}) AS timeStr, <!--- 替换 CONVERT -->
+          EXTRACT(YEAR FROM cur_time)::INTEGER AS yearStr <!--- 替换 YEAR() -->
+          <include refid="commonSelectSql" />
+          FROM ${yoyLastTableName} dh
+          WHERE
+          cur_time >= #{yoyStartTime} AND cur_time &lt;= #{yoyEndTime}
+          and dh.device_num in (
+            select
+              cpm.mt_num
+            from
+              collection_params_manage cpm
+            join device_ledger dl on
+              cpm.device_ledger_id = dl.id
+              <if test="paramType != null and paramType != '' ">
+                  and dl.device_type = #{paramType}
+              </if>
+              and cpm.grade = 40 )
+          GROUP BY
+          device_type,
+          SUBSTRING(TO_CHAR(cur_time, 'YYYY-MM-DD HH24:MI:SS') FROM 1 FOR ${len}), <!--- 动态截取时间 -->
+          EXTRACT(YEAR FROM cur_time) <!--- 替换 YEAR() -->
+          <include refid="commonGroupSql" />
+          UNION ALL
+          SELECT
+          SUM(calc_value) AS sumValue,
+          device_type AS deviceType,
+          SUBSTRING(TO_CHAR(cur_time, 'YYYY-MM-DD HH24:MI:SS') FROM 1 FOR ${len}) AS timeStr,
+          EXTRACT(YEAR FROM cur_time)::INTEGER AS yearStr
+          <include refid="commonSelectSql" />
+          FROM ${yoyCurTableName} dh
+          WHERE
+          cur_time >= #{yoyStartTime} AND cur_time &lt;= #{yoyEndTime}
+          	and dh.device_num in (
+          select
+          cpm.mt_num
+          from
+            collection_params_manage cpm
+          join device_ledger dl on
+            cpm.device_ledger_id = dl.id
+              <if test="paramType != null and paramType != '' ">
+                  and dl.device_type = #{paramType}
+              </if>
+            and cpm.grade = 40 )
+          GROUP BY
+          device_type,
+          SUBSTRING(TO_CHAR(cur_time, 'YYYY-MM-DD HH24:MI:SS') FROM 1 FOR ${len}),
+          EXTRACT(YEAR FROM cur_time)
+          <include refid="commonGroupSql" />
+          ) a
+          RIGHT JOIN ( <!--- 右连接语法保持不变 -->
+          -- 子查询 b（当前期数据）
+          SELECT
+          SUM(calc_value) AS sumValue,
+          device_type AS deviceType,
+          SUBSTRING(TO_CHAR(cur_time, 'YYYY-MM-DD HH24:MI:SS') FROM 1 FOR ${len}) AS timeStr,
+          EXTRACT(YEAR FROM cur_time)::INTEGER AS yearStr
+          <include refid="commonSelectSql" />
+          FROM ${lastTableName} dh
+          WHERE
+          cur_time >= #{startTime} AND cur_time &lt;= #{endTime}
+          	and dh.device_num in (
+          select
+          cpm.mt_num
+          from
+            collection_params_manage cpm
+          join device_ledger dl on
+            cpm.device_ledger_id = dl.id
+              <if test="paramType != null and paramType != '' ">
+                  and dl.device_type = #{paramType}
+              </if>
+            and cpm.grade = 40 )
+          GROUP BY
+          device_type,
+          SUBSTRING(TO_CHAR(cur_time, 'YYYY-MM-DD HH24:MI:SS') FROM 1 FOR ${len}),
+          EXTRACT(YEAR FROM cur_time)
+          <include refid="commonGroupSql" />
+          UNION ALL
+          SELECT
+          SUM(calc_value) AS sumValue,
+          device_type AS deviceType,
+          SUBSTRING(TO_CHAR(cur_time, 'YYYY-MM-DD HH24:MI:SS') FROM 1 FOR ${len}) AS timeStr,
+          EXTRACT(YEAR FROM cur_time)::INTEGER AS yearStr
+          <include refid="commonSelectSql" />
+          FROM ${curTableName} dh
+          WHERE
+          cur_time >= #{startTime} AND cur_time &lt;= #{endTime}
+          	and dh.device_num in (
+          select
+          cpm.mt_num
+          from
+            collection_params_manage cpm
+          join device_ledger dl on
+            cpm.device_ledger_id = dl.id
+              <if test="paramType != null and paramType != '' ">
+                  and dl.device_type = #{paramType}
+              </if>
+            and cpm.grade = 40 )
+          GROUP BY
+          device_type,
+          SUBSTRING(TO_CHAR(cur_time, 'YYYY-MM-DD HH24:MI:SS') FROM 1 FOR ${len}),
+          EXTRACT(YEAR FROM cur_time)
+          <include refid="commonGroupSql" />
+          ) b ON a.yearStr + 1 = b.yearStr <!--- 假设 yearStr 已转为整数 -->
+          <include refid="commonYOYWhereSql"/>
   </select>
 
   <select id="queryMonthAndYearMom" resultType="com.mh.common.core.domain.entity.ConsumptionAnalyze">
-    select
+      SELECT
       t1.timeStr,
-      t1.sumValue as curValue,
-      t2.sumValue as lastValue,
-      case when t2.sumValue > 0 then concat(convert(decimal(18,2),(t1.sumValue - t2.sumValue)/t2.sumValue*100),'%') else '上期无数据' end mom
-    from
-        (
-        select
-            convert(varchar(${len}),
-            cur_time,
-            120) as timeStr,
-          <choose>
-              <when test="paramType != null and paramType != '' and paramType == 'system' ">
-                  convert(decimal(15,2),isnull(avg(case when calc_value != 0 then calc_value else null end),0)*1.0) as sumValue,
-              </when>
-              <otherwise>
-                  sum(calc_value) as sumValue,
-              </otherwise>
-          </choose>
-            year(cur_time) as yearStr
-            <if test="timeType != null and timeType != '' and timeType == 'month'">
-                ,month(cur_time) as monthStr
-            </if>
-        from
-            ${tableName} dh
-        where
-            cur_time >= #{startTime}
-            and cur_time &lt;= #{endTime}
-            and device_type = #{paramType}
-            and calc_value is not null
-        <if test='paramType != null and paramType != "" and paramType != "system" '>
-            and exists(select 1 from device_manage dm where dm.grade between 40 and 50 and dm.device_num = dh.device_num)
-        </if>
-        group by
-            convert(varchar(${len}),
-            cur_time,
-            120),
-            year(cur_time)
-            <if test="timeType != null and timeType != '' and timeType == 'month'">
-                ,month(cur_time)
-            </if>
-        ) t1
-    left join
-        (
-        select
-            <choose>
-                <when test="paramType != null and paramType != '' and paramType == 'system' ">
-                    convert(decimal(15,2),isnull(avg(case when calc_value != 0 then calc_value else null end),0)*1.0) as sumValue,
-                </when>
-                <otherwise>
-                    sum(calc_value) as sumValue,
-                </otherwise>
-            </choose>
-            year(cur_time) as yearStr
-            <if test="timeType != null and timeType != '' and timeType == 'month'">
-                ,month(cur_time) as monthStr
-            </if>
-        from
-            ${tableName} dh
-        where
-            cur_time >= #{momStartTime}
-            and cur_time &lt;= #{momEndTime}
-            and device_type = #{paramType}
-            and calc_value is not null
-          <if test='paramType != null and paramType != "" and paramType != "system" '>
-              and exists(select 1 from device_manage dm where dm.grade between 40 and 50 and dm.device_num = dh.device_num)
+      t1.sumValue AS curValue,
+      t2.sumValue AS lastValue,
+      CASE
+      WHEN t2.sumValue > 0 THEN CONCAT(CAST((t1.sumValue - t2.sumValue) / t2.sumValue * 100 AS NUMERIC(18, 2)), '%')
+      ELSE '上期无数据'
+      END AS mom
+      FROM (
+      SELECT
+      TO_CHAR(cur_time, 'YYYY-MM-DD HH24:MI:SS') AS timeStr,
+      <choose>
+          <when test="paramType != null and paramType != '' and paramType == 'system' ">
+              CAST(COALESCE(AVG(CASE WHEN calc_value!= 0 THEN calc_value ELSE NULL END), 0) * 1.0 AS NUMERIC(15, 2)) AS sumValue,
+          </when>
+          <otherwise>
+              SUM(calc_value) AS sumValue,
+          </otherwise>
+      </choose>
+      EXTRACT(YEAR FROM cur_time) AS yearStr
+      <if test="timeType != null and timeType != '' and timeType == 'month'">
+          ,EXTRACT(MONTH FROM cur_time) AS monthStr
+      </if>
+      FROM ${tableName} dh
+      WHERE cur_time >= #{startTime} AND cur_time &lt;= #{endTime}
+      AND calc_value IS NOT NULL
+      <if test='paramType!= null and paramType!= "" and paramType!= "system" '>
+          and dh.device_num in (
+          select
+          cpm.mt_num
+          from
+          collection_params_manage cpm
+          join device_ledger dl on
+          cpm.device_ledger_id = dl.id
+          <if test="paramType != null and paramType != '' ">
+              and dl.device_type = #{paramType}
           </if>
-        group by
-            year(cur_time)
-            <if test="timeType != null and timeType != '' and timeType == 'month'">
-                ,month(cur_time)
-            </if>
-        ) t2 on
-        <choose>
-            <when test="timeType != null and timeType != '' and timeType == 'month'">
-                t1.monthStr = t2.monthStr + 1
-            </when>
-            <otherwise>
-                t1.yearStr = t2.yearStr + 1
-            </otherwise>
-        </choose>
-    order by timeStr
+          and cpm.grade = 40 )
+      </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'">
+          ,EXTRACT(MONTH FROM cur_time)
+      </if>
+      ) t1
+      LEFT JOIN (
+      SELECT
+      <choose>
+          <when test="paramType!= null and paramType!= '' and paramType == 'system' ">
+              CAST(COALESCE(AVG(CASE WHEN calc_value!= 0 THEN calc_value ELSE NULL END), 0) * 1.0 AS NUMERIC(15, 2)) AS sumValue,
+          </when>
+          <otherwise>
+              SUM(calc_value) AS sumValue,
+          </otherwise>
+      </choose>
+      EXTRACT(YEAR FROM cur_time) AS yearStr
+      <if test="timeType!= null and timeType!= '' and timeType == 'month'">
+          ,EXTRACT(MONTH FROM cur_time) AS monthStr
+      </if>
+      FROM ${tableName} dh
+      WHERE cur_time >= #{momStartTime} AND cur_time &lt;= #{momEndTime}
+      AND calc_value IS NOT NULL
+      <if test='paramType!= null and paramType!= "" and paramType!= "system" '>
+          and dh.device_num in (
+          select
+          cpm.mt_num
+          from
+          collection_params_manage cpm
+          join device_ledger dl on
+          cpm.device_ledger_id = dl.id
+          <if test="paramType != null and paramType != '' ">
+              and dl.device_type = #{paramType}
+          </if>
+          and cpm.grade = 40 )
+      </if>
+      GROUP BY EXTRACT(YEAR FROM cur_time)
+      <if test="timeType!= null and timeType!= '' and timeType == 'month'">
+          ,EXTRACT(MONTH FROM cur_time)
+      </if>
+      ) t2 ON
+      <choose>
+          <when test="timeType!= null and timeType!= '' and timeType == 'month'">
+              t1.monthStr = t2.monthStr + 1
+          </when>
+          <otherwise>
+              t1.yearStr = t2.yearStr + 1
+          </otherwise>
+      </choose>
+      ORDER BY timeStr
   </select>
 
-<!--    <select id="queryMonthAndYearMom" resultType="com.mh.common.core.domain.entity.ConsumptionAnalyze">-->
-<!--        select-->
-<!--        t1.timeStr,-->
-<!--        t1.sumValue as curValue,-->
-<!--        t2.sumValue as lastValue,-->
-<!--        case when t2.sumValue > 0 then concat(convert(decimal(18,2),(t1.sumValue - t2.sumValue)/t2.sumValue*100),'%') else '上期无数据' end mom-->
-<!--        from-->
-<!--        (-->
-<!--        select-->
-<!--        convert(varchar(${len}),-->
-<!--        cur_time,-->
-<!--        120) as timeStr,-->
-<!--        sum(calc_value) as sumValue,-->
-<!--        year(cur_time) as yearStr-->
-<!--        <if test="timeType != null and timeType != '' and timeType == 'month'">-->
-<!--            ,month(cur_time) as monthStr-->
-<!--        </if>-->
-<!--        from-->
-<!--        ${tableName}-->
-<!--        where-->
-<!--        cur_time >= #{startTime}-->
-<!--        and cur_time &lt;= #{endTime}-->
-<!--        and device_type = #{paramType}-->
-<!--        group by-->
-<!--        convert(varchar(${len}),-->
-<!--        cur_time,-->
-<!--        120),-->
-<!--        year(cur_time)-->
-<!--        <if test="timeType != null and timeType != '' and timeType == 'month'">-->
-<!--            ,month(cur_time)-->
-<!--        </if>-->
-<!--        ) t1-->
-<!--        left join-->
-<!--        (-->
-<!--        select-->
-<!--        sum(calc_value) as sumValue,-->
-<!--        year(cur_time) as yearStr-->
-<!--        <if test="timeType != null and timeType != '' and timeType == 'month'">-->
-<!--            ,month(cur_time) as monthStr-->
-<!--        </if>-->
-<!--        from-->
-<!--        ${tableName}-->
-<!--        where-->
-<!--        cur_time >= #{momStartTime}-->
-<!--        and cur_time &lt;= #{momEndTime}-->
-<!--        and device_type = #{paramType}-->
-<!--        group by-->
-<!--        year(cur_time)-->
-<!--        <if test="timeType != null and timeType != '' and timeType == 'month'">-->
-<!--            ,month(cur_time)-->
-<!--        </if>-->
-<!--        ) t2 on-->
-<!--        <choose>-->
-<!--            <when test="timeType != null and timeType != '' and timeType == 'month'">-->
-<!--                t1.monthStr = t2.monthStr + 1-->
-<!--            </when>-->
-<!--            <otherwise>-->
-<!--                t1.yearStr = t2.yearStr + 1-->
-<!--            </otherwise>-->
-<!--        </choose>-->
-<!--        order by timeStr-->
-<!--    </select>-->
-
     <select id="queryOneTableMom" resultType="com.mh.common.core.domain.entity.ConsumptionAnalyze">
         select
         t1.timeStr,
         t1.sumValue as curValue,
         t2.sumValue as lastValue,
-        case when t2.sumValue > 0 then concat(convert(decimal(18,2),(t1.sumValue - t2.sumValue)/t2.sumValue*100),'%') else '上期无数据' end mom
+        case
+        when t2.sumValue > 0 then concat(to_char( ((t1.sumValue - t2.sumValue)/t2.sumValue*100), 'FM999999999990.00'), '%')
+        else '上期无数据'
+        end as mom
         from
         (
         select
-        convert(varchar(${len}),
-        cur_time,
-        120) as timeStr,
+        substring(to_char(cur_time, 'YYYY-MM-DD HH24:MI:SS') from 1 for ${len}) as timeStr,
         <choose>
             <when test="paramType != null and paramType != '' and paramType == 'system' ">
-                convert(decimal(15,2),isnull(avg(case when calc_value != 0 then calc_value else null end),0)*1.0) as sumValue,
+                cast(coalesce(avg(case when calc_value != 0 then calc_value else null end),0)*1.0 as numeric(15,2)) as sumValue,
             </when>
             <otherwise>
                 sum(calc_value) as sumValue,
             </otherwise>
         </choose>
-        year(cur_time) as yearStr
+        extract(year from cur_time) as yearStr
         <include refid="commonSelectSql"/>
         from
         ${tableName} dh
         where
         cur_time >= #{startTime}
         and cur_time &lt;= #{endTime}
-        and device_type = #{paramType}
         and calc_value is not null
         <if test="paramType != null and paramType != '' and paramType != 'system'">
-            and exists(select 1 from device_manage dm where dm.grade between 40 and 50 and dm.device_num = dh.device_num)
+            and dh.device_num in (
+            select
+            cpm.mt_num
+            from
+            collection_params_manage cpm
+            join device_ledger dl on
+            cpm.device_ledger_id = dl.id
+            <if test="paramType != null and paramType != '' ">
+                and dl.device_type = #{paramType}
+            </if>
+            and cpm.grade = 40 )
         </if>
         group by
-        convert(varchar(${len}),
-        cur_time,
-        120),
-        year(cur_time)
+        substring(to_char(cur_time, 'YYYY-MM-DD HH24:MI:SS') from 1 for ${len}),
+        extract(year from cur_time)
         <include refid="commonGroupSql"/>
         ) t1
         left join
@@ -362,26 +469,35 @@
         select
         <choose>
             <when test="paramType != null and paramType != '' and paramType == 'system' ">
-                convert(decimal(15,2),isnull(avg(case when calc_value != 0 then calc_value else null end),0)*1.0) as sumValue,
+                cast(coalesce(avg(case when calc_value != 0 then calc_value else null end),0)*1.0 as numeric(15,2)) as sumValue,
             </when>
             <otherwise>
                 sum(calc_value) as sumValue,
             </otherwise>
         </choose>
-        year(cur_time) as yearStr
+        extract(year from cur_time) as yearStr
         <include refid="commonLastSelectSql"/>
         from
         ${tableName} dh
         where
         cur_time >= #{momStartTime}
         and cur_time &lt;= #{momEndTime}
-        and device_type = #{paramType}
         and calc_value is not null
         <if test="paramType != null and paramType != '' and paramType != 'system'">
-            and exists(select 1 from device_manage dm where dm.grade between 40 and 50 and dm.device_num = dh.device_num)
+            and dh.device_num in (
+            select
+            cpm.mt_num
+            from
+            collection_params_manage cpm
+            join device_ledger dl on
+            cpm.device_ledger_id = dl.id
+            <if test="paramType != null and paramType != '' ">
+                and dl.device_type = #{paramType}
+            </if>
+            and cpm.grade = 40 )
         </if>
         group by
-        year(cur_time)
+        extract(year from cur_time)
         <include refid="commonLastGroupSql"/>
         ) t2 on
         <choose>
@@ -400,56 +516,69 @@
         t1.timeStr,
         t1.sumValue as curValue,
         t2.sumValue as lastValue,
-        case when t2.sumValue > 0 then concat(convert(decimal(18,2),(t1.sumValue - t2.sumValue)/t2.sumValue*100),'%') else '上期无数据' end mom
+        case
+        when t2.sumValue > 0 then concat(to_char( ((t1.sumValue - t2.sumValue)/t2.sumValue*100), 'FM999999999990.00'), '%')
+        else '上期无数据'
+        end as mom
         from
         (
         select
-        convert(varchar(${len}),
-        cur_time,
-        120) as timeStr,
+        substring(to_char(cur_time, 'YYYY-MM-DD HH24:MI:SS') from 1 for ${len}) as timeStr,
         sum(calc_value) as sumValue,
-        year(cur_time) as yearStr
+        extract(year from cur_time) as yearStr
         <include refid="commonSelectSql"/>
         from
         ${tableName1}
         where
         cur_time >= #{startTime}
         and cur_time &lt;= #{endTime}
-        and device_type = #{paramType}
-        and exists(select 1 from device_manage dm where dm.grade between 40 and 50 and dm.device_num = device_num)
+        and dh.device_num in (
+        select
+        cpm.mt_num
+        from
+        collection_params_manage cpm
+        join device_ledger dl on
+        cpm.device_ledger_id = dl.id
+        <if test="paramType != null and paramType != '' ">
+            and dl.device_type = #{paramType}
+        </if>
+        and cpm.grade = 40 )
         group by
-        convert(varchar(${len}),
-        cur_time,
-        120),
-        year(cur_time)
+        substring(to_char(cur_time, 'YYYY-MM-DD HH24:MI:SS') from 1 for ${len}),
+        extract(year from cur_time)
         <include refid="commonGroupSql"/>
         union all
         select
-        convert(varchar(${len}),
-        cur_time,
-        120) as timeStr,
+        substring(to_char(cur_time, 'YYYY-MM-DD HH24:MI:SS') from 1 for ${len}) as timeStr,
         sum(calc_value) as sumValue,
-        year(cur_time) as yearStr
+        extract(year from cur_time) as yearStr
         <include refid="commonSelectSql"/>
         from
         ${tableName2} dh
         where
         cur_time >= #{startTime}
         and cur_time &lt;= #{endTime}
-        and device_type = #{paramType}
-        and exists(select 1 from device_manage dm where dm.grade between 40 and 50 and dm.device_num = dh.device_num)
+        and dh.device_num in (
+        select
+        cpm.mt_num
+        from
+        collection_params_manage cpm
+        join device_ledger dl on
+        cpm.device_ledger_id = dl.id
+        <if test="paramType != null and paramType != '' ">
+            and dl.device_type = #{paramType}
+        </if>
+        and cpm.grade = 40 )
         group by
-        convert(varchar(${len}),
-        cur_time,
-        120),
-        year(cur_time)
+        substring(to_char(cur_time, 'YYYY-MM-DD HH24:MI:SS') from 1 for ${len}),
+        extract(year from cur_time)
         <include refid="commonGroupSql"/>
         ) t1
         left join
         (
         select
         sum(calc_value) as sumValue,
-        year(cur_time) as yearStr
+        extract(year from cur_time) as yearStr
         <include refid="commonLastSelectSql"/>
         from
         ${tableName1}
@@ -458,22 +587,31 @@
         and cur_time &lt;= #{momEndTime}
         and device_type = #{paramType}
         group by
-        year(cur_time)
+        extract(year from cur_time)
         <include refid="commonLastGroupSql"/>
         union all
         select
         sum(calc_value) as sumValue,
-        year(cur_time) as yearStr
+        extract(year from cur_time) as yearStr
         <include refid="commonLastSelectSql"/>
         from
         ${tableName2} dh
         where
         cur_time >= #{momStartTime}
         and cur_time &lt;= #{momEndTime}
-        and device_type = #{paramType}
-        and exists(select 1 from device_manage dm where dm.grade between 40 and 50 and dm.device_num = dh.device_num)
+        and dh.device_num in (
+        select
+        cpm.mt_num
+        from
+        collection_params_manage cpm
+        join device_ledger dl on
+        cpm.device_ledger_id = dl.id
+        <if test="paramType != null and paramType != '' ">
+            and dl.device_type = #{paramType}
+        </if>
+        and cpm.grade = 40 )
         group by
-        year(cur_time)
+        extract(year from cur_time)
         <include refid="commonLastGroupSql"/>
         ) t2 on
         <choose>
@@ -626,131 +764,163 @@
     </select>
 
     <select id="queryLineDataSysByOne" resultType="com.mh.common.core.domain.entity.ConsumptionAnalyze">
-        select sum(isnull(calc_value,0.00)) as curValue, 'efrMeter' as device_type, convert(varchar(16),cur_time,20) as timeStr from ${curTable} dy
-        where cur_time >= #{startTime} and cur_time  &lt;= #{endTime}
-          and exists (
-            select
-                1
-            from
-                device_manage
-            where
-                device_num = dy.device_num and grade &lt; 150 and grade >=140
-        )
-        and dy.device_type = 'meter'
-        group by device_type, cur_time
-        union all
-        select avg(isnull(calc_value,0.00)) as curValue, 'efrCloud' as device_type, convert(varchar(16),cur_time,20) as timeStr from ${curTable} dy
-        where cur_time >= #{startTime} and cur_time  &lt;= #{endTime}
-          and exists (
+        select
+            sum(coalesce(calc_value,0)) as curValue,
+            'efrMeter' as deviceType,
+            TO_CHAR(dm.cur_time,
+            'YYYY-MM-DD HH24:MI') as timeStr
+        from
+            ${curTable} dm
+        where
+            dm.cur_time >=  #{startTime}::timestamp
+            and dm.cur_time &lt;= #{endTime}::timestamp
+            and dm.device_num in (
             select
-                1
-            from
-                device_manage
-            where
-                device_num = dy.device_num and grade &lt; 150 and grade >=140
+            cpm.mt_num
+        from
+            collection_params_manage cpm
+        join device_ledger dl
+        on
+            cpm.device_ledger_id = dl.id
+            and dl.device_type = '5'
+            and cpm.grade = 140
         )
-        and dy.device_type = 'cloud'
-        group by device_type, cur_time
+        group by
+            device_type,
+            TO_CHAR(dm.cur_time,
+            'YYYY-MM-DD HH24:MI')
         union all
-        select sum(calc_value) as curValue,device_type as deviceType, convert(varchar(16),cur_time,20) as timeStr from ${curTable} dy
-         where cur_time >= #{startTime} and cur_time  &lt;= #{endTime}
-            and exists (
+        select
+            sum(coalesce(calc_value,0)) as curValue,
+            'efrCloud' as deviceType,
+            TO_CHAR(dm.cur_time,
+                    'YYYY-MM-DD HH24:MI') as timeStr
+        from
+            ${curTable} dm
+        where
+            dm.cur_time >=  #{startTime}::timestamp
+            and dm.cur_time &lt;= #{endTime}::timestamp
+          and dm.device_num in (
             select
-            1
+            cpm.mt_num
             from
-            device_manage
-            where
-            device_num = dy.device_num and grade &lt; 50 and grade >=40
+            collection_params_manage cpm
+            join device_ledger dl
+            on
+            cpm.device_ledger_id = dl.id
+          and dl.device_type = '6'
+          and cpm.grade = 140
             )
-         group by device_type, cur_time
-        union all
-        select avg(isnull(calc_value,0.00)) as curValue, 'cop' as device_type, convert(varchar(16),cur_time,20) as timeStr from ${curCopTable}
-         where cur_time >= #{startTime} and cur_time  &lt;= #{endTime}
-         and device_type = 'system'
-         group by device_type, cur_time
+        group by
+            device_type,
+            TO_CHAR(dm.cur_time,
+            'YYYY-MM-DD HH24:MI')
     </select>
 
     <select id="queryLineDataSysByMany" resultType="com.mh.common.core.domain.entity.ConsumptionAnalyze">
-        select sum(isnull(calc_value,0.00)) as curValue, 'efrMeter' as device_type, convert(varchar(16),cur_time,20) as timeStr from ${lastTable} dy
-        where cur_time >= #{startTime} and cur_time  &lt;= #{endTime}
-          and exists (
+        select
+            sum(coalesce(calc_value,0)) as curValue,
+            'efrMeter' as deviceType,
+            TO_CHAR(dm.cur_time,
+                    'YYYY-MM-DD HH24:MI') as timeStr
+        from
+            ${lastTable} dm
+        where
+            dm.cur_time >=  #{startTime}::timestamp
+            and dm.cur_time &lt;= #{endTime}::timestamp
+          and dm.device_num in (
             select
-                1
+            cpm.mt_num
             from
-                device_manage
-            where
-                device_num = dy.device_num and grade &lt; 150 and grade >=140
-        )
-        and dy.device_type = 'meter'
-        group by device_type, cur_time
+            collection_params_manage cpm
+            join device_ledger dl
+            on
+            cpm.device_ledger_id = dl.id
+          and dl.device_type = '5'
+          and cpm.grade = 140
+            )
+        group by
+            device_type,
+            TO_CHAR(dm.cur_time,
+            'YYYY-MM-DD HH24:MI')
         union all
-        select sum(isnull(calc_value,0.00)) as curValue, 'efrMeter' as device_type, convert(varchar(16),cur_time,20) as timeStr from ${curTable} dt
-        where cur_time >= #{startTime} and cur_time  &lt;= #{endTime}
-          and exists (
+        select
+            sum(coalesce(calc_value,0)) as curValue,
+            'efrCloud' as deviceType,
+            TO_CHAR(dm.cur_time,
+                    'YYYY-MM-DD HH24:MI') as timeStr
+        from
+            ${lastTable} dm
+        where
+            dm.cur_time >=  #{startTime}::timestamp
+            and dm.cur_time &lt;= #{endTime}::timestamp
+          and dm.device_num in (
             select
-                1
+            cpm.mt_num
             from
-                device_manage
-            where
-                device_num = dt.device_num and grade &lt; 150 and grade >=140
-        )
-        and dy.device_type = 'meter'
-        group by device_type, cur_time
+            collection_params_manage cpm
+            join device_ledger dl
+            on
+            cpm.device_ledger_id = dl.id
+          and dl.device_type = '6'
+          and cpm.grade = 140
+            )
+        group by
+            device_type,
+            TO_CHAR(dm.cur_time,
+            'YYYY-MM-DD HH24:MI')
         union all
-        select sum(isnull(calc_value,0.00)) as curValue, 'efrCloud' as device_type, convert(varchar(16),cur_time,20) as timeStr from ${lastTable} dy
-        where cur_time >= #{startTime} and cur_time  &lt;= #{endTime}
-          and exists (
+        select
+            sum(coalesce(calc_value,0)) as curValue,
+            'efrMeter' as deviceType,
+            TO_CHAR(dm.cur_time,
+                    'YYYY-MM-DD HH24:MI') as timeStr
+        from
+            ${curTable} dm
+        where
+            dm.cur_time >=  #{startTime}::timestamp
+            and dm.cur_time &lt;= #{endTime}::timestamp
+          and dm.device_num in (
             select
-                1
+            cpm.mt_num
             from
-                device_manage
-            where
-                device_num = dy.device_num and grade &lt; 150 and grade >=140
-        )
-        and dy.device_type = 'cloud'
-        group by device_type, cur_time
+            collection_params_manage cpm
+            join device_ledger dl
+            on
+            cpm.device_ledger_id = dl.id
+          and dl.device_type = '5'
+          and cpm.grade = 140
+            )
+        group by
+            device_type,
+            TO_CHAR(dm.cur_time,
+            'YYYY-MM-DD HH24:MI')
         union all
-        select sum(isnull(calc_value,0.00)) as curValue, 'efrCloud' as device_type, convert(varchar(16),cur_time,20) as timeStr from ${curTable} dt
-        where cur_time >= #{startTime} and cur_time  &lt;= #{endTime}
-          and exists (
+        select
+            sum(coalesce(calc_value,0)) as curValue,
+            'efrCloud' as deviceType,
+            TO_CHAR(dm.cur_time,
+                    'YYYY-MM-DD HH24:MI') as timeStr
+        from
+            ${curTable} dm
+        where
+            dm.cur_time >=  #{startTime}::timestamp
+            and dm.cur_time &lt;= #{endTime}::timestamp
+          and dm.device_num in (
             select
-                1
+            cpm.mt_num
             from
-                device_manage
-            where
-                device_num = dt.device_num and grade &lt; 150 and grade >=140
-        )
-        and dy.device_type = 'cloud'
-        group by device_type, cur_time
-        union all
-        select sum(calc_value) as curValue,device_type as deviceType, convert(varchar(16),cur_time,20) as timeStr from ${lastTable} dy
-         where cur_time >= #{startTime} and cur_time  &lt;= #{endTime}
-           and exists (
-             select
-                 1
-             from
-                 device_manage
-             where
-                 device_num = dy.device_num and grade &lt; 50 and grade >=40
-         )
-         group by device_type, cur_time
-        union all
-        select sum(calc_value) as curValue,device_type as deviceType, convert(varchar(16),cur_time,20) as timeStr from ${curTable} dt
-         where cur_time >= #{startTime} and cur_time  &lt;= #{endTime}
-           and exists (
-             select
-                 1
-             from
-                 device_manage
-             where
-                 device_num = dt.device_num and grade &lt; 50 and grade >=40
-         )
-         group by device_type, cur_time
-        union all
-        select avg(isnull(calc_value,0.00)) as curValue, 'cop' as device_type, convert(varchar(16),cur_time,20) as timeStr from ${lastCopTable}
-         where cur_time >= #{startTime} and cur_time  &lt;= #{endTime}
-         and device_type = 'system'
-         group by device_type, cur_time
+            collection_params_manage cpm
+            join device_ledger dl
+            on
+            cpm.device_ledger_id = dl.id
+          and dl.device_type = '6'
+          and cpm.grade = 140
+            )
+        group by
+            device_type,
+            TO_CHAR(dm.cur_time,
+            'YYYY-MM-DD HH24:MI')
     </select>
 
     <select id="queryDeviceLineManyTable" resultType="com.mh.common.core.domain.entity.ConsumptionAnalyze">