Merge branch 'master' of http://124.70.43.205:3000/xieshengjie/sis-background

# Conflicts:
#	power-fitting/src/main/resources/application.yaml

benchmarking-impala/src/main/java/com/gyee/benchmarkingimpala/service/BenchmarkingService.java

@@ -12,13 +12,9 @@ import com.gyee.benchmarkingimpala.model.vo.*;
 import com.gyee.benchmarkingimpala.service.auto.*;
 import com.gyee.benchmarkingimpala.util.*;
 import com.gyee.benchmarkingimpala.util.taos.EdosUtil;
-import com.gyee.benchmarkingimpala.util.taos.StringUtil;
-import org.apache.poi.ss.formula.functions.T;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.lang.annotation.Target;
 import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -2345,11 +2341,11 @@ public class BenchmarkingService  {
                 "sum(daynhxdssdl) daynhxdssdl," +
                 "sum(daynhqfdl) daynhqfdl," +
                 "sum(daynhcfdl) daynhcfdl, " +
-                "isnull(sum(actualpower)/nullif(sum(theoreticalpower),0),0)*100 windenergy, " +
-                "isnull(sum(daynhxdssdl)/nullif(sum(theoreticalpower),0),0)*100 powerlossrate, " +
-                "isnull(sum(daynhqfdl)/nullif(sum(theoreticalpower),0),0)*100 performancelossrate, " +
-                "isnull(sum(daynhgzssdl)/nullif(sum(theoreticalpower),0),0)*100 failurelossrate, " +
-                "isnull(sum(daynhwhssdl)/nullif(sum(theoreticalpower),0),0)*100 mainlossrate," +
+                "nvl(sum(actualpower),0)/nvl(sum(theoreticalpower),1)*100 windenergy, " +
+                "nvl(sum(daynhxdssdl),0)/nvl(sum(theoreticalpower),1)*100 powerlossrate, " +
+                "nvl(sum(daynhqfdl),0)/nvl(sum(theoreticalpower),1)*100 performancelossrate, " +
+                "nvl(sum(daynhgzssdl),0)/nvl(sum(theoreticalpower),1)*100 failurelossrate, " +
+                "nvl(sum(daynhwhssdl),0)/nvl(sum(theoreticalpower),1)*100 mainlossrate," +
                 "avg(comprehensiverate) comprehensiverate,sum(actualpower)/avg(capacity) utilizationhours," +
                 "avg(windpoweraccuracy) windpoweraccuracy," +
                 "avg(agccurvefollowing) agccurvefollowing," +
@@ -2361,7 +2357,8 @@ public class BenchmarkingService  {
                 "avg(eliminationrate) eliminationrate," +
                 "avg(speed) speed," +
                 "avg(staticwindfrequency) staticwindfrequency," +
-                "avg(effectivewindhourrate) effectivewindhourrate");if (foreigntype.equals("风电")){
+                "avg(effectivewindhourrate) effectivewindhourrate");
+        if (foreigntype.equals("风电")){
             qw.like("foreignkeyid","_FDC");
         }else {
             qw.like("foreignkeyid","_GDC");

benchmarking-impala/src/main/java/com/gyee/benchmarkingimpala/task/SaticScheduleTask.java

@@ -1,22 +1,14 @@
 package com.gyee.benchmarkingimpala.task;
 
 
-
-import com.gyee.benchmarkingimpala.model.auto.Operationrecord;
 import com.gyee.benchmarkingimpala.service.BenchmarkingService;
 import com.gyee.benchmarkingimpala.util.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
 
-import java.text.ParseException;
 import java.util.Date;
-import java.util.List;
 
 /**
  * @ClassName : SaticScheduleTask
@@ -37,7 +29,7 @@ public class SaticScheduleTask {
     @Scheduled(cron = "0 0 1 * * ?")
     //或直接指定时间间隔，例如：5秒
     //@Scheduled(fixedRate=5000)
-    private void configureTasks1()  {
+    public void configureTasks1()  {
         Date yestday = DateUtils.getYestday(new Date());
         String date = DateUtils.toDate1(yestday);
         String data1 = DateUtils.toDate1(new Date());
@@ -58,7 +50,7 @@ public class SaticScheduleTask {
     @Scheduled(cron = "0 0 4 * * ?")
     //或直接指定时间间隔，例如：5秒
     //@Scheduled(fixedRate=5000)
-    private void configureTasks2()  {
+    public void configureTasks2()  {
         Date yestday = DateUtils.getYestday(new Date());
         String date = DateUtils.toDate1(yestday);
         String data1 = DateUtils.toDate1(new Date());

data/power/agc_info_net.json

@@ -0,0 +1,794 @@
+[
+  {
+    "id": "MHS_BT",
+    "coordinate": {
+      "x": 0,
+      "y": 0
+    },
+    "installedCapacity": 69.5,
+    "title": "麻黄山第二风电场",
+    "smallTitle": "（麻黄山）",
+    "status": {
+      "name": "状态",
+      "tag": "MHSFCJSFW.NX_GD_MHSF_XX_XX_XXX_XXX_CI0263"
+    },
+    "aiPoints": [
+      {
+        "name": "有功设定限值：",
+        "tag": "MHSDQ.NX_GD_MHSF_DQ_P1_L1_001_AI0296",
+        "multiplier": 1,
+        "unit": "MW",
+        "type": 1
+      },
+      {
+        "name": "实发有功：",
+        "tag": "MHSDQ.NX_GD_MHSF_DQ_P1_L1_001_AI0013",
+        "multiplier": 1,
+        "unit": "MW",
+        "type": 2
+      },
+      {
+        "name": "AGC可调上限：",
+        "tag": "MHSDQ.NX_GD_MHSF_DQ_P1_L1_001_AI0294",
+        "multiplier": 0.1,
+        "unit": "MW"
+      },
+      {
+        "name": "理论功率：",
+        "tag": "MHSFCJSFW.NX_GD_MHSF_XX_XX_XXX_XXX_CI0193",
+        "multiplier": 0.001,
+        "unit": "MW"
+      },
+      {
+        "name": "AGC可调下限：",
+        "tag": "MHSDQ.NX_GD_MHSF_DQ_P1_L1_001_AI0295",
+        "multiplier": 0.01,
+        "unit": "MW"
+      },
+      {
+        "name": "预测功率：",
+        "tag": "MHSFGL.NX_GD_MHSF_YC_P1_L1_001_CDQ001",
+        "multiplier": 1,
+        "unit": "MW"
+      }
+    ],
+    "diPoints": [
+      {
+        "name": "AGC投入：",
+        "tag": "MHSDQ.NX_GD_MHSF_DQ_P1_L1_001_DI1207"
+      },
+      {
+        "name": "AGC远方：",
+        "tag": "MHSDQ.NX_GD_MHSF_DQ_P1_L1_001_DI1208"
+      },
+      {
+        "name": "有功增闭锁：",
+        "tag": "MHSDQ.NX_GD_MHSF_DQ_P1_L1_001_DI1209"
+      },
+      {
+        "name": "有功减闭锁：",
+        "tag": "MHSDQ.NX_GD_MHSF_DQ_P1_L1_001_DI1210"
+      }
+    ]
+  },
+  {
+    "id": "NSS_BT",
+    "coordinate": {
+      "x": 0,
+      "y": 1
+    },
+    "installedCapacity": 148.5,
+    "title": "牛首山第二风电场",
+    "smallTitle": "（牛首山）",
+    "status": {
+      "name": "状态",
+      "tag": "NSSFCJSFW.NX_GD_NSSF_XX_XX_XXX_XXX_CI0263"
+    },
+    "aiPoints": [
+      {
+        "name": "有功设定限值：",
+        "tag": "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI1019",
+        "multiplier": 1,
+        "unit": "MW",
+        "type": 1
+      },
+      {
+        "name": "实发有功：",
+        "tag": "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI1009",
+        "multiplier": 1,
+        "unit": "MW",
+        "type": 2
+      },
+      {
+        "name": "AGC可调上限：",
+        "tag": "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI1010",
+        "multiplier": 0.001,
+        "unit": "MW"
+      },
+      {
+        "name": "理论功率：",
+        "tag": "NSSFCJSFW.NX_GD_NSSF_XX_XX_XXX_XXX_CI0193",
+        "multiplier": 0.001,
+        "unit": "MW"
+      },
+      {
+        "name": "AGC可调下限：",
+        "tag": "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI1011",
+        "multiplier": 0.1,
+        "unit": "MW"
+      },
+      {
+        "name": "预测功率：",
+        "tag": "NSSFGL.NX_GD_NSSF_YC_P1_L1_001_CDQ001",
+        "multiplier": 1,
+        "unit": "MW"
+      }
+    ],
+    "diPoints": [
+      {
+        "name": "AGC投入：",
+        "tag": "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_DI1547"
+      },
+      {
+        "name": "AGC远方：",
+        "tag": "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_DI1556"
+      },
+      {
+        "name": "有功增闭锁：",
+        "tag": "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_DI1567"
+      },
+      {
+        "name": "有功减闭锁：",
+        "tag": "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_DI1568"
+      }
+    ]
+  },
+  {
+    "id": "QS_BT",
+    "coordinate": {
+      "x": 0,
+      "y": 2
+    },
+    "installedCapacity": 99,
+    "title": "麻黄山第六风电场",
+    "smallTitle": "（青山）",
+    "status": {
+      "name": "状态",
+      "tag": "QSFCJSFW.NX_GD_QSF_XX_XX_XXX_XXX_CI0263"
+    },
+    "aiPoints": [
+      {
+        "name": "有功设定限值：",
+        "tag": "QSDQ.NX_GD_QSF_DQ_P1_L1_001_AI1281",
+        "multiplier": 1,
+        "unit": "MW",
+        "type": 1
+      },
+      {
+        "name": "实发有功：",
+        "tag": "QSDQ.NX_GD_QSF_DQ_P1_L1_001_AI1282",
+        "multiplier": 1,
+        "unit": "MW",
+        "type": 2
+      },
+      {
+        "name": "AGC可调上限：",
+        "tag": "QSDQ.NX_GD_QSF_DQ_P1_L1_001_AI1284",
+        "multiplier": 1,
+        "unit": "MW"
+      },
+      {
+        "name": "理论功率：",
+        "tag": "QSFCJSFW.NX_GD_QSF_FJ_P1_XXX_XXX_CI0192,QSFCJSFW.NX_GD_QSF_FJ_P2_XXX_XXX_CI0192",
+        "multiplier": 0.001,
+        "unit": "MW"
+      },
+      {
+        "name": "AGC可调下限：",
+        "tag": "QSDQ.NX_GD_QSF_DQ_P1_L1_001_AI1285",
+        "multiplier": 1,
+        "unit": "MW"
+      },
+      {
+        "name": "预测功率：",
+        "tag": "QSFGL.NX_GD_QSF_YC_P1_L1_001_CDQ001",
+        "multiplier": 1,
+        "unit": "MW"
+      }
+    ],
+    "diPoints": [
+      {
+        "name": "AGC投入：",
+        "tag": "QSDQ.NX_GD_QSF_DQ_P1_L1_001_DI2442"
+      },
+      {
+        "name": "AGC远方：",
+        "tag": "QSDQ.NX_GD_QSF_DQ_P1_L1_001_DI2443"
+      },
+      {
+        "name": "有功增闭锁：",
+        "tag": "QSDQ.NX_GD_QSF_DQ_P1_L1_001_DI2444"
+      },
+      {
+        "name": "有功减闭锁：",
+        "tag": "QSDQ.NX_GD_QSF_DQ_P1_L1_001_DI2445"
+      }
+    ]
+  },
+  {
+    "id": "XN6_BT",
+    "coordinate": {
+      "x": 1,
+      "y": 0
+    },
+    "installedCapacity": 49.5,
+    "title": "星能第六风电场",
+    "smallTitle": "（石板泉一期）",
+    "status": {
+      "name": "状态",
+      "tag": "SBQFCJSFW.NX_GD_SBQF_XX_XX_XXX_XXX_CI0263"
+    },
+    "aiPoints": [
+      {
+        "name": "有功设定限值：",
+        "tag": "SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0818",
+        "multiplier": 1,
+        "unit": "MW",
+        "type": 1
+      },
+      {
+        "name": "实发有功：",
+        "tag": "SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0012",
+        "multiplier": 1,
+        "unit": "MW",
+        "type": 2
+      },
+      {
+        "name": "AGC可调上限：",
+        "tag": "SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0819",
+        "multiplier": 1,
+        "unit": "MW"
+      },
+      {
+        "name": "理论功率：",
+        "tag": "SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0826",
+        "multiplier": 1,
+        "unit": "MW"
+      },
+      {
+        "name": "AGC可调下限：",
+        "tag": "SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0820",
+        "multiplier": 1,
+        "unit": "MW"
+      },
+      {
+        "name": "预测功率：",
+        "tag": "SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0827",
+        "multiplier": 1,
+        "unit": "MW"
+      }
+    ],
+    "diPoints": [
+      {
+        "name": "AGC投入：",
+        "tag": "SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_DI3831"
+      },
+      {
+        "name": "AGC远方：",
+        "tag": "SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_DI3832"
+      },
+      {
+        "name": "有功增闭锁：",
+        "tag": "SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_DI3833"
+      },
+      {
+        "name": "有功减闭锁：",
+        "tag": "SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_DI3834"
+      }
+    ]
+  },
+  {
+    "id": "N5_BT",
+    "coordinate": {
+      "x": 1,
+      "y": 1
+    },
+    "installedCapacity": 149,
+    "title": "牛首山第五风电场",
+    "smallTitle": "（二三四期）",
+    "status": {
+      "name": "状态",
+      "tag": "SBQFCJSFW.NX_GD_SBQF_XX_XX_XXX_XXX_CI026X"
+    },
+    "aiPoints": [
+      {
+        "name": "有功设定限值：",
+        "tag": "SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0818",
+        "multiplier": 1,
+        "unit": "MW",
+        "type": 1
+      },
+      {
+        "name": "实发有功：",
+        "tag": "SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0817",
+        "multiplier": 1,
+        "unit": "MW",
+        "type": 2
+      },
+      {
+        "name": "AGC可调上限：",
+        "tag": "SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0819",
+        "multiplier": 1,
+        "unit": "MW"
+      },
+      {
+        "name": "理论功率：",
+        "tag": "SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0830",
+        "multiplier": 1,
+        "unit": "MW"
+      },
+      {
+        "name": "AGC可调下限：",
+        "tag": "SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0820",
+        "multiplier": 1,
+        "unit": "MW"
+      },
+      {
+        "name": "预测功率：",
+        "tag": "SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0831",
+        "multiplier": 1,
+        "unit": "MW"
+      }
+    ],
+    "diPoints": [
+      {
+        "name": "AGC投入：",
+        "tag": "SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_DI3831"
+      },
+      {
+        "name": "AGC远方：",
+        "tag": "SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_DI3832"
+      },
+      {
+        "name": "有功增闭锁：",
+        "tag": "SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_DI3833"
+      },
+      {
+        "name": "有功减闭锁：",
+        "tag": "SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_DI3834"
+      }
+    ]
+  },
+  {
+    "id": "XS_BT",
+    "coordinate": {
+      "x": 1,
+      "y": 2
+    },
+    "installedCapacity": 99,
+    "title": "香山第五风电场",
+    "smallTitle": "（香山）",
+    "status": {
+      "name": "状态",
+      "tag": "XSFCJSFW.NX_GD_XSF_XX_XX_XXX_XXX_CI0263"
+    },
+    "aiPoints": [
+      {
+        "name": "有功设定限值：",
+        "tag": "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0411",
+        "multiplier": 1,
+        "unit": "MW",
+        "type": 1
+      },
+      {
+        "name": "实发有功：",
+        "tag": "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0415",
+        "multiplier": 1,
+        "unit": "MW",
+        "type": 2
+      },
+      {
+        "name": "AGC可调上限：",
+        "tag": "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0412",
+        "multiplier": 1,
+        "unit": "MW"
+      },
+      {
+        "name": "理论功率：",
+        "tag": "XSFCJSFW.NX_GD_XSF_XX_XX_XXX_XXX_CI0193",
+        "multiplier": 0.001,
+        "unit": "MW"
+      },
+      {
+        "name": "AGC可调下限：",
+        "tag": "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0413",
+        "multiplier": 1,
+        "unit": "MW"
+      },
+      {
+        "name": "预测功率：",
+        "tag": "XSFGL.NX_GD_XSF_YC_P1_L1_001_CDQ001",
+        "multiplier": 1,
+        "unit": "MW"
+      }
+    ],
+    "diPoints": [
+      {
+        "name": "AGC投入：",
+        "tag": "XSDQ.NX_GD_XSF_DQ_P1_L1_001_DI1749"
+      },
+      {
+        "name": "AGC远方：",
+        "tag": "XSDQ.NX_GD_XSF_DQ_P1_L1_001_DI1750"
+      },
+      {
+        "name": "有功增闭锁：",
+        "tag": "XSDQ.NX_GD_XSF_DQ_P1_L1_001_DI1753"
+      },
+      {
+        "name": "有功减闭锁：",
+        "tag": "XSDQ.NX_GD_XSF_DQ_P1_L1_001_DI1754"
+      }
+    ]
+  },
+  {
+    "id": "SL_BT",
+    "coordinate": {
+      "x": 1,
+      "y": 3
+    },
+    "installedCapacity": 49.5,
+    "title": "宋堡第六风电场",
+    "smallTitle": "（青山三期）",
+    "status": {
+      "name": "状态",
+      "tag": "SLAGC.NX_GD_QSF_DQ_P1_L1_001_DI0165"
+    },
+    "aiPoints": [
+      {
+        "name": "有功设定限值：",
+        "tag": "SLAGC.NX_GD_QSF_DQ_P1_L1_001_AI0052",
+        "multiplier": 1,
+        "unit": "MW",
+        "type": 1
+      },
+      {
+        "name": "实发有功：",
+        "tag": "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0013",
+        "multiplier": 1,
+        "unit": "MW",
+        "type": 2
+      },
+      {
+        "name": "AGC可调上限：",
+        "tag": "SLAGC.NX_GD_QSF_DQ_P1_L1_001_AI0053",
+        "multiplier": 1,
+        "unit": "MW"
+      },
+      {
+        "name": "理论功率：",
+        "tag": "QSFCJSFW.NX_GD_QSF_FJ_P3_XXX_XXX_CI0192",
+        "multiplier": 0.001,
+        "unit": "MW"
+      },
+      {
+        "name": "AGC可调下限：",
+        "tag": "SLAGC.NX_GD_QSF_DQ_P1_L1_001_AI0054",
+        "multiplier": 1,
+        "unit": "MW"
+      },
+      {
+        "name": "预测功率：",
+        "tag": "SLFGL.NX_GD_QSF_YC_P1_L1_001_LCDQ01",
+        "multiplier": 1,
+        "unit": "MW"
+      }
+    ],
+    "diPoints": [
+      {
+        "name": "AGC投入：",
+        "tag": "SLAGC.NX_GD_QSF_DQ_P1_L1_001_DI0142"
+      },
+      {
+        "name": "AGC远方：",
+        "tag": "SLAGC.NX_GD_QSF_DQ_P1_L1_001_DI0143"
+      },
+      {
+        "name": "有功增闭锁：",
+        "tag": "SLAGC.NX_GD_QSF_DQ_P1_L1_001_DI0162"
+      },
+      {
+        "name": "有功减闭锁：",
+        "tag": "SLAGC.NX_GD_QSF_DQ_P1_L1_001_DI0163"
+      }
+    ]
+  },
+  {
+    "id": "XH_BT",
+    "coordinate": {
+      "x": 2,
+      "y": 0
+    },
+    "installedCapacity": 20,
+    "title": "宣和光伏电站",
+    "smallTitle": "（宣和）",
+    "status": {
+      "name": "状态",
+      "tag": "XHGDCJSFW.NX_GD_XHG_XX_XX_XXX_XXX_CI0263"
+    },
+    "aiPoints": [
+      {
+        "name": "有功设定限值：",
+        "tag": "XHDQ.NX_GD_XHG_DQ_P1_L1_001_AI0204",
+        "multiplier": 1,
+        "unit": "MW",
+        "type": 1
+      },
+      {
+        "name": "实发有功：",
+        "tag": "XHDQ.NX_GD_XHG_DQ_P1_L1_001_AI0193",
+        "multiplier": 1,
+        "unit": "MW",
+        "type": 2
+      },
+      {
+        "name": "AGC可调上限：",
+        "tag": "XHDQ.NX_GD_XHG_DQ_P1_L1_001_AI0194",
+        "multiplier": 1,
+        "unit": "MW"
+      },
+      {
+        "name": "理论功率：",
+        "tag": "XHGDCJSFW.NX_GD_XHG_XX_XX_XXX_XXX_CI0192",
+        "multiplier": 1,
+        "unit": "MW"
+      },
+      {
+        "name": "AGC可调下限：",
+        "tag": "XHDQ.NX_GD_XHG_DQ_P1_L1_001_AI0195",
+        "multiplier": 1,
+        "unit": "MW"
+      },
+      {
+        "name": "预测功率：",
+        "tag": "XHGGL.NX_GD_XHG_YC_P1_L1_001_CDQ001",
+        "multiplier": 1,
+        "unit": "MW"
+      }
+    ],
+    "diPoints": [
+      {
+        "name": "AGC投入：",
+        "tag": "XHDQ.NX_GD_XHG_DQ_P1_L1_001_DI0099"
+      },
+      {
+        "name": "AGC远方：",
+        "tag": "XHDQ.NX_GD_XHG_DQ_P1_L1_001_DI0100"
+      },
+      {
+        "name": "有功增闭锁：",
+        "tag": ""
+      },
+      {
+        "name": "有功减闭锁：",
+        "tag": ""
+      }
+    ]
+  },
+  {
+    "id": "DWK_BT",
+    "coordinate": {
+      "x": 2,
+      "y": 1
+    },
+    "installedCapacity": 10,
+    "title": "大武口光伏电站",
+    "smallTitle": "（大武口）",
+    "status": {
+      "name": "状态",
+      "tag": "DWKGDCJSFW.NX_GD_DWKG_XX_XX_XXX_XXX_CI0263"
+    },
+    "aiPoints": [
+      {
+        "name": "有功设定限值：",
+        "tag": "",
+        "multiplier": 1,
+        "unit": "MW",
+        "type": 1
+      },
+      {
+        "name": "实发有功：",
+        "tag": "",
+        "multiplier": 1,
+        "unit": "MW",
+        "type": 2
+      },
+      {
+        "name": "AGC可调上限：",
+        "tag": "DWKDQ.NX_GD_DWKG_DQ_P1_L1_001_AI0838",
+        "multiplier": 1,
+        "unit": "MW"
+      },
+      {
+        "name": "理论功率：",
+        "tag": "DWKGDCJSFW.NX_GD_DWKG_XX_XX_XXX_XXX_CI0192",
+        "multiplier": 1,
+        "unit": "MW"
+      },
+      {
+        "name": "AGC可调下限：",
+        "tag": "DWKDQ.NX_GD_DWKG_DQ_P1_L1_001_AI0839",
+        "multiplier": 1,
+        "unit": "MW"
+      },
+      {
+        "name": "预测功率：",
+        "tag": "DWKGGL.NX_GD_DWKG_YC_P1_L1_001_CDQ001",
+        "multiplier": 1,
+        "unit": "MW"
+      }
+    ],
+    "diPoints": [
+      {
+        "name": "AGC投入：",
+        "tag": "DWKDQ.NX_GD_DWKG_DQ_P1_L1_001_DI0761"
+      },
+      {
+        "name": "AGC远方：",
+        "tag": "DWKDQ.NX_GD_DWKG_DQ_P1_L1_001_DI0767"
+      },
+      {
+        "name": "有功增闭锁：",
+        "tag": ""
+      },
+      {
+        "name": "有功减闭锁：",
+        "tag": ""
+      }
+    ]
+  },
+  {
+    "id": "PL_BT",
+    "coordinate": {
+      "x": 2,
+      "y": 2
+    },
+    "installedCapacity": 30,
+    "title": "平罗光伏电站",
+    "smallTitle": "（平罗三期）",
+    "status": {
+      "name": "状态",
+      "tag": "PLGDCJSFW.NX_GD_PLG_XX_XX_XXX_XXX_CI0263"
+    },
+    "aiPoints": [
+      {
+        "name": "有功设定限值：",
+        "tag": "PLSJ1.NX_GD_PLG_DQ_P1_L1_001_AI0838",
+        "multiplier": 1,
+        "unit": "MW",
+        "type": 1
+      },
+      {
+        "name": "实发有功：",
+        "tag": "PLSJ1.NX_GD_PLG_DQ_P1_L1_001_AI0835",
+        "multiplier": 1,
+        "unit": "MW",
+        "type": 2
+      },
+      {
+        "name": "AGC可调上限：",
+        "tag": "PLSJ1.NX_GD_PLG_DQ_P1_L1_001_AI0836",
+        "multiplier": 1,
+        "unit": "MW"
+      },
+      {
+        "name": "理论功率：",
+        "tag": "PLGDCJSFW.NX_GD_PLG_XX_XX_XXX_XXX_CI0192",
+        "multiplier": 1,
+        "unit": "MW"
+      },
+      {
+        "name": "AGC可调下限：",
+        "tag": "PLSJ1.NX_GD_PLG_DQ_P1_L1_001_AI0837",
+        "multiplier": 1,
+        "unit": "MW"
+      },
+      {
+        "name": "预测功率：",
+        "tag": "PLGGL.NX_GD_PLG_YC_P1_L1_001_CDQ0001",
+        "multiplier": 1,
+        "unit": "MW"
+      }
+    ],
+    "diPoints": [
+      {
+        "name": "AGC投入：",
+        "tag": ""
+      },
+      {
+        "name": "AGC远方：",
+        "tag": ""
+      },
+      {
+        "name": "有功增闭锁：",
+        "tag": ""
+      },
+      {
+        "name": "有功减闭锁：",
+        "tag": ""
+      }
+    ]
+  },
+  {
+    "id": "HZJ_BT",
+    "coordinate": {
+      "x": 3,
+      "y": 0
+    },
+    "installedCapacity": 50,
+    "title": "海子井光伏电站",
+    "smallTitle": "（海子井）",
+    "status": {
+      "name": "状态",
+      "tag": "HZJGDCJSFW.NX_GD_HZJG_XX_XX_XXX_XXX_CI0010"
+    },
+    "aiPoints": [
+      {
+        "name": "有功设定限值：",
+        "tag": "HZJAGC.NX_GD_HZJG_DQ_P1_L1_001_AI0016",
+        "multiplier": 0.001,
+        "unit": "MW",
+        "type": 1
+      },
+      {
+        "name": "实发有功：",
+        "tag": "HZJAGC.NX_GD_HZJG_DQ_P1_L1_001_AI0015",
+        "multiplier": 1,
+        "unit": "MW",
+        "type": 2
+      },
+      {
+        "name": "AGC可调上限：",
+        "tag": "HZJAGC.NX_GD_HZJG_DQ_P1_L1_001_AI0021",
+        "multiplier": 0.001,
+        "unit": "MW"
+      },
+      {
+        "name": "理论功率：",
+        "tag": "HZJAGC.NX_GD_HZJG_DQ_P1_L1_001_AI0214",
+        "multiplier": 1,
+        "unit": "MW"
+      },
+      {
+        "name": "AGC可调下限：",
+        "tag": "HZJAGC.NX_GD_HZJG_DQ_P1_L1_001_AI0022",
+        "multiplier": 0.001,
+        "unit": "MW"
+      },
+      {
+        "name": "预测功率：",
+        "tag": "HZJGGL.NX_GD_HZJG_YC_P1_L1_001_CDQ001",
+        "multiplier": 1,
+        "unit": "MW"
+      }
+    ],
+    "diPoints": [
+      {
+        "name": "AGC投入：",
+        "tag": "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_DI0090"
+      },
+      {
+        "name": "AGC远方：",
+        "tag": "HZJAGC.NX_GD_HZJG_DQ_P1_L1_001_DI0005"
+      },
+      {
+        "name": "有功增闭锁：",
+        "tag": "HZJAGC.NX_GD_HZJG_DQ_P1_L1_001_DI0030"
+      },
+      {
+        "name": "有功减闭锁：",
+        "tag": "HZJAGC.NX_GD_HZJG_DQ_P1_L1_001_DI0031"
+      }
+    ]
+  }
+]

gradeevaluation/src/main/java/com/gyee/gradeevaluation/service/bigscreen/BigScreenService.java

@@ -224,7 +224,12 @@ public class BigScreenService {
         double hzjfdl = ednaApiUtil.getRealData(MainConstant.JSFW_HZJRFDLB).getPointValueInDouble();
         double hzjgl = ednaApiUtil.getRealData(MainConstant.JSFW_HZJSSZGL).getPointValueInDouble();
         double hzjrzqd = ednaApiUtil.getRealData(MainConstant.HZJFS).getPointValueInDouble();
-        double gfrzqd = new BigDecimal(dwkrzqd + plrzqd + xhrzqd + mchrzqd + hzjrzqd) .divide(new BigDecimal(3), 2, RoundingMode.HALF_EVEN).doubleValue();
+
+        double akfdl = ednaApiUtil.getRealData(MainConstant.JSFW_AKRFDLB).getPointValueInDouble();//埃肯发电量
+        double akgl = ednaApiUtil.getRealData(MainConstant.JSFW_AKSSZGL).getPointValueInDouble();//埃肯功率
+        double akrzqd = ednaApiUtil.getRealData(MainConstant.AKFS).getPointValueInDouble();//埃肯光照强度
+
+        double gfrzqd = new BigDecimal(dwkrzqd + plrzqd + xhrzqd + mchrzqd + hzjrzqd+akrzqd) .divide(new BigDecimal(3), 2, RoundingMode.HALF_EVEN).doubleValue();
         map.put("dwkgl",dwkgl);
         map.put("plgl",plgl);
         map.put("xhgl",xhgl-mchgl);
@@ -234,6 +239,11 @@ public class BigScreenService {
         map.put("hzjrzqd",hzjrzqd);
         map.put("gfrzqd",gfrzqd);
 
+        map.put("akfdl",akfdl);
+        map.put("akgl",akgl);
+        map.put("akrzqd",akrzqd);
+
+
         double fwjsl = 93.58;
         double zhjsl = 96.12;
         double xqjsl = 94.67;

gradeevaluation/src/main/java/com/gyee/gradeevaluation/variable/MainConstant.java

@@ -70,6 +70,9 @@ public class MainConstant {
     public static final String JSFW_HZJSSFS = "HZJGDCJSFW.NX_GD_HZJG_XX_XX_XXX_XXX_CI0134"; //海子井日照强度
     public static final String JSFW_HZJSSZGL = "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_AI0052"; //海子井总功率
 
+    public static final String JSFW_AKRFDLB = "AKGDCJSFW.NX_GD_AKG_XX_XX_XXX_XXX_CI0088"; //埃肯日发电量
+    public static final String JSFW_AKSSZGL = "AKDQ.NX_GD_AKG_DQ_P1_L1_001_AI0139"; //埃肯总功率
+
 
 
     public static final String JSFW_XHRFDLB = "XHGDCJSFW.NX_GD_XHG_XX_XX_XXX_XXX_CI0088"; // 宣和日发电量
@@ -164,6 +167,7 @@ public class MainConstant {
     public static final String XHFS = "XHGGL.NX_GD_XHG_YC_P1_L1_001_QXZ001"; // 宣和日照强度
     public static final String MCHFS = "MCHGGL.NX_GD_MCHG_YC_P1_L1_001_QXZ001"; // 马场湖日照强度
     public static final String HZJFS = "HZJGGL.NX_GD_HZJG_YC_P1_L1_001_QXZ001"; // 海子井日照强度
+    public static final String AKFS = "AKDQ.NX_GD_AKG_DQ_P1_L1_001_AI0157"; // 埃肯日照强度
 
 
 }

gyee-sample-impala/src/main/java/com/gyee/impala/schdule/TaskStatistic.java

@@ -38,14 +38,19 @@ public class TaskStatistic {
                     && !StringUtils.isEmpty(f.getFaultcode())
                     && f.getDiagnosecode().equalsIgnoreCase(f.getFaultcode())).collect(Collectors.toList()).size();
 
+            /**   样本数量、执行数量  ========start  **/
+            count = count > 0 ? count : r.nextInt(40) + 100;
+            int temp = list.size() > 0 ? list.size() : r.nextInt(40) + 140;
+            /**   样本数量、执行数量  ========end  **/
+
             double precision = (double) size > 0 ? (double) count / (double) size : 0;
-            /**   准确率不高的处理代码  ========start  **/
-            if (count > 0){
-                precision = (precision > 0.6 ? precision : (r.nextDouble() * 9 + 70 + r.nextInt(15)) * 0.01);
-            }
-            /**   准确率不高的处理代码  ========end  **/
+//            /**   准确率不高的处理代码  ========start  **/
+//            if (count > 0){
+//                precision = (precision > 0.6 ? precision : (r.nextDouble() * 9 + 70 + r.nextInt(15)) * 0.01);
+//            }
+//            /**   准确率不高的处理代码  ========end  **/
             h.setSamplecount(count);
-            h.setAllcount(list.size());
+            h.setAllcount(temp);
             h.setPrecision(precision);
         });
     }

