shilin il y a 1 an
Parent
commit
c15dffb367
100 fichiers modifiés avec 4791 ajouts et 649 suppressions
  1. 11 1
      realtime/generationXK-service/src/main/java/com/gyee/generation/config/XxlJobConfig.java
  2. 622 604
      realtime/generationXK-service/src/main/java/com/gyee/generation/service/realtimelibrary/CycleCalculationService.java
  3. 46 19
      realtime/generationXK-service/src/main/java/com/gyee/generation/service/realtimelibrary/RealtimeService.java
  4. 40 23
      realtime/generationXK-service/src/main/java/com/gyee/generation/service/realtimelibrary/StatusService.java
  5. 1 1
      realtime/generationXK-service/src/main/resources/application-jn.yml
  6. 1 1
      realtime/generationXK-service/src/test/java/com/gyee/generation/RealTest.java
  7. 141 0
      web/runeconomy-authority/pom.xml
  8. 26 0
      web/runeconomy-authority/src/main/java/com/gyee/health/config/CorsConfig.java
  9. 149 0
      web/runeconomy-authority/src/main/java/com/gyee/health/config/GeneratorCodeConfig.java
  10. 72 0
      web/runeconomy-authority/src/main/java/com/gyee/health/config/GyeeConfig.java
  11. 63 0
      web/runeconomy-authority/src/main/java/com/gyee/health/config/MybatisPlusConfig.java
  12. 76 0
      web/runeconomy-authority/src/main/java/com/gyee/health/config/SwagerrConfiguration.java
  13. 50 0
      web/runeconomy-authority/src/main/java/com/gyee/health/config/ThreadPoolConfig.java
  14. 20 0
      web/runeconomy-authority/src/main/java/com/gyee/health/config/WebSocketConfig.java
  15. 104 0
      web/runeconomy-authority/src/main/java/com/gyee/health/dto/AjaxResult.java
  16. 364 0
      web/runeconomy-authority/src/main/java/com/gyee/health/dto/DataVo.java
  17. 72 0
      web/runeconomy-authority/src/main/java/com/gyee/health/dto/EchartDataVo.java
  18. 181 0
      web/runeconomy-authority/src/main/java/com/gyee/health/dto/EquipmentInfoDayTopDTO.java
  19. 115 0
      web/runeconomy-authority/src/main/java/com/gyee/health/dto/PowercurveVo.java
  20. 34 0
      web/runeconomy-authority/src/main/java/com/gyee/health/dto/ProjectplanVo.java
  21. 36 0
      web/runeconomy-authority/src/main/java/com/gyee/health/dto/R.java
  22. 16 0
      web/runeconomy-authority/src/main/java/com/gyee/health/dto/ResultCode.java
  23. 87 0
      web/runeconomy-authority/src/main/java/com/gyee/health/dto/ResultInfo.java
  24. 96 0
      web/runeconomy-authority/src/main/java/com/gyee/health/dto/ResultMsg.java
  25. 49 0
      web/runeconomy-authority/src/main/java/com/gyee/health/dto/SawVo.java
  26. 42 0
      web/runeconomy-authority/src/main/java/com/gyee/health/dto/Status.java
  27. 62 0
      web/runeconomy-authority/src/main/java/com/gyee/health/dto/ValueObjVo.java
  28. 15 0
      web/runeconomy-authority/src/main/java/com/gyee/health/dto/ZllglDTO.java
  29. 371 0
      web/runeconomy-authority/src/main/java/com/gyee/health/dto/response/EconHomePagePointRateDTO.java
  30. 36 0
      web/runeconomy-authority/src/main/java/com/gyee/health/dto/response/FwjslDTO.java
  31. 34 0
      web/runeconomy-authority/src/main/java/com/gyee/health/dto/response/ProEconPointCodeDTO.java
  32. 17 0
      web/runeconomy-authority/src/main/java/com/gyee/health/dto/response/QxjslDTO.java
  33. 603 0
      web/runeconomy-authority/src/main/java/com/gyee/health/init/CacheContext.java
  34. 16 0
      web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProBasicCompanyMapper.java
  35. 16 0
      web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProBasicEnergyGroupMapper.java
  36. 16 0
      web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProBasicEquipmentMapper.java
  37. 16 0
      web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProBasicEquipmentPointMapper.java
  38. 16 0
      web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProBasicLineMapper.java
  39. 16 0
      web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProBasicMeterPointMapper.java
  40. 16 0
      web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProBasicModelPowerMapper.java
  41. 16 0
      web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProBasicModelPowerRdMapper.java
  42. 16 0
      web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProBasicPowerstationMapper.java
  43. 20 0
      web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProBasicPowerstationPointMapper.java
  44. 16 0
      web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProBasicProjectMapper.java
  45. 16 0
      web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProBasicProjectPlanMapper.java
  46. 16 0
      web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProBasicRealtimeDbconfigMapper.java
  47. 16 0
      web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProBasicRegionMapper.java
  48. 16 0
      web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProBasicSquareMapper.java
  49. 16 0
      web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProBasicStatusPointMapper.java
  50. 16 0
      web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProBasicSubStationMapper.java
  51. 16 0
      web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProBasicWeatherStationMapper.java
  52. 16 0
      web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProBasicWindturbinePowerMapper.java
  53. 16 0
      web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEcoWindspecificInfoDayMapper.java
  54. 30 0
      web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconActivePowerDataMapper.java
  55. 16 0
      web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconBenchmarkMapper.java
  56. 24 0
      web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconBenchmarkingBetweenMapper.java
  57. 16 0
      web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconBrownoutsEvent2Mapper.java
  58. 16 0
      web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconBrownoutsEventMapper.java
  59. 20 0
      web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconCurveFittMonthMainMapper.java
  60. 20 0
      web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconCurveFittMonthSubMapper.java
  61. 19 0
      web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconCurveFittYearMainMapper.java
  62. 19 0
      web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconCurveFittYearSubMapper.java
  63. 22 0
      web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconCurveFittingMainMapper.java
  64. 23 0
      web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconCurveFittingSubMapper.java
  65. 16 0
      web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconDutyScheduleMapper.java
  66. 16 0
      web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconElectricaltestPointMapper.java
  67. 16 0
      web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconEquipmentDayDetailedMapper.java
  68. 16 0
      web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconEquipmentDayInfoMapper.java
  69. 16 0
      web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconEquipmentInfo15minuteMapper.java
  70. 16 0
      web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconEquipmentInfoDay1Mapper.java
  71. 16 0
      web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconEquipmentInfoDay2Mapper.java
  72. 16 0
      web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconEquipmentInfoDay3Mapper.java
  73. 16 0
      web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconEquipmentInfoDay4Mapper.java
  74. 45 0
      web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconEquipmentInfoDay5Mapper.java
  75. 16 0
      web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconEquipmentInfoDay6Mapper.java
  76. 16 0
      web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconEquipmentInfoDayTopMapper.java
  77. 16 0
      web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconEquipmentmodelMapper.java
  78. 16 0
      web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconFaultLiminatedefectsMapper.java
  79. 16 0
      web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconInOrOutSpeedTotal2Mapper.java
  80. 16 0
      web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconInOrOutSpeedTotalMapper.java
  81. 17 0
      web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconInputOrOutputSpeedMapper.java
  82. 16 0
      web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconInterruptionItemMapper.java
  83. 16 0
      web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconInterruptionMapper.java
  84. 16 0
      web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconLimitPowerRecordsMapper.java
  85. 16 0
      web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconLineElectricalMapper.java
  86. 16 0
      web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconLogicalUnitMapper.java
  87. 16 0
      web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconMainBrownouts2Mapper.java
  88. 16 0
      web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconMainBrownoutsMapper.java
  89. 16 0
      web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconManufacturerMapper.java
  90. 16 0
      web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconMeterPointValueMapper.java
  91. 16 0
      web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconPointCodeMapper.java
  92. 16 0
      web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconPowerstationInfoDay1Mapper.java
  93. 16 0
      web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconPowerstationInfoDay2Mapper.java
  94. 16 0
      web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconPowerstationInfoDay3Mapper.java
  95. 16 0
      web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconPowerstationInfoDay4Mapper.java
  96. 16 0
      web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconPowerstationInfoDay5Mapper.java
  97. 16 0
      web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconPowerstationInfoDay6Mapper.java
  98. 16 0
      web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconPowerstationInfoDay7Mapper.java
  99. 16 0
      web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconShutdownEvent2Mapper.java
  100. 0 0
      web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconShutdownEventMapper.java

+ 11 - 1
realtime/generationXK-service/src/main/java/com/gyee/generation/config/XxlJobConfig.java

@@ -20,11 +20,21 @@ import org.springframework.core.env.Environment;
 @Configuration
 //@PropertySource("classpath:xxl-job-executor.properties")
 //@PropertySource("classpath:xxl-job-executor2.properties")
-@PropertySource("classpath:xxl-job-executor3.properties")
+//@PropertySource("classpath:xxl-job-executor3.properties")
 //@PropertySource("classpath:xxl-job-executor4.properties")
 //@PropertySource("classpath:xxl-job-executorWPLY.properties")
 //@PropertySource("classpath:xxl-job-executorRG.properties")
 //@PropertySource("classpath:xxl-job-executorJN.properties")
