数据中心模块更新

common/src/main/java/com/gyee/common/vo/datacenter/CurveVo.java

@@ -0,0 +1,17 @@
+package com.gyee.common.vo.datacenter;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @ClassName : CurveVo
+ * @Author : xieshengjie
+ * @Date: 2021/5/27 10:16
+ * @Description : 曲线vo
+ */
+@Data
+public class CurveVo {
+//    private String wtid;
+    private Date time;
+}

common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -6,6 +6,7 @@ D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\vo\targetdata\Nxzb
 D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\util\CommonUtils.java
 D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\model\PointData.java
 D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\vo\benchmark\GoodCompareVo.java
+D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\vo\datacenter\CurveVo.java
 D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\model\StrFormatter.java
 D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\CommonMain.java
 D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\util\ClassUtil.java
@@ -19,6 +20,8 @@ D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\contant\Contant.ja
 D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\vo\benchmark\DjhxdbInitVo.java
 D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\vo\analysis\BdzVo.java
 D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\vo\benchmark\FzyVo.java
+D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\vo\datacenter\RealExport.java
+D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\vo\datacenter\PointDataVo.java
 D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\util\JSONUtil.java
 D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\util\RandomUtil.java
 D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\model\auto\Windturbine.java
@@ -33,6 +36,7 @@ D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\util\algorithm\GDJ
 D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\util\DateUtils.java
 D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\vo\benchmark\FjjxbmxVo.java
 D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\vo\analysis\AnalsisUpdateVo.java
+D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\vo\datacenter\ParameterComparisonVo.java
 D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\util\CopyUtils.java
 D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\vo\specific\SpecificTargetVo.java
 D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\vo\analysis\AnalysisMainVo.java
@@ -54,4 +58,5 @@ D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\util\DoubleUtils.j
 D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\model\DNAStatVal.java
 D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\service\IWindturbineService.java
 D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\vo\benchmark\DataVo.java
+D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\domain\AjaxResult.java
 D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\util\algorithm\LineBuild.java

web/datacenter-hb/src/main/java/com/gyee/datacenter/controller/ParameterComparisonController.java

@@ -0,0 +1,105 @@
+package com.gyee.datacenter.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.gyee.common.model.StringUtils;
+
+import com.gyee.datacenter.config.R;
+import com.gyee.datacenter.init.CacheContext;
+import com.gyee.datacenter.model.auto.Uniformcode;
+import com.gyee.datacenter.model.auto.Windturbine;
+import com.gyee.datacenter.service.ParameterComparisonService;
+import com.gyee.datacenter.service.auto.IWindturbineService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @ClassName : ParameterComparisonController
+ * @Author : xieshengjie
+ * @Date: 2021/5/25 9:05
+ * @Description : 参数对比controller
+ */
+@RestController
+@RequestMapping("//paramComparison")
+public class ParameterComparisonController {
+    @Resource
+    private IWindturbineService windturbineService;
+    @Resource
+    private ParameterComparisonService parameterComparisonService;
+
+
+    /**
+     * 获取设备结构
+     * @return
+     */
+    @GetMapping("/equipmentStructure")
+    @ResponseBody
+    @CrossOrigin(origins = "*", maxAge = 3600)
+    public R getEquipmentStructure(@RequestParam(value = "wtid",required = false)String wtid){
+        QueryWrapper<Windturbine> qw = new QueryWrapper<>();
+        if (StringUtils.isNotNull(wtid)){
+            qw.like("id",wtid);
+        }
+        qw.like("windpowerstationid","FDC");
+        List<Windturbine> wts = windturbineService.list(qw);
+        wts.stream().forEach(i->{
+            i.setWindpowerstationid(CacheContext.wpmap.get(i.getWindpowerstationid()));
+        });
+        if (StringUtils.isNotNull(wts)) {
+            return R.ok().data(wts);
+        }else{
+            return R.error().message("访问失败");
+        }
+    }
+
+    /**
+     * 获取参数列表
+     * @return
+     */
+    @GetMapping("/equipmentParams")
+    @ResponseBody
+    @CrossOrigin(origins = "*", maxAge = 3600)
+    public R getEquipmentParams(@RequestParam(value = "description",required = false)String description){
+        List<Uniformcode> codeList = CacheContext.codeList;
+        if (StringUtils.isNotNull(description)){
+            codeList = codeList.stream().filter(i->i.getDescription().contains(description)).collect(Collectors.toList());
+        }
+        if (StringUtils.isNotNull(codeList)) {
+            return R.ok().data(codeList);
+        }else{
+            return R.error().message("访问失败");
+        }
+    }
+
+
+    /**
+     * 生成曲线
+     * @return
+     */
+    @GetMapping("/generatingCurve")
+    @ResponseBody
+    @CrossOrigin(origins = "*", maxAge = 3600)
+    public R generatingCurve(@RequestParam(value = "begin",required = true)String begin,
+                             @RequestParam(value = "end",required = true)String end,
+                             @RequestParam(value = "interval",required = false)String interval,
+                             @RequestParam(value = "type",required = false)String type,
+                             @RequestParam(value = "paramtype",required = true)String paramtype,
+                             @RequestParam(value = "wts",required = true)String wts,
+                             @RequestParam(value = "params",required = true)String params) throws Exception {
+//        Map<String, List<ParameterComparisonVo>> stringListMap = null;
+        List<Object> result = null;
+        if (paramtype.equals("1")){//单风机
+            result = parameterComparisonService.generatingCurveBywt(begin, end, interval, type, wts, params);
+        }else {
+            result = parameterComparisonService.generatingCurveByParam(begin,end,interval,type,wts,params);
+        }
+        if (StringUtils.isNotNull(result)) {
+            return R.ok().data(result);
+        }else{
+            return R.error().message("访问失败");
+        }
+    }
+}

web/datacenter-hb/src/main/java/com/gyee/datacenter/controller/auto/UniformcodeController.java

@@ -0,0 +1,20 @@
+package com.gyee.datacenter.controller.auto;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-02-22
+ */
+@RestController
+@RequestMapping("//uniformcode")
+public class UniformcodeController {
+
+}

web/datacenter-hb/src/main/java/com/gyee/datacenter/controller/auto/WindpowerstationController.java

@@ -0,0 +1,20 @@
+package com.gyee.datacenter.controller.auto;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-02-22
+ */
+@RestController
+@RequestMapping("//windpowerstation")
+public class WindpowerstationController {
+
+}

web/datacenter-hb/src/main/java/com/gyee/datacenter/controller/auto/WindturbineController.java

@@ -0,0 +1,20 @@
+package com.gyee.datacenter.controller.auto;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-02-22
+ */
+@RestController
+@RequestMapping("//windturbine")
+public class WindturbineController {
+
+}

web/datacenter-hb/src/main/java/com/gyee/datacenter/init/CacheContext.java

@@ -1,10 +1,14 @@
 package com.gyee.datacenter.init;
 
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.TypeReference;
 import com.gyee.common.model.StringUtils;
 import com.gyee.common.util.JSONUtil;
-import com.gyee.datacenter.model.auto.Datacenter;
-import com.gyee.datacenter.model.auto.Datacenterpoint;
+import com.gyee.datacenter.model.auto.*;
 import com.gyee.datacenter.service.auto.IDatacenterService;
