删除无用代码

histroy/benchmarking-histroy/src/main/java/com/gyee/benchmarkinghistroy/controller/auto/EquipmentdayinfoController.java

@@ -1,4 +1,4 @@
-package com.gyee.benchmarkinghistroy.controller.auto;
+package com.gyee.cache.controller;
 
 
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -11,10 +11,10 @@ import org.springframework.web.bind.annotation.RestController;
  * </p>
  *
  * @author 谢生杰
- * @since 2021-09-29
+ * @since 2022-03-01
  */
 @RestController
-@RequestMapping("//equipmentdayinfo")
-public class EquipmentdayinfoController {
+@RequestMapping("//windpowerstationpointnew")
+public class WindpowerstationpointnewController {
 
 }

histroy/benchmarking-histroy/src/main/java/com/gyee/benchmarkinghistroy/controller/auto/WindturbinetestingpointController.java

@@ -1,4 +1,4 @@
-package com.gyee.benchmarkinghistroy.controller.auto;
+package com.gyee.cache.controller;
 
 
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -11,10 +11,10 @@ import org.springframework.web.bind.annotation.RestController;
  * </p>
  *
  * @author 谢生杰
- * @since 2021-09-29
+ * @since 2022-03-01
  */
 @RestController
-@RequestMapping("//windturbinetestingpoint")
-public class WindturbinetestingpointController {
+@RequestMapping("//windturbinetestingpointnew")
+public class WindturbinetestingpointnewController {
 
 }

cache/src/main/java/com/gyee/cache/init/CacheContext.java

@@ -1,22 +1,17 @@
 package com.gyee.cache.init;
 
 
-
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.gyee.cache.model.auto.*;
 import com.gyee.cache.service.RedisService;
 import com.gyee.cache.service.auto.*;
-
-
-import com.gyee.common.util.JSONUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.stereotype.Component;
 
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -52,6 +47,10 @@ public class CacheContext implements CommandLineRunner {
     private IWindpowerstationService windpowerstationService;
     @Autowired
     private IModelpowerrdService modelpowerrdService;
+    @Autowired
+    private IWindturbinetestingpointnewService windturbinetestingpointnewService;
+    @Autowired
+    private IWindpowerstationpointnewService windpowerstationpointnewService;
 
     public static Map<String, Map<String, Windturbinetestingpointai>> wtpointMap = new HashMap<>();
     public static List<Windturbine> wtls = new ArrayList<>();
@@ -94,77 +93,167 @@ public class CacheContext implements CommandLineRunner {
 //            }
 //        });
 //        logger.info("----------------------数据中心点结束");
+//        logger.info("----------------------设备点开始");
+//        //缓存设备点
+//        if (!redisService.hasKey("WT")){
+//            Map<String,Map<String,Windturbinetestingpointai>> wtaimap = new HashMap<>();
+//            List<Windturbine> windturbineList = windturbineService.list();
+//            windturbineList.stream().forEach(i->{
+//                Map<String,Windturbinetestingpointai> codeaimap = new HashMap<>();
+//                QueryWrapper<Windturbinetestingpointai> qw = new QueryWrapper<>();
+//                qw.eq("windturbineid",i.getId());
+//                List<Windturbinetestingpointai> windturbinetestingpointai2List = windturbinetestingpointai2Service.list(qw);
+//                windturbinetestingpointai2List.stream().forEach(x->{
+//                    codeaimap.put(x.getUniformcode(),x);
+//                });
+//                wtaimap.put(i.getId(),codeaimap);
+//            });
+//            String s = JSONObject.toJSONString(wtaimap);
+//            redisService.set("WT",s);
+//        };
+//        logger.info("----------------------设备点结束");
+//        logger.info("----------------------线路点开始");
+//        //缓存线路点
+//        if (!redisService.hasKey("LN")){
+//            Map<String,Map<String, Windpowerstationtestingpoint>> lnaimap = new HashMap<>();
+//            List<Line> lineList = lineService.list();
+//            lineList.stream().forEach(i->{
+//                Map<String,Windpowerstationtestingpoint> codeaimap = new HashMap<>();
+//                QueryWrapper<Windpowerstationtestingpoint> qw = new QueryWrapper<>();
+//                qw.eq("windpowerstationid",i.getId());
+//                List<Windpowerstationtestingpoint> windpowerstationtestingpoint2List = windpowerstationtestingpoint2Service.list(qw);
+//                windpowerstationtestingpoint2List.stream().forEach(x->{
+//                    codeaimap.put(x.getUniformcode(),x);
+//                });
+//                lnaimap.put(i.getId(),codeaimap);
+//            });
+//            String s = JSONObject.toJSONString(lnaimap);
+//            redisService.set("LN",s);
+//        };
+//        logger.info("----------------------线路点结束");
+//        logger.info("----------------------工程点开始");
+//        //缓存工程点
+//        if (!redisService.hasKey("PJ")){
+//            Map<String,Map<String, Windpowerstationtestingpoint>> pjaimap = new HashMap<>();
+//            List<Project> projectList = projectService.list();
+//            projectList.stream().forEach(i->{
+//                Map<String,Windpowerstationtestingpoint> codeaimap = new HashMap<>();
+//                QueryWrapper<Windpowerstationtestingpoint> qw = new QueryWrapper<>();
+//                qw.eq("windpowerstationid",i.getId());
+//                List<Windpowerstationtestingpoint> windpowerstationtestingpoint2List = windpowerstationtestingpoint2Service.list(qw);
+//                windpowerstationtestingpoint2List.stream().forEach(x->{
+//                    codeaimap.put(x.getUniformcode(),x);
+//                });
+//                pjaimap.put(i.getId(),codeaimap);
+//            });
+//            String s = JSONObject.toJSONString(pjaimap);
+//            redisService.set("PJ",s);
+//        };
+//        logger.info("----------------------工程点结束");
+//        logger.info("----------------------场站点开始");
+//        //缓存场站点
+//        if (!redisService.hasKey("WP")){
+//            Map<String,Map<String, Windpowerstationtestingpoint>> wpaimap = new HashMap<>();
+//            List<Windpowerstation> wpList = windpowerstationService.list();
+//            List<String> wpids = wpList.stream().map(i -> i.getId()).collect(Collectors.toList());
+//            wpids.add("0");
+//            wpids.add("-1");
+//            wpids.add("-2");
+//            wpids.stream().forEach(i->{
+//                Map<String,Windpowerstationtestingpoint> codeaimap = new HashMap<>();
+//                QueryWrapper<Windpowerstationtestingpoint> qw = new QueryWrapper<>();
+//                qw.eq("windpowerstationid",i);
+//                List<Windpowerstationtestingpoint> windpowerstationtestingpoint2List = windpowerstationtestingpoint2Service.list(qw);
+//                windpowerstationtestingpoint2List.stream().forEach(x->{
+//                    codeaimap.put(x.getUniformcode(),x);
+//                });
+//                wpaimap.put(i,codeaimap);
+//            });
+//            String s = JSONObject.toJSONString(wpaimap);
+//
+//            redisService.set("WP",s);
+//        };
+//        logger.info("----------------------场站点结束");
+//        logger.info("----------------------MODELPOWERRD表开始");
+//        if (!redisService.hasKey("MPRD")){
+//            List<Modelpowerrd> mordlist = modelpowerrdService.list();
+//            String s = JSONObject.toJSONString(mordlist);
+//            redisService.set("MPRD",s);
+//        }
+//        logger.info("----------------------MODELPOWERRD表结束");
+//
+
         logger.info("----------------------设备点开始");
         //缓存设备点
-        if (!redisService.hasKey("WT")){
-            Map<String,Map<String,Windturbinetestingpointai>> wtaimap = new HashMap<>();
+        if (!redisService.hasKey("PRODUCT-WT")){
+            Map<String,Map<String,Windturbinetestingpointnew>> wtaimap = new HashMap<>();
             List<Windturbine> windturbineList = windturbineService.list();
             windturbineList.stream().forEach(i->{
-                Map<String,Windturbinetestingpointai> codeaimap = new HashMap<>();
-                QueryWrapper<Windturbinetestingpointai> qw = new QueryWrapper<>();
+                Map<String,Windturbinetestingpointnew> codeaimap = new HashMap<>();
+                QueryWrapper<Windturbinetestingpointnew> qw = new QueryWrapper<>();
                 qw.eq("windturbineid",i.getId());
-                List<Windturbinetestingpointai> windturbinetestingpointai2List = windturbinetestingpointai2Service.list(qw);
+                List<Windturbinetestingpointnew> windturbinetestingpointai2List = windturbinetestingpointnewService.list(qw);
                 windturbinetestingpointai2List.stream().forEach(x->{
                     codeaimap.put(x.getUniformcode(),x);
                 });
                 wtaimap.put(i.getId(),codeaimap);
             });
             String s = JSONObject.toJSONString(wtaimap);
-            redisService.set("WT",s);
+            redisService.set("PRODUCT-WT",s);
         };
         logger.info("----------------------设备点结束");
         logger.info("----------------------线路点开始");
         //缓存线路点
-        if (!redisService.hasKey("LN")){
-            Map<String,Map<String, Windpowerstationtestingpoint>> lnaimap = new HashMap<>();
+        if (!redisService.hasKey("PRODUCT-LN")){
+            Map<String,Map<String, Windpowerstationpointnew>> lnaimap = new HashMap<>();
             List<Line> lineList = lineService.list();
             lineList.stream().forEach(i->{
-                Map<String,Windpowerstationtestingpoint> codeaimap = new HashMap<>();
-                QueryWrapper<Windpowerstationtestingpoint> qw = new QueryWrapper<>();
+                Map<String,Windpowerstationpointnew> codeaimap = new HashMap<>();
+                QueryWrapper<Windpowerstationpointnew> qw = new QueryWrapper<>();
                 qw.eq("windpowerstationid",i.getId());
-                List<Windpowerstationtestingpoint> windpowerstationtestingpoint2List = windpowerstationtestingpoint2Service.list(qw);
+                List<Windpowerstationpointnew> windpowerstationtestingpoint2List = windpowerstationpointnewService.list(qw);
                 windpowerstationtestingpoint2List.stream().forEach(x->{
                     codeaimap.put(x.getUniformcode(),x);
                 });
                 lnaimap.put(i.getId(),codeaimap);
             });
             String s = JSONObject.toJSONString(lnaimap);
-            redisService.set("LN",s);
+            redisService.set("PRODUCT-LN",s);
         };
         logger.info("----------------------线路点结束");
         logger.info("----------------------工程点开始");
         //缓存工程点
-        if (!redisService.hasKey("PJ")){
-            Map<String,Map<String, Windpowerstationtestingpoint>> pjaimap = new HashMap<>();
+        if (!redisService.hasKey("PRODUCT-PJ")){
+            Map<String,Map<String, Windpowerstationpointnew>> pjaimap = new HashMap<>();
             List<Project> projectList = projectService.list();
             projectList.stream().forEach(i->{
-                Map<String,Windpowerstationtestingpoint> codeaimap = new HashMap<>();
-                QueryWrapper<Windpowerstationtestingpoint> qw = new QueryWrapper<>();
+                Map<String,Windpowerstationpointnew> codeaimap = new HashMap<>();
+                QueryWrapper<Windpowerstationpointnew> qw = new QueryWrapper<>();
                 qw.eq("windpowerstationid",i.getId());
-                List<Windpowerstationtestingpoint> windpowerstationtestingpoint2List = windpowerstationtestingpoint2Service.list(qw);
+                List<Windpowerstationpointnew> windpowerstationtestingpoint2List = windpowerstationpointnewService.list(qw);
                 windpowerstationtestingpoint2List.stream().forEach(x->{
                     codeaimap.put(x.getUniformcode(),x);
                 });
                 pjaimap.put(i.getId(),codeaimap);
             });
             String s = JSONObject.toJSONString(pjaimap);
-            redisService.set("PJ",s);
+            redisService.set("PRODUCT-PJ",s);
         };
         logger.info("----------------------工程点结束");
         logger.info("----------------------场站点开始");
         //缓存场站点
-        if (!redisService.hasKey("WP")){
-            Map<String,Map<String, Windpowerstationtestingpoint>> wpaimap = new HashMap<>();
+        if (!redisService.hasKey("PRODUCT-WP")){
+            Map<String,Map<String, Windpowerstationpointnew>> wpaimap = new HashMap<>();
             List<Windpowerstation> wpList = windpowerstationService.list();
             List<String> wpids = wpList.stream().map(i -> i.getId()).collect(Collectors.toList());
             wpids.add("0");
             wpids.add("-1");
             wpids.add("-2");
             wpids.stream().forEach(i->{
-                Map<String,Windpowerstationtestingpoint> codeaimap = new HashMap<>();
-                QueryWrapper<Windpowerstationtestingpoint> qw = new QueryWrapper<>();
+                Map<String, Windpowerstationpointnew> codeaimap = new HashMap<>();
+                QueryWrapper<Windpowerstationpointnew> qw = new QueryWrapper<>();
                 qw.eq("windpowerstationid",i);
-                List<Windpowerstationtestingpoint> windpowerstationtestingpoint2List = windpowerstationtestingpoint2Service.list(qw);
+                List<Windpowerstationpointnew> windpowerstationtestingpoint2List = windpowerstationpointnewService.list(qw);
                 windpowerstationtestingpoint2List.stream().forEach(x->{
                     codeaimap.put(x.getUniformcode(),x);
                 });
@@ -172,16 +261,9 @@ public class CacheContext implements CommandLineRunner {
             });
             String s = JSONObject.toJSONString(wpaimap);
 
-            redisService.set("WP",s);
+            redisService.set("PRODUCT-WP",s);
         };
         logger.info("----------------------场站点结束");
-        logger.info("----------------------MODELPOWERRD表开始");
-        if (!redisService.hasKey("MPRD")){
-            List<Modelpowerrd> mordlist = modelpowerrdService.list();
-            String s = JSONObject.toJSONString(mordlist);
-            redisService.set("MPRD",s);
-        }
-        logger.info("----------------------MODELPOWERRD表结束");
 
 
     }

cache/src/main/java/com/gyee/cache/mapper/auto/WindpowerstationpointnewMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.cache.mapper.auto;
+
+import com.gyee.cache.model.auto.Windpowerstationpointnew;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-03-01
+ */
+public interface WindpowerstationpointnewMapper extends BaseMapper<Windpowerstationpointnew> {
+
+}

cache/src/main/java/com/gyee/cache/mapper/auto/WindturbinetestingpointnewMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.cache.mapper.auto;
+
+import com.gyee.cache.model.auto.Windturbinetestingpointnew;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-03-01
+ */
+public interface WindturbinetestingpointnewMapper extends BaseMapper<Windturbinetestingpointnew> {
+
+}

histroy/benchmarking-histroy/src/main/java/com/gyee/benchmarkinghistroy/model/auto/Windpowerstationtestingpoint2.java

@@ -1,4 +1,4 @@
-package com.gyee.benchmarkinghistroy.model.auto;
+package com.gyee.cache.model.auto;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -7,24 +7,25 @@ import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.math.BigDecimal;
-
 /**
  * <p>
  * 
  * </p>
  *
  * @author 谢生杰
- * @since 2021-05-13
+ * @since 2022-03-01
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName("Windpowerstationtestingpoint2")
-public class Windpowerstationtestingpoint2 extends Model {
+@TableName("WINDPOWERSTATIONPOINTNEW")
+public class Windpowerstationpointnew extends Model {
 
     private static final long serialVersionUID = 1L;
 
-    @TableId("CODE")
+    @TableId("ID")
+    private String id;
+
+    @TableField("CODE")
     private String code;
 
     @TableField("NAME")
@@ -46,16 +47,16 @@ public class Windpowerstationtestingpoint2 extends Model {
     private String modelid;
 
     @TableField("MAXVAL")
-    private BigDecimal maxval;
+    private Double maxval;
 
     @TableField("MINVAL")
-    private BigDecimal minval;
+    private Double minval;
 
     @TableField("REASONABLEMAXVAL")
-    private BigDecimal reasonablemaxval;
+    private Double reasonablemaxval;
 
     @TableField("REASONABLEMINVAL")
-    private BigDecimal reasonableminval;
+    private Double reasonableminval;
 
     @TableField("UNIFORMCODE")
     private String uniformcode;

histroy/benchmarking-histroy/src/main/java/com/gyee/benchmarkinghistroy/model/auto/Windturbinetestingpoint.java

@@ -1,10 +1,9 @@
-package com.gyee.benchmarkinghistroy.model.auto;
+package com.gyee.cache.model.auto;
 
-import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 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;
 
@@ -14,12 +13,12 @@ import lombok.EqualsAndHashCode;
  * </p>
  *
  * @author 谢生杰
- * @since 2021-09-29
+ * @since 2022-03-01
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName("WINDTURBINETESTINGPOINT")
-public class Windturbinetestingpoint extends Model {
+@TableName("WINDTURBINETESTINGPOINTNEW")
+public class Windturbinetestingpointnew extends Model {
 
     private static final long serialVersionUID = 1L;
 
@@ -48,16 +47,16 @@ public class Windturbinetestingpoint extends Model {
     private String modelid;
 
     @TableField("MAXVAL")
-    private BigDecimal maxval;
+    private Double maxval;
 
     @TableField("MINVAL")
-    private BigDecimal minval;
+    private Double minval;
 
     @TableField("REASONABLEMAXVAL")
-    private BigDecimal reasonablemaxval;
+    private Double reasonablemaxval;
 
     @TableField("REASONABLEMINVAL")
-    private BigDecimal reasonableminval;
+    private Double reasonableminval;
 
     @TableField("WINDTURBINEID")
     private String windturbineid;

cache/src/main/java/com/gyee/cache/service/auto/IWindpowerstationpointnewService.java

@@ -0,0 +1,16 @@
+package com.gyee.cache.service.auto;
+
+import com.gyee.cache.model.auto.Windpowerstationpointnew;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-03-01
+ */
+public interface IWindpowerstationpointnewService extends IService<Windpowerstationpointnew> {
+
+}

cache/src/main/java/com/gyee/cache/service/auto/IWindturbinetestingpointnewService.java

@@ -0,0 +1,16 @@
+package com.gyee.cache.service.auto;
+
+import com.gyee.cache.model.auto.Windturbinetestingpointnew;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-03-01
+ */
+public interface IWindturbinetestingpointnewService extends IService<Windturbinetestingpointnew> {
+
+}

cache/src/main/java/com/gyee/cache/service/auto/impl/WindpowerstationpointnewServiceImpl.java

@@ -0,0 +1,20 @@
+package com.gyee.cache.service.auto.impl;
+
+import com.gyee.cache.model.auto.Windpowerstationpointnew;
+import com.gyee.cache.mapper.auto.WindpowerstationpointnewMapper;
+import com.gyee.cache.service.auto.IWindpowerstationpointnewService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-03-01
+ */
+@Service
+public class WindpowerstationpointnewServiceImpl extends ServiceImpl<WindpowerstationpointnewMapper, Windpowerstationpointnew> implements IWindpowerstationpointnewService {
+
+}

cache/src/main/java/com/gyee/cache/service/auto/impl/WindturbinetestingpointnewServiceImpl.java

@@ -0,0 +1,20 @@
+package com.gyee.cache.service.auto.impl;
+
+import com.gyee.cache.model.auto.Windturbinetestingpointnew;
+import com.gyee.cache.mapper.auto.WindturbinetestingpointnewMapper;
+import com.gyee.cache.service.auto.IWindturbinetestingpointnewService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-03-01
+ */
+@Service
+public class WindturbinetestingpointnewServiceImpl extends ServiceImpl<WindturbinetestingpointnewMapper, Windturbinetestingpointnew> implements IWindturbinetestingpointnewService {
+
+}

common/src/main/java/com/gyee/common/util/DateUtils.java

@@ -981,6 +981,49 @@ public class DateUtils  {
         return currYearFirst;
     }
 
+    /**
+     * 获取当天0点
+     * @return
+     */
+    public static Date getSamedayZero(){
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(new Date());
+        calendar.set(Calendar.HOUR_OF_DAY, 0);
+        calendar.set(Calendar.MINUTE, 0);
+        calendar.set(Calendar.SECOND, 0);
+        calendar.set(Calendar.MILLISECOND,0);
+        return calendar.getTime();
+    }
+
+    /**
+     * 获取当月第一天0点
+     * @return
+     */
+    public static Date getMonthFirstZero(){
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(Calendar.DAY_OF_MONTH,1);
+        calendar.set(Calendar.HOUR_OF_DAY, 0);
+        calendar.set(Calendar.MINUTE, 0);
+        calendar.set(Calendar.SECOND, 0);
+        calendar.set(Calendar.MILLISECOND,0);
+        return calendar.getTime();
+    }
+
+    /**
+     * 获取当年第一天0点
+     * @return
+     */
+    public static Date getYearFirstZero(){
+        Calendar calendar = Calendar.getInstance();
+        int year = calendar.get(Calendar.YEAR);
+        calendar.set(Calendar.YEAR, year);
+        calendar.set(Calendar.HOUR_OF_DAY, 0);
+        calendar.set(Calendar.MINUTE, 0);
+        calendar.set(Calendar.SECOND, 0);
+        calendar.set(Calendar.MILLISECOND,0);
+        return calendar.getTime();
+    }
+
 
 
 }

common/src/main/java/com/gyee/common/vo/matrix/MatrixVo.java

@@ -0,0 +1,29 @@
+package com.gyee.common.vo.matrix;
+
+import lombok.Data;
+
+/**
+ * @ClassName : MatrixVo
+ * @Author : xieshengjie
+ * @Date: 2022/2/25 15:54
+ * @Description :
+ */
+@Data
+public class MatrixVo {
+    private String wpid;
+    private Integer yxts;
+    private Integer djts;
+    private Integer xdts;
+    private Integer gzts;
+    private Integer whts;
+    private Integer slts;
+    private Integer lxts;
+    private Double ycgl;
+    private Double bzgl;
+    private Double yfgl;
+    private Double sjgl;
+    private Double agc;
+    private Double cxgl;
+    private String wtid;
+    private Integer staus;
+}

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

@@ -44,6 +44,7 @@ com\gyee\common\util\RestTemplateUtil$SingletonRestTemplate.class
 com\gyee\common\model\DNAVal.class
 com\gyee\common\util\algorithm\GDJTLineBuild.class
 com\gyee\common\vo\algorithm\LineParameters.class
+com\gyee\common\vo\matrix\MatrixVo.class
 com\gyee\common\vo\specific\SpecificCenterVo.class
 com\gyee\common\vo\targetdata\NxzbfxVo.class
 com\gyee\common\util\CopyUtils.class

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

@@ -10,6 +10,7 @@ D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\model\PointData.ja
 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\vo\matrix\MatrixVo.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
 D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\vo\analysis\DynamicBean.java

histroy/benchmarking-histroy/src/main/java/com/gyee/benchmarkinghistroy/BenchmarkingHistroyMain.java

@@ -1,19 +0,0 @@
-package com.gyee.benchmarkinghistroy;
-
-import org.mybatis.spring.annotation.MapperScan;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-/**
- * @ClassName : BenchmarkingHistroyMain
- * @Author : xieshengjie
- * @Date: 2021/9/29 16:14
- * @Description : 对标管理历史计算服务
- */
-@SpringBootApplication
-@MapperScan("com.gyee.benchmarkinghistroy.mapper")
-public class BenchmarkingHistroyMain {
-    public static void main(String[] args) {
-        SpringApplication.run(BenchmarkingHistroyMain.class, args);
-    }
-}

histroy/benchmarking-histroy/src/main/java/com/gyee/benchmarkinghistroy/init/CacheContext.java

@@ -1,151 +0,0 @@
-package com.gyee.benchmarkinghistroy.init;
-
-
-import com.gyee.benchmarkinghistroy.model.auto.*;
-import com.gyee.benchmarkinghistroy.service.auto.*;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.CommandLineRunner;
-import org.springframework.stereotype.Component;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @ClassName : CacheContext
- * @Author : xieshengjie
- * @Date: 2021/9/29 17:33
- * @Description : 初始化
- */
-@Component
-public class CacheContext implements CommandLineRunner {
-
-
-    private static final Logger log = LoggerFactory.getLogger(CacheContext.class);
-
-    @Autowired
-    private IWindturbineService windturbineService;
-    @Autowired
-    private IWindpowerstationService windpowerstationService;
-    @Autowired
-    private IProjectService projectService;
-    @Autowired
-    private ILineService lineService;
-    @Autowired
-    private IWindturbinetestingpointai2Service windturbineTestingAi2Service;
-    @Autowired
-    private IWindpowerstationtestingpoint2Service windpowerstationtestingpoint2Service;
-
-    public static Map<String, List<Windturbine>> wtmap = new HashMap<>();
-
-    public static Map<String,Windturbine> wmap = new HashMap<>();
-
-    public static Map<String, Windpowerstation> wpmap = new HashMap<>();
-
-    public static List<Windpowerstation> wplist = new ArrayList<>();
-
-    public static List<Windturbine> wtls = new ArrayList<>();
-
-    public static Map<String, Map<String, Windturbinetestingpointai2>> wtpAimap = new HashMap<>();// 风电机测点AI表
-
-    public static Map<String,Map<String, Windpowerstationtestingpoint2>> wppointmap =new HashMap<>();
-
-    public static List<Project> projects = new ArrayList<>();
-
-    public static List<Line> lines = new ArrayList<>();
-
-
-    @Override
-    public void run(String... args) throws Exception {
-
-        log.info("-------------------------------缓存开始--------------------------------------");
-
-        wplist = windpowerstationService.list();
-        wplist.stream().filter(i->i.getId().endsWith("FDC")).forEach(i->{
-            wpmap.put(i.getId(),i);
-        });
-
-        projects = projectService.list();
-
-        lines = lineService.list();
-
-        wtls = windturbineService.list();
-        wtls.stream().forEach(wt->{
-            wmap.put(wt.getId(),wt);
-            if (wtmap.containsKey(wt.getWindpowerstationid())){
-                wtmap.get(wt.getWindpowerstationid()).add(wt);
-            }else{
-                List<Windturbine> wts = new ArrayList<>();
-                wts.add(wt);
-                wtmap.put(wt.getWindpowerstationid(),wts);
-            }
-        });
-
-        List<Windturbinetestingpointai2> windturbinetestingpointai2List = windturbineTestingAi2Service.list();
-        Map<String, Windturbinetestingpointai2> map = null;
-
-        if(windturbinetestingpointai2List != null && !windturbinetestingpointai2List.isEmpty()){
-            for(Windturbinetestingpointai2 mp : windturbinetestingpointai2List){
-                if(wtpAimap.containsKey(mp.getWindturbineid())){
-                    map = wtpAimap.get(mp.getWindturbineid());
-                    map.put(mp.getUniformcode(), mp);
-                }else{
-                    map = new HashMap<String, Windturbinetestingpointai2>();
-                    map.put(mp.getUniformcode(), mp);
-                    wtpAimap.put(mp.getWindturbineid(), map);
-                }
-            }
-        }
-
-
-        List<Windpowerstationtestingpoint2> wplist = windpowerstationtestingpoint2Service.list();
-        for (Windpowerstationtestingpoint2 windpowerstationtestingpoint2 : wplist) {
-            if (wppointmap.containsKey(windpowerstationtestingpoint2.getWindpowerstationid())){
-                wppointmap.get(windpowerstationtestingpoint2.getWindpowerstationid()).put(windpowerstationtestingpoint2.getUniformcode(),windpowerstationtestingpoint2);
-            }else{
-                Map<String,Windpowerstationtestingpoint2> wpmap = new HashMap<>();
-                wpmap.put(windpowerstationtestingpoint2.getUniformcode(),windpowerstationtestingpoint2);
-                wppointmap.put(windpowerstationtestingpoint2.getWindpowerstationid(),wpmap);
-            }
-        }
-
-        log.info("-------------------------------缓存结束--------------------------------------");
-    }
-//  取redis
-//    private Logger logger = LoggerFactory.getLogger(CacheContext.class);
-//    @Resource
-//    private IWindturbinetestingpointService windturbinetestingpointService;
-//    @Resource
-//    private RedisService redisService;
-//
-//    public static Map<String, Map<String, Windturbinetestingpoint>> wtpAimap = new HashMap<>();// 风电机测点表
-//
-//    @Override
-//    public void run(String... args) {
-//        logger.info("--------------------------------缓存开始--------------------------------");
-//        if (redisService.hasKey("WT")){
-//            String wt = redisService.get("WT");
-//            wtpAimap = (Map<String, Map<String, Windturbinetestingpoint>>) JSONUtils.parse(wt);
-//        }else {
-//            List<Windturbinetestingpoint> windturbinetestingpointList = windturbinetestingpointService.list();
-//            Map<String, Windturbinetestingpoint> map = null;
-//
-//            if(windturbinetestingpointList != null && !windturbinetestingpointList.isEmpty()){
-//                for(Windturbinetestingpoint mp : windturbinetestingpointList){
-//                    if(wtpAimap.containsKey(mp.getWindturbineid())){
-//                        map = wtpAimap.get(mp.getWindturbineid());
-//                        map.put(mp.getUniformcode(), mp);
-//                    }else{
-//                        map = new HashMap<String, Windturbinetestingpoint>();
-//                        map.put(mp.getUniformcode(), mp);
-//                        wtpAimap.put(mp.getWindturbineid(), map);
-//                    }
-//                }
-//            }
-//        }
-//        logger.info("--------------------------------缓存结束--------------------------------");
-//    }
-}

histroy/benchmarking-histroy/src/main/java/com/gyee/benchmarkinghistroy/mapper/auto/BenchmarkMapper.java

@@ -1,21 +0,0 @@
-package com.gyee.benchmarkinghistroy.mapper.auto;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.gyee.benchmarkinghistroy.model.auto.Benchmark;
-import org.apache.ibatis.annotations.Select;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author 谢生杰
- * @since 2021-07-26
- */
-public interface BenchmarkMapper extends BaseMapper<Benchmark> {
-
-    @Select("")
-    List<Benchmark> listTop(String timetype, String foreigntype);
-}

histroy/benchmarking-histroy/src/main/java/com/gyee/benchmarkinghistroy/mapper/auto/BenchmarkingbetweenMapper.java

@@ -1,23 +0,0 @@
-package com.gyee.benchmarkinghistroy.mapper.auto;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.gyee.benchmarkinghistroy.model.auto.Benchmarkingbetween;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author 谢生杰
- * @since 2021-06-24
- */
-public interface BenchmarkingbetweenMapper extends BaseMapper<Benchmarkingbetween> {
-    @Select("select dutyname,sum(theoreticalgeneratity) theoreticalgeneratity,sum(generatity) generatity,sum(faultloss) faultloss,sum(mainloss) mainloss,sum(performanceloss) performanceloss,sum(rationingloss) rationingloss,sum(involvesloss) involvesloss from benchmarkingbetween where theday>=#{begin} and theday <=#{end} group by dutyname ")
-    public List<Benchmarkingbetween> findByBeginAndEnd(@Param(value = "begin")Date begin, @Param(value = "end")Date end);
-
-}

histroy/benchmarking-histroy/src/main/java/com/gyee/benchmarkinghistroy/mapper/auto/DutyscheduleMapper.java

@@ -1,16 +0,0 @@
-package com.gyee.benchmarkinghistroy.mapper.auto;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.gyee.benchmarkinghistroy.model.auto.Dutyschedule;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author 谢生杰
- * @since 2021-06-24
- */
-public interface DutyscheduleMapper extends BaseMapper<Dutyschedule> {
-
-}

histroy/benchmarking-histroy/src/main/java/com/gyee/benchmarkinghistroy/mapper/auto/EquipmentdaydetailedMapper.java

@@ -1,16 +0,0 @@
-package com.gyee.benchmarkinghistroy.mapper.auto;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.gyee.benchmarkinghistroy.model.auto.Equipmentdaydetailed;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author 谢生杰
- * @since 2021-06-21
- */
-public interface EquipmentdaydetailedMapper extends BaseMapper<Equipmentdaydetailed> {
-
-}

histroy/benchmarking-histroy/src/main/java/com/gyee/benchmarkinghistroy/mapper/auto/EquipmentdayinfoMapper.java

@@ -1,16 +0,0 @@
-package com.gyee.benchmarkinghistroy.mapper.auto;
-
-import com.gyee.benchmarkinghistroy.model.auto.Equipmentdayinfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author 谢生杰
- * @since 2021-09-29
- */
-public interface EquipmentdayinfoMapper extends BaseMapper<Equipmentdayinfo> {
-
-}

histroy/benchmarking-histroy/src/main/java/com/gyee/benchmarkinghistroy/mapper/auto/LineMapper.java

@@ -1,16 +0,0 @@
-package com.gyee.benchmarkinghistroy.mapper.auto;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.gyee.benchmarkinghistroy.model.auto.Line;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author 谢生杰
- * @since 2021-06-21
- */
-public interface LineMapper extends BaseMapper<Line> {
-
-}

histroy/benchmarking-histroy/src/main/java/com/gyee/benchmarkinghistroy/mapper/auto/OperationrecordMapper.java

@@ -1,31 +0,0 @@
-package com.gyee.benchmarkinghistroy.mapper.auto;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.gyee.benchmarkinghistroy.model.auto.Operationrecord;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author 谢生杰
- * @since 2021-06-24
- */
-public interface OperationrecordMapper extends BaseMapper<Operationrecord> {
-    @Select("select * from operationrecord where time>=#{begin} and time <=#{end} ")
-    public List<Operationrecord> listByBeginAndEnd(@Param(value = "begin") Date begin, @Param(value = "end")Date end);
-
-    @Select(" select s.name,o.wtid,o.id,w.windpowerstationid,o.time,o.value from operationrecord o left join windturbine w on w.id = o.wtid left join WindPowerStation s on s.id = w.windpowerstationid where w.windpowerstationid = #{WindPowerStation} and o.wtid = #{wtid} and o.time >=#{beginDate} and o.time <=#{endDate}")
-    public List<Map> listBy(@Param(value = "WindPowerStation") String WindPowerStation,@Param(value = "wtid")String wtid,
-                                @Param(value = "beginDate")Date beginDate,@Param(value = "endDate")Date endDate);
-
-    @Select(" select s.name,o.wtid,o.id,w.windpowerstationid,o.time,o.value from operationrecord o left join windturbine w on w.id = o.wtid left join WindPowerStation s on s.id = w.windpowerstationid where w.windpowerstationid = #{WindPowerStation} and o.wtid = #{wtid} and o.time >=#{beginDate} and o.time <=#{endDate}")
-    public List<Map> conversion(@Param(value = "WindPowerStation") String WindPowerStation,@Param(value = "wtid")String wtid,
-                                @Param(value = "beginDate")Date beginDate,@Param(value = "endDate")Date endDate);
-}

histroy/benchmarking-histroy/src/main/java/com/gyee/benchmarkinghistroy/mapper/auto/ProjectMapper.java

@@ -1,16 +0,0 @@
-package com.gyee.benchmarkinghistroy.mapper.auto;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.gyee.benchmarkinghistroy.model.auto.Project;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author 谢生杰
- * @since 2021-06-21
- */
-public interface ProjectMapper extends BaseMapper<Project> {
-
-}

histroy/benchmarking-histroy/src/main/java/com/gyee/benchmarkinghistroy/mapper/auto/Windpowerinfoday3Mapper.java

@@ -1,16 +0,0 @@
-package com.gyee.benchmarkinghistroy.mapper.auto;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.gyee.benchmarkinghistroy.model.auto.Windpowerinfoday3;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author 谢生杰
- * @since 2021-07-26
- */
-public interface Windpowerinfoday3Mapper extends BaseMapper<Windpowerinfoday3> {
-
-}

histroy/benchmarking-histroy/src/main/java/com/gyee/benchmarkinghistroy/mapper/auto/WindpowerinfodayMapper.java

@@ -1,16 +0,0 @@
-package com.gyee.benchmarkinghistroy.mapper.auto;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.gyee.benchmarkinghistroy.model.auto.Windpowerinfoday;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author 谢生杰
- * @since 2021-07-26
- */
-public interface WindpowerinfodayMapper extends BaseMapper<Windpowerinfoday> {
-
-}

histroy/benchmarking-histroy/src/main/java/com/gyee/benchmarkinghistroy/mapper/auto/WindpowerspecificinfodayMapper.java

@@ -1,16 +0,0 @@
-package com.gyee.benchmarkinghistroy.mapper.auto;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.gyee.benchmarkinghistroy.model.auto.Windpowerspecificinfoday;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author 谢生杰
- * @since 2021-07-26
- */
-public interface WindpowerspecificinfodayMapper extends BaseMapper<Windpowerspecificinfoday> {
-
-}

histroy/benchmarking-histroy/src/main/java/com/gyee/benchmarkinghistroy/mapper/auto/WindpowerstationMapper.java

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

histroy/benchmarking-histroy/src/main/java/com/gyee/benchmarkinghistroy/mapper/auto/Windpowerstationtestingpoint2Mapper.java

@@ -1,16 +0,0 @@
-package com.gyee.benchmarkinghistroy.mapper.auto;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.gyee.benchmarkinghistroy.model.auto.Windpowerstationtestingpoint2;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author 谢生杰
- * @since 2021-05-13
- */
-public interface Windpowerstationtestingpoint2Mapper extends BaseMapper<Windpowerstationtestingpoint2> {
-
-}

histroy/benchmarking-histroy/src/main/java/com/gyee/benchmarkinghistroy/mapper/auto/WindpowerstationthewindinfoMapper.java

@@ -1,16 +0,0 @@
-package com.gyee.benchmarkinghistroy.mapper.auto;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.gyee.benchmarkinghistroy.model.auto.Windpowerstationthewindinfo;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author 谢生杰
- * @since 2021-07-26
- */
-public interface WindpowerstationthewindinfoMapper extends BaseMapper<Windpowerstationthewindinfo> {
-
-}

histroy/benchmarking-histroy/src/main/java/com/gyee/benchmarkinghistroy/mapper/auto/WindturbineMapper.java

@@ -1,17 +0,0 @@
-package com.gyee.benchmarkinghistroy.mapper.auto;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.gyee.benchmarkinghistroy.model.auto.Windturbine;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author 谢生杰
- * @since 2021-05-25
- */
-public interface WindturbineMapper extends BaseMapper<Windturbine> {
-
-}

histroy/benchmarking-histroy/src/main/java/com/gyee/benchmarkinghistroy/mapper/auto/WindturbinetestingpointMapper.java

@@ -1,16 +0,0 @@
-package com.gyee.benchmarkinghistroy.mapper.auto;
-
-import com.gyee.benchmarkinghistroy.model.auto.Windturbinetestingpoint;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author 谢生杰
- * @since 2021-09-29
- */
-public interface WindturbinetestingpointMapper extends BaseMapper<Windturbinetestingpoint> {
-
-}

histroy/benchmarking-histroy/src/main/java/com/gyee/benchmarkinghistroy/mapper/auto/Windturbinetestingpointai2Mapper.java

@@ -1,16 +0,0 @@
-package com.gyee.benchmarkinghistroy.mapper.auto;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.gyee.benchmarkinghistroy.model.auto.Windturbinetestingpointai2;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author 谢生杰
- * @since 2021-05-13
- */
-public interface Windturbinetestingpointai2Mapper extends BaseMapper<Windturbinetestingpointai2> {
-
-}

histroy/benchmarking-histroy/src/main/java/com/gyee/benchmarkinghistroy/mapper/auto/WpmttrandmtbfdayMapper.java

@@ -1,16 +0,0 @@
-package com.gyee.benchmarkinghistroy.mapper.auto;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.gyee.benchmarkinghistroy.model.auto.Wpmttrandmtbfday;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author 谢生杰
- * @since 2021-07-26
- */
-public interface WpmttrandmtbfdayMapper extends BaseMapper<Wpmttrandmtbfday> {
-
-}

histroy/benchmarking-histroy/src/main/java/com/gyee/benchmarkinghistroy/model/auto/Benchmark.java

@@ -1,132 +0,0 @@
-package com.gyee.benchmarkinghistroy.model.auto;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author 谢生杰
- * @since 2021-07-26
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("BENCHMARK")
-public class Benchmark extends Model {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "ID",type = IdType.INPUT)
-    private String id;
-
-    @TableField("RECORDDATE")
-    private Date recorddate;
-
-    @TableField("FOREIGNKEYID")
-    private String foreignkeyid;
-
-    @TableField("MARK")
-    private Double mark;
-
-    @TableField("CAPACITY")
-    private Double capacity;
-
-    @TableField("UNITS")
-    private Double units;
-
-    @TableField("THEORETICALPOWER")
-    private Double theoreticalpower;
-
-    @TableField("ACTUALPOWER")
-    private Double actualpower;
-
-    @TableField("DAYNHGZSSDL")
-    private Double daynhgzssdl;
-
-    @TableField("DAYNHWHSSDL")
-    private Double daynhwhssdl;
-
-    @TableField("DAYNHXDSSDL")
-    private Double daynhxdssdl;
-
-    @TableField("DAYNHQFDL")
-    private Double daynhqfdl;
-
-    @TableField("DAYNHCFDL")
-    private Double daynhcfdl;
-
-    @TableField("WINDENERGY")
-    private Double windenergy;
-
-    @TableField("POWERLOSSRATE")
-    private Double powerlossrate;
-
-    @TableField("PERFORMANCELOSSRATE")
-    private Double performancelossrate;
-
-    @TableField("COMPREHENSIVERATE")
-    private Double comprehensiverate;
-
-    @TableField("UTILIZATIONHOURS")
-    private Double utilizationhours;
-
-    @TableField("WINDPOWERACCURACY")
-    private Double windpoweraccuracy;
-
-    @TableField("AGCCURVEFOLLOWING")
-    private Double agccurvefollowing;
-
-    @TableField("MTBF")
-    private Double mtbf;
-
-    @TableField("MTTF")
-    private Double mttf;
-
-    @TableField("AVAILABILITY")
-    private Double availability;
-
-    @TableField("AVAILABILITYFACTOR")
-    private Double availabilityfactor;
-
-    @TableField("FAILURELOSSRATE")
-    private Double failurelossrate;
-
-    @TableField("MAINLOSSRATE")
-    private Double mainlossrate;
-
-    @TableField("MTTR")
-    private Double mttr;
-
-    @TableField("HIDDENTIMELY")
-    private Double hiddentimely;
-
-    @TableField("RESETTIMELYRATE")
-    private Double resettimelyrate;
-
-    @TableField("STATETRANSITIONRATE")
-    private Double statetransitionrate;
-
-    @TableField("ELIMINATIONRATE")
-    private Double eliminationrate;
-
-    @TableField("SPEED")
-    private Double speed;
-
-    @TableField("STATICWINDFREQUENCY")
-    private Double staticwindfrequency;
-
-    @TableField("EFFECTIVEWINDHOURRATE")
-    private Double effectivewindhourrate;
-    @TableField(exist = false)
-    private Double orderno;
-
-}

histroy/benchmarking-histroy/src/main/java/com/gyee/benchmarkinghistroy/model/auto/Benchmarkingbetween.java

@@ -1,76 +0,0 @@
-package com.gyee.benchmarkinghistroy.model.auto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author 谢生杰
- * @since 2021-06-24
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("BENCHMARKINGBETWEEN")
-public class Benchmarkingbetween extends Model {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId("ID")
-    private Double id;
-
-    @TableField("DUTYNAME")
-    private String dutyname;
-
-    @TableField("THEDAY")
-    private Date theday;
-
-    @TableField("THEORETICALGENERATITY")
-    private Double theoreticalgeneratity;
-
-    @TableField("GENERATITY")
-    private Double generatity;
-
-    @TableField("FAULTLOSS")
-    private Double faultloss;
-
-    @TableField("FAULTRATE")
-    private Double faultrate;
-
-    @TableField("MAINLOSS")
-    private Double mainloss;
-
-    @TableField("MAINRATE")
-    private Double mainrate;
-
-    @TableField("PERFORMANCELOSS")
-    private Double performanceloss;
-
-    @TableField("PERFORMANCERATE")
-    private Double performancerate;
-
-    @TableField("RATIONINGLOSS")
-    private Double rationingloss;
-
-    @TableField("RATIONINGRATE")
-    private Double rationingrate;
-
-    @TableField("INVOLVESLOSS")
-    private Double involvesloss;
-
-    @TableField("INVOLVESRATE")
-    private Double involvesrate;
-
-    @TableField("FNLYL")
-    private Double fnlyl;
-
-
-}

histroy/benchmarking-histroy/src/main/java/com/gyee/benchmarkinghistroy/model/auto/Dutyschedule.java

@@ -1,44 +0,0 @@
-package com.gyee.benchmarkinghistroy.model.auto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author 谢生杰
- * @since 2021-06-24
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("DUTYSCHEDULE")
-public class Dutyschedule extends Model {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId("ID")
-    private BigDecimal id;
-
-    @TableField("NAME")
-    private String name;
-
-    @TableField("BEGIN")
-    private String begin;
-
-    @TableField("END")
-    private String end;
-
-    @TableField("CREATEDATE")
-    private Date createdate;
-
-
-}

histroy/benchmarking-histroy/src/main/java/com/gyee/benchmarkinghistroy/model/auto/Equipmentdaydetailed.java

@@ -1,92 +0,0 @@
-package com.gyee.benchmarkinghistroy.model.auto;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author 谢生杰
- * @since 2021-06-21
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("EQUIPMENTDAYDETAILED")
-public class Equipmentdaydetailed extends Model {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "ID",type = IdType.INPUT)
-    private String id;
-
-    @TableField("WINDTURBINEID")
-    private String windturbineid;
-
-    @TableField("PROJECTID")
-    private String projectid;
-
-    @TableField("LINEID")
-    private String lineid;
-
-    @TableField("WINDPOWERSTATIONID")
-    private String windpowerstationid;
-
-    @TableField("RECORDDATE")
-    private Date recorddate;
-
-    @TableField("GENECAPACITY")
-    private Double genecapacity;
-
-    @TableField("THEROGENECAPACITY")
-    private Double therogenecapacity;
-
-    @TableField("SPEED")
-    private Double speed;
-
-    @TableField("DAYNHWHSSDL1")
-    private Double daynhwhssdl1;
-
-    @TableField("DAYNHWHSSDL2")
-    private Double daynhwhssdl2;
-
-    @TableField("DAYNHGZSSDL1")
-    private Double daynhgzssdl1;
-
-    @TableField("DAYNHGZSSDL2")
-    private Double daynhgzssdl2;
-
-    @TableField("DAYNHXDSSDL1")
-    private Double daynhxdssdl1;
-
-    @TableField("DAYNHXDSSDL2")
-    private Double daynhxdssdl2;
-
-    @TableField("DAYNHQFDL1")
-    private Double daynhqfdl1;
-
-    @TableField("DAYNHQFDL2")
-    private Double daynhqfdl2;
-
-    @TableField("DAYNHQFDL3")
-    private Double daynhqfdl3;
-
-    @TableField("DAYNHQFDL4")
-    private Double daynhqfdl4;
-
-    @TableField("DAYNHCFDL1")
-    private Double daynhcfdl1;
-
-    @TableField("DAYNHCFDL2")
-    private Double daynhcfdl2;
-
-
-}

histroy/benchmarking-histroy/src/main/java/com/gyee/benchmarkinghistroy/model/auto/Equipmentdayinfo.java

@@ -1,73 +0,0 @@
-package com.gyee.benchmarkinghistroy.model.auto;
-
-import java.math.BigDecimal;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-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 2021-09-29
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("EQUIPMENTDAYINFO")
-public class Equipmentdayinfo extends Model {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "ID",type = IdType.INPUT)
-    private String id;
-
-    @TableField("WINDTURBINEID")
-    private String windturbineid;
-
-    @TableField("PROJECTID")
-    private String projectid;
-
-    @TableField("LINEID")
-    private String lineid;
-
-    @TableField("WINDPOWERSTATIONID")
-    private String windpowerstationid;
-
-    @TableField("RECORDDATE")
-    private Date recorddate;
-
-    @TableField("GENECAPACITY")
-    private Double genecapacity;
-
-    @TableField("THEROGENECAPACITY")
-    private Double therogenecapacity;
-
-    @TableField("SPEED")
-    private Double speed;
-
-    @TableField("DAYNHWHSSDL")
-    private Double daynhwhssdl;
-
-    @TableField("DAYNHGZSSDL")
-    private Double daynhgzssdl;
-
-    @TableField("DAYNHXDSSDL")
-    private Double daynhxdssdl;
-
-    @TableField("DAYNHQFDL")
-    private Double daynhqfdl;
-
-    @TableField("DAYNHCFDL")
-    private Double daynhcfdl;
-
-}

histroy/benchmarking-histroy/src/main/java/com/gyee/benchmarkinghistroy/model/auto/Operationrecord.java

@@ -1,43 +0,0 @@
-package com.gyee.benchmarkinghistroy.model.auto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author 谢生杰
- * @since 2021-06-24
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("OPERATIONRECORD")
-public class Operationrecord extends Model {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId("ID")
-    private Long id;
-
-    @TableField("DUTYNAME")
-    private String dutyname;
-
-    @TableField("WTID")
-    private String wtid;
-
-    @TableField("TIME")
-    private Date time;
-
-    @TableField("VALUE")
-    private Double value;
-
-
-}

histroy/benchmarking-histroy/src/main/java/com/gyee/benchmarkinghistroy/model/auto/Project.java

@@ -1,70 +0,0 @@
-package com.gyee.benchmarkinghistroy.model.auto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author 谢生杰
- * @since 2021-06-21
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("PROJECT")
-public class Project extends Model {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId("ID")
-    private String id;
-
-    @TableField("CODE")
-    private String code;
-
-    @TableField("NAME")
-    private String name;
-
-    @TableField("ANAME")
-    private String aname;
-
-    @TableField("WINDPOWERSTATIONID")
-    private String windpowerstationid;
-
-    @TableField("CAPACITY")
-    private Double capacity;
-
-    @TableField("CAPACITYUNIT")
-    private String capacityunit;
-
-    @TableField("QUANTITY")
-    private Double quantity;
-
-    @TableField("MODEL")
-    private String model;
-
-    @TableField("COMMISSIONDATE")
-    private Date commissiondate;
-
-    @TableField("MASTERPHONE")
-    private String masterphone;
-
-    @TableField("SHIFTFOREMAN")
-    private String shiftforeman;
-
-    @TableField("SHIFTFOREMANPHONE")
-    private String shiftforemanphone;
-
-    @TableField("ORDERNUM")
-    private Double ordernum;
-
-
-}

histroy/benchmarking-histroy/src/main/java/com/gyee/benchmarkinghistroy/model/auto/Windpowerinfoday.java

@@ -1,574 +0,0 @@
-package com.gyee.benchmarkinghistroy.model.auto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author 谢生杰
- * @since 2021-07-26
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("WINDPOWERINFODAY")
-public class Windpowerinfoday extends Model {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 编号
-     */
-    @TableId("ID")
-    private Long id;
-
-    /**
-     * 外键编号
-     */
-    @TableField("FOREIGNKEYID")
-    private String foreignkeyid;
-
-    /**
-     * 运行小时
-     */
-    @TableField("RUNHOURS")
-    private Double runhours;
-
-    /**
-     * 停机小时
-     */
-    @TableField("STOPHOURS")
-    private Double stophours;
-
-    /**
-     * 故障小时
-     */
-    @TableField("FAULTHOURS")
-    private Double faulthours;
-
-    /**
-     * 维护小时
-     */
-    @TableField("MAINTAINHOURS")
-    private Double maintainhours;
-
-    /**
-     * 通讯中断小时
-     */
-    @TableField("INTERRUPTHOURS")
-    private Double interrupthours;
-
-    /**
-     * 发电量(SCADA)
-     */
-    @TableField("GENERATINGCAPACITY")
-    private Double generatingcapacity;
-
-    /**
-     * 风速
-     */
-    @TableField("SPEED")
-    private Double speed;
-
-    /**
-     * 功率
-     */
-    @TableField("POWER")
-    private Double power;
-
-    /**
-     * 日期
-     */
-    @TableField("RECORDDATE")
-    private Date recorddate;
-
-    /**
-     * 上网电量
-     */
-    @TableField("GRIDELECTRICITY")
-    private Double gridelectricity;
-
-    /**
-     * 工网购网电量
-     */
-    @TableField("BUYELECTRICITY")
-    private Double buyelectricity;
-
-    /**
-     * 场内停机
-     */
-    @TableField("INSTOP")
-    private Double instop;
-
-    /**
-     * 场外停机
-     */
-    @TableField("OUTSTOP")
-    private Double outstop;
-
-    /**
-     * 运行时间（计算过）
-     */
-    @TableField("RUNTIME")
-    private Double runtime;
-
-    /**
-     * 停机时间（计算过）
-     */
-    @TableField("STOPTIME")
-    private Double stoptime;
-
-    /**
-     * 故障时间（计算过）
-     */
-    @TableField("FAULTTIME")
-    private Double faulttime;
-
-    /**
-     * 维护时间（计算过）
-     */
-    @TableField("MAINTAINTIME")
-    private Double maintaintime;
-
-    /**
-     * 通讯中断时间（计算过）
-     */
-    @TableField("INTERRUPTTIME")
-    private Double interrupttime;
-
-    /**
-     * 月发电量
-     */
-    @TableField("MONTHGC")
-    private Double monthgc;
-
-    /**
-     * 年发电量
-     */
-    @TableField("YEARGC")
-    private Double yeargc;
-
-    /**
-     * 理论发电量
-     */
-    @TableField("THEORYGENERATION")
-    private Double theorygeneration;
-
-    /**
-     * 损失发电量
-     */
-    @TableField("LOSSOFPOWER")
-    private Double lossofpower;
-
-    /**
-     * 场用电量
-     */
-    @TableField("FIELDELECTRICITY")
-    private Double fieldelectricity;
-
-    /**
-     * 发电量（电表）
-     */
-    @TableField("GENERATINGCAPACITY2")
-    private Double generatingcapacity2;
-
-    /**
-     * 风场编号
-     */
-    @TableField("WINDPOWERSTATIONID")
-    private String windpowerstationid;
-
-    /**
-     * 项目编号
-     */
-    @TableField("PROJECTID")
-    private String projectid;
-
-    /**
-     * 线路编号
-     */
-    @TableField("LINEID")
-    private String lineid;
-
-    /**
-     * 所属位置
-     */
-    @TableField("LOCATION")
-    private String location;
-
-    /**
-     * 农网购网电量
-     */
-    @TableField("BUYAGRICULTUREELECTRICITY")
-    private Double buyagricultureelectricity;
-
-    /**
-     * 月发电量(电表)
-     */
-    @TableField("MONTHGC2")
-    private Double monthgc2;
-
-    /**
-     * 年发电量(电表)
-     */
-    @TableField("YEARGC2")
-    private Double yeargc2;
-
-    /**
-     * 风速(测风塔)
-     */
-    @TableField("SPEED2")
-    private Double speed2;
-
-    /**
-     * 最小风速
-     */
-    @TableField("MAXSPEED")
-    private Double maxspeed;
-
-    /**
-     * 最大风速（日照强度）
-     */
-    @TableField("MINSPEED")
-    private Double minspeed;
-
-    /**
-     * 限电量
-     */
-    @TableField("LIMITPOWER")
-    private Double limitpower;
-
-    /**
-     * 总发电量（SCADA）
-     */
-    @TableField("TOTALGC")
-    private Double totalgc;
-
-    /**
-     * 总发电量
-     */
-    @TableField("TOTALGC2")
-    private Double totalgc2;
-
-    /**
-     * 自算理论发电量
-     */
-    @TableField("THEORYGENERATIONZS")
-    private Double theorygenerationzs;
-
-    /**
-     * 有效风时数
-     */
-    @TableField("WINDHOURS")
-    private Double windhours;
-
-    /**
-     * 最大功率
-     */
-    @TableField("MAXPOWER")
-    private Double maxpower;
-
-    /**
-     * 最小功率
-     */
-    @TableField("MINPOWER")
-    private Double minpower;
-
-    /**
-     * 月上网电量
-     */
-    @TableField("MONTHGE")
-    private Double monthge;
-
-    /**
-     * 年上网电量
-     */
-    @TableField("YEARGE")
-    private Double yearge;
-
-    /**
-     * 月工网购网电量
-     */
-    @TableField("MONTHBE")
-    private Double monthbe;
-
-    /**
-     * 年工网购网电量
-     */
-    @TableField("YEARBE")
-    private Double yearbe;
-
-    /**
-     * 月农网购网电量
-     */
-    @TableField("MONTHAE")
-    private Double monthae;
-
-    /**
-     * 年农网购网电量
-     */
-    @TableField("YEARAE")
-    private Double yearae;
-
-    /**
-     * 日发电量（4位小数）
-     */
-    @TableField("GENERATINGCAPACITY4")
-    private Double generatingcapacity4;
-
-    /**
-     * 日上网电量（4位小数）
-     */
-    @TableField("GRIDELECTRICITY4")
-    private Double gridelectricity4;
-
-    /**
-     * 日工网购网电量（4位小数）
-     */
-    @TableField("BUYELECTRICITY4")
-    private Double buyelectricity4;
-
-    /**
-     * 日农网购网电量（4位小数）
-     */
-    @TableField("BUYAGRICULTUREELECTRICITY4")
-    private Double buyagricultureelectricity4;
-
-    /**
-     * 日利用小时数
-     */
-    @TableField("DAYLYXS")
-    private Double daylyxs;
-
-    /**
-     * 月利用小时数
-     */
-    @TableField("MONTHLYXS")
-    private Double monthlyxs;
-
-    /**
-     * 年利用小时数
-     */
-    @TableField("YEARLYXS")
-    private Double yearlyxs;
-
-    /**
-     * 日综合厂用电率
-     */
-    @TableField("DAYZHCYDL")
-    private Double dayzhcydl;
-
-    /**
-     * 月综合厂用电率
-     */
-    @TableField("MONTHZHCYDL")
-    private Double monthzhcydl;
-
-    /**
-     * 年综合厂用电率
-     */
-    @TableField("YEARZHCYDL")
-    private Double yearzhcydl;
-
-    /**
-     * 日设备可利用率
-     */
-    @TableField("DAYSBKLYL")
-    private Double daysbklyl;
-
-    /**
-     * 月设备可利用率
-     */
-    @TableField("MONTHSBKLYL")
-    private Double monthsbklyl;
-
-    /**
-     * 年设备可利用率
-     */
-    @TableField("YEARSBKLYL")
-    private Double yearsbklyl;
-
-    /**
-     * 日等效可用系数
-     */
-    @TableField("DAYDXKYXS")
-    private Double daydxkyxs;
-
-    /**
-     * 月等效可用系数
-     */
-    @TableField("MONTHDXKYXS")
-    private Double monthdxkyxs;
-
-    /**
-     * 年等效可用系数
-     */
-    @TableField("YEARDXKYXS")
-    private Double yeardxkyxs;
-
-    /**
-     * 月平均风速
-     */
-    @TableField("MONTHSPEED")
-    private Double monthspeed;
-
-    /**
-     * 年平均风速
-     */
-    @TableField("YEARSPEED")
-    private Double yearspeed;
-
-    /**
-     * 运行时间（计算过）月
-     */
-    @TableField("MONTHRUNTIME")
-    private Double monthruntime;
-
-    /**
-     * 停机时间（计算过）月
-     */
-    @TableField("MONHTSTOPTIME")
-    private Double monhtstoptime;
-
-    /**
-     * 故障时间（计算过）月
-     */
-    @TableField("MONTHFAULTTIME")
-    private Double monthfaulttime;
-
-    /**
-     * 维护时间（计算过）月
-     */
-    @TableField("MONTHMAINTAINTIME")
-    private Double monthmaintaintime;
-
-    /**
-     * 通讯中断时间（计算过）月
-     */
-    @TableField("MONTHINTERRUPTTIME")
-    private Double monthinterrupttime;
-
-    /**
-     * 运行时间（计算过）年
-     */
-    @TableField("YEARRUNTIME")
-    private Double yearruntime;
-
-    /**
-     * 停机时间（计算过）年
-     */
-    @TableField("YEARSTOPTIME")
-    private Double yearstoptime;
-
-    /**
-     * 故障时间（计算过）年
-     */
-    @TableField("YEARFAULTTIME")
-    private Double yearfaulttime;
-
-    /**
-     * 维护时间（计算过）年
-     */
-    @TableField("YEARMAINTAINTIME")
-    private Double yearmaintaintime;
-
-    /**
-     * 通讯中断时间（计算过）年
-     */
-    @TableField("YEARINTERRUPTTIME")
-    private Double yearinterrupttime;
-
-    /**
-     * 日日历小时数
-     */
-    @TableField("DAYCALENDARHOURS")
-    private Double daycalendarhours;
-
-    /**
-     * 月日历小时数
-     */
-    @TableField("MONTHCALENDARHOURS")
-    private Double monthcalendarhours;
-
-    /**
-     * 年日历小时数
-     */
-    @TableField("YEARCALENDARHOURS")
-    private Double yearcalendarhours;
-
-    /**
-     * 限电损失电量
-     */
-    @TableField("LOSSOFPOWER1")
-    private Double lossofpower1;
-
-    /**
-     * 故障损失电量
-     */
-    @TableField("LOSSOFPOWER2")
-    private Double lossofpower2;
-
-    /**
-     * 维护损失电量
-     */
-    @TableField("LOSSOFPOWER3")
-    private Double lossofpower3;
-
-    /**
-     * 性能损失电量
-     */
-    @TableField("LOSSOFPOWER4")
-    private Double lossofpower4;
-
-    /**
-     * 月有效风时数
-     */
-    @TableField("MONTHWINDHOURS")
-    private Double monthwindhours;
-
-    /**
-     * 年有效风时数
-     */
-    @TableField("YEARWINDHOURS")
-    private Double yearwindhours;
-
-    /**
-     * 日限电小时数
-     */
-    @TableField("BROWNOUTSTIME")
-    private Double brownoutstime;
-
-    /**
-     * 月限电小时数
-     */
-    @TableField("MONTHBROWNOUTSTIME")
-    private Double monthbrownoutstime;
-
-    /**
-     * 年限电小时数
-     */
-    @TableField("YEARBROWNOUTSTIME")
-    private Double yearbrownoutstime;
-
-    @TableField("MAINLOSSIN")
-    private Double mainlossin;
-
-    @TableField("FAULTLOSSIN")
-    private Double faultlossin;
-
-    @TableField("ELECTRICLOSSOUT")
-    private Double electriclossout;
-
-    @TableField("WEATHERLOSSOUT")
-    private Double weatherlossout;
-
-
-}

histroy/benchmarking-histroy/src/main/java/com/gyee/benchmarkinghistroy/model/auto/Windpowerinfoday3.java

@@ -1,172 +0,0 @@
-package com.gyee.benchmarkinghistroy.model.auto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author 谢生杰
- * @since 2021-07-26
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("WINDPOWERINFODAY3")
-public class Windpowerinfoday3 extends Model {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId("ID")
-    private Long id;
-
-    @TableField("WINDPOWERSTATIONID")
-    private String windpowerstationid;
-
-    @TableField("PROJECTID")
-    private String projectid;
-
-    @TableField("LINEID")
-    private String lineid;
-
-    @TableField("WINDTURBINEID")
-    private String windturbineid;
-
-    @TableField("DAYDL1")
-    private Double daydl1;
-
-    @TableField("DAYDL2")
-    private Double daydl2;
-
-    @TableField("DAYPOWER")
-    private Double daypower;
-
-    @TableField("DAYSPEED")
-    private Double dayspeed;
-
-    @TableField("DAYMAXPOWER")
-    private Double daymaxpower;
-
-    @TableField("DAYMINPOWER")
-    private Double dayminpower;
-
-    @TableField("DAYMAXSPEED")
-    private Double daymaxspeed;
-
-    @TableField("DAYMINSPEED")
-    private Double dayminspeed;
-
-    @TableField("DAYNHGL")
-    private Double daynhgl;
-
-    @TableField("DAYNHDL")
-    private Double daynhdl;
-
-    @TableField("DAYNHGZSSDL")
-    private Double daynhgzssdl;
-
-    @TableField("DAYNHWHSSDL")
-    private Double daynhwhssdl;
-
-    @TableField("DAYNHXDSSDL")
-    private Double daynhxdssdl;
-
-    @TableField("DAYNHQFDL")
-    private Double daynhqfdl;
-
-    @TableField("DAYNHCFDL")
-    private Double daynhcfdl;
-
-    @TableField("DAYNHPCL")
-    private Double daynhpcl;
-
-    @TableField("DAYNHGL2")
-    private Double daynhgl2;
-
-    @TableField("DAYNHDL2")
-    private Double daynhdl2;
-
-    @TableField("DAYNHGZSSDL2")
-    private Double daynhgzssdl2;
-
-    @TableField("DAYNHWHSSDL2")
-    private Double daynhwhssdl2;
-
-    @TableField("DAYNHXDSSDL2")
-    private Double daynhxdssdl2;
-
-    @TableField("DAYNHQFDL2")
-    private Double daynhqfdl2;
-
-    @TableField("DAYNHCFDL2")
-    private Double daynhcfdl2;
-
-    @TableField("DAYNHPCL2")
-    private Double daynhpcl2;
-
-    @TableField("DAYBZGL")
-    private Double daybzgl;
-
-    @TableField("DAYBZDL")
-    private Double daybzdl;
-
-    @TableField("DAYBZGZSSDL")
-    private Double daybzgzssdl;
-
-    @TableField("DAYBZWHSSDL")
-    private Double daybzwhssdl;
-
-    @TableField("DAYBZXDSSDL")
-    private Double daybzxdssdl;
-
-    @TableField("DAYBZQFDL")
-    private Double daybzqfdl;
-
-    @TableField("DAYBZCFDL")
-    private Double daybzcfdl;
-
-    @TableField("DAYBZPCL")
-    private Double daybzpcl;
-
-    @TableField("DAYLLGL")
-    private Double dayllgl;
-
-    @TableField("DAYLLDL")
-    private Double daylldl;
-
-    @TableField("DAYLLGZSSDL")
-    private Double dayllgzssdl;
-
-    @TableField("DAYLLWHSSDL")
-    private Double dayllwhssdl;
-
-    @TableField("DAYLLXDSSDL")
-    private Double dayllxdssdl;
-
-    @TableField("DAYLLQFDL")
-    private Double dayllqfdl;
-
-    @TableField("DAYLLCFDL")
-    private Double dayllcfdl;
-
-    @TableField("DAYLLPCL")
-    private Double dayllpcl;
-
-    @TableField("RECORDDATE")
-    private Date recorddate;
-
-    @TableField("FOREIGNKEYID")
-    private String foreignkeyid;
-
-    @TableField("LOCATION")
-    private String location;
-
-
-}

histroy/benchmarking-histroy/src/main/java/com/gyee/benchmarkinghistroy/model/auto/Windpowerspecificinfoday.java

@@ -1,118 +0,0 @@
-package com.gyee.benchmarkinghistroy.model.auto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author 谢生杰
- * @since 2021-07-26
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("WINDPOWERSPECIFICINFODAY")
-public class Windpowerspecificinfoday extends Model {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId("ID")
-    private Long id;
-
-    @TableField("WINDPOWERSTATIONID")
-    private String windpowerstationid;
-
-    @TableField("RECORDDATE")
-    private Date recorddate;
-
-    @TableField("THEORETICALCAPACITY")
-    private Double theoreticalcapacity;
-
-    @TableField("GENERATINGCAPACITY")
-    private Double generatingcapacity;
-
-    @TableField("WINDENERGYRATE")
-    private Double windenergyrate;
-
-    @TableField("DAYNHWHSSDL")
-    private Double daynhwhssdl;
-
-    @TableField("DAYNHWHSSRATE")
-    private Double daynhwhssrate;
-
-    @TableField("DAYNHGZSSDL")
-    private Double daynhgzssdl;
-
-    @TableField("DAYNHGZSSRATE")
-    private Double daynhgzssrate;
-
-    @TableField("DAYNHXDSSDL")
-    private Double daynhxdssdl;
-
-    @TableField("DAYNHXDSSRATE")
-    private Double daynhxdssrate;
-
-    @TableField("DAYNHQFDL")
-    private Double daynhqfdl;
-
-    @TableField("DAYNHQFRATE")
-    private Double daynhqfrate;
-
-    @TableField("DAYNHCFDL")
-    private Double daynhcfdl;
-
-    @TableField("DAYNHCFRATE")
-    private Double daynhcfrate;
-
-    @TableField("FAULTCOUNT")
-    private Double faultcount;
-
-    @TableField("FAULTTIME")
-    private Double faulttime;
-
-    @TableField("WTCOUNT")
-    private Double wtcount;
-
-    @TableField("CALENDARTIME")
-    private Double calendartime;
-
-    @TableField("THEORESETTIMES")
-    private Double theoresettimes;
-
-    @TableField("RESETTIMES")
-    private Double resettimes;
-
-    @TableField("THEOCONVERSIONTIMES")
-    private Double theoconversiontimes;
-
-    @TableField("CONVERSIONTIMES")
-    private Double conversiontimes;
-
-    @TableField("THEOFAULTCOUNT")
-    private Double theofaultcount;
-
-    @TableField("RIGHTCOUNT")
-    private Double rightcount;
-
-    @TableField("YEAR")
-    private Double year;
-
-    @TableField("MONTH")
-    private Double month;
-
-    @TableField("ZHCYDL")
-    private Double zhcydl;
-
-    @TableField("GENERATINGCAPACITY2")
-    private Double generatingcapacity2;
-
-
-}

histroy/benchmarking-histroy/src/main/java/com/gyee/benchmarkinghistroy/model/auto/Windpowerstation.java

@@ -1,87 +0,0 @@
-package com.gyee.benchmarkinghistroy.model.auto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author 谢生杰
- * @since 2021-06-01
- */
-@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 Double capacity;
-
-    @TableField("CAPACITYUNIT")
-    private String capacityunit;
-
-    @TableField("QUANTITY")
-    private Double quantity;
-
-    @TableField("ANAME")
-    private String aname;
-
-    @TableField("LONGITUDE")
-    private Double longitude;
-
-    @TableField("LATITUDE")
-    private Double 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 Double ordernum;
-
-    @TableField("ALTITUDE")
-    private Double altitude;
-
-    @TableField("HEIGHT")
-    private Double height;
-
-
-}

histroy/benchmarking-histroy/src/main/java/com/gyee/benchmarkinghistroy/model/auto/Windpowerstationthewindinfo.java

@@ -1,928 +0,0 @@
-package com.gyee.benchmarkinghistroy.model.auto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author 谢生杰
- * @since 2021-07-26
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("WINDPOWERSTATIONTHEWINDINFO")
-public class Windpowerstationthewindinfo extends Model {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId("ID")
-    private Long id;
-
-    @TableField("WINDPOWERSTATIONID")
-    private String windpowerstationid;
-
-    @TableField("RECORDDATE")
-    private Date recorddate;
-
-    @TableField("CA")
-    private Double ca;
-
-    @TableField("CB")
-    private Double cb;
-
-    @TableField("CC")
-    private Double cc;
-
-    @TableField("CD")
-    private Double cd;
-
-    @TableField("CF")
-    private Double cf;
-
-    @TableField("CG")
-    private Double cg;
-
-    @TableField("E")
-    private Double e;
-
-    @TableField("ESE")
-    private Double ese;
-
-    @TableField("SE")
-    private Double se;
-
-    @TableField("SSE")
-    private Double sse;
-
-    @TableField("S")
-    private Double s;
-
-    @TableField("SSW")
-    private Double ssw;
-
-    @TableField("SW")
-    private Double sw;
-
-    @TableField("WSW")
-    private Double wsw;
-
-    @TableField("W")
-    private Double w;
-
-    @TableField("WNW")
-    private Double wnw;
-
-    @TableField("NW")
-    private Double nw;
-
-    @TableField("NNW")
-    private Double nnw;
-
-    @TableField("N")
-    private Double n;
-
-    @TableField("NNE")
-    private Double nne;
-
-    @TableField("NE")
-    private Double ne;
-
-    @TableField("ENE")
-    private Double ene;
-
-    @TableField("E2")
-    private Double e2;
-
-    @TableField("ESE2")
-    private Double ese2;
-
-    @TableField("SE2")
-    private Double se2;
-
-    @TableField("SSE2")
-    private Double sse2;
-
-    @TableField("S2")
-    private Double s2;
-
-    @TableField("SSW2")
-    private Double ssw2;
-
-    @TableField("SW2")
-    private Double sw2;
-
-    @TableField("WSW2")
-    private Double wsw2;
-
-    @TableField("W2")
-    private Double w2;
-
-    @TableField("WNW2")
-    private Double wnw2;
-
-    @TableField("NW2")
-    private Double nw2;
-
-    @TableField("NNW2")
-    private Double nnw2;
-
-    @TableField("N2")
-    private Double n2;
-
-    @TableField("NNE2")
-    private Double nne2;
-
-    @TableField("NE2")
-    private Double ne2;
-
-    @TableField("ENE2")
-    private Double ene2;
-
-    @TableField("E3")
-    private Double e3;
-
-    @TableField("ESE3")
-    private Double ese3;
-
-    @TableField("SE3")
-    private Double se3;
-
-    @TableField("SSE3")
-    private Double sse3;
-
-    @TableField("S3")
-    private Double s3;
-
-    @TableField("SSW3")
-    private Double ssw3;
-
-    @TableField("SW3")
-    private Double sw3;
-
-    @TableField("WSW3")
-    private Double wsw3;
-
-    @TableField("W3")
-    private Double w3;
-
-    @TableField("WNW3")
-    private Double wnw3;
-
-    @TableField("NW3")
-    private Double nw3;
-
-    @TableField("NNW3")
-    private Double nnw3;
-
-    @TableField("N3")
-    private Double n3;
-
-    @TableField("NNE3")
-    private Double nne3;
-
-    @TableField("NE3")
-    private Double ne3;
-
-    @TableField("ENE3")
-    private Double ene3;
-
-    @TableField("E4")
-    private Double e4;
-
-    @TableField("ESE4")
-    private Double ese4;
-
-    @TableField("SE4")
-    private Double se4;
-
-    @TableField("SSE4")
-    private Double sse4;
-
-    @TableField("S4")
-    private Double s4;
-
-    @TableField("SSW4")
-    private Double ssw4;
-
-    @TableField("SW4")
-    private Double sw4;
-
-    @TableField("WSW4")
-    private Double wsw4;
-
-    @TableField("W4")
-    private Double w4;
-
-    @TableField("WNW4")
-    private Double wnw4;
-
-    @TableField("NW4")
-    private Double nw4;
-
-    @TableField("NNW4")
-    private Double nnw4;
-
-    @TableField("N4")
-    private Double n4;
-
-    @TableField("NNE4")
-    private Double nne4;
-
-    @TableField("NE4")
-    private Double ne4;
-
-    @TableField("ENE4")
-    private Double ene4;
-
-    @TableField("E5")
-    private Double e5;
-
-    @TableField("ESE5")
-    private Double ese5;
-
-    @TableField("SE5")
-    private Double se5;
-
-    @TableField("SSE5")
-    private Double sse5;
-
-    @TableField("S5")
-    private Double s5;
-
-    @TableField("SSW5")
-    private Double ssw5;
-
-    @TableField("SW5")
-    private Double sw5;
-
-    @TableField("WSW5")
-    private Double wsw5;
-
-    @TableField("W5")
-    private Double w5;
-
-    @TableField("WNW5")
-    private Double wnw5;
-
-    @TableField("NW5")
-    private Double nw5;
-
-    @TableField("NNW5")
-    private Double nnw5;
-
-    @TableField("N5")
-    private Double n5;
-
-    @TableField("NNE5")
-    private Double nne5;
-
-    @TableField("NE5")
-    private Double ne5;
-
-    @TableField("ENE5")
-    private Double ene5;
-
-    @TableField("E6")
-    private Double e6;
-
-    @TableField("ESE6")
-    private Double ese6;
-
-    @TableField("SE6")
-    private Double se6;
-
-    @TableField("SSE6")
-    private Double sse6;
-
-    @TableField("S6")
-    private Double s6;
-
-    @TableField("SSW6")
-    private Double ssw6;
-
-    @TableField("SW6")
-    private Double sw6;
-
-    @TableField("WSW6")
-    private Double wsw6;
-
-    @TableField("W6")
-    private Double w6;
-
-    @TableField("WNW6")
-    private Double wnw6;
-
-    @TableField("NW6")
-    private Double nw6;
-
-    @TableField("NNW6")
-    private Double nnw6;
-
-    @TableField("N6")
-    private Double n6;
-
-    @TableField("NNE6")
-    private Double nne6;
-
-    @TableField("NE6")
-    private Double ne6;
-
-    @TableField("ENE6")
-    private Double ene6;
-
-    @TableField("E7")
-    private Double e7;
-
-    @TableField("ESE7")
-    private Double ese7;
-
-    @TableField("SE7")
-    private Double se7;
-
-    @TableField("SSE7")
-    private Double sse7;
-
-    @TableField("S7")
-    private Double s7;
-
-    @TableField("SSW7")
-    private Double ssw7;
-
-    @TableField("SW7")
-    private Double sw7;
-
-    @TableField("WSW7")
-    private Double wsw7;
-
-    @TableField("W7")
-    private Double w7;
-
-    @TableField("WNW7")
-    private Double wnw7;
-
-    @TableField("NW7")
-    private Double nw7;
-
-    @TableField("NNW7")
-    private Double nnw7;
-
-    @TableField("N7")
-    private Double n7;
-
-    @TableField("NNE7")
-    private Double nne7;
-
-    @TableField("NE7")
-    private Double ne7;
-
-    @TableField("ENE7")
-    private Double ene7;
-
-    @TableField("E8")
-    private Double e8;
-
-    @TableField("ESE8")
-    private Double ese8;
-
-    @TableField("SE8")
-    private Double se8;
-
-    @TableField("SSE8")
-    private Double sse8;
-
-    @TableField("S8")
-    private Double s8;
-
-    @TableField("SSW8")
-    private Double ssw8;
-
-    @TableField("SW8")
-    private Double sw8;
-
-    @TableField("WSW8")
-    private Double wsw8;
-
-    @TableField("W8")
-    private Double w8;
-
-    @TableField("WNW8")
-    private Double wnw8;
-
-    @TableField("NW8")
-    private Double nw8;
-
-    @TableField("NNW8")
-    private Double nnw8;
-
-    @TableField("N8")
-    private Double n8;
-
-    @TableField("NNE8")
-    private Double nne8;
-
-    @TableField("NE8")
-    private Double ne8;
-
-    @TableField("ENE8")
-    private Double ene8;
-
-    @TableField("E9")
-    private Double e9;
-
-    @TableField("ESE9")
-    private Double ese9;
-
-    @TableField("SE9")
-    private Double se9;
-
-    @TableField("SSE9")
-    private Double sse9;
-
-    @TableField("S9")
-    private Double s9;
-
-    @TableField("SSW9")
-    private Double ssw9;
-
-    @TableField("SW9")
-    private Double sw9;
-
-    @TableField("WSW9")
-    private Double wsw9;
-
-    @TableField("W9")
-    private Double w9;
-
-    @TableField("WNW9")
-    private Double wnw9;
-
-    @TableField("NW9")
-    private Double nw9;
-
-    @TableField("NNW9")
-    private Double nnw9;
-
-    @TableField("N9")
-    private Double n9;
-
-    @TableField("NNE9")
-    private Double nne9;
-
-    @TableField("NE9")
-    private Double ne9;
-
-    @TableField("ENE9")
-    private Double ene9;
-
-    @TableField("E10")
-    private Double e10;
-
-    @TableField("ESE10")
-    private Double ese10;
-
-    @TableField("SE10")
-    private Double se10;
-
-    @TableField("SSE10")
-    private Double sse10;
-
-    @TableField("S10")
-    private Double s10;
-
-    @TableField("SSW10")
-    private Double ssw10;
-
-    @TableField("SW10")
-    private Double sw10;
-
-    @TableField("WSW10")
-    private Double wsw10;
-
-    @TableField("W10")
-    private Double w10;
-
-    @TableField("WNW10")
-    private Double wnw10;
-
-    @TableField("NW10")
-    private Double nw10;
-
-    @TableField("NNW10")
-    private Double nnw10;
-
-    @TableField("N10")
-    private Double n10;
-
-    @TableField("NNE10")
-    private Double nne10;
-
-    @TableField("NE10")
-    private Double ne10;
-
-    @TableField("ENE10")
-    private Double ene10;
-
-    @TableField("E11")
-    private Double e11;
-
-    @TableField("ESE11")
-    private Double ese11;
-
-    @TableField("SE11")
-    private Double se11;
-
-    @TableField("SSE11")
-    private Double sse11;
-
-    @TableField("S11")
-    private Double s11;
-
-    @TableField("SSW11")
-    private Double ssw11;
-
-    @TableField("SW11")
-    private Double sw11;
-
-    @TableField("WSW11")
-    private Double wsw11;
-
-    @TableField("W11")
-    private Double w11;
-
-    @TableField("WNW11")
-    private Double wnw11;
-
-    @TableField("NW11")
-    private Double nw11;
-
-    @TableField("NNW11")
-    private Double nnw11;
-
-    @TableField("N11")
-    private Double n11;
-
-    @TableField("NNE11")
-    private Double nne11;
-
-    @TableField("NE11")
-    private Double ne11;
-
-    @TableField("ENE11")
-    private Double ene11;
-
-    @TableField("E12")
-    private Double e12;
-
-    @TableField("ESE12")
-    private Double ese12;
-
-    @TableField("SE12")
-    private Double se12;
-
-    @TableField("SSE12")
-    private Double sse12;
-
-    @TableField("S12")
-    private Double s12;
-
-    @TableField("SSW12")
-    private Double ssw12;
-
-    @TableField("SW12")
-    private Double sw12;
-
-    @TableField("WSW12")
-    private Double wsw12;
-
-    @TableField("W12")
-    private Double w12;
-
-    @TableField("WNW12")
-    private Double wnw12;
-
-    @TableField("NW12")
-    private Double nw12;
-
-    @TableField("NNW12")
-    private Double nnw12;
-
-    @TableField("N12")
-    private Double n12;
-
-    @TableField("NNE12")
-    private Double nne12;
-
-    @TableField("NE12")
-    private Double ne12;
-
-    @TableField("ENE12")
-    private Double ene12;
-
-    @TableField("E13")
-    private Double e13;
-
-    @TableField("ESE13")
-    private Double ese13;
-
-    @TableField("SE13")
-    private Double se13;
-
-    @TableField("SSE13")
-    private Double sse13;
-
-    @TableField("S13")
-    private Double s13;
-
-    @TableField("SSW13")
-    private Double ssw13;
-
-    @TableField("SW13")
-    private Double sw13;
-
-    @TableField("WSW13")
-    private Double wsw13;
-
-    @TableField("W13")
-    private Double w13;
-
-    @TableField("WNW13")
-    private Double wnw13;
-
-    @TableField("NW13")
-    private Double nw13;
-
-    @TableField("NNW13")
-    private Double nnw13;
-
-    @TableField("N13")
-    private Double n13;
-
-    @TableField("NNE13")
-    private Double nne13;
-
-    @TableField("NE13")
-    private Double ne13;
-
-    @TableField("ENE13")
-    private Double ene13;
-
-    @TableField("E14")
-    private Double e14;
-
-    @TableField("ESE14")
-    private Double ese14;
-
-    @TableField("SE14")
-    private Double se14;
-
-    @TableField("SSE14")
-    private Double sse14;
-
-    @TableField("S14")
-    private Double s14;
-
-    @TableField("SSW14")
-    private Double ssw14;
-
-    @TableField("SW14")
-    private Double sw14;
-
-    @TableField("WSW14")
-    private Double wsw14;
-
-    @TableField("W14")
-    private Double w14;
-
-    @TableField("WNW14")
-    private Double wnw14;
-
-    @TableField("NW14")
-    private Double nw14;
-
-    @TableField("NNW14")
-    private Double nnw14;
-
-    @TableField("N14")
-    private Double n14;
-
-    @TableField("NNE14")
-    private Double nne14;
-
-    @TableField("NE14")
-    private Double ne14;
-
-    @TableField("ENE14")
-    private Double ene14;
-
-    @TableField("E15")
-    private Double e15;
-
-    @TableField("ESE15")
-    private Double ese15;
-
-    @TableField("SE15")
-    private Double se15;
-
-    @TableField("SSE15")
-    private Double sse15;
-
-    @TableField("S15")
-    private Double s15;
-
-    @TableField("SSW15")
-    private Double ssw15;
-
-    @TableField("SW15")
-    private Double sw15;
-
-    @TableField("WSW15")
-    private Double wsw15;
-
-    @TableField("W15")
-    private Double w15;
-
-    @TableField("WNW15")
-    private Double wnw15;
-
-    @TableField("NW15")
-    private Double nw15;
-
-    @TableField("NNW15")
-    private Double nnw15;
-
-    @TableField("N15")
-    private Double n15;
-
-    @TableField("NNE15")
-    private Double nne15;
-
-    @TableField("NE15")
-    private Double ne15;
-
-    @TableField("ENE15")
-    private Double ene15;
-
-    @TableField("E16")
-    private Double e16;
-
-    @TableField("ESE16")
-    private Double ese16;
-
-    @TableField("SE16")
-    private Double se16;
-
-    @TableField("SSE16")
-    private Double sse16;
-
-    @TableField("S16")
-    private Double s16;
-
-    @TableField("SSW16")
-    private Double ssw16;
-
-    @TableField("SW16")
-    private Double sw16;
-
-    @TableField("WSW16")
-    private Double wsw16;
-
-    @TableField("W16")
-    private Double w16;
-
-    @TableField("WNW16")
-    private Double wnw16;
-
-    @TableField("NW16")
-    private Double nw16;
-
-    @TableField("NNW16")
-    private Double nnw16;
-
-    @TableField("N16")
-    private Double n16;
-
-    @TableField("NNE16")
-    private Double nne16;
-
-    @TableField("NE16")
-    private Double ne16;
-
-    @TableField("ENE16")
-    private Double ene16;
-
-    @TableField("E17")
-    private Double e17;
-
-    @TableField("ESE17")
-    private Double ese17;
-
-    @TableField("SE17")
-    private Double se17;
-
-    @TableField("SSE17")
-    private Double sse17;
-
-    @TableField("S17")
-    private Double s17;
-
-    @TableField("SSW17")
-    private Double ssw17;
-
-    @TableField("SW17")
-    private Double sw17;
-
-    @TableField("WSW17")
-    private Double wsw17;
-
-    @TableField("W17")
-    private Double w17;
-
-    @TableField("WNW17")
-    private Double wnw17;
-
-    @TableField("NW17")
-    private Double nw17;
-
-    @TableField("NNW17")
-    private Double nnw17;
-
-    @TableField("N17")
-    private Double n17;
-
-    @TableField("NNE17")
-    private Double nne17;
-
-    @TableField("NE17")
-    private Double ne17;
-
-    @TableField("ENE17")
-    private Double ene17;
-
-    @TableField("E18")
-    private Double e18;
-
-    @TableField("ESE18")
-    private Double ese18;
-
-    @TableField("SE18")
-    private Double se18;
-
-    @TableField("SSE18")
-    private Double sse18;
-
-    @TableField("S18")
-    private Double s18;
-
-    @TableField("SSW18")
-    private Double ssw18;
-
-    @TableField("SW18")
-    private Double sw18;
-
-    @TableField("WSW18")
-    private Double wsw18;
-
-    @TableField("W18")
-    private Double w18;
-
-    @TableField("WNW18")
-    private Double wnw18;
-
-    @TableField("NW18")
-    private Double nw18;
-
-    @TableField("NNW18")
-    private Double nnw18;
-
-    @TableField("N18")
-    private Double n18;
-
-    @TableField("NNE18")
-    private Double nne18;
-
-    @TableField("NE18")
-    private Double ne18;
-
-    @TableField("ENE18")
-    private Double ene18;
-
-    @TableField("CH")
-    private Double ch;
-
-    @TableField("CI")
-    private Double ci;
-
-    @TableField("CJ")
-    private Double cj;
-
-
-}

histroy/benchmarking-histroy/src/main/java/com/gyee/benchmarkinghistroy/model/auto/Windturbinetestingpointai2.java

@@ -1,82 +0,0 @@
-package com.gyee.benchmarkinghistroy.model.auto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.math.BigDecimal;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author 谢生杰
- * @since 2021-05-13
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("WINDTURBINETESTINGPOINTAI2")
-public class Windturbinetestingpointai2 extends Model {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId("ID")
-    private String id;
-
-    @TableField("CODE")
-    private String code;
-
-    @TableField("NAME")
-    private String name;
-
-    @TableField("MODEL")
-    private String model;
-
-    @TableField("VALUEUNIT")
-    private String valueunit;
-
-    @TableField("ENGLISHNAME")
-    private String englishname;
-
-    @TableField("TYPEID")
-    private String typeid;
-
-    @TableField("MODELID")
-    private String modelid;
-
-    @TableField("MAXVAL")
-    private BigDecimal maxval;
-
-    @TableField("MINVAL")
-    private BigDecimal minval;
-
-    @TableField("REASONABLEMAXVAL")
-    private BigDecimal reasonablemaxval;
-
-    @TableField("REASONABLEMINVAL")
-    private BigDecimal reasonableminval;
-
-    @TableField("WINDTURBINEID")
-    private String windturbineid;
-
-    @TableField("UNIFORMCODE")
-    private String uniformcode;
-
-    @TableField("SHORTID")
-    private String shortid;
-
-    @TableField("LONGID")
-    private String longid;
-
-    @TableField("WINDPOWERSTATIONID")
-    private String windpowerstationid;
-
-    @TableField("REALTIMEID")
-    private String realtimeid;
-
-
-}

histroy/benchmarking-histroy/src/main/java/com/gyee/benchmarkinghistroy/model/auto/Wpmttrandmtbfday.java

@@ -1,52 +0,0 @@
-package com.gyee.benchmarkinghistroy.model.auto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author 谢生杰
- * @since 2021-07-26
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("WPMTTRANDMTBFDAY")
-public class Wpmttrandmtbfday extends Model {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId("ID")
-    private String id;
-
-    @TableField("WPID")
-    private String wpid;
-
-    @TableField("WPNAME")
-    private String wpname;
-
-    @TableField("LOCATION")
-    private String location;
-
-    @TableField("RECORDDATE")
-    private Date recorddate;
-
-    @TableField("STOPHOURS")
-    private Double stophours;
-
-    @TableField("STOPRTIMES")
-    private Double stoprtimes;
-
-    @TableField("WTHOURS")
-    private Double wthours;
-
-
-}

histroy/benchmarking-histroy/src/main/java/com/gyee/benchmarkinghistroy/service/BenchmarkingHistroyService.java

@@ -1,513 +0,0 @@
-package com.gyee.benchmarkinghistroy.service;
-
-import com.gyee.benchmarkinghistroy.init.CacheContext;
-import com.gyee.benchmarkinghistroy.model.auto.*;
-import com.gyee.benchmarkinghistroy.service.auto.*;
-import com.gyee.benchmarkinghistroy.util.realtimesource.EdosUtil;
-import com.gyee.common.contant.Contant;
-import com.gyee.common.model.PointData;
-import com.gyee.common.model.StringUtils;
-
-import com.gyee.common.util.DateUtils;
-import com.gyee.common.util.RandomUtil;
-import com.gyee.common.vo.benchmark.OpeVo;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.*;
-import java.util.stream.Collectors;
-
-/**
- * @ClassName : BenchmarkingHistroyService
- * @Author : xieshengjie
- * @Date: 2021/9/29 18:18
- * @Description : 对标管理service
- */
-@Service
-public class BenchmarkingHistroyService {
-
-    private  final String TYPE_DATE = "date";
-    private  final String TYPE_WIND = "wind";
-    private  final String TYPE_PROJECT = "project";
-    private  final String TYPE_LINE = "line";
-    private  final String TYPE_WINDTURBINE = "windturbine";
-
-    private EdosUtil edosUtil = new EdosUtil();
-    @Resource
-    private IEquipmentdayinfoService equipmentdayinfoService;
-    @Resource
-    private IEquipmentdaydetailedService equipmentdaydetailedService;
-    @Resource
-    private IDutyscheduleService dutyscheduleService;
-    @Resource
-    private IOperationrecordService operationrecordService;
-    @Resource
-    private IBenchmarkingbetweenService benchmarkingbetweenService;
-    @Resource
-    private IBenchmarkService benchmarkService;
-    @Resource
-    private IWindpowerinfodayService windpowerinfodayService;
-    @Resource
-    private IWindpowerinfoday3Service windpowerinfoday3Service;
-    @Resource
-    private IWpmttrandmtbfdayService wpmttrandmtbfdayService;
-    @Resource
-    private IWindpowerspecificinfodayService windpowerspecificinfodayService;
-    @Resource
-    private IWindpowerstationthewindinfoService windpowerstationthewindinfoService;
-
-    /**
-     * 保存日信息表
-     * @param beginDate
-     * @param endDate
-     */
-    public void saveEquipmentdayinfo(String beginDate,String endDate){
-        Map<String, Map<String, Windturbinetestingpointai2>> wtpAimap = CacheContext.wtpAimap;
-        List<Windturbine> wtls = CacheContext.wtls.stream().filter(i->i.getWindpowerstationid().endsWith("FDC")).collect(Collectors.toList());
-        String[] uniformcodes = Contant.WXSS.split(",");
-        List<String> days = getDays(beginDate, endDate);
-
-        for (String d : days) {
-            Map<String,Object> delMap = new HashMap<>();
-            delMap.put("recorddate",DateUtils.parseDate(d));
-            equipmentdayinfoService.removeByMap(delMap);
-            List<Equipmentdayinfo> resultList = new ArrayList<>();
-            Date date = DateUtils.parseDate(d);
-            Date addDays = DateUtils.addDays(date, 1);
-            Date begin = DateUtils.getStartOfDay(addDays);
-            Date end = DateUtils.addSeconds(begin, 1);
-
-            wtls.stream().filter(i->i.getWindpowerstationid().endsWith("FDC")).forEach(wt->{
-                Map<String,Double> wtDataMap = new HashMap<>();
-                Map<String, Windturbinetestingpointai2> nmap = wtpAimap.get(wt.getId());
-                for (String uniformcode : uniformcodes) {
-                    try {
-                        Windturbinetestingpointai2 windturbinetestingpointai2 = nmap.get(uniformcode);
-                        if (windturbinetestingpointai2!=null){
-                            List<PointData> pointDatas = edosUtil.getHistoryDatasSnap(windturbinetestingpointai2, begin.getTime()/1000, end.getTime()/1000,1l,1l);
-                            Optional<PointData> first = pointDatas.stream().findFirst();
-                            Double value = first.isPresent()?first.get().getPointValueInDouble():0;
-                            wtDataMap.put(wt.getId()+"_"+uniformcode,value);
-                        }else {
-                            System.out.println(wt.getId()+"----"+uniformcode);
-                        }
-
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
-                }
-
-                Equipmentdayinfo equipmentdayinfo = new Equipmentdayinfo();
-                equipmentdayinfo.setId(StringUtils.getUUID());
-                equipmentdayinfo.setWindturbineid(wt.getId());
-                equipmentdayinfo.setLineid(wt.getLineid());
-                equipmentdayinfo.setProjectid(wt.getProjectid());
-                equipmentdayinfo.setWindpowerstationid(wt.getWindpowerstationid());
-                equipmentdayinfo.setRecorddate(DateUtils.parseDate(d));
-                equipmentdayinfo.setGenecapacity(wtDataMap.get(wt.getId()+"_RFDL"));
-                equipmentdayinfo.setSpeed(wtDataMap.get(wt.getId()+"_AI022"));
-                //维护：RJXSSDL-ZS,RLZSSDL-ZS
-                equipmentdayinfo.setDaynhwhssdl(wtDataMap.get(wt.getId()+"_RJXSSDL-ZS") + wtDataMap.get(wt.getId()+"_RLZSSDL-ZS"));
-                //故障：RGZSSDL-ZS,NSZSSDL-ZS
-                equipmentdayinfo.setDaynhgzssdl(wtDataMap.get(wt.getId()+"_RGZSSDL-ZS") + wtDataMap.get(wt.getId()+"_NSZSSDL-ZS"));
-                //限电：RQFSSDL-ZS,RXDSSDL-ZS
-                equipmentdayinfo.setDaynhxdssdl(wtDataMap.get(wt.getId()+"_RQFSSDL-ZS") + wtDataMap.get(wt.getId()+"_RXDSSDL-ZS"));
-                //性能：RDJSSDL-ZS,RSTSSDL-ZS，RXNSSDL-ZS，RQXSSDL-ZS(集团项目需把发电欠发去掉)
-                equipmentdayinfo.setDaynhqfdl(wtDataMap.get(wt.getId()+"_RDJSSDL-ZS") + wtDataMap.get(wt.getId()+"_RSTSSDL-ZS") + wtDataMap.get(wt.getId()+"_RXNSSDL-ZS") + wtDataMap.get(wt.getId()+"_RQXSSDL-ZS"));
-                //受累：RWZSSDL-ZS,RTZSSDL-ZS
-                equipmentdayinfo.setDaynhcfdl(wtDataMap.get(wt.getId()+"_RWZSSDL-ZS") + wtDataMap.get(wt.getId()+"_RTZSSDL-ZS"));
-                equipmentdayinfo.setTherogenecapacity(equipmentdayinfo.getGenecapacity()+equipmentdayinfo.getDaynhwhssdl()+equipmentdayinfo.getDaynhgzssdl()+equipmentdayinfo.getDaynhxdssdl()+equipmentdayinfo.getDaynhqfdl()+equipmentdayinfo.getDaynhcfdl());
-                resultList.add(equipmentdayinfo);
-            });
-            equipmentdayinfoService.saveBatch(resultList);
-        }
-    }
-
-    /**
-     * 保存日信息明细
-     * @param beginDate
-     * @param endDate
-     */
-    public void saveEquipmentdaydetailed(String beginDate,String endDate){
-        Map<String, Map<String, Windturbinetestingpointai2>> wtpAimap = CacheContext.wtpAimap;
-        List<Windturbine> wtls = CacheContext.wtls;
-        String[] uniformcodes = Contant.WXSS.split(",");
-        List<String> days = getDays(beginDate, endDate);
-        for (String d : days) {
-            Map<String,Object> delMap = new HashMap<>();
-            delMap.put("recorddate",DateUtils.parseDate(d));
-            equipmentdaydetailedService.removeByMap(delMap);
-            List<Equipmentdaydetailed> resultList = new ArrayList<>();
-            Date date = DateUtils.parseDate(d);
-            Date addDays = DateUtils.addDays(date, 1);
-            Date begin = DateUtils.getStartOfDay(addDays);
-            Date end = DateUtils.addSeconds(begin, 1);
-            wtls.stream().filter(i->i.getWindpowerstationid().endsWith("FDC")).forEach(wt->{
-                Map<String,Double> wtDataMap = new HashMap<>();
-                Map<String, Windturbinetestingpointai2> nmap = wtpAimap.get(wt.getId());
-                for (String uniformcode : uniformcodes) {
-                    try {
-                        Windturbinetestingpointai2 windturbinetestingpointai2 = nmap.get(uniformcode);
-                        List<PointData> pointDatas = edosUtil.getHistoryDatasSnap(windturbinetestingpointai2, begin.getTime()/1000, end.getTime()/1000,1l,1l);
-                        Optional<PointData> first = pointDatas.stream().findFirst();
-                        Double value = first.isPresent()?first.get().getPointValueInDouble():0;
-                        wtDataMap.put(wt.getId()+"_"+uniformcode,value);
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
-                }
-                Equipmentdaydetailed equipmentdayinfo = new Equipmentdaydetailed();
-                equipmentdayinfo.setId(StringUtils.getUUID());
-                equipmentdayinfo.setWindturbineid(wt.getId());
-                equipmentdayinfo.setLineid(wt.getLineid());
-                equipmentdayinfo.setProjectid(wt.getProjectid());
-                equipmentdayinfo.setWindpowerstationid(wt.getWindpowerstationid());
-                equipmentdayinfo.setRecorddate(DateUtils.parseDate(d));
-                equipmentdayinfo.setGenecapacity(wtDataMap.get(wt.getId()+"_RFDL"));
-                equipmentdayinfo.setSpeed(wtDataMap.get(wt.getId()+"_AI022"));
-                //维护：RJXSSDL-ZS,RLZSSDL-ZS
-                equipmentdayinfo.setDaynhwhssdl1(wtDataMap.get(wt.getId()+"_RJXSSDL-ZS"));
-                equipmentdayinfo.setDaynhwhssdl2(wtDataMap.get(wt.getId()+"_RLZSSDL-ZS"));
-                //故障：RGZSSDL-ZS,NSZSSDL-ZS
-                equipmentdayinfo.setDaynhgzssdl1(wtDataMap.get(wt.getId()+"_RGZSSDL-ZS"));
-                equipmentdayinfo.setDaynhgzssdl2(wtDataMap.get(wt.getId()+"_NSZSSDL-ZS"));
-                //限电：RQFSSDL-ZS,RXDSSDL-ZS
-                equipmentdayinfo.setDaynhxdssdl1(wtDataMap.get(wt.getId()+"_RQFSSDL-ZS"));
-                equipmentdayinfo.setDaynhxdssdl2(wtDataMap.get(wt.getId()+"_RXDSSDL-ZS"));
-                //性能：RDJSSDL-ZS,RSTSSDL-ZS，RXNSSDL-ZS，RQXSSDL-ZS
-                equipmentdayinfo.setDaynhqfdl1(wtDataMap.get(wt.getId()+"_RDJSSDL-ZS"));
-                equipmentdayinfo.setDaynhqfdl2(wtDataMap.get(wt.getId()+"_RSTSSDL-ZS"));
-                equipmentdayinfo.setDaynhqfdl3(wtDataMap.get(wt.getId()+"_RXNSSDL-ZS"));
-                equipmentdayinfo.setDaynhqfdl4(wtDataMap.get(wt.getId()+"_RQXSSDL-ZS"));
-                //受累：RWZSSDL-ZS,RTZSSDL-ZS
-                equipmentdayinfo.setDaynhcfdl1(wtDataMap.get(wt.getId()+"_RWZSSDL-ZS"));
-                equipmentdayinfo.setDaynhcfdl2(wtDataMap.get(wt.getId()+"_RTZSSDL-ZS"));
-
-                equipmentdayinfo.setTherogenecapacity(equipmentdayinfo.getGenecapacity()+equipmentdayinfo.getDaynhwhssdl1()+equipmentdayinfo.getDaynhwhssdl2()
-                        +equipmentdayinfo.getDaynhgzssdl1()+equipmentdayinfo.getDaynhgzssdl2()
-                        +equipmentdayinfo.getDaynhxdssdl1()+equipmentdayinfo.getDaynhxdssdl2()
-                        +equipmentdayinfo.getDaynhqfdl1()+equipmentdayinfo.getDaynhqfdl2()+equipmentdayinfo.getDaynhqfdl3()+equipmentdayinfo.getDaynhqfdl4()
-                        +equipmentdayinfo.getDaynhcfdl1()+equipmentdayinfo.getDaynhcfdl2());
-                resultList.add(equipmentdayinfo);
-            });
-            equipmentdaydetailedService.saveBatch(resultList);
-        }
-    }
-
-    /**
-     * 保存值际操作指令表
-     * @param beginDate
-     * @param endDate
-     */
-    public void saveOperationrecord(String beginDate,String endDate) throws ParseException {
-        List<String> days = getDays(beginDate, endDate);
-        for (String day : days) {
-            Date date = DateUtils.parseDate(day);
-            Date startOfDay = DateUtils.getStartOfDay(date);
-            Date endOfDay = DateUtils.getEndOfDay(date);
-            Map<String, Object> params1 = new HashMap<>();
-            params1.put("createdate", date);
-            List<Dutyschedule> dutyList = dutyscheduleService.listByMap(params1);
-            params1.remove("createdate");
-            params1.put("time",date);
-            operationrecordService.removeByMap(params1);
-            Map<String, Map<String, Windturbinetestingpointai2>> wtpointMap = CacheContext.wtpAimap;
-            String[] points = Contant.opePoints.split(",");
-            List<Windturbine> wtls = CacheContext.wtls;
-            List<OpeVo> resuList = new ArrayList<>();
-            for (Windturbine wt : wtls) {
-                if (wt.getWindpowerstationid().endsWith("GDC")){
-                    continue;
-                }
-                for (String point : points) {
-                    Windturbinetestingpointai2 windturbinetestingpointai2 = wtpointMap.get(wt.getId()).get(point);
-                    try {
-                        List<PointData> pointDatas = edosUtil.getHistoryDatasRaw(windturbinetestingpointai2.getId(), startOfDay.getTime()/1000, endOfDay.getTime()/1000);
-                        pointDatas.stream().forEach(pointData -> {
-                            OpeVo vo = new OpeVo();
-                            vo.setWtid(wt.getId());
-                            vo.setTime(DateUtils.parseLongToDate(pointData.getPointTime()*1000));
-                            vo.setValue(pointData.getPointValueInDouble());
-                            resuList.add(vo);
-                        });
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
-                }
-            }
-            for (Dutyschedule duty : dutyList) {
-                for (OpeVo vo : resuList) {
-                    if (isTimeRange(duty,vo.getTime())) {
-                        Operationrecord operationrecord = new Operationrecord();
-                        operationrecord.setDutyname(duty.getName());
-                        operationrecord.setWtid(vo.getWtid());
-                        operationrecord.setTime(vo.getTime());
-                        operationrecord.setValue(vo.getValue());
-                        operationrecordService.save(operationrecord);
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * 保存值际五损
-     * @param beginDate
-     * @param endDate
-     */
-    public void saveBeanchmarkList(String beginDate,String endDate) throws Exception {
-        List<String> days = getDays(beginDate, endDate);
-        for (String day : days) {
-            Date date = DateUtils.parseDate(day);
-            Date startOfDay = DateUtils.getStartOfDay(date);
-            Date endOfDay = DateUtils.getEndOfDay(date);
-
-            Map<String, Object> params = new HashMap<>();
-            params.put("theday", date);
-            benchmarkingbetweenService.removeByMap(params);
-            Map<String, Object> params1 = new HashMap<>();
-            params1.put("createdate", date);
-            List<Dutyschedule> dutyList = dutyscheduleService.listByMap(params1);
-            String[] points = Contant.benchPoints.split(",");
-            Map<String, Windpowerstationtestingpoint2> wpmap = CacheContext.wppointmap.get("0");
-            SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-            Map<String, Map<String, Double>> remap = new HashMap<>();
-
-            for (Dutyschedule dutyschedule : dutyList) {
-                String[] begins = dutyschedule.getBegin().split(",");
-                String[] ends = dutyschedule.getEnd().split(",");
-                Map<String, Double> map = new HashMap<>();
-                for (int i = 0; i < begins.length; i++) {
-                    Date begin = df.parse(day + " " + begins[i] + ":00");
-                    Date end = df.parse(day + " " + ends[i] + ":00");
-                    for (String point : points) {
-                        Windpowerstationtestingpoint2 windpowerstationtestingpoint2 = wpmap.get(point);
-                        List<PointData> maxs = edosUtil.getHistStat(windpowerstationtestingpoint2.getCode(), begin.getTime() / 1000, end.getTime() / 1000, (long) 1, null, 0);
-                        List<PointData> mins = edosUtil.getHistStat(windpowerstationtestingpoint2.getCode(), begin.getTime() / 1000, end.getTime() / 1000, (long) 1, null, 1);
-                        double ssdl = 0;
-                        if (StringUtils.isNotEmpty(maxs) && StringUtils.isNotEmpty(mins)) {
-                            ssdl = (maxs.get(0).getPointValueInDouble() - mins.get(0).getPointValueInDouble()) / 10000;
-                        }
-                        if (!map.containsKey(point)) {
-                            map.put(point, ssdl);
-                        } else {
-                            map.put(point, map.get(point) + ssdl);
-                        }
-                    }
-                    Windpowerstationtestingpoint2 windpowerstationtestingpoint2 = wpmap.get("RFDL");
-                    List<PointData> maxs = edosUtil.getHistStat(windpowerstationtestingpoint2.getCode(), begin.getTime() / 1000, end.getTime() / 1000, (long) 1, null, 0);
-                    List<PointData> mins = edosUtil.getHistStat(windpowerstationtestingpoint2.getCode(), begin.getTime() / 1000, end.getTime() / 1000, (long) 1, null, 1);
-                    double fdl = 0;
-                    if (StringUtils.isNotEmpty(maxs) && StringUtils.isNotEmpty(mins)) {
-                        fdl = maxs.get(0).getPointValueInDouble() - mins.get(0).getPointValueInDouble();
-                    }
-                    if (!map.containsKey("RFDL")) {
-                        map.put("RFDL", fdl);
-                    } else {
-                        map.put("RFDL", map.get("RFDL") + fdl);
-                    }
-                    remap.put(dutyschedule.getName(), map);
-                }
-            }
-            Set<String> dutyset = remap.keySet();
-            for (String duty : dutyset) {
-                Benchmarkingbetween bench = new Benchmarkingbetween();
-                bench.setDutyname(duty);
-                bench.setTheday(date);
-                Map<String, Double> pointmap = remap.get(duty);
-                bench.setPerformanceloss(pointmap.get("RSDJZSDL") + pointmap.get("RSSTZSDL") + pointmap.get("RXNZSDL") + pointmap.get("RSQXZSDL"));
-                bench.setFaultloss(pointmap.get("RGZZSDL") + pointmap.get("RSZZSDL"));
-                bench.setMainloss(pointmap.get("RJXZSDL") + pointmap.get("RLZZSDL"));
-                bench.setRationingloss(pointmap.get("RQFZSDL") + pointmap.get("RXDZSDL"));
-                bench.setInvolvesloss(pointmap.get("RWZZSDL") + pointmap.get("RTZZSDL"));
-                bench.setGeneratity(pointmap.get("RFDL"));
-                bench.setTheoreticalgeneratity(bench.getPerformanceloss() + bench.getFaultloss() + bench.getMainloss() + bench.getRationingloss() + bench.getInvolvesloss() + bench.getGeneratity());
-                benchmarkingbetweenService.save(bench);
-            }
-        }
-    }
-
-    /**
-     * 保存对标管理首页大表
-     * @param beginDate
-     * @param endDate
-     */
-    public void saveBenchmark(String beginDate,String endDate){
-        List<Windpowerstation> wplist = CacheContext.wplist;
-        List<String> days = getDays(beginDate, endDate);
-        for (String day : days) {
-            Date date = DateUtils.parseDate(day);
-            Map<String,Object> selMap = new HashMap<>();
-            selMap.put("recorddate",date);
-            benchmarkService.removeByMap(selMap);
-
-            //获取数据
-            List<Windpowerinfoday> windpowerinfodays = windpowerinfodayService.listByMap(selMap);
-            List<Windpowerinfoday3> windpowerinfoday3s = windpowerinfoday3Service.listByMap(selMap);
-            List<Wpmttrandmtbfday> wpmttrandmtbfdays = wpmttrandmtbfdayService.listByMap(selMap);
-            List<Windpowerspecificinfoday> windpowerspecificinfodays = windpowerspecificinfodayService.listByMap(selMap);
-            List<Windpowerstationthewindinfo> windpowerstationthewindinfos = windpowerstationthewindinfoService.listByMap(selMap);
-            //封装结果list一起存储
-            List<Benchmark> resultList = new ArrayList<>();
-
-            //赋值
-            wplist.stream().forEach(wp -> {
-                Benchmark benchmark = new Benchmark();
-                benchmark.setId(StringUtils.getUUID());
-                benchmark.setForeignkeyid(wp.getId()); //场站
-                benchmark.setRecorddate(date);
-                benchmark.setMark(RandomUtil.getRandomForDoubleBounded(80.0,95.0));
-                benchmark.setCapacity(wp.getCapacity());
-                benchmark.setUnits(wp.getQuantity());
-                double fdl = 0.0;
-                double swdl = 0.0;
-                double gwdl = 0.0;
-                double gzdl = 0.0;
-                double whdl = 0.0;
-                double xddl = 0.0;
-                double xndl = 0.0;
-                double sldl = 0.0;
-                double zhcydl = 0.0;
-                double gzcs = 0.0;
-                double gzsj = 0.0;
-                double rlsj = 0.0;
-                double sbklyl = 0.0;
-                double dxkyxs = 0.0;
-                double yfwcs = 0.0;
-                double sjfwcs = 0.0;
-                double yzhcs = 0.0;
-                double sjzhcs = 0.0;
-                double yxqcs = 0.0;
-                double sjxqcs = 0.0;
-                double speed = 0.0;
-                double jfpl = 0.0;
-                double jfcs = 0.0;
-                List<Windpowerinfoday> infodayList = windpowerinfodays.stream().filter(i -> i.getForeignkeyid().equals(wp.getId())).collect(Collectors.toList());
-                if (StringUtils.isNotNull(infodayList) && StringUtils.isNotEmpty(infodayList)){
-                    Windpowerinfoday windpowerinfoday = infodayList.get(0);
-                    fdl = windpowerinfoday.getGeneratingcapacity();
-                    swdl = windpowerinfoday.getGridelectricity();
-                    gwdl = windpowerinfoday.getBuyelectricity();
-                    zhcydl = fdl + gwdl - swdl;
-                    sbklyl = windpowerinfoday.getDaysbklyl();
-                    dxkyxs = windpowerinfoday.getDaydxkyxs();
-                    speed = windpowerinfoday.getSpeed();
-                }
-                List<Windpowerinfoday3> infoday3List = windpowerinfoday3s.stream().filter(i -> i.getForeignkeyid().equals(wp.getId())).collect(Collectors.toList());
-                if (StringUtils.isNotNull(infoday3List) && StringUtils.isNotEmpty(infoday3List)){
-                    Windpowerinfoday3 windpowerinfoday3 = infoday3List.get(0);
-                    gzdl = windpowerinfoday3.getDaynhgzssdl()/10000;
-                    whdl = windpowerinfoday3.getDaynhwhssdl()/10000;
-                    xddl = windpowerinfoday3.getDaynhxdssdl()/10000;
-                    xndl = windpowerinfoday3.getDaynhqfdl()/10000;
-                    //sldl = windpowerinfoday3.getDaynhcfdl()/10000;
-                }
-                List<Wpmttrandmtbfday> wpmttrandmtbfdayList = wpmttrandmtbfdays.stream().filter(i -> i.getWpid().equals(wp.getId())).collect(Collectors.toList());
-                if (StringUtils.isNotNull(wpmttrandmtbfdayList) && StringUtils.isNotEmpty(wpmttrandmtbfdayList)){
-                    Wpmttrandmtbfday wpmttrandmtbfday = wpmttrandmtbfdayList.get(0);
-                    gzcs = wpmttrandmtbfday.getStoprtimes();
-                    gzsj = wpmttrandmtbfday.getStophours();
-                    rlsj = wpmttrandmtbfday.getWthours();
-                }
-                List<Windpowerspecificinfoday> windpowerspecificinfodayList = windpowerspecificinfodays.stream().filter(i -> i.getWindpowerstationid().equals(wp.getId())).collect(Collectors.toList());
-                if (StringUtils.isNotNull(windpowerspecificinfodayList) && StringUtils.isNotEmpty(windpowerspecificinfodayList)){
-                    Windpowerspecificinfoday windpowerspecificinfoday = windpowerspecificinfodayList.get(0);
-                    yfwcs = windpowerspecificinfoday.getTheoresettimes();
-                    sjfwcs = windpowerspecificinfoday.getResettimes();
-                    yzhcs = windpowerspecificinfoday.getTheoconversiontimes();
-                    sjzhcs = windpowerspecificinfoday.getConversiontimes();
-                    yxqcs = windpowerspecificinfoday.getTheofaultcount();
-                    sjxqcs = windpowerspecificinfoday.getRightcount();
-                }
-                List<Windpowerstationthewindinfo> windpowerstationthewindinfoList = windpowerstationthewindinfos.stream().filter(i -> i.getWindpowerstationid().equals(wp.getId())).collect(Collectors.toList());
-                if (StringUtils.isNotNull(windpowerstationthewindinfoList) && StringUtils.isNotEmpty(windpowerstationthewindinfoList)){
-                    Windpowerstationthewindinfo windpowerstationthewindinfo = windpowerstationthewindinfoList.get(0);
-                    jfcs = windpowerstationthewindinfo.getCa();
-                    jfpl = windpowerstationthewindinfo.getCb();
-                }
-
-                benchmark.setActualpower(fdl);
-                benchmark.setDaynhgzssdl(gzdl);
-                benchmark.setDaynhwhssdl(whdl);
-                benchmark.setDaynhxdssdl(xddl);
-                benchmark.setDaynhqfdl(xndl);
-                benchmark.setDaynhcfdl(sldl);
-                benchmark.setTheoreticalpower(benchmark.getActualpower()+benchmark.getDaynhgzssdl()+benchmark.getDaynhwhssdl()+benchmark.getDaynhxdssdl()+benchmark.getDaynhqfdl()+benchmark.getDaynhcfdl());
-                benchmark.setWindenergy(benchmark.getTheoreticalpower()!=0?benchmark.getActualpower()/benchmark.getTheoreticalpower()*100:0.0);
-                benchmark.setPowerlossrate(benchmark.getTheoreticalpower()!=0?benchmark.getDaynhxdssdl()/benchmark.getTheoreticalpower()*100:0.0);
-                benchmark.setPerformancelossrate(benchmark.getTheoreticalpower()!=0?benchmark.getDaynhqfdl()/benchmark.getTheoreticalpower()*100:0.0);
-                benchmark.setComprehensiverate(benchmark.getActualpower()!=0?zhcydl/benchmark.getActualpower()*100:0.0);
-                benchmark.setUtilizationhours(benchmark.getActualpower()/benchmark.getCapacity()*10);
-                benchmark.setWindpoweraccuracy(RandomUtil.getRandomForDoubleBounded(91.0,99.0));
-                benchmark.setAgccurvefollowing(RandomUtil.getRandomForDoubleBounded(91.0,99.0));
-                benchmark.setMttr(gzcs!=0?gzsj/gzcs:0.0);
-                benchmark.setMtbf(gzcs!=0?rlsj/gzcs:0.0);
-                benchmark.setMttf(benchmark.getMtbf()-benchmark.getMttr());
-                benchmark.setAvailability(sbklyl);
-                benchmark.setAvailabilityfactor(dxkyxs);
-                benchmark.setFailurelossrate(benchmark.getTheoreticalpower()!=0?benchmark.getDaynhgzssdl()/benchmark.getTheoreticalpower()*100:0.0);
-                benchmark.setMainlossrate(benchmark.getTheoreticalpower()!=0?benchmark.getDaynhwhssdl()/benchmark.getTheoreticalpower()*100:0.0);
-                benchmark.setHiddentimely(RandomUtil.getRandomForDoubleBounded(70.0,99.0));
-                benchmark.setResettimelyrate(yfwcs!=0?sjfwcs/yfwcs*100:0.0);
-                benchmark.setStatetransitionrate(yzhcs!=0?sjzhcs/yzhcs*100:0.0);
-                benchmark.setEliminationrate(yxqcs!=0?sjxqcs/yxqcs*100:0.0);
-                benchmark.setSpeed(speed);
-                benchmark.setStaticwindfrequency(jfpl);
-                benchmark.setEffectivewindhourrate(0.0);
-                resultList.add(benchmark);
-            });
-
-            benchmarkService.saveBatch(resultList);
-        }
-
-
-    }
-
-    /**
-     * 判断实际操作指令时间是否属于某个值班
-     * @param duty
-     * @param time
-     * @return
-     * @throws ParseException
-     */
-    private boolean isTimeRange(Dutyschedule duty,Date time) throws ParseException {
-        SimpleDateFormat df = new SimpleDateFormat("HH:mm");
-        Date now = df.parse(df.format(time));
-        String[] begins=duty.getBegin().split(",");
-        String[] ends=duty.getEnd().split(",");
-        for (int i=0 ; i<begins.length;i++) {
-            Date begin = df.parse(begins[i]);
-            Date end = df.parse(ends[i]);
-            Calendar nowTime = Calendar.getInstance();
-            nowTime.setTime(now);
-            Calendar beginTime = Calendar.getInstance();
-            beginTime.setTime(begin);
-            Calendar endTime = Calendar.getInstance();
-            endTime.setTime(end);
-            if (nowTime.before(endTime) && nowTime.after(beginTime)) {
-                return true;
-            }
-        }
-        return false;
-
-    }
-    /**
-     * 获取两日期间日期list
-     *
-     * @param beginDate
-     * @param endDate
-     * @return
-     */
-    public static List<String> getDays(String beginDate, String endDate) {
-        List<String> days = null;
-        if (StringUtils.isNotEmpty(beginDate) && StringUtils.isNotEmpty(endDate)) {
-            days = DateUtils.getDays(beginDate, endDate);
-        } else {
-            days = new ArrayList<>();
-            days.add(DateUtils.getYesterdayStr("yyyy-MM-dd"));
-        }
-        return days;
-    }
-}

histroy/benchmarking-histroy/src/main/java/com/gyee/benchmarkinghistroy/service/auto/IBenchmarkService.java

@@ -1,19 +0,0 @@
-package com.gyee.benchmarkinghistroy.service.auto;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gyee.benchmarkinghistroy.model.auto.Benchmark;
-
-import java.util.List;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author 谢生杰
- * @since 2021-07-26
- */
-public interface IBenchmarkService extends IService<Benchmark> {
-
-    List<Benchmark> listTop(String timetype, String foreigntype);
-}

histroy/benchmarking-histroy/src/main/java/com/gyee/benchmarkinghistroy/service/auto/IBenchmarkingbetweenService.java

@@ -1,20 +0,0 @@
-package com.gyee.benchmarkinghistroy.service.auto;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gyee.benchmarkinghistroy.model.auto.Benchmarkingbetween;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author 谢生杰
- * @since 2021-06-24
- */
-public interface IBenchmarkingbetweenService extends IService<Benchmarkingbetween> {
-
-    List<Benchmarkingbetween> findByBeginAndEnd(Date begin, Date end);
-}

histroy/benchmarking-histroy/src/main/java/com/gyee/benchmarkinghistroy/service/auto/IDutyscheduleService.java

@@ -1,16 +0,0 @@
-package com.gyee.benchmarkinghistroy.service.auto;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gyee.benchmarkinghistroy.model.auto.Dutyschedule;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author 谢生杰
- * @since 2021-06-24
- */
-public interface IDutyscheduleService extends IService<Dutyschedule> {
-
-}

histroy/benchmarking-histroy/src/main/java/com/gyee/benchmarkinghistroy/service/auto/IEquipmentdaydetailedService.java

@@ -1,16 +0,0 @@
-package com.gyee.benchmarkinghistroy.service.auto;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gyee.benchmarkinghistroy.model.auto.Equipmentdaydetailed;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author 谢生杰
- * @since 2021-06-21
- */
-public interface IEquipmentdaydetailedService extends IService<Equipmentdaydetailed> {
-
-}

histroy/benchmarking-histroy/src/main/java/com/gyee/benchmarkinghistroy/service/auto/IEquipmentdayinfoService.java

@@ -1,16 +0,0 @@
-package com.gyee.benchmarkinghistroy.service.auto;
-
-import com.gyee.benchmarkinghistroy.model.auto.Equipmentdayinfo;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author 谢生杰
- * @since 2021-09-29
- */
-public interface IEquipmentdayinfoService extends IService<Equipmentdayinfo> {
-
-}

histroy/benchmarking-histroy/src/main/java/com/gyee/benchmarkinghistroy/service/auto/ILineService.java

@@ -1,16 +0,0 @@
-package com.gyee.benchmarkinghistroy.service.auto;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gyee.benchmarkinghistroy.model.auto.Line;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author 谢生杰
- * @since 2021-06-21
- */
-public interface ILineService extends IService<Line> {
-
-}

histroy/benchmarking-histroy/src/main/java/com/gyee/benchmarkinghistroy/service/auto/IOperationrecordService.java

@@ -1,25 +0,0 @@
-package com.gyee.benchmarkinghistroy.service.auto;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gyee.benchmarkinghistroy.model.auto.Operationrecord;
-
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author 谢生杰
- * @since 2021-06-24
- */
-public interface IOperationrecordService extends IService<Operationrecord> {
-    public List<Operationrecord> listByBeginAndEnd(Date begin, Date end);
-
-    public List<Map> listBy (String WindPowerStation,String wtid,Date beginDate, Date endDate);
-
-    public List<Map> conversion (String WindPowerStation,String wtid,Date beginDate, Date endDate);
-
-}

histroy/benchmarking-histroy/src/main/java/com/gyee/benchmarkinghistroy/service/auto/IProjectService.java

@@ -1,16 +0,0 @@
-package com.gyee.benchmarkinghistroy.service.auto;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gyee.benchmarkinghistroy.model.auto.Project;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author 谢生杰
- * @since 2021-06-21
- */
-public interface IProjectService extends IService<Project> {
-
-}

histroy/benchmarking-histroy/src/main/java/com/gyee/benchmarkinghistroy/service/auto/IWindpowerinfoday3Service.java

@@ -1,16 +0,0 @@
-package com.gyee.benchmarkinghistroy.service.auto;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gyee.benchmarkinghistroy.model.auto.Windpowerinfoday3;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author 谢生杰
- * @since 2021-07-26
- */
-public interface IWindpowerinfoday3Service extends IService<Windpowerinfoday3> {
-
-}

histroy/benchmarking-histroy/src/main/java/com/gyee/benchmarkinghistroy/service/auto/IWindpowerinfodayService.java

@@ -1,16 +0,0 @@
-package com.gyee.benchmarkinghistroy.service.auto;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gyee.benchmarkinghistroy.model.auto.Windpowerinfoday;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author 谢生杰
- * @since 2021-07-26
- */
-public interface IWindpowerinfodayService extends IService<Windpowerinfoday> {
-
-}

histroy/benchmarking-histroy/src/main/java/com/gyee/benchmarkinghistroy/service/auto/IWindpowerspecificinfodayService.java

@@ -1,16 +0,0 @@
-package com.gyee.benchmarkinghistroy.service.auto;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gyee.benchmarkinghistroy.model.auto.Windpowerspecificinfoday;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author 谢生杰
- * @since 2021-07-26
- */
-public interface IWindpowerspecificinfodayService extends IService<Windpowerspecificinfoday> {
-
-}

histroy/benchmarking-histroy/src/main/java/com/gyee/benchmarkinghistroy/service/auto/IWindpowerstationService.java

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

histroy/benchmarking-histroy/src/main/java/com/gyee/benchmarkinghistroy/service/auto/IWindpowerstationtestingpoint2Service.java

@@ -1,16 +0,0 @@
-package com.gyee.benchmarkinghistroy.service.auto;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gyee.benchmarkinghistroy.model.auto.Windpowerstationtestingpoint2;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author 谢生杰
- * @since 2021-05-13
- */
-public interface IWindpowerstationtestingpoint2Service extends IService<Windpowerstationtestingpoint2> {
-
-}

histroy/benchmarking-histroy/src/main/java/com/gyee/benchmarkinghistroy/service/auto/IWindpowerstationthewindinfoService.java

@@ -1,16 +0,0 @@
-package com.gyee.benchmarkinghistroy.service.auto;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gyee.benchmarkinghistroy.model.auto.Windpowerstationthewindinfo;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author 谢生杰
- * @since 2021-07-26
- */
-public interface IWindpowerstationthewindinfoService extends IService<Windpowerstationthewindinfo> {
-
-}

histroy/benchmarking-histroy/src/main/java/com/gyee/benchmarkinghistroy/service/auto/IWindturbineService.java

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

histroy/benchmarking-histroy/src/main/java/com/gyee/benchmarkinghistroy/service/auto/IWindturbinetestingpointService.java

@@ -1,16 +0,0 @@
-package com.gyee.benchmarkinghistroy.service.auto;
-
-import com.gyee.benchmarkinghistroy.model.auto.Windturbinetestingpoint;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author 谢生杰
- * @since 2021-09-29
- */
-public interface IWindturbinetestingpointService extends IService<Windturbinetestingpoint> {
-
-}

histroy/benchmarking-histroy/src/main/java/com/gyee/benchmarkinghistroy/service/auto/IWindturbinetestingpointai2Service.java

@@ -1,16 +0,0 @@
-package com.gyee.benchmarkinghistroy.service.auto;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gyee.benchmarkinghistroy.model.auto.Windturbinetestingpointai2;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author 谢生杰
- * @since 2021-05-13
- */
-public interface IWindturbinetestingpointai2Service extends IService<Windturbinetestingpointai2> {
-
-}

histroy/benchmarking-histroy/src/main/java/com/gyee/benchmarkinghistroy/service/auto/IWpmttrandmtbfdayService.java

@@ -1,16 +0,0 @@
-package com.gyee.benchmarkinghistroy.service.auto;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gyee.benchmarkinghistroy.model.auto.Wpmttrandmtbfday;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author 谢生杰
- * @since 2021-07-26
- */
-public interface IWpmttrandmtbfdayService extends IService<Wpmttrandmtbfday> {
-
-}

histroy/benchmarking-histroy/src/main/java/com/gyee/benchmarkinghistroy/service/auto/impl/BenchmarkServiceImpl.java

@@ -1,30 +0,0 @@
-package com.gyee.benchmarkinghistroy.service.auto.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-import com.gyee.benchmarkinghistroy.mapper.auto.BenchmarkMapper;
-import com.gyee.benchmarkinghistroy.model.auto.Benchmark;
-import com.gyee.benchmarkinghistroy.service.auto.IBenchmarkService;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author 谢生杰
- * @since 2021-07-26
- */
-@Service
-public class BenchmarkServiceImpl extends ServiceImpl<BenchmarkMapper, Benchmark> implements IBenchmarkService {
-    @Resource
-    private BenchmarkMapper benchmarkMapper;
-
-    @Override
-    public List<Benchmark> listTop(String timetype, String foreigntype) {
-        return benchmarkMapper.listTop(timetype,foreigntype);
-    }
-}

histroy/benchmarking-histroy/src/main/java/com/gyee/benchmarkinghistroy/service/auto/impl/BenchmarkingbetweenServiceImpl.java

@@ -1,31 +0,0 @@
-package com.gyee.benchmarkinghistroy.service.auto.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-import com.gyee.benchmarkinghistroy.mapper.auto.BenchmarkingbetweenMapper;
-import com.gyee.benchmarkinghistroy.model.auto.Benchmarkingbetween;
-import com.gyee.benchmarkinghistroy.service.auto.IBenchmarkingbetweenService;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.Date;
-import java.util.List;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author 谢生杰
- * @since 2021-06-24
- */
-@Service
-public class BenchmarkingbetweenServiceImpl extends ServiceImpl<BenchmarkingbetweenMapper, Benchmarkingbetween> implements IBenchmarkingbetweenService {
-
-    @Resource
-    private BenchmarkingbetweenMapper benchmarkingbetweenMapper;
-    @Override
-    public List<Benchmarkingbetween> findByBeginAndEnd(Date begin, Date end) {
-        return benchmarkingbetweenMapper.findByBeginAndEnd(begin,end);
-    }
-}

histroy/benchmarking-histroy/src/main/java/com/gyee/benchmarkinghistroy/service/auto/impl/DutyscheduleServiceImpl.java

@@ -1,21 +0,0 @@
-package com.gyee.benchmarkinghistroy.service.auto.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-import com.gyee.benchmarkinghistroy.mapper.auto.DutyscheduleMapper;
-import com.gyee.benchmarkinghistroy.model.auto.Dutyschedule;
-import com.gyee.benchmarkinghistroy.service.auto.IDutyscheduleService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author 谢生杰
- * @since 2021-06-24
- */
-@Service
-public class DutyscheduleServiceImpl extends ServiceImpl<DutyscheduleMapper, Dutyschedule> implements IDutyscheduleService {
-
-}

histroy/benchmarking-histroy/src/main/java/com/gyee/benchmarkinghistroy/service/auto/impl/EquipmentdaydetailedServiceImpl.java

@@ -1,21 +0,0 @@
-package com.gyee.benchmarkinghistroy.service.auto.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-import com.gyee.benchmarkinghistroy.mapper.auto.EquipmentdaydetailedMapper;
-import com.gyee.benchmarkinghistroy.model.auto.Equipmentdaydetailed;
-import com.gyee.benchmarkinghistroy.service.auto.IEquipmentdaydetailedService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author 谢生杰
- * @since 2021-06-21
- */
-@Service
-public class EquipmentdaydetailedServiceImpl extends ServiceImpl<EquipmentdaydetailedMapper, Equipmentdaydetailed> implements IEquipmentdaydetailedService {
-
-}

histroy/benchmarking-histroy/src/main/java/com/gyee/benchmarkinghistroy/service/auto/impl/EquipmentdayinfoServiceImpl.java

@@ -1,20 +0,0 @@
-package com.gyee.benchmarkinghistroy.service.auto.impl;
-
-import com.gyee.benchmarkinghistroy.model.auto.Equipmentdayinfo;
-import com.gyee.benchmarkinghistroy.mapper.auto.EquipmentdayinfoMapper;
-import com.gyee.benchmarkinghistroy.service.auto.IEquipmentdayinfoService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author 谢生杰
- * @since 2021-09-29
- */
-@Service
-public class EquipmentdayinfoServiceImpl extends ServiceImpl<EquipmentdayinfoMapper, Equipmentdayinfo> implements IEquipmentdayinfoService {
-
-}

histroy/benchmarking-histroy/src/main/java/com/gyee/benchmarkinghistroy/service/auto/impl/LineServiceImpl.java

@@ -1,21 +0,0 @@
-package com.gyee.benchmarkinghistroy.service.auto.impl;
-
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gyee.benchmarkinghistroy.mapper.auto.LineMapper;
-import com.gyee.benchmarkinghistroy.model.auto.Line;
-import com.gyee.benchmarkinghistroy.service.auto.ILineService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author 谢生杰
- * @since 2021-06-21
- */
-@Service
-public class LineServiceImpl extends ServiceImpl<LineMapper, Line> implements ILineService {
-
-}

histroy/benchmarking-histroy/src/main/java/com/gyee/benchmarkinghistroy/service/auto/impl/OperationrecordServiceImpl.java

@@ -1,127 +0,0 @@
-package com.gyee.benchmarkinghistroy.service.auto.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-import com.gyee.benchmarkinghistroy.mapper.auto.OperationrecordMapper;
-import com.gyee.benchmarkinghistroy.model.auto.Operationrecord;
-import com.gyee.benchmarkinghistroy.service.auto.IOperationrecordService;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.*;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author 谢生杰
- * @since 2021-06-24
- */
-@Service
-public class OperationrecordServiceImpl extends ServiceImpl<OperationrecordMapper, Operationrecord> implements IOperationrecordService {
-    @Resource
-    private OperationrecordMapper  operationrecordMapper;
-    @Override
-    public List<Operationrecord> listByBeginAndEnd(Date begin, Date end) {
-        return operationrecordMapper.listByBeginAndEnd(begin,end);
-    }
-
-    public List<Map> listBy (String WindPowerStation,String wtid,Date beginDate, Date endDate) {
-        List<Map> map = operationrecordMapper.listBy(WindPowerStation,wtid,beginDate,endDate);
-
-//        for (int i = 0;i<map.size();i++) {
-//            map.get(i).put("ConversionName",Statedescription(map.get(i).get("VALUE").toString()));
-//        }
-
-
-        List<Map> conversiontype = new ArrayList<Map>();
-
-        for (int i = 0;i<map.size();i++) {
-            Map<String, String> maps = new HashMap<>();
-            maps.put("zhsj",map.get(i).get("TIME").toString());//时间
-            maps.put("ConversionName",Statedescription(map.get(i).get("VALUE").toString()));//状态描述
-            maps.put("wtid",map.get(i).get("WTID").toString());
-            maps.put("name",map.get(i).get("NAME").toString());
-            maps.put("id",map.get(i).get("ID").toString());
-            maps.put("windpowerstationid",map.get(i).get("WINDPOWERSTATIONID").toString());
-            conversiontype.add(maps);
-        }
-
-        return conversiontype;
-
-    }
-
-    public List<Map> conversion (String WindPowerStation,String wtid,Date beginDate, Date endDate) {
-        List<Map> map = operationrecordMapper.conversion(WindPowerStation,wtid,beginDate,endDate);
-
-        List<Map> conversiontype = new ArrayList<Map>();
-
-        for (int i = 0;i<map.size()-1;i++) {
-            Map<String, String> maps = new HashMap<>();
-            maps.put("zhsj",map.get(i).get("TIME").toString());//转换时间
-//            maps.put("beforeConversion",map.get(i).get("VALUE").toString());//转换前状态
-            maps.put("beforeConversionName",Statedescription(map.get(i).get("VALUE").toString()));//转换前状态描述
-//            maps.put("AfterConversion",map.get(i+1).get("VALUE").toString());//转换后状态
-            maps.put("AfterConversionName",Statedescription(map.get(i+1).get("VALUE").toString()));//转换后状态描述
-            maps.put("wtid",map.get(i).get("WTID").toString());
-            maps.put("name",map.get(i).get("NAME").toString());
-            maps.put("id",map.get(i).get("ID").toString());
-            maps.put("windpowerstationid",map.get(i).get("WINDPOWERSTATIONID").toString());
-            conversiontype.add(maps);
-        }
-
-        return conversiontype;
-    }
-
-
-    public  static String Statedescription(String code) {
-
-
-        String  name = "VALUE";
-
-        switch (code) {
-            case "1":
-                name = "启动";
-                break;
-            case "2":
-                name = "停机";
-                break;
-            case "3":
-                name = "复位";
-                break;
-            case "4":
-                name = "维护";
-                break;
-            case "5":
-                name = "取消维护";
-                break;
-            case "6":
-                name = "挂牌检修";
-                break;
-            case "7":
-                name = "挂牌故障维修";
-                break;
-            case "8":
-                name = "挂牌场内受累检修";
-                break;
-            case "9":
-                name = "挂牌场内受累故障";
-                break;
-            case "10":
-                name = "挂牌场外受累电网";
-                break;
-            case "11":
-                name = "挂牌场外受累天气";
-                break;
-            case "12":
-                name = "取消挂牌";
-                break;
-            default:
-
-        }
-        return name;
-    }
-
-
-}

histroy/benchmarking-histroy/src/main/java/com/gyee/benchmarkinghistroy/service/auto/impl/ProjectServiceImpl.java

@@ -1,21 +0,0 @@
-package com.gyee.benchmarkinghistroy.service.auto.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-import com.gyee.benchmarkinghistroy.mapper.auto.ProjectMapper;
-import com.gyee.benchmarkinghistroy.model.auto.Project;
-import com.gyee.benchmarkinghistroy.service.auto.IProjectService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author 谢生杰
- * @since 2021-06-21
- */
-@Service
-public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> implements IProjectService {
-
-}

histroy/benchmarking-histroy/src/main/java/com/gyee/benchmarkinghistroy/service/auto/impl/Windpowerinfoday3ServiceImpl.java

@@ -1,20 +0,0 @@
-package com.gyee.benchmarkinghistroy.service.auto.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gyee.benchmarkinghistroy.mapper.auto.Windpowerinfoday3Mapper;
-import com.gyee.benchmarkinghistroy.model.auto.Windpowerinfoday3;
-import com.gyee.benchmarkinghistroy.service.auto.IWindpowerinfoday3Service;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author 谢生杰
- * @since 2021-07-26
- */
-@Service
-public class Windpowerinfoday3ServiceImpl extends ServiceImpl<Windpowerinfoday3Mapper, Windpowerinfoday3> implements IWindpowerinfoday3Service {
-
-}

histroy/benchmarking-histroy/src/main/java/com/gyee/benchmarkinghistroy/service/auto/impl/WindpowerinfodayServiceImpl.java

@@ -1,21 +0,0 @@
-package com.gyee.benchmarkinghistroy.service.auto.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-import com.gyee.benchmarkinghistroy.mapper.auto.WindpowerinfodayMapper;
-import com.gyee.benchmarkinghistroy.model.auto.Windpowerinfoday;
-import com.gyee.benchmarkinghistroy.service.auto.IWindpowerinfodayService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author 谢生杰
- * @since 2021-07-26
- */
-@Service
-public class WindpowerinfodayServiceImpl extends ServiceImpl<WindpowerinfodayMapper, Windpowerinfoday> implements IWindpowerinfodayService {
-
-}

histroy/benchmarking-histroy/src/main/java/com/gyee/benchmarkinghistroy/service/auto/impl/WindpowerspecificinfodayServiceImpl.java

@@ -1,21 +0,0 @@
-package com.gyee.benchmarkinghistroy.service.auto.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-import com.gyee.benchmarkinghistroy.mapper.auto.WindpowerspecificinfodayMapper;
-import com.gyee.benchmarkinghistroy.model.auto.Windpowerspecificinfoday;
-import com.gyee.benchmarkinghistroy.service.auto.IWindpowerspecificinfodayService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author 谢生杰
- * @since 2021-07-26
- */
-@Service
-public class WindpowerspecificinfodayServiceImpl extends ServiceImpl<WindpowerspecificinfodayMapper, Windpowerspecificinfoday> implements IWindpowerspecificinfodayService {
-
-}

histroy/benchmarking-histroy/src/main/java/com/gyee/benchmarkinghistroy/service/auto/impl/WindpowerstationServiceImpl.java

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

histroy/benchmarking-histroy/src/main/java/com/gyee/benchmarkinghistroy/service/auto/impl/Windpowerstationtestingpoint2ServiceImpl.java

@@ -1,21 +0,0 @@
-package com.gyee.benchmarkinghistroy.service.auto.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-import com.gyee.benchmarkinghistroy.mapper.auto.Windpowerstationtestingpoint2Mapper;
-import com.gyee.benchmarkinghistroy.model.auto.Windpowerstationtestingpoint2;
-import com.gyee.benchmarkinghistroy.service.auto.IWindpowerstationtestingpoint2Service;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author 谢生杰
- * @since 2021-05-13
- */
-@Service
-public class Windpowerstationtestingpoint2ServiceImpl extends ServiceImpl<Windpowerstationtestingpoint2Mapper, Windpowerstationtestingpoint2> implements IWindpowerstationtestingpoint2Service {
-
-}

histroy/benchmarking-histroy/src/main/java/com/gyee/benchmarkinghistroy/service/auto/impl/WindpowerstationthewindinfoServiceImpl.java

@@ -1,21 +0,0 @@
-package com.gyee.benchmarkinghistroy.service.auto.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-import com.gyee.benchmarkinghistroy.mapper.auto.WindpowerstationthewindinfoMapper;
-import com.gyee.benchmarkinghistroy.model.auto.Windpowerstationthewindinfo;
-import com.gyee.benchmarkinghistroy.service.auto.IWindpowerstationthewindinfoService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author 谢生杰
- * @since 2021-07-26
- */
-@Service
-public class WindpowerstationthewindinfoServiceImpl extends ServiceImpl<WindpowerstationthewindinfoMapper, Windpowerstationthewindinfo> implements IWindpowerstationthewindinfoService {
-
-}

histroy/benchmarking-histroy/src/main/java/com/gyee/benchmarkinghistroy/service/auto/impl/WindturbineServiceImpl.java

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

histroy/benchmarking-histroy/src/main/java/com/gyee/benchmarkinghistroy/service/auto/impl/WindturbinetestingpointServiceImpl.java

@@ -1,20 +0,0 @@
-package com.gyee.benchmarkinghistroy.service.auto.impl;
-
-import com.gyee.benchmarkinghistroy.model.auto.Windturbinetestingpoint;
-import com.gyee.benchmarkinghistroy.mapper.auto.WindturbinetestingpointMapper;
-import com.gyee.benchmarkinghistroy.service.auto.IWindturbinetestingpointService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author 谢生杰
- * @since 2021-09-29
- */
-@Service
-public class WindturbinetestingpointServiceImpl extends ServiceImpl<WindturbinetestingpointMapper, Windturbinetestingpoint> implements IWindturbinetestingpointService {
-
-}

histroy/benchmarking-histroy/src/main/java/com/gyee/benchmarkinghistroy/service/auto/impl/Windturbinetestingpointai2ServiceImpl.java

@@ -1,21 +0,0 @@
-package com.gyee.benchmarkinghistroy.service.auto.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-import com.gyee.benchmarkinghistroy.mapper.auto.Windturbinetestingpointai2Mapper;
-import com.gyee.benchmarkinghistroy.model.auto.Windturbinetestingpointai2;
-import com.gyee.benchmarkinghistroy.service.auto.IWindturbinetestingpointai2Service;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author 谢生杰
- * @since 2021-05-13
- */
-@Service
-public class Windturbinetestingpointai2ServiceImpl extends ServiceImpl<Windturbinetestingpointai2Mapper, Windturbinetestingpointai2> implements IWindturbinetestingpointai2Service {
-
-}