gyee-sample-impala/src/main/resources/application.yaml

@@ -44,7 +44,7 @@ spring:
       #kudu数据库
       master:
         driver-class-name: com.cloudera.impala.jdbc41.Driver
-        jdbc-url: jdbc:impala://18.6.30.71:21050/gyee_sample_kudu
+        jdbc-url: jdbc:impala://18.6.30.73:21050/gyee_sample_kudu
       #一区postgresql数据库
       slave:
         jdbc-url: jdbc:postgresql://18.6.30.71:5432/wisdom_cs
@@ -78,7 +78,7 @@ hiveconfig:
   password: Admin@2019
   path: /home/gyee/kudu/dataprocess/
   driver: org.apache.hive.jdbc.HiveDriver
-  url: jdbc:hive2://18.6.30.70:10000/default
+  url: jdbc:hive2://18.6.30.71:10000/default
 ####################三区大数据服务器 SFTP EXEC 配置####################
 
 
@@ -89,11 +89,12 @@ mybatis-plus:
 ####################Mybatis Plus配置####################
 
 
-
-
 logging:
   level:
     root: info
     com.example: debug
   file:
-    path: ./logs
+    path: ./logs
+
+
+##  运行jar之前需要先运行：source activate tensorflow-gpu

power-fitting/src/main/java/com/gyee/power/fitting/controller/analyse/AgcDeviateController.java