+import com.gyee.datacenter.service.auto.IUniformcodeService;
+import com.gyee.datacenter.service.auto.IWindpowerstationService;
+import com.gyee.datacenter.service.auto.IWindturbineService;
 import com.gyee.datacenter.util.redis.RedisService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -30,14 +34,24 @@ public class CacheContext  implements CommandLineRunner {
 
     @Resource
     private RedisService redisService;
-
+    @Resource
+    private IUniformcodeService uniformcodeService;
     @Resource
     private IDatacenterService datacenterService;
 
+    @Resource
+    private IWindturbineService windturbineService;
+    @Resource
+    private IWindpowerstationService windpowerstationService;
     public static List<Datacenter> tableList = new ArrayList<>();
     public static Map<String, List<Datacenterpoint>> pointmap = new HashMap<>();
     public static Map<String,String> inmap = new HashMap<>();
+    public static List<Uniformcode> codeList = new ArrayList<>();
+    public static Map<String,String> codemap = new HashMap<>();
+    public static Map<String,String> wpmap = new HashMap<>();
+    public static Map<String, Map<String, Windturbinetestingpointai>> wtpointmap = new HashMap<>();
 
+    public static Map<String,String> wtmap = new HashMap<>();
     @Override
     public void run(String... args) throws Exception {
         log.info("-------------------------------缓存开始--------------------------------------");
@@ -54,6 +68,25 @@ public class CacheContext  implements CommandLineRunner {
             }
         });
 
+        List<Windpowerstation> wpls = windpowerstationService.list();
+        wpls.stream().forEach(i->{
+            wpmap.put(i.getId(),i.getName());
+        });
+
+        codeList = uniformcodeService.list();
+        codeList.stream().forEach(i->{
+            codemap.put(i.getCode(),i.getDescription());
+        });
+
+        List<Windturbine> wtls = windturbineService.list();
+        wtls.stream().forEach(i->{
+            wtmap.put(i.getId(),i.getName());
+        });
+
+        String wtjson = redisService.get("WT");
+        wtpointmap = JSONObject.parseObject(wtjson, new TypeReference<Map<String, Map<String, Windturbinetestingpointai>>>() {
+        });
+
         log.info("-------------------------------缓存结束--------------------------------------");
     }
 }

web/datacenter-hb/src/main/java/com/gyee/datacenter/mapper/auto/UniformcodeMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.datacenter.mapper.auto;
+
+import com.gyee.datacenter.model.auto.Uniformcode;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-02-22
+ */
+public interface UniformcodeMapper extends BaseMapper<Uniformcode> {
+
+}

web/datacenter-hb/src/main/java/com/gyee/datacenter/mapper/auto/WindpowerstationMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.datacenter.mapper.auto;
+
+import com.gyee.datacenter.model.auto.Windpowerstation;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-02-22
+ */
+public interface WindpowerstationMapper extends BaseMapper<Windpowerstation> {
+
+}

web/datacenter-hb/src/main/java/com/gyee/datacenter/mapper/auto/WindturbineMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.datacenter.mapper.auto;
+
+import com.gyee.datacenter.model.auto.Windturbine;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-02-22
+ */
+public interface WindturbineMapper extends BaseMapper<Windturbine> {
+
+}

web/datacenter-hb/src/main/java/com/gyee/datacenter/model/auto/Uniformcode.java

@@ -0,0 +1,35 @@
+package com.gyee.datacenter.model.auto;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-02-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("UNIFORMCODE")
+public class Uniformcode extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId("ID")
+    private String id;
+
+    @TableField("CODE")
+    private String code;
+
+    @TableField("DESCRIPTION")
+    private String description;
+
+
+}

web/datacenter-hb/src/main/java/com/gyee/datacenter/model/auto/Windpowerstation.java

