读取调试

README.md

@@ -1,17 +1,16 @@
 # sis
 
-
 ##模块:
+
 ### common -- 公共类型和方法
+
 * data -- 公共数据类型
 * utils -- 公共方法
 
 ### cache -- 数据缓存模块
 
-
 ### realtime -- 实时计算
 
-
 ### web -- 接口层
 
 

common/src/main/java/com/gyee/common/CommonMain.java

@@ -1,6 +1,5 @@
 package com.gyee.common;
 
-import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 

common/src/main/java/com/gyee/common/config/GeneratorCodeConfig.java

@@ -11,11 +11,11 @@ import com.baomidou.mybatisplus.generator.engine.FreemarkerTemplateEngine;
 import java.util.Scanner;
 
 /**
- *@ClassName GeneratorCodeConfig
- *@Description 自动生成mybatisplus的相关代码
- *@Author 谢生杰
- *@Date 2020/9/25 18:26
- *@Version 1.0
+ * @ClassName GeneratorCodeConfig
+ * @Description 自动生成mybatisplus的相关代码
+ * @Author 谢生杰
+ * @Date 2020/9/25 18:26
+ * @Version 1.0
  **/
 public class GeneratorCodeConfig {
     public static String scanner(String tip) {
@@ -49,11 +49,11 @@ public class GeneratorCodeConfig {
         // 数据源配置
         DataSourceConfig dsc = new DataSourceConfig();
 
-//        dsc.setUrl("jdbc:mysql://127.0.0.1:3306/test?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true");
-//        dsc.setDriverName("com.mysql.jdbc.Driver");
-//        dsc.setUsername("root");
-//        dsc.setPassword("root");
-//        mpg.setDataSource(dsc);
+        //        dsc.setUrl("jdbc:mysql://127.0.0.1:3306/test?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true");
+        //        dsc.setDriverName("com.mysql.jdbc.Driver");
+        //        dsc.setUsername("root");
+        //        dsc.setPassword("root");
+        //        mpg.setDataSource(dsc);
 
         dsc.setDriverName("oracle.jdbc.driver.OracleDriver");
         dsc.setUsername("nxfdprod");
@@ -61,47 +61,46 @@ public class GeneratorCodeConfig {
         dsc.setUrl("jdbc:oracle:thin:@49.4.50.80:1521:gdnxfd");
         mpg.setDataSource(dsc);
 
-//        dsc.setDriverName("com.cloudera.impala.jdbc41.Driver");
-//        dsc.setUrl("jdbc:impala://192.168.1.67:21050/gyee_test");
-//        mpg.setDataSource(dsc);
-
+        //        dsc.setDriverName("com.cloudera.impala.jdbc41.Driver");
+        //        dsc.setUrl("jdbc:impala://192.168.1.67:21050/gyee_test");
+        //        mpg.setDataSource(dsc);
 
 
         // 包配置
         PackageConfig pc = new PackageConfig();
-//        pc.setModuleName(scanner("模块名"));
+        //        pc.setModuleName(scanner("模块名"));
         pc.setParent("com.gyee.common");
         pc.setEntity("model.auto");
-//        pc.setMapper("mapper.auto");
-//        pc.setService("service.auto");
-//        pc.setServiceImpl("service.auto.impl");
-//        pc.setController("controller.auto");
+        //        pc.setMapper("mapper.auto");
+        //        pc.setService("service.auto");
+        //        pc.setServiceImpl("service.auto.impl");
+        //        pc.setController("controller.auto");
         mpg.setPackageInfo(pc);
 
         // 自定义配置
-//        InjectionConfig cfg = new InjectionConfig() {
-//            @Override
-//            public void initMap() {
-//                // to do nothing
-//            }
-//        };
+        //        InjectionConfig cfg = new InjectionConfig() {
+        //            @Override
+        //            public void initMap() {
+        //                // to do nothing
+        //            }
+        //        };
 
         // 如果模板引擎是 freemarker
-//        String templatePath = "/templates/mapper.xml.ftl";
+        //        String templatePath = "/templates/mapper.xml.ftl";
         // 如果模板引擎是 velocity
         // String templatePath = "/templates/mapper.xml.vm";
 
         // 自定义输出配置
-//        List<FileOutConfig> focList = new ArrayList<>();
+        //        List<FileOutConfig> focList = new ArrayList<>();
         // 自定义配置会被优先输出
-//        focList.add(new FileOutConfig(templatePath) {
-//            @Override
-//            public String outputFile(TableInfo tableInfo) {
-//                // 自定义输出文件名 ， 如果你 Entity 设置了前后缀、此处注意 xml 的名称会跟着发生变化！！
-//                return projectPath + "/src/main/resources/mapper/" + pc.getModuleName()
-//                        + "/" + tableInfo.getEntityName() + "Mapper" + StringPool.DOT_XML;
-//            }
-//        });
+        //        focList.add(new FileOutConfig(templatePath) {
+        //            @Override
+        //            public String outputFile(TableInfo tableInfo) {
+        //                // 自定义输出文件名 ， 如果你 Entity 设置了前后缀、此处注意 xml 的名称会跟着发生变化！！
+        //                return projectPath + "/src/main/resources/mapper/" + pc.getModuleName()
+        //                        + "/" + tableInfo.getEntityName() + "Mapper" + StringPool.DOT_XML;
+        //            }
+        //        });
         /*
         cfg.setFileCreate(new IFileCreate() {
             @Override
@@ -112,8 +111,8 @@ public class GeneratorCodeConfig {
             }
         });
         */
-//        cfg.setFileOutConfigList(focList);
-//        mpg.setCfg(cfg);
+        //        cfg.setFileOutConfigList(focList);
+        //        mpg.setCfg(cfg);
 
         // 配置模板
         TemplateConfig templateConfig = new TemplateConfig();
@@ -137,9 +136,9 @@ public class GeneratorCodeConfig {
 
         strategy.setEntityLombokModel(true);
         // 公共父类
-//        strategy.setSuperControllerClass("com.baomidou.ant.common.BaseController");
+        //        strategy.setSuperControllerClass("com.baomidou.ant.common.BaseController");
         // 写于父类中的公共字段
-//        strategy.setSuperEntityColumns("id");
+        //        strategy.setSuperEntityColumns("id");
         strategy.setInclude(scanner("表名，多个英文逗号分割").split(","));
         strategy.setControllerMappingHyphenStyle(true);
         strategy.setTablePrefix(pc.getModuleName() + "_");

common/src/main/java/com/gyee/common/config/R.java

@@ -21,15 +21,19 @@ public class R {
     private Long count;
     @ApiModelProperty(value = "返回数据")
     private Object data = new Object();
-    private R(){}
-    public static R ok(){
+
+    private R() {
+    }
+
+    public static R ok() {
         R r = new R();
         r.setSuccess(true);
         r.setCode(ResultCode.SUCCESS);
         r.setMessage("成功");
         return r;
     }
-    public static R ok(Long count){
+
+    public static R ok(Long count) {
         R r = new R();
         r.setSuccess(true);
         r.setCode(ResultCode.SUCCESS);
@@ -37,34 +41,39 @@ public class R {
         r.setCount(count);
         return r;
     }
-    public static R error(){
+
+    public static R error() {
         R r = new R();
         r.setSuccess(false);
         r.setCode(ResultCode.ERROR);
         r.setMessage("失败");
         return r;
     }
-    public R success(Boolean success){
+
+    public R success(Boolean success) {
         this.setSuccess(success);
         return this;
     }
-    public R message(String message){
+
+    public R message(String message) {
         this.setMessage(message);
         return this;
     }
-    public R code(Integer code){
+
+    public R code(Integer code) {
         this.setCode(code);
         return this;
     }
-//    public R data(String key, Object value){
-//        this.data.put(key, value);
-//        return this;
-//    }
-//    public R data(Map<String, Object> map){
-//        this.setData(map);
-//        return this;
-//    }
-    public R data(Object value){
+
+    //    public R data(String key, Object value){
+    //        this.data.put(key, value);
+    //        return this;
+    //    }
+    //    public R data(Map<String, Object> map){
+    //        this.setData(map);
+    //        return this;
+    //    }
+    public R data(Object value) {
         this.setData(value);
         return this;
     }

common/src/main/java/com/gyee/common/contant/Contant.java

@@ -32,17 +32,17 @@ public class Contant {
     public static final String SWDLY = "SWDLY"; //月上网发电量
     public static final String SWDLN = "SWDLN"; //年上网发电量
 
-    public static final String GWGWB="GWGWB";//工网电量
-    public static final String GWGWY="GWGWY";//月工网电量
-    public static final String GWGWN="GWGWN";//年工网电量
+    public static final String GWGWB = "GWGWB";//工网电量
+    public static final String GWGWY = "GWGWY";//月工网电量
+    public static final String GWGWN = "GWGWN";//年工网电量
 
-    public static final String NWGWB="NWGWB";//农网电量
-    public static final String NWGWY="NWGWY";//月农网电量
-    public static final String NWGWN="NWGWN";//年农网电量
+    public static final String NWGWB = "NWGWB";//农网电量
+    public static final String NWGWY = "NWGWY";//月农网电量
+    public static final String NWGWN = "NWGWN";//年农网电量
 
-    public static final String CYDLB="CYDLB";//场用电量
-    public static final String CYDLY="CYDLY";//月场用电量
-    public static final String CYDLN="CYDLN";//年场用电量
+    public static final String CYDLB = "CYDLB";//场用电量
+    public static final String CYDLY = "CYDLY";//月场用电量
+    public static final String CYDLN = "CYDLN";//年场用电量
 
     public static final String FNLYL = "FNLYL";//风能利用率
     public static final String AQTS = "AQTS";
@@ -64,8 +64,8 @@ public class Contant {
     public static final String AI139 = "AI139"; //风机年发电量
 
     //判断数据中断(风速，功率，绕组温度，电流，电压)
-    public static final String INTERRUPTION ="AI022,AI130,AI045,AI061,AI058";
-    public static final String INTERRUPTIONGF ="AIG013,AIG017,AIG009,AIG006";
+    public static final String INTERRUPTION = "AI022,AI130,AI045,AI061,AI058";
+    public static final String INTERRUPTIONGF = "AIG013,AIG017,AIG009,AIG006";
     //判断状态
     public static final String MX000 = "MX000"; //待机
     public static final String MX002 = "MX002";//运行
@@ -118,8 +118,8 @@ public class Contant {
     public static final String ZBZGL = "ZBZGL";//场站保证功率
 
     //风机日损失电量
-    public static final String WTRDJSSDL ="RDJSSDL-ZS";  //待机损失电量
-    public static final String WTRSTSSDL ="RSTSSDL-ZS"; //手动停机损失电量
+    public static final String WTRDJSSDL = "RDJSSDL-ZS";  //待机损失电量
+    public static final String WTRSTSSDL = "RSTSSDL-ZS"; //手动停机损失电量
     public static final String WTRXNSSDL = "RXNSSDL-ZS"; //性能损失电量
     public static final String WTRQXSSDL = "RQXSSDL-ZS";//降出力损失电量
 
@@ -136,14 +136,14 @@ public class Contant {
     public static final String WTRTZSSDL = "RTZSSDL-ZS";//天气受累
 
 
-    public static final String GZSSDL ="GZSSDL";  //故障损失电量
-    public static final String WHSSDL ="WHSSDL"; //维护损失电量
+    public static final String GZSSDL = "GZSSDL";  //故障损失电量
+    public static final String WHSSDL = "WHSSDL"; //维护损失电量
     public static final String XNSSDL = "XNSSDL"; //性能损失电量
     public static final String XDSSDL = "XDSSDL";//限电损失电量
     public static final String SLSSDL = "SLSSDL";//受累损失电量
     //风机月损失电量
-    public static final String WTYDJSSDL ="YDJSSDL-ZS";  //待机损失电量
-    public static final String WTYSTSSDL ="YSTSSDL-ZS"; //手动停机损失电量
+    public static final String WTYDJSSDL = "YDJSSDL-ZS";  //待机损失电量
+    public static final String WTYSTSSDL = "YSTSSDL-ZS"; //手动停机损失电量
     public static final String WTYXNSSDL = "YXNSSDL-ZS"; //性能损失电量
     public static final String WTYQXSSDL = "YQXSSDL-ZS";//降出力损失电量
 
@@ -159,8 +159,8 @@ public class Contant {
     public static final String WTYWZSSDL = "YWZSSDL-ZS";//电网受累
     public static final String WTYTZSSDL = "YTZSSDL-ZS";//天气受累
     //风机年损失电量
-    public static final String WTNDJSSDL ="NDJSSDL-ZS";  //待机损失电量
-    public static final String WTNSTSSDL ="NSTSSDL-ZS"; //手动停机损失电量
+    public static final String WTNDJSSDL = "NDJSSDL-ZS";  //待机损失电量
+    public static final String WTNSTSSDL = "NSTSSDL-ZS"; //手动停机损失电量
     public static final String WTNXNSSDL = "NXNSSDL-ZS"; //性能损失电量
     public static final String WTNQXSSDL = "NQXSSDL-ZS";//降出力损失电量
 
@@ -177,8 +177,8 @@ public class Contant {
     public static final String WTNTZSSDL = "NTZSSDL-ZS";//天气受累
 
     //场站日五损
-    public static final String RSDJZSDL ="RSDJZSDL";  //待机损失电量
-    public static final String RSSTZSDL ="RSSTZSDL"; //手动停机损失电量
+    public static final String RSDJZSDL = "RSDJZSDL";  //待机损失电量
+    public static final String RSSTZSDL = "RSSTZSDL"; //手动停机损失电量
     public static final String RXNZSDL = "RXNZSDL"; //性能损失电量
     public static final String RSQXZSDL = "RSQXZSDL";//降出力损失电量
     public static final String RGZZSDL = "RGZZSDL"; //故障损失电量
@@ -190,8 +190,8 @@ public class Contant {
     public static final String RWZZSDL = "RWZZSDL";//电网受累
     public static final String RTZZSDL = "RTZZSDL";//天气受累
     //场站月五损
-    public static final String YSDJZSDL ="YSDJZSDL";  //待机损失电量
-    public static final String YSSTZSDL ="YSSTZSDL"; //手动停机损失电量
+    public static final String YSDJZSDL = "YSDJZSDL";  //待机损失电量
+    public static final String YSSTZSDL = "YSSTZSDL"; //手动停机损失电量
     public static final String YXNZSDL = "YXNZSDL"; //性能损失电量
     public static final String YSQXZSDL = "YSQXZSDL";//降出力损失电量
     public static final String YGZZSDL = "YGZZSDL"; //故障损失电量
@@ -203,8 +203,8 @@ public class Contant {
     public static final String YWZZSDL = "YWZZSDL";//电网受累
     public static final String YTZZSDL = "YTZZSDL";//天气受累
     //场站年五损
-    public static final String NSDJZSDL ="NSDJZSDL";  //待机损失电量
-    public static final String NSSTZSDL ="NSSTZSDL"; //手动停机损失电量
+    public static final String NSDJZSDL = "NSDJZSDL";  //待机损失电量
+    public static final String NSSTZSDL = "NSSTZSDL"; //手动停机损失电量
     public static final String NXNZSDL = "NXNZSDL"; //性能损失电量
     public static final String NSQXZSDL = "NSQXZSDL";//降出力损失电量
     public static final String NGZZSDL = "NGZZSDL"; //故障损失电量
@@ -230,7 +230,6 @@ public class Contant {
     public static final String JYS = "JYS";   //节约用水
 
 
-
     public static final String TPOINT_WP_XDTS = "XDTS";// 限电台数
     public static final String TPOINT_WP_YXTS = "YXTS";// 运行台数
     public static final String TPOINT_WP_DJTS = "DJTS"; // 待机台数
@@ -253,16 +252,16 @@ public class Contant {
     public static final String TPOINT_WP_MATRIX = "XDTS,YXTS,DJTS,WHTJ,GZTJ,TXZD,SSFS,SLTS,FCFGCDQ0001,ZBZGL,ZZSGL,SSZGL,AGC002,AGC001";
 
 
-    public static final String TPOINT_WT_FJZT = "FJZT" ;
+    public static final String TPOINT_WT_FJZT = "FJZT";
 
-    public static final String XDSL = "XDSL" ; //限电受累
+    public static final String XDSL = "XDSL"; //限电受累
 
-    public static final String XDZT = "XDZT" ; //限电状态
+    public static final String XDZT = "XDZT"; //限电状态
 
     public static final String XCLZT = "XCLZT"; //限出力状态
 
-  //  DI11139 DI10923
-  public static final String DI11139 = "DI11139";
+    //  DI11139 DI10923
+    public static final String DI11139 = "DI11139";
     public static final String DI10923 = "DI10923";
 
     public static final String LLGL = "LLGL"; //理论功率

common/src/main/java/com/gyee/common/contant/ContantXk.java

@@ -5,184 +5,181 @@ package com.gyee.common.contant;
  */
 
 public class ContantXk {
-    public static final String  AQTS= "AQTS";//安全天数
-    public static final String  CZZT= "CZZT";//场站状态
-    public static final String  SBJRZT= "SBJRZT";//场站设备接入状态
-    public static final String  DQJRZT= "DQJRZT";//场站电气接入状态
-    public static final String  AGCJRZT= "AGCJRZT";//场站AGC/AVC接入状态
-    public static final String  GLYCJRZT= "GLYCJRZT";//场站功率预测接入状态
-    public static final String  QXZJRZT= "QXZJRZT";//场站测风塔接入状态
-    public static final String  SSPJFS= "SSPJFS";//场站实时平均风速
-    public static final String  SSPJGZD = "SSPJGZD";
-    public static final String  SSZGL= "SSZGL";//场站实时总功率
-    public static final String  SSZGLSYZ= "SSZGLSYZ";//场站实时总功率 升压站
-    public static final String  SSZLLGL= "SSZLLGL";//场站实时总理论功率
-    public static final String  SSZBZGL= "SSZBZGL";//场站实时总保证功率
-    public static final String  SSZNHGLZS= "SSZNHGLZS";//场站实时总拟合功率(自算)
-    public static final String  ZYCGL = "ZYCGL";   //总预测功率
-    public static final String  SSZZYGL= "SSZZYGL";//场站实时总最优功率
-    public static final String  SSZKYGL= "SSZKYGL";//场站实时总可用功率
-    public static final String  RPJGL= "RPJGL";//日平均功率
-    public static final String  RPJFS= "RPJFS";//日平均风速
-    public static final String  RPJGZD= "RPJGZD";//日平均光照度
-    public static final String  RFDL= "RFDL";//日发电量
-    public static final String  RKYDL= "RKYDL";//日可用电量
-    public static final String  RLLFDL= "RLLFDL";//日理论发电量
-    public static final String  RLLFDLZS= "RLLFDLZS"; //日理论发电量自算
-    public static final String  RGZSSDL= "RGZSSDL";//日故障损失电量
-    public static final String  RCNSLGZSSDL= "RCNSLGZSSDL";//日场内受累故障损失电量
-    public static final String  RJXSSDL= "RJXSSDL";//日检修损失电量
-    public static final String  RCNSLJXSSDL= "RCNSLJXSSDL";//日场内受累检修损失电量
-    public static final String  RDJSSDL= "RDJSSDL";//日待机损失电量
-    public static final String  RQXJCLSSDL= "RQXJCLSSDL";//日缺陷降出力损失电量
-    public static final String  RSDTJSSDL= "RSDTJSSDL";//日手动停机损失电量
-    public static final String  RXNSSDL= "RXNSSDL";//日性能损失电量
-    public static final String  RXDTJSSDL= "RXDTJSSDL";//日限电停机损失电量
-    public static final String  RXDJCLSSDL= "RXDJCLSSDL";//日限电降出力损失电量
-    public static final String  RCWSLDWSSDL= "RCWSLDWSSDL";//日场外受累电网损失电量
-    public static final String  RCWSLTQSSDL= "RCWSLTQSSDL";//日场外受累天气损失电量
-    public static final String  RZFDL= "RZFDL";//日增发电量
-    public static final String  RQFDL= "RQFDL";//日欠发电量
-    public static final String  YPJGL= "YPJGL";//月平均功率
-    public static final String  YPJFS= "YPJFS";//月平均风速
-    public static final String  YPJGZD= "YPJGZD";//月平均光照度
-    public static final String  YFDL= "YFDL";//月发电量
-    public static final String  YKYDL= "YKYDL";//月可用电量
-    public static final String  YLLFDL= "YLLFDL";//月理论发电量
-    public static final String  YLLFDLZS= "YLLFDLZS";//月理论发电量自算
-    public static final String  YGZSSDL= "YGZSSDL";//月故障损失电量
-    public static final String  YCNSLGZSSDL= "YCNSLGZSSDL";//月场内受累故障损失电量
-    public static final String  YJXSSDL= "YJXSSDL";//月检修损失电量
-    public static final String  YCNSLJXSSDL= "YCNSLJXSSDL";//月场内受累检修损失电量
-    public static final String  YDJSSDL= "YDJSSDL";//月待机损失电量
-    public static final String  YQXJCLSSDL= "YQXJCLSSDL";//月缺陷降出力损失电量
-    public static final String  YSDTJSSDL= "YSDTJSSDL";//月手动停机损失电量
-    public static final String  YXNSSDL= "YXNSSDL";//月性能损失电量
-    public static final String  YXDTJSSDL= "YXDTJSSDL";//月限电停机损失电量
-    public static final String  YXDJCLSSDL= "YXDJCLSSDL";//月限电降出力损失电量
-    public static final String  YCWSLDWSSDL= "YCWSLDWSSDL";//月场外受累电网损失电量
-    public static final String  YCWSLTQSSDL= "YCWSLTQSSDL";//月场外受累天气损失电量
-    public static final String  YZFDL= "YZFDL";//月增发电量
-    public static final String  YQFDL= "YQFDL";//月欠发电量
-    public static final String  NPJGL= "NPJGL";//年平均功率
-    public static final String  NPJFS= "NPJFS";//年平均风速
-    public static final String  NPJGZD= "NPJGZD";//年平均光照度
-    public static final String  NFDL= "NFDL";//年发电量
-    public static final String  NKYDL= "NKYDL";//年可用电量
-    public static final String  NLLFDL= "NLLFDL";//年理论发电量
-    public static final String  NLLFDLZS= "NLLFDLZS";//年理论发电量
-    public static final String  NGZSSDL= "NGZSSDL";//年故障损失电量
-    public static final String  NCNSLGZSSDL= "NCNSLGZSSDL";//年场内受累故障损失电量
-    public static final String  NJXSSDL= "NJXSSDL";//年检修损失电量
-    public static final String  NCNSLJXSSDL= "NCNSLJXSSDL";//年场内受累检修损失电量
-    public static final String  NDJSSDL= "NDJSSDL";//年待机损失电量
-    public static final String  NQXJCLSSDL= "NQXJCLSSDL";//年缺陷降出力损失电量
-    public static final String  NSDTJSSDL= "NSDTJSSDL";//年手动停机损失电量
-    public static final String  NXNSSDL= "NXNSSDL";//年性能损失电量
-    public static final String  NXDTJSSDL= "NXDTJSSDL";//年限电停机损失电量
-    public static final String  NXDJCLSSDL= "NXDJCLSSDL";//年限电降出力损失电量
-    public static final String  NCWSLDWSSDL= "NCWSLDWSSDL";//年场外受累电网损失电量
-    public static final String  NCWSLTQSSDL= "NCWSLTQSSDL";//年场外受累天气损失电量
-    public static final String  NZFDL= "NZFDL";//年增发电量
-    public static final String  NQFDL= "NQFDL";//年欠发电量
-    public static final String  PJFS15= "PJFS15";//15分钟平均风速
-    public static final String  PJGZD15= "PJGZD15";//15分钟光照度
-    public static final String  PJGL15= "PJGL15";//15分钟平均功率
-    public static final String  FDL15= "FDL15";//15分钟发电量
-    public static final String  KYDL15= "KYDL15";//15分钟可用电量
-    public static final String  LLFDL15= "LLFDL15";//15分钟理论发电量
-    public static final String  LLFDL15ZS= "LLFDL15ZS";//15分钟理论发电量
-    public static final String  GZSSDL15= "GZSSDL15";//15分钟故障损失电量
-    public static final String  CNSLGZSSDL15= "CNSLGZSSDL15";//15分钟场内受累故障损失电量
-    public static final String  JXSSDL15= "JXSSDL15";//15分钟检修损失电量
-    public static final String  CNSLJXSSDL15= "CNSLJXSSDL15";//15分钟场内受累检修损失电量
-    public static final String  DJSSDL15= "DJSSDL15";//15分钟待机损失电量
-    public static final String  QXJCLSSDL15= "QXJCLSSDL15";//15分钟缺陷降出力损失电量
-    public static final String  SDTJSSDL15= "SDTJSSDL15";//15分钟手动停机损失电量
-    public static final String  XNSSDL15= "XNSSDL15";//15分钟性能损失电量
-    public static final String  XDTJSSDL15= "XDTJSSDL15";//15分钟限电停机损失电量
-    public static final String  XDJCLSSDL15= "XDJCLSSDL15";//15分钟限电降出力损失电量
-    public static final String  CWSLDWSSDL15= "CWSLDWSSDL15";//15分钟场外受累电网损失电量
-    public static final String  CWSLTQSSDL15= "CWSLTQSSDL15";//15分钟场外受累天气损失电量
-    public static final String  ZFDL15= "ZFDL15";//15分钟增发电量
-    public static final String  QFDL15= "QFDL15";//15分钟欠发电量
-    public static final String  RFDLSYZ= "RFDLSYZ";//日发电量(升压站)
-    public static final String  YFDLSYZ= "YFDLSYZ";//月发电量(升压站)
-    public static final String  NFDLSYZ= "NFDLSYZ";//年发电量(升压站)
-    public static final String  RSWDL= "RSWDL";//日上网电量
-    public static final String  YSWDL= "YSWDL";//月上网电量
-    public static final String  NSWDL= "NSWDL";//年上网电量
-    public static final String  RGWGWDL= "RGWGWDL";//日工网购网电量
-    public static final String  YGWGWDL= "YGWGWDL";//月工网购网电量
-    public static final String  NGWGWDL= "NGWGWDL";//年工网购网电量
-    public static final String  RNWGWDL= "RNWGWDL";//日农网购网电量
-    public static final String  YNWGWDL= "YNWGWDL";//月农网购网电量
-    public static final String  NNWGWDL= "NNWGWDL";//年农网购网电量
-    public static final String  RCYDL= "RCYDL";//日厂用电量
-    public static final String  YCYDL= "YCYDL";//月厂用电量
-    public static final String  NCYDL= "NCYDL";//年厂用电量
-    public static final String  AIG007= "AIG007";
-    public static final String  AIEMI002= "AIEMI002";
-
-    public static final String  DJTSMX= "DJTSMX";//待机台数（明细）
-    public static final String  SDTJTSMX= "SDTJTSMX";//手动停机台数（明细）
-    public static final String  XNTSMX= "XNTSMX";//性能台数（明细）
-    public static final String  QXJCLTSMX= "QXJCLTSMX";//缺陷降出力台数（明细）
-    public static final String  GZTSMX= "GZTSMX";//故障台数（明细）
-    public static final String  CNSLGZTSMX= "CNSLGZTSMX";//场内受累故障台数（明细）
-    public static final String  JXTSMX= "JXTSMX";//检修台数（明细）
-    public static final String  CNSLJXTSMX= "CNSLJXTSMX";//场内受累检修台数（明细）
-    public static final String  XDTJTSMX= "XDTJTSMX";//限电停机台数（明细）
-    public static final String  XDJCLTSMX= "XDJCLTSMX";//限电降出力台数（明细）
-    public static final String  CWSLDWTSMX= "CWSLDWTSMX";//场外受累电网台数（明细）
-    public static final String  CWSLTQTSMX= "CWSLTQTSMX";//场外受累天气台数（明细）
-    public static final String  LXTSMX= "LXTSMX";//离线台数（明细）
-    public static final String  TXZDTSMX= "TXZDTSMX";//通讯中断台数（明细）
-
-    public static final String  DJTS= "DJTS";//待机台数
-    public static final String  GZTJTS= "GZTJTS";//故障停机台数
-    public static final String  TXZDTS= "TXZDTS";//通讯中断台数
-    public static final String  JXTJTS= "JXTJTS";//维护停机台数
-    public static final String  SLTS= "SLTS";//受累台数
-    public static final String  XDTS= "XDTS";//限电台数
-    public static final String  YXTS= "YXTS";//运行台数
-
-    public static final String  RZHD= "RZHD";//日自耗电
-    public static final String  YZHD= "YZHD";//月自耗电
-    public static final String  NZHD= "NZHD";//年自耗电
-    public static final String  ZHD15= "ZHD15";//15分钟自耗电
-
-
-    public static final String  SBZT= "SBZT";//设备状态
-    public static final String  MXZT= "MXZT";//设备明细状态
-    public static final String  ZTCXSJ= "ZTCXSJ";//设备当前状态下持续时间
-    public static final String  SSBF= "SSBF";//设备实时补风风速
-    public static final String  SSBG= "SSBG";//设备实时补光
-    public static final String  XDZT= "XDZT";//设备限电状态
-    public static final String  GPZT= "GPZT";//设备挂牌状态（原限电受累）
-    public static final String  LSQFZT= "LSQFZT";//设备历史欠发状态
-    public static final String  SSQFZT= "SSQFZT";//设备实时欠发状态
-    public static final String  LLGL= "LLGL";//设备理论功率
-    public static final String  BZGL= "BZGL";//设备保证功率
-    public static final String  ZSGL= "ZSGL";//设备拟合功率(自算)
-    public static final String  ZYGL= "ZYGL";//设备最优功率
-    public static final String  KYGL= "KYGL";//设备可用功率
-
-
-
-
-
-    public static final String  CJ_SSFS= "AI066";//设备风速，光照
-    public static final String  CJ_SSGL= "AI114";//设备有功功率
-    public static final String  CJ_SSZS= "AI060";//转速
-    public static final String  CJ_FDZTXZSGD= "AI061";//发电状态下的转速给定
-    public static final String  CJ_SCADA_YGSD= "AI003";//scada有功设定值
-    public static final String  CJ_YLZSGD= "AI110";//叶轮转速给定
-    public static final String  CJ_FDL= "AI121";//发电量
-    public static final String  CJ_DWGL = "AI107";  //电网功率
-    public static final String  CJ_FX = "AI067";  //风向
-    public static final String  CJ_WGGL = "AI107";  //风向
-    public static final String  CJ_DFJD = "AI073";  //对风角度
+    public static final String AQTS = "AQTS";//安全天数
+    public static final String CZZT = "CZZT";//场站状态
+    public static final String SBJRZT = "SBJRZT";//场站设备接入状态
+    public static final String DQJRZT = "DQJRZT";//场站电气接入状态
+    public static final String AGCJRZT = "AGCJRZT";//场站AGC/AVC接入状态
+    public static final String GLYCJRZT = "GLYCJRZT";//场站功率预测接入状态
+    public static final String QXZJRZT = "QXZJRZT";//场站测风塔接入状态
+    public static final String SSPJFS = "SSPJFS";//场站实时平均风速
+    public static final String SSPJGZD = "SSPJGZD";
+    public static final String SSZGL = "SSZGL";//场站实时总功率
+    public static final String SSZGLSYZ = "SSZGLSYZ";//场站实时总功率 升压站
+    public static final String SSZLLGL = "SSZLLGL";//场站实时总理论功率
+    public static final String SSZBZGL = "SSZBZGL";//场站实时总保证功率
+    public static final String SSZNHGLZS = "SSZNHGLZS";//场站实时总拟合功率(自算)
+    public static final String ZYCGL = "ZYCGL";   //总预测功率
+    public static final String SSZZYGL = "SSZZYGL";//场站实时总最优功率
+    public static final String SSZKYGL = "SSZKYGL";//场站实时总可用功率
+    public static final String RPJGL = "RPJGL";//日平均功率
+    public static final String RPJFS = "RPJFS";//日平均风速
+    public static final String RPJGZD = "RPJGZD";//日平均光照度
+    public static final String RFDL = "RFDL";//日发电量
+    public static final String RKYDL = "RKYDL";//日可用电量
+    public static final String RLLFDL = "RLLFDL";//日理论发电量
+    public static final String RLLFDLZS = "RLLFDLZS"; //日理论发电量自算
+    public static final String RGZSSDL = "RGZSSDL";//日故障损失电量
+    public static final String RCNSLGZSSDL = "RCNSLGZSSDL";//日场内受累故障损失电量
+    public static final String RJXSSDL = "RJXSSDL";//日检修损失电量
+    public static final String RCNSLJXSSDL = "RCNSLJXSSDL";//日场内受累检修损失电量
+    public static final String RDJSSDL = "RDJSSDL";//日待机损失电量
+    public static final String RQXJCLSSDL = "RQXJCLSSDL";//日缺陷降出力损失电量
+    public static final String RSDTJSSDL = "RSDTJSSDL";//日手动停机损失电量
+    public static final String RXNSSDL = "RXNSSDL";//日性能损失电量
+    public static final String RXDTJSSDL = "RXDTJSSDL";//日限电停机损失电量
+    public static final String RXDJCLSSDL = "RXDJCLSSDL";//日限电降出力损失电量
+    public static final String RCWSLDWSSDL = "RCWSLDWSSDL";//日场外受累电网损失电量
+    public static final String RCWSLTQSSDL = "RCWSLTQSSDL";//日场外受累天气损失电量
+    public static final String RZFDL = "RZFDL";//日增发电量
+    public static final String RQFDL = "RQFDL";//日欠发电量
+    public static final String YPJGL = "YPJGL";//月平均功率
+    public static final String YPJFS = "YPJFS";//月平均风速
+    public static final String YPJGZD = "YPJGZD";//月平均光照度
+    public static final String YFDL = "YFDL";//月发电量
+    public static final String YKYDL = "YKYDL";//月可用电量
+    public static final String YLLFDL = "YLLFDL";//月理论发电量
+    public static final String YLLFDLZS = "YLLFDLZS";//月理论发电量自算
+    public static final String YGZSSDL = "YGZSSDL";//月故障损失电量
+    public static final String YCNSLGZSSDL = "YCNSLGZSSDL";//月场内受累故障损失电量
+    public static final String YJXSSDL = "YJXSSDL";//月检修损失电量
+    public static final String YCNSLJXSSDL = "YCNSLJXSSDL";//月场内受累检修损失电量
+    public static final String YDJSSDL = "YDJSSDL";//月待机损失电量
+    public static final String YQXJCLSSDL = "YQXJCLSSDL";//月缺陷降出力损失电量
+    public static final String YSDTJSSDL = "YSDTJSSDL";//月手动停机损失电量
+    public static final String YXNSSDL = "YXNSSDL";//月性能损失电量
+    public static final String YXDTJSSDL = "YXDTJSSDL";//月限电停机损失电量
+    public static final String YXDJCLSSDL = "YXDJCLSSDL";//月限电降出力损失电量
+    public static final String YCWSLDWSSDL = "YCWSLDWSSDL";//月场外受累电网损失电量
+    public static final String YCWSLTQSSDL = "YCWSLTQSSDL";//月场外受累天气损失电量
+    public static final String YZFDL = "YZFDL";//月增发电量
+    public static final String YQFDL = "YQFDL";//月欠发电量
+    public static final String NPJGL = "NPJGL";//年平均功率
+    public static final String NPJFS = "NPJFS";//年平均风速
+    public static final String NPJGZD = "NPJGZD";//年平均光照度
+    public static final String NFDL = "NFDL";//年发电量
+    public static final String NKYDL = "NKYDL";//年可用电量
+    public static final String NLLFDL = "NLLFDL";//年理论发电量
+    public static final String NLLFDLZS = "NLLFDLZS";//年理论发电量
+    public static final String NGZSSDL = "NGZSSDL";//年故障损失电量
+    public static final String NCNSLGZSSDL = "NCNSLGZSSDL";//年场内受累故障损失电量
+    public static final String NJXSSDL = "NJXSSDL";//年检修损失电量
+    public static final String NCNSLJXSSDL = "NCNSLJXSSDL";//年场内受累检修损失电量
+    public static final String NDJSSDL = "NDJSSDL";//年待机损失电量
+    public static final String NQXJCLSSDL = "NQXJCLSSDL";//年缺陷降出力损失电量
+    public static final String NSDTJSSDL = "NSDTJSSDL";//年手动停机损失电量
+    public static final String NXNSSDL = "NXNSSDL";//年性能损失电量
+    public static final String NXDTJSSDL = "NXDTJSSDL";//年限电停机损失电量
+    public static final String NXDJCLSSDL = "NXDJCLSSDL";//年限电降出力损失电量
+    public static final String NCWSLDWSSDL = "NCWSLDWSSDL";//年场外受累电网损失电量
+    public static final String NCWSLTQSSDL = "NCWSLTQSSDL";//年场外受累天气损失电量
+    public static final String NZFDL = "NZFDL";//年增发电量
+    public static final String NQFDL = "NQFDL";//年欠发电量
+    public static final String PJFS15 = "PJFS15";//15分钟平均风速
+    public static final String PJGZD15 = "PJGZD15";//15分钟光照度
+    public static final String PJGL15 = "PJGL15";//15分钟平均功率
+    public static final String FDL15 = "FDL15";//15分钟发电量
+    public static final String KYDL15 = "KYDL15";//15分钟可用电量
+    public static final String LLFDL15 = "LLFDL15";//15分钟理论发电量
+    public static final String LLFDL15ZS = "LLFDL15ZS";//15分钟理论发电量
+    public static final String GZSSDL15 = "GZSSDL15";//15分钟故障损失电量
+    public static final String CNSLGZSSDL15 = "CNSLGZSSDL15";//15分钟场内受累故障损失电量
+    public static final String JXSSDL15 = "JXSSDL15";//15分钟检修损失电量
+    public static final String CNSLJXSSDL15 = "CNSLJXSSDL15";//15分钟场内受累检修损失电量
+    public static final String DJSSDL15 = "DJSSDL15";//15分钟待机损失电量
+    public static final String QXJCLSSDL15 = "QXJCLSSDL15";//15分钟缺陷降出力损失电量
+    public static final String SDTJSSDL15 = "SDTJSSDL15";//15分钟手动停机损失电量
+    public static final String XNSSDL15 = "XNSSDL15";//15分钟性能损失电量
+    public static final String XDTJSSDL15 = "XDTJSSDL15";//15分钟限电停机损失电量
+    public static final String XDJCLSSDL15 = "XDJCLSSDL15";//15分钟限电降出力损失电量
+    public static final String CWSLDWSSDL15 = "CWSLDWSSDL15";//15分钟场外受累电网损失电量
+    public static final String CWSLTQSSDL15 = "CWSLTQSSDL15";//15分钟场外受累天气损失电量
+    public static final String ZFDL15 = "ZFDL15";//15分钟增发电量
+    public static final String QFDL15 = "QFDL15";//15分钟欠发电量
+    public static final String RFDLSYZ = "RFDLSYZ";//日发电量(升压站)
+    public static final String YFDLSYZ = "YFDLSYZ";//月发电量(升压站)
+    public static final String NFDLSYZ = "NFDLSYZ";//年发电量(升压站)
+    public static final String RSWDL = "RSWDL";//日上网电量
+    public static final String YSWDL = "YSWDL";//月上网电量
+    public static final String NSWDL = "NSWDL";//年上网电量
+    public static final String RGWGWDL = "RGWGWDL";//日工网购网电量
+    public static final String YGWGWDL = "YGWGWDL";//月工网购网电量
+    public static final String NGWGWDL = "NGWGWDL";//年工网购网电量
+    public static final String RNWGWDL = "RNWGWDL";//日农网购网电量
+    public static final String YNWGWDL = "YNWGWDL";//月农网购网电量
+    public static final String NNWGWDL = "NNWGWDL";//年农网购网电量
+    public static final String RCYDL = "RCYDL";//日厂用电量
+    public static final String YCYDL = "YCYDL";//月厂用电量
+    public static final String NCYDL = "NCYDL";//年厂用电量
+    public static final String AIG007 = "AIG007";
+    public static final String AIEMI002 = "AIEMI002";
+
+    public static final String DJTSMX = "DJTSMX";//待机台数（明细）
+    public static final String SDTJTSMX = "SDTJTSMX";//手动停机台数（明细）
+    public static final String XNTSMX = "XNTSMX";//性能台数（明细）
+    public static final String QXJCLTSMX = "QXJCLTSMX";//缺陷降出力台数（明细）
+    public static final String GZTSMX = "GZTSMX";//故障台数（明细）
+    public static final String CNSLGZTSMX = "CNSLGZTSMX";//场内受累故障台数（明细）
+    public static final String JXTSMX = "JXTSMX";//检修台数（明细）
+    public static final String CNSLJXTSMX = "CNSLJXTSMX";//场内受累检修台数（明细）
+    public static final String XDTJTSMX = "XDTJTSMX";//限电停机台数（明细）
+    public static final String XDJCLTSMX = "XDJCLTSMX";//限电降出力台数（明细）
+    public static final String CWSLDWTSMX = "CWSLDWTSMX";//场外受累电网台数（明细）
+    public static final String CWSLTQTSMX = "CWSLTQTSMX";//场外受累天气台数（明细）
+    public static final String LXTSMX = "LXTSMX";//离线台数（明细）
+    public static final String TXZDTSMX = "TXZDTSMX";//通讯中断台数（明细）
+
+    public static final String DJTS = "DJTS";//待机台数
+    public static final String GZTJTS = "GZTJTS";//故障停机台数
+    public static final String TXZDTS = "TXZDTS";//通讯中断台数
+    public static final String JXTJTS = "JXTJTS";//维护停机台数
+    public static final String SLTS = "SLTS";//受累台数
+    public static final String XDTS = "XDTS";//限电台数
+    public static final String YXTS = "YXTS";//运行台数
+
+    public static final String RZHD = "RZHD";//日自耗电
+    public static final String YZHD = "YZHD";//月自耗电
+    public static final String NZHD = "NZHD";//年自耗电
+    public static final String ZHD15 = "ZHD15";//15分钟自耗电
+
+
+    public static final String SBZT = "SBZT";//设备状态
+    public static final String MXZT = "MXZT";//设备明细状态
+    public static final String ZTCXSJ = "ZTCXSJ";//设备当前状态下持续时间
+    public static final String SSBF = "SSBF";//设备实时补风风速
+    public static final String SSBG = "SSBG";//设备实时补光
+    public static final String XDZT = "XDZT";//设备限电状态
+    public static final String GPZT = "GPZT";//设备挂牌状态（原限电受累）
+    public static final String LSQFZT = "LSQFZT";//设备历史欠发状态
+    public static final String SSQFZT = "SSQFZT";//设备实时欠发状态
+    public static final String LLGL = "LLGL";//设备理论功率
+    public static final String BZGL = "BZGL";//设备保证功率
+    public static final String ZSGL = "ZSGL";//设备拟合功率(自算)
+    public static final String ZYGL = "ZYGL";//设备最优功率
+    public static final String KYGL = "KYGL";//设备可用功率
+
+
+    public static final String CJ_SSFS = "AI066";//设备风速，光照
+    public static final String CJ_SSGL = "AI114";//设备有功功率
+    public static final String CJ_SSZS = "AI060";//转速
+    public static final String CJ_FDZTXZSGD = "AI061";//发电状态下的转速给定
+    public static final String CJ_SCADA_YGSD = "AI003";//scada有功设定值
+    public static final String CJ_YLZSGD = "AI110";//叶轮转速给定
+    public static final String CJ_FDL = "AI121";//发电量
+    public static final String CJ_DWGL = "AI107";  //电网功率
+    public static final String CJ_FX = "AI067";  //风向
+    public static final String CJ_WGGL = "AI107";  //风向
+    public static final String CJ_DFJD = "AI073";  //对风角度
 
     public static final String TPOINT_WP_AGC = "AGC002";// agc
     public static final String TPOINT_WP_CXGL = "AGC001";// 出线
@@ -197,9 +194,7 @@ public class ContantXk {
     public static final String TPOINT_WP_YCGL = "FCFGDQDT0001";// 预测功率
 
 
-    public static final String SSGLSYZ= "SSGLSYZ";//线路实时功率 升压站 采集点
-
-
+    public static final String SSGLSYZ = "SSGLSYZ";//线路实时功率 升压站 采集点
 
 
     public static final String NBQSRGL = "AIG067";   //逆变器输入功率
@@ -224,10 +219,10 @@ public class ContantXk {
     public static final String KQMD = "KQMD";//测风塔空气密度
     public static final String FCCFTYQ = "FCCFTYQ";//测风塔压强
     //判断数据中断(风速，功率，绕组温度，电流，电压)
-    public static final String INTERRUPTION ="AI066,AI114,AI004";
+    public static final String INTERRUPTION = "AI066,AI114,AI004";
 
-//    public static final String INTERRUPTION ="AI066,AI114,AI004,AI075,AI093";
-    public static final String INTERRUPTIONGF ="AI114,AI075,AIG055";
+    //    public static final String INTERRUPTION ="AI066,AI114,AI004,AI075,AI093";
+    public static final String INTERRUPTIONGF = "AI114,AI075,AIG055";
 
 
     public static final String QCZT = "QCZT";  //全场状态
@@ -282,67 +277,66 @@ public class ContantXk {
 
     public static final String AI074 = "AI074"; //机舱温度
 
-    public static final String JKZT001= "JKZT001"; //风机实时健康状态
-    public static final String JKZT002= "JKZT002"; //齿轮箱实时健康状态
-    public static final String JKZT003= "JKZT003"; //发电机实时健康状态
-    public static final String JKZT004= "JKZT004"; //控制因素实时健康状态
-    public static final String JKZT005= "JKZT005"; //机舱系统健康状态
-    public static final String JKJL001= "JKJL001"; //风机实时健康结果值
-    public static final String JKJL002= "JKJL002"; //齿轮箱实时健康结果值
-    public static final String JKJL003= "JKJL003"; //发电机实时健康结果值
-    public static final String JKJL004= "JKJL004"; //控制因素实时健康结果值
-    public static final String JKJL005= "JKJL005"; //机舱系统健康结果值
-    public static final String JKYC001= "JKYC001"; //风机健康预测-4小时
-    public static final String JKYC002= "JKYC002"; //齿轮箱健康预测-4小时
-    public static final String JKYC003= "JKYC003"; //发电机健康预测-4小时
-    public static final String JKYC004= "JKYC004"; //控制因素健康预测-4小时
-    public static final String JKYC005= "JKYC005"; //机舱系统健康预测-4小时
-    public static final String JKYC006= "JKYC006"; //风机健康预测-1天
-    public static final String JKYC007= "JKYC007"; //齿轮箱健康预测-1天
-    public static final String JKYC008= "JKYC008"; //发电机健康预测-1天
-    public static final String JKYC009= "JKYC009"; //控制因素健康预测-1天
-    public static final String JKYC010= "JKYC010"; //机舱系统健康预测-1天
-    public static final String JKYC011= "JKYC011"; //风机健康预测-3天
-    public static final String JKYC012= "JKYC012"; //齿轮箱健康预测-3天
-    public static final String JKYC013= "JKYC013"; //发电机健康预测-3天
-    public static final String JKYC014= "JKYC014"; //控制因素健康预测-3天
-    public static final String JKYC015= "JKYC015"; //机舱系统健康预测-3天
-    public static final String JKYC016= "JKYC016"; //风机健康预测-7天
-    public static final String JKYC017= "JKYC017"; //齿轮箱健康预测-7天
-    public static final String JKYC018= "JKYC018"; //发电机健康预测-7天
-    public static final String JKYC019= "JKYC019"; //控制因素健康预测-7天
-    public static final String JKYC020= "JKYC020"; //机舱系统健康预测-7天
-    public static final String JKYC021= "JKYC021"; //风机健康预测-1个月
-    public static final String JKYC022= "JKYC022"; //齿轮箱健康预测-1个月
-    public static final String JKYC023= "JKYC023"; //发电机健康预测-1个月
-    public static final String JKYC024= "JKYC024"; //控制因素健康预测-1个月
-    public static final String JKYC025= "JKYC025"; //机舱系统健康预测-1个月
-    public static final String JKZT100= "JKZT100"; //风机01总健康状态
-    public static final String JKZS= "JKZS"; //健康指数
-    public static final String JKSLLH001= "JKSLLH001"; //风机良好数量
-    public static final String JKSLHG001= "JKSLHG001"; //风机合格数量
-    public static final String JKSLZY001= "JKSLZY001"; //风机注意数量
-    public static final String JKSLYZ001= "JKSLYZ001"; //风机严重数量
-    public static final String JKSLLH002= "JKSLLH002"; //齿轮箱良好数量
-    public static final String JKSLHG002= "JKSLHG002"; //齿轮箱合格数量
-    public static final String JKSLZY002= "JKSLZY002"; //齿轮箱注意数量
-    public static final String JKSLYZ002= "JKSLYZ002"; //齿轮箱严重数量
-    public static final String JKSLLH003= "JKSLLH003"; //发电机良好数量
-    public static final String JKSLHG003= "JKSLHG003"; //发电机合格数量
-    public static final String JKSLZY003= "JKSLZY003"; //发电机注意数量
-    public static final String JKSLYZ003= "JKSLYZ003"; //发电机严重数量
-    public static final String JKSLLH004= "JKSLLH004"; //空置因素良好数量
-    public static final String JKSLHG004= "JKSLHG004"; //空置因素合格数量
-    public static final String JKSLZY004= "JKSLZY004"; //空置因素注意数量
-    public static final String JKSLYZ004= "JKSLYZ004"; //空置因素严重数量
-    public static final String JKSLLH005= "JKSLLH005"; //机舱系统良好数量
-    public static final String JKSLHG005= "JKSLHG005"; //机舱系统合格数量
-    public static final String JKSLZY005= "JKSLZY005"; //机舱系统注意数量
-    public static final String JKSLYZ005= "JKSLYZ005"; //机舱系统严重数量
-
-
-
-    public static final String  ZJZT= "ZJZT";//中间状态
+    public static final String JKZT001 = "JKZT001"; //风机实时健康状态
+    public static final String JKZT002 = "JKZT002"; //齿轮箱实时健康状态
+    public static final String JKZT003 = "JKZT003"; //发电机实时健康状态
+    public static final String JKZT004 = "JKZT004"; //控制因素实时健康状态
+    public static final String JKZT005 = "JKZT005"; //机舱系统健康状态
+    public static final String JKJL001 = "JKJL001"; //风机实时健康结果值
+    public static final String JKJL002 = "JKJL002"; //齿轮箱实时健康结果值
+    public static final String JKJL003 = "JKJL003"; //发电机实时健康结果值
+    public static final String JKJL004 = "JKJL004"; //控制因素实时健康结果值
+    public static final String JKJL005 = "JKJL005"; //机舱系统健康结果值
+    public static final String JKYC001 = "JKYC001"; //风机健康预测-4小时
+    public static final String JKYC002 = "JKYC002"; //齿轮箱健康预测-4小时
+    public static final String JKYC003 = "JKYC003"; //发电机健康预测-4小时
+    public static final String JKYC004 = "JKYC004"; //控制因素健康预测-4小时
+    public static final String JKYC005 = "JKYC005"; //机舱系统健康预测-4小时
+    public static final String JKYC006 = "JKYC006"; //风机健康预测-1天
+    public static final String JKYC007 = "JKYC007"; //齿轮箱健康预测-1天
+    public static final String JKYC008 = "JKYC008"; //发电机健康预测-1天
+    public static final String JKYC009 = "JKYC009"; //控制因素健康预测-1天
+    public static final String JKYC010 = "JKYC010"; //机舱系统健康预测-1天
+    public static final String JKYC011 = "JKYC011"; //风机健康预测-3天
+    public static final String JKYC012 = "JKYC012"; //齿轮箱健康预测-3天
+    public static final String JKYC013 = "JKYC013"; //发电机健康预测-3天
+    public static final String JKYC014 = "JKYC014"; //控制因素健康预测-3天
+    public static final String JKYC015 = "JKYC015"; //机舱系统健康预测-3天
+    public static final String JKYC016 = "JKYC016"; //风机健康预测-7天
+    public static final String JKYC017 = "JKYC017"; //齿轮箱健康预测-7天
+    public static final String JKYC018 = "JKYC018"; //发电机健康预测-7天
+    public static final String JKYC019 = "JKYC019"; //控制因素健康预测-7天
+    public static final String JKYC020 = "JKYC020"; //机舱系统健康预测-7天
+    public static final String JKYC021 = "JKYC021"; //风机健康预测-1个月
+    public static final String JKYC022 = "JKYC022"; //齿轮箱健康预测-1个月
+    public static final String JKYC023 = "JKYC023"; //发电机健康预测-1个月
+    public static final String JKYC024 = "JKYC024"; //控制因素健康预测-1个月
+    public static final String JKYC025 = "JKYC025"; //机舱系统健康预测-1个月
+    public static final String JKZT100 = "JKZT100"; //风机01总健康状态
+    public static final String JKZS = "JKZS"; //健康指数
+    public static final String JKSLLH001 = "JKSLLH001"; //风机良好数量
+    public static final String JKSLHG001 = "JKSLHG001"; //风机合格数量
+    public static final String JKSLZY001 = "JKSLZY001"; //风机注意数量
+    public static final String JKSLYZ001 = "JKSLYZ001"; //风机严重数量
+    public static final String JKSLLH002 = "JKSLLH002"; //齿轮箱良好数量
+    public static final String JKSLHG002 = "JKSLHG002"; //齿轮箱合格数量
+    public static final String JKSLZY002 = "JKSLZY002"; //齿轮箱注意数量
+    public static final String JKSLYZ002 = "JKSLYZ002"; //齿轮箱严重数量
+    public static final String JKSLLH003 = "JKSLLH003"; //发电机良好数量
+    public static final String JKSLHG003 = "JKSLHG003"; //发电机合格数量
+    public static final String JKSLZY003 = "JKSLZY003"; //发电机注意数量
+    public static final String JKSLYZ003 = "JKSLYZ003"; //发电机严重数量
+    public static final String JKSLLH004 = "JKSLLH004"; //空置因素良好数量
+    public static final String JKSLHG004 = "JKSLHG004"; //空置因素合格数量
+    public static final String JKSLZY004 = "JKSLZY004"; //空置因素注意数量
+    public static final String JKSLYZ004 = "JKSLYZ004"; //空置因素严重数量
+    public static final String JKSLLH005 = "JKSLLH005"; //机舱系统良好数量
+    public static final String JKSLHG005 = "JKSLHG005"; //机舱系统合格数量
+    public static final String JKSLZY005 = "JKSLZY005"; //机舱系统注意数量
+    public static final String JKSLYZ005 = "JKSLYZ005"; //机舱系统严重数量
+
+
+    public static final String ZJZT = "ZJZT";//中间状态
 
     public static final String MX000 = "MX000"; //待机
     public static final String MX001 = "MX001";//手动停机
@@ -360,11 +354,10 @@ public class ContantXk {
     public static final String MX013 = "MX013";//设备离线
 
     //新配置预测
-    public static final String FSYC="FSYC"; //风速预测
+    public static final String FSYC = "FSYC"; //风速预测
     public static final String GZYC = "GZYC"; //光照预测
     public static final String GLYC = "GLYC"; //功率预测
     public static final String GCGZQD = "GCGZQD"; //场站光照
 
 
-
 }

common/src/main/java/com/gyee/common/domain/AjaxResult.java

@@ -3,53 +3,47 @@ package com.gyee.common.domain;
 import java.util.HashMap;
 
 /**
-* @ClassName: AjaxResult
-* @Description: ajax操作消息提醒
-* @author gyee
-* @date 2018年8月18日
-*
+ * @author gyee
+ * @ClassName: AjaxResult
+ * @Description: ajax操作消息提醒
+ * @date 2018年8月18日
  */
-public class AjaxResult extends HashMap<String, Object>
-{
+public class AjaxResult extends HashMap<String, Object> {
     private static final long serialVersionUID = 1L;
 
     /**
      * 初始化一个新创建的 Message 对象
      */
-    public AjaxResult()
-    {
+    public AjaxResult() {
     }
 
     /**
      * 返回错误消息
-     * 
+     *
      * @return 错误消息
      */
-    public static AjaxResult error()
-    {
+    public static AjaxResult error() {
         return error(1, "操作失败");
     }
 
     /**
      * 返回错误消息
-     * 
+     *
      * @param msg 内容
      * @return 错误消息
      */
-    public static AjaxResult error(String msg)
-    {
+    public static AjaxResult error(String msg) {
         return error(500, msg);
     }
 
     /**
      * 返回错误消息
-     * 
+     *
      * @param code 错误码
-     * @param msg 内容
+     * @param msg  内容
      * @return 错误消息
      */
-    public static AjaxResult error(int code, String msg)
-    {
+    public static AjaxResult error(int code, String msg) {
         AjaxResult json = new AjaxResult();
         json.put("code", code);
         json.put("msg", msg);
@@ -58,46 +52,43 @@ public class AjaxResult extends HashMap<String, Object>
 
     /**
      * 返回成功消息
-     * 
+     *
      * @param msg 内容
      * @return 成功消息
      */
-    public static AjaxResult success(String msg)
-    {
+    public static AjaxResult success(String msg) {
         AjaxResult json = new AjaxResult();
         json.put("msg", msg);
         json.put("code", 200);
         return json;
     }
-    
+
     /**
      * 返回成功消息
-     * 
+     *
      * @return 成功消息
      */
-    public static AjaxResult success()
-    {
+    public static AjaxResult success() {
         return AjaxResult.success("操作成功");
     }
-    
-    public static AjaxResult successData(int code, Object value){
-    	 AjaxResult json = new AjaxResult();
-    	 json.put("code", code);
-         json.put("data", value);
-         return json;
+
+    public static AjaxResult successData(int code, Object value) {
+        AjaxResult json = new AjaxResult();
+        json.put("code", code);
+        json.put("data", value);
+        return json;
     }
-   
-    
+
+
     /**
      * 返回成功消息
-     * 
-     * @param key 键值
+     *
+     * @param key   键值
      * @param value 内容
      * @return 成功消息
      */
     @Override
-    public AjaxResult put(String key, Object value)
-    {
+    public AjaxResult put(String key, Object value) {
         super.put(key, value);
         return this;
     }

common/src/main/java/com/gyee/common/model/Alertrule2.java

@@ -14,7 +14,7 @@ import java.util.Date;
 public class Alertrule2 {
     private static final long serialVersionUID = 1L;
 
-    @TableId(value="ID",type = IdType.INPUT)
+    @TableId(value = "ID", type = IdType.INPUT)
     private String id;
 
     @TableField("NAME")

common/src/main/java/com/gyee/common/model/Alertrulefailure.java

@@ -12,7 +12,7 @@ import lombok.Data;
 public class Alertrulefailure {
     private static final long serialVersionUID = 1L;
 
-    @TableId(value = "ID",type = IdType.INPUT)
+    @TableId(value = "ID", type = IdType.INPUT)
     private String id;
 
     @TableField("TID")

common/src/main/java/com/gyee/common/model/CharsetKit.java

@@ -5,72 +5,76 @@ import java.nio.charset.StandardCharsets;
 
 /**
  * 字符集工具类
- * 
- * @author fc
  *
+ * @author fc
  */
-public class CharsetKit
-{
-    /** ISO-8859-1 */
+public class CharsetKit {
+    /**
+     * ISO-8859-1
+     */
     public static final String ISO_8859_1 = "ISO-8859-1";
-    /** UTF-8 */
+    /**
+     * UTF-8
+     */
     public static final String UTF_8 = "UTF-8";
-    /** GBK */
+    /**
+     * GBK
+     */
     public static final String GBK = "GBK";
 
-    /** ISO-8859-1 */
+    /**
+     * ISO-8859-1
+     */
     public static final Charset CHARSET_ISO_8859_1 = Charset.forName(ISO_8859_1);
-    /** UTF-8 */
+    /**
+     * UTF-8
+     */
     public static final Charset CHARSET_UTF_8 = Charset.forName(UTF_8);
-    /** GBK */
+    /**
+     * GBK
+     */
     public static final Charset CHARSET_GBK = Charset.forName(GBK);
 
     /**
      * 转换为Charset对象
-     * 
+     *
      * @param charset 字符集，为空则返回默认字符集
      * @return Charset
      */
-    public static Charset charset(String charset)
-    {
+    public static Charset charset(String charset) {
         return StringUtils.isEmpty(charset) ? Charset.defaultCharset() : Charset.forName(charset);
     }
 
     /**
      * 转换字符串的字符集编码
-     * 
-     * @param source 字符串
-     * @param srcCharset 源字符集，默认ISO-8859-1
+     *
+     * @param source      字符串
+     * @param srcCharset  源字符集，默认ISO-8859-1
      * @param destCharset 目标字符集，默认UTF-8
      * @return 转换后的字符集
      */
-    public static String convert(String source, String srcCharset, String destCharset)
-    {
+    public static String convert(String source, String srcCharset, String destCharset) {
         return convert(source, Charset.forName(srcCharset), Charset.forName(destCharset));
     }
 
     /**
      * 转换字符串的字符集编码
-     * 
-     * @param source 字符串
-     * @param srcCharset 源字符集，默认ISO-8859-1
+     *
+     * @param source      字符串
+     * @param srcCharset  源字符集，默认ISO-8859-1
      * @param destCharset 目标字符集，默认UTF-8
      * @return 转换后的字符集
      */
-    public static String convert(String source, Charset srcCharset, Charset destCharset)
-    {
-        if (null == srcCharset)
-        {
+    public static String convert(String source, Charset srcCharset, Charset destCharset) {
+        if (null == srcCharset) {
             srcCharset = StandardCharsets.ISO_8859_1;
         }
 
-        if (null == destCharset)
-        {
+        if (null == destCharset) {
             srcCharset = StandardCharsets.UTF_8;
         }
 
-        if (StringUtils.isEmpty(source) || srcCharset.equals(destCharset))
-        {
+        if (StringUtils.isEmpty(source) || srcCharset.equals(destCharset)) {
             return source;
         }
         return new String(source.getBytes(srcCharset), destCharset);
@@ -79,8 +83,7 @@ public class CharsetKit
     /**
      * @return 系统字符集编码
      */
-    public static String systemCharset()
-    {
+    public static String systemCharset() {
         return Charset.defaultCharset().name();
     }
 

common/src/main/java/com/gyee/common/model/DNAStatVal.java

@@ -1,7 +1,7 @@
 package com.gyee.common.model;
 
 public class DNAStatVal {
-	public DNAVal avg = new DNAVal();
-	public DNAVal max = new DNAVal();
-	public DNAVal min = new DNAVal();
+    public DNAVal avg = new DNAVal();
+    public DNAVal max = new DNAVal();
+    public DNAVal min = new DNAVal();
 }

common/src/main/java/com/gyee/common/model/DNAVal.java

@@ -1,6 +1,7 @@
 package com.gyee.common.model;
+
 public class DNAVal {
-	public double DValue;
-	public int Time;
-	public short Status;
+    public double DValue;
+    public int Time;
+    public short Status;
 }

common/src/main/java/com/gyee/common/model/Evaluationdatasource.java

@@ -12,7 +12,7 @@ import java.math.BigDecimal;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author 谢生杰
@@ -25,7 +25,7 @@ public class Evaluationdatasource extends Model {
 
     private static final long serialVersionUID = 1L;
 
-    @TableId(value = "TARGETID",type = IdType.INPUT)
+    @TableId(value = "TARGETID", type = IdType.INPUT)
     private String targetid;
 
     @TableField("TARGETNAME")

common/src/main/java/com/gyee/common/model/Healthconfig.java

@@ -8,7 +8,7 @@ import lombok.EqualsAndHashCode;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author 谢生杰

common/src/main/java/com/gyee/common/model/P3DeviceFault.java

@@ -15,7 +15,7 @@ import java.util.Date;
 public class P3DeviceFault {
     private static final long serialVersionUID = 1L;
 
-    @TableId(value="ID",type = IdType.INPUT)
+    @TableId(value = "ID", type = IdType.INPUT)
     private String id;
 
     @TableField("CODE")

common/src/main/java/com/gyee/common/model/PointData.java

@@ -2,64 +2,64 @@ package com.gyee.common.model;
 
 public class PointData {
 
-	private double pointValueInDouble;
+    private double pointValueInDouble;
 
-	private double pointValueInDouble2;
+    private double pointValueInDouble2;
 
-	private Long pointTime;
+    private Long pointTime;
 
-	private String pointValue;
+    private String pointValue;
 
-	private String pointName;// z自定义名称
+    private String pointName;// z自定义名称
 
-	private String ednaId;// edna全局id
+    private String ednaId;// edna全局id
 
-	public double getPointValueInDouble2() {
-		return pointValueInDouble2;
-	}
+    public double getPointValueInDouble2() {
+        return pointValueInDouble2;
+    }
 
-	public void setPointValueInDouble2(double pointValueInDouble2) {
-		this.pointValueInDouble2 = pointValueInDouble2;
-	}
+    public void setPointValueInDouble2(double pointValueInDouble2) {
+        this.pointValueInDouble2 = pointValueInDouble2;
+    }
 
-	public String getEdnaId() {
-		return ednaId;
-	}
+    public String getEdnaId() {
+        return ednaId;
+    }
 
-	public String getPointName() {
-		return pointName;
-	}
+    public String getPointName() {
+        return pointName;
+    }
 
-	public Long getPointTime() {
-		return pointTime;
-	}
+    public Long getPointTime() {
+        return pointTime;
+    }
 
-	public String getPointValue() {
-		return pointValue;
-	}
+    public String getPointValue() {
+        return pointValue;
+    }
 
-	public  double getPointValueInDouble() {
-		return pointValueInDouble;
-	}
+    public double getPointValueInDouble() {
+        return pointValueInDouble;
+    }
 
-	public void setEdnaId(String ednaId) {
-		this.ednaId = ednaId;
-	}
+    public void setEdnaId(String ednaId) {
+        this.ednaId = ednaId;
+    }
 
-	public void setPointName(String pointName) {
-		this.pointName = pointName;
-	}
+    public void setPointName(String pointName) {
+        this.pointName = pointName;
+    }
 
-	public void setPointTime(Long pointTime) {
-		this.pointTime = pointTime;
-	}
+    public void setPointTime(Long pointTime) {
+        this.pointTime = pointTime;
+    }
 
-	public void setPointValue(String pointValue) {
-		this.pointValue = pointValue;
-	}
+    public void setPointValue(String pointValue) {
+        this.pointValue = pointValue;
+    }
 
-	public void setPointValueInDouble(double pointValueInDouble) {
-		this.pointValueInDouble = pointValueInDouble;
-	}
+    public void setPointValueInDouble(double pointValueInDouble) {
+        this.pointValueInDouble = pointValueInDouble;
+    }
 
 }

common/src/main/java/com/gyee/common/model/StrFormatter.java

@@ -3,11 +3,10 @@ package com.gyee.common.model;
 
 /**
  * 字符串格式化
- * 
+ *
  * @author fc
  */
-public class StrFormatter
-{
+public class StrFormatter {
 
     public static final String EMPTY_JSON = "{}";
     public static final char C_BACKSLASH = '\\';
@@ -22,15 +21,13 @@ public class StrFormatter
      * 通常使用：format("this is {} for {}", "a", "b") -> this is a for b<br>
      * 转义{}： format("this is \\{} for {}", "a", "b") -> this is \{} for a<br>
      * 转义\： format("this is \\\\{} for {}", "a", "b") -> this is \a for b<br>
-     * 
+     *
      * @param strPattern 字符串模板
-     * @param argArray 参数列表
+     * @param argArray   参数列表
      * @return 结果
      */
-    public static String format(final String strPattern, final Object... argArray)
-    {
-        if (StringUtils.isEmpty(strPattern) || StringUtils.isEmpty(argArray))
-        {
+    public static String format(final String strPattern, final Object... argArray) {
+        if (StringUtils.isEmpty(strPattern) || StringUtils.isEmpty(argArray)) {
             return strPattern;
         }
         final int strPatternLength = strPattern.length();
@@ -40,43 +37,30 @@ public class StrFormatter
 
         int handledPosition = 0;
         int delimIndex;// 占位符所在位置
-        for (int argIndex = 0; argIndex < argArray.length; argIndex++)
-        {
+        for (int argIndex = 0; argIndex < argArray.length; argIndex++) {
             delimIndex = strPattern.indexOf(EMPTY_JSON, handledPosition);
-            if (delimIndex == -1)
-            {
-                if (handledPosition == 0)
-                {
+            if (delimIndex == -1) {
+                if (handledPosition == 0) {
                     return strPattern;
-                }
-                else
-                { // 字符串模板剩余部分不再包含占位符，加入剩余部分后返回结果
+                } else { // 字符串模板剩余部分不再包含占位符，加入剩余部分后返回结果
                     sbuf.append(strPattern, handledPosition, strPatternLength);
                     return sbuf.toString();
                 }
-            }
-            else
-            {
-                if (delimIndex > 0 && strPattern.charAt(delimIndex - 1) == C_BACKSLASH)
-                {
-                    if (delimIndex > 1 && strPattern.charAt(delimIndex - 2) == C_BACKSLASH)
-                    {
+            } else {
+                if (delimIndex > 0 && strPattern.charAt(delimIndex - 1) == C_BACKSLASH) {
+                    if (delimIndex > 1 && strPattern.charAt(delimIndex - 2) == C_BACKSLASH) {
                         // 转义符之前还有一个转义符，占位符依旧有效
                         sbuf.append(strPattern, handledPosition, delimIndex - 1);
                         sbuf.append(Convert.utf8Str(argArray[argIndex]));
                         handledPosition = delimIndex + 2;
-                    }
-                    else
-                    {
+                    } else {
                         // 占位符被转义
                         argIndex--;
                         sbuf.append(strPattern, handledPosition, delimIndex - 1);
                         sbuf.append(C_DELIM_START);
                         handledPosition = delimIndex + 1;
                     }
-                }
-                else
-                {
+                } else {
                     // 正常占位符
                     sbuf.append(strPattern, handledPosition, delimIndex);
                     sbuf.append(Convert.utf8Str(argArray[argIndex]));

common/src/main/java/com/gyee/common/model/StringUtils.java

@@ -12,182 +12,167 @@ import java.util.UUID;
 
 /**
  * 字符串工具类
- * 
+ *
  * @author fc
  */
-public class StringUtils extends org.apache.commons.lang3.StringUtils
-{
-    /** 空字符串 */
+public class StringUtils extends org.apache.commons.lang3.StringUtils {
+    /**
+     * 空字符串
+     */
     private static final String NULLSTR = "";
 
-    /** 下划线 */
+    /**
+     * 下划线
+     */
     private static final char SEPARATOR = '_';
 
     /**
      * 获取参数不为空值
-     * 
+     *
      * @param value defaultValue 要判断的value
      * @return value 返回值
      */
-    public static <T> T nvl(T value, T defaultValue)
-    {
+    public static <T> T nvl(T value, T defaultValue) {
         return value != null ? value : defaultValue;
     }
 
     /**
      * * 判断一个Collection是否为空， 包含List，Set，Queue
-     * 
+     *
      * @param coll 要判断的Collection
      * @return true：为空 false：非空
      */
-    public static boolean isEmpty(Collection<?> coll)
-    {
+    public static boolean isEmpty(Collection<?> coll) {
         return isNull(coll) || coll.isEmpty();
     }
 
     /**
      * * 判断一个Collection是否非空，包含List，Set，Queue
-     * 
+     *
      * @param coll 要判断的Collection
      * @return true：非空 false：空
      */
-    public static boolean isNotEmpty(Collection<?> coll)
-    {
+    public static boolean isNotEmpty(Collection<?> coll) {
         return !isEmpty(coll);
     }
 
     /**
      * * 判断一个对象数组是否为空
-     * 
+     *
      * @param objects 要判断的对象数组
-     ** @return true：为空 false：非空
+     *                * @return true：为空 false：非空
      */
-    public static boolean isEmpty(Object[] objects)
-    {
+    public static boolean isEmpty(Object[] objects) {
         return isNull(objects) || (objects.length == 0);
     }
 
     /**
      * * 判断一个对象数组是否非空
-     * 
+     *
      * @param objects 要判断的对象数组
      * @return true：非空 false：空
      */
-    public static boolean isNotEmpty(Object[] objects)
-    {
+    public static boolean isNotEmpty(Object[] objects) {
         return !isEmpty(objects);
     }
 
     /**
      * * 判断一个Map是否为空
-     * 
+     *
      * @param map 要判断的Map
      * @return true：为空 false：非空
      */
-    public static boolean isEmpty(Map<?, ?> map)
-    {
+    public static boolean isEmpty(Map<?, ?> map) {
         return isNull(map) || map.isEmpty();
     }
 
     /**
      * * 判断一个Map是否为空
-     * 
+     *
      * @param map 要判断的Map
      * @return true：非空 false：空
      */
-    public static boolean isNotEmpty(Map<?, ?> map)
-    {
+    public static boolean isNotEmpty(Map<?, ?> map) {
         return !isEmpty(map);
     }
 
     /**
      * * 判断一个字符串是否为空串
-     * 
+     *
      * @param str String
      * @return true：为空 false：非空
      */
-    public static boolean isEmpty(String str)
-    {
+    public static boolean isEmpty(String str) {
         return isNull(str) || NULLSTR.equals(str.trim());
     }
 
     /**
      * * 判断一个字符串是否为非空串
-     * 
+     *
      * @param str String
      * @return true：非空串 false：空串
      */
-    public static boolean isNotEmpty(String str)
-    {
+    public static boolean isNotEmpty(String str) {
         return !isEmpty(str);
     }
 
     /**
      * * 判断一个对象是否为空
-     * 
+     *
      * @param object Object
      * @return true：为空 false：非空
      */
-    public static boolean isNull(Object object)
-    {
+    public static boolean isNull(Object object) {
         return object == null;
     }
 
     /**
      * * 判断一个对象是否非空
-     * 
+     *
      * @param object Object
      * @return true：非空 false：空
      */
-    public static boolean isNotNull(Object object)
-    {
+    public static boolean isNotNull(Object object) {
         return !isNull(object);
     }
 
     /**
      * * 判断一个对象是否是数组类型（Java基本型别的数组）
-     * 
+     *
      * @param object 对象
      * @return true：是数组 false：不是数组
      */
-    public static boolean isArray(Object object)
-    {
+    public static boolean isArray(Object object) {
         return isNotNull(object) && object.getClass().isArray();
     }
 
     /**
      * 去空格
      */
-    public static String trim(String str)
-    {
+    public static String trim(String str) {
         return (str == null ? "" : str.trim());
     }
 
     /**
      * 截取字符串
-     * 
-     * @param str 字符串
+     *
+     * @param str   字符串
      * @param start 开始
      * @return 结果
      */
-    public static String substring(final String str, int start)
-    {
-        if (str == null)
-        {
+    public static String substring(final String str, int start) {
+        if (str == null) {
             return NULLSTR;
         }
 
-        if (start < 0)
-        {
+        if (start < 0) {
             start = str.length() + start;
         }
 
-        if (start < 0)
-        {
+        if (start < 0) {
             start = 0;
         }
-        if (start > str.length())
-        {
+        if (start > str.length()) {
             return NULLSTR;
         }
 
@@ -196,44 +181,36 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
 
     /**
      * 截取字符串
-     * 
-     * @param str 字符串
+     *
+     * @param str   字符串
      * @param start 开始
-     * @param end 结束
+     * @param end   结束
      * @return 结果
      */
-    public static String substring(final String str, int start, int end)
-    {
-        if (str == null)
-        {
+    public static String substring(final String str, int start, int end) {
+        if (str == null) {
             return NULLSTR;
         }
 
-        if (end < 0)
-        {
+        if (end < 0) {
             end = str.length() + end;
         }
-        if (start < 0)
-        {
+        if (start < 0) {
             start = str.length() + start;
         }
 
-        if (end > str.length())
-        {
+        if (end > str.length()) {
             end = str.length();
         }
 
-        if (start > end)
-        {
+        if (start > end) {
             return NULLSTR;
         }
 
-        if (start < 0)
-        {
+        if (start < 0) {
             start = 0;
         }
-        if (end < 0)
-        {
+        if (end < 0) {
             end = 0;
         }
 
@@ -248,15 +225,13 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
      * 通常使用：format("this is {} for {}", "a", "b") -> this is a for b<br>
      * 转义{}： format("this is \\{} for {}", "a", "b") -> this is \{} for a<br>
      * 转义\： format("this is \\\\{} for {}", "a", "b") -> this is \a for b<br>
-     * 
+     *
      * @param template 文本模板，被替换的部分用 {} 表示
-     * @param params 参数值
+     * @param params   参数值
      * @return 格式化后的文本
      */
-    public static String format(String template, Object... params)
-    {
-        if (isEmpty(params) || isEmpty(template))
-        {
+    public static String format(String template, Object... params) {
+        if (isEmpty(params) || isEmpty(template)) {
             return template;
         }
         return StrFormatter.format(template, params);
@@ -265,49 +240,39 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
     /**
      * 驼峰首字符小写 NameVc>>nameVc
      */
-    public static String uncapitalize(String str)
-    {
+    public static String uncapitalize(String str) {
         int strLen;
-        if (str == null || (strLen = str.length()) == 0)
-        {
+        if (str == null || (strLen = str.length()) == 0) {
             return str;
         }
         return new StrBuilder(strLen).append(Character.toLowerCase(str.charAt(0))).append(str.substring(1)).toString();
     }
-    
+
 
     /**
      * 下划线转驼峰命名 nameVc>>name_vc
      */
-    public static String toUnderScoreCase(String s)
-    {
-        if (s == null)
-        {
+    public static String toUnderScoreCase(String s) {
+        if (s == null) {
             return null;
         }
         StringBuilder sb = new StringBuilder();
         boolean upperCase = false;
-        for (int i = 0; i < s.length(); i++)
-        {
+        for (int i = 0; i < s.length(); i++) {
             char c = s.charAt(i);
 
             boolean nextUpperCase = true;
 
-            if (i < (s.length() - 1))
-            {
+            if (i < (s.length() - 1)) {
                 nextUpperCase = Character.isUpperCase(s.charAt(i + 1));
             }
 
-            if ((i > 0) && Character.isUpperCase(c))
-            {
-                if (!upperCase || !nextUpperCase)
-                {
+            if ((i > 0) && Character.isUpperCase(c)) {
+                if (!upperCase || !nextUpperCase) {
                     sb.append(SEPARATOR);
                 }
                 upperCase = true;
-            }
-            else
-            {
+            } else {
                 upperCase = false;
             }
 
@@ -319,53 +284,43 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
 
     /**
      * 是否包含字符串
-     * 
-     * @param str 验证字符串
+     *
+     * @param str  验证字符串
      * @param strs 字符串组
      * @return 包含返回true
      */
-    public static boolean inStringIgnoreCase(String str, String... strs)
-    {
-        if (str != null && strs != null)
-        {
-            for (String s : strs)
-            {
-                if (str.equalsIgnoreCase(trim(s)))
-                {
+    public static boolean inStringIgnoreCase(String str, String... strs) {
+        if (str != null && strs != null) {
+            for (String s : strs) {
+                if (str.equalsIgnoreCase(trim(s))) {
                     return true;
                 }
             }
         }
         return false;
     }
-    
+
     /**
      * 将下划线大写方式命名的字符串转换为驼峰式。如果转换前的下划线大写方式命名的字符串为空，则返回空字符串。 例如：HELLO_WORLD->HelloWorld
-     * 
+     *
      * @param name 转换前的下划线大写方式命名的字符串
      * @return 转换后的驼峰式命名的字符串
      */
-    public static String convertToCamelCase(String name)
-    {
+    public static String convertToCamelCase(String name) {
         StringBuilder result = new StringBuilder();
         // 快速检查
-        if (name == null || name.isEmpty())
-        {
+        if (name == null || name.isEmpty()) {
             // 没必要转换
             return "";
-        }
-        else if (!name.contains("_"))
-        {
+        } else if (!name.contains("_")) {
             // 不含下划线，仅将首字母大写
             return name.substring(0, 1).toUpperCase() + name.substring(1);
         }
         // 用下划线将原始字符串分割
         String[] camels = name.split("_");
-        for (String camel : camels)
-        {
+        for (String camel : camels) {
             // 跳过原始字符串中开头、结尾的下换线或双重下划线
-            if (camel.isEmpty())
-            {
+            if (camel.isEmpty()) {
                 continue;
             }
             // 首字母大写
@@ -374,6 +329,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
         }
         return result.toString();
     }
+
     /**
      * 首字母大写
      *
@@ -384,6 +340,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
         name = name.substring(0, 1).toUpperCase() + name.substring(1);
         return name;
     }
+
     /**
      * 首字母小写
      *
@@ -395,7 +352,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
         return name;
 
     }
-    
+
     /**
      * 将下划线转化为大写
      *
@@ -404,7 +361,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
      * @return
      */
     public static String upperCase_(String name, boolean firstCase) {
-        if(isEmpty(name)){
+        if (isEmpty(name)) {
             return "";
         }
         String[] s = name.split("_");
@@ -412,26 +369,26 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
         for (String s1 : s) {
             stringBuffer.append(s1.substring(0, 1).toUpperCase() + s1.substring(1));
         }
-        if(!firstCase){
+        if (!firstCase) {
             return firstLowerCase(stringBuffer.toString());
         }
         return stringBuffer.toString();
     }
 
-    
 
     /**
      * 列名转换成Java属性名
      */
     public static String columnToJava(String columnName) {
-        return WordUtils.capitalizeFully(columnName, new char[]{'_'}).replace("_", "" );
+        return WordUtils.capitalizeFully(columnName, new char[]{'_'}).replace("_", "");
     }
+
     /**
      * 表名转换成Java类名
      */
     public static String tableToJava(String tableName, String tablePrefix) {
         if (StringUtils.isNotBlank(tablePrefix)) {
-            tableName = tableName.replaceFirst(tablePrefix, "" );
+            tableName = tableName.replaceFirst(tablePrefix, "");
         }
         return columnToJava(tableName);
     }
@@ -441,7 +398,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
         return new BigDecimal(num).setScale(digit, RoundingMode.HALF_UP).doubleValue();
     }
 
-    public static String getUUID(){
+    public static String getUUID() {
         String uuid = UUID.randomUUID().toString().trim().replaceAll("-", "");
         return uuid;
     }

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

@@ -22,6 +22,7 @@ public class BigDecimalUtils {
 
     /**
      * 加法
+     *
      * @param num
      * @param num1
      * @return
@@ -33,6 +34,7 @@ public class BigDecimalUtils {
 
     /**
      * 提供精确的加法运算(默认四舍五入，根据scale保留小数位数)
+     *
      * @param num
      * @param num1
      * @param scale
@@ -45,6 +47,7 @@ public class BigDecimalUtils {
 
     /**
      * 提供精确的加法运算(默认四舍五入，根据scale保留小数位数)
+     *
      * @param add
      * @param add1
      * @param scale
@@ -59,6 +62,7 @@ public class BigDecimalUtils {
 
     /**
      * 减法
+     *
      * @param num
      * @param num1
      * @return
@@ -70,6 +74,7 @@ public class BigDecimalUtils {
 
     /**
      * 提供精确的减法运算(默认四舍五入，根据scale保留小数位数)
+     *
      * @param num
      * @param num1
      * @param scale
@@ -82,6 +87,7 @@ public class BigDecimalUtils {
 
     /**
      * 提供精确的减法运算(默认四舍五入，根据scale保留小数位数)
+     *
      * @param minus
      * @param minus1
      * @return
@@ -95,6 +101,7 @@ public class BigDecimalUtils {
 
     /**
      * 乘法
+     *
      * @param num
      * @param num1
      * @return
@@ -106,6 +113,7 @@ public class BigDecimalUtils {
 
     /**
      * 提供精确的乘法运算(默认四舍五入,保留小数位数根据scale决定)
+     *
      * @param num
      * @param num1
      * @param scale
@@ -120,6 +128,7 @@ public class BigDecimalUtils {
 
     /**
      * 提供精确的乘法运算(默认四舍五入，保留小数位数根据scale确定)
+     *
      * @param num
      * @param num1
      * @param scale
@@ -132,6 +141,7 @@ public class BigDecimalUtils {
 
     /**
      * 除法(除法除不尽会抛异常)
+     *
      * @param num
      * @param num1
      * @return
@@ -143,6 +153,7 @@ public class BigDecimalUtils {
 
     /**
      * 提供精确的除法运算(默认四舍五入保留两位小数)
+     *
      * @param dividend
      * @param divisor
      * @return
@@ -154,6 +165,7 @@ public class BigDecimalUtils {
 
     /**
      * 提供精确的除法运算(默认四舍五入，保留小数位数根据scale决定)
+     *
      * @param dividend
      * @param divisor
      * @param scale
@@ -168,6 +180,7 @@ public class BigDecimalUtils {
 
     /**
      * 提供精确的取余数运算(小数保留位数根据scale决定)
+     *
      * @param dividend
      * @param divisor
      * @param scale
@@ -180,6 +193,7 @@ public class BigDecimalUtils {
 
     /**
      * 提供精确的取余数运算(默认保留两位小数)
+     *
      * @param dividend
      * @param divisor
      * @param scale
@@ -192,6 +206,7 @@ public class BigDecimalUtils {
 
     /**
      * 比较BigDecimal,相等返回0,num>num1返回1,num<num1返回-1
+     *
      * @param num
      * @param num1
      * @return
@@ -203,6 +218,7 @@ public class BigDecimalUtils {
 
     /**
      * BigDecimal货币格式化
+     *
      * @param money
      * @return
      */
@@ -213,6 +229,7 @@ public class BigDecimalUtils {
 
     /**
      * BigDecimal百分比格式化
+     *
      * @param rate
      * @return
      */

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

@@ -19,11 +19,10 @@ import java.util.Set;
  */
 public class ClassUtil {
     /**
-     *
-     * @param object   旧的对象带值
-     * @param addMap   动态需要添加的属性和属性类型
-     * @param addValMap  动态需要添加的属性和属性值
-     * @return  新的对象
+     * @param object    旧的对象带值
+     * @param addMap    动态需要添加的属性和属性类型
+     * @param addValMap 动态需要添加的属性和属性值
+     * @return 新的对象
      * @throws Exception
      */
     public static Object dynamicClass(Object object, LinkedHashMap addMap, LinkedHashMap addValMap) throws Exception {

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

@@ -11,21 +11,22 @@ import java.util.UUID;
  */
 public class CommonUtils {
 
-    public static String getUUID(){
+    public static String getUUID() {
         String uuid = UUID.randomUUID().toString().trim().replaceAll("-", "");
         return uuid;
     }
 
     /**
      * 获取对象所有属性
+     *
      * @param o
      * @return
      */
-    public static String[] getFileName(Object o){
+    public static String[] getFileName(Object o) {
         Field[] fields = o.getClass().getDeclaredFields();
         String[] fieldNames = new String[fields.length];
-        for (int i=0;i<fields.length;i++){
-            fieldNames[i]=fields[i].getName();
+        for (int i = 0; i < fields.length; i++) {
+            fieldNames[i] = fields[i].getName();
         }
         return fieldNames;
 

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

@@ -11,24 +11,24 @@ import java.beans.PropertyDescriptor;
  * @Description : 复制对象工具类
  */
 public class CopyUtils {
-    public static void copy(Object source,Object dest) throws  Exception{
-        BeanInfo sourceBean = Introspector.getBeanInfo(source.getClass(),Object.class);
+    public static void copy(Object source, Object dest) throws Exception {
+        BeanInfo sourceBean = Introspector.getBeanInfo(source.getClass(), Object.class);
         PropertyDescriptor[] sourceProperty = sourceBean.getPropertyDescriptors();
 
-        BeanInfo destBean = Introspector.getBeanInfo(dest.getClass(),Object.class);
+        BeanInfo destBean = Introspector.getBeanInfo(dest.getClass(), Object.class);
         PropertyDescriptor[] destProperty = destBean.getPropertyDescriptors();
 
         try {
-            for (int i=0;i<sourceProperty.length;i++){
-                for (int j=0;j<destProperty.length;j++){
-                    if (sourceProperty[i].getName().equals(destProperty[j].getName()) && sourceProperty[i].getPropertyType() == destProperty[j].getPropertyType()){
-                        destProperty[j].getWriteMethod().invoke(dest,sourceProperty[i].getReadMethod().invoke(source));
+            for (int i = 0; i < sourceProperty.length; i++) {
+                for (int j = 0; j < destProperty.length; j++) {
+                    if (sourceProperty[i].getName().equals(destProperty[j].getName()) && sourceProperty[i].getPropertyType() == destProperty[j].getPropertyType()) {
+                        destProperty[j].getWriteMethod().invoke(dest, sourceProperty[i].getReadMethod().invoke(source));
                         break;
                     }
                 }
             }
-        }catch (Exception e){
-            throw new Exception("属性复制失败："+e.getMessage());
+        } catch (Exception e) {
+            throw new Exception("属性复制失败：" + e.getMessage());
         }
 
     }

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

@@ -18,7 +18,7 @@ import java.util.List;
  * @Date: 2021/10/5 17:35
  * @Description : 日期工具
  */
-public class DateUtils  {
+public class DateUtils {
 
 
     private static final String format = "yyyy-MM-dd";
@@ -40,6 +40,7 @@ public class DateUtils  {
         }
         return null;
     }
+
     public static SimpleDateFormat getFormat() {
 
         SimpleDateFormat df = (SimpleDateFormat) threadLocal.get();
@@ -174,6 +175,7 @@ public class DateUtils  {
 
     /**
      * 获取当年年份
+     *
      * @return
      */
     public static Integer getCurrentYear() {
@@ -182,6 +184,7 @@ public class DateUtils  {
         return year;
 
     }
+
     /**
      * 将时间的时分秒毫秒字段去掉
      *
@@ -401,6 +404,7 @@ public class DateUtils  {
 
     /**
      * 获取当前周的周一的日期
+     *
      * @param date 传入当前日期
      * @return
      */
@@ -422,7 +426,6 @@ public class DateUtils  {
 
     /**
      * 获取指定日期的月初
-     *
      */
     public static Date getFirstAndLastDayOfMonth(Date date) throws Exception {
 
@@ -444,10 +447,11 @@ public class DateUtils  {
 
     /**
      * 获取季度开始
+     *
      * @param date
      * @return
      */
-    public static Date getSeasonStartDate (Date date) {
+    public static Date getSeasonStartDate(Date date) {
         Calendar calendar = Calendar.getInstance();
         calendar.setTime(date);
         int month = calendar.get(Calendar.MONTH);
@@ -505,8 +509,7 @@ public class DateUtils  {
     /**
      * 获取某年第一天日期
      *
-     * @param year
-     *            年份
+     * @param year 年份
      * @return Date
      */
     public static Date getYearFirst(int year) {
@@ -534,7 +537,6 @@ public class DateUtils  {
      * 获取某日期的当月第一天
      *
      * @param date
-     *
      * @return Date
      */
     public static Date getMonthFirst(Date date) {
@@ -543,14 +545,13 @@ public class DateUtils  {
         int month = getMonth(date);
         int year = getYear(date);
         calendar.set(Calendar.YEAR, year);
-        calendar.set(Calendar.MONTH, month-1);
+        calendar.set(Calendar.MONTH, month - 1);
         calendar.set(Calendar.DAY_OF_MONTH, calendar.getActualMinimum(Calendar.DAY_OF_MONTH));
         Date currYearFirst = calendar.getTime();
         return currYearFirst;
     }
 
 
-
     /**
      * 获取当前月的第一天
      *
@@ -647,7 +648,6 @@ public class DateUtils  {
     }
 
 
-
     public static List<Date> getBetweenDates(Date start, Date end) {
         List<Date> result = new ArrayList<Date>();
         Calendar tempStart = Calendar.getInstance();
@@ -667,9 +667,10 @@ public class DateUtils  {
 
     /**
      * 获取上月最后一天
+     *
      * @return
      */
-    public static Date getYestmonthLastday(Date date){
+    public static Date getYestmonthLastday(Date date) {
         Calendar calendar = Calendar.getInstance();
         calendar.setTime(date);
         calendar.add(Calendar.MONTH, -1);
@@ -679,7 +680,6 @@ public class DateUtils  {
     }
 
 
-
     /**
      * 转换Edna时间格式为标准格式
      *
@@ -779,13 +779,13 @@ public class DateUtils  {
      * 获取两个日期之间的所有日期(字符串格式, 按天计算)
      *
      * @param startTime String 开始时间 yyyy-MM-dd
-     * @param endTime  String 结束时间 yyyy-MM-dd
+     * @param endTime   String 结束时间 yyyy-MM-dd
      * @return
      */
     public static List<String> getBetweenDays(String startTime, String endTime) throws ParseException {
 
         //1、定义转换格式
-        SimpleDateFormat df  = new SimpleDateFormat("yyyy-MM-dd");
+        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
 
         Date start = df.parse(startTime);
         Date end = df.parse(endTime);
@@ -806,15 +806,17 @@ public class DateUtils  {
         }
         return result;
     }
+
     public static String convertEdnaTime(String pointTime) {
         return convertEdnaTime2(pointTime, false);
     }
 
     /**
      * 获取昨天凌晨时间
+     *
      * @return
      */
-    public static Date getYesterdayStart () throws ParseException {
+    public static Date getYesterdayStart() throws ParseException {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         Date date = new Date();
@@ -828,18 +830,20 @@ public class DateUtils  {
 
         StringBuffer time = new StringBuffer();
 
-        String dateString  = format.format(date);
+        String dateString = format.format(date);
 
         time.append(dateString).append(" ").append("00:00:00");
 
         return sdf.parse(time.toString());
 
     }
+
     /**
      * 时间减去一年
+     *
      * @return
      */
-    public static Date subOneYear (Date date) throws ParseException {
+    public static Date subOneYear(Date date) throws ParseException {
 
         Calendar calendar = Calendar.getInstance();
         calendar.setTime(date);
@@ -850,9 +854,10 @@ public class DateUtils  {
 
     /**
      * 获取昨天最后时间
+     *
      * @return
      */
-    public static Date getYesterdayEnd () throws ParseException {
+    public static Date getYesterdayEnd() throws ParseException {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         Date date = new Date();
         Calendar calendar = Calendar.getInstance();
@@ -865,14 +870,16 @@ public class DateUtils  {
 
         StringBuffer time = new StringBuffer();
 
-        String dateString  = format.format(date);
+        String dateString = format.format(date);
 
         time.append(dateString).append(" ").append("23:59:59");
 
         return sdf.parse(time.toString());
     }
+
     /**
      * 获取SimpleDateFormat
+     *
      * @param parttern 日期格式
      * @return SimpleDateFormat对象
      * @throws RuntimeException 异常：非法日期格式
@@ -883,6 +890,7 @@ public class DateUtils  {
 
     /**
      * 获取昨天日期
+     *
      * @param format
      * @return
      */
@@ -894,9 +902,10 @@ public class DateUtils  {
 
     /**
      * z获取前一天
+     *
      * @return
      */
-    public static Date getYestday(Date date){
+    public static Date getYestday(Date date) {
         Calendar calendar = Calendar.getInstance();
         calendar.setTime(date);
         calendar.add(Calendar.DATE, -1);
@@ -907,7 +916,8 @@ public class DateUtils  {
 
     // 获得某天最大时间 2020-02-19 23:59:59
     public static Date getEndOfDay(Date date) {
-        LocalDateTime localDateTime = LocalDateTime.ofInstant(Instant.ofEpochMilli(date.getTime()), ZoneId.systemDefault());;
+        LocalDateTime localDateTime = LocalDateTime.ofInstant(Instant.ofEpochMilli(date.getTime()), ZoneId.systemDefault());
+        ;
         LocalDateTime endOfDay = localDateTime.with(LocalTime.MAX);
         return Date.from(endOfDay.atZone(ZoneId.systemDefault()).toInstant());
     }
@@ -918,12 +928,14 @@ public class DateUtils  {
         LocalDateTime startOfDay = localDateTime.with(LocalTime.MIN);
         return Date.from(startOfDay.atZone(ZoneId.systemDefault()).toInstant());
     }
+
     public static void main(String[] args) {
         System.out.println(DateUtils.getMonthDays(DateUtils.today()));
     }
 
     /**
      * 获取连个日期间的所有日期
+     *
      * @param startTime
      * @param endTime
      * @return
@@ -959,11 +971,12 @@ public class DateUtils  {
     public static int getMonth(Date date) {
         Calendar cd = Calendar.getInstance();
         cd.setTime(date);
-        return cd.get(Calendar.MONTH)+1;
+        return cd.get(Calendar.MONTH) + 1;
     }
 
     /**
      * 用于从日期对象中获取月份的字符串形式
+     *
      * @param date
      * @return
      */
@@ -974,6 +987,7 @@ public class DateUtils  {
         int month = calendar.get(Calendar.MONTH) + 1;
         return (month);
     }
+
     /**
      * 获得指定时间的年数
      *
@@ -990,7 +1004,6 @@ public class DateUtils  {
      * 获取某日期的当月最后一天
      *
      * @param date
-     *
      * @return Date
      */
     public static Date getMonthLast(Date date) {
@@ -999,7 +1012,7 @@ public class DateUtils  {
         int month = getMonth(date);
         int year = getYear(date);
         calendar.set(Calendar.YEAR, year);
-        calendar.set(Calendar.MONTH, month-1);
+        calendar.set(Calendar.MONTH, month - 1);
         calendar.set(Calendar.DAY_OF_MONTH, calendar.getActualMaximum(Calendar.DAY_OF_MONTH));
         Date currYearFirst = calendar.getTime();
         return currYearFirst;
@@ -1007,20 +1020,22 @@ public class DateUtils  {
 
     /**
      * 获取当天0点
+     *
      * @return
      */
-    public static Date getSamedayZero(){
+    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);
+        calendar.set(Calendar.MILLISECOND, 0);
         return calendar.getTime();
     }
 
     /**
      * 获取前一天23点59分59秒
+     *
      * @return
      */
     public static Date geteleven() {
@@ -1032,76 +1047,82 @@ public class DateUtils  {
         calendar.set(Calendar.MILLISECOND, 0);
         return calendar.getTime();
     }
-    public static Date getSamedayZero(String date){
+
+    public static Date getSamedayZero(String date) {
         Calendar calendar = Calendar.getInstance();
         calendar.setTime(parseDate(date));
         calendar.set(Calendar.HOUR_OF_DAY, 0);
         calendar.set(Calendar.MINUTE, 0);
         calendar.set(Calendar.SECOND, 0);
-        calendar.set(Calendar.MILLISECOND,0);
+        calendar.set(Calendar.MILLISECOND, 0);
         return calendar.getTime();
     }
 
     /**
      * 获取当月第一天0点
+     *
      * @return
      */
-    public static Date getMonthFirstZero(){
+    public static Date getMonthFirstZero() {
         Calendar calendar = Calendar.getInstance();
-        calendar.set(Calendar.DAY_OF_MONTH,1);
+        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);
+        calendar.set(Calendar.MILLISECOND, 0);
         return calendar.getTime();
     }
-    public static Date getMonthFirstZero(String date){
+
+    public static Date getMonthFirstZero(String date) {
         Calendar calendar = Calendar.getInstance();
         calendar.setTime(parseDate(date));
-        calendar.set(Calendar.DAY_OF_MONTH,1);
+        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);
+        calendar.set(Calendar.MILLISECOND, 0);
         return calendar.getTime();
     }
 
     /**
      * 获取当年第一天0点
+     *
      * @return
      */
-    public static Date getYearFirstZero(){
+    public static Date getYearFirstZero() {
         Calendar calendar = Calendar.getInstance();
         int year = calendar.get(Calendar.YEAR);
         calendar.set(Calendar.YEAR, year);
-        calendar.set(Calendar.MONTH,0);
-        calendar.set(Calendar.DAY_OF_MONTH,1);
+        calendar.set(Calendar.MONTH, 0);
+        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);
+        calendar.set(Calendar.MILLISECOND, 0);
         return calendar.getTime();
     }
-    public static Date getYearFirstZero(String date){
+
+    public static Date getYearFirstZero(String date) {
         Calendar calendar = Calendar.getInstance();
         calendar.setTime(parseDate(date));
         int year = calendar.get(Calendar.YEAR);
         calendar.set(Calendar.YEAR, year);
-        calendar.set(Calendar.MONTH,0);
-        calendar.set(Calendar.DAY_OF_MONTH,1);
+        calendar.set(Calendar.MONTH, 0);
+        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);
+        calendar.set(Calendar.MILLISECOND, 0);
         return calendar.getTime();
     }
 
     /**
      * 获取当前日期小时数
+     *
      * @param
      * @return
      */
-    public static int getCurrentHour(){
+    public static int getCurrentHour() {
         Calendar calendar = Calendar.getInstance();
         int i = calendar.get(Calendar.HOUR_OF_DAY);
         return i;
@@ -1109,6 +1130,7 @@ public class DateUtils  {
 
     /**
      * 判断是否为当天日期
+     *
      * @param inputJudgeDate
      * @return
      */
@@ -1141,13 +1163,13 @@ public class DateUtils  {
     /**
      * 判断日期是否为本月1号
      */
-    public static boolean isFirstDayOfMonth(Date date){
+    public static boolean isFirstDayOfMonth(Date date) {
         Calendar cal = Calendar.getInstance();
         cal.setTime(date);
-        cal.set(Calendar.DATE,cal.get(Calendar.DATE)+1);
-        if (cal.get(Calendar.DAY_OF_MONTH) == 2){
+        cal.set(Calendar.DATE, cal.get(Calendar.DATE) + 1);
+        if (cal.get(Calendar.DAY_OF_MONTH) == 2) {
             return true;
-        }else {
+        } else {
             return false;
         }
     }
@@ -1155,13 +1177,13 @@ public class DateUtils  {
     /**
      * 判断日期是否为当年第一天
      */
-    public static boolean isFirstDayOfYear(Date date){
+    public static boolean isFirstDayOfYear(Date date) {
         Calendar cal = Calendar.getInstance();
         cal.setTime(date);
-        int month = cal.get(Calendar.MONTH)+1;
-        if (month == 1 && isFirstDayOfMonth(date)){
+        int month = cal.get(Calendar.MONTH) + 1;
+        if (month == 1 && isFirstDayOfMonth(date)) {
             return true;
-        }else {
+        } else {
             return false;
         }
     }

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

@@ -12,6 +12,7 @@ public class DoubleUtils {
 
     /**
      * 保留两位小数
+     *
      * @param number
      * @param precision
      * @return
@@ -25,23 +26,24 @@ public class DoubleUtils {
     /**
      * double保留小数点位数，四舍五入
      * 比如处理价格等数据
+     *
      * @param d 要处理的double值
      * @param n 要保留的位数
      * @return
      */
-    public static double getRoundingNum(double d , int n) {
+    public static double getRoundingNum(double d, int n) {
         BigDecimal b = new BigDecimal(String.valueOf(d));
         b = b.divide(BigDecimal.ONE, n, BigDecimal.ROUND_HALF_UP);
         return b.doubleValue();
     }
+
     /**
-     *
-     * @param numA 数字A
-     * @param numB 数字B
+     * @param numA    数字A
+     * @param numB    数字B
      * @param operate 运算符
      * @return
      */
-    public static double GetResult(double numA, double numB, String operate){
+    public static double GetResult(double numA, double numB, String operate) {
         double res = 0;
         BigDecimal bigA = new BigDecimal(Double.toString(numA));
         BigDecimal bigB = new BigDecimal(Double.toString(numB));
@@ -57,9 +59,9 @@ public class DoubleUtils {
                 res = bigA.multiply(bigB).doubleValue();
                 break;
             case "/":
-                res = bigA.divide(bigB,2,BigDecimal.ROUND_HALF_UP).doubleValue();
+                res = bigA.divide(bigB, 2, BigDecimal.ROUND_HALF_UP).doubleValue();
                 break;
-            default :
+            default:
                 System.out.println("运算符不合法~");
                 break;
         }
@@ -67,60 +69,62 @@ public class DoubleUtils {
     }
 
 
-    public static Double sum(Double ...in){
+    public static Double sum(Double... in) {
         Double result = 0.0;
-        for (int i = 0; i < in.length; i++){
-            result = result+(ifNullSet0(in[i]));
+        for (int i = 0; i < in.length; i++) {
+            result = result + (ifNullSet0(in[i]));
         }
         return result;
     }
 
-    public static String hb(String ...in){
+    public static String hb(String... in) {
         String result = "";
-        for (int i = 0; i < in.length; i++){
-            result = result+in[i];
+        for (int i = 0; i < in.length; i++) {
+            result = result + in[i];
         }
         return result;
     }
 
-    public static Integer sum(Integer ...in) {
+    public static Integer sum(Integer... in) {
         Integer result = 0;
-        for (int i = 0; i < in.length; i++){
-            result = result+(ifNullSet0(in[i]));
+        for (int i = 0; i < in.length; i++) {
+            result = result + (ifNullSet0(in[i]));
         }
         return result;
     }
 
-    public static Double max(Double ...in){
+    public static Double max(Double... in) {
         Double result = 0.0;
-        for (int i = 0; i < in.length; i++){
-            if (result<ifNullSet0(in[i])){
-                result=ifNullSet0(in[i]);
+        for (int i = 0; i < in.length; i++) {
+            if (result < ifNullSet0(in[i])) {
+                result = ifNullSet0(in[i]);
             }
         }
         return result;
     }
 
-    public static Double min(Double ...in){
+    public static Double min(Double... in) {
         Double result = 0.0;
-        for (int i = 0; i < in.length; i++){
-            if (i==0){
-                result=ifNullSet0(in[0]);
+        for (int i = 0; i < in.length; i++) {
+            if (i == 0) {
+                result = ifNullSet0(in[0]);
             }
-            if (result>ifNullSet0(in[i])){
-                result=ifNullSet0(in[i]);
+            if (result > ifNullSet0(in[i])) {
+                result = ifNullSet0(in[i]);
             }
         }
         return result;
     }
-    public static Double ave(Double ...in){
-        if(in.length==0){
+
+    public static Double ave(Double... in) {
+        if (in.length == 0) {
             return 0.0;
-        }else{
-            return sum(in)/in.length;
+        } else {
+            return sum(in) / in.length;
         }
 
     }
+
     public static Double ifNullSet0(Double in) {
         if (in != null) {
             return in;

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

@@ -21,6 +21,7 @@ public class JSONUtil {
      * 将对象转换成json字符串。
      * <p>Title: pojoToJson</p>
      * <p>Description: </p>
+     *
      * @param data
      * @return
      */
@@ -41,9 +42,9 @@ public class JSONUtil {
      * @param beanType 对象中的object类型
      * @return
      */
-    public static <T> T jsonToPojo(String jsonData,Class<T> beanType) {
+    public static <T> T jsonToPojo(String jsonData, Class<T> beanType) {
         try {
-            T t = MAPPER.readValue(jsonData,beanType);
+            T t = MAPPER.readValue(jsonData, beanType);
             return t;
         } catch (Exception e) {
             e.printStackTrace();
@@ -55,14 +56,15 @@ public class JSONUtil {
      * 将json数据转换成pojo对象list
      * <p>Title: jsonToList</p>
      * <p>Description: </p>
+     *
      * @param jsonData
      * @param beanType
      * @return
      */
     public static <T> List<T> jsonToList(String jsonData, Class<T> beanType) {
-        JavaType javaType = MAPPER.getTypeFactory().constructParametricType(List.class,beanType);
+        JavaType javaType = MAPPER.getTypeFactory().constructParametricType(List.class, beanType);
         try {
-            List<T> list = MAPPER.readValue(jsonData,javaType);
+            List<T> list = MAPPER.readValue(jsonData, javaType);
             return list;
         } catch (Exception e) {
             e.printStackTrace();

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

@@ -18,7 +18,7 @@ import java.util.Map;
  */
 public class JSONUtils {
     public enum LetterType {
-        UPPERCASE(1),LOWERCASE(2);
+        UPPERCASE(1), LOWERCASE(2);
         private final int type;
 
         private LetterType(int type) {
@@ -32,17 +32,18 @@ public class JSONUtils {
 
     /**
      * json字符串转换javabean
+     *
      * @param json json字符串
      * @param bean 对象.class
      * @return T
      * @throws IOException
      * @throws JsonMappingException
      * @throws JsonParseException
-     * */
+     */
     @SuppressWarnings("unchecked")
-    public static <T> T jsonStrToJava(String json,Class<?> bean) throws JsonParseException, JsonMappingException, IOException{
+    public static <T> T jsonStrToJava(String json, Class<?> bean) throws JsonParseException, JsonMappingException, IOException {
         ObjectMapper objectMapper = new ObjectMapper();
-        if(json.indexOf("/Date(")>0) {
+        if (json.indexOf("/Date(") > 0) {
             json = JSONUtils.jsonDateToJavaDate(json);
         }
         return (T) objectMapper.readValue(json, bean);
@@ -50,22 +51,23 @@ public class JSONUtils {
 
     /**
      * json字符串转换javabean
-     * @param json json字符串
-     * @param bean 对象.class
+     *
+     * @param json       json字符串
+     * @param bean       对象.class
      * @param toggleCase 是否转换key的大小写
      * @param letterType 转换枚举类 UPPERCASE-大写、LOWERCASE-小写
      * @return T
      * @throws IOException
      * @throws JsonMappingException
      * @throws JsonParseException
-     * */
+     */
     @SuppressWarnings("unchecked")
-    public static <T> T jsonStrToJava(String json,Class<?> bean,boolean toggleCase,LetterType letterType) throws JsonParseException, JsonMappingException, IOException{
+    public static <T> T jsonStrToJava(String json, Class<?> bean, boolean toggleCase, LetterType letterType) throws JsonParseException, JsonMappingException, IOException {
         ObjectMapper objectMapper = new ObjectMapper();
-        if(toggleCase) {
-            json = JSONUtils.convertLetter(json,letterType);
+        if (toggleCase) {
+            json = JSONUtils.convertLetter(json, letterType);
         }
-        if(json.indexOf("/Date(")>0) {
+        if (json.indexOf("/Date(") > 0) {
             json = JSONUtils.jsonDateToJavaDate(json);
         }
         return (T) objectMapper.readValue(json, bean);
@@ -73,19 +75,20 @@ public class JSONUtils {
 
     /**
      * json字符串转换key的大小写
-     * @param json json字符串
+     *
+     * @param json       json字符串
      * @param letterType 转换枚举类 UPPERCASE-大写、LOWERCASE-小写
      * @return json字符串
      * @throws IOException
      * @throws JsonMappingException
      * @throws JsonParseException
-     * */
-    public static String convertLetter(String json,LetterType letterType) throws JsonParseException, JsonMappingException, IOException {
-        Map<String,String> map = JSONUtils.jsonStrToJava(json, Map.class);
+     */
+    public static String convertLetter(String json, LetterType letterType) throws JsonParseException, JsonMappingException, IOException {
+        Map<String, String> map = JSONUtils.jsonStrToJava(json, Map.class);
         for (Map.Entry<String, String> entry : map.entrySet()) {
-            if(letterType.getType()==1) {
+            if (letterType.getType() == 1) {
                 map.put(entry.getKey().toUpperCase(), entry.getValue());
-            }else {
+            } else {
                 map.put(entry.getKey().toLowerCase(), entry.getValue());
             }
             map.remove(entry.getKey());
@@ -94,10 +97,11 @@ public class JSONUtils {
     }
 
     /**
-     *  javabean转换json字符串
+     * javabean转换json字符串
+     *
      * @return
      * @throws JsonProcessingException
-     * */
+     */
     public static String javaToJson(Object bean) throws JsonProcessingException {
         ObjectMapper objectMapper = new ObjectMapper();
         String json = objectMapper.writeValueAsString(bean);
@@ -105,17 +109,18 @@ public class JSONUtils {
     }
 
     /**
-     *  json字符串中存在Date(1558427619277+0800)类似的时间格式进行转换
-     *  @param    json json字符串
-     * @return     json json字符串
+     * json字符串中存在Date(1558427619277+0800)类似的时间格式进行转换
+     *
+     * @param json json字符串
+     * @return json json字符串
      * @throws JsonProcessingException
-     * */
+     */
     public static String jsonDateToJavaDate(String json) throws JsonParseException, JsonMappingException, IOException {
-        Map<String,String> map = JSONUtils.jsonStrToJava(json, Map.class);
+        Map<String, String> map = JSONUtils.jsonStrToJava(json, Map.class);
         for (Map.Entry<String, String> entry : map.entrySet()) {
-            if(entry.getValue().indexOf("/Date(")>0) {
-                String dateJSON = entry.getValue().replace("/Date(","").replace(")/","");
-                Long dateLong = Long.valueOf(dateJSON.substring(0, dateJSON.length()-5));
+            if (entry.getValue().indexOf("/Date(") > 0) {
+                String dateJSON = entry.getValue().replace("/Date(", "").replace(")/", "");
+                Long dateLong = Long.valueOf(dateJSON.substring(0, dateJSON.length() - 5));
                 Date date = new Date(dateLong);
                 SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                 map.put(entry.getKey(), format.format(date));

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

@@ -27,11 +27,12 @@ public class JwtUtil {
 
     /**
      * 生成jwt字符串，30分钟后过期  JWT（json web token）
+     *
      * @param userId
      * @param info
      * @return
      */
-    public static String sign(String userId, Map<String,Object> info) {
+    public static String sign(String userId, Map<String, Object> info) {
         try {
             Date date = new Date(System.currentTimeMillis() + EXPIRE_TIME);
             Algorithm algorithm = Algorithm.HMAC256(SECRET);
@@ -39,12 +40,12 @@ public class JwtUtil {
                     //将userId保存在token里面
                     .withAudience(userId)
                     //存放自定义数据
-                    .withClaim("info",info)
+                    .withClaim("info", info)
                     //30分钟后token过期
                     .withExpiresAt(date)
                     //token的密钥
                     .sign(algorithm);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return null;
         }
@@ -52,6 +53,7 @@ public class JwtUtil {
 
     /**
      * 根据token获取userId
+     *
      * @param token
      * @return
      */
@@ -59,36 +61,38 @@ public class JwtUtil {
         try {
             String userId = JWT.decode(token).getAudience().get(0);
             return userId;
-        }catch (JWTDecodeException e){
+        } catch (JWTDecodeException e) {
             return null;
         }
     }
 
     /**
      * 根据token获取自定义数据info
+     *
      * @param token
      * @return
      */
-    public static Map<String,Object> getInfo(String token){
+    public static Map<String, Object> getInfo(String token) {
         try {
             return JWT.decode(token).getClaim("info").asMap();
-        }catch (JWTDecodeException e){
+        } catch (JWTDecodeException e) {
             return null;
         }
     }
 
     /**
      * 校验token
+     *
      * @param token
      * @return
      */
-    public static boolean checkSign(String token){
+    public static boolean checkSign(String token) {
         try {
             Algorithm algorithm = Algorithm.HMAC256(SECRET);
             JWTVerifier verifier = JWT.require(algorithm).build();
             verifier.verify(token);
             return true;
-        }catch (JWTVerificationException e){
+        } catch (JWTVerificationException e) {
             throw new RuntimeException("token 无效，请重新获取");
         }
 

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

@@ -15,13 +15,13 @@ public class MD5Utils {
         try {
             MessageDigest md5 = MessageDigest.getInstance("md5");
             digest = md5.digest(str.getBytes("utf-8"));
-        }catch (NoSuchAlgorithmException e){
+        } catch (NoSuchAlgorithmException e) {
             e.printStackTrace();
-        }catch (UnsupportedEncodingException e){
+        } catch (UnsupportedEncodingException e) {
             e.printStackTrace();
         }
         //16是表示转换16进制数
-        String md5str = new BigInteger(1,digest).toString(16);
+        String md5str = new BigInteger(1, digest).toString(16);
         return md5str;
 
     }

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

@@ -9,7 +9,7 @@ import java.lang.reflect.Field;
 
 public class ReflexUtil {
 
-    public static Object getFieldValueByObject(Object object,String targetFieldName) throws Exception{
+    public static Object getFieldValueByObject(Object object, String targetFieldName) throws Exception {
         //获取该对象的class
         Class objClass = object.getClass();
         //初始化返回时
@@ -18,15 +18,15 @@ public class ReflexUtil {
         //获取所有的属性数组
         Field[] fields = objClass.getDeclaredFields();
 
-        for (Field field : fields){
+        for (Field field : fields) {
             //属性名称
             String currentFieldName = "";
 
             try {
                 boolean has_JsonProperty = field.isAnnotationPresent(JsonProperty.class);
-                if (has_JsonProperty){
+                if (has_JsonProperty) {
                     currentFieldName = field.getAnnotation(JsonProperty.class).value();
-                }else {
+                } else {
                     currentFieldName = field.getName();
                 }
 
@@ -36,11 +36,11 @@ public class ReflexUtil {
 
                     return result;
                 }
-            }catch (SecurityException e) {
+            } catch (SecurityException e) {
                 e.printStackTrace();
-            }catch (IllegalArgumentException e){
+            } catch (IllegalArgumentException e) {
                 e.printStackTrace();
-            }catch (IllegalAccessException e){
+            } catch (IllegalAccessException e) {
                 e.printStackTrace();
             }
         }

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

@@ -1,6 +1,5 @@
 package com.gyee.common.util;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
@@ -29,7 +28,8 @@ public class RestTemplateUtil {
 
     /**
      * * GET请求
-     * @param url 请求路径
+     *
+     * @param url   请求路径
      * @param token jwt所需的Token不需要可传null
      * @return
      */
@@ -49,8 +49,9 @@ public class RestTemplateUtil {
 
     /**
      * * POST请求
-     * @param url 请求路径
-     * @param data body数据
+     *
+     * @param url   请求路径
+     * @param data  body数据
      * @param token jwt所需的Token不需要可传null
      * @return
      */
@@ -68,22 +69,22 @@ public class RestTemplateUtil {
 
 
     public static void main(String[] args) {
-//        //Get接口调用
-//        String url="http://www.kuaidi100.com/query?type=yuantong&postid=11111111111";
-//        String responseInfo = RestTemplateUtil.get(url, null);
-//        System.out.println(responseInfo);
-//
-//        //Post接口调用
-//        String Url="http://localhost:8080/login/doLogin";
-//        ObjectMapper objectMapper = new ObjectMapper();
-//        String data = null;
-//        UserLogin userLogin=new UserLogin("clover","12345","weq");
-//        try {
-//            data = objectMapper.writeValueAsString(userLogin);
-//        } catch (JsonProcessingException e) {
-//            e.printStackTrace();
-//        }
-//        String responseInfo2 = RestTemplateUtil.post(Url, data, null);
-//        System.out.println(responseInfo2);
+        //        //Get接口调用
+        //        String url="http://www.kuaidi100.com/query?type=yuantong&postid=11111111111";
+        //        String responseInfo = RestTemplateUtil.get(url, null);
+        //        System.out.println(responseInfo);
+        //
+        //        //Post接口调用
+        //        String Url="http://localhost:8080/login/doLogin";
+        //        ObjectMapper objectMapper = new ObjectMapper();
+        //        String data = null;
+        //        UserLogin userLogin=new UserLogin("clover","12345","weq");
+        //        try {
+        //            data = objectMapper.writeValueAsString(userLogin);
+        //        } catch (JsonProcessingException e) {
+        //            e.printStackTrace();
+        //        }
+        //        String responseInfo2 = RestTemplateUtil.post(Url, data, null);
+        //        System.out.println(responseInfo2);
     }
 }

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

@@ -21,10 +21,8 @@ public class SortUtils {
     /**
      * 对list中的元素按升序排列.
      *
-     * @param list
-     *            排序集合
-     * @param field
-     *            排序字段
+     * @param list  排序集合
+     * @param field 排序字段
      * @return
      */
     public static List<?> sort(List<?> list, final String field) {
@@ -34,15 +32,12 @@ public class SortUtils {
     /**
      * 对list中的元素进行排序.
      *
-     * @param list
-     *            排序集合
-     * @param field
-     *            排序字段
-     * @param sort
-     *            排序方式: SortListUtil.DESC(降序) SortListUtil.ASC(升序).
+     * @param list  排序集合
+     * @param field 排序字段
+     * @param sort  排序方式: SortListUtil.DESC(降序) SortListUtil.ASC(升序).
      * @return
      */
-    @SuppressWarnings({ "unchecked", "rawtypes" })
+    @SuppressWarnings({"unchecked", "rawtypes"})
     public static List<?> sort(List<?> list, final String field,
                                final String sort) {
         Collections.sort(list, new Comparator() {
@@ -98,15 +93,12 @@ public class SortUtils {
      * 对list中的元素按fields和sorts进行排序,
      * fields[i]指定排序字段,sorts[i]指定排序方式.如果sorts[i]为空则默认按升序排列.
      *
-     * @param list
-     *            排序集合
-     * @param fields
-     *            排序字段-数组（一个或多个）
-     * @param sorts
-     *            排序规则-数组（一个或多个）
+     * @param list   排序集合
+     * @param fields 排序字段-数组（一个或多个）
+     * @param sorts  排序规则-数组（一个或多个）
      * @return
      */
-    @SuppressWarnings({ "unchecked", "rawtypes" })
+    @SuppressWarnings({"unchecked", "rawtypes"})
     public static List<?> sort(List<?> list, String[] fields, String[] sorts) {
         if (fields != null && fields.length > 0) {
             for (int i = fields.length - 1; i >= 0; i--) {
@@ -171,10 +163,8 @@ public class SortUtils {
     /**
      * 默认按正序排列
      *
-     * @param list
-     *            排序集合
-     * @param method
-     *            排序方法 "getXxx()"
+     * @param list   排序集合
+     * @param method 排序方法 "getXxx()"
      * @return
      */
     public static List<?> sortByMethod(List<?> list, final String method) {
@@ -184,15 +174,12 @@ public class SortUtils {
     /**
      * 集合排序
      *
-     * @param list
-     *            排序集合
-     * @param method
-     *            排序方法 "getXxx()"
-     * @param sort
-     *            排序方式: SortListUtil.DESC(降序) SortListUtil.ASC(升序).
+     * @param list   排序集合
+     * @param method 排序方法 "getXxx()"
+     * @param sort   排序方式: SortListUtil.DESC(降序) SortListUtil.ASC(升序).
      * @return
      */
-    @SuppressWarnings({ "unchecked", "rawtypes" })
+    @SuppressWarnings({"unchecked", "rawtypes"})
     public static List<?> sortByMethod(List<?> list, final String method,
                                        final String sort) {
         Collections.sort(list, new Comparator() {

common/src/main/java/com/gyee/common/util/algorithm/GDJTLineBuild.java

@@ -12,39 +12,33 @@ import java.util.*;
  */
 public class GDJTLineBuild {
 
-    public static List<PointVo> buildLine(double[] arrX, double[] arrY)
-    {
+    public static List<PointVo> buildLine(double[] arrX, double[] arrY) {
         List<PointVo> points = new ArrayList<>();
 
-        if (arrX.length != arrY.length)
-        {
+        if (arrX.length != arrY.length) {
             return points;
         }
 
-        Map<Double,Double> pointsDic = new HashMap<>();
-        Map<Double,Integer> pointsjs = new HashMap<>();
+        Map<Double, Double> pointsDic = new HashMap<>();
+        Map<Double, Integer> pointsjs = new HashMap<>();
 
-        for (int i = 0; i < arrX.length; i++)
-        {
-            if (pointsDic.containsKey(arrX[i]))
-            {
+        for (int i = 0; i < arrX.length; i++) {
+            if (pointsDic.containsKey(arrX[i])) {
                 Double x = pointsDic.get(arrX[i]);
-                x+=arrY[i];
-                pointsDic.put(arrX[i],x);
+                x += arrY[i];
+                pointsDic.put(arrX[i], x);
                 Integer js = pointsjs.get(arrX[i]);
                 js++;
-                pointsjs.put(arrX[i],js);
-            }
-            else
-            {
+                pointsjs.put(arrX[i], js);
+            } else {
                 pointsDic.put(arrX[i], arrY[i]);
                 pointsjs.put(arrX[i], 1);
             }
         }
 
         Set<Double> keys = pointsDic.keySet();
-        for (Double key : keys){
-            double b=pointsDic.get(key)/ pointsjs.get(key);
+        for (Double key : keys) {
+            double b = pointsDic.get(key) / pointsjs.get(key);
             PointVo p = new PointVo();
             p.setX(key);
             p.setY(b);

common/src/main/java/com/gyee/common/util/algorithm/LineBuild.java

@@ -22,55 +22,47 @@ public class LineBuild {
     /// <param name="dimension">方程的最高次数</param>
     /// <param name="scale">曲线的刻度</param>
     /// <returns></returns>
-    public static List<PointVo> buildLine(double[] arrX, double[] arrY, int length, int dimension, double scale)
-    {
+    public static List<PointVo> buildLine(double[] arrX, double[] arrY, int length, int dimension, double scale) {
 
         List<PointVo> points = new ArrayList<>();
 
-        if (arrX.length != arrY.length || arrX.length<3)
-        {
+        if (arrX.length != arrY.length || arrX.length < 3) {
             return points;
         }
 
-        double minValue=arrY[0];
-        double maxValue=arrY[arrY.length-1];
+        double minValue = arrY[0];
+        double maxValue = arrY[arrY.length - 1];
 
 
         double min = 0;
-        double max= 0;
+        double max = 0;
 
         double[] coefficient = multiLine(arrX, arrY, length, dimension);
 
-        for (double i = arrX[0]; i <= arrX[arrX.length - 1]; i += scale)
-        {
+        for (double i = arrX[0]; i <= arrX[arrX.length - 1]; i += scale) {
             PointVo point = new PointVo();
-            point.setX(StringUtils.round(i,2));
+            point.setX(StringUtils.round(i, 2));
 
 
-            for (int j = 0; j < coefficient.length; j++)
-            {
+            for (int j = 0; j < coefficient.length; j++) {
                 Double y = point.getY();
-                if (y==null){
-                    y=0.0;
+                if (y == null) {
+                    y = 0.0;
                 }
-                y += (float)(coefficient[j] * Math.pow((double)point.getX(), (double)j));
+                y += (float) (coefficient[j] * Math.pow((double) point.getX(), (double) j));
                 point.setY(y);
             }
-            if (point.getY() < minValue)
-            {
+            if (point.getY() < minValue) {
                 point.setY(minValue);
             }
-            if (point.getY() > maxValue)
-            {
+            if (point.getY() > maxValue) {
                 point.setY(maxValue);
             }
 
-            if (point.getY() < min)
-            {
+            if (point.getY() < min) {
                 min = point.getY();
             }
-            if (point.getY() > max)
-            {
+            if (point.getY() > max) {
                 max = point.getY();
             }
 
@@ -80,35 +72,24 @@ public class LineBuild {
         return points;
     }
 
-    private static void builder(List<PointVo> points, double min, double max)
-    {
+    private static void builder(List<PointVo> points, double min, double max) {
         boolean b = false;
-        for (int i = 0; i < points.size(); i++)
-        {
-            if (b)
-            {
+        for (int i = 0; i < points.size(); i++) {
+            if (b) {
                 points.get(i).setY(max);
-            }
-            else
-            {
-                if (max == points.get(i).getY())
-                {
+            } else {
+                if (max == points.get(i).getY()) {
                     b = true;
                 }
             }
 
         }
 
-        for (int i = points.size()-1; i > -1; i--)
-        {
-            if (!b)
-            {
+        for (int i = points.size() - 1; i > -1; i--) {
+            if (!b) {
                 points.get(i).setY(min);
-            }
-            else
-            {
-                if (min ==points.get(i).getY())
-                {
+            } else {
+                if (min == points.get(i).getY()) {
                     b = false;
                 }
             }
@@ -117,7 +98,6 @@ public class LineBuild {
     }
 
 
-
     ///<summary>
     ///用最小二乘法拟合二元多次曲线
     ///</summary>
@@ -129,22 +109,20 @@ public class LineBuild {
     {
         int n = dimension + 1;                  //dimension次方程需要求 dimension+1个 系数
         double[][] guass = new double[n][n + 1];      //高斯矩阵 例如：y=a0+a1*x+a2*x*x
-        for (int i = 0; i < n; i++)
-        {
+        for (int i = 0; i < n; i++) {
             int j;
-            for (j = 0; j < n; j++)
-            {
+            for (j = 0; j < n; j++) {
                 guass[i][j] = SumArr(arrX, j + i, length);
             }
             guass[i][j] = SumArr(arrX, i, arrY, 1, length);
         }
         return computGauss(guass, n);
     }
+
     public static double SumArr(double[] arr, int n, int length) //求数组的元素的n次方的和
     {
         double s = 0;
-        for (int i = 0; i < length; i++)
-        {
+        for (int i = 0; i < length; i++) {
             if (arr[i] != 0 || n != 0)
                 s = s + Math.pow(arr[i], n);
             else
@@ -152,11 +130,10 @@ public class LineBuild {
         }
         return s;
     }
-    public static double SumArr(double[] arr1, int n1, double[] arr2, int n2, int length)
-    {
+
+    public static double SumArr(double[] arr1, int n1, double[] arr2, int n2, int length) {
         double s = 0;
-        for (int i = 0; i < length; i++)
-        {
+        for (int i = 0; i < length; i++) {
             if ((arr1[i] != 0 || n1 != 0) && (arr2[i] != 0 || n2 != 0))
                 s = s + Math.pow(arr1[i], n1) * Math.pow(arr2[i], n2);
             else
@@ -165,8 +142,8 @@ public class LineBuild {
         return s;
 
     }
-    public static double[] computGauss(double[][] guass, int n)
-    {
+
+    public static double[] computGauss(double[][] guass, int n) {
         int i, j;
         int k, m;
         double temp;
@@ -175,51 +152,41 @@ public class LineBuild {
         double[] x = new double[n];
         for (i = 0; i < n; i++) x[i] = 0.0;//初始化
 
-        for (j = 0; j < n; j++)
-        {
+        for (j = 0; j < n; j++) {
             max = 0;
             k = j;
-            for (i = j; i < n; i++)
-            {
-                if (Math.abs(guass[i][j]) > max)
-                {
+            for (i = j; i < n; i++) {
+                if (Math.abs(guass[i][j]) > max) {
                     max = guass[i][j];
                     k = i;
                 }
             }
 
 
-            if (k != j)
-            {
-                for (m = j; m < n + 1; m++)
-                {
+            if (k != j) {
+                for (m = j; m < n + 1; m++) {
                     temp = guass[j][m];
                     guass[j][m] = guass[k][m];
                     guass[k][m] = temp;
                 }
             }
-            if (0 == max)
-            {
+            if (0 == max) {
                 // "此线性方程为奇异线性方程"
                 return x;
             }
 
-            for (i = j + 1; i < n; i++)
-            {
+            for (i = j + 1; i < n; i++) {
                 s = guass[i][j];
-                for (m = j; m < n + 1; m++)
-                {
+                for (m = j; m < n + 1; m++) {
                     guass[i][m] = guass[i][m] - guass[j][m] * s / (guass[j][j]);
                 }
             }
 
         }//结束for (j=0;j<n;j++)
 
-        for (i = n - 1; i >= 0; i--)
-        {
+        for (i = n - 1; i >= 0; i--) {
             s = 0;
-            for (j = i + 1; j < n; j++)
-            {
+            for (j = i + 1; j < n; j++) {
                 s = s + guass[i][j] * x[j];
             }
             x[i] = (guass[i][n] - s) / guass[i][i];

common/src/main/java/com/gyee/common/util/algorithm/MathUtils.java

@@ -7,17 +7,17 @@ public class MathUtils {
 
     //标准差σ=sqrt(s^2)
     public static double standardDiviation(Double[] x) {
-        int m=x.length;
-        double sum=0;
-        for(int i=0;i<m;i++){//求和
-            sum+=x[i];
+        int m = x.length;
+        double sum = 0;
+        for (int i = 0; i < m; i++) {//求和
+            sum += x[i];
         }
-        double dAve=sum/m;//求平均值
-        double dVar=0;
-        for(int i=0;i<m;i++){//求方差
-            dVar+=(x[i]-dAve)*(x[i]-dAve);
+        double dAve = sum / m;//求平均值
+        double dVar = 0;
+        for (int i = 0; i < m; i++) {//求方差
+            dVar += (x[i] - dAve) * (x[i] - dAve);
         }
         //reture Math.sqrt(dVar/(m-1));
-        return Math.sqrt(dVar/m);
+        return Math.sqrt(dVar / m);
     }
 }

common/src/main/java/com/gyee/common/util/algorithm/Underdelivery.java

@@ -9,26 +9,25 @@ package com.gyee.common.util.algorithm;
 public class Underdelivery {
 
     /**
-     *
      * @param pp
      * @param zs
      * @return
      */
-    public static double underdeliveryStatusReal(double pp,double zs){
+    public static double underdeliveryStatusReal(double pp, double zs) {
         double ratioll = 0;
         double qfzt = 0;
-        if (zs != 0){
-            ratioll = (zs-pp)/zs;
+        if (zs != 0) {
+            ratioll = (zs - pp) / zs;
         }
-        if (ratioll<0.05){
+        if (ratioll < 0.05) {
             qfzt = 0;
-        }else if (ratioll >= 0.05 && ratioll < 0.1){
+        } else if (ratioll >= 0.05 && ratioll < 0.1) {
             qfzt = 1;
-        }else if (ratioll >= 0.1 && ratioll < 0.2){
+        } else if (ratioll >= 0.1 && ratioll < 0.2) {
             qfzt = 2;
-        }else if (ratioll >= 0.2 && ratioll < 0.4) {
+        } else if (ratioll >= 0.2 && ratioll < 0.4) {
             qfzt = 3;
-        }else {
+        } else {
             qfzt = 4;
         }
         return qfzt;

common/src/main/java/com/gyee/common/vo/analysis/DeskObject.java

@@ -3,7 +3,6 @@ package com.gyee.common.vo.analysis;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * @ClassName : DeskObject

common/src/main/java/com/gyee/common/vo/analysis/EnergyDailyVo.java

@@ -1,6 +1,5 @@
 package com.gyee.common.vo.analysis;
 
-import com.gyee.common.model.StringUtils;
 import lombok.Data;
 
 /**
@@ -37,5 +36,4 @@ public class EnergyDailyVo {
     private Integer isWind;
 
 
-
 }

common/src/main/java/com/gyee/common/vo/benchmark/DataVo.java

@@ -1,14 +1,8 @@
-
 package com.gyee.common.vo.benchmark;
 
 /**
- * 
- * 
  * 项目名称：nxfd 类名称：DataVo 类描述： 创建人：石林 创建时间：2014-3-4 下午2:34:22 修改人：shilinno1
  * 修改时间：2014-3-4 下午2:34:22 修改备注：
- * 
- * @version
- * 
  */
 
 public class DataVo {
@@ -32,13 +26,13 @@ public class DataVo {
     private Double value8;
 
     private Double value9;
-    
+
     private Double value10;
-    
+
     private Double value11;
-    
+
     private Double value12;
-    
+
     private Double value13;
 
     private Double speed;
@@ -71,7 +65,6 @@ public class DataVo {
     private String value;
 
 
-
     public String getValue() {
         return value;
     }
@@ -320,36 +313,36 @@ public class DataVo {
         this.value9 = value9;
     }
 
-	public Double getValue10() {
-		return value10;
-	}
+    public Double getValue10() {
+        return value10;
+    }
 
-	public void setValue10(Double value10) {
-		this.value10 = value10;
-	}
+    public void setValue10(Double value10) {
+        this.value10 = value10;
+    }
 
-	public Double getValue11() {
-		return value11;
-	}
+    public Double getValue11() {
+        return value11;
+    }
 
-	public void setValue11(Double value11) {
-		this.value11 = value11;
-	}
+    public void setValue11(Double value11) {
+        this.value11 = value11;
+    }
 
-	public Double getValue12() {
-		return value12;
-	}
+    public Double getValue12() {
+        return value12;
+    }
 
-	public void setValue12(Double value12) {
-		this.value12 = value12;
-	}
+    public void setValue12(Double value12) {
+        this.value12 = value12;
+    }
 
-	public Double getValue13() {
-		return value13;
-	}
+    public Double getValue13() {
+        return value13;
+    }
 
-	public void setValue13(Double value13) {
-		this.value13 = value13;
-	}
+    public void setValue13(Double value13) {
+        this.value13 = value13;
+    }
 
 }

common/src/main/java/com/gyee/common/vo/benchmark/DjhxdbtopVo.java

@@ -1,7 +1,5 @@
 package com.gyee.common.vo.benchmark;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -14,7 +12,7 @@ import java.util.List;
  * @Description : 单机横向对比表格vo
  */
 @Data
-public class DjhxdbtopVo  implements Serializable {
+public class DjhxdbtopVo implements Serializable {
     private static final long serialVersionUID = 4849539762497547224L;
 
     private String wtid;

common/src/main/java/com/gyee/common/vo/benchmark/FjjxbVo.java

@@ -11,7 +11,7 @@ import java.io.Serializable;
  * @Description : 风机绩效榜vo
  */
 @Data
-public class FjjxbVo  implements Serializable  {
+public class FjjxbVo implements Serializable {
     private static final long serialVersionUID = -8275715166269543409L;
 
     private String id;   //id

common/src/main/java/com/gyee/common/vo/benchmark/GoodCompareVo.java

@@ -3,65 +3,77 @@ package com.gyee.common.vo.benchmark;
 
 public class GoodCompareVo implements java.io.Serializable {
 
-	/** 
-    * @Fields serialVersionUID : TODO
-    */ 
-    
-    
+    /**
+     * @Fields serialVersionUID : TODO
+     */
+
+
     private static final long serialVersionUID = 1L;
-	// Fields
-
-	private Integer id;
-	private String name;
-	private String value1;
-	private String value2;
-	private String value3;
-	private String value4;
-	private String value5;
-	
-	public String getName() {
-    	return name;
+    // Fields
+
+    private Integer id;
+    private String name;
+    private String value1;
+    private String value2;
+    private String value3;
+    private String value4;
+    private String value5;
+
+    public String getName() {
+        return name;
     }
-	public void setName(String name) {
-    	this.name = name;
+
+    public void setName(String name) {
+        this.name = name;
     }
-	public Integer getId() {
-    	return id;
+
+    public Integer getId() {
+        return id;
     }
-	public void setId(Integer id) {
-    	this.id = id;
+
+    public void setId(Integer id) {
+        this.id = id;
     }
-	public String getValue1() {
-    	return value1;
+
+    public String getValue1() {
+        return value1;
     }
-	public void setValue1(String value1) {
-    	this.value1 = value1;
+
+    public void setValue1(String value1) {
+        this.value1 = value1;
     }
-	public String getValue2() {
-    	return value2;
+
+    public String getValue2() {
+        return value2;
     }
-	public void setValue2(String value2) {
-    	this.value2 = value2;
+
+    public void setValue2(String value2) {
+        this.value2 = value2;
     }
-	public String getValue3() {
-    	return value3;
+
+    public String getValue3() {
+        return value3;
     }
-	public void setValue3(String value3) {
-    	this.value3 = value3;
+
+    public void setValue3(String value3) {
+        this.value3 = value3;
     }
-	public String getValue4() {
-    	return value4;
+
+    public String getValue4() {
+        return value4;
     }
-	public void setValue4(String value4) {
-    	this.value4 = value4;
+
+    public void setValue4(String value4) {
+        this.value4 = value4;
     }
-	public String getValue5() {
-    	return value5;
+
+    public String getValue5() {
+        return value5;
     }
-	public void setValue5(String value5) {
-    	this.value5 = value5;
+
+    public void setValue5(String value5) {
+        this.value5 = value5;
     }
-	
 
 
 }

common/src/main/java/com/gyee/common/vo/benchmark/ValueVo.java

@@ -1,70 +1,70 @@
 package com.gyee.common.vo.benchmark;
 
 public class ValueVo {
-	private String name;
-	private String value;
-	private Double data1;
+    private String name;
+    private String value;
+    private Double data1;
 
-	private String warningId;
-	private String shutdowneventId;
-	private String wpId;
-	private String wtId;
+    private String warningId;
+    private String shutdowneventId;
+    private String wpId;
+    private String wtId;
 
-	public String getValue() {
-		return value;
-	}
+    public String getValue() {
+        return value;
+    }
 
-	public void setValue(String value) {
-		this.value = value;
-	}
+    public void setValue(String value) {
+        this.value = value;
+    }
 
-	public String getName() {
-		return name;
-	}
+    public String getName() {
+        return name;
+    }
 
-	public void setName(String name) {
-		this.name = name;
-	}
+    public void setName(String name) {
+        this.name = name;
+    }
 
-	public Double getData1() {
-		return data1;
-	}
+    public Double getData1() {
+        return data1;
+    }
 
-	public void setData1(Double data1) {
-		this.data1 = data1;
-	}
+    public void setData1(Double data1) {
+        this.data1 = data1;
+    }
 
-	public String getWarningId() {
-		return warningId;
-	}
+    public String getWarningId() {
+        return warningId;
+    }
 
-	public void setWarningId(String warningId) {
-		this.warningId = warningId;
-	}
+    public void setWarningId(String warningId) {
+        this.warningId = warningId;
+    }
 
-	public String getShutdowneventId() {
-		return shutdowneventId;
-	}
+    public String getShutdowneventId() {
+        return shutdowneventId;
+    }
 
-	public void setShutdowneventId(String shutdowneventId) {
-		this.shutdowneventId = shutdowneventId;
-	}
+    public void setShutdowneventId(String shutdowneventId) {
+        this.shutdowneventId = shutdowneventId;
+    }
 
-	public String getWpId() {
-		return wpId;
-	}
+    public String getWpId() {
+        return wpId;
+    }
 
-	public void setWpId(String wpId) {
-		this.wpId = wpId;
-	}
+    public void setWpId(String wpId) {
+        this.wpId = wpId;
+    }
 
-	public String getWtId() {
-		return wtId;
-	}
+    public String getWtId() {
+        return wtId;
+    }
+
+    public void setWtId(String wtId) {
+        this.wtId = wtId;
+    }
 
-	public void setWtId(String wtId) {
-		this.wtId = wtId;
-	}
 
-	
 }

common/src/main/java/com/gyee/common/vo/benchmark/WxsslVo.java

@@ -20,7 +20,7 @@ public class WxsslVo implements Serializable {
     private String id;
     private String name;
     private Double ordernum;
-    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date date;
     private Integer zhpm;
     private Integer fdlpm;

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

@@ -12,6 +12,6 @@ import java.util.Date;
  */
 @Data
 public class CurveVo {
-//    private String wtid;
+    //    private String wtid;
     private Date time;
 }

common/src/main/java/com/gyee/common/vo/monitor/FittingVo.java

@@ -5,8 +5,6 @@ package com.gyee.common.vo.monitor;/*
 
 import lombok.Data;
 
-import java.util.Date;
-
 @Data
 public class FittingVo {
 

common/src/main/java/com/gyee/common/vo/specific/SpecificTarget.java

@@ -6,11 +6,12 @@ package com.gyee.common.vo.specific;/*
 import lombok.Data;
 
 import java.util.List;
+
 @Data
 public class SpecificTarget {
     private String wpid;
     private String wpname;
-//    private Integer year;
+    //    private Integer year;
     List<SpecificTargetVo> targetList;
     private Integer orderNum;
 }

common/src/main/java/com/gyee/common/vo/specific/SpecificTargetVo.java

@@ -2,8 +2,6 @@ package com.gyee.common.vo.specific;
 
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @ClassName : SpecificTargetVo
  * @Author : xieshengjie

common/src/main/java/com/gyee/common/vo/threerate/FwjslVo.java

@@ -3,7 +3,6 @@ package com.gyee.common.vo.threerate;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.math.BigDecimal;
 import java.util.Date;
 
 /**

common/src/main/java/com/gyee/common/vo/threerate/QxjslVo.java

@@ -3,7 +3,6 @@ package com.gyee.common.vo.threerate;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.math.BigDecimal;
 
 /**
  * @ClassName : QxjslVo

common/src/main/resources/application.yml

@@ -1,38 +1,38 @@
 spring:
   main:
     allow-bean-definition-overriding: true #当遇到同样名字的时候，是否允许覆盖注册
-#  redis:
-##    host: 49.4.50.80
-#    host: 10.155.32.4
-#    port: 6379
-#    timeout: 100000
-#    #    集群环境打开下面注释，单机不需要打开
-#    #    cluster:
-#    #      集群信息
-#    #      nodes: xxx.xxx.xxx.xxx:xxxx,xxx.xxx.xxx.xxx:xxxx,xxx.xxx.xxx.xxx:xxxx
-#    #      #默认值是5 一般当此值设置过大时，容易报：Too many Cluster redirections
-#    #      maxRedirects: 3
-#    password: gdnxfd123
-#    application:
-#      name: test
-#    jedis:
-#      pool:
-#        max-active: 8
-#        min-idle: 0
-#        max-idle: 8
-#        max-wait: -1
-#    database: 1
+  #  redis:
+  ##    host: 49.4.50.80
+  #    host: 10.155.32.4
+  #    port: 6379
+  #    timeout: 100000
+  #    #    集群环境打开下面注释，单机不需要打开
+  #    #    cluster:
+  #    #      集群信息
+  #    #      nodes: xxx.xxx.xxx.xxx:xxxx,xxx.xxx.xxx.xxx:xxxx,xxx.xxx.xxx.xxx:xxxx
+  #    #      #默认值是5 一般当此值设置过大时，容易报：Too many Cluster redirections
+  #    #      maxRedirects: 3
+  #    password: gdnxfd123
+  #    application:
+  #      name: test
+  #    jedis:
+  #      pool:
+  #        max-active: 8
+  #        min-idle: 0
+  #        max-idle: 8
+  #        max-wait: -1
+  #    database: 1
   autoconfigure:
     exclude: org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration,org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration
   datasource:
-#    type: com.alibaba.druid.pool.DruidDataSource
-#    driver-class-name: oracle.jdbc.OracleDriver
+    #    type: com.alibaba.druid.pool.DruidDataSource
+    #    driver-class-name: oracle.jdbc.OracleDriver
     #外网
-#    url: jdbc:oracle:thin:@49.4.50.80:1521:gdnxfd
-##    url: jdbc:oracle:thin:@192.168.1.105:1521:gdnxfd
-#    username: nxfdprod
-#    password: gdnxfd123
-#    oracle-schema=:
+    #    url: jdbc:oracle:thin:@49.4.50.80:1521:gdnxfd
+    ##    url: jdbc:oracle:thin:@192.168.1.105:1521:gdnxfd
+    #    username: nxfdprod
+    #    password: gdnxfd123
+    #    oracle-schema=:
     type: com.alibaba.druid.pool.DruidDataSource
     url: jdbc:mysql://127.0.0.1:3306/test?characterEncoding=utf8&serverTimezone=UTC
     username: root

data-adapter/src/main/java/com/gyee/dataadapter/controller/AdapterController.java

@@ -58,16 +58,16 @@ public class AdapterController {
 
     @GetMapping("/history/stat")
     public List<PointData> getHistoryStat(@RequestParam("tagName") String tagName,
-                                           @RequestParam("startTs") Long startTs, @RequestParam("endTs") Long endTs,
-                                           @RequestParam(value = "interval", required = false) Integer interval,
-                                           @RequestParam(value = "type", required = false) Integer type) {
+                                          @RequestParam("startTs") Long startTs, @RequestParam("endTs") Long endTs,
+                                          @RequestParam(value = "interval", required = false) Integer interval,
+                                          @RequestParam(value = "type", required = false) Integer type) {
         return tsDataService.getHistoryStat(tagName, new Date(startTs), new Date(endTs), interval, type);
     }
 
     @GetMapping("/history/stat2")
     public List<DoubleStatData> getHistoryStat2(@RequestParam("tagName") String tagName,
-                                               @RequestParam("startTs") Long startTs, @RequestParam("endTs") Long endTs,
-                                               @RequestParam(value = "interval", required = false) Integer interval) {
+                                                @RequestParam("startTs") Long startTs, @RequestParam("endTs") Long endTs,
+                                                @RequestParam(value = "interval", required = false) Integer interval) {
         List<DoubleStatData> result = new ArrayList<>();
         List<PointData> max = tsDataService.getHistoryStat(tagName, new Date(startTs), new Date(endTs), interval, 2);
         List<PointData> min = tsDataService.getHistoryStat(tagName, new Date(startTs), new Date(endTs), interval, 3);

data-adapter/src/main/java/com/gyee/dataadapter/service/impl/AdapterServiceImpl.java

@@ -17,7 +17,10 @@ import reactor.core.publisher.Mono;
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.*;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 

data-adapter/target/classes/application.yaml

@@ -1,28 +0,0 @@
-server:
-  port: 9011
-
-# Mqtt相关配置
-publish:
-  mqtt:
-    host: tcp://10.220.1.5:2883
-    username: admin@scada.com
-    password: Scada135}+?
-    cleansession: false
-    clientid: HUIANTOGUANGYAO
-    keepalive: 10
-    connectionTimeout: 3000
-
-
-spring:
-  datasource:
-    # pg数据库连接配置
-    type: com.alibaba.druid.pool.DruidDataSource
-    driver-class-name: org.postgresql.Driver
-    url: jdbc:postgresql://10.220.1.5:15432/smartwindpower
-    username: smartuser
-    password: smart123!@#
-
-subscribe:
-  topic: scada/public/HUIANTOGUANGYAO/tag_values
-  qos: 0
-

generationXK-service/pom.xml

@@ -127,11 +127,11 @@
             <version>2.3.1</version>
         </dependency>
 
-<!--        <dependency>-->
-<!--            <groupId>com.gyee</groupId>-->
-<!--            <artifactId>data-adapter</artifactId>-->
-<!--            <version>1.0.0-SNAPSHOT</version>-->
-<!--        </dependency>-->
+        <!--        <dependency>-->
+        <!--            <groupId>com.gyee</groupId>-->
+        <!--            <artifactId>data-adapter</artifactId>-->
+        <!--            <version>1.0.0-SNAPSHOT</version>-->
+        <!--        </dependency>-->
 
 
     </dependencies>

generationXK-service/src/main/java/com/gyee/generation/GenerationMain.java

@@ -24,174 +24,174 @@ public class GenerationMain {
 
         System.out.println("启动完成");
 
-//        /*************************风机历史计算服务**************************/
-//        Calendar c = Calendar.getInstance();
-//        Logger logger = LoggerFactory.getLogger(GenerationMain.class);
-//
-//        while (true) {
-//
-//            Date begin = new Date();
-//            Date end = null;
-//            SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-//            logger.info(df.format(c.getTime()).toString());
-//
-//
-//            EquipmentInfo1Service equipmentInfo1Service = SpringUtils.getBean("equipmentInfo1Service");
-//            EquipmentInfo2Service equipmentInfo2Service = SpringUtils.getBean("equipmentInfo2Service");
-//            EquipmentInfo3Service equipmentInfo3Service = SpringUtils.getBean("equipmentInfo3Service");
-//
-//
-//            equipmentInfo1Service.calEquipmentInfoDay(begin);
-//            logger.info("equipmentInfo1Service完成一次!。。。。。。");
-//            TimeUnit.SECONDS.sleep(3);
-//            equipmentInfo2Service.calEquipmentInfoDay(begin);
-//            logger.info("equipmentInfo2Service完成一次!。。。。。。");
-//            TimeUnit.SECONDS.sleep(3);
-//            equipmentInfo3Service.calEquipmentInfoDay(begin);
-//            logger.info("equipmentInfo3Service完成一次!。。。。。。");
-//            TimeUnit.SECONDS.sleep(3);
-//            logger.info("equipmentInfo5Service开始!。。。。。。");
-//            EquipmentInfo5Service equipmentInfo5Service = SpringUtils.getBean("equipmentInfo5Service");
-//            TimeUnit.SECONDS.sleep(3);
-//            EquipmentInfo4Service equipmentInfo4Service = SpringUtils.getBean("equipmentInfo4Service");
-//            TimeUnit.SECONDS.sleep(3);
-//            equipmentInfo5Service.calEquipmentInfoDay(begin);
-//            logger.info("equipmentInfo5Service完成一次!。。。。。。");
-//            logger.info("equipmentInfo4Service开始!。。。。。。");
-//            equipmentInfo4Service.calEquipmentInfoDay(begin);
-//            logger.info("equipmentInfo4Service完成一次!。。。。。。");
-//
-//            WtAlysisDayService wtAlysisDayService = SpringUtils.getBean("wtAlysisDayService");
-//
-//            EquipmentInfoDayTopService equipmentInfoDayTopService = SpringUtils.getBean("equipmentInfoDayTopService");
-//            equipmentInfoDayTopService.calEquipmentInfoDayTop(begin);
-//            equipmentInfoDayTopService.calEquipmentInfoMonthTop(begin);
-//            equipmentInfoDayTopService.calEquipmentInfoYearTop(begin);
-//
-//            TimeUnit.SECONDS.sleep(3);
-//            logger.info("wtAlysisyService开始!。。。。。。");
-//            wtAlysisDayService.calEquipmentInfoDay(begin);
-//            logger.info("wtAlysisyService完成!。。。。。。");
-//            end = new Date();
-//            logger.info(df.format(end).toString());
-//            logger.info("完成一次!。。。。。。");
-//            logger.info("执行用时" + com.gyee.generation.util.DateUtils.secondsDiff(begin, end) + "秒");
-//
-//            TimeUnit.MINUTES.sleep(15);
-//        }
-//
-//        /*************************风机历史计算服务**************************/
-//
-//
-//        /*************************逆变器历史计算服务**************************/
-//        Calendar c = Calendar.getInstance();
-//        Logger logger = LoggerFactory.getLogger(GenerationMain.class);
-//
-//        while (true) {
-//
-//            Date begin = new Date();
-//            Date end = null;
-//            SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-//            logger.info(df.format(c.getTime()).toString());
-//
-//
-//            EquipmentInfo1Service equipmentInfo1Service = SpringUtils.getBean("equipmentInfo1Service");
-//            EquipmentInfo2Service equipmentInfo2Service = SpringUtils.getBean("equipmentInfo2Service");
-//            EquipmentInfo3Service equipmentInfo3Service = SpringUtils.getBean("equipmentInfo3Service");
-//
-//
-//            equipmentInfo1Service.calEquipmentInfoDay(begin);
-//            TimeUnit.SECONDS.sleep(3);
-//            equipmentInfo2Service.calEquipmentInfoDay(begin);
-//            TimeUnit.SECONDS.sleep(3);
-//            equipmentInfo3Service.calEquipmentInfoDay(begin);
-//            TimeUnit.SECONDS.sleep(3);
-//
-//
-//            end = new Date();
-//            logger.info(df.format(end).toString());
-//            logger.info("完成一次!。。。。。。");
-//            logger.info("执行用时" + com.gyee.generation.util.DateUtils.secondsDiff(begin, end) + "秒");
-//            TimeUnit.MINUTES.sleep(15);
-//        }
-//
-//        /*************************逆变器历史计算服务**************************/
-//
-//
-//        /*************************15分钟实时状态计算服务**************************/
-//        Calendar c = Calendar.getInstance();
-//
-//
-//        while (true) {
-//
-//            Date begin = new Date();
-//            Date end = null;
-//            SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-//            System.out.println(df.format(c.getTime()).toString());
-//
-//
-//
-//
-//            CycleCalculationService cycleCalculationService= SpringUtils.getBean("cycleCalculationService");
-//
-//            cycleCalculationService.saveCyle();
-//
-//
-//            end = new Date();
-//            System.out.println(df.format(end).toString());
-//            System.out.println("完成一次!。。。。。。");
-//            System.out.println("执行用时" + com.gyee.generation.util.DateUtils.secondsDiff(begin, end) + "秒");
-//            Thread.sleep(3000);
-//        }
-//
-//        /*************************状态实时状态计算服务**************************/
-//
-//        /*************************健康管理测点导出**************************/
-//        Calendar c = Calendar.getInstance();
-//
-//
-//        Date begin = new Date();
-//        Date end = null;
-//        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-//        System.out.println(df.format(c.getTime()).toString());
-//
-//
-//        InitialPointGoldenXkByEqService initialPointGoldenXkByEqService = SpringUtils.getBean("initialPointGoldenXkByEqService");
-//
-//        initialPointGoldenXkByEqService.initalJkfc();
-//        initialPointGoldenXkByEqService.initalJkfj();
-//
-//
-//        end = new Date();
-//        System.out.println(df.format(end).toString());
-//        System.out.println("完成一次!。。。。。。");
-//        System.out.println("执行用时" + com.gyee.generation.util.DateUtils.secondsDiff(begin, end) + "秒");
-//
-//
-//        /*************************健康管理测点导出**************************/
-//
-//
-// /*************************redis缓存**************************/
-//        Calendar c = Calendar.getInstance();
-//
-//
-//        Date begin = new Date();
-//        Date end = null;
-//        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-//        System.out.println(df.format(c.getTime()).toString());
-//
-//
-//        CacheService cacheService= SpringUtils.getBean("cacheService");
-//        cacheService.initRedisCache();
-//
-//        end = new Date();
-//        System.out.println(df.format(end).toString());
-//        System.out.println("完成一次!。。。。。。");
-//        System.out.println("执行用时" + com.gyee.generation.util.DateUtils.secondsDiff(begin, end) + "秒");
-//
-//
-//        /*************************redis缓存**************************/
-//
+        //        /*************************风机历史计算服务**************************/
+        //        Calendar c = Calendar.getInstance();
+        //        Logger logger = LoggerFactory.getLogger(GenerationMain.class);
+        //
+        //        while (true) {
+        //
+        //            Date begin = new Date();
+        //            Date end = null;
+        //            SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        //            logger.info(df.format(c.getTime()).toString());
+        //
+        //
+        //            EquipmentInfo1Service equipmentInfo1Service = SpringUtils.getBean("equipmentInfo1Service");
+        //            EquipmentInfo2Service equipmentInfo2Service = SpringUtils.getBean("equipmentInfo2Service");
+        //            EquipmentInfo3Service equipmentInfo3Service = SpringUtils.getBean("equipmentInfo3Service");
+        //
+        //
+        //            equipmentInfo1Service.calEquipmentInfoDay(begin);
+        //            logger.info("equipmentInfo1Service完成一次!。。。。。。");
+        //            TimeUnit.SECONDS.sleep(3);
+        //            equipmentInfo2Service.calEquipmentInfoDay(begin);
+        //            logger.info("equipmentInfo2Service完成一次!。。。。。。");
+        //            TimeUnit.SECONDS.sleep(3);
+        //            equipmentInfo3Service.calEquipmentInfoDay(begin);
+        //            logger.info("equipmentInfo3Service完成一次!。。。。。。");
+        //            TimeUnit.SECONDS.sleep(3);
+        //            logger.info("equipmentInfo5Service开始!。。。。。。");
+        //            EquipmentInfo5Service equipmentInfo5Service = SpringUtils.getBean("equipmentInfo5Service");
+        //            TimeUnit.SECONDS.sleep(3);
+        //            EquipmentInfo4Service equipmentInfo4Service = SpringUtils.getBean("equipmentInfo4Service");
+        //            TimeUnit.SECONDS.sleep(3);
+        //            equipmentInfo5Service.calEquipmentInfoDay(begin);
+        //            logger.info("equipmentInfo5Service完成一次!。。。。。。");
+        //            logger.info("equipmentInfo4Service开始!。。。。。。");
+        //            equipmentInfo4Service.calEquipmentInfoDay(begin);
+        //            logger.info("equipmentInfo4Service完成一次!。。。。。。");
+        //
+        //            WtAlysisDayService wtAlysisDayService = SpringUtils.getBean("wtAlysisDayService");
+        //
+        //            EquipmentInfoDayTopService equipmentInfoDayTopService = SpringUtils.getBean("equipmentInfoDayTopService");
+        //            equipmentInfoDayTopService.calEquipmentInfoDayTop(begin);
+        //            equipmentInfoDayTopService.calEquipmentInfoMonthTop(begin);
+        //            equipmentInfoDayTopService.calEquipmentInfoYearTop(begin);
+        //
+        //            TimeUnit.SECONDS.sleep(3);
+        //            logger.info("wtAlysisyService开始!。。。。。。");
+        //            wtAlysisDayService.calEquipmentInfoDay(begin);
+        //            logger.info("wtAlysisyService完成!。。。。。。");
+        //            end = new Date();
+        //            logger.info(df.format(end).toString());
+        //            logger.info("完成一次!。。。。。。");
+        //            logger.info("执行用时" + com.gyee.generation.util.DateUtils.secondsDiff(begin, end) + "秒");
+        //
+        //            TimeUnit.MINUTES.sleep(15);
+        //        }
+        //
+        //        /*************************风机历史计算服务**************************/
+        //
+        //
+        //        /*************************逆变器历史计算服务**************************/
+        //        Calendar c = Calendar.getInstance();
+        //        Logger logger = LoggerFactory.getLogger(GenerationMain.class);
+        //
+        //        while (true) {
+        //
+        //            Date begin = new Date();
+        //            Date end = null;
+        //            SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        //            logger.info(df.format(c.getTime()).toString());
+        //
+        //
+        //            EquipmentInfo1Service equipmentInfo1Service = SpringUtils.getBean("equipmentInfo1Service");
+        //            EquipmentInfo2Service equipmentInfo2Service = SpringUtils.getBean("equipmentInfo2Service");
+        //            EquipmentInfo3Service equipmentInfo3Service = SpringUtils.getBean("equipmentInfo3Service");
+        //
+        //
+        //            equipmentInfo1Service.calEquipmentInfoDay(begin);
+        //            TimeUnit.SECONDS.sleep(3);
+        //            equipmentInfo2Service.calEquipmentInfoDay(begin);
+        //            TimeUnit.SECONDS.sleep(3);
+        //            equipmentInfo3Service.calEquipmentInfoDay(begin);
+        //            TimeUnit.SECONDS.sleep(3);
+        //
+        //
+        //            end = new Date();
+        //            logger.info(df.format(end).toString());
+        //            logger.info("完成一次!。。。。。。");
+        //            logger.info("执行用时" + com.gyee.generation.util.DateUtils.secondsDiff(begin, end) + "秒");
+        //            TimeUnit.MINUTES.sleep(15);
+        //        }
+        //
+        //        /*************************逆变器历史计算服务**************************/
+        //
+        //
+        //        /*************************15分钟实时状态计算服务**************************/
+        //        Calendar c = Calendar.getInstance();
+        //
+        //
+        //        while (true) {
+        //
+        //            Date begin = new Date();
+        //            Date end = null;
+        //            SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        //            System.out.println(df.format(c.getTime()).toString());
+        //
+        //
+        //
+        //
+        //            CycleCalculationService cycleCalculationService= SpringUtils.getBean("cycleCalculationService");
+        //
+        //            cycleCalculationService.saveCyle();
+        //
+        //
+        //            end = new Date();
+        //            System.out.println(df.format(end).toString());
+        //            System.out.println("完成一次!。。。。。。");
+        //            System.out.println("执行用时" + com.gyee.generation.util.DateUtils.secondsDiff(begin, end) + "秒");
+        //            Thread.sleep(3000);
+        //        }
+        //
+        //        /*************************状态实时状态计算服务**************************/
+        //
+        //        /*************************健康管理测点导出**************************/
+        //        Calendar c = Calendar.getInstance();
+        //
+        //
+        //        Date begin = new Date();
+        //        Date end = null;
+        //        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        //        System.out.println(df.format(c.getTime()).toString());
+        //
+        //
+        //        InitialPointGoldenXkByEqService initialPointGoldenXkByEqService = SpringUtils.getBean("initialPointGoldenXkByEqService");
+        //
+        //        initialPointGoldenXkByEqService.initalJkfc();
+        //        initialPointGoldenXkByEqService.initalJkfj();
+        //
+        //
+        //        end = new Date();
+        //        System.out.println(df.format(end).toString());
+        //        System.out.println("完成一次!。。。。。。");
+        //        System.out.println("执行用时" + com.gyee.generation.util.DateUtils.secondsDiff(begin, end) + "秒");
+        //
+        //
+        //        /*************************健康管理测点导出**************************/
+        //
+        //
+        // /*************************redis缓存**************************/
+        //        Calendar c = Calendar.getInstance();
+        //
+        //
+        //        Date begin = new Date();
+        //        Date end = null;
+        //        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        //        System.out.println(df.format(c.getTime()).toString());
+        //
+        //
+        //        CacheService cacheService= SpringUtils.getBean("cacheService");
+        //        cacheService.initRedisCache();
+        //
+        //        end = new Date();
+        //        System.out.println(df.format(end).toString());
+        //        System.out.println("完成一次!。。。。。。");
+        //        System.out.println("执行用时" + com.gyee.generation.util.DateUtils.secondsDiff(begin, end) + "秒");
+        //
+        //
+        //        /*************************redis缓存**************************/
+        //
 
 
         /*************************重算设备历史数据**************************/
@@ -200,13 +200,12 @@ public class GenerationMain {
 
         c.add(Calendar.DAY_OF_MONTH, -1);
         ReCalSevice reCalSevice = SpringUtils.getBean("reCalSevice");
-//        //重算风机
-//        reCalSevice.calWt(c.getTime());
+        //        //重算风机
+        //        reCalSevice.calWt(c.getTime());
         //重算逆变器
         reCalSevice.calIn(c.getTime());
 
 
-
         /*************************重算设备历史数据**************************/
 
 

generationXK-service/src/main/java/com/gyee/generation/config/GeneratorCodeConfig.java

@@ -11,11 +11,11 @@ import com.baomidou.mybatisplus.generator.engine.FreemarkerTemplateEngine;
 import java.util.Scanner;
 
 /**
- *@ClassName GeneratorCodeConfig
- *@Description 自动生成mybatisplus的相关代码
- *@Author 谢生杰
- *@Date 2020/9/25 18:26
- *@Version 1.0
+ * @ClassName GeneratorCodeConfig
+ * @Description 自动生成mybatisplus的相关代码
+ * @Author 谢生杰
+ * @Date 2020/9/25 18:26
+ * @Version 1.0
  **/
 public class GeneratorCodeConfig {
     public static String scanner(String tip) {
@@ -39,7 +39,7 @@ public class GeneratorCodeConfig {
         // 全局配置
         GlobalConfig gc = new GlobalConfig();
         String projectPath = System.getProperty("user.dir");
-        gc.setOutputDir(projectPath+"/realtime/generationXK-service"+ "/src/main/java");
+        gc.setOutputDir(projectPath + "/realtime/generationXK-service" + "/src/main/java");
         gc.setAuthor("shilin");
         gc.setOpen(false);
         //实体属性 Swagger2 注解
@@ -53,29 +53,28 @@ public class GeneratorCodeConfig {
         dsc.setUsername("root");
         dsc.setPassword("root");
         mpg.setDataSource(dsc);*/
-//        dsc.setDriverName("oracle.jdbc.driver.OracleDriver");
-//        dsc.setUsername("gdprod");
-//        dsc.setPassword("gd123");
-//        dsc.setUrl("jdbc:oracle:thin:@10.83.68.165:1521:gdsj");
+        //        dsc.setDriverName("oracle.jdbc.driver.OracleDriver");
+        //        dsc.setUsername("gdprod");
+        //        dsc.setPassword("gd123");
+        //        dsc.setUrl("jdbc:oracle:thin:@10.83.68.165:1521:gdsj");
 
         dsc.setDriverName("org.postgresql.Driver");
         dsc.setUsername("postgres");
         dsc.setPassword("gd123");
         dsc.setUrl("jdbc:postgresql://10.81.3.151:5432/IMS_NEM_JN");
-//        dsc.setDriverName("org.postgresql.Driver");
-//        dsc.setUsername("postgres");
-//        dsc.setPassword("postgres");
-//        dsc.setUrl("jdbc:postgresql://192.168.11.248:5432/IMS_NEM_SD");
-//        dsc.setUrl("jdbc:postgresql://124.70.75.91:5432/jn_test");
-//        dsc.setUsername("postgres");
-//        dsc.setPassword("gd123");
+        //        dsc.setDriverName("org.postgresql.Driver");
+        //        dsc.setUsername("postgres");
+        //        dsc.setPassword("postgres");
+        //        dsc.setUrl("jdbc:postgresql://192.168.11.248:5432/IMS_NEM_SD");
+        //        dsc.setUrl("jdbc:postgresql://124.70.75.91:5432/jn_test");
+        //        dsc.setUsername("postgres");
+        //        dsc.setPassword("gd123");
         mpg.setDataSource(dsc);
 
 
-
         // 包配置
         PackageConfig pc = new PackageConfig();
-//        pc.setModuleName(scanner("模块名"));
+        //        pc.setModuleName(scanner("模块名"));
         pc.setParent("com.gyee.generation");
         pc.setEntity("model.auto");
         pc.setMapper("mapper.auto");
@@ -84,29 +83,29 @@ public class GeneratorCodeConfig {
         mpg.setPackageInfo(pc);
 
         // 自定义配置
-//        InjectionConfig cfg = new InjectionConfig() {
-//            @Override
-//            public void initMap() {
-//                // to do nothing
-//            }
-//        };
+        //        InjectionConfig cfg = new InjectionConfig() {
+        //            @Override
+        //            public void initMap() {
+        //                // to do nothing
+        //            }
+        //        };
 
         // 如果模板引擎是 freemarker
-//        String templatePath = "/templates/mapper.xml.ftl";
+        //        String templatePath = "/templates/mapper.xml.ftl";
         // 如果模板引擎是 velocity
         // String templatePath = "/templates/mapper.xml.vm";
 
         // 自定义输出配置
-//        List<FileOutConfig> focList = new ArrayList<>();
+        //        List<FileOutConfig> focList = new ArrayList<>();
         // 自定义配置会被优先输出
-//        focList.add(new FileOutConfig(templatePath) {
-//            @Override
-//            public String outputFile(TableInfo tableInfo) {
-//                // 自定义输出文件名 ， 如果你 Entity 设置了前后缀、此处注意 xml 的名称会跟着发生变化！！
-//                return projectPath + "/src/main/resources/mapper/" + pc.getModuleName()
-//                        + "/" + tableInfo.getEntityName() + "Mapper" + StringPool.DOT_XML;
-//            }
-//        });
+        //        focList.add(new FileOutConfig(templatePath) {
+        //            @Override
+        //            public String outputFile(TableInfo tableInfo) {
+        //                // 自定义输出文件名 ， 如果你 Entity 设置了前后缀、此处注意 xml 的名称会跟着发生变化！！
+        //                return projectPath + "/src/main/resources/mapper/" + pc.getModuleName()
+        //                        + "/" + tableInfo.getEntityName() + "Mapper" + StringPool.DOT_XML;
+        //            }
+        //        });
         /*
         cfg.setFileCreate(new IFileCreate() {
             @Override
@@ -117,8 +116,8 @@ public class GeneratorCodeConfig {
             }
         });
         */
-//        cfg.setFileOutConfigList(focList);
-//        mpg.setCfg(cfg);
+        //        cfg.setFileOutConfigList(focList);
+        //        mpg.setCfg(cfg);
 
         // 配置模板
         TemplateConfig templateConfig = new TemplateConfig();
@@ -142,9 +141,9 @@ public class GeneratorCodeConfig {
 
         strategy.setEntityLombokModel(true);
         // 公共父类
-//        strategy.setSuperControllerClass("com.baomidou.ant.common.BaseController");
+        //        strategy.setSuperControllerClass("com.baomidou.ant.common.BaseController");
         // 写于父类中的公共字段
-//        strategy.setSuperEntityColumns("id");
+        //        strategy.setSuperEntityColumns("id");
         strategy.setInclude(scanner("表名，多个英文逗号分割").split(","));
         strategy.setControllerMappingHyphenStyle(true);
         strategy.setTablePrefix(pc.getModuleName() + "_");

generationXK-service/src/main/java/com/gyee/generation/config/ThreadPoolTaskConfig.java

@@ -13,22 +13,34 @@ public class ThreadPoolTaskConfig {
      *  当队列满了，就继续创建线程，当线程数量大于等于maxPoolSize后，开始使用拒绝策略拒绝
      */
 
-    /** 核心线程数（默认线程数） */
-    private static final int corePoolSize =12;
-    /** 最大线程数 */
+    /**
+     * 核心线程数（默认线程数）
+     */
+    private static final int corePoolSize = 12;
+    /**
+     * 最大线程数
+     */
     private static final int maxPoolSize = 30;
-    /** 允许线程空闲时间（单位：默认为秒） */
+    /**
+     * 允许线程空闲时间（单位：默认为秒）
+     */
     private static final int keepAliveTime = 30;
-    /** 缓冲队列大小 */
+    /**
+     * 缓冲队列大小
+     */
     private static final int queueCapacity = 240;
-    /** 允许等待最长时间 */
+    /**
+     * 允许等待最长时间
+     */
     private static final int awaitTime = 60;
-    /** 线程池名前缀 */
+    /**
+     * 线程池名前缀
+     */
     private static final String threadNamePrefix = "GYEE-Thread-";
 
     private ThreadPoolTaskExecutor executor;
 
-    public ThreadPoolTaskExecutor getExecutor(){
+    public ThreadPoolTaskExecutor getExecutor() {
         if (executor == null)
             executor = taskExecutor();
 
@@ -36,7 +48,7 @@ public class ThreadPoolTaskConfig {
     }
 
 
-    private ThreadPoolTaskExecutor taskExecutor(){
+    private ThreadPoolTaskExecutor taskExecutor() {
         ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
         executor.setCorePoolSize(corePoolSize);
         executor.setMaxPoolSize(maxPoolSize);

generationXK-service/src/main/java/com/gyee/generation/config/mybatis/InsertOrUpdateBath.java

@@ -2,11 +2,11 @@ package com.gyee.generation.config.mybatis;
 
 
 import com.baomidou.mybatisplus.core.injector.AbstractMethod;
-        import com.baomidou.mybatisplus.core.metadata.TableInfo;
-        import org.apache.ibatis.executor.keygen.NoKeyGenerator;
-        import org.apache.ibatis.mapping.MappedStatement;
-        import org.apache.ibatis.mapping.SqlSource;
-        import org.springframework.util.StringUtils;
+import com.baomidou.mybatisplus.core.metadata.TableInfo;
+import org.apache.ibatis.executor.keygen.NoKeyGenerator;
+import org.apache.ibatis.mapping.MappedStatement;
+import org.apache.ibatis.mapping.SqlSource;
+import org.springframework.util.StringUtils;
 
 public class InsertOrUpdateBath extends AbstractMethod {
 
@@ -16,8 +16,8 @@ public class InsertOrUpdateBath extends AbstractMethod {
         final String tableName = tableInfo.getTableName();
         final String filedSql = prepareFieldSql(tableInfo);
         final String modelValuesSql = prepareModelValuesSql(tableInfo);
-        final String duplicateKeySql =prepareDuplicateKeySql(tableInfo);
-        final String sqlResult = String.format(sql, tableName, filedSql, modelValuesSql,duplicateKeySql);
+        final String duplicateKeySql = prepareDuplicateKeySql(tableInfo);
+        final String sqlResult = String.format(sql, tableName, filedSql, modelValuesSql, duplicateKeySql);
         //System.out.println("savaorupdatesqlsql="+sqlResult);
         SqlSource sqlSource = languageDriver.createSqlSource(configuration, sqlResult, modelClass);
         return this.addInsertMappedStatement(mapperClass, modelClass, "mysqlInsertOrUpdateBath", sqlSource, new NoKeyGenerator(), null, null);
@@ -25,12 +25,13 @@ public class InsertOrUpdateBath extends AbstractMethod {
 
     /**
      * 准备ON DUPLICATE KEY UPDATE sql
+     *
      * @param tableInfo
      * @return
      */
     private String prepareDuplicateKeySql(TableInfo tableInfo) {
         final StringBuilder duplicateKeySql = new StringBuilder();
-        if(!StringUtils.isEmpty(tableInfo.getKeyColumn())) {
+        if (!StringUtils.isEmpty(tableInfo.getKeyColumn())) {
             duplicateKeySql.append(tableInfo.getKeyColumn()).append("=values(").append(tableInfo.getKeyColumn()).append("),");
         }
 
@@ -46,6 +47,7 @@ public class InsertOrUpdateBath extends AbstractMethod {
 
     /**
      * 准备属性名
+     *
      * @param tableInfo
      * @return
      */
@@ -61,10 +63,10 @@ public class InsertOrUpdateBath extends AbstractMethod {
         return fieldSql.toString();
     }
 
-    private String prepareModelValuesSql(TableInfo tableInfo){
+    private String prepareModelValuesSql(TableInfo tableInfo) {
         final StringBuilder valueSql = new StringBuilder();
         valueSql.append("<foreach collection=\"list\" item=\"item\" index=\"index\" open=\"(\" separator=\"),(\" close=\")\">");
-        if(!StringUtils.isEmpty(tableInfo.getKeyProperty())) {
+        if (!StringUtils.isEmpty(tableInfo.getKeyProperty())) {
             valueSql.append("#{item.").append(tableInfo.getKeyProperty()).append("},");
         }
         tableInfo.getFieldList().forEach(x -> valueSql.append("#{item.").append(x.getProperty()).append("},"));

generationXK-service/src/main/java/com/gyee/generation/controller/AnalysisNewController.java

@@ -5,7 +5,6 @@ import com.gyee.common.util.DateUtils;
 import com.gyee.generation.service.AnalysisNewService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -22,7 +21,7 @@ public class AnalysisNewController {
     @Resource
     private AnalysisNewService analysisNewService;
 
-//    @Scheduled(cron = "0 15 0 * * ?")
+    //    @Scheduled(cron = "0 15 0 * * ?")
     @GetMapping(value = "/companys")
     @ApiOperation(value = "公司列表", notes = "公司列表")
     public R companys() throws Exception {
@@ -31,7 +30,7 @@ public class AnalysisNewController {
         return null;
     }
 
-//    @Scheduled(cron = "0 30 0 * * ?")
+    //    @Scheduled(cron = "0 30 0 * * ?")
     @GetMapping(value = "/can")
     @ApiOperation(value = "公司列表", notes = "公司列表")
     public R cans() throws Exception {
@@ -58,20 +57,20 @@ public class AnalysisNewController {
 
 
         //补充数据可将其打开
-//        for (int i = 0; i < 44; i++) {
-//        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-//
-//        String beginDateStr = sdf.format(beginDate);
-//        String endDateStr = sdf.format(endDate);
+        //        for (int i = 0; i < 44; i++) {
+        //        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        //
+        //        String beginDateStr = sdf.format(beginDate);
+        //        String endDateStr = sdf.format(endDate);
 
 
         String yesterday = DateUtils.getYesterdayStr("yyyy-MM-dd");
         analysisNewService.saveWindProject();
 
-//          beginDate = DateUtils.addDays(beginDate, -1);
-//          calendar.add(Calendar.DAY_OF_MONTH, -1);
-//          endDate = calendar.getTime();
-//        }
+        //          beginDate = DateUtils.addDays(beginDate, -1);
+        //          calendar.add(Calendar.DAY_OF_MONTH, -1);
+        //          endDate = calendar.getTime();
+        //        }
 
         return null;
     }

generationXK-service/src/main/java/com/gyee/generation/controller/CacheController.java

@@ -14,12 +14,13 @@ public class CacheController {
 
     @Resource
     private CacheService cacheService;
+
     @GetMapping(value = "/qd")
     public AjaxResult getinformation(String wpId) throws Exception {
 
-            cacheService.initRedisCache();
+        cacheService.initRedisCache();
 
-            return AjaxResult.success();
+        return AjaxResult.success();
 
     }
 }

generationXK-service/src/main/java/com/gyee/generation/controller/EquipmentmodelController.java

@@ -7,7 +7,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author 谢生杰

generationXK-service/src/main/java/com/gyee/generation/controller/LineController.java

@@ -2,12 +2,11 @@ package com.gyee.generation.controller;
 
 
 import org.springframework.web.bind.annotation.RequestMapping;
-
 import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author 谢生杰

generationXK-service/src/main/java/com/gyee/generation/controller/MeterpointController.java

@@ -2,12 +2,11 @@ package com.gyee.generation.controller;
 
 
 import org.springframework.web.bind.annotation.RequestMapping;
-
 import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author 谢生杰

generationXK-service/src/main/java/com/gyee/generation/controller/MeterpointvalueController.java

@@ -7,7 +7,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author 谢生杰

generationXK-service/src/main/java/com/gyee/generation/controller/ProBasicBranchController.java

@@ -7,7 +7,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author xieshengjie

generationXK-service/src/main/java/com/gyee/generation/controller/ProBasicModelPowerController.java

@@ -7,7 +7,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author shilin

generationXK-service/src/main/java/com/gyee/generation/controller/ProBasicModelPowerRdController.java

@@ -7,7 +7,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author shilin