需量分析查询171、173表调整2

fiveep-persistence/src/main/java/com/bizmatics/persistence/mapper/HtAnalogDataMapper.java

@@ -131,6 +131,11 @@ public interface HtAnalogDataMapper extends CrudMapper<HtAnalogData> {
                                              @Param("endTime") String endTime,
                                              @Param("table") String table);
 
+    List<HtAnalogData> getDemandAnalysisList1(@Param("deviceCode") String deviceCode,
+                                             @Param("startTime") String startTime,
+                                             @Param("endTime") String endTime,
+                                             @Param("table") String table);
+
     List<HtAnalogDataOneVo> energyUseListOne(@Param("deviceCode") String deviceCode,
                                              @Param("startTime") String startTime,
                                              @Param("endTime") String endTime,

fiveep-persistence/src/main/resources/mapper/mysql/HtAnalogDataMapper.xml

@@ -1351,6 +1351,22 @@
     </select>
 
 
+    <select id="getDemandAnalysisList1" resultType="com.bizmatics.model.HtAnalogData">
+        SELECT
+        Demand,freezingTime
+        FROM
+        ${table}
+        WHERE
+        deviceName = #{deviceCode}
+        <if test="endTime != null and startTime != null and endTime != '' and startTime != ''">
+            AND freezingTime BETWEEN #{startTime}
+            AND #{endTime}
+        </if>
+
+        GROUP BY
+        freezingTime
+    </select>
+
     <select id="yearOnYearThree" parameterType="java.util.List" resultType="com.bizmatics.model.vo.HtAnalogDataVo">
         SELECT
         a.id,

fiveep-service/src/main/java/com/bizmatics/service/impl/HtAnalogDataServiceImpl.java

@@ -881,7 +881,7 @@ public class HtAnalogDataServiceImpl extends AbstractCrudService<HtAnalogDataMap
                 table = "ht_analog_173_data";
             }
         }
-        List<HtAnalogData> list1 = baseMapper.getDemandAnalysisList(deviceCode, date1, date2, table);
+        List<HtAnalogData> list1 = baseMapper.getDemandAnalysisList1(deviceCode, date1, date2, table);
         List<Object> demandList = new ArrayList<>();
         List<Object> freezingTimesList = new ArrayList<>();
         for (int i = 0; i < list1.size(); i++) {