@@ -0,0 +1,87 @@
+package com.gyee.datacenter.model.auto;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-02-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("WINDPOWERSTATION")
+public class Windpowerstation extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId("ID")
+    private String id;
+
+    @TableField("CODE")
+    private String code;
+
+    @TableField("NAME")
+    private String name;
+
+    @TableField("ADDRESS")
+    private String address;
+
+    @TableField("TELEPHONE")
+    private String telephone;
+
+    @TableField("CAPACITY")
+    private BigDecimal capacity;
+
+    @TableField("CAPACITYUNIT")
+    private String capacityunit;
+
+    @TableField("QUANTITY")
+    private BigDecimal quantity;
+
+    @TableField("ANAME")
+    private String aname;
+
+    @TableField("LONGITUDE")
+    private BigDecimal longitude;
+
+    @TableField("LATITUDE")
+    private BigDecimal latitude;
+
+    @TableField("PHOTO")
+    private String photo;
+
+    @TableField("COMPANYID")
+    private String companyid;
+
+    @TableField("SYSTEMMANUFACT")
+    private String systemmanufact;
+
+    @TableField("HEADFARM")
+    private String headfarm;
+
+    @TableField("HEADFARMPHONE")
+    private String headfarmphone;
+
+    @TableField("MODEL")
+    private String model;
+
+    @TableField("ORDERNUM")
+    private BigDecimal ordernum;
+
+    @TableField("ALTITUDE")
+    private BigDecimal altitude;
+
+    @TableField("HEIGHT")
+    private BigDecimal height;
+
+
+}

web/datacenter-hb/src/main/java/com/gyee/datacenter/model/auto/Windturbine.java

@@ -0,0 +1,69 @@
+package com.gyee.datacenter.model.auto;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-02-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("WINDTURBINE")
+public class Windturbine extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId("ID")
+    private String id;
+
+    @TableField("CODE")
+    private String code;
+
+    @TableField("WINDPOWERSTATIONID")
+    private String windpowerstationid;
+
+    @TableField("LONGITUDE")
+    private BigDecimal longitude;
+
+    @TableField("LATITUDE")
+    private BigDecimal latitude;
+
+    @TableField("MODELID")
+    private String modelid;
+
+    @TableField("STATUS")
+    private String status;
+
+    @TableField("PROJECTID")
+    private String projectid;
+
+    @TableField("LINEID")
+    private String lineid;
+
+    @TableField("FIRSTINTEGRATEDTIME")
+    private Date firstintegratedtime;
+
+    @TableField("PHOTO")
+    private String photo;
+
+    @TableField("NAME")
+    private String name;
+
+    @TableField("STANDARDID")
+    private String standardid;
+
+
+}

web/datacenter-hb/src/main/java/com/gyee/datacenter/service/ParameterComparisonService.java