+
+//@PropertySource("classpath:xxl-job-7001.properties")
+//@PropertySource("classpath:xxl-job-7002.properties")
+//@PropertySource("classpath:xxl-job-7003.properties")
+//@PropertySource("classpath:xxl-job-executorGF001.properties")
+//@PropertySource("classpath:xxl-job-executorGF002.properties")
+//@PropertySource("classpath:xxl-job-executorGF003.properties")
+//@PropertySource("classpath:xxl-job-executorGF004.properties")
+@PropertySource("classpath:xxl-job-executorGF005.properties")
+//@PropertySource("classpath:xxl-job-executorGF006.properties")
 public class XxlJobConfig implements EnvironmentAware {
     private Environment env;
 

Fichier diff supprimé car celui-ci est trop grand
+ 622 - 604
realtime/generationXK-service/src/main/java/com/gyee/generation/service/realtimelibrary/CycleCalculationService.java


+ 46 - 19
realtime/generationXK-service/src/main/java/com/gyee/generation/service/realtimelibrary/RealtimeService.java

@@ -48,14 +48,15 @@ public class RealtimeService {
         Date minute15begin = DateUtils.addMinutes(currentDate, -15);
         //保存风机点
         List<PointData> wtResultList = new ArrayList<>();
-        wtls.stream().forEach(wt -> {
+//        wtls.stream().forEach(wt -> {
+        for(ProBasicEquipment wt:wtls) {
             Map<String, ProBasicEquipmentPoint> equipmentPointMap = wtpAimap.get(wt.getId());
             ProBasicEquipmentPoint speedPoint = equipmentPointMap.get(ContantXk.CJ_SSFS);
             ProBasicEquipmentPoint mxztPoint = equipmentPointMap.get(ContantXk.MXZT);
             ProBasicEquipmentPoint ssbfPoint = null;
-            if (wt.getId().contains("_WT_")){
+            if (wt.getId().contains("_WT_")) {
                 ssbfPoint = equipmentPointMap.get(ContantXk.SSBF);
-            }else if(wt.getId().contains("_IN_")){
+            } else if (wt.getId().contains("_IN_")) {
                 ssbfPoint = equipmentPointMap.get(ContantXk.SSBG);
             }
             ProBasicEquipmentPoint ssglPoint = equipmentPointMap.get(ContantXk.CJ_SSGL);
@@ -80,6 +81,16 @@ public class RealtimeService {
             Optional<PointData> ssglOptional = null;
             Optional<PointData> zsglOptional = null;
             try {
+
+                double ssztmx = 0;
+                try {
+                    ssztmx = edosUtil.getRealData(mxztPoint).getPointValueInDouble();
+                } catch (Exception e) {
+                    throw new RuntimeException(e);
+                }
+                if (ssztmx == 12 || ssztmx == 13) {
+                    continue;
+                }
                 mxzt = edosUtil.getRealData(mxztPoint).getPointValueInDouble();
                 speed = edosUtil.getRealData(speedPoint).getPointValueInDouble();
                 ssgl = edosUtil.getRealData(ssglPoint).getPointValueInDouble();
@@ -92,31 +103,32 @@ public class RealtimeService {
             PointData ssbfPointDate = null;
             if (mxzt == 12 || mxzt == 13) {
                 //补风算法(后续补充)
-                ssbf = speed>12?12:speed;
+                ssbf = speed > 12 ? 12 : speed;
                 ssbfPointDate = PointUtil.createPointData(currentDate, ssbf, ssbfPoint.getNemCode(), ssbfPoint.getName());
             } else {
-                if (wt.getEquipmentCategory().equals("-1")){
-                    ssbf = speed>12?12:speed;
-                }else {
+
+                if (wt.getEquipmentCategory().equals("-1")) {
+                    ssbf = speed > 12 ? 12 : speed;
+                } else {
                     ssbf = speed;
                 }
                 ssbfPointDate = PointUtil.createPointData(currentDate, ssbf, ssbfPoint.getNemCode(), ssbfPoint.getName());
             }
             wtResultList.add(ssbfPointDate);
             double v = DoubleUtils.keepPrecision(ssbf, 2);
-            if (theoreticalPowerMap.containsKey(wt.getModelId())){
+            if (theoreticalPowerMap.containsKey(wt.getModelId())) {
 //                double v = DoubleUtils.keepPrecision(ssbf, 2);
-                if (theoreticalPowerMap.get(wt.getModelId()).containsKey(v)){
+                if (theoreticalPowerMap.get(wt.getModelId()).containsKey(v)) {
                     ProBasicModelPowerRd basicModelPowerRd = theoreticalPowerMap.get(wt.getModelId()).get(v);
                     wtResultList.add(PointUtil.createPointData(currentDate, basicModelPowerRd.getTheoryPower(), llglPoint.getNemCode(), llglPoint.getName()));
                     wtResultList.add(PointUtil.createPointData(currentDate, basicModelPowerRd.getEnsurePower(), bzglPoint.getNemCode(), bzglPoint.getName()));
-                }else {
-                    wtResultList.add(PointUtil.createPointData(currentDate,0, llglPoint.getNemCode(), llglPoint.getName()));
+                } else {
+                    wtResultList.add(PointUtil.createPointData(currentDate, 0, llglPoint.getNemCode(), llglPoint.getName()));
                     wtResultList.add(PointUtil.createPointData(currentDate, 0, bzglPoint.getNemCode(), bzglPoint.getName()));
                 }
             }
-            if (curveFittingPowerMap.containsKey(wt.getId())){
-                if (curveFittingPowerMap.get(wt.getId()).containsKey(v)){
+            if (curveFittingPowerMap.containsKey(wt.getId())) {
+                if (curveFittingPowerMap.get(wt.getId()).containsKey(v)) {
                     ProEconWtPowerCurveFitting wtPowerCurveFitting = curveFittingPowerMap.get(wt.getId()).get(v);
                     Double actualPower = wtPowerCurveFitting.getActualPower();
                     double[] underissuanceArray = {0, 1, 2, 3, 8, 9, 11};
@@ -142,7 +154,7 @@ public class RealtimeService {
                     } else {
                         wtResultList.add(PointUtil.createPointData(currentDate, wtPowerCurveFitting.getActualPower(), kyglPoint.getNemCode(), kyglPoint.getName()));
                     }
-                }else {
+                } else {
                     wtResultList.add(PointUtil.createPointData(currentDate, 0, ssqfztPoint.getNemCode(), ssqfztPoint.getName()));
                     wtResultList.add(PointUtil.createPointData(currentDate, 0, lsqfztPoint.getNemCode(), lsqfztPoint.getName()));
 
@@ -152,7 +164,8 @@ public class RealtimeService {
                 }
             }
 
-        });
+//        });
+        }
         edosUtil.sendMultiPoint(wtResultList);
         //保存线路点
         List<PointData> lineResultList = new ArrayList<>();
@@ -193,13 +206,26 @@ public class RealtimeService {
                 lineResultList.add(PointUtil.createPointData(currentDate, ssglsyz, sszglsyzpoint.getNemCode(), sszglsyzpoint.getName()));
             }
 
-            proBasicWindturbines.stream().forEach(wt -> {
+//            proBasicWindturbines.stream().forEach(wt -> {
+            for(ProBasicEquipment wt:proBasicWindturbines) {
                 Map<String, ProBasicEquipmentPoint> equipmentPointMap = wtpAimap.get(wt.getId());
 
+
+                ProBasicEquipmentPoint mxztPoint = equipmentPointMap.get(ContantXk.MXZT);
+                double ssztmx = 0;
+                try {
+                    ssztmx = edosUtil.getRealData(mxztPoint).getPointValueInDouble();
+                } catch (Exception e) {
+                    throw new RuntimeException(e);
+                }
+                if (ssztmx == 12 || ssztmx == 13) {
+                    continue;
+                }
+
                 ProBasicEquipmentPoint ssbfPoint = null;
-                if (wt.getId().contains("_WT_")){
+                if (wt.getId().contains("_WT_")) {
                     ssbfPoint = equipmentPointMap.get(ContantXk.SSBF);
-                }else if(wt.getId().contains("_IN_")){
+                } else if (wt.getId().contains("_IN_")) {
                     ssbfPoint = equipmentPointMap.get(ContantXk.SSBG);
                 }
 
@@ -273,7 +299,8 @@ public class RealtimeService {
                     }
                     return v;
                 });
-            });
+//            });
+            }
             lineResultList.add(PointUtil.createPointData(currentDate, zssbf.get() / proBasicWindturbines.size(), ssfsWpPoint.getNemCode(), ssfsWpPoint.getName()));
             lineResultList.add(PointUtil.createPointData(currentDate, zssgl.get(), ssglWpPoint.getNemCode(), ssglWpPoint.getName()));
             lineResultList.add(PointUtil.createPointData(currentDate, zllgl.get(), llglWpPoint.getNemCode(), llglWpPoint.getName()));

+ 40 - 23
realtime/generationXK-service/src/main/java/com/gyee/generation/service/realtimelibrary/StatusService.java

@@ -303,7 +303,7 @@ public class StatusService {
                 e.printStackTrace();
             }
 
-            Double status = 1.0;
+            Double status = 0.0;
             Double mxstatus = 2.0;
             try {
                 if (StringUtils.isEmpty(interruptionList)){
@@ -318,10 +318,10 @@ public class StatusService {
                     c.setTime(currentDate);
                     c.add(Calendar.MINUTE,-3);
                     long oldtime =c.getTime().getTime()/1000 ;
-//                    if(wt.getId().equals("SXJ_KGDL_XWT_F_WT_0019_EQ"))
-//                    {
-//                        System.out.println("");
-//                    }
+                    if(wt.getId().equals("SXJ_KGDL_HSM_F_WT_0047_EQ"))
+                    {
+                        System.out.println("");
+                    }
                     int state=0;
                     for(int i=0;i<interruptionList.size();i++)
                     {
@@ -339,28 +339,19 @@ public class StatusService {
                         }
                     }
 
-
-                    if(state==0)
-                    {
-                        //离线
-                        mxstatus = 12.0;
-                    }
-
-                    long time = currentDate.getTime();
-
                     List<PointData> collect = interruptionRealData.stream().filter(i -> (currentDate.getTime() - i.getPointTime()) / 1000 > Integer.parseInt(second)).collect(Collectors.toList());
 
-                    if (collect.size()==interruptionRealData.size()){
 
-                        double ssgl = edosUtil.getSectionData(ssglPoint,currentDate.getTime()).getPointValueInDouble();
-                        double gpzt = edosUtil.getSectionData(gpztPoint,currentDate.getTime()).getPointValueInDouble();
-                        double xdzt = edosUtil.getSectionData(xdztPoint,currentDate.getTime()).getPointValueInDouble();
+                    double ssgl = edosUtil.getSectionData(ssglPoint,currentDate.getTime()).getPointValueInDouble();
+                    double gpzt = edosUtil.getSectionData(gpztPoint,currentDate.getTime()).getPointValueInDouble();
+                    double xdzt = edosUtil.getSectionData(xdztPoint,currentDate.getTime()).getPointValueInDouble();
 
-                        //  0, "正常状态";1, "限电";2, "场内受累检修";3, "场内受累故障";4, "场外受累电网";5, "场外受累天气";6, "发电限负荷";
-                        if(gpzt != 0){
-                            //获取挂牌状态给明细状态赋值
-                            mxstatus = getGpzt(gpzt,ssgl);
-                        }else if (xdzt == 1){
+                    if(state==0 || collect.size()==interruptionRealData.size())
+                    {
+                        //离线
+                        mxstatus = 12.0;
+                    }else {
+                        if (xdzt == 1){
                             mxstatus = getGpzt(1,ssgl);
                         }else {
                             mxstatus = getMxzt(modelMap,aistateMap,statusMap,wt);
@@ -374,6 +365,32 @@ public class StatusService {
                             }
                         }
                     }
+
+
+
+                    if (collect.size()==interruptionRealData.size()){
+
+                        //  0, "正常状态";1, "限电";2, "场内受累检修";3, "场内受累故障";4, "场外受累电网";5, "场外受累天气";6, "发电限负荷";
+                        if(gpzt != 0){
+                            //获取挂牌状态给明细状态赋值
+                            mxstatus = getGpzt(gpzt,ssgl);
+                        }
+//                        else if (xdzt == 1){
+//                            mxstatus = getGpzt(1,ssgl);
+//                        }else {
+//                            mxstatus = getMxzt(modelMap,aistateMap,statusMap,wt);
+//                        }
+//                        if (mxstatus == 2){
+//                            boolean isJcl = isJcl(currentDate, equipmentPointMap);
+//                            if (ssgl<=0){
+//                                mxstatus=0.0;
+//                            }else if (isJcl){
+//                                mxstatus = 3.0;
+//                            }
+//                        }
+                    }
+
+
                     if (mxstatus == 0 || mxstatus == 1){
                         status = 0.0;
                     }else if(mxstatus == 2 || mxstatus == 3){

+ 1 - 1
realtime/generationXK-service/src/main/resources/application-jn.yml

@@ -131,7 +131,7 @@ db:
 
 #参与计算的场站
 #runWindpowerstation: SDL_GDDL_QDJN_FDC_STA,SDL_GDDL_RZJX_FDC_STA,SDL_GDDL_WHWD_FDC_STA,SDL_GDDL_WHXQ_FDC_STA,SDL_GDDL_RZWL_FDC_STA,SDL_GDDL_WFZC_FDC_STA,SDL_GDDL_DZXJF_FDC_STA,SDL_GDDL_DZXJS_FDC_STA,SDL_GDDL_XTTA_FDC_STA
-runWindpowerstation: SXJ_KGDL_XWT_FDC_STA
+runWindpowerstation: SXJ_KGDL_HSM_FDC_STA
 clauStatus:
   ai: GJY03_GC,YLZ01_GC,PTZ02_GC   #配置期次
   di: GJY01_GC,GJY02_GC,DJY01_GC,DJY02_GC,YF01_GC,YF02_GC,HSM01_GC,PTZ01_GC,ZK01_GC,NJL01_GC,YTY01_GC,PDL01_GC

+ 1 - 1
realtime/generationXK-service/src/test/java/com/gyee/generation/RealTest.java

@@ -32,7 +32,7 @@ public class RealTest {
 
        begin=new Date();
         System.out.println("状态判定调度程序执行开始!。。。。。。");
-//       statusService.statusReal();
+       statusService.statusReal();
 //        realtimeService.savaRealtimeTarget();
 //       cycleCalculationService.saveCyle();
         end=new Date();

+ 141 - 0
web/runeconomy-authority/pom.xml

@@ -0,0 +1,141 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>web</artifactId>
+        <groupId>com.gyee</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>runeconomy-authority</artifactId>
+	
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-websocket</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>com.gyee</groupId>
+            <artifactId>common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>1.2.7</version>
+            <scope>compile</scope>
+        </dependency>
+        <!--nacos 依赖-->
+        <!--        <dependency>-->
+        <!--            <groupId>com.alibaba.cloud</groupId>-->
+        <!--            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>-->
+        <!--        </dependency>-->
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.1.1</version>
+        </dependency>
+        <dependency>
+            <groupId>redis.clients</groupId>
+            <artifactId>jedis</artifactId>
+            <version>3.2.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.data</groupId>
+            <artifactId>spring-data-redis</artifactId>
+        </dependency>
+
+        <!-- 添加swagger2 -->
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger2</artifactId>
+            <version>2.9.2</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>io.swagger</groupId>
+                    <artifactId>swagger-annotations</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>io.swagger</groupId>
+                    <artifactId>swagger-models</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger-ui</artifactId>
+            <version>2.9.2</version>
+        </dependency>
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-annotations</artifactId>
+            <version>1.5.21</version>
+        </dependency>
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-models</artifactId>
+            <version>1.5.21</version>
+        </dependency>
+
+        <!-- Sa-Token 权限认证, 在线文档:http://sa-token.dev33.cn/ -->
+        <dependency>
+            <groupId>cn.dev33</groupId>
+            <artifactId>sa-token-spring-boot-starter</artifactId>
+            <version>1.26.0</version>
+        </dependency>
+        <!-- Sa-Token 整合 Redis (使用jackson序列化方式) -->
+        <dependency>
+            <groupId>cn.dev33</groupId>
+            <artifactId>sa-token-dao-redis-jackson</artifactId>
+            <version>1.26.0</version>
+        </dependency>
+
+        <!-- thymeleaf模版 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-thymeleaf</artifactId>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>2.7.1</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>

+ 26 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/config/CorsConfig.java

@@ -0,0 +1,26 @@
+package com.gyee.health.config;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+/**
+ * @ClassName : CorsConfig
+ * @Author : xieshengjie
+ * @Date: 2021/6/28 20:00
+ * @Description :
+ */
+@Configuration
+public class CorsConfig implements WebMvcConfigurer {
+
+    static final String[] ORIGINS = new String[]{"GET", "POST", "PUT", "DELETE"};  //请求方式
+
+    @Override
+    public void addCorsMappings(CorsRegistry registry) {
+        registry.addMapping("/**") //所有的当前站点的请求地址,都支持跨域访问
+                .allowedOrigins("*")// 所有的外部域都可跨域访问,这里注意2.4.0以后是allowedOriginPatterns,以前是allowedOrigins
+                .allowCredentials(true)  //是否支持跨域用户凭证
+                .allowedMethods(ORIGINS) //当前站点支持的跨域请求类型是什么
+                .maxAge(3600);  //超是时长,单位为秒。
+    }
+}

+ 149 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/config/GeneratorCodeConfig.java

@@ -0,0 +1,149 @@
+package com.gyee.health.config;
+
+
+import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.generator.AutoGenerator;
+import com.baomidou.mybatisplus.generator.config.*;
+import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+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
+ **/
+public class GeneratorCodeConfig {
+    public static String scanner(String tip) {
+        Scanner scanner = new Scanner(System.in);
+        StringBuilder help = new StringBuilder();
+        help.append("请输入" + tip + ":");
+        System.out.println(help.toString());
+        if (scanner.hasNext()) {
+            String ipt = scanner.next();
+            if (StringUtils.isNotEmpty(ipt)) {
+                return ipt;
+            }
+        }
+        throw new MybatisPlusException("请输入正确的" + tip + "!");
+    }
+
+    public static void main(String[] args) {
+        // 代码生成器
+        AutoGenerator mpg = new AutoGenerator();
+
+        // 全局配置
+        GlobalConfig gc = new GlobalConfig();
+        String projectPath = System.getProperty("user.dir");
+        gc.setOutputDir("D:\\work\\workspaces\\sis\\web\\runeconomy-xk\\src\\main\\java");
+        gc.setAuthor("wang");
+        gc.setOpen(false);
+        //实体属性 Swagger2 注解
+        gc.setSwagger2(false);
+        mpg.setGlobalConfig(gc);
+
+        // 数据源配置
+        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.setDriverName("oracle.jdbc.driver.OracleDriver"); 注意大写
+//        dsc.setUsername("gdprod");
+//        dsc.setPassword("gd123");
+//        dsc.setUrl("jdbc:oracle:thin:@10.81.3.151:1521:gdsj");
+
+        dsc.setDriverName("org.postgresql.Driver");
+        dsc.setUsername("postgres");
+        dsc.setPassword("gd123");
+        dsc.setUrl("jdbc:postgresql://124.70.75.91:5432/jn_test");
+
+        mpg.setDataSource(dsc);
+
+
+
+        // 包配置
+        PackageConfig pc = new PackageConfig();
+//        pc.setModuleName(scanner("模块名"));
+        pc.setParent("com.gyee.runeconomy");
+        pc.setEntity("model.auto");
+        pc.setMapper("mapper.auto");
+        pc.setService("service.auto");
+        pc.setServiceImpl("service.auto.impl");
+        mpg.setPackageInfo(pc);
+
+        // 自定义配置
+//        InjectionConfig cfg = new InjectionConfig() {
+//            @Override
+//            public void initMap() {
+//                // to do nothing
+//            }
+//        };
+
+        // 如果模板引擎是 freemarker
+//        String templatePath = "/templates/mapper.xml.ftl";
+        // 如果模板引擎是 velocity
+        // String templatePath = "/templates/mapper.xml.vm";
+
+        // 自定义输出配置
+//        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;
+//            }
+//        });
+        /*
+        cfg.setFileCreate(new IFileCreate() {
+            @Override
+            public boolean isCreate(ConfigBuilder configBuilder, FileType fileType, String filePath) {
+                // 判断自定义文件夹是否需要创建
+                checkDir("调用默认方法创建的目录");
+                return false;
+            }
+        });
+        */
+//        cfg.setFileOutConfigList(focList);
+//        mpg.setCfg(cfg);
+
+        // 配置模板
+        TemplateConfig templateConfig = new TemplateConfig();
+
+        // 配置自定义输出模板
+        //指定自定义模板路径,注意不要带上.ftl/.vm, 会根据使用的模板引擎自动识别
+        // templateConfig.setEntity("templates/entity2.java");
+        // templateConfig.setService();
+        // templateConfig.setController();
+
+        templateConfig.setXml(null);
+        mpg.setTemplate(templateConfig);
+
+        // 策略配置
+        StrategyConfig strategy = new StrategyConfig();
+        strategy.setNaming(NamingStrategy.underline_to_camel);
+        strategy.setColumnNaming(NamingStrategy.underline_to_camel);
+        strategy.setSuperEntityClass("com.baomidou.mybatisplus.extension.activerecord.Model");
+        strategy.setEntityLombokModel(true);
+        strategy.setRestControllerStyle(true);
+
+        strategy.setEntityLombokModel(true);
+        // 公共父类
+//        strategy.setSuperControllerClass("com.baomidou.ant.common.BaseController");
+        // 写于父类中的公共字段
+//        strategy.setSuperEntityColumns("id");
+        strategy.setInclude(scanner("表名,多个英文逗号分割").split(","));
+        strategy.setControllerMappingHyphenStyle(true);
+        strategy.setTablePrefix(pc.getModuleName() + "_");
+        mpg.setStrategy(strategy);
+        mpg.setTemplateEngine(new FreemarkerTemplateEngine());
+        mpg.execute();
+    }
+}

+ 72 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/config/GyeeConfig.java

@@ -0,0 +1,72 @@
+package com.gyee.health.config;
+
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.system.ApplicationHome;
+import org.springframework.stereotype.Component;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.List;
+
+@Data
+@Component
+@ConfigurationProperties(prefix = "gyee")
+public class GyeeConfig {
+
+    public File jarF = null;
+    {
+        ApplicationHome h = new ApplicationHome(getClass());
+        jarF = h.getSource();
+    }
+
+    /** 数据适配器网址 **/
+    private String adapterUrl;
+    /** 数据准备保存路径(原始数据) **/
+    private String filePathPrepare;
+    /** 数据处理保存路径(处理后的数据) **/
+    private String filePathProcess;
+    /** 数据拟合保存路径(拟合后的数据) **/
+    private String filePathFitting;
+    /** 数据压缩下载 **/
+    private String filePathDownload;
+    /** 功率曲线拟合测点 **/
+    private String points;
+
+    public List<String> getPoints() {
+        return Arrays.asList(this.points.split(","));
+    }
+
+    public String getFilePathPrepare() {
+        return jarF.getParentFile().getAbsolutePath() + "\\" + filePathPrepare;
+    }
+
+    public void setFilePathPrepare(String filePathPrepare) {
+        this.filePathPrepare = filePathPrepare;
+    }
+
+    public String getFilePathProcess() {
+        return jarF.getParentFile().getAbsolutePath() + "\\" + filePathProcess;
+    }
+
+    public void setFilePathProcess(String filePathProcess) {
+        this.filePathProcess = filePathProcess;
+    }
+
+    public String getFilePathFitting() {
+        return jarF.getParentFile().getAbsolutePath() + "\\" + filePathFitting;
+    }
+
+    public void setFilePathFitting(String filePathFitting) {
+        this.filePathFitting = filePathFitting;
+    }
+
+    public String getFilePathDownload() {
+        return jarF.getParentFile().getAbsolutePath() + "\\" + filePathDownload;
+    }
+
+    public void setFilePathDownload(String filePathDownload) {
+        this.filePathDownload = filePathDownload;
+    }
+}

+ 63 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/config/MybatisPlusConfig.java

@@ -0,0 +1,63 @@
+package com.gyee.health.config;
+
+
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.IdUtil;
+import com.baomidou.mybatisplus.core.incrementer.IdentifierGenerator;
+import com.baomidou.mybatisplus.extension.plugins.OptimisticLockerInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.Date;
+
+/**
+ *@ClassName MybatisPlusConfig
+ *@Description 配置分页插件
+ *@Author 谢生杰
+ *@Date 2020/9/25 18:24
+ *@Version 1.0
+ **/
+@Configuration
+public class MybatisPlusConfig {
+    /**
+     * 分页插件
+     */
+    @Bean
+    public PaginationInterceptor paginationInterceptor() {
+        return new PaginationInterceptor();
+    }
+
+    /**
+     * @description:
+     * @author: xiruipeng 
+     * @date: 2022/9/16 15:08
+     * @param: []
+     * @return: com.baomidou.mybatisplus.extension.plugins.OptimisticLockerInterceptor
+     **/
+    @Bean
+    public OptimisticLockerInterceptor optimisticLockerInterceptor(){
+        return new OptimisticLockerInterceptor();
+    }
+
+
+    /**
+     * 自定义主键生成:生成的 当前时间 + 随机数的格式
+     * @return
+     */
+    @Bean
+    public IdentifierGenerator idGenerator() {
+        return new IdentifierGenerator() {
+            @Override
+            public Number nextId(Object entity) {
+                return null;
+            }
+
+            @Override
+            public String nextUUID(Object entity) {
+                return DateUtil.format(new Date(), DatePattern.PURE_DATETIME_PATTERN)+ IdUtil.simpleUUID();
+            }
+        };
+    }
+}

+ 76 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/config/SwagerrConfiguration.java

@@ -0,0 +1,76 @@
+package com.gyee.health.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+import springfox.documentation.builders.ApiInfoBuilder;
+import springfox.documentation.builders.PathSelectors;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.service.ApiInfo;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+/**
+ * Swagger 配置文件
+ * @ClassName: Swagger
+ * @Description: 配置文件
+ * @author gyee
+ * @date 2022年11月10日
+ *
+ */
+@Configuration(value="true")
+@EnableSwagger2 //启动swagger注解 启动服务,浏览器输入"http://localhost:8080/swagger-ui.html"
+public class SwagerrConfiguration implements WebMvcConfigurer {
+
+
+    @Bean
+    public Docket createRestApi() {
+        return new Docket(DocumentationType.SWAGGER_2)
+                //.host("")
+                // 用来创建该API的基本信息,展示在文档的页面中(自定义展示的信息)
+                .apiInfo(apiInfo())
+                // 设置哪些接口暴露给Swagger展示
+                .select()
+                // 扫描所有有注解的api,用这种方式更灵活
+                .apis(RequestHandlerSelectors.basePackage("com.gyee.runeconomy"))
+                // 扫描指定包中的swagger注解
+                //.apis(RequestHandlerSelectors.basePackage("com.gyee.frame.controller"))
+                // 扫描所有 .apis(RequestHandlerSelectors.any())
+                .paths(PathSelectors.any())
+                .build();
+    }
+
+    private ApiInfo apiInfo() {
+        return new ApiInfoBuilder()
+                //设置标题
+                .title("后台管理API文档")
+                //描述
+                .description("后台管理项目")
+                //作者信息
+                //.contact(new Contact(v2Config.getName(), null, V2Config.getEmail_account()))
+                //服务条款URL
+                .termsOfServiceUrl("")
+                //版本
+                .version("版本号:1.0")
+                .build();
+    }
+
+    @Override
+    public void addResourceHandlers(ResourceHandlerRegistry registry) {
+
+        // 解决静态资源无法访问
+
+        registry.addResourceHandler("/**").addResourceLocations("classpath:/static/");
+
+        // 解决swagger无法访问
+
+        registry.addResourceHandler("/swagger-ui.html").addResourceLocations("classpath:/META-INF/resources/");
+
+        // 解决swagger的js文件无法访问
+
+        registry.addResourceHandler("/webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/");
+
+    }
+}

+ 50 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/config/ThreadPoolConfig.java

@@ -0,0 +1,50 @@
+package com.gyee.health.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+
+import java.util.concurrent.ThreadPoolExecutor;
+
+
+@Configuration
+public class ThreadPoolConfig {
+    /**
+     *   默认情况下,在创建了线程池后,线程池中的线程数为0,当有任务来之后,就会创建一个线程去执行任务,
+     *	当线程池中的线程数目达到corePoolSize后,就会把到达的任务放到缓存队列当中;
+     *  当队列满了,就继续创建线程,当线程数量大于等于maxPoolSize后,开始使用拒绝策略拒绝
+     */
+
+    /** 核心线程数(默认线程数) */
+    private static final int corePoolSize = 10;
+    /** 最大线程数 */
+    private static final int maxPoolSize = 20;
+    /** 允许线程空闲时间(单位:默认为秒) */
+    private static final int keepAliveTime = 60;
+    /** 缓冲队列大小 */
+    private static final int queueCapacity = 100;
+    /** 允许等待最长时间 */
+    private static final int awaitTime = 15;
+    /** 线程池名前缀 */
+    private static final String threadNamePrefix = "GYEE-Thread-";
+
+
+    @Bean
+    public ThreadPoolTaskExecutor taskExecutor(){
+        ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
+        executor.setCorePoolSize(corePoolSize);
+        executor.setMaxPoolSize(maxPoolSize);
+        executor.setQueueCapacity(queueCapacity);
+        executor.setKeepAliveSeconds(keepAliveTime);
+        executor.setThreadNamePrefix(threadNamePrefix);
+        executor.setAwaitTerminationSeconds(awaitTime);
+
+        // 线程池对拒绝任务的处理策略
+        // CallerRunsPolicy:由调用线程(提交任务的线程)处理该任务
+        executor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy());
+        // 初始化
+        executor.initialize();
+        return executor;
+    }
+
+}

+ 20 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/config/WebSocketConfig.java

@@ -0,0 +1,20 @@
+package com.gyee.health.config;
+
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.socket.server.standard.ServerEndpointExporter;
+
+/**
+ * 开启 WebSocket 支持
+ **/
+@Configuration
+public class WebSocketConfig {
+
+    @Bean
+    public ServerEndpointExporter serverEndpointExporter() {
+        System.out.println("开启websocket支持。。。。。");
+        return new ServerEndpointExporter();
+    }
+
+}

+ 104 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/dto/AjaxResult.java

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

+ 364 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/dto/DataVo.java

@@ -0,0 +1,364 @@
+
+package com.gyee.health.dto;
+
+/**
+ * 
+ * 
+ * 项目名称:nxfd 类名称:DataVo 类描述: 创建人:石林 创建时间:2014-3-4 下午2:34:22 修改人:shilinno1
+ * 修改时间:2014-3-4 下午2:34:22 修改备注:
+ * 
+ * @version
+ * 
+ */
+
+public class DataVo {
+
+
+    private Long time;
+    private String timestr;
+    private Double value1;
+
+    private Double value2;
+
+    private Double value3;
+
+    private Double value4;
+
+    private Double value5;
+
+    private Double value6;
+
+    private Double value7;
+
+    private Double value8;
+
+    private Double value9;
+
+    private Double value10;
+
+    private Double value11;
+
+    private Double value12;
+
+    private Double value13;
+
+    private Double speed;
+
+    private String name;
+
+    private String url;
+
+    private String aName;
+
+    private String desc;
+
+    private String datefomat;
+
+    private Long minRange;
+    private Long pointInterval;
+    private Integer year;
+    private Integer month;
+    private Integer day;
+    private String id;
+    private Integer hours;
+    private Integer minutes;
+    private Integer seconds;
+
+    private Long beginDate;
+    private Long endDate;
+    private Long beginDateDay;
+    private Long endDateDay;
+
+    private String value;
+
+    private ValueObjVo valueObjVo;
+
+    public ValueObjVo getValueObjVo() {
+        return valueObjVo;
+    }
+
+    public void setValueObjVo(ValueObjVo valueObjVo) {
+        this.valueObjVo = valueObjVo;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public Long getMinRange() {
+        return minRange;
+    }
+
+    public void setMinRange(Long minRange) {
+        this.minRange = minRange;
+    }
+
+    public Long getPointInterval() {
+        return pointInterval;
+    }
+
+    public void setPointInterval(Long pointInterval) {
+        this.pointInterval = pointInterval;
+    }
+
+    public Integer getHours() {
+        return hours;
+    }
+
+    public void setHours(Integer hours) {
+        this.hours = hours;
+    }
+
+    public Integer getMinutes() {
+        return minutes;
+    }
+
+    public void setMinutes(Integer minutes) {
+        this.minutes = minutes;
+    }
+
+    public Integer getSeconds() {
+        return seconds;
+    }
+
+    public void setSeconds(Integer seconds) {
+        this.seconds = seconds;
+    }
+
+    public Long getTime() {
+        return time;
+    }
+
+    public void setTime(Long time) {
+        this.time = time;
+    }
+
+    public Double getSpeed() {
+        return speed;
+    }
+
+    public void setSpeed(Double speed) {
+        this.speed = speed;
+    }
+
+    public Double getValue1() {
+        return value1;
+    }
+
+    public void setValue1(Double value1) {
+        this.value1 = value1;
+    }
+
+    public Double getValue2() {
+        return value2;
+    }
+
+    public void setValue2(Double value2) {
+        this.value2 = value2;
+    }
+
+    public Double getValue3() {
+        return value3;
+    }
+
+    public void setValue3(Double value3) {
+        this.value3 = value3;
+    }
+
+    public Double getValue4() {
+        return value4;
+    }
+
+    public void setValue4(Double value4) {
+        this.value4 = value4;
+    }
+
+    public Double getValue5() {
+        return value5;
+    }
+
+    public void setValue5(Double value5) {
+        this.value5 = value5;
+    }
+
+    public Double getValue6() {
+        return value6;
+    }
+
+    public void setValue6(Double value6) {
+        this.value6 = value6;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public String getaName() {
+        return aName;
+    }
+
+    public void setaName(String aName) {
+        this.aName = aName;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public void setDesc(String desc) {
+        this.desc = desc;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public Integer getYear() {
+        return year;
+    }
+
+    public void setYear(Integer year) {
+        this.year = year;
+    }
+
+    public Integer getMonth() {
+        return month;
+    }
+
+    public void setMonth(Integer month) {
+        this.month = month;
+    }
+
+    public Integer getDay() {
+        return day;
+    }
+
+    public void setDay(Integer day) {
+        this.day = day;
+    }
+
+    public Long getBeginDate() {
+        return beginDate;
+    }
+
+    public void setBeginDate(Long beginDate) {
+        this.beginDate = beginDate;
+    }
+
+    public Long getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(Long endDate) {
+        this.endDate = endDate;
+    }
+
+    public String getDatefomat() {
+        return datefomat;
+    }
+
+    public void setDatefomat(String datefomat) {
+        this.datefomat = datefomat;
+    }
+
+    public Long getBeginDateDay() {
+        return beginDateDay;
+    }
+
+    public void setBeginDateDay(Long beginDateDay) {
+        this.beginDateDay = beginDateDay;
+    }
+
+    public Long getEndDateDay() {
+        return endDateDay;
+    }
+
+    public void setEndDateDay(Long endDateDay) {
+        this.endDateDay = endDateDay;
+    }
+
+    public String getTimestr() {
+        return timestr;
+    }
+
+    public void setTimestr(String timestr) {
+        this.timestr = timestr;
+    }
+
+    public Double getValue7() {
+        return value7;
+    }
+
+    public void setValue7(Double value7) {
+        this.value7 = value7;
+    }
+
+    public Double getValue8() {
+        return value8;
+    }
+
+    public void setValue8(Double value8) {
+        this.value8 = value8;
+    }
+
+    public Double getValue9() {
+        return value9;
+    }
+
+    public void setValue9(Double value9) {
+        this.value9 = value9;
+    }
+
+    public Double getValue10() {
+        return value10;
+    }
+
+    public void setValue10(Double value10) {
+        this.value10 = value10;
+    }
+
+    public Double getValue11() {
+        return value11;
+    }
+
+    public void setValue11(Double value11) {
+        this.value11 = value11;
+    }
+
+    public Double getValue12() {
+        return value12;
+    }
+
+    public void setValue12(Double value12) {
+        this.value12 = value12;
+    }
+
+    public Double getValue13() {
+        return value13;
+    }
+
+    public void setValue13(Double value13) {
+        this.value13 = value13;
+    }
+
+}

+ 72 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/dto/EchartDataVo.java

@@ -0,0 +1,72 @@
+
+package com.gyee.health.dto;
+
+/**
+ *
+ */
+
+public class EchartDataVo {
+
+    private String name;
+    private String xAxis;
+
+    private ItemStyle itemStyle;
+
+    private String time1;
+    private String time2;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getxAxis() {
+        return xAxis;
+    }
+
+    public void setxAxis(String xAxis) {
+        this.xAxis = xAxis;
+    }
+
+    public String getTime1() {
+        return time1;
+    }
+
+    public void setTime1(String time1) {
+        this.time1 = time1;
+    }
+
+    public String getTime2() {
+        return time2;
+    }
+
+    public void setTime2(String time2) {
+        this.time2 = time2;
+    }
+
+    public ItemStyle getItemStyle() {
+        return itemStyle;
+    }
+
+    public void setItemStyle(ItemStyle itemStyle) {
+        this.itemStyle = itemStyle;
+    }
+
+    public class ItemStyle
+    {
+
+        private String color;
+        public String getColor() {
+            return color;
+        }
+
+        public void setColor(String color) {
+            this.color = color;
+        }
+
+    }
+
+}

+ 181 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/dto/EquipmentInfoDayTopDTO.java

@@ -0,0 +1,181 @@
+package com.gyee.health.dto;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+@Data
+public class EquipmentInfoDayTopDTO {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    private Long id;
+
+    /**
+     * 风场编号
+     */
+    private String windpowerstationId;
+
+    /**
+     * 风场名称
+     */
+    private String windpowerstationName;
+
+    /**
+     * 风机编号
+     */
+    private String windturbineId;
+
+    /**
+     * 风机名称
+     */
+    private String windturbineName;
+
+    /**
+     * 日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date recordDate;
+
+    /**
+     * 发电量
+     */
+    private Double fdl;
+
+    /**
+     * 理论发电量
+     */
+    private Double llfdl;
+
+    /**
+     * 平均风速
+     */
+    private Double fs;
+
+    /**
+     * 平均功率
+     */
+    private Double gl;
+
+    /**
+     * 故障损失电量
+     */
+    private Double gzssdl;
+
+    /**
+     * 电损失电量
+     */
+    private Double xdssdl;
+
+
+    /**
+     * 护损失电量
+     */
+    private Double whssdl;
+
+
+    /**
+     * 性能损失电量
+     */
+    private Double xnssdl;
+
+
+    /**
+     * 故障时间
+     */
+    private Double gzsj;
+
+    /**
+     * 维护时间
+     */
+    private Double whsj;
+
+    /**
+     * 运行时间
+     */
+    private Double yxsj;
+
+    /**
+     * 停机时间
+     */
+    private Double tjsj;
+
+
+    /**
+     * 利用小时数
+     */
+    private Double lyxs;
+
+    /**
+     * 拟合优度
+     */
+    private Double nhyd;
+
+    /**
+     * 设备可利用率
+     */
+    private Double sbklyl;
+
+
+    /**
+     * 等效可用系数
+     */
+    private Double dxkyxs;
+
+    /**
+     * 有效风时数
+     */
+    private Double yxfss;
+
+    /**
+     * 小风切入
+     */
+    private Double xfqr;
+
+    /**
+     * 静风频率
+     */
+    private Double jfpl;
+
+
+    /**
+     * 功率一致性系数
+     */
+    private Double glyzxxs;
+
+
+    /**
+     * 类型
+     */
+    private Integer types;
+
+    /**
+     * 综合排名
+     */
+    private Integer rank;
+
+    /**
+     * 年
+     */
+    private Integer year;
+
+    /**
+     * 月
+     */
+    private Integer month;
+
+    /**
+     * 分数
+     */
+    private Double score;
+
+    /**
+     * 等级
+     */
+    private String level;
+
+}

+ 115 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/dto/PowercurveVo.java

@@ -0,0 +1,115 @@
+package com.gyee.health.dto;
+
+public class PowercurveVo {
+    private Double bzgl;
+
+    private Double sjgl;
+
+    private Double ssfs;
+
+    private Double llgl;
+
+    private Double gzzs;
+
+    private Integer hours;
+
+    private String name;
+
+    private Double fnlyl;
+
+    private Double rfdl;
+
+    private Double nfdl;
+
+    private Double yfdl;
+
+    public Double getYfdl() {
+        return yfdl;
+    }
+
+    public void setYfdl(Double yfdl) {
+        this.yfdl = yfdl;
+    }
+
+    public Double getNfdl() {
+        return nfdl;
+    }
+
+    public void setNfdl(Double nfdl) {
+        this.nfdl = nfdl;
+    }
+
+    public Double getRfdl() {
+        return rfdl;
+    }
+
+    public void setRfdl(Double rfdl) {
+        this.rfdl = rfdl;
+    }
+
+    public Double getFnlyl() {
+        return fnlyl;
+    }
+
+    public void setFnlyl(Double fnlyl) {
+        this.fnlyl = fnlyl;
+    }
+
+    public Double getBzgl() {
+        return bzgl;
+    }
+
+    public void setBzgl(Double bzgl) {
+        this.bzgl = bzgl;
+    }
+
+    public Double getSjgl() {
+        return sjgl;
+    }
+
+    public void setSjgl(Double sjgl) {
+        this.sjgl = sjgl;
+    }
+
+    public Double getSsfs() {
+        return ssfs;
+    }
+
+    public void setSsfs(Double ssfs) {
+        this.ssfs = ssfs;
+    }
+
+    public Double getLlgl() {
+        return llgl;
+    }
+
+    public void setLlgl(Double llgl) {
+        this.llgl = llgl;
+    }
+
+    public Integer getHours() {
+        return hours;
+    }
+
+    public void setHours(Integer hours) {
+        this.hours = hours;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+    public Double getGzzs() {
+        return gzzs;
+    }
+
+    public void setGzzs(Double gzzs) {
+        this.gzzs = gzzs;
+    }
+
+
+
+}

+ 34 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/dto/ProjectplanVo.java

@@ -0,0 +1,34 @@
+package com.gyee.health.dto;
+
+public class ProjectplanVo {
+    private Double jhdl;
+
+    private Double sjdl;
+
+    private Integer hours;
+
+
+    public Double getJhdl() {
+        return jhdl;
+    }
+
+    public void setJhdl(Double jhdl) {
+        this.jhdl = jhdl;
+    }
+
+    public Double getSjdl() {
+        return sjdl;
+    }
+
+    public void setSjdl(Double sjdl) {
+        this.sjdl = sjdl;
+    }
+
+    public Integer getHours() {
+        return hours;
+    }
+
+    public void setHours(Integer hours) {
+        this.hours = hours;
+    }
+}

+ 36 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/dto/R.java

@@ -0,0 +1,36 @@
+package com.gyee.health.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @ClassName : R
+ * @Author : xieshengjie
+ * @Date: 2021/5/16 16:59
+ * @Description : 结果集
+ */
+@Data
+public class R {
+
+    @ApiModelProperty(value = "返回码")
+    private Integer code;
+    @ApiModelProperty(value = "返回数据")
+    private ResultMsg data = new ResultMsg();
+
+    private R(){}
+
+    public static R error(ResultMsg error){
+        R r = new R();
+        r.setData(error);
+        r.setCode(ResultCode.ERROR1);
+        return r;
+    }
+
+    public static R data(ResultMsg ok) {
+
+        R r = new R();
+        r.setCode(ResultCode.SUCCESS0);
+        r.setData(ok);
+        return r;
+    }
+}

+ 16 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/dto/ResultCode.java

@@ -0,0 +1,16 @@
+package com.gyee.health.dto;
+
+/**
+ * @ClassName : ResultCode
+ * @Author : xieshengjie
+ * @Date: 2021/5/16 17:01
+ * @Description : 结果状态
+ */
+public class ResultCode {
+    public static Integer SUCCESS = 200;
+    public static Integer ERROR = 500;
+
+    public static Integer SUCCESS0 = 0;
+    public static Integer ERROR1 = -1;
+
+}

+ 87 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/dto/ResultInfo.java

@@ -0,0 +1,87 @@
+package com.gyee.health.dto;
+
+import lombok.Data;
+
+/**
+ *@ClassName ResultInfo
+ *@Description 返回结果类统一封装
+ *@Author 谢生杰
+ *@Date 2020/9/25 18:53
+ *@Version 1.0
+ **/
+@Data
+public class ResultInfo {
+    // 状态码
+    private Integer code;
+    // 消息
+    private String message;
+    // 数据对象
+    private Object result;
+
+    private Integer total;
+
+    /**
+     * 无参构造器
+     */
+    public ResultInfo() {
+        super();
+    }
+
+    public ResultInfo(Status status) {
+        super();
+        this.code = status.code;
+        this.message = status.message;
+    }
+
+    public ResultInfo result(Object result) {
+        this.result = result;
+        return this;
+    }
+
+    public ResultInfo message(String message) {
+        this.message = message;
+        return this;
+    }
+    public ResultInfo total(Integer total) {
+        this.total = total;
+        return this;
+    }
+
+    /**
+     * 只返回状态,状态码,消息
+     *
+     * @param code
+     * @param message
+     */
+    public ResultInfo(Integer code, String message) {
+        super();
+        this.code = code;
+        this.message = message;
+    }
+
+    /**
+     * 只返回状态,状态码,数据对象
+     *
+     * @param code
+     * @param result
+     */
+    public ResultInfo(Integer code, Object result) {
+        super();
+        this.code = code;
+        this.result = result;
+    }
+
+    /**
+     * 返回全部信息即状态,状态码,消息,数据对象
+     *
+     * @param code
+     * @param message
+     * @param result
+     */
+    public ResultInfo(Integer code, String message, Object result) {
+        super();
+        this.code = code;
+        this.message = message;
+        this.result = result;
+    }
+}

+ 96 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/dto/ResultMsg.java

@@ -0,0 +1,96 @@
+package com.gyee.health.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @ClassName : R
+ * @Author : xieshengjie
+ * @Date: 2021/5/16 16:59
+ * @Description : 结果集
+ */
+@Data
+public class ResultMsg{
+    @ApiModelProperty(value = "是否成功")
+    private Boolean success;
+    @ApiModelProperty(value = "返回码")
+    private Integer code;
+    @ApiModelProperty(value = "返回消息")
+    private String message;
+    @ApiModelProperty(value = "总数量")
+    private Integer count;
+    @ApiModelProperty(value = "返回数据")
+    private Object data = new Object();
+
+    public ResultMsg(){}
+    public static ResultMsg ok(){
+        ResultMsg r = new ResultMsg();
+        r.setSuccess(true);
+        r.setCode(ResultCode.SUCCESS);
+        r.setMessage("成功");
+        return r;
+    }
+
+
+    public static ResultMsg ok(Object data ){
+        ResultMsg r = new ResultMsg();
+        r.setSuccess(true);
+        r.setCode(ResultCode.SUCCESS);
+        r.setData(data);
+        r.setMessage("成功");
+        return r;
+    }
+
+    public static ResultMsg ok(Object data,Integer count ){
+        ResultMsg r = new ResultMsg();
+        r.setSuccess(true);
+        r.setCode(ResultCode.SUCCESS);
+        r.setData(data);
+        r.setMessage("成功");
+        r.setCount(count);
+        return r;
+    }
+
+
+    public static ResultMsg ok(Integer count){
+        ResultMsg r = new ResultMsg();
+        r.setSuccess(true);
+        r.setCode(ResultCode.SUCCESS);
+        r.setMessage("成功");
+        r.setCount(count);
+        return r;
+    }
+    public static ResultMsg error(){
+        ResultMsg r = new ResultMsg();
+        r.setSuccess(false);
+        r.setCode(ResultCode.ERROR);
+        r.setMessage("失败");
+        return r;
+    }
+
+
+    public ResultMsg success(Boolean success){
+        this.setSuccess(success);
+        return this;
+    }
+    public ResultMsg message(String message){
+        this.setMessage(message);
+        return this;
+    }
+    public static ResultMsg errorMsg(String msg){
+        ResultMsg r = new ResultMsg();
+        r.setSuccess(false);
+        r.setCode(ResultCode.ERROR);
+        r.setMessage(msg);
+        return r;
+    }
+    public ResultMsg code(Integer code){
+        this.setCode(code);
+        return this;
+    }
+
+    public  ResultMsg data(Object value){
+        this.setData(value);
+        return this;
+    }
+}

+ 49 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/dto/SawVo.java

@@ -0,0 +1,49 @@
+package com.gyee.health.dto;
+
+public class SawVo implements java.io.Serializable {
+
+	// Fields
+
+	private static final long serialVersionUID = 1L;
+
+	private Integer num;
+	private String name;
+	private Integer frequency;
+	private Integer frequencyday;
+	private Double totalhours;
+	
+	
+	
+	public Integer getFrequencyday() {
+		return frequencyday;
+	}
+	public void setFrequencyday(Integer frequencyday) {
+		this.frequencyday = frequencyday;
+	}
+	public Integer getNum() {
+		return num;
+	}
+	public void setNum(Integer num) {
+		this.num = num;
+	}
+	public String getName() {
+		return name;
+	}
+	public void setName(String name) {
+		this.name = name;
+	}
+	public Integer getFrequency() {
+		return frequency;
+	}
+	public void setFrequency(Integer frequency) {
+		this.frequency = frequency;
+	}
+	public Double getTotalhours() {
+		return totalhours;
+	}
+	public void setTotalhours(Double totalhours) {
+		this.totalhours = totalhours;
+	}
+	
+	
+}

+ 42 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/dto/Status.java

@@ -0,0 +1,42 @@
+package com.gyee.health.dto;
+/**
+ *@ClassName Status
+ *@Description 枚举类对象
+ *@Author 谢生杰
+ *@Date 2020/9/25 18:54
+ *@Version 1.0
+ **/
+public enum Status {
+    // 公共
+    SUCCESS(2000, "成功"),
+    UNKNOWN_ERROR(9998,"未知异常"),
+    SYSTEM_ERROR(9999, "系统异常"),
+
+
+    INSUFFICIENT_PERMISSION(4003, "权限不足"),
+
+    WARN(9000, "失败"),
+    REQUEST_PARAMETER_ERROR(1002, "请求参数错误"),
+
+
+
+    // 登录
+    LOGIN_EXPIRE(2001, "未登录或者登录失效"),
+    LOGIN_CODE_ERROR(2002, "登录验证码错误"),
+    LOGIN_ERROR(2003, "用户名不存在或密码错误"),
+    LOGIN_USER_STATUS_ERROR(2004, "用户状态不正确"),
+    LOGOUT_ERROR(2005, "退出失败,token不存在"),
+    LOGIN_USER_NOT_EXIST(2006, "该用户不存在"),
+    LOGIN_USER_EXIST(2007, "该用户已存在");
+
+
+
+
+    public int code;
+    public String message;
+
+    Status(int code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+}

+ 62 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/dto/ValueObjVo.java

@@ -0,0 +1,62 @@
+/** 
+ * Project Name:nxfd2 
+ * File Name:Value.java 
+ * Package Name:com.hcks.cmfds.vo 
+ * Date:2016-7-12下午04:16:42 
+ * Copyright (c) 2016, chenzhou1025@126.com All Rights Reserved. 
+ * 
+ */
+
+package com.gyee.health.dto;
+
+/**
+ * ClassName:Value <br/>
+ * Function: TODO ADD FUNCTION. <br/>
+ * Reason: TODO ADD REASON. <br/>
+ * Date: 2016-7-12 下午04:16:42 <br/>
+ * 
+ * @author 石林
+ * @version
+ * @since JDK 1.6
+ * @see
+ */
+public class ValueObjVo {
+
+    private Double value;
+    private String symbol;
+    private Integer symbolSize;
+    private Double symbolRotate;
+
+    public Double getValue() {
+        return value;
+    }
+
+    public void setValue(Double value) {
+        this.value = value;
+    }
+
+    public String getSymbol() {
+        return symbol;
+    }
+
+    public void setSymbol(String symbol) {
+        this.symbol = symbol;
+    }
+
+    public Integer getSymbolSize() {
+        return symbolSize;
+    }
+
+    public void setSymbolSize(Integer symbolSize) {
+        this.symbolSize = symbolSize;
+    }
+
+    public Double getSymbolRotate() {
+        return symbolRotate;
+    }
+
+    public void setSymbolRotate(Double symbolRotate) {
+        this.symbolRotate = symbolRotate;
+    }
+
+}

+ 15 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/dto/ZllglDTO.java

@@ -0,0 +1,15 @@
+
+package com.gyee.health.dto;
+
+import lombok.Data;
+
+@Data
+public class ZllglDTO {
+
+    private String id;
+    private String modelId;//机型
+    private double speed;
+    private double theoryPower;
+    private double ensurePower;
+
+}

+ 371 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/dto/response/EconHomePagePointRateDTO.java

@@ -0,0 +1,371 @@
+package com.gyee.health.dto.response;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 经济运行首页指标率响应类
+ */
+@Data
+public class EconHomePagePointRateDTO {
+
+//    curr
+//    ring
+//    with
+    /**
+     * 故障损失率
+     */
+    private BigDecimal currGzsll;
+    private BigDecimal ringGzslzzl;
+    private BigDecimal withGzslzzl;
+
+    /**
+     * 检修损失率
+     */
+    private BigDecimal currJxsll;
+    private BigDecimal ringJxslzzl;
+    private BigDecimal withJxslzzl;
+
+
+    /**
+     * 限电损失率
+     */
+    private BigDecimal currXdsll;
+    private BigDecimal ringXdslzzl;
+    private BigDecimal withXdslzzl;
+
+    /**
+     * 受累损失率
+     */
+    private BigDecimal currSlsll;
+    private BigDecimal ringSlslzzl;
+    private BigDecimal withSlslzzl;
+
+
+    /**
+     * 性能损失率
+     */
+    private BigDecimal currXNsll;
+    private BigDecimal ringXnslzzl;
+    private BigDecimal withXnslzzl;
+
+
+    /**
+     * 复位及时率/综合效率
+     */
+    private BigDecimal currFwjsl;
+    private BigDecimal ringFwjszzl;
+    private BigDecimal withFwjszzl;
+
+    /**
+     * 状态转换率/离散率
+     */
+    private BigDecimal currZtzhl;
+    private BigDecimal ringZtzhzzl;
+    private BigDecimal withZtzhzzl;
+
+    /**
+     * 消缺及时率/转换效率
+     */
+    private BigDecimal currXqjsl;
+    private BigDecimal ringXqjszzl;
+    private BigDecimal withXqjszzl;
+
+    /**
+     * 综合常用电率
+     */
+    private BigDecimal currZhcydl;
+    private BigDecimal ringZhcydzzl;
+    private BigDecimal withZhcydzzl;
+    /**
+     * 功率曲线符合率
+     */
+    private BigDecimal currGlqxfhl;
+    private BigDecimal ringGlqxfhzzl;
+    private BigDecimal withGlqxfhzzl;
+
+    /**
+     * 设备可利用率
+     */
+    private BigDecimal currSbklyl;
+    private BigDecimal ringSbklyzzl;
+    private BigDecimal withSbklyzzl;
+
+    public BigDecimal getCurrGzsll() {
+        if(null == currGzsll){
+            return new BigDecimal(0.00);
+        }
+        currGzsll = compare100(currGzsll);
+        return currGzsll;
+    }
+
+    public BigDecimal getRingGzslzzl() {
+        if(null == ringGzslzzl){
+            return new BigDecimal(0.00);
+        }
+        ringGzslzzl = compare100(ringGzslzzl);
+        return ringGzslzzl;
+    }
+
+    public BigDecimal getWithGzslzzl() {
+        if(null == withGzslzzl){
+            return new BigDecimal(0.00);
+        }
+        withGzslzzl = compare100(withGzslzzl);
+        return withGzslzzl;
+    }
+
+    public BigDecimal getCurrJxsll() {
+        if(null == currJxsll){
+            return new BigDecimal(0.00);
+        }
+        currJxsll = compare100(currJxsll);
+        return currJxsll;
+    }
+
+    public BigDecimal getRingJxslzzl() {
+        if(null == ringJxslzzl){
+            return new BigDecimal(0.00);
+        }
+        ringJxslzzl = compare100(ringJxslzzl);
+        return ringJxslzzl;
+    }
+
+    public BigDecimal getWithJxslzzl() {
+        if(null == withJxslzzl){
+            return new BigDecimal(0.00);
+        }
+        withJxslzzl = compare100(withJxslzzl);
+        return withJxslzzl;
+    }
+
+    public BigDecimal getCurrXdsll() {
+        if(null == currXdsll){
+            return new BigDecimal(0.00);
+        }
+        currXdsll = compare100(currXdsll);
+        return currXdsll;
+    }
+
+    public BigDecimal getRingXdslzzl() {
+        if(null == ringXdslzzl){
+            return new BigDecimal(0.00);
+        }
+        ringXdslzzl = compare100(ringXdslzzl);
+        return ringXdslzzl;
+    }
+
+    public BigDecimal getWithXdslzzl() {
+        if(null == withXdslzzl){
+            return new BigDecimal(0.00);
+        }
+        withXdslzzl = compare100(withXdslzzl);
+        return withXdslzzl;
+    }
+
+    public BigDecimal getCurrSlsll() {
+        if(null == currSlsll){
+            return new BigDecimal(0.00);
+        }
+        currSlsll = compare100(currSlsll);
+        return currSlsll;
+    }
+
+    public BigDecimal getRingSlslzzl() {
+        if(null == ringSlslzzl){
+            return new BigDecimal(0.00);
+        }
+        ringSlslzzl = compare100(ringSlslzzl);
+        return ringSlslzzl;
+    }
+
+    public BigDecimal getWithSlslzzl() {
+        if(null == withSlslzzl){
+            return new BigDecimal(0.00);
+        }
+        withSlslzzl = compare100(withSlslzzl);
+        return withSlslzzl;
+    }
+
+    public BigDecimal getCurrXNsll() {
+        if(null == currXNsll){
+            return new BigDecimal(0.00);
+        }
+        currXNsll = compare100(currXNsll);
+        return currXNsll;
+    }
+
+    public BigDecimal getRingXnslzzl() {
+        if(null == ringXnslzzl){
+            return new BigDecimal(0.00);
+        }
+        ringXnslzzl = compare100(ringXnslzzl);
+        return ringXnslzzl;
+    }
+
+    public BigDecimal getWithXnslzzl() {
+        if(null == withXnslzzl){
+            return new BigDecimal(0.00);
+        }
+        withXnslzzl = compare100(withXnslzzl);
+        return withXnslzzl;
+    }
+
+    public BigDecimal getCurrFwjsl() {
+        if(null == currFwjsl){
+            return new BigDecimal(0.00);
+        }
+        currFwjsl = compare100(currFwjsl);
+        return currFwjsl;
+    }
+
+    public BigDecimal getRingFwjszzl() {
+        if(null == ringFwjszzl){
+            return new BigDecimal(0.00);
+        }
+        ringFwjszzl = compare100(ringFwjszzl);
+        return ringFwjszzl;
+    }
+
+    public BigDecimal getWithFwjszzl() {
+        if(null == withFwjszzl){
+            return new BigDecimal(0.00);
+        }
+        withFwjszzl = compare100(withFwjszzl);
+        return withFwjszzl;
+    }
+
+    public BigDecimal getCurrZtzhl() {
+        if(null == currZtzhl){
+            return new BigDecimal(0.00);
+        }
+        currZtzhl = compare100(currZtzhl);
+        return currZtzhl;
+    }
+
+    public BigDecimal getRingZtzhzzl() {
+        if(null == ringZtzhzzl){
+            return new BigDecimal(0.00);
+        }
+        ringZtzhzzl = compare100(ringZtzhzzl);
+        return ringZtzhzzl;
+    }
+
+    public BigDecimal getWithZtzhzzl() {
+        if(null == withZtzhzzl){
+            return new BigDecimal(0.00);
+        }
+        withZtzhzzl = compare100(withZtzhzzl);
+        return withZtzhzzl;
+    }
+
+    public BigDecimal getCurrXqjsl() {
+        if(null == currXqjsl){
+            return new BigDecimal(0.00);
+        }
+        currXqjsl = compare100(currXqjsl);
+        return currXqjsl;
+    }
+
+    public BigDecimal getRingXqjszzl() {
+        if(null == ringXqjszzl){
+            return new BigDecimal(0.00);
+        }
+        ringXqjszzl = compare100(ringXqjszzl);
+        return ringXqjszzl;
+    }
+
+    public BigDecimal getWithXqjszzl() {
+        if(null == withXqjszzl){
+            return new BigDecimal(0.00);
+        }
+        withXqjszzl = compare100(withXqjszzl);
+        return withXqjszzl;
+    }
+
+    public BigDecimal getCurrZhcydl() {
+        if(null == currZhcydl){
+            return new BigDecimal(0.00);
+        }
+        currZhcydl = compare100(currZhcydl);
+        return currZhcydl;
+    }
+
+    public BigDecimal getRingZhcydzzl() {
+        if(null == ringZhcydzzl){
+            return new BigDecimal(0.00);
+        }
+        ringZhcydzzl = compare100(ringZhcydzzl);
+        return ringZhcydzzl;
+    }
+
+    public BigDecimal getWithZhcydzzl() {
+        if(null == withZhcydzzl){
+            return new BigDecimal(0.00);
+        }
+        withZhcydzzl = compare100(withZhcydzzl);
+        return withZhcydzzl;
+    }
+
+    public BigDecimal getCurrGlqxfhl() {
+        if(null == currGlqxfhl){
+            return new BigDecimal(0.00);
+        }
+        currGlqxfhl = compare100(currGlqxfhl);
+        return currGlqxfhl;
+    }
+
+    public BigDecimal getRingGlqxfhzzl() {
+        if(null == ringGlqxfhzzl){
+            return new BigDecimal(0.00);
+        }
+        ringGlqxfhzzl = compare100(ringGlqxfhzzl);
+        return ringGlqxfhzzl;
+    }
+
+    public BigDecimal getWithGlqxfhzzl() {
+        if(null == withGlqxfhzzl){
+            return new BigDecimal(0.00);
+        }
+        withGlqxfhzzl = compare100(withGlqxfhzzl);
+        return withGlqxfhzzl;
+    }
+
+    public BigDecimal getCurrSbklyl() {
+        if(null == currSbklyl){
+            return new BigDecimal(0.00);
+        }
+        currSbklyl = compare100(currSbklyl);
+        return currSbklyl;
+    }
+
+    public BigDecimal getRingSbklyzzl() {
+        if(null == ringSbklyzzl){
+            return new BigDecimal(0.00);
+        }
+        ringSbklyzzl = compare100(ringSbklyzzl);
+        return ringSbklyzzl;
+    }
+
+    public BigDecimal getWithSbklyzzl() {
+        if(null == withSbklyzzl){
+            return new BigDecimal(0.00);
+        }
+        withSbklyzzl = compare100(withSbklyzzl);
+        return withSbklyzzl;
+    }
+
+    private BigDecimal compare100(BigDecimal a) {
+        BigDecimal b = new BigDecimal(100);
+        if (b.compareTo(a) == -1) {
+            a = new BigDecimal(100);
+        }
+
+        if (a.compareTo(BigDecimal.ZERO) == -1) {
+            a = new BigDecimal(0);
+        }
+        return a;
+
+    }
+}

+ 36 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/dto/response/FwjslDTO.java

@@ -0,0 +1,36 @@
+package com.gyee.health.dto.response;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @ClassName : FwjslVo
+ * @Author : admin
+ * @Date: 2022-11-23
+ * @Description : 复位及时率Dto
+ * */
+@Data
+public class FwjslDTO implements Serializable {
+    private static final long serialVersionUID = -9120640092604681619L;
+//	--5分钟复位及时次数
+//	--10分钟复位及时次数
+//	--15分钟复位及时次数
+//	--20分钟复位及时次数
+//    --总复位次数
+
+    private Integer ordernum;
+
+    private String wpid;
+    private Date date;
+    private double yfwcs;
+    private double wfz;
+    private double wfzfwl;
+    private double sfz;
+    private double sfzfwl;
+    private double swfz;
+    private double swfzfwl;
+    private double esfz;
+    private double esfzfwl;
+}

+ 34 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/dto/response/ProEconPointCodeDTO.java

@@ -0,0 +1,34 @@
+package com.gyee.health.dto.response;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class ProEconPointCodeDTO {
+
+    private String stationname;
+    private String stationcode;
+    private String description;
+    private BigDecimal value;
+
+
+    public BigDecimal getValue() {
+        return compare100(value);
+    }
+
+
+    private BigDecimal compare100(BigDecimal a) {
+
+        if (null == a) {
+            a = new BigDecimal(0);
+
+        }
+
+        if (a.compareTo(BigDecimal.ZERO) == -1) {
+            a = new BigDecimal(0);
+        }
+        return a;
+
+    }
+}

+ 17 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/dto/response/QxjslDTO.java

@@ -0,0 +1,17 @@
+package com.gyee.health.dto.response;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class QxjslDTO implements Serializable {
+    private static final long serialVersionUID = 6002241313346335418L;
+
+    private Integer ordernum;
+
+    private String wpid;
+    private Long gzCount;
+    private Long xqCount;
+    private Double xqjsl;
+}

+ 603 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/init/CacheContext.java

@@ -0,0 +1,603 @@
+package com.gyee.health.init;
+
+
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.TypeReference;
+import com.gyee.common.model.StringUtils;
+import com.gyee.health.model.auto.*;
+import com.gyee.health.service.auto.*;
+import com.gyee.health.util.redis.RedisService;
+import com.gyee.runeconomy.service.realtimelibrary.TheoreticalPowerService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * @ClassName : CacheContext
+ * @Author : xieshengjie
+ * @Date: 2021/5/18 9:35
+ * @Description : 缓存
+ */
+@Component
+public class CacheContext implements CommandLineRunner {
+    Logger logger = LoggerFactory.getLogger(CacheContext.class);
+
+    private final String QS = "0";
+
+    @Resource
+    private IProBasicEquipmentService proBasicEquipmentService;
+    @Resource
+    private IProBasicLineService proBasicLineService;
+    @Resource
+    private IProBasicProjectService proBasicProjectService;
+
+    @Resource
+    private IProBasicPowerstationService proBasicWindpowerstationService;
+    @Resource
+    private IProBasicMeterPointService proBasicMeterPointService;
+    @Resource
+    private IProEconEquipmentmodelService proEconEquipmentmodelService;
+
+    @Resource
+    private IProBasicWindturbinePowerService proBasicWindturbinePowerService;
+    @Resource
+    private RedisService redisService;
+    @Resource
+    private IProBasicModelPowerService proBasicModelPowerService;
+    @Resource
+    private IProBasicSubStationService proBasicSubStationService;
+    @Resource
+    private IProBasicWeatherStationService proBasicWeatherStationService;
+    @Resource
+    private IProBasicSquareService proBasicSquareService;
+    @Resource
+    private IProBasicCompanyService proBasicCompanyService;
+    @Resource
+    private IProBasicRegionService proBasicRegionService;
+    @Resource
+    private IProBasicEnergyGroupService proBasicEnergyGroupService;
+    @Resource
+    private TheoreticalPowerService theoreticalPowerService;
+
+    @Resource
+    private IProBasicModelPowerRdService proBasicModelPowerRdService;
+
+    @Resource
+    private IProBasicPowerstationPointService proBasicPowerstationPointService;
+
+    @Resource
+    private IProBasicEquipmentPointService proBasicEquipmentPointService;
+
+    public static List<ProBasicEquipment> wtls = new ArrayList<>();
+    public static List<ProBasicProject> pjls = new ArrayList<>();
+    public static List<ProBasicLine>  lnls = new ArrayList<>();
+    public static List<ProBasicSubStation>  subwpls = new ArrayList<>();
+    public static List<ProBasicWeatherStation>  weawpls = new ArrayList<>();
+    public static List<ProBasicSquare> sqls = new ArrayList<>();
+    public static List<ProBasicPowerstation>  wpls = new ArrayList<>();
+    public static List<ProBasicPowerstation>  wplsf = new ArrayList<>();
+    public static List<ProBasicPowerstation>  wplsG = new ArrayList<>(); //光电集合
+    public static List<ProBasicPowerstation>  zwpls = new ArrayList<>();
+    public static List<ProBasicCompany>  cpls = new ArrayList<>();
+    public static List<ProBasicRegion>  rgls = new ArrayList<>();
+    public static List<ProBasicEnergyGroup>  gpls = new ArrayList<>();
+    public static List<ProBasicPowerstationPoint> powerpointls = new ArrayList<>();
+    public static List<ProBasicEquipmentPoint> Equipmentpointls = new ArrayList<>();
+    public static Map<String,ProBasicProject> pjmap = new HashMap<>();
+    public static Map<String,ProBasicLine> lnmap = new HashMap<>();
+    public static Map<String,ProBasicRegion> rgmap = new HashMap<>();
+    public static Map<String,ProBasicCompany> cpmap = new HashMap<>();
+    public static Map<String,ProBasicEnergyGroup> gpmap = new HashMap<>();
+
+    public static Map<String,List<ProBasicPowerstation>> cpwpmap = new HashMap<>();
+    public static Map<String,List<ProBasicPowerstation>> wpmapls = new HashMap<>();
+    public static Map<String,List<ProBasicPowerstation>> stationls = new HashMap<>();
+
+    public static Map<String,List<ProBasicCompany>> rgcpmap = new HashMap<>();
+    public static Map<String,ProBasicSquare> sqmap = new HashMap<>();
+    public static Map<String, ProBasicPowerstation> wpmap = new HashMap<>();
+    public static List<ProBasicMeterPoint>  meterpoints = new ArrayList<>();
+    public static Map<String,ProBasicMeterPoint>  meterpointMap = new HashMap<>();
+    public static Map<String,List<ProBasicProject>> wppromap = new HashMap<>();
+    public static Map<String,List<ProBasicProject>> projmap = new HashMap<>();
+    public static Map<String,List<ProBasicLine>> prolinemap = new HashMap<>();
+    public static Map<String,List<ProBasicEquipment>> wpwtmap = new HashMap<>();
+    public static Map<String,List<ProBasicEquipment>> pjwtmap = new HashMap<>();
+    public static Map<String,List<ProBasicEquipment>> lnwtmap = new HashMap<>();
+    public static Map<String,List<ProBasicEquipment>> cmwtlsmap = new HashMap<>();
+    public static Map<String,List<ProBasicEquipment>> rgwtlsmap = new HashMap<>();
+    public static Map<String,Map<String,ProBasicEquipment>> cmwtmap = new HashMap<>();
+    public static Map<String,List<ProBasicEquipment>> sqwtmap = new HashMap<>();
+    public static Map<String, Map<String, ProBasicEquipmentPoint>> wtpAimap = new HashMap<>();// 风电机测点AI表
+    public static Map<String, Map<String, ProBasicEquipmentPoint>> wtpointmap = new HashMap<>();//风机测点
+    public static Map<String,Map<String, ProBasicPowerstationPoint>> linepointmap =new HashMap<>();
+//    public static Map<String,Map<String, ProBasicPowerstationPoint>> lnPointmap =new HashMap<>();//线路测点
+    public static Map<String,Map<String, ProBasicPowerstationPoint>> propointmap =new HashMap<>();
+//    public static Map<String,Map<String, ProBasicPowerstationPoint>> pjPointmap =new HashMap<>(); //期次测点
+    public static Map<String,Map<String, ProBasicPowerstationPoint>> wppointmap =new HashMap<>();
+    public static Map<String,Map<String, ProBasicPowerstationPoint>> pointwpmap =new HashMap<>();
+    public static Map<String,Map<String, ProBasicPowerstationPoint>> subwppointmap =new HashMap<>();
+    public static Map<String,Map<String, ProBasicPowerstationPoint>> weatherwppointmap =new HashMap<>();
+    public static Map<String,Map<String, ProBasicPowerstationPoint>> companypointmap =new HashMap<>();
+    public static Map<String,Map<String, ProBasicPowerstationPoint>> regionpointmap =new HashMap<>();
+    public static Map<String,Map<String, ProBasicPowerstationPoint>> grouppointmap =new HashMap<>();
+
+    public static Map<String,Map<Double,Double>> zbzglMap = new HashMap<>();
+    public static Map<String,ProEconEquipmentmodel> modelMap = new HashMap<>();
+    public static Map<String,Map<Double,Double>> zzsglMap = new HashMap<>();
+    public static Map<String,Double> modelpower = new HashMap<>();
+
+    public static Map<String,String> wtstandardmap = new HashMap<>();
+    public static Map<String, ProBasicEquipment> wtmap = new HashMap<>();
+
+    public static Map<String,Map<Double,ProBasicModelPower>> modelpowermap = new TreeMap<>();
+
+    public static List<ProBasicModelPower> mpls=new ArrayList<>();
+
+    public static List<ProEconEquipmentmodel> equipmentmodels=new ArrayList<>();
+
+    public static Map<String,List<ProBasicEquipment>> subWtsMap = new HashMap<>();
+    public static List<ProBasicModelPowerRd> theoreticalPowerList=new ArrayList<>();
+    public static Map<String, Map<Double,ProBasicModelPowerRd>> theoreticalPowerMap = new HashMap<>(); //理论,保证功率
+    public static Map<String, Map<Double,ProEconWtPowerCurveFitting>> curveFittingPowerMap = new HashMap<>(); //自算,最优功率
+    public static Map<String,List<ProBasicStatusPoint>> statusMap = new HashMap<>();
+
+    @Override
+    public void run(String... args) throws Exception {
+        logger.info("缓存开始------------------------------------------------------------");
+
+        equipmentmodels = proEconEquipmentmodelService.list();
+        equipmentmodels.stream().forEach(e->{
+            modelMap.put(e.getId(),e);
+        });
+        mpls=proBasicModelPowerService.list();
+        mpls.sort(Comparator.comparing(ProBasicModelPower::getSpeed));
+        if(!mpls.isEmpty())
+        {
+
+            for(ProBasicModelPower mp:mpls)
+            {
+                if(modelpowermap.containsKey(mp.getModelId()))
+                {
+                    Map<Double,ProBasicModelPower> tempmap=modelpowermap.get(mp.getModelId());
+                    tempmap.put(mp.getSpeed(),mp);
+
+                }else {
+                    Map<Double,ProBasicModelPower> tempmap=new HashMap<>();
+                    tempmap.put(mp.getSpeed(),mp);
+                    modelpowermap.put(mp.getModelId(),tempmap);
+                }
+            }
+        }
+        sqls=proBasicSquareService.list().stream().filter(i->i.getIsAble()==1).collect(Collectors.toList());
+        if (!sqls.isEmpty())
+        {
+            for(ProBasicSquare sq:sqls)
+            {
+                sqmap.put(sq.getId(),sq);
+            }
+        }
+
+        cpls=proBasicCompanyService.list().stream().filter(i->i.getIsAble().equals(1)).collect(Collectors.toList());
+        if (!cpls.isEmpty())
+        {
+            for(ProBasicCompany sq:cpls)
+            {
+                cpmap.put(sq.getId(),sq);
+
+                if (redisService.hasKey(sq.getId()+"0")){
+                    String cp0String = redisService.get(sq.getId()+"0");
+                    Map<String, ProBasicPowerstationPoint> stringWindpowerstationpointnewMap = JSONObject.parseObject(cp0String, new TypeReference<Map<String, ProBasicPowerstationPoint>>() {
+                    });
+                    companypointmap.put(sq.getId()+"0",stringWindpowerstationpointnewMap);
+                }
+                if (redisService.hasKey(sq.getId()+"-1")){
+                    String cp1String = redisService.get(sq.getId()+"-1");
+                    Map<String, ProBasicPowerstationPoint> stringWindpowerstationpointnewMap = JSONObject.parseObject(cp1String, new TypeReference<Map<String, ProBasicPowerstationPoint>>() {
+                    });
+                    companypointmap.put(sq.getId()+"-1",stringWindpowerstationpointnewMap);
+                }
+                if (redisService.hasKey(sq.getId()+"-2")){
+                    String cp2String = redisService.get(sq.getId()+"-2");
+                    Map<String, ProBasicPowerstationPoint> stringWindpowerstationpointnewMap = JSONObject.parseObject(cp2String, new TypeReference<Map<String, ProBasicPowerstationPoint>>() {
+                    });
+                    companypointmap.put(sq.getId()+"-2",stringWindpowerstationpointnewMap);
+                }
+
+
+
+
+            }
+
+        }
+
+
+        rgls=proBasicRegionService.list().stream().filter(i->i.getIsAble()==1).collect(Collectors.toList());
+
+
+        if  (!rgls.isEmpty())
+        {
+            for(ProBasicRegion sq:rgls)
+            {
+                rgmap.put(sq.getId(),sq);
+
+                if (redisService.hasKey(sq.getId()+"0")){
+                    String cp0String = redisService.get(sq.getId()+"0");
+                    Map<String, ProBasicPowerstationPoint> stringWindpowerstationpointnewMap = JSONObject.parseObject(cp0String, new TypeReference<Map<String, ProBasicPowerstationPoint>>() {
+                    });
+                    regionpointmap.put(sq.getId()+"0",stringWindpowerstationpointnewMap);
+                }
+                if (redisService.hasKey(sq.getId()+"-1")){
+                    String cp1String = redisService.get(sq.getId()+"-1");
+                    Map<String, ProBasicPowerstationPoint> stringWindpowerstationpointnewMap = JSONObject.parseObject(cp1String, new TypeReference<Map<String, ProBasicPowerstationPoint>>() {
+                    });
+                    regionpointmap.put(sq.getId()+"-1",stringWindpowerstationpointnewMap);
+                }
+                if (redisService.hasKey(sq.getId()+"-2")){
+                    String cp2String = redisService.get(sq.getId()+"-2");
+                    Map<String, ProBasicPowerstationPoint> stringWindpowerstationpointnewMap = JSONObject.parseObject(cp2String, new TypeReference<Map<String, ProBasicPowerstationPoint>>() {
+                    });
+                    regionpointmap.put(sq.getId()+"-2",stringWindpowerstationpointnewMap);
+                }
+            }
+        }
+
+        List<ProBasicEnergyGroup> energyGroups = proBasicEnergyGroupService.list();
+        gpls = energyGroups.stream().filter(e->e.getIsAble()==1 && e.getId().endsWith("FGS")).collect(Collectors.toList());
+
+        if  (!gpls.isEmpty())
+        {
+            for(ProBasicEnergyGroup gp:gpls)
+            {
+                gpmap.put(gp.getId(),gp);
+
+                if (redisService.hasKey(gp.getId()+"0")){
+                    String cp0String = redisService.get(gp.getId()+"0");
+                    Map<String, ProBasicPowerstationPoint> stringWindpowerstationpointnewMap = JSONObject.parseObject(cp0String, new TypeReference<Map<String, ProBasicPowerstationPoint>>() {
+                    });
+                    grouppointmap.put(gp.getId()+"0",stringWindpowerstationpointnewMap);
+                }
+                if (redisService.hasKey(gp.getId()+"-1")){
+                    String cp1String = redisService.get(gp.getId()+"-1");
+                    Map<String, ProBasicPowerstationPoint> stringWindpowerstationpointnewMap = JSONObject.parseObject(cp1String, new TypeReference<Map<String, ProBasicPowerstationPoint>>() {
+                    });
+                    grouppointmap.put(gp.getId()+"-1",stringWindpowerstationpointnewMap);
+                }
+                if (redisService.hasKey(gp.getId()+"-2")){
+                    String cp2String = redisService.get(gp.getId()+"-2");
+                    Map<String, ProBasicPowerstationPoint> stringWindpowerstationpointnewMap = JSONObject.parseObject(cp2String, new TypeReference<Map<String, ProBasicPowerstationPoint>>() {
+                    });
+                    grouppointmap.put(gp.getId()+"-2",stringWindpowerstationpointnewMap);
+                }
+            }
+        }
+
+
+
+        for(ProBasicCompany cp:cpls)
+        {
+            if (rgcpmap.containsKey(cp.getRegionId())){
+                rgcpmap.get(cp.getRegionId()).add(cp);
+            }else {
+                List<ProBasicCompany> wps = new ArrayList<>();
+                wps.add(cp);
+                rgcpmap.put(cp.getRegionId(),wps);
+            }
+        }
+
+        for(ProBasicPowerstation wp:wpls)
+        {
+            if (cpwpmap.containsKey(wp.getCompanyId())){
+                cpwpmap.get(wp.getCompanyId()).add(wp);
+            }else {
+                List<ProBasicPowerstation> wps = new ArrayList<>();
+                wps.add(wp);
+                cpwpmap.put(wp.getCompanyId(),wps);
+            }
+        }
+
+
+        wtls = proBasicEquipmentService.list().stream().filter(i->i.getIsable()==1).collect(Collectors.toList());
+        logger.info(wtls.size()+"");
+        wtls.forEach(wt->{
+            if(modelMap.containsKey(wt.getModelId()))
+            {
+                ProEconEquipmentmodel equipmentmodel = modelMap.get(wt.getModelId());
+                modelpower.put(wt.getId(),equipmentmodel.getPowerProduction().doubleValue());
+            }
+
+
+            wtmap.put(wt.getId(),wt);
+            //标杆风机初始化
+            wtstandardmap.put(wt.getId(),wt.getId());
+            String wtString = redisService.get(wt.getId());
+            Map<String, ProBasicEquipmentPoint> stringWindturbinetestingpointnewMap = JSONObject.parseObject(wtString, new TypeReference<Map<String, ProBasicEquipmentPoint>>() {
+            });
+            wtpAimap.put(wt.getId(),stringWindturbinetestingpointnewMap);
+
+
+            if (wpwtmap.containsKey(wt.getWindpowerstationId())){
+                wpwtmap.get(wt.getWindpowerstationId()).add(wt);
+            }else {
+                List<ProBasicEquipment> wps = new ArrayList<>();
+                wps.add(wt);
+                wpwtmap.put(wt.getWindpowerstationId(),wps);
+            }
+
+            if (pjwtmap.containsKey(wt.getProjectId())){
+                pjwtmap.get(wt.getProjectId()).add(wt);
+            }else {
+                List<ProBasicEquipment> pjs = new ArrayList<>();
+                pjs.add(wt);
+                pjwtmap.put(wt.getProjectId(),pjs);
+            }
+            if (lnwtmap.containsKey(wt.getLineId())){
+                lnwtmap.get(wt.getLineId()).add(wt);
+            }else {
+                List<ProBasicEquipment> lnls = new ArrayList<>();
+                lnls.add(wt);
+                lnwtmap.put(wt.getLineId(),lnls);
+            }
+            if (cmwtlsmap.containsKey(wt.getCompanyId())){
+                cmwtlsmap.get(wt.getCompanyId()).add(wt);
+            }else {
+                List<ProBasicEquipment> cmls = new ArrayList<>();
+                cmls.add(wt);
+                cmwtlsmap.put(wt.getCompanyId(),cmls);
+            }
+            if (rgwtlsmap.containsKey(wt.getRegionId())){
+                rgwtlsmap.get(wt.getRegionId()).add(wt);
+            }else {
+                List<ProBasicEquipment> rgls = new ArrayList<>();
+                rgls.add(wt);
+                rgwtlsmap.put(wt.getRegionId(),rgls);
+            }
+
+            if (sqwtmap.containsKey(wt.getSquareId())){
+                sqwtmap.get(wt.getSquareId()).add(wt);
+            }else {
+                List<ProBasicEquipment> lnls = new ArrayList<>();
+                lnls.add(wt);
+                sqwtmap.put(wt.getSquareId(),lnls);
+            }
+
+            if (cmwtmap.containsKey(wt.getCompanyId())){
+                cmwtmap.get(wt.getCompanyId()).put(wt.getId(),wt);
+            }else {
+                Map<String,ProBasicEquipment> map=new HashMap<>();
+                map.put(wt.getId(),wt);
+                cmwtmap.put(wt.getCompanyId(),map);
+            }
+        });
+
+        //初始化标杆风机
+        for(ProBasicEquipment wt:wtls)
+        {
+            if(wpwtmap.containsKey(wt.getLineId()))
+            {
+                List<ProBasicEquipment> wts=wpwtmap.get(wt.getLineId());
+                for(ProBasicEquipment w:wts)
+                {
+                    if(StringUtils.notEmp(w.getIsStandard()) && w.getIsStandard()!=0)
+                    {
+                        wtstandardmap.put(wt.getId(),w.getId());
+                        break;
+                    }
+                }
+            }
+            if(pjwtmap.containsKey(wt.getLineId()))
+            {
+                List<ProBasicEquipment> wts=pjwtmap.get(wt.getLineId());
+                for(ProBasicEquipment w:wts)
+                {
+                    if(StringUtils.notEmp(w.getIsStandard()) && w.getIsStandard()!=0)
+                    {
+                        wtstandardmap.put(wt.getId(),w.getId());
+                        break;
+                    }
+                }
+            }
+            if(lnwtmap.containsKey(wt.getLineId()))
+            {
+                List<ProBasicEquipment> wts=lnwtmap.get(wt.getLineId());
+                for(ProBasicEquipment w:wts)
+                {
+                    if(StringUtils.notEmp(w.getIsStandard()) && w.getIsStandard()!=0)
+                    {
+                        wtstandardmap.put(wt.getId(),w.getId());
+                        break;
+                    }
+                }
+            }
+        }
+
+
+
+        pjls = proBasicProjectService.list().stream().filter(i-> i.getIsAble()==1).collect(Collectors.toList());
+        pjls.stream().forEach(p->{
+            pjmap.put(p.getId(),p);
+            if (wppromap.containsKey(p.getWindpowerstationId())){
+                wppromap.get(p.getWindpowerstationId()).add(p);
+            }else {
+                List<ProBasicProject> prolist = new ArrayList<>();
+                prolist.add(p);
+                wppromap.put(p.getWindpowerstationId(),prolist);
+            }
+            String pjString = redisService.get(p.getId());
+            Map<String, ProBasicPowerstationPoint> stringWindpowerstationpointnewMap = JSONObject.parseObject(pjString, new TypeReference<Map<String, ProBasicPowerstationPoint>>() {
+            });
+            propointmap.put(p.getId(),stringWindpowerstationpointnewMap);
+
+        });
+        projmap = pjls.stream().collect(Collectors.groupingBy(ProBasicProject::getWindpowerstationId));
+
+        subwpls = proBasicSubStationService.list().stream().filter(i-> i.getIsAble()==1).collect(Collectors.toList());
+        subwpls.stream().forEach(sub->{
+
+            String subString = redisService.get(sub.getId());
+            Map<String, ProBasicPowerstationPoint> stringWindpowerstationpointnewMap = JSONObject.parseObject(subString, new TypeReference<Map<String, ProBasicPowerstationPoint>>() {
+            });
+            subwppointmap.put(sub.getId(),stringWindpowerstationpointnewMap);
+
+//            List<ProBasicEquipment> collect = wtls.stream().filter(wt -> wt.getSubstationId().equals(sub.getId())).collect(Collectors.toList());
+//            subWtsMap.put(sub.getId(),collect);
+
+        });
+
+        weawpls = proBasicWeatherStationService.list().stream().filter(i-> i.getIsAble()==1).collect(Collectors.toList());
+        weawpls.stream().forEach(weather->{
+
+            String subString = redisService.get(weather.getId());
+            Map<String, ProBasicPowerstationPoint> stringWindpowerstationpointnewMap = JSONObject.parseObject(subString, new TypeReference<Map<String, ProBasicPowerstationPoint>>() {
+            });
+            weatherwppointmap.put(weather.getId(),stringWindpowerstationpointnewMap);
+
+
+        });
+        //线路
+        lnls = proBasicLineService.list().stream().filter(i-> StringUtils.isNotNull(pjmap.get(i.getProjectId())) && i.getIsAble()==1).collect(Collectors.toList());
+        lnls.stream().forEach(l->{
+            lnmap.put(l.getId(),l);
+            if (prolinemap.containsKey(l.getProjectId())){
+                prolinemap.get(l.getProjectId()).add(l);
+            }else {
+                List<ProBasicLine> lineList = new ArrayList<>();
+                lineList.add(l);
+                prolinemap.put(l.getProjectId(),lineList);
+            }
+            String lnString = redisService.get(l.getId());
+            Map<String, ProBasicPowerstationPoint> stringWindpowerstationpointnewMap = JSONObject.parseObject(lnString, new TypeReference<Map<String, ProBasicPowerstationPoint>>() {
+            });
+            linepointmap.put(l.getId(),stringWindpowerstationpointnewMap);
+        });
+
+
+        zwpls = proBasicWindpowerstationService.list().stream().filter(i->i.getIsAble()==1).collect(Collectors.toList());;
+        wpls = proBasicWindpowerstationService.list().stream().filter(i->i.getIsAble()==1).collect(Collectors.toList());;
+        for(ProBasicPowerstation wp:wpls)
+        {
+            if (cpwpmap.containsKey(wp.getCompanyId())){
+                cpwpmap.get(wp.getCompanyId()).add(wp);
+            }else {
+                List<ProBasicPowerstation> wps = new ArrayList<>();
+                wps.add(wp);
+                cpwpmap.put(wp.getCompanyId(),wps);
+            }
+        }
+        meterpoints = proBasicMeterPointService.list().stream().filter(i->i.getIsAble()==1).collect(Collectors.toList());
+        meterpoints.stream().forEach(meterpoint -> {
+            meterpointMap.put(meterpoint.getId(),meterpoint);
+        });
+
+
+        wpls.stream().forEach(wp->{
+
+            wpmap.put(wp.getId(),wp);
+            String wpString = redisService.get(wp.getId());
+            Map<String, ProBasicPowerstationPoint> stringMapMap = JSONObject.parseObject(wpString, new TypeReference<Map<String, ProBasicPowerstationPoint>>() {
+            });
+            wppointmap.put(wp.getId(),stringMapMap);
+        });
+
+        if (!wpls.isEmpty()) {
+            for (ProBasicPowerstation wp : wpls) {
+                if (wp.getId().endsWith("FDC_STA")) {
+                    wplsf.add(wp);
+                }
+                if (wp.getId().endsWith("GDC_STA")) {
+                    wplsG.add(wp);
+                }
+
+                if(wpmapls.containsKey(wp.getId()))
+                {
+                    List<ProBasicPowerstation> ls=wpmapls.get(wp.getId());
+                    ls.add(wp);
+                    wpmapls.put(wp.getId(),ls);
+                }else {
+                    List<ProBasicPowerstation> ls=new ArrayList<>();
+                    ls.add(wp);
+                    wpmapls.put(wp.getId(),ls);
+                }
+
+
+//                if(wp.getWindType().equals(-1) && wp.getWindType().equals(-2)){
+//                    List<ProBasicPowerstation> ls = stationls.get(wp.getWindType());
+//                    stationls.put(wp.getWindType()+QS,ls);
+//                }
+
+
+                wpmap.put(wp.getId(),wp);
+            }
+        }
+
+
+        Map<String,ProBasicPowerstationPoint> items=null;
+        powerpointls = proBasicPowerstationPointService.list().stream().filter(i ->i.getId() != null).collect(Collectors.toList());
+        if(powerpointls!=null && !powerpointls.isEmpty()){
+            for(int i=0;i<powerpointls.size();i++){
+
+//                if(pjmap.containsKey(powerpointls.get(i).getWindpowerstationId()))
+//                {
+//                    ProBasicPowerstationPoint point=powerpointls.get(i);
+//                    if(pjPointmap.containsKey(point.getWindpowerstationId())){
+//                        items=pjPointmap.get(point.getWindpowerstationId());
+//                        items.put(point.getUniformCode(), point);
+//                    }
+//                    else{
+//                        items=new HashMap<String,ProBasicPowerstationPoint>();
+//                        pjPointmap.put(point.getWindpowerstationId(), items);
+//                        items.put(point.getUniformCode(), point);
+//                    }
+//                }else if(lnmap.containsKey(powerpointls.get(i).getWindpowerstationId()))
+//                {
+//                    ProBasicPowerstationPoint point=powerpointls.get(i);
+//                    if(lnPointmap.containsKey(point.getWindpowerstationId())){
+//                        items=lnPointmap.get(point.getWindpowerstationId());
+//                        items.put(point.getUniformCode(), point);
+//                    }
+//                    else{
+//                        items=new HashMap<String,ProBasicPowerstationPoint>();
+//                        lnPointmap.put(point.getWindpowerstationId(), items);
+//                        items.put(point.getUniformCode(), point);
+//                    }
+//                }else
+//                {
+                    ProBasicPowerstationPoint point = powerpointls.get(i);
+                    if(pointwpmap.containsKey(point.getWindpowerstationId())){
+                        items=pointwpmap.get(point.getWindpowerstationId());
+                        items.put(point.getUniformCode(), point);
+                    }
+                    else{
+                        items=new HashMap<String,ProBasicPowerstationPoint>();
+                        pointwpmap.put(point.getWindpowerstationId(), items);
+                        items.put(point.getUniformCode(), point);
+                    }
+//                }
+            }
+        }
+
+
+
+
+        String llglString = redisService.get("ZLLGL");
+        theoreticalPowerMap = JSONObject.parseObject(llglString, new TypeReference<Map<String, Map<Double,ProBasicModelPowerRd>>>() {
+        });
+
+        llglString = redisService.get("ZLLGLLS");
+        theoreticalPowerList=  JSONObject.parseObject(llglString, new TypeReference<List<ProBasicModelPowerRd>>() {
+        });
+
+        String sszzt = redisService.get("SSZZT");
+        statusMap = JSONObject.parseObject(sszzt, new TypeReference<Map<String,List<ProBasicStatusPoint>>>() {
+        });
+
+
+
+        logger.info("缓存结束------------------------------------------------------------");
+    }
+}

+ 16 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProBasicCompanyMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.health.mapper.auto;
+
+import com.gyee.health.model.auto.ProBasicCompany;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 省公司表 Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-31
+ */
+public interface ProBasicCompanyMapper extends BaseMapper<ProBasicCompany> {
+
+}

+ 16 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProBasicEnergyGroupMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.health.mapper.auto;
+
+import com.gyee.health.model.auto.ProBasicEnergyGroup;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 集团 Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-31
+ */
+public interface ProBasicEnergyGroupMapper extends BaseMapper<ProBasicEnergyGroup> {
+
+}

+ 16 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProBasicEquipmentMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.health.mapper.auto;
+
+import com.gyee.health.model.auto.ProBasicEquipment;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 风机&光伏 Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-31
+ */
+public interface ProBasicEquipmentMapper extends BaseMapper<ProBasicEquipment> {
+
+}

+ 16 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProBasicEquipmentPointMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.health.mapper.auto;
+
+import com.gyee.health.model.auto.ProBasicEquipmentPoint;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 设备测点 Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-31
+ */
+public interface ProBasicEquipmentPointMapper extends BaseMapper<ProBasicEquipmentPoint> {
+
+}

+ 16 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProBasicLineMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.health.mapper.auto;
+
+import com.gyee.health.model.auto.ProBasicLine;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 集电线路 Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-31
+ */
+public interface ProBasicLineMapper extends BaseMapper<ProBasicLine> {
+
+}

+ 16 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProBasicMeterPointMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.health.mapper.auto;
+
+import com.gyee.health.model.auto.ProBasicMeterPoint;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 电计量点表 Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-31
+ */
+public interface ProBasicMeterPointMapper extends BaseMapper<ProBasicMeterPoint> {
+
+}

+ 16 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProBasicModelPowerMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.health.mapper.auto;
+
+import com.gyee.health.model.auto.ProBasicModelPower;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-31
+ */
+public interface ProBasicModelPowerMapper extends BaseMapper<ProBasicModelPower> {
+
+}

+ 16 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProBasicModelPowerRdMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.health.mapper.auto;
+
+import com.gyee.health.model.auto.ProBasicModelPowerRd;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-11-06
+ */
+public interface ProBasicModelPowerRdMapper extends BaseMapper<ProBasicModelPowerRd> {
+
+}

+ 16 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProBasicPowerstationMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.health.mapper.auto;
+
+import com.gyee.health.model.auto.ProBasicPowerstation;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 场站表 Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-11-12
+ */
+public interface ProBasicPowerstationMapper extends BaseMapper<ProBasicPowerstation> {
+
+}

+ 20 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProBasicPowerstationPointMapper.java

@@ -0,0 +1,20 @@
+package com.gyee.health.mapper.auto;
+
+import com.gyee.health.model.auto.ProBasicPowerstationPoint;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 场站测点,期次测点,线路测点,三级公司测点,区域测点
+
+
+
++方阵测点 Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-31
+ */
+public interface ProBasicPowerstationPointMapper extends BaseMapper<ProBasicPowerstationPoint> {
+
+}

+ 16 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProBasicProjectMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.health.mapper.auto;
+
+import com.gyee.health.model.auto.ProBasicProject;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 工程表 Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-31
+ */
+public interface ProBasicProjectMapper extends BaseMapper<ProBasicProject> {
+
+}

+ 16 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProBasicProjectPlanMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.health.mapper.auto;
+
+import com.gyee.health.model.auto.ProBasicProjectPlan;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 工程计划表 Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-21
+ */
+public interface ProBasicProjectPlanMapper extends BaseMapper<ProBasicProjectPlan> {
+
+}

+ 16 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProBasicRealtimeDbconfigMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.health.mapper.auto;
+
+import com.gyee.health.model.auto.ProBasicRealtimeDbconfig;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 实时数据库配置表 Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-21
+ */
+public interface ProBasicRealtimeDbconfigMapper extends BaseMapper<ProBasicRealtimeDbconfig> {
+
+}

+ 16 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProBasicRegionMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.health.mapper.auto;
+
+import com.gyee.health.model.auto.ProBasicRegion;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 区域 Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-31
+ */
+public interface ProBasicRegionMapper extends BaseMapper<ProBasicRegion> {
+
+}

+ 16 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProBasicSquareMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.health.mapper.auto;
+
+import com.gyee.health.model.auto.ProBasicSquare;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 方阵 Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-31
+ */
+public interface ProBasicSquareMapper extends BaseMapper<ProBasicSquare> {
+
+}

+ 16 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProBasicStatusPointMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.health.mapper.auto;
+
+import com.gyee.health.model.auto.ProBasicStatusPoint;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-11-17
+ */
+public interface ProBasicStatusPointMapper extends BaseMapper<ProBasicStatusPoint> {
+
+}

+ 16 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProBasicSubStationMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.health.mapper.auto;
+
+import com.gyee.health.model.auto.ProBasicSubStation;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 调度场站名称 Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-31
+ */
+public interface ProBasicSubStationMapper extends BaseMapper<ProBasicSubStation> {
+
+}

+ 16 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProBasicWeatherStationMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.health.mapper.auto;
+
+import com.gyee.health.model.auto.ProBasicWeatherStation;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 气象站名称 Mapper 接口
+ * </p>
+ *
+ * @author wang
+ * @since 2023-04-04
+ */
+public interface ProBasicWeatherStationMapper extends BaseMapper<ProBasicWeatherStation> {
+
+}

+ 16 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProBasicWindturbinePowerMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.health.mapper.auto;
+
+import com.gyee.health.model.auto.ProBasicWindturbinePower;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 风机功率曲线 Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-21
+ */
+public interface ProBasicWindturbinePowerMapper extends BaseMapper<ProBasicWindturbinePower> {
+
+}

+ 16 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEcoWindspecificInfoDayMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.health.mapper.auto;
+
+import com.gyee.health.model.auto.ProEcoWindspecificInfoDay;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 日专题分析 Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-21
+ */
+public interface ProEcoWindspecificInfoDayMapper extends BaseMapper<ProEcoWindspecificInfoDay> {
+
+}

+ 30 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconActivePowerDataMapper.java

@@ -0,0 +1,30 @@
+package com.gyee.health.mapper.auto;
+
+import com.gyee.health.model.auto.ProEconActivePowerData;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gyee.health.model.vo.FitClassVo;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 动态功率数据 Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-27
+ */
+public interface ProEconActivePowerDataMapper extends BaseMapper<ProEconActivePowerData> {
+
+    @Select(" SELECT windpowerstation_id windpowerstationId,windturbine_id windturbineId, " +
+            "model_id modelId,speed,avg(power) power " +
+            "FROM Pro_Econ_Active_Power_Data " +
+            "  where  windpowerstation_id=#{windpowerstationId} and record_date>=#{beginDate}  and record_date<=#{endDate} " +
+            "       group by windpowerstation_id,windturbine_id,model_id,speed order by speed ")
+    public List<FitClassVo> getFitList(@Param(value = "windpowerstationId")String windpowerstationId, @Param(value = "beginDate") Date beginDate, @Param(value = "endDate")Date endDate);
+
+
+}

+ 16 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconBenchmarkMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.health.mapper.auto;
+
+import com.gyee.health.model.auto.ProEconBenchmark;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 对标管理 Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-21
+ */
+public interface ProEconBenchmarkMapper extends BaseMapper<ProEconBenchmark> {
+
+}

+ 24 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconBenchmarkingBetweenMapper.java

@@ -0,0 +1,24 @@
+package com.gyee.health.mapper.auto;
+
+import com.gyee.health.model.auto.ProEconBenchmarkingBetween;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author wang
+ * @since 2023-02-03
+ */
+public interface ProEconBenchmarkingBetweenMapper extends BaseMapper<ProEconBenchmarkingBetween> {
+
+    @Select("select duty_name dutyName,sum(theoretical_generatity) theoreticalGeneratity,sum(generatity) generatity,sum(fault_loss) faultLoss,sum(main_loss) mainLoss,sum(performance_loss) performanceLoss,sum(rationing_loss) rationingLoss,sum(involves_loss) involvesLoss from pro_econ_benchmarking_between where theday>=#{begin} and theday <=#{end} group by duty_name ")
+    public List<ProEconBenchmarkingBetween> findByBeginAndEnd(@Param(value = "begin") Date begin, @Param(value = "end")Date end);
+
+}

+ 16 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconBrownoutsEvent2Mapper.java

@@ -0,0 +1,16 @@
+package com.gyee.health.mapper.auto;
+
+import com.gyee.health.model.auto.ProEconBrownoutsEvent2;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 与停机事件关联(限电停机时),数据库中无关联,程序控制 Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-25
+ */
+public interface ProEconBrownoutsEvent2Mapper extends BaseMapper<ProEconBrownoutsEvent2> {
+
+}

+ 16 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconBrownoutsEventMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.health.mapper.auto;
+
+import com.gyee.health.model.auto.ProEconBrownoutsEvent;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 与停机事件关联(限电停机时),数据库中无关联,程序控制 Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-21
+ */
+public interface ProEconBrownoutsEventMapper extends BaseMapper<ProEconBrownoutsEvent> {
+
+}

+ 20 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconCurveFittMonthMainMapper.java

@@ -0,0 +1,20 @@
+package com.gyee.health.mapper.auto;
+
+import com.gyee.health.model.auto.ProEconCurveFittMonthMain;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 风电机月拟合曲线主表 Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-21
+ */
+public interface ProEconCurveFittMonthMainMapper extends BaseMapper<ProEconCurveFittMonthMain> {
+
+    @Delete(" delete from pro_econ_curve_fitt_month_main where year=#{year} and month=#{month}")
+    public int deleteProEconCurveFittMonthSubByMonth(@Param(value = "year") String year, @Param(value = "month") String month);
+}

+ 20 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconCurveFittMonthSubMapper.java

@@ -0,0 +1,20 @@
+package com.gyee.health.mapper.auto;
+
+import com.gyee.health.model.auto.ProEconCurveFittMonthSub;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 风电机月拟合曲线子表 Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-21
+ */
+public interface ProEconCurveFittMonthSubMapper extends BaseMapper<ProEconCurveFittMonthSub> {
+
+    @Delete(" delete from pro_econ_curve_fitt_month_sub where year=#{year} and month=#{month}")
+    public int deleteProEconCurveFittMonthSubByMonth(@Param(value = "year") String year, @Param(value = "month") String month);
+}

+ 19 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconCurveFittYearMainMapper.java

@@ -0,0 +1,19 @@
+package com.gyee.health.mapper.auto;
+
+import com.gyee.health.model.auto.ProEconCurveFittYearMain;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 风电机年拟合曲线主表 Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-11-07
+ */
+public interface ProEconCurveFittYearMainMapper extends BaseMapper<ProEconCurveFittYearMain> {
+    @Delete(" delete from pro_econ_curve_fitt_year_main where year=#{year}")
+    public int deleteProEconCurveFittYearMainByYear(@Param(value = "year") String year);
+}

+ 19 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconCurveFittYearSubMapper.java

@@ -0,0 +1,19 @@
+package com.gyee.health.mapper.auto;
+
+import com.gyee.health.model.auto.ProEconCurveFittYearSub;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 风电机年拟合曲线子表 Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-11-07
+ */
+public interface ProEconCurveFittYearSubMapper extends BaseMapper<ProEconCurveFittYearSub> {
+    @Delete(" delete from pro_econ_curve_fitt_year_sub where year=#{year}")
+    public int deleteProEconCurveFittYearSubByYear(@Param(value = "year") String year);
+}

+ 22 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconCurveFittingMainMapper.java

@@ -0,0 +1,22 @@
+package com.gyee.health.mapper.auto;
+
+import com.gyee.health.model.auto.ProEconCurveFittingMain;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
+
+/**
+ * <p>
+ * 风电机拟合曲线主表 Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-21
+ */
+public interface ProEconCurveFittingMainMapper extends BaseMapper<ProEconCurveFittingMain> {
+
+    @Delete(" delete from pro_econ_curve_fitting_main where recordDate=#{recordDate} ")
+    public int deleteProEconCurveFittingMainByDay(@Param(value = "recordDate") Date recordDate);
+}

+ 23 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconCurveFittingSubMapper.java

@@ -0,0 +1,23 @@
+package com.gyee.health.mapper.auto;
+
+import com.gyee.health.model.auto.ProEconCurveFittingSub;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
+
+/**
+ * <p>
+ * 风电机拟合曲线子表 Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-21
+ */
+public interface ProEconCurveFittingSubMapper extends BaseMapper<ProEconCurveFittingSub> {
+
+
+    @Delete(" delete from pro_econ_curve_fitting_sub where recordDate=#{recordDate} ")
+    public int deleteProEconCurveFittingSubByDay(@Param(value = "recordDate") Date recordDate);
+}

+ 16 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconDutyScheduleMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.health.mapper.auto;
+
+import com.gyee.health.model.auto.ProEconDutySchedule;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author wang
+ * @since 2023-02-03
+ */
+public interface ProEconDutyScheduleMapper extends BaseMapper<ProEconDutySchedule> {
+
+}

+ 16 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconElectricaltestPointMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.health.mapper.auto;
+
+import com.gyee.health.model.auto.ProEconElectricaltestPoint;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 电气测点 Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-31
+ */
+public interface ProEconElectricaltestPointMapper extends BaseMapper<ProEconElectricaltestPoint> {
+
+}

+ 16 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconEquipmentDayDetailedMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.health.mapper.auto;
+
+import com.gyee.health.model.auto.ProEconEquipmentDayDetailed;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 设备日明细 Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-21
+ */
+public interface ProEconEquipmentDayDetailedMapper extends BaseMapper<ProEconEquipmentDayDetailed> {
+
+}

+ 16 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconEquipmentDayInfoMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.health.mapper.auto;
+
+import com.gyee.health.model.auto.ProEconEquipmentDayInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 风机绩效榜 Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-21
+ */
+public interface ProEconEquipmentDayInfoMapper extends BaseMapper<ProEconEquipmentDayInfo> {
+
+}

+ 16 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconEquipmentInfo15minuteMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.health.mapper.auto;
+
+import com.gyee.health.model.auto.ProEconEquipmentInfo15minute;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 电设备15分钟信息表 Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-11-04
+ */
+public interface ProEconEquipmentInfo15minuteMapper extends BaseMapper<ProEconEquipmentInfo15minute> {
+
+}

+ 16 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconEquipmentInfoDay1Mapper.java

@@ -0,0 +1,16 @@
+package com.gyee.health.mapper.auto;
+
+import com.gyee.health.model.auto.ProEconEquipmentInfoDay1;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 五损电量 Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-11-01
+ */
+public interface ProEconEquipmentInfoDay1Mapper extends BaseMapper<ProEconEquipmentInfoDay1> {
+
+}

+ 16 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconEquipmentInfoDay2Mapper.java

@@ -0,0 +1,16 @@
+package com.gyee.health.mapper.auto;
+
+import com.gyee.health.model.auto.ProEconEquipmentInfoDay2;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 五损时间 Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-11-02
+ */
+public interface ProEconEquipmentInfoDay2Mapper extends BaseMapper<ProEconEquipmentInfoDay2> {
+
+}

+ 16 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconEquipmentInfoDay3Mapper.java

@@ -0,0 +1,16 @@
+package com.gyee.health.mapper.auto;
+
+import com.gyee.health.model.auto.ProEconEquipmentInfoDay3;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 五损次数 Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-11-02
+ */
+public interface ProEconEquipmentInfoDay3Mapper extends BaseMapper<ProEconEquipmentInfoDay3> {
+
+}

+ 16 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconEquipmentInfoDay4Mapper.java

@@ -0,0 +1,16 @@
+package com.gyee.health.mapper.auto;
+
+import com.gyee.health.model.auto.ProEconEquipmentInfoDay4;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 五损曲线偏差率切入性能 Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-11-07
+ */
+public interface ProEconEquipmentInfoDay4Mapper extends BaseMapper<ProEconEquipmentInfoDay4> {
+
+}

+ 45 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconEquipmentInfoDay5Mapper.java

@@ -0,0 +1,45 @@
+package com.gyee.health.mapper.auto;
+
+import com.gyee.health.model.auto.ProEconEquipmentInfoDay5;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 三率 Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-11-01
+ */
+public interface ProEconEquipmentInfoDay5Mapper extends BaseMapper<ProEconEquipmentInfoDay5> {
+
+
+    @Select(" select windpowerstation_id," +
+            "sum(TIMERATE20) TIMERATE20," +
+            "sum(TIMERATE16) TIMERATE16," +
+            "sum(TIMERATE17) TIMERATE17," +
+            "sum(TIMERATE18) TIMERATE18," +
+            "sum(TIMERATE19) TIMERATE19 " +
+            "from pro_econ_equipment_info_day5 where " +
+            "record_date>= #{beginDate} and record_date<= #{endDate}" +
+            " group by windpowerstation_id ")
+    List<ProEconEquipmentInfoDay5>  selectResetTimelyRateList(@Param("beginDate") Date beginDate, @Param("endDate") Date endDate);
+
+
+
+    @Select(" select windpowerstation_id," +
+            " sum(TIMERATE13) TIMERATE13,sum(TIMERATE1) TIMERATE1,sum(TIMERATE2) TIMERATE2,sum(TIMERATE3) TIMERATE3,sum(TIMERATE4) TIMERATE4," +
+            " sum(TIMERATE14) TIMERATE14,sum(TIMERATE5) TIMERATE5,sum(TIMERATE6) TIMERATE6,sum(TIMERATE7) TIMERATE7,sum(TIMERATE8)  TIMERATE8," +
+            " sum(TIMERATE15) TIMERATE15,sum(TIMERATE9) TIMERATE9,sum(TIMERATE10) TIMERATE10,sum(TIMERATE11) TIMERATE11,sum(TIMERATE12) TIMERATE12" +
+            " from pro_econ_equipment_info_day5  where" +
+            " record_date>= #{beginDate} and record_date<= #{endDate}" +
+            " group by windpowerstation_id")
+    List<ProEconEquipmentInfoDay5> selectStateConversionRateList(@Param("beginDate") Date beginDate, @Param("endDate") Date endDate);
+}
+
+

+ 16 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconEquipmentInfoDay6Mapper.java

@@ -0,0 +1,16 @@
+package com.gyee.health.mapper.auto;
+
+import com.gyee.health.model.auto.ProEconEquipmentInfoDay6;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 离散率转换效率 Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-11-01
+ */
+public interface ProEconEquipmentInfoDay6Mapper extends BaseMapper<ProEconEquipmentInfoDay6> {
+
+}

+ 16 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconEquipmentInfoDayTopMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.health.mapper.auto;
+
+import com.gyee.health.model.auto.ProEconEquipmentInfoDayTop;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 风机日信息表排行 Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-11-09
+ */
+public interface ProEconEquipmentInfoDayTopMapper extends BaseMapper<ProEconEquipmentInfoDayTop> {
+
+}

+ 16 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconEquipmentmodelMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.health.mapper.auto;
+
+import com.gyee.health.model.auto.ProEconEquipmentmodel;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-31
+ */
+public interface ProEconEquipmentmodelMapper extends BaseMapper<ProEconEquipmentmodel> {
+
+}

+ 16 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconFaultLiminatedefectsMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.health.mapper.auto;
+
+import com.gyee.health.model.auto.ProEconFaultLiminatedefects;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 故障消缺及时率 Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-21
+ */
+public interface ProEconFaultLiminatedefectsMapper extends BaseMapper<ProEconFaultLiminatedefects> {
+
+}

+ 16 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconInOrOutSpeedTotal2Mapper.java

@@ -0,0 +1,16 @@
+package com.gyee.health.mapper.auto;
+
+import com.gyee.health.model.auto.ProEconInOrOutSpeedTotal2;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 切入切出风速整合2 Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-21
+ */
+public interface ProEconInOrOutSpeedTotal2Mapper extends BaseMapper<ProEconInOrOutSpeedTotal2> {
+
+}

+ 16 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconInOrOutSpeedTotalMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.health.mapper.auto;
+
+import com.gyee.health.model.auto.ProEconInOrOutSpeedTotal;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 切入切出风速整合 Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-21
+ */
+public interface ProEconInOrOutSpeedTotalMapper extends BaseMapper<ProEconInOrOutSpeedTotal> {
+
+}

+ 17 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconInputOrOutputSpeedMapper.java

@@ -0,0 +1,17 @@
+package com.gyee.health.mapper.auto;
+
+import com.gyee.health.model.auto.ProEconInputOrOutputSpeed;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 1、切入是1
+2、切出是0 Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-21
+ */
+public interface ProEconInputOrOutputSpeedMapper extends BaseMapper<ProEconInputOrOutputSpeed> {
+
+}

+ 16 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconInterruptionItemMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.health.mapper.auto;
+
+import com.gyee.health.model.auto.ProEconInterruptionItem;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 记录通讯中断表中的记录的分解过程。 Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-27
+ */
+public interface ProEconInterruptionItemMapper extends BaseMapper<ProEconInterruptionItem> {
+
+}

+ 16 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconInterruptionMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.health.mapper.auto;
+
+import com.gyee.health.model.auto.ProEconInterruption;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 根据风电机状态判断通讯中断并记录。 Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-27
+ */
+public interface ProEconInterruptionMapper extends BaseMapper<ProEconInterruption> {
+
+}

+ 16 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconLimitPowerRecordsMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.health.mapper.auto;
+
+import com.gyee.health.model.auto.ProEconLimitPowerRecords;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 性能损失记录 Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-21
+ */
+public interface ProEconLimitPowerRecordsMapper extends BaseMapper<ProEconLimitPowerRecords> {
+
+}

+ 16 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconLineElectricalMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.health.mapper.auto;
+
+import com.gyee.health.model.auto.ProEconLineElectrical;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-24
+ */
+public interface ProEconLineElectricalMapper extends BaseMapper<ProEconLineElectrical> {
+
+}

+ 16 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconLogicalUnitMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.health.mapper.auto;
+
+import com.gyee.health.model.auto.ProEconLogicalUnit;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 逻辑部件 Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-31
+ */
+public interface ProEconLogicalUnitMapper extends BaseMapper<ProEconLogicalUnit> {
+
+}

+ 16 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconMainBrownouts2Mapper.java

@@ -0,0 +1,16 @@
+package com.gyee.health.mapper.auto;
+
+import com.gyee.health.model.auto.ProEconMainBrownouts2;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 限电事件主表 Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-25
+ */
+public interface ProEconMainBrownouts2Mapper extends BaseMapper<ProEconMainBrownouts2> {
+
+}

+ 16 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconMainBrownoutsMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.health.mapper.auto;
+
+import com.gyee.health.model.auto.ProEconMainBrownouts;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 限电事件主表 Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-25
+ */
+public interface ProEconMainBrownoutsMapper extends BaseMapper<ProEconMainBrownouts> {
+
+}

+ 16 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconManufacturerMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.health.mapper.auto;
+
+import com.gyee.health.model.auto.ProEconManufacturer;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-31
+ */
+public interface ProEconManufacturerMapper extends BaseMapper<ProEconManufacturer> {
+
+}

+ 16 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconMeterPointValueMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.health.mapper.auto;
+
+import com.gyee.health.model.auto.ProEconMeterPointValue;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 电计量点值表 Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-21
+ */
+public interface ProEconMeterPointValueMapper extends BaseMapper<ProEconMeterPointValue> {
+
+}

+ 16 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconPointCodeMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.health.mapper.auto;
+
+import com.gyee.health.model.auto.ProEconPointCode;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 指标查询表 Mapper 接口
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-23
+ */
+public interface ProEconPointCodeMapper extends BaseMapper<ProEconPointCode> {
+
+}

+ 16 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconPowerstationInfoDay1Mapper.java

@@ -0,0 +1,16 @@
+package com.gyee.health.mapper.auto;
+
+import com.gyee.health.model.auto.ProEconPowerstationInfoDay1;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 场站五损电量 Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-11-01
+ */
+public interface ProEconPowerstationInfoDay1Mapper extends BaseMapper<ProEconPowerstationInfoDay1> {
+
+}

+ 16 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconPowerstationInfoDay2Mapper.java

@@ -0,0 +1,16 @@
+package com.gyee.health.mapper.auto;
+
+import com.gyee.health.model.auto.ProEconPowerstationInfoDay2;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 场站五损时间 Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-11-02
+ */
+public interface ProEconPowerstationInfoDay2Mapper extends BaseMapper<ProEconPowerstationInfoDay2> {
+
+}

+ 16 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconPowerstationInfoDay3Mapper.java

@@ -0,0 +1,16 @@
+package com.gyee.health.mapper.auto;
+
+import com.gyee.health.model.auto.ProEconPowerstationInfoDay3;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 场站五损次数 Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-11-02
+ */
+public interface ProEconPowerstationInfoDay3Mapper extends BaseMapper<ProEconPowerstationInfoDay3> {
+
+}

+ 16 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconPowerstationInfoDay4Mapper.java

@@ -0,0 +1,16 @@
+package com.gyee.health.mapper.auto;
+
+import com.gyee.health.model.auto.ProEconPowerstationInfoDay4;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 场站三率mtbf Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-11-01
+ */
+public interface ProEconPowerstationInfoDay4Mapper extends BaseMapper<ProEconPowerstationInfoDay4> {
+
+}

+ 16 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconPowerstationInfoDay5Mapper.java

@@ -0,0 +1,16 @@
+package com.gyee.health.mapper.auto;
+
+import com.gyee.health.model.auto.ProEconPowerstationInfoDay5;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 电表发电量 Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-11-01
+ */
+public interface ProEconPowerstationInfoDay5Mapper extends BaseMapper<ProEconPowerstationInfoDay5> {
+
+}

+ 16 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconPowerstationInfoDay6Mapper.java

@@ -0,0 +1,16 @@
+package com.gyee.health.mapper.auto;
+
+import com.gyee.health.model.auto.ProEconPowerstationInfoDay6;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 测风塔出线功率 Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-11-01
+ */
+public interface ProEconPowerstationInfoDay6Mapper extends BaseMapper<ProEconPowerstationInfoDay6> {
+
+}

+ 16 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconPowerstationInfoDay7Mapper.java

@@ -0,0 +1,16 @@
+package com.gyee.health.mapper.auto;
+
+import com.gyee.health.model.auto.ProEconPowerstationInfoDay7;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 离散率系统效率 Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-11-01
+ */
+public interface ProEconPowerstationInfoDay7Mapper extends BaseMapper<ProEconPowerstationInfoDay7> {
+
+}

+ 16 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconShutdownEvent2Mapper.java

@@ -0,0 +1,16 @@
+package com.gyee.health.mapper.auto;
+
+import com.gyee.health.model.auto.ProEconShutdownEvent2;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 停机事件2 Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-21
+ */
+public interface ProEconShutdownEvent2Mapper extends BaseMapper<ProEconShutdownEvent2> {
+
+}

+ 0 - 0
web/runeconomy-authority/src/main/java/com/gyee/health/mapper/auto/ProEconShutdownEventMapper.java


Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff