数据管理-同比分析报表-统计图查询

fiveep-controller/src/main/java/com/bizmatics/controller/web/DeviceController.java

@@ -83,5 +83,18 @@ public class DeviceController {
     public ApiResult<List<DeviceList>> deviceList(@RequestParam String siteId) {
         return ApiResult.success(deviceService.deviceList(siteId));
     }
+
+
+    /**
+     * 数据管理-同比分析报表-右侧设备查询
+     * @param siteId 站点ID
+     * @param deviceType 设备类型 默认1、用电设备
+     * @return
+     */
+    @GetMapping("dataManagementDeviceList")
+    public ApiResult<List<Device>> dataManagementDeviceList(@RequestParam int siteId,
+                                                            @RequestParam(value = "deviceType", required = false, defaultValue = "1") int deviceType) {
+        return ApiResult.success(deviceService.dataManagementDeviceList(siteId,deviceType));
+    }
 }
 

fiveep-controller/src/main/java/com/bizmatics/controller/web/HtAnalogDataController.java

@@ -2,6 +2,8 @@ package com.bizmatics.controller.web;
 
 
 import com.bizmatics.common.core.bean.ApiResult;
+import com.bizmatics.model.HtAnalogData;
+import com.bizmatics.model.vo.HtAnalogDataVo;
 import com.bizmatics.service.HtAnalogDataService;
 import com.bizmatics.service.impl.HtAnalogDataServiceImpl;
 import com.bizmatics.service.vo.CommonIcoVO;
@@ -32,74 +34,92 @@ public class HtAnalogDataController {
 
     /**
      * 首页日/月/年用电量
+     *
      * @return
      */
     @GetMapping("count")
-    public ApiResult<HadCountVO> count(){
+    public ApiResult<HadCountVO> count() {
         return ApiResult.success(htAnalogDataService.selectCount());
     }
 
     /**
      * 今日/昨日用电趋势
+     *
      * @param siteId 站点id
      * @return
      */
     @GetMapping("eptrendIco")
-    public ApiResult<List<CommonIcoVO>> getTrendByDate(@RequestParam(required = false) Integer siteId){
+    public ApiResult<List<CommonIcoVO>> getTrendByDate(@RequestParam(required = false) Integer siteId) {
         return ApiResult.success(htAnalogDataService.selectTrendByDate(siteId));
     }
 
     /**
      * 当月用电趋势图
+     *
      * @return
      */
     @GetMapping("eptrendIcoMonth")
-    public ApiResult<List<CommonIcoVO>> getTrendByMonth(){
+    public ApiResult<List<CommonIcoVO>> getTrendByMonth() {
         return ApiResult.success(htAnalogDataService.selectTrendByMonth());
     }
 
 
     /**
      * 站点日/月/年用电量
+     *
      * @param siteId 站点id
      * @return
      */
     @GetMapping("dayMonthYearEp")
-    public ApiResult<HadCountVO> getCountBySite(@RequestParam Integer siteId){
+    public ApiResult<HadCountVO> getCountBySite(@RequestParam Integer siteId) {
         return ApiResult.success(htAnalogDataService.getCountBySite(siteId));
     }
 
 
     /**
      * 分时电量
+     *
      * @param siteId 站点id
-     * @param type 时间
+     * @param type   时间
      * @return
      */
     @GetMapping("timeShare")
-    public ApiResult<TimeShareVO> getTimeShare(@RequestParam Integer siteId,@RequestParam Integer type){
-        return ApiResult.success(htAnalogDataService.getTimeShare(siteId,type));
+    public ApiResult<TimeShareVO> getTimeShare(@RequestParam Integer siteId, @RequestParam Integer type) {
+        return ApiResult.success(htAnalogDataService.getTimeShare(siteId, type));
     }
 
     /**
      * 需量趋势图
+     *
      * @param siteId 站点id
      * @return
      */
     @GetMapping("demandIco")
-    public ApiResult<List<CommonIcoVO>> getDemandIco(@RequestParam Integer siteId){
+    public ApiResult<List<CommonIcoVO>> getDemandIco(@RequestParam Integer siteId) {
         return ApiResult.success(htAnalogDataService.getDemandIco(siteId));
     }
 
     /**
      * 历史记录电流电压
+     *
      * @param siteId 站点id
-     * @param date 时间
+     * @param date   时间
      * @return
      */
     @GetMapping("electricIco")
-    public ApiResult<List<CommonIcoVO>> getElectricIco(@RequestParam Integer siteId,@RequestParam Date date){
-        return ApiResult.success(htAnalogDataService.getElectricIco(siteId,date));
+    public ApiResult<List<CommonIcoVO>> getElectricIco(@RequestParam Integer siteId, @RequestParam Date date) {
+        return ApiResult.success(htAnalogDataService.getElectricIco(siteId, date));
     }
+
+
+    @GetMapping("yearOnYearList")
+    public ApiResult<List<CommonIcoVO>> yearOnYearList(@RequestParam String deviceCode,
+                                                       @RequestParam String displayField,
+                                                       @RequestParam(value = "type", required = false, defaultValue = "0") int type,
+                                                       @RequestParam(required = false) String startTime,
+                                                       @RequestParam(required = false) String endTime) {
+        return ApiResult.success(htAnalogDataService.yearOnYearList(deviceCode, type, startTime, endTime, displayField));
+    }
+
 }
 

fiveep-controller/src/main/java/com/bizmatics/controller/web/PowerQualityConfigController.java

@@ -3,10 +3,7 @@ package com.bizmatics.controller.web;
 
 import com.bizmatics.common.core.bean.ApiResult;
 import com.bizmatics.model.PowerQualityConfig;
-import com.bizmatics.model.WcBlackoutPlan;
-import com.bizmatics.model.vo.WcBlackoutPlanVo;
 import com.bizmatics.service.PowerQualityConfigService;
-import com.bizmatics.service.WcBlackoutPlanService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -14,7 +11,7 @@ import java.util.List;
 
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author ya
@@ -29,6 +26,7 @@ public class PowerQualityConfigController {
 
     /**
      * 站点管理-电能质量评分配置-新增
+     *
      * @param powerQualityConfig
      * @return
      */
@@ -40,6 +38,7 @@ public class PowerQualityConfigController {
 
     /**
      * 站点管理-电能质量评分配置-修改
+     *
      * @param powerQualityConfig
      * @return
      */
@@ -51,6 +50,7 @@ public class PowerQualityConfigController {
 
     /**
      * 站点管理-电能质量评分配置-注销
+     *
      * @param id 电能质量评分配置表主键ID
      * @return
      */
@@ -62,6 +62,7 @@ public class PowerQualityConfigController {
 
     /**
      * 站点管理-电能质量评分配置-查询
+     *
      * @param siteId 站点ID
      * @return
      */

fiveep-model/src/main/java/com/bizmatics/model/vo/HtAnalogDataVo.java

@@ -0,0 +1,417 @@
+package com.bizmatics.model.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author ya
+ * @since 2021-07-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class HtAnalogDataVo implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 伍继电力test_183消费组模拟量数据表ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 阿里云平台设备名称
+     */
+    @TableField("deviceName")
+    private String deviceName;
+
+    /**
+     * 母线停电次数
+     */
+    @TableField("Busot")
+    private Integer Busot;
+
+    /**
+     * 三相功率因数
+     */
+    @TableField("COS")
+    private Double cos;
+
+    /**
+     * A相功率因数
+     */
+    @TableField("COSa")
+    private Double COSa;
+
+    /**
+     * B相功率因数
+     */
+    @TableField("COSb")
+    private Double COSb;
+
+    /**
+     * C相功率因数
+     */
+    @TableField("COSc")
+    private Double COSc;
+
+    /**
+     * 实时有功需量
+     */
+    @TableField("Demand")
+    private Double Demand;
+
+    /**
+     * 设备复位次数
+     */
+    @TableField("DevResetTimes")
+    private Integer DevResetTimes;
+
+    /**
+     * 设备温度
+     */
+    @TableField("DeviceTemp")
+    private Double DeviceTemp;
+
+    /**
+     * 三相反向有功电度
+     */
+    @TableField("Epn")
+    private Double Epn;
+
+    /**
+     * 尖段反向有功电度
+     */
+    @TableField("Epn1")
+    private Double Epn1;
+
+    /**
+     * 峰段反向有功电度
+     */
+    @TableField("Epn2")
+    private Double Epn2;
+
+    /**
+     * 平段反向有功电度
+     */
+    @TableField("Epn3")
+    private Double Epn3;
+
+    /**
+     * 谷段反向有功电度
+     */
+    @TableField("Epn4")
+    private Double Epn4;
+
+    /**
+     * 三相正向有功电度
+     */
+    @TableField("Epp")
+    private Double Epp;
+
+    /**
+     * 尖段正向有功电度
+     */
+    @TableField("Epp1")
+    private Double Epp1;
+
+    /**
+     * 峰段正向有功电度
+     */
+    @TableField("Epp2")
+    private Double Epp2;
+
+    /**
+     * 平段正向有功电度
+     */
+    @TableField("Epp3")
+    private Double Epp3;
+
+    /**
+     * 谷段正向有功电度
+     */
+    @TableField("Epp4")
+    private Double Epp4;
+
+    /**
+     * 三相反向无功电度
+     */
+    @TableField("Eqn")
+    private Double Eqn;
+
+    /**
+     * 三相正向无功电度
+     */
+    @TableField("Eqp")
+    private Double Eqp;
+
+    /**
+     * 频率
+     */
+    @TableField("F")
+    private Double f;
+
+    /**
+     * 零序电流
+     */
+    @TableField("I0")
+    private Double i0;
+
+    /**
+     * 负序电流
+     */
+    @TableField("I2")
+    private Double i2;
+
+    /**
+     * A相总谐波电流
+     */
+    @TableField("IHa")
+    private Double IHa;
+
+    /**
+     * B相总谐波电流
+     */
+    @TableField("IHb")
+    private Double IHb;
+
+    /**
+     * C相总谐波电流
+     */
+    @TableField("IHc")
+    private Double IHc;
+
+    /**
+     * A相电流
+     */
+    @TableField("Ia")
+    private Double Ia;
+
+    /**
+     * B相电流
+     */
+    @TableField("Ib")
+    private Double Ib;
+
+    /**
+     * C相电流
+     */
+    @TableField("Ic")
+    private Double Ic;
+
+    /**
+     * 剩余电流
+     */
+    @TableField("Ir")
+    private Double Ir;
+
+    /**
+     * 昨日有功最大需量
+     */
+    @TableField("LastDayMD")
+    private Double LastDayMD;
+
+    /**
+     * 昨日有功最大需量发生时间
+     */
+    @TableField("LastDayMDt")
+    private Double LastDayMDt;
+
+    /**
+     * 三相总有功功率
+     */
+    @TableField("P")
+    private Double p;
+
+    /**
+     * A相有功功率
+     */
+    @TableField("Pa")
+    private Double Pa;
+
+    /**
+     * B相有功功率
+     */
+    @TableField("Pb")
+    private Double Pb;
+
+    /**
+     * C相有功功率
+     */
+    @TableField("Pc")
+    private Double Pc;
+
+    /**
+     * 三相总无功功率
+     */
+    @TableField("Q")
+    private Double q;
+
+    /**
+     * A相无功功率
+     */
+    @TableField("Qa")
+    private Double Qa;
+
+    /**
+     * B相无功功率
+     */
+    @TableField("Qb")
+    private Double Qb;
+
+    /**
+     * C相无功功率
+     */
+    @TableField("Qc")
+    private Double Qc;
+
+    /**
+     * 信号强度
+     */
+    @TableField("SignalIntensity")
+    private Double SignalIntensity;
+
+    /**
+     * 第1路温度
+     */
+    @TableField("T1")
+    private Double t1;
+
+    /**
+     * 第2路温度
+     */
+    @TableField("T2")
+    private Double t2;
+
+    /**
+     * 第3路温度
+     */
+    @TableField("T3")
+    private Double t3;
+
+    /**
+     * 第4路温度
+     */
+    @TableField("T4")
+    private Double t4;
+
+    /**
+     * A相电压THD
+     */
+    @TableField("THDUa")
+    private Double THDUa;
+
+    /**
+     * B相电压THD
+     */
+    @TableField("THDUb")
+    private Double THDUb;
+
+    /**
+     * C相电压THD
+     */
+    @TableField("THDUc")
+    private Double THDUc;
+
+    /**
+     * A相电压
+     */
+    @TableField("Ua")
+    private Double Ua;
+
+    /**
+     * AB线电压
+     */
+    @TableField("Uab")
+    private Double Uab;
+
+    /**
+     * B相电压
+     */
+    @TableField("Ub")
+    private Double Ub;
+
+    /**
+     * BC线电压
+     */
+    @TableField("Ubc")
+    private Double Ubc;
+
+    /**
+     * 零序电压不平衡度
+     */
+    @TableField("UblU0")
+    private Double UblU0;
+
+    /**
+     * 负序电压不平衡度
+     */
+    @TableField("UblU2")
+    private Double UblU2;
+
+    /**
+     * C相电压
+     */
+    @TableField("Uc")
+    private Double Uc;
+
+    /**
+     * CA线电压
+     */
+    @TableField("Uca")
+    private Double Uca;
+
+    /**
+     * 电压暂降次数
+     */
+    @TableField("Udt")
+    private Integer Udt;
+
+    /**
+     * 线路侧电压
+     */
+    @TableField("Ul")
+    private Double Ul;
+
+    /**
+     * 电压暂升次数
+     */
+    @TableField("Upt")
+    private Integer Upt;
+
+    /**
+     * 电压短时中断次数
+     */
+    @TableField("Ust")
+    private Integer Ust;
+
+    /**
+     * 冻结时间
+     */
+//    @TableField("freezingTime")
+    private String freezingTimes;
+
+    /**
+     * 上报时间
+     */
+    @TableField("dataTime")
+    private Date dataTime;
+
+
+    @TableField(exist = false)
+    private Integer siteId;
+
+
+}

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.bizmatics.model.AlarmPower;
 import com.bizmatics.model.HtAnalogData;
 import com.bizmatics.common.mvc.base.CrudMapper;
+import com.bizmatics.model.vo.HtAnalogDataVo;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -14,7 +15,7 @@ import java.util.Map;
 
 /**
  * <p>
- *  Mapper 接口
+ * Mapper 接口
  * </p>
  *
  * @author ya
@@ -26,24 +27,24 @@ public interface HtAnalogDataMapper extends CrudMapper<HtAnalogData> {
 
     HtAnalogData selectByEndTime(@Param("startTime") Date startTime,
                                  @Param("endTime") Date endTime,
-                                 @Param("siteId")Integer siteId,
-                                 @Param("userId")Integer userId);
+                                 @Param("siteId") Integer siteId,
+                                 @Param("userId") Integer userId);
 
 
     HtAnalogData selectByStartTime(@Param("startTime") Date startTime,
                                    @Param("endTime") Date endTime,
-                                   @Param("siteId")Integer siteId,
-                                   @Param("userId")Integer userId);
+                                   @Param("siteId") Integer siteId,
+                                   @Param("userId") Integer userId);
 
 
-    Map<String,Double> selectMaxAndMinAndAvg(@Param("siteId") Integer siteId,
-                                             @Param("startTime") Date startTime,
-                                             @Param("endTime") Date endTime);
+    Map<String, Double> selectMaxAndMinAndAvg(@Param("siteId") Integer siteId,
+                                              @Param("startTime") Date startTime,
+                                              @Param("endTime") Date endTime);
 
 
     Double selectCount(@Param("siteId") Integer siteId,
-                                             @Param("startTime") Date startTime,
-                                             @Param("endTime") Date endTime);
+                       @Param("startTime") Date startTime,
+                       @Param("endTime") Date endTime);
 
 
     List<HtAnalogData> list(@Param("startTime") Date startTime,
@@ -51,12 +52,26 @@ public interface HtAnalogDataMapper extends CrudMapper<HtAnalogData> {
                             @Param("deviceCode") String deviceCode);
 
 
-    List<HtAnalogData> page(@Param("current")Integer current,
-                            @Param("size")Integer size,
-                          @Param("startTime") Date startTime,
-                          @Param("endTime") Date endTime);
+    List<HtAnalogData> page(@Param("current") Integer current,
+                            @Param("size") Integer size,
+                            @Param("startTime") Date startTime,
+                            @Param("endTime") Date endTime);
 
 
-    List<Map<String,Object>> getDateList(@Param("startTime") Date startTime,
-                                         @Param("endTime") Date endTime);
+    List<Map<String, Object>> getDateList(@Param("startTime") Date startTime,
+                                          @Param("endTime") Date endTime);
+
+    List<HtAnalogDataVo> yearOnYearOne(@Param("deviceCode") String deviceCode,
+                                     @Param("type") Integer type,
+                                     @Param("startTime") String startTime,
+                                     @Param("endTime") String endTime);
+
+    List<HtAnalogDataVo> yearOnYearTwo(@Param("deviceCode") String deviceCode,
+                                       @Param("startTime") String startTime,
+                                       @Param("endTime") String endTime);
+
+    List<HtAnalogDataVo> yearOnYearThree(@Param("deviceCode") String deviceCode,
+                                       @Param("startTime") String startTime,
+                                       @Param("endTime") String endTime);
+
 }

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

@@ -120,4 +120,56 @@
     </select>
 
 
+    <select id="yearOnYearOne" resultType="com.bizmatics.model.vo.HtAnalogDataVo">
+        select
+        id,deviceName,AVG(Busot) AS Busot,AVG(COS) as COS,AVG(COSa) as COSa,AVG(COSb) as COSb,AVG(COSc) as COSc,AVG(Demand) as Demand,AVG(DevResetTimes) as DevResetTimes,AVG(DeviceTemp) as DeviceTemp,
+        AVG(Epn) as Epn,AVG(Epn1) as Epn1,AVG(Epn2) as Epn2,AVG(Epn3) as Epn3,AVG(Epn4) as Epn4,AVG(Epp) as Epp,AVG(Epp1) as Epp1,AVG(Epp2) as Epp2,AVG(Epp3) as Epp3,AVG(Epp4) as Epp4,AVG(Eqn) as Eqn,
+        AVG(Eqp) as Eqp,AVG(F) as F,AVG(I0) as I0,AVG(I2) as I2,AVG(IHa) as IHa,AVG(IHb) as IHb,AVG(IHc) as IHc,AVG(Ia) as Ia,AVG(Ib) as Ib,AVG(Ic) as Ic,AVG(Ir) as Ir,AVG(LastDayMD) as LastDayMD,
+        AVG(LastDayMDt) as LastDayMDt,AVG(P) as P,AVG(Pa) as Pa,AVG(Pb) as Pb,AVG(Pc) as Pc,AVG(Q) as Q,AVG(Qa) as Qa,AVG(Qb) as Qb,AVG(Qc) as Qc,AVG(SignalIntensity) as SignalIntensity,AVG(T1) as T1,
+        AVG(T2) as T2,AVG(T3) as T3,AVG(T4) as T4,AVG(THDUa) as THDUa,AVG(THDUb) as THDUb,AVG(THDUc) as THDUc,AVG(Ua) as Ua,AVG(Uab) as Uab,AVG(Ub) as Ub,AVG(Ubc) as Ubc,AVG(UblU0) as UblU0,AVG(UblU2) as UblU2,
+        AVG(Uc) as Uc,AVG(Uca) as Uca,AVG(Udt) as Udt,AVG(Ul) as Ul,AVG(Upt) as Upt,AVG(Ust) as Ust,FROM_UNIXTIME(UNIX_TIMESTAMP(dataTime) , '%m-%d %H:%i') as freezingTimes,dataTime
+        from ht_analog_data
+        <where>
+                and deviceName = #{deviceCode}
+            <if test="endTime != null and startTime != null and endTime != '' and startTime != ''">
+                and dataTime BETWEEN #{startTime} and #{endTime}
+            </if>
+        </where>
+        <if test="type != 0">
+            GROUP BY freezingTime
+        </if>
+    </select>
+
+    <select id="yearOnYearTwo" resultType="com.bizmatics.model.vo.HtAnalogDataVo">
+        select
+        id,deviceName,AVG(Busot) AS Busot,AVG(COS) as COS,AVG(COSa) as COSa,AVG(COSb) as COSb,AVG(COSc) as COSc,AVG(Demand) as Demand,AVG(DevResetTimes) as DevResetTimes,AVG(DeviceTemp) as DeviceTemp,
+        AVG(Epn) as Epn,AVG(Epn1) as Epn1,AVG(Epn2) as Epn2,AVG(Epn3) as Epn3,AVG(Epn4) as Epn4,AVG(Epp) as Epp,AVG(Epp1) as Epp1,AVG(Epp2) as Epp2,AVG(Epp3) as Epp3,AVG(Epp4) as Epp4,AVG(Eqn) as Eqn,
+        AVG(Eqp) as Eqp,AVG(F) as F,AVG(I0) as I0,AVG(I2) as I2,AVG(IHa) as IHa,AVG(IHb) as IHb,AVG(IHc) as IHc,AVG(Ia) as Ia,AVG(Ib) as Ib,AVG(Ic) as Ic,AVG(Ir) as Ir,AVG(LastDayMD) as LastDayMD,
+        AVG(LastDayMDt) as LastDayMDt,AVG(P) as P,AVG(Pa) as Pa,AVG(Pb) as Pb,AVG(Pc) as Pc,AVG(Q) as Q,AVG(Qa) as Qa,AVG(Qb) as Qb,AVG(Qc) as Qc,AVG(SignalIntensity) as SignalIntensity,AVG(T1) as T1,
+        AVG(T2) as T2,AVG(T3) as T3,AVG(T4) as T4,AVG(THDUa) as THDUa,AVG(THDUb) as THDUb,AVG(THDUc) as THDUc,AVG(Ua) as Ua,AVG(Uab) as Uab,AVG(Ub) as Ub,AVG(Ubc) as Ubc,AVG(UblU0) as UblU0,AVG(UblU2) as UblU2,
+        AVG(Uc) as Uc,AVG(Uca) as Uca,AVG(Udt) as Udt,AVG(Ul) as Ul,AVG(Upt) as Upt,AVG(Ust) as Ust,FROM_UNIXTIME(UNIX_TIMESTAMP(dataTime) , '%m-%d %H:%i') as freezingTimes,dataTime
+        from ht_analog_data
+        <where>
+            and deviceName = #{deviceCode}
+            <if test="endTime != null and startTime != null and endTime != '' and startTime != ''">
+                and dataTime BETWEEN #{startTime} and #{endTime}
+            </if>
+        </where>
+        GROUP BY freezingTimes
+    </select>
+
+    <select id="yearOnYearThree" resultType="com.bizmatics.model.vo.HtAnalogDataVo">
+        select
+        id,deviceName,Busot,COS,COSa,COSb,COSc,Demand,DevResetTimes,DeviceTemp,Epn,Epn1,Epn2,Epn3,Epn4,Epp,
+        Epp1,Epp2,Epp3,Epp4,Eqn,Eqp,F,I0,I2,IHa,IHb,IHc,Ia,Ib,Ic,Ir,LastDayMD,LastDayMDt,P,Pa,Pb,Pc,Q,Qa,Qb,Qc,SignalIntensity,
+        T1,T2,T3,T4,THDUa,THDUb,THDUc,Ua,Uab,Ub,Ubc,UblU0,UblU2,Uc,Uca,Udt,Ul,Upt,Ust,FROM_UNIXTIME(UNIX_TIMESTAMP(dataTime) , '%m-%d %H:%i') as freezingTimes,dataTime
+        from ht_analog_data
+        <where>
+            and deviceName = #{deviceCode}
+            <if test="endTime != null and startTime != null and endTime != '' and startTime != ''">
+                and dataTime BETWEEN #{startTime} and #{endTime}
+            </if>
+        </where>
+        GROUP BY dataTime
+    </select>
 </mapper>

fiveep-service/src/main/java/com/bizmatics/service/DeviceService.java

@@ -34,4 +34,6 @@ public interface DeviceService extends CrudService<Device> {
     DeviceCountVO selectDeviceCountByType(Integer site);
 
     List<DeviceList> deviceList(String siteId);
+
+    List<Device> dataManagementDeviceList(int siteId,int deviceType);
 }

fiveep-service/src/main/java/com/bizmatics/service/HtAnalogDataService.java

@@ -2,6 +2,7 @@ package com.bizmatics.service;
 
 import com.bizmatics.model.HtAnalogData;
 import com.bizmatics.common.mvc.base.CrudService;
+import com.bizmatics.model.vo.HtAnalogDataVo;
 import com.bizmatics.service.vo.CommonIcoVO;
 import com.bizmatics.service.vo.HadCountVO;
 import com.bizmatics.service.vo.TimeShareVO;
@@ -73,5 +74,7 @@ public interface HtAnalogDataService extends CrudService<HtAnalogData> {
     List<CommonIcoVO> getElectricIco(Integer siteId,Date date);
 
 
+    List<CommonIcoVO> yearOnYearList(String deviceCode, int type, String startTime, String endTime,String displayField);
+
 
 }

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

@@ -1,8 +1,11 @@
 package com.bizmatics.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.bizmatics.common.mvc.base.AbstractCrudService;
 import com.bizmatics.model.Device;
 import com.bizmatics.model.DeviceList;
+import com.bizmatics.model.PowerQualityConfig;
 import com.bizmatics.model.TemplateData;
 import com.bizmatics.persistence.mapper.DeviceMapper;
 import com.bizmatics.service.DeviceService;
@@ -12,6 +15,7 @@ import com.bizmatics.service.util.SecurityUtils;
 import com.bizmatics.service.vo.DeviceCountVO;
 import org.springframework.stereotype.Service;
 
+import java.sql.Wrapper;
 import java.util.Date;
 import java.util.List;
 import java.util.Optional;
@@ -79,4 +83,13 @@ public class DeviceServiceImpl extends AbstractCrudService<DeviceMapper, Device>
         DeviceList = baseMapper.DeviceList(Integer.parseInt(siteId));
         return DeviceList;
     }
+
+    @Override
+    public List<Device> dataManagementDeviceList(int siteId,int deviceType){
+        LambdaQueryWrapper<Device> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(Device::getEnable, 1).eq(Device::getSiteId, siteId);
+        List<Device> deviceList = this.list(queryWrapper);
+        return deviceList;
+    }
+
 }

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

@@ -4,8 +4,10 @@ import com.bizmatics.common.core.util.Arith;
 import com.bizmatics.common.core.util.DateUtils;
 import com.bizmatics.common.mvc.base.AbstractCrudService;
 import com.bizmatics.common.spring.util.JsonUtils;
+import com.bizmatics.model.GroupingList;
 import com.bizmatics.model.HadSiteStatic;
 import com.bizmatics.model.HtAnalogData;
+import com.bizmatics.model.vo.HtAnalogDataVo;
 import com.bizmatics.persistence.mapper.HtAnalogDataMapper;
 import com.bizmatics.service.HadSiteStaticService;
 import com.bizmatics.service.HtAnalogDataService;
@@ -17,10 +19,7 @@ import com.fasterxml.jackson.core.type.TypeReference;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Optional;
+import java.util.*;
 
 
 /**
@@ -207,7 +206,6 @@ public class HtAnalogDataServiceImpl extends AbstractCrudService<HtAnalogDataMap
             maxList.add(hadSiteStatics.stream()
                     .filter(hadSiteStatic -> DateUtils.isEffectiveDate(hadSiteStatic.getHadTime(), dayStartTime, dayEndTime)
                     ).findFirst().map(HadSiteStatic::getMaxDemand).orElse(0.00));
-
             minList.add(hadSiteStatics.stream()
                     .filter(hadSiteStatic -> DateUtils.isEffectiveDate(hadSiteStatic.getHadTime(), dayStartTime, dayEndTime)
                     ).findFirst().map(HadSiteStatic::getMinDemand).orElse(0.00));
@@ -270,4 +268,331 @@ public class HtAnalogDataServiceImpl extends AbstractCrudService<HtAnalogDataMap
         return list;
     }
 
+
+    @Override
+    public List<CommonIcoVO> yearOnYearList(String deviceCode,int type,String startTime,String endTime,String displayField){
+        List<HtAnalogDataVo> yearOnYearList = null;
+        if (type==1){
+            yearOnYearList = baseMapper.yearOnYearOne(deviceCode,type,startTime,endTime);
+        }else if (type==2){
+            yearOnYearList = baseMapper.yearOnYearTwo(deviceCode,startTime,endTime);
+        }else {
+            yearOnYearList = baseMapper.yearOnYearThree(deviceCode,startTime,endTime);
+        }
+        String[] arr = displayField.split(",");
+        List<Object> BusotList = new ArrayList<>();
+        List<Object> COSList = new ArrayList<>();
+        List<Object> COSaList = new ArrayList<>();
+        List<Object> COSbList = new ArrayList<>();
+        List<Object> COScList = new ArrayList<>();
+        List<Object> DemandList = new ArrayList<>();
+        List<Object> DevResetTimesList = new ArrayList<>();
+        List<Object> DeviceTempList = new ArrayList<>();
+        List<Object> EpnList = new ArrayList<>();
+        List<Object> Epn1List = new ArrayList<>();
+        List<Object> Epn2List = new ArrayList<>();
+        List<Object> Epn3List = new ArrayList<>();
+        List<Object> Epn4List = new ArrayList<>();
+        List<Object> EppList = new ArrayList<>();
+        List<Object> Epp1List = new ArrayList<>();
+        List<Object> Epp2List = new ArrayList<>();
+        List<Object> Epp3List = new ArrayList<>();
+        List<Object> Epp4List = new ArrayList<>();
+        List<Object> EqnList = new ArrayList<>();
+        List<Object> EqpList = new ArrayList<>();
+        List<Object> FList = new ArrayList<>();
+        List<Object> I0List = new ArrayList<>();
+        List<Object> I2List = new ArrayList<>();
+        List<Object> IHaList = new ArrayList<>();
+        List<Object> IHbList = new ArrayList<>();
+        List<Object> IHcList = new ArrayList<>();
+        List<Object> IaList = new ArrayList<>();
+        List<Object> IbList = new ArrayList<>();
+        List<Object> IcList = new ArrayList<>();
+        List<Object> IrList = new ArrayList<>();
+        List<Object> LastDayMDList = new ArrayList<>();
+        List<Object> LastDayMDtList = new ArrayList<>();
+        List<Object> PList = new ArrayList<>();
+        List<Object> PaList = new ArrayList<>();
+        List<Object> PbList = new ArrayList<>();
+        List<Object> PcList = new ArrayList<>();
+        List<Object> QList = new ArrayList<>();
+        List<Object> QaList = new ArrayList<>();
+        List<Object> QbList = new ArrayList<>();
+        List<Object> QcList = new ArrayList<>();
+        List<Object> SignalIntensityList = new ArrayList<>();
+        List<Object> T1List = new ArrayList<>();
+        List<Object> T2List = new ArrayList<>();
+        List<Object> T3List = new ArrayList<>();
+        List<Object> T4List = new ArrayList<>();
+        List<Object> THDUaList = new ArrayList<>();
+        List<Object> THDUbList = new ArrayList<>();
+        List<Object> THDUcList = new ArrayList<>();
+        List<Object> UaList = new ArrayList<>();
+        List<Object> UabList = new ArrayList<>();
+        List<Object> UbList = new ArrayList<>();
+        List<Object> UbcList = new ArrayList<>();
+        List<Object> UblU0List = new ArrayList<>();
+        List<Object> UblU2List = new ArrayList<>();
+        List<Object> UcList = new ArrayList<>();
+        List<Object> UcaList = new ArrayList<>();
+        List<Object> UdtList = new ArrayList<>();
+        List<Object> UlList = new ArrayList<>();
+        List<Object> UptList = new ArrayList<>();
+        List<Object> freezingTimesList = new ArrayList<>();
+        List<Object> UstList = new ArrayList<>();
+
+        if (yearOnYearList.size()>0){
+            for (int i = 0; i < yearOnYearList.size(); i++) {
+                freezingTimesList.add(yearOnYearList.get(i).getFreezingTimes());
+                if (Arrays.asList(arr).contains("Busot")){
+                    BusotList.add(yearOnYearList.get(i).getBusot());
+                }
+
+                if (Arrays.asList(arr).contains("Ust")){
+                    UstList.add(yearOnYearList.get(i).getUst());
+                }
+                if (Arrays.asList(arr).contains("Upt")){
+                    UptList.add(yearOnYearList.get(i).getUpt());
+                }
+                if (Arrays.asList(arr).contains("Ul")){
+                    UlList.add(yearOnYearList.get(i).getUl());
+                }
+                if (Arrays.asList(arr).contains("Udt")){
+                    UdtList.add(yearOnYearList.get(i).getUdt());
+                }
+                if (Arrays.asList(arr).contains("Uca")){
+                    UcaList.add(yearOnYearList.get(i).getUca());
+                }
+                if (Arrays.asList(arr).contains("Uc")){
+                    UcList.add(yearOnYearList.get(i).getUc());
+                }
+                if (Arrays.asList(arr).contains("UblU2")){
+                    UblU2List.add(yearOnYearList.get(i).getUblU2());
+                }
+                if (Arrays.asList(arr).contains("UblU0")){
+                    UblU0List.add(yearOnYearList.get(i).getUblU0());
+                }
+                if (Arrays.asList(arr).contains("Ubc")){
+                    UbcList.add(yearOnYearList.get(i).getUbc());
+                }
+                if (Arrays.asList(arr).contains("Ub")){
+                    UbList.add(yearOnYearList.get(i).getUb());
+                }
+                if (Arrays.asList(arr).contains("Uab")){
+                    UabList.add(yearOnYearList.get(i).getUab());
+                }
+                if (Arrays.asList(arr).contains("Ua")){
+                    UaList.add(yearOnYearList.get(i).getUa());
+                }
+                if (Arrays.asList(arr).contains("THDUc")){
+                    THDUcList.add(yearOnYearList.get(i).getTHDUc());
+                }
+                if (Arrays.asList(arr).contains("THDUb")){
+                    THDUbList.add(yearOnYearList.get(i).getTHDUb());
+                }
+                if (Arrays.asList(arr).contains("THDUa")){
+                    THDUaList.add(yearOnYearList.get(i).getTHDUa());
+                }
+                if (Arrays.asList(arr).contains("T4")){
+                    T4List.add(yearOnYearList.get(i).getT4());
+                }
+                if (Arrays.asList(arr).contains("T3")){
+                    T3List.add(yearOnYearList.get(i).getT3());
+                }
+                if (Arrays.asList(arr).contains("T2")){
+                    T2List.add(yearOnYearList.get(i).getT2());
+                }
+                if (Arrays.asList(arr).contains("T1")){
+                    T1List.add(yearOnYearList.get(i).getT1());
+                }
+                if (Arrays.asList(arr).contains("SignalIntensity")){
+                    SignalIntensityList.add(yearOnYearList.get(i).getSignalIntensity());
+                }
+                if (Arrays.asList(arr).contains("Qc")){
+                    QcList.add(yearOnYearList.get(i).getQc());
+                }
+                if (Arrays.asList(arr).contains("Qb")){
+                    QbList.add(yearOnYearList.get(i).getQb());
+                }
+                if (Arrays.asList(arr).contains("Qa")){
+                    QaList.add(yearOnYearList.get(i).getQa());
+                }
+                if (Arrays.asList(arr).contains("Q")){
+                    QList.add(yearOnYearList.get(i).getQ());
+                }
+                if (Arrays.asList(arr).contains("Pc")){
+                    PcList.add(yearOnYearList.get(i).getPc());
+                }
+                if (Arrays.asList(arr).contains("Pb")){
+                    PbList.add(yearOnYearList.get(i).getPb());
+                }
+                if (Arrays.asList(arr).contains("Pa")){
+                    PaList.add(yearOnYearList.get(i).getPa());
+                }
+                if (Arrays.asList(arr).contains("P")){
+                    PList.add(yearOnYearList.get(i).getP());
+                }
+                if (Arrays.asList(arr).contains("LastDayMDt")){
+                    LastDayMDtList.add(yearOnYearList.get(i).getLastDayMDt());
+                }
+                if (Arrays.asList(arr).contains("LastDayMD")){
+                    LastDayMDList.add(yearOnYearList.get(i).getLastDayMD());
+                }
+                if (Arrays.asList(arr).contains("Ir")){
+                    IrList.add(yearOnYearList.get(i).getIr());
+                }
+                if (Arrays.asList(arr).contains("Ic")){
+                    IcList.add(yearOnYearList.get(i).getIc());
+                }
+                if (Arrays.asList(arr).contains("Ib")){
+                    IbList.add(yearOnYearList.get(i).getIb());
+                }
+                if (Arrays.asList(arr).contains("Ia")){
+                    IaList.add(yearOnYearList.get(i).getIa());
+                }
+                if (Arrays.asList(arr).contains("IHc")){
+                    IHcList.add(yearOnYearList.get(i).getIHc());
+                }
+                if (Arrays.asList(arr).contains("IHb")){
+                    IHbList.add(yearOnYearList.get(i).getIHb());
+                }
+                if (Arrays.asList(arr).contains("IHa")){
+                    IHaList.add(yearOnYearList.get(i).getIHa());
+                }
+                if (Arrays.asList(arr).contains("I2")){
+                    I2List.add(yearOnYearList.get(i).getI2());
+                }
+                if (Arrays.asList(arr).contains("I0")){
+                    I0List.add(yearOnYearList.get(i).getI0());
+                }
+                if (Arrays.asList(arr).contains("F")){
+                    FList.add(yearOnYearList.get(i).getF());
+                }
+                if (Arrays.asList(arr).contains("Eqp")){
+                    EqpList.add(yearOnYearList.get(i).getEqp());
+                }
+                if (Arrays.asList(arr).contains("Eqn")){
+                    EqnList.add(yearOnYearList.get(i).getEqn());
+                }
+                if (Arrays.asList(arr).contains("Epp4")){
+                    Epp4List.add(yearOnYearList.get(i).getEpp4());
+                }
+                if (Arrays.asList(arr).contains("Epp3")){
+                    Epp3List.add(yearOnYearList.get(i).getEpp3());
+                }
+                if (Arrays.asList(arr).contains("Epp2")){
+                    Epp2List.add(yearOnYearList.get(i).getEpp2());
+                }
+                if (Arrays.asList(arr).contains("Epp1")){
+                    Epp1List.add(yearOnYearList.get(i).getEpp1());
+                }
+                if (Arrays.asList(arr).contains("Epp")){
+                    EppList.add(yearOnYearList.get(i).getEpp());
+                }
+                if (Arrays.asList(arr).contains("Epn4")){
+                    Epn4List.add(yearOnYearList.get(i).getEpn4());
+                }
+                if (Arrays.asList(arr).contains("Epn3")){
+                    Epn3List.add(yearOnYearList.get(i).getEpn3());
+                }
+                if (Arrays.asList(arr).contains("Epn2")){
+                    Epn2List.add(yearOnYearList.get(i).getEpn2());
+                }
+                if (Arrays.asList(arr).contains("Epn1")){
+                    Epn1List.add(yearOnYearList.get(i).getEpn1());
+                }
+                if (Arrays.asList(arr).contains("Epn")){
+                    EpnList.add(yearOnYearList.get(i).getEpn());
+                }
+                if (Arrays.asList(arr).contains("DeviceTemp")){
+                    DeviceTempList.add(yearOnYearList.get(i).getDeviceTemp());
+                }
+                if (Arrays.asList(arr).contains("DevResetTimes")){
+                    DevResetTimesList.add(yearOnYearList.get(i).getDevResetTimes());
+                }
+                if (Arrays.asList(arr).contains("Demand")){
+                    DemandList.add(yearOnYearList.get(i).getDemand());
+                }
+                if (Arrays.asList(arr).contains("COSc")){
+                    COScList.add(yearOnYearList.get(i).getCOSc());
+                }
+                if (Arrays.asList(arr).contains("COSb")){
+                    COSbList.add(yearOnYearList.get(i).getCOSb());
+                }
+                if (Arrays.asList(arr).contains("COSa")){
+                    COSaList.add(yearOnYearList.get(i).getCOSa());
+                }
+                if (Arrays.asList(arr).contains("COS")){
+                    COSList.add(yearOnYearList.get(i).getCos());
+                }
+
+            }
+
+        }
+        List<CommonIcoVO> list = new ArrayList<>();
+        if (Arrays.asList(arr).contains("Busot")){list.add(CommonIcoVO.builder().name("母线停电次数").list(BusotList).listDate(freezingTimesList).build());}
+        if (Arrays.asList(arr).contains("COS")){list.add(CommonIcoVO.builder().name("三相功率因数").list(COSList).listDate(freezingTimesList).build());}
+        if (Arrays.asList(arr).contains("COSa")){list.add(CommonIcoVO.builder().name("A相功率因数").list(COSaList).listDate(freezingTimesList).build());}
+        if (Arrays.asList(arr).contains("COSb")){list.add(CommonIcoVO.builder().name("B相功率因数").list(COSbList).listDate(freezingTimesList).build());}
+        if (Arrays.asList(arr).contains("COSc")){list.add(CommonIcoVO.builder().name("C相功率因数").list(COScList).listDate(freezingTimesList).build());}
+        if (Arrays.asList(arr).contains("Demand")){list.add(CommonIcoVO.builder().name("实时有功需量").list(DemandList).listDate(freezingTimesList).build());}
+        if (Arrays.asList(arr).contains("DevResetTimes")){list.add(CommonIcoVO.builder().name("设备复位次数").list(DevResetTimesList).listDate(freezingTimesList).build());}
+        if (Arrays.asList(arr).contains("DeviceTemp")){list.add(CommonIcoVO.builder().name("设备温度").list(DeviceTempList).listDate(freezingTimesList).build());}
+        if (Arrays.asList(arr).contains("Epn")){list.add(CommonIcoVO.builder().name("三相反向有功电度").list(EpnList).listDate(freezingTimesList).build());}
+        if (Arrays.asList(arr).contains("Epn1")){list.add(CommonIcoVO.builder().name("尖段反向有功电度").list(Epn1List).listDate(freezingTimesList).build());}
+        if (Arrays.asList(arr).contains("Epn2")){list.add(CommonIcoVO.builder().name("峰段反向有功电度").list(Epn2List).listDate(freezingTimesList).build());}
+        if (Arrays.asList(arr).contains("Epn3")){list.add(CommonIcoVO.builder().name("平段反向有功电度").list(Epn3List).listDate(freezingTimesList).build());}
+        if (Arrays.asList(arr).contains("Epn4")){list.add(CommonIcoVO.builder().name("谷段反向有功电度").list(Epn4List).listDate(freezingTimesList).build());}
+        if (Arrays.asList(arr).contains("Epp")){list.add(CommonIcoVO.builder().name("三相正向有功电度").list(EppList).listDate(freezingTimesList).build());}
+        if (Arrays.asList(arr).contains("Epp1")){list.add(CommonIcoVO.builder().name("尖段正向有功电度").list(Epp1List).listDate(freezingTimesList).build());}
+        if (Arrays.asList(arr).contains("Epp2")){list.add(CommonIcoVO.builder().name("峰段正向有功电度").list(Epp2List).listDate(freezingTimesList).build());}
+        if (Arrays.asList(arr).contains("Epp3")){list.add(CommonIcoVO.builder().name("平段正向有功电度").list(Epp3List).listDate(freezingTimesList).build());}
+        if (Arrays.asList(arr).contains("Epp4")){list.add(CommonIcoVO.builder().name("谷段正向有功电度").list(Epp4List).listDate(freezingTimesList).build());}
+        if (Arrays.asList(arr).contains("Eqn")){list.add(CommonIcoVO.builder().name("三相反向无功电度").list(EqnList).listDate(freezingTimesList).build());}
+        if (Arrays.asList(arr).contains("Eqp")){list.add(CommonIcoVO.builder().name("三相正向无功电度").list(EqpList).listDate(freezingTimesList).build());}
+        if (Arrays.asList(arr).contains("F")){list.add(CommonIcoVO.builder().name("频率").list(FList).listDate(freezingTimesList).build());}
+        if (Arrays.asList(arr).contains("I0")){list.add(CommonIcoVO.builder().name("零序电流").list(I0List).listDate(freezingTimesList).build());}
+        if (Arrays.asList(arr).contains("I2")){list.add(CommonIcoVO.builder().name("负序电流").list(I2List).listDate(freezingTimesList).build());}
+        if (Arrays.asList(arr).contains("IHa")){list.add(CommonIcoVO.builder().name("A相总谐波电流").list(IHaList).listDate(freezingTimesList).build());}
+        if (Arrays.asList(arr).contains("IHb")){list.add(CommonIcoVO.builder().name("B相总谐波电流").list(IHbList).listDate(freezingTimesList).build());}
+        if (Arrays.asList(arr).contains("IHc")){list.add(CommonIcoVO.builder().name("C相总谐波电流").list(IHcList).listDate(freezingTimesList).build());}
+        if (Arrays.asList(arr).contains("Ia")){list.add(CommonIcoVO.builder().name("A相电流").list(IaList).listDate(freezingTimesList).build());}
+        if (Arrays.asList(arr).contains("Ib")){list.add(CommonIcoVO.builder().name("B相电流").list(IbList).listDate(freezingTimesList).build());}
+        if (Arrays.asList(arr).contains("Ic")){list.add(CommonIcoVO.builder().name("C相电流").list(IcList).listDate(freezingTimesList).build());}
+        if (Arrays.asList(arr).contains("Ir")){list.add(CommonIcoVO.builder().name("剩余电流").list(IrList).listDate(freezingTimesList).build());}
+        if (Arrays.asList(arr).contains("LastDayMD")){list.add(CommonIcoVO.builder().name("昨日有功最大需量").list(LastDayMDList).listDate(freezingTimesList).build());}
+        if (Arrays.asList(arr).contains("LastDayMDt")){list.add(CommonIcoVO.builder().name("昨日有功最大需量发生时间").list(LastDayMDtList).listDate(freezingTimesList).build());}
+        if (Arrays.asList(arr).contains("P")){list.add(CommonIcoVO.builder().name("三相总有功功率").list(PList).listDate(freezingTimesList).build());}
+        if (Arrays.asList(arr).contains("Pa")){list.add(CommonIcoVO.builder().name("A相有功功率").list(PaList).listDate(freezingTimesList).build());}
+        if (Arrays.asList(arr).contains("Pb")){list.add(CommonIcoVO.builder().name("B相有功功率").list(PbList).listDate(freezingTimesList).build());}
+        if (Arrays.asList(arr).contains("Pc")){list.add(CommonIcoVO.builder().name("C相有功功率").list(PcList).listDate(freezingTimesList).build());}
+        if (Arrays.asList(arr).contains("Q")){list.add(CommonIcoVO.builder().name("三相总无功功率").list(QList).listDate(freezingTimesList).build());}
+        if (Arrays.asList(arr).contains("Qa")){list.add(CommonIcoVO.builder().name("A相无功功率").list(QaList).listDate(freezingTimesList).build());}
+        if (Arrays.asList(arr).contains("Qb")){list.add(CommonIcoVO.builder().name("B相无功功率").list(QbList).listDate(freezingTimesList).build());}
+        if (Arrays.asList(arr).contains("Qc")){list.add(CommonIcoVO.builder().name("C相无功功率").list(QcList).listDate(freezingTimesList).build());}
+        if (Arrays.asList(arr).contains("SignalIntensity")){list.add(CommonIcoVO.builder().name("信号强度").list(SignalIntensityList).listDate(freezingTimesList).build());}
+        if (Arrays.asList(arr).contains("T1")){list.add(CommonIcoVO.builder().name("第1路温度").list(T1List).listDate(freezingTimesList).build());}
+        if (Arrays.asList(arr).contains("T2")){list.add(CommonIcoVO.builder().name("第2路温度").list(T2List).listDate(freezingTimesList).build());}
+        if (Arrays.asList(arr).contains("T3")){list.add(CommonIcoVO.builder().name("第3路温度").list(T3List).listDate(freezingTimesList).build());}
+        if (Arrays.asList(arr).contains("T4")){list.add(CommonIcoVO.builder().name("第4路温度").list(T4List).listDate(freezingTimesList).build());}
+        if (Arrays.asList(arr).contains("THDUa")){list.add(CommonIcoVO.builder().name("A相电压THD").list(THDUaList).listDate(freezingTimesList).build());}
+        if (Arrays.asList(arr).contains("THDUb")){list.add(CommonIcoVO.builder().name("B相电压THD").list(THDUbList).listDate(freezingTimesList).build());}
+        if (Arrays.asList(arr).contains("THDUc")){list.add(CommonIcoVO.builder().name("C相电压THD").list(THDUcList).listDate(freezingTimesList).build());}
+        if (Arrays.asList(arr).contains("Ua")){list.add(CommonIcoVO.builder().name("A相电压").list(UaList).listDate(freezingTimesList).build());}
+        if (Arrays.asList(arr).contains("Uab")){list.add(CommonIcoVO.builder().name("AB线电压").list(UabList).listDate(freezingTimesList).build());}
+        if (Arrays.asList(arr).contains("Ub")){list.add(CommonIcoVO.builder().name("B相电压").list(UbList).listDate(freezingTimesList).build());}
+        if (Arrays.asList(arr).contains("Ubc")){list.add(CommonIcoVO.builder().name("BC线电压").list(UbcList).listDate(freezingTimesList).build());}
+        if (Arrays.asList(arr).contains("UblU0")){list.add(CommonIcoVO.builder().name("零序电压不平衡度").list(UblU0List).listDate(freezingTimesList).build());}
+        if (Arrays.asList(arr).contains("UblU2")){list.add(CommonIcoVO.builder().name("负序电压不平衡度").list(UblU2List).listDate(freezingTimesList).build());}
+        if (Arrays.asList(arr).contains("Uc")){list.add(CommonIcoVO.builder().name("C相电压").list(UcList).listDate(freezingTimesList).build());}
+        if (Arrays.asList(arr).contains("Uca")){list.add(CommonIcoVO.builder().name("CA线电压").list(UcaList).listDate(freezingTimesList).build());}
+        if (Arrays.asList(arr).contains("Udt")){list.add(CommonIcoVO.builder().name("电压暂降次数").list(UdtList).listDate(freezingTimesList).build());}
+        if (Arrays.asList(arr).contains("Ul")){list.add(CommonIcoVO.builder().name("线路侧电压").list(UlList).listDate(freezingTimesList).build());}
+        if (Arrays.asList(arr).contains("Upt")){list.add(CommonIcoVO.builder().name("电压暂升次数").list(UptList).listDate(freezingTimesList).build());}
+        if (Arrays.asList(arr).contains("freezingTime")){list.add(CommonIcoVO.builder().name("电压短时中断次数").list(freezingTimesList).listDate(freezingTimesList).build());}
+        if (Arrays.asList(arr).contains("Ust")){list.add(CommonIcoVO.builder().name("冻结时间").list(UstList).listDate(freezingTimesList).build());}
+        return list;
+    }
+
 }