@@ -0,0 +1,161 @@
+package com.gyee.datacenter.service;
+
+
+import com.gyee.common.model.PointData;
+import com.gyee.common.model.StringUtils;
+import com.gyee.common.util.ClassUtil;
+import com.gyee.common.util.DateUtils;
+import com.gyee.common.vo.datacenter.CurveVo;
+import com.gyee.common.vo.datacenter.ParameterComparisonVo;
+import com.gyee.datacenter.init.CacheContext;
+
+import com.gyee.datacenter.model.auto.Windturbinetestingpointai;
+import com.gyee.datacenter.util.realtimesource.EdosUtil;
+import com.gyee.datacenter.util.realtimesource.IEdosUtil;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+
+/**
+ * @ClassName : ParameterComparisonService
+ * @Author : xieshengjie
+ * @Date: 2021/5/25 8:52
+ * @Description : 参数对比service
+ */
+@Service
+public class ParameterComparisonService {
+
+
+    private IEdosUtil edosUtil = new EdosUtil();
+
+    public List<Object> generatingCurveBywt(String begin, String end, String interval, String type, String wt, String params) throws Exception {
+        List<Object>  resultList = new ArrayList<>();
+        Date beginDate = DateUtils.parseDate1(begin);
+        Date endDate = DateUtils.parseDate1(end);
+        Map<String,List<ParameterComparisonVo>> result = new HashMap<>();
+//        List<List<ParameterComparisonVo>> result = new ArrayList<>();
+        Map<String, Map<String, Windturbinetestingpointai>> wtpointmap = CacheContext.wtpointmap;
+        Map<String, String> codemap = CacheContext.codemap;
+
+        String[] paramArray = params.split(",");
+        Map<String, Windturbinetestingpointai> stringWindturbinetestingpointai2Map = wtpointmap.get(wt);
+        for (String param : paramArray) {
+            List<ParameterComparisonVo> paramList = new ArrayList<>();
+            List<PointData> pointDatas = null;
+            Windturbinetestingpointai windturbinetestingpointai2 = stringWindturbinetestingpointai2Map.get(param);
+            if(null !=windturbinetestingpointai2){
+                if (interval != null) {
+                    if (type!=null){
+                        pointDatas = edosUtil.getHistStat(windturbinetestingpointai2,beginDate.getTime()/1000, endDate.getTime()/1000,null,Long.parseLong(interval),Integer.parseInt(type));
+                    }else{
+                        pointDatas = edosUtil.getHistoryDatasSnap(windturbinetestingpointai2,beginDate.getTime()/1000, endDate.getTime()/1000,null,Long.parseLong(interval));
+                    }
+                }else {
+                    pointDatas = edosUtil.getHistoryDatasRaw(windturbinetestingpointai2, beginDate.getTime(), endDate.getTime());
+                }
+                if (StringUtils.isNotEmpty(pointDatas)){
+                    pointDatas.stream().forEach(pointData->{
+                        ParameterComparisonVo vo = new ParameterComparisonVo();
+                        vo.setWtid(wt);
+                        vo.setTagetName(codemap.get(param));
+                        vo.setValue(pointData.getPointValueInDouble());
+                        vo.setTime(DateUtils.parseLongToDate(pointData.getPointTime()*1000));
+                        paramList.add(vo);
+                    });
+                }
+                result.put(codemap.get(param),paramList);
+//                result.add(paramList);
+            }
+        }
+        if (result !=null && result.size()>0){
+            List<ParameterComparisonVo> parameterComparisonVos = result.values().stream().findFirst().get();
+            parameterComparisonVos.stream().forEach(i->{
+                CurveVo vo = new CurveVo();
+                vo.setTime(i.getTime());
+//                vo.setWtid(i.getWtid());
+                resultList.add(vo);
+            });
+            Set<String> paramsString = result.keySet();
+            for (int i = 0;i<resultList.size();i++){
+                LinkedHashMap addMap = new LinkedHashMap();
+                LinkedHashMap addValMap = new LinkedHashMap();
+                for (String param : paramsString) {
+                    addMap.put(param,Class.forName("java.lang.Double"));
+                    addValMap.put(param, result.get(param).get(i).getValue());
+                }
+                addMap.put("风机",Class.forName("java.lang.String"));
+                addValMap.put("风机", wt);
+                Object blo = new ClassUtil().dynamicClass(resultList.get(i), addMap, addValMap);
+                resultList.set(i,blo);
+            }
+        }
+        return resultList;
+    }
+
+    public List<Object> generatingCurveByParam(String begin, String end, String interval, String type, String wts, String params) throws Exception {
+        List<Object>  resultList = new ArrayList<>();
+        Date beginDate = DateUtils.parseDate1(begin);
+        Date endDate = DateUtils.parseDate1(end);
+        Map<String,List<ParameterComparisonVo>> result = new HashMap<>();
+
+        Map<String, Map<String, Windturbinetestingpointai>> wtpointmap = CacheContext.wtpointmap;
+        Map<String, String> codemap = CacheContext.codemap;
+        Map<String, String> wtmap = CacheContext.wtmap;
+
+        String[] wtArray = wts.split(",");
+        for (String wt : wtArray) {
+            List<ParameterComparisonVo> wtsList = new ArrayList<>();
+            List<PointData> pointDatas = null;
+            Windturbinetestingpointai windturbinetestingpointai2 =  wtpointmap.get(wt).get(params);
+            if (null != windturbinetestingpointai2){
+                if (interval != null) {
+                    if (type!=null){
+                        pointDatas = edosUtil.getHistStat(windturbinetestingpointai2,beginDate.getTime()/1000, endDate.getTime()/1000,null,Long.parseLong(interval),Integer.parseInt(type));
+                    }else{
+                        pointDatas = edosUtil.getHistoryDatasSnap(windturbinetestingpointai2,beginDate.getTime()/1000, endDate.getTime()/1000,null,Long.parseLong(interval));
+                    }
+                }else {
+                    pointDatas = edosUtil.getHistoryDatasRaw(windturbinetestingpointai2, beginDate.getTime(), endDate.getTime());
+                }
+                if (StringUtils.isNotEmpty(pointDatas)){
+                    pointDatas.stream().forEach(pointData->{
+                        ParameterComparisonVo vo = new ParameterComparisonVo();
+                        vo.setWtid(wt);
+                        vo.setTagetName(codemap.get(params));
+                        vo.setValue(pointData.getPointValueInDouble());
+                        vo.setTime(DateUtils.parseLongToDate(pointData.getPointTime()*1000));
+                        wtsList.add(vo);
+                    });
+                }
+                result.put(wt,wtsList);
+            }
+        }
+        if (result !=null && result.size()>0){
+            List<ParameterComparisonVo> parameterComparisonVos = result.values().stream().findFirst().get();
+            parameterComparisonVos.stream().forEach(i->{
+                CurveVo vo = new CurveVo();
+                vo.setTime(i.getTime());
+//                vo.setWtid(i.getWtid());
+                resultList.add(vo);
+            });
+            Set<String> wtstring = result.keySet();
+            for (int i = 0;i<resultList.size();i++){
+                if (resultList.get(i)==null){
+                    continue;
+                }
+                LinkedHashMap addMap = new LinkedHashMap();
+                LinkedHashMap addValMap = new LinkedHashMap();
+                for (String wt : wtstring) {
+                    addMap.put(wtmap.get(wt),Class.forName("java.lang.Double"));
+                    addValMap.put(wtmap.get(wt), result.get(wt).size()>0?result.get(wt).get(i).getValue():0);
+                }
+                addMap.put("指标",Class.forName("java.lang.String"));
+                addValMap.put("指标", CacheContext.codemap.get(params));
+                Object blo = new ClassUtil().dynamicClass(resultList.get(i), addMap, addValMap);
+                resultList.set(i,blo);
+            }
+        }
+        return resultList;
+    }
+
+}