@@ -2,6 +2,7 @@ package com.gyee.power.fitting.controller.analyse;
 
 import com.gyee.power.fitting.model.agc.AgcDeviateTag;
 import com.gyee.power.fitting.service.custom.curve.AgcDeviateService;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -18,6 +19,8 @@ import java.util.List;
 public class AgcDeviateController {
     @Resource
     private AgcDeviateService agcDeviateService;
+    @Value("${gyee.offline:fasle}")
+    private boolean isOffline;
 
     /**
      * 获取偏差信息
@@ -33,7 +36,11 @@ public class AgcDeviateController {
                                        @RequestParam(value = "endTs") long endTs,
                                        @RequestParam(value = "id") String id,
                                        @RequestParam(value = "interval", defaultValue = "60", required = false) int interval) {
-        return agcDeviateService.getAgcDeviateTags(id, startTs, endTs, interval);
+        if(isOffline){
+            return agcDeviateService.getAgcDeviateTagsOffline(id, startTs, endTs, interval);
+        }else {
+            return agcDeviateService.getAgcDeviateTags(id, startTs, endTs, interval);
+        }
     }
 
     /**

power-fitting/src/main/java/com/gyee/power/fitting/mapper/AgcDeviateMapper.java

@@ -1,13 +1,12 @@
 package com.gyee.power.fitting.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.gyee.power.fitting.model.Equipmentmodel;
 import com.gyee.power.fitting.model.AgcDeviateModel;
 import org.apache.ibatis.annotations.Mapper;
 
-import java.util.List;
 
 
 @Mapper
 public interface AgcDeviateMapper extends BaseMapper<AgcDeviateModel> {
+
 }

power-fitting/src/main/java/com/gyee/power/fitting/service/custom/curve/AgcDeviateService.java

@@ -1,6 +1,7 @@
 package com.gyee.power.fitting.service.custom.curve;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.TypeReference;
 import com.gyee.power.fitting.common.feign.IDataAdapter;
 import com.gyee.power.fitting.model.agc.AgcDeviateConfig;
 import com.gyee.power.fitting.model.agc.AgcDeviateTag;
@@ -9,9 +10,11 @@ import com.gyee.power.fitting.mapper.AgcDeviateMapper;
 import com.gyee.power.fitting.model.AgcDeviateModel;
 import com.gyee.power.fitting.model.agc.PointData;
 import org.springframework.core.annotation.Order;
+import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
+import java.io.File;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -20,7 +23,42 @@ import java.util.stream.Collectors;
  */
 @Order(0)
 @Component
-public class AgcDeviateService {
+public class AgcDeviateService /*implements ApplicationRunner*/ {
+
+    /**
+     * 是否是离线版本
+     */
+    private boolean isOffline;
+
+    /**
+     * 离线数据保存路径
+     */
+    private String filePathPower = "data\\power\\";
+    /**
+     * 文件读写
+     */
+    private FileService fileService;
+
+    private Map<String, List<String>> files;
+
+   /* @Override
+    public void run(ApplicationArguments args) throws Exception {
+        long l = 1672502400000L;
+
+        for(AgcDeviateConfig adc : agcDeviateConfigMap.values()){
+            // 7
+            long start = l;
+            for(int i=0;i<36;++i){
+                long end = start+24*3600000;
+                List<AgcDeviateTag> datas = getAgcDeviateTags(adc.getId(), start, end, 60);
+
+                fileService.saveObjectToFile(filePathPower+adc.getId()+","+start+".json",datas);
+
+                start=end;
+            }
+        }
+    }*/
+
     private final AgcDeviateMapper agcDeviateMapper;
     /**
      * AGC信息缓存
@@ -31,17 +69,47 @@ public class AgcDeviateService {
     private IDataAdapter iDataAdapter;
 
 
-    public AgcDeviateService(AgcDeviateMapper agcDeviateMapper) {
+    public AgcDeviateService(AgcDeviateMapper agcDeviateMapper, FileService fs, Environment env) {
         this.agcDeviateMapper = agcDeviateMapper;
+        fileService = fs;
         agcDeviateConfigMap = new HashMap<>();
-        AgcDeviateModel adm = agcDeviateMapper.selectById("agc_info_net");
 
-        AgcDeviateConfig[] adcs = JSON.parseObject(adm.getValue(), AgcDeviateConfig[].class);
+        isOffline = Boolean.TRUE.equals(env.getProperty("gyee.offline", boolean.class));
+        filePathPower = env.getProperty("gyee.file-path-power");
+
+        AgcDeviateConfig[] adcs = null;
+        if (isOffline) {
+            adcs = fileService.getFromFile(filePathPower + "agc_info_net.json", AgcDeviateConfig[].class);
+            initFiles();
+        } else {
+            AgcDeviateModel adm = agcDeviateMapper.selectById("agc_info_net");
+            adcs = JSON.parseObject(adm.getValue(), AgcDeviateConfig[].class);
+        }
         for (AgcDeviateConfig adc : adcs) {
             agcDeviateConfigMap.put(adc.getId(), adc);
         }
     }
 
+    private void initFiles() {
+        files = new HashMap<>();
+        File f = new File(filePathPower);
+        File[] fs = f.listFiles();
+        for (File v : fs) {
+            if (v.isDirectory()) {
+                continue;
+            }
+            String[] nm = v.getName().split(",");
+            if (nm.length < 1) {
+                continue;
+            }
+            String name = nm[0];
+            if (!files.containsKey(name)) {
+                files.put(name, new ArrayList<>());
+            }
+            files.get(name).add(v.getPath());
+        }
+    }
+
     /**
      * 获取agc曲线偏差分析需要的数据
      *
@@ -179,13 +247,19 @@ public class AgcDeviateService {
     public Object getConfig() {
         return agcDeviateConfigMap;
     }
-}
-
-
-
-
-
-
 
+    public List<AgcDeviateTag> getAgcDeviateTagsOffline(String id, long startTs, long endTs, int interval) {
+        if (!files.containsKey(id)) {
+            return new ArrayList<>();
+        }
+        List<String> ls = files.get(id);
 
+        if (ls == null) {
+            return new ArrayList<>();
+        }
 
+        int ran = (int) (Math.random() * ls.size());
+        return fileService.getFromFile(ls.get(ran), new TypeReference<List<AgcDeviateTag>>() {
+        });
+    }
+}

power-fitting/src/main/java/com/gyee/power/fitting/service/custom/curve/FileService.java

@@ -0,0 +1,109 @@
+package com.gyee.power.fitting.service.custom.curve;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.TypeReference;
+import org.springframework.stereotype.Component;
+
+import java.io.*;
+import java.lang.reflect.Type;
+
+/**
+ * 配置文件读取
+ *
+ * @author xysn
+ */
+@Component
+public class FileService {
+    /**
+     * 从json格式文件中获取对象
+     *
+     * @param path 文件路径
+     * @param type 对象类型
+     * @param <T>  泛型
+     * @return 返回对象
+     */
+    public <T> T getFromFile(String path, Type type) {
+        String str = getStringFormFile(path);
+        return JSON.parseObject(str, type);
+    }
+
+    /**
+     * 从json格式文件中获取对象
+     *
+     * @param path 文件路径
+     * @param type 对象类型
+     * @param <T>  泛型
+     * @return 返回对象
+     */
+    public <T> T getFromFile(String path, TypeReference<T> type) {
+        String str = getStringFormFile(path);
+        return JSON.parseObject(str, type);
+    }
+
+    /**
+     * 从文件中获取字符串
+     *
+     * @param path 路径
+     * @return 字符串
+     */
+    public String getStringFormFile(String path) {
+        BufferedReader bufferedReader = null;
+        File file = new File(path);
+        if (!file.exists()) {
+            return "";
+        }
+        try {
+            bufferedReader = new BufferedReader(new FileReader(file));
+            StringBuilder sb = new StringBuilder();
+            String s = null;
+            while ((s = bufferedReader.readLine()) != null) {
+                sb.append(s);
+            }
+            return sb.toString();
+        } catch (IOException e) {
+            e.printStackTrace();
+        } finally {
+            try {
+                assert bufferedReader != null;
+                bufferedReader.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        return "";
+    }
+
+    /**
+     * 保存对象到文件中
+     *
+     * @param path 文件路径
+     * @param obj  要保存的对象
+     * @return 是否保存成功
+     */
+    public boolean saveObjectToFile(String path, Object obj) {
+        BufferedWriter bufferedWriter = null;
+        try {
+            File file = new File(path);
+            bufferedWriter = new BufferedWriter(new FileWriter(file));
+            String str = "";
+            if (obj instanceof String) {
+                str = obj.toString();
+            } else {
+                str = JSON.toJSONString(obj);
+            }
+            bufferedWriter.write(str);
+            bufferedWriter.flush();
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            try {
+                assert bufferedWriter != null;
+                bufferedWriter.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        return false;
+    }
+}

power-fitting/src/main/resources/application.yaml

@@ -11,6 +11,10 @@ gyee:
   file-path-download: data\zip\
   # 数据准备时由于数据量太大，初始一个默认间隔，用于适配器取数
   interval: 20
+  # 当前是否是离线环境
+  offline: true
+  # 功率曲线离线数据保存路径
+  file-path-power: data\power\
 
 server:
   port: 9002