web/datacenter-hb/src/main/java/com/gyee/datacenter/service/auto/IUniformcodeService.java

@@ -0,0 +1,16 @@
+package com.gyee.datacenter.service.auto;
+
+import com.gyee.datacenter.model.auto.Uniformcode;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-02-22
+ */
+public interface IUniformcodeService extends IService<Uniformcode> {
+
+}

web/datacenter-hb/src/main/java/com/gyee/datacenter/service/auto/IWindpowerstationService.java

@@ -0,0 +1,16 @@
+package com.gyee.datacenter.service.auto;
+
+import com.gyee.datacenter.model.auto.Windpowerstation;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-02-22
+ */
+public interface IWindpowerstationService extends IService<Windpowerstation> {
+
+}

web/datacenter-hb/src/main/java/com/gyee/datacenter/service/auto/IWindturbineService.java

@@ -0,0 +1,16 @@
+package com.gyee.datacenter.service.auto;
+
+import com.gyee.datacenter.model.auto.Windturbine;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-02-22
+ */
+public interface IWindturbineService extends IService<Windturbine> {
+
+}

web/datacenter-hb/src/main/java/com/gyee/datacenter/service/auto/impl/UniformcodeServiceImpl.java

@@ -0,0 +1,20 @@
+package com.gyee.datacenter.service.auto.impl;
+
+import com.gyee.datacenter.model.auto.Uniformcode;
+import com.gyee.datacenter.mapper.auto.UniformcodeMapper;
+import com.gyee.datacenter.service.auto.IUniformcodeService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-02-22
+ */
+@Service
+public class UniformcodeServiceImpl extends ServiceImpl<UniformcodeMapper, Uniformcode> implements IUniformcodeService {
+
+}

web/datacenter-hb/src/main/java/com/gyee/datacenter/service/auto/impl/WindpowerstationServiceImpl.java

@@ -0,0 +1,20 @@
+package com.gyee.datacenter.service.auto.impl;
+
+import com.gyee.datacenter.model.auto.Windpowerstation;
+import com.gyee.datacenter.mapper.auto.WindpowerstationMapper;
+import com.gyee.datacenter.service.auto.IWindpowerstationService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-02-22
+ */
+@Service
+public class WindpowerstationServiceImpl extends ServiceImpl<WindpowerstationMapper, Windpowerstation> implements IWindpowerstationService {
+
+}

web/datacenter-hb/src/main/java/com/gyee/datacenter/service/auto/impl/WindturbineServiceImpl.java

@@ -0,0 +1,20 @@
+package com.gyee.datacenter.service.auto.impl;
+
+import com.gyee.datacenter.model.auto.Windturbine;
+import com.gyee.datacenter.mapper.auto.WindturbineMapper;
+import com.gyee.datacenter.service.auto.IWindturbineService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-02-22
+ */
+@Service
+public class WindturbineServiceImpl extends ServiceImpl<WindturbineMapper, Windturbine> implements IWindturbineService {
+
+}

web/datacenter-hb/src/main/resources/application-dev.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8091
+  port: 8087
   servlet:
     context-path: /
 

web/datacenter-hb/src/main/resources/application-test.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8091
+  port: 8087
   servlet:
     context-path: /
 

web/datacenter-hb/target/classes/application-dev.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8091
+  port: 8087
   servlet:
     context-path: /
 

web/datacenter-hb/target/classes/application-test.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8091
+  port: 8087
   servlet:
     context-path: /
 

web/datacenter-hb/target/maven-archiver/pom.properties

@@ -0,0 +1,5 @@
+#Generated by Maven
+#Tue Feb 22 09:49:31 CST 2022
+version=1.0-SNAPSHOT
+groupId=com.gyee
+artifactId=datacenter-hb

web/datacenter-hb/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -0,0 +1,8 @@
+com\gyee\datacenter\service\auto\IUniformcodeService.class
+com\gyee\datacenter\service\auto\impl\UniformcodeServiceImpl.class
+com\gyee\datacenter\controller\ParameterComparisonController.class
+com\gyee\datacenter\mapper\auto\UniformcodeMapper.class
+com\gyee\datacenter\controller\auto\UniformcodeController.class
+com\gyee\datacenter\service\ParameterComparisonService.class
+com\gyee\datacenter\model\auto\Uniformcode.class
+com\gyee\datacenter\init\CacheContext$1.class

web/datacenter-hb/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -0,0 +1,86 @@
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\service\auto\impl\WindturbinetestingpointaiServiceImpl.java
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\util\realtimesource\timeseries\LongWriteTsData.java
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\mapper\auto\WindpowerstationMapper.java
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\util\realtimesource\timeseries\Interpolation.java
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\mapper\auto\UniformcodeMapper.java
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\util\redis\RedisConfig.java
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\mapper\auto\DatacenterpointMapper.java
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\service\auto\impl\WindturbineServiceImpl.java
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\mapper\auto\WindturbineMapper.java
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\util\realtimesource\timeseries\DoubleWriteTsData.java
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\mapper\auto\DatacenterMapper.java
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\util\realtimesource\GoldenConfig.java
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\service\auto\IDatacenterpointService.java
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\util\realtimesource\timeseries\DoubleStatData.java
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\controller\auto\WindturbineController.java
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\util\realtimesource\timeseries\TsPoint.java
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\service\auto\IWindpowerstationtestingpointService.java
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\service\auto\impl\WindpowerstationServiceImpl.java
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\util\realtimesource\timeseries\StringTsData.java
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\util\realtimesource\IEdosUtil.java
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\util\realtimesource\timeseries\ErrorRequest.java
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\util\realtimesource\timeseries\LongTsData.java
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\DatacenterMain.java
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\service\auto\IWindturbineService.java
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\util\realtimesource\timeseries\StringUtil.java
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\util\realtimesource\timeseries\BooleanTsData.java
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\config\R.java
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\util\realtimesource\timeseries\CoordinateWriteTsData.java
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\util\realtimesource\timeseries\DoubleTsData.java
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\util\realtimesource\timeseries\TsPointData.java
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\service\auto\impl\DatacenterServiceImpl.java
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\config\CorsConfig.java
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\controller\ParameterComparisonController.java
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\service\DataqueryService.java
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\service\auto\IWindturbinetestingpointaiService.java
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\model\auto\Datacenter.java
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\util\realtimesource\timeseries\BasicTsData.java
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\service\auto\IWindpowerstationService.java
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\model\auto\Windturbine.java
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\util\realtimesource\timeseries\TsDataType.java
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\util\redis\RedisService.java
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\controller\DataqueryController.java
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\config\MybatisPlusConfig.java
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\service\auto\IDatacenterService.java
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\util\realtimesource\timeseries\TsData.java
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\controller\auto\DatacenterController.java
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\service\auto\impl\UniformcodeServiceImpl.java
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\util\realtimesource\EdosUtil.java
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\util\realtimesource\timeseries\BlobTsData.java
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\config\ResultCode.java
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\util\redis\RedisServiceImpl.java
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\service\auto\impl\WindpowerstationtestingpointServiceImpl.java
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\service\auto\IUniformcodeService.java
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\service\ParameterComparisonService.java
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\util\realtimesource\timeseries\TsQuery.java
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\controller\auto\WindturbinetestingpointaiController.java
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\util\realtimesource\timeseries\Coordinate.java
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\util\realtimesource\timeseries\BasicTsPoint.java
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\util\realtimesource\timeseries\JsonObjectHelper.java
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\model\auto\Windpowerstation.java
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\config\GeneratorCodeConfig.java
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\mapper\auto\WindpowerstationtestingpointMapper.java
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\model\auto\Windturbinetestingpointai.java
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\init\CacheContext.java
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\util\realtimesource\StringUtil.java
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\util\realtimesource\MongoEdosUtil.java
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\util\realtimesource\timeseries\StringWriteTsData.java
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\model\auto\Datacenterpoint.java
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\service\auto\impl\DatacenterpointServiceImpl.java
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\util\redis\RedisAutoConfiguration.java
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\util\realtimesource\timeseries\BlobWriteTsData.java
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\controller\auto\UniformcodeController.java
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\model\auto\Windpowerstationtestingpoint.java
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\controller\auto\WindpowerstationtestingpointController.java
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\model\auto\Uniformcode.java
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\controller\auto\WindpowerstationController.java
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\util\realtimesource\timeseries\BaseTsQuery.java
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\util\realtimesource\HttpClientUtil.java
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\util\realtimesource\timeseries\TsPointDataList.java
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\mapper\auto\WindturbinetestingpointaiMapper.java
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\util\realtimesource\timeseries\CoordinateTsData.java
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\util\realtimesource\ApiGolden.java
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\controller\auto\DatacenterpointController.java
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\util\realtimesource\timeseries\GeneralTsData.java
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\util\realtimesource\timeseries\BooleanWriteTsData.java
+D:\work\ideawork\sis\sis\web\datacenter-hb\src\main\java\com\gyee\datacenter\util\PageUtil.java