信控实体类修正提交

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

@@ -40,7 +40,7 @@ public class GeneratorCodeConfig {
         GlobalConfig gc = new GlobalConfig();
         String projectPath = System.getProperty("user.dir");
         gc.setOutputDir(projectPath+"/realtime/generationXK-service"+ "/src/main/java");
-        gc.setAuthor("石林");
+        gc.setAuthor("shilin");
         gc.setOpen(false);
         //实体属性 Swagger2 注解
         gc.setSwagger2(false);
@@ -59,9 +59,12 @@ public class GeneratorCodeConfig {
 //        dsc.setUrl("jdbc:oracle:thin:@10.83.68.165:1521:gdsj");
 
         dsc.setDriverName("org.postgresql.Driver");
-        dsc.setUsername("postgres");
-        dsc.setPassword("postgres");
-        dsc.setUrl("jdbc:postgresql://192.168.11.248:5432/eng_mctl");
+//        dsc.setUsername("postgres");
+//        dsc.setPassword("postgres");
+//        dsc.setUrl("jdbc:postgresql://192.168.11.248:5432/eng_mctl");
+        dsc.setUrl("jdbc:postgresql://120.46.148.180:5432/wisdom");
+        dsc.setUsername("gdprod");
+        dsc.setPassword("gd123");
         mpg.setDataSource(dsc);
 
 

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

@@ -0,0 +1,20 @@
+package com.gyee.generation.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 设备日明细 前端控制器
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-21
+ */
+@RestController
+@RequestMapping("//pro-econ-equipment-day-detailed")
+public class ProEconEquipmentDayDetailedController {
+
+}

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

@@ -0,0 +1,20 @@
+package com.gyee.generation.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 故障消缺及时率 前端控制器
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-21
+ */
+@RestController
+@RequestMapping("//pro-econ-fault-liminatedefects")
+public class ProEconFaultLiminatedefectsController {
+
+}

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

@@ -0,0 +1,20 @@
+package com.gyee.generation.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 状态转换及时率表 前端控制器
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-21
+ */
+@RestController
+@RequestMapping("//pro-econ-state-transition-rates")
+public class ProEconStateTransitionRatesController {
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/init/CacheContext.java

@@ -39,8 +39,7 @@ public class CacheContext implements CommandLineRunner {
     private IProBasicMeterPointService proBasicMeterPointService;
     @Resource
     private IProEconEquipmentmodelService proEconEquipmentmodelService;
-    @Resource
-    private IWindturbinestatusdiService windturbinestatusdiService;
+
     @Resource
     private IProBasicWindturbinePowerService proBasicWindturbinePowerService;
     @Resource
@@ -62,7 +61,7 @@ public class CacheContext implements CommandLineRunner {
     public static Map<String,Map<String, ProBasicWppoint>> propointmap =new HashMap<>();
     public static Map<String,Map<String, ProBasicWppoint>> wppointmap =new HashMap<>();
     public static Map<String,ProBasicProject> proMap = new HashMap<>();
-    public static Map<String,List<Windturbinestatusdi>> statusMap = 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<>();
@@ -145,8 +144,6 @@ public class CacheContext implements CommandLineRunner {
         });
 
         String sszzt = redisService.get("SSZZT");
-         statusMap = JSONObject.parseObject(sszzt, new TypeReference<Map<String,List<Windturbinestatusdi>>>() {
-        });
 
 
 

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/ProBasicBoxchangeMapper.java

@@ -1,16 +0,0 @@
-package com.gyee.generation.mapper.auto;
-
-import com.gyee.generation.model.auto.ProBasicBoxchange;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 箱变 Mapper 接口
- * </p>
- *
- * @author 石林
- * @since 2022-10-13
- */
-public interface ProBasicBoxchangeMapper extends BaseMapper<ProBasicBoxchange> {
-
-}

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/ProBasicCompanyMapper.java

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

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/ProBasicEnergyGroupMapper.java

@@ -8,8 +8,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * 集团 Mapper 接口
  * </p>
  *
- * @author 石林
- * @since 2022-10-13
+ * @author shilin
+ * @since 2022-10-21
  */
 public interface ProBasicEnergyGroupMapper extends BaseMapper<ProBasicEnergyGroup> {
 

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/ProBasicEquipmentPointMapper.java

@@ -8,8 +8,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * 设备测点 Mapper 接口
  * </p>
  *
- * @author 石林
- * @since 2022-10-13
+ * @author shilin
+ * @since 2022-10-21
  */
 public interface ProBasicEquipmentPointMapper extends BaseMapper<ProBasicEquipmentPoint> {
 

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/ProBasicInverterMapper.java

@@ -1,16 +0,0 @@
-package com.gyee.generation.mapper.auto;
-
-import com.gyee.generation.model.auto.ProBasicInverter;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 逆变器 Mapper 接口
- * </p>
- *
- * @author 石林
- * @since 2022-10-13
- */
-public interface ProBasicInverterMapper extends BaseMapper<ProBasicInverter> {
-
-}

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/ProBasicJunctionboxMapper.java

@@ -1,16 +0,0 @@
-package com.gyee.generation.mapper.auto;
-
-import com.gyee.generation.model.auto.ProBasicJunctionbox;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 汇流箱 Mapper 接口
- * </p>
- *
- * @author 石林
- * @since 2022-10-13
- */
-public interface ProBasicJunctionboxMapper extends BaseMapper<ProBasicJunctionbox> {
-
-}

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/ProBasicLineMapper.java

@@ -8,8 +8,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * 集电线路 Mapper 接口
  * </p>
  *
- * @author 石林
- * @since 2022-10-13
+ * @author shilin
+ * @since 2022-10-21
  */
 public interface ProBasicLineMapper extends BaseMapper<ProBasicLine> {
 

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/ProBasicMeterPointMapper.java

@@ -8,8 +8,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * 电计量点表 Mapper 接口
  * </p>
  *
- * @author 石林
- * @since 2022-10-13
+ * @author shilin
+ * @since 2022-10-21
  */
 public interface ProBasicMeterPointMapper extends BaseMapper<ProBasicMeterPoint> {
 

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/ProBasicPhotovoltaicPointMapper.java

@@ -1,16 +0,0 @@
-package com.gyee.generation.mapper.auto;
-
-import com.gyee.generation.model.auto.ProBasicPhotovoltaicPoint;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 光伏测点 Mapper 接口
- * </p>
- *
- * @author 石林
- * @since 2022-10-13
- */
-public interface ProBasicPhotovoltaicPointMapper extends BaseMapper<ProBasicPhotovoltaicPoint> {
-
-}

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/ProBasicProjectMapper.java

@@ -8,8 +8,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * 工程表 Mapper 接口
  * </p>
  *
- * @author 石林
- * @since 2022-10-13
+ * @author shilin
+ * @since 2022-10-21
  */
 public interface ProBasicProjectMapper extends BaseMapper<ProBasicProject> {
 

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/ProBasicProjectPlanMapper.java

@@ -8,8 +8,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * 工程计划表 Mapper 接口
  * </p>
  *
- * @author 石林
- * @since 2022-10-13
+ * @author shilin
+ * @since 2022-10-21
  */
 public interface ProBasicProjectPlanMapper extends BaseMapper<ProBasicProjectPlan> {
 

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/ProBasicRealtimeDbconfigMapper.java

@@ -8,8 +8,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * 实时数据库配置表 Mapper 接口
  * </p>
  *
- * @author 石林
- * @since 2022-10-13
+ * @author shilin
+ * @since 2022-10-21
  */
 public interface ProBasicRealtimeDbconfigMapper extends BaseMapper<ProBasicRealtimeDbconfig> {
 

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/ProBasicRegionMapper.java

@@ -8,8 +8,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * 区域 Mapper 接口
  * </p>
  *
- * @author 石林
- * @since 2022-10-13
+ * @author shilin
+ * @since 2022-10-21
  */
 public interface ProBasicRegionMapper extends BaseMapper<ProBasicRegion> {
 

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/ProBasicSquareMapper.java

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

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/ProBasicWindpowerstationMapper.java

@@ -8,8 +8,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * 场站表 Mapper 接口
  * </p>
  *
- * @author 石林
- * @since 2022-10-13
+ * @author shilin
+ * @since 2022-10-21
  */
 public interface ProBasicWindpowerstationMapper extends BaseMapper<ProBasicWindpowerstation> {
 

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/ProBasicWindsubStationMapper.java

@@ -8,8 +8,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * 变电所 Mapper 接口
  * </p>
  *
- * @author 石林
- * @since 2022-10-13
+ * @author shilin
+ * @since 2022-10-21
  */
 public interface ProBasicWindsubStationMapper extends BaseMapper<ProBasicWindsubStation> {
 

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/ProBasicWindturbineMapper.java

@@ -8,8 +8,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * 风机 Mapper 接口
  * </p>
  *
- * @author 石林
- * @since 2022-10-13
+ * @author shilin
+ * @since 2022-10-21
  */
 public interface ProBasicWindturbineMapper extends BaseMapper<ProBasicWindturbine> {
 

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/ProBasicWindturbinePowerMapper.java

@@ -8,8 +8,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * 风机功率曲线 Mapper 接口
  * </p>
  *
- * @author 石林
- * @since 2022-10-13
+ * @author shilin
+ * @since 2022-10-21
  */
 public interface ProBasicWindturbinePowerMapper extends BaseMapper<ProBasicWindturbinePower> {
 

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/ProBasicWppointMapper.java

@@ -8,8 +8,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * 场站测点 Mapper 接口
  * </p>
  *
- * @author 石林
- * @since 2022-10-13
+ * @author shilin
+ * @since 2022-10-21
  */
 public interface ProBasicWppointMapper extends BaseMapper<ProBasicWppoint> {
 

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/ProEcoWindspecificInfoDayMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.generation.mapper.auto;
+
+import com.gyee.generation.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> {
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/ProEconBenchmarkMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.generation.mapper.auto;
+
+import com.gyee.generation.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> {
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/ProEconBrownoutsEventMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.generation.mapper.auto;
+
+import com.gyee.generation.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> {
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/ProEconCurveFittMonthMainMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.generation.mapper.auto;
+
+import com.gyee.generation.model.auto.ProEconCurveFittMonthMain;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 风电机月拟合曲线主表 Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-21
+ */
+public interface ProEconCurveFittMonthMainMapper extends BaseMapper<ProEconCurveFittMonthMain> {
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/ProEconCurveFittMonthSubMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.generation.mapper.auto;
+
+import com.gyee.generation.model.auto.ProEconCurveFittMonthSub;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 风电机月拟合曲线子表 Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-21
+ */
+public interface ProEconCurveFittMonthSubMapper extends BaseMapper<ProEconCurveFittMonthSub> {
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/ProEconCurveFittingMainMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.generation.mapper.auto;
+
+import com.gyee.generation.model.auto.ProEconCurveFittingMain;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 风电机拟合曲线主表 Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-21
+ */
+public interface ProEconCurveFittingMainMapper extends BaseMapper<ProEconCurveFittingMain> {
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/ProEconCurveFittingSubMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.generation.mapper.auto;
+
+import com.gyee.generation.model.auto.ProEconCurveFittingSub;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 风电机拟合曲线子表 Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-21
+ */
+public interface ProEconCurveFittingSubMapper extends BaseMapper<ProEconCurveFittingSub> {
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/ProEconElectricaltestPointMapper.java

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

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/ProEconEquipmentDayDetailedMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.generation.mapper.auto;
+
+import com.gyee.generation.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> {
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/ProEconEquipmentDayInfoMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.generation.mapper.auto;
+
+import com.gyee.generation.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> {
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/ProEconEquipmentmodelMapper.java

@@ -8,8 +8,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * 设备型号 Mapper 接口
  * </p>
  *
- * @author 谢生杰
- * @since 2022-10-13
+ * @author shilin
+ * @since 2022-10-21
  */
 public interface ProEconEquipmentmodelMapper extends BaseMapper<ProEconEquipmentmodel> {
 

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/ProEconFaultLiminatedefectsMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.generation.mapper.auto;
+
+import com.gyee.generation.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> {
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/ProEconInOrOutSpeedTotal2Mapper.java

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

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/ProEconInOrOutSpeedTotalMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.generation.mapper.auto;
+
+import com.gyee.generation.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> {
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/ProEconInputOrOutputSpeedMapper.java

@@ -0,0 +1,17 @@
+package com.gyee.generation.mapper.auto;
+
+import com.gyee.generation.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> {
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/ProEconLimitPowerRecordsMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.generation.mapper.auto;
+
+import com.gyee.generation.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> {
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/ProEconLogicalUnitMapper.java

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

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/ProEconManufacturerMapper.java

@@ -8,8 +8,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * 设备厂商 Mapper 接口
  * </p>
  *
- * @author 石林
- * @since 2022-10-13
+ * @author shilin
+ * @since 2022-10-21
  */
 public interface ProEconManufacturerMapper extends BaseMapper<ProEconManufacturer> {
 

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/ProEconMeterPointValueMapper.java

@@ -8,8 +8,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * 电计量点值表 Mapper 接口
  * </p>
  *
- * @author 石林
- * @since 2022-10-14
+ * @author shilin
+ * @since 2022-10-21
  */
 public interface ProEconMeterPointValueMapper extends BaseMapper<ProEconMeterPointValue> {
 

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/ProEconModelPowerMapper.java

@@ -1,16 +0,0 @@
-package com.gyee.generation.mapper.auto;
-
-import com.gyee.generation.model.auto.ProEconModelPower;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 设备类型对应功率表 Mapper 接口
- * </p>
- *
- * @author 石林
- * @since 2022-10-13
- */
-public interface ProEconModelPowerMapper extends BaseMapper<ProEconModelPower> {
-
-}

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/ProEconShutdownEvent2Mapper.java

@@ -0,0 +1,16 @@
+package com.gyee.generation.mapper.auto;
+
+import com.gyee.generation.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> {
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/ProEconShutdowneventMapper.java

@@ -8,8 +8,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * 停机事件 Mapper 接口
  * </p>
  *
- * @author 石林
- * @since 2022-10-13
+ * @author shilin
+ * @since 2022-10-21
  */
 public interface ProEconShutdowneventMapper extends BaseMapper<ProEconShutdownevent> {
 

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/ProEconStateTransitionRatesMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.generation.mapper.auto;
+
+import com.gyee.generation.model.auto.ProEconStateTransitionRates;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 状态转换及时率表 Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-21
+ */
+public interface ProEconStateTransitionRatesMapper extends BaseMapper<ProEconStateTransitionRates> {
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/ProEconStopTypeMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.generation.mapper.auto;
+
+import com.gyee.generation.model.auto.ProEconStopType;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 停机类型 Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-21
+ */
+public interface ProEconStopTypeMapper extends BaseMapper<ProEconStopType> {
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/ProEconTestingPointMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.generation.mapper.auto;
+
+import com.gyee.generation.model.auto.ProEconTestingPoint;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 逻辑测点 Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-21
+ */
+public interface ProEconTestingPointMapper extends BaseMapper<ProEconTestingPoint> {
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/ProEconUniformCodeMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.generation.mapper.auto;
+
+import com.gyee.generation.model.auto.ProEconUniformCode;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 统一编码表 Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-21
+ */
+public interface ProEconUniformCodeMapper extends BaseMapper<ProEconUniformCode> {
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/ProEconWarningClassifyMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.generation.mapper.auto;
+
+import com.gyee.generation.model.auto.ProEconWarningClassify;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 报警分类 Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-21
+ */
+public interface ProEconWarningClassifyMapper extends BaseMapper<ProEconWarningClassify> {
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/ProEconWarningLevelMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.generation.mapper.auto;
+
+import com.gyee.generation.model.auto.ProEconWarningLevel;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 报警等级 Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-21
+ */
+public interface ProEconWarningLevelMapper extends BaseMapper<ProEconWarningLevel> {
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/ProEconWarningMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.generation.mapper.auto;
+
+import com.gyee.generation.model.auto.ProEconWarning;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 报警 Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-21
+ */
+public interface ProEconWarningMapper extends BaseMapper<ProEconWarning> {
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/ProEconWindpowerInfoDayMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.generation.mapper.auto;
+
+import com.gyee.generation.model.auto.ProEconWindpowerInfoDay;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 风场日信息表 Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-21
+ */
+public interface ProEconWindpowerInfoDayMapper extends BaseMapper<ProEconWindpowerInfoDay> {
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/ProEconWindturbineInfoDayMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.generation.mapper.auto;
+
+import com.gyee.generation.model.auto.ProEconWindturbineInfoDay;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 风机日信息表 Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-21
+ */
+public interface ProEconWindturbineInfoDayMapper extends BaseMapper<ProEconWindturbineInfoDay> {
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/ProEconWindturbineStatus2Mapper.java

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

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/ProEconWindturbineStatusMapper.java

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

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/ProEconWpMttrMtbfMonthMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.generation.mapper.auto;
+
+import com.gyee.generation.model.auto.ProEconWpMttrMtbfMonth;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 月场站级别MTTR MTBF Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-21
+ */
+public interface ProEconWpMttrMtbfMonthMapper extends BaseMapper<ProEconWpMttrMtbfMonth> {
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/ProEconWpmttrDmtbfYearMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.generation.mapper.auto;
+
+import com.gyee.generation.model.auto.ProEconWpmttrDmtbfYear;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 年场站级别MTTR MTBF Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-21
+ */
+public interface ProEconWpmttrDmtbfYearMapper extends BaseMapper<ProEconWpmttrDmtbfYear> {
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/ProEconWpmttrMtbfDayMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.generation.mapper.auto;
+
+import com.gyee.generation.model.auto.ProEconWpmttrMtbfDay;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 日场站级别MTTR MTBF Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-21
+ */
+public interface ProEconWpmttrMtbfDayMapper extends BaseMapper<ProEconWpmttrMtbfDay> {
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/ProEconWtCurveFittingMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.generation.mapper.auto;
+
+import com.gyee.generation.model.auto.ProEconWtCurveFitting;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 风电机拟合曲线 Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-21
+ */
+public interface ProEconWtCurveFittingMapper extends BaseMapper<ProEconWtCurveFitting> {
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/ProEconWtCurveFittingMonthMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.generation.mapper.auto;
+
+import com.gyee.generation.model.auto.ProEconWtCurveFittingMonth;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 风电机月拟合曲线 Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-21
+ */
+public interface ProEconWtCurveFittingMonthMapper extends BaseMapper<ProEconWtCurveFittingMonth> {
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/ProEconWtPowerCurveFittingMapper.java

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

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/ProEconWtmttrMtbfDayMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.generation.mapper.auto;
+
+import com.gyee.generation.model.auto.ProEconWtmttrMtbfDay;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 日风机级别MTTR MTBF Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-21
+ */
+public interface ProEconWtmttrMtbfDayMapper extends BaseMapper<ProEconWtmttrMtbfDay> {
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/ProEconWtmttrMtbfMonthMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.generation.mapper.auto;
+
+import com.gyee.generation.model.auto.ProEconWtmttrMtbfMonth;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 月风机级别MTTR MTBF Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-21
+ */
+public interface ProEconWtmttrMtbfMonthMapper extends BaseMapper<ProEconWtmttrMtbfMonth> {
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/ProEconWtmttrMtbfYearMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.generation.mapper.auto;
+
+import com.gyee.generation.model.auto.ProEconWtmttrMtbfYear;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 年风机级别MTTR MTBF Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-21
+ */
+public interface ProEconWtmttrMtbfYearMapper extends BaseMapper<ProEconWtmttrMtbfYear> {
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/ProEconWtwindDayInfoMapper.java

@@ -0,0 +1,33 @@
+package com.gyee.generation.mapper.auto;
+
+import com.gyee.generation.model.auto.ProEconWtwindDayInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 1、日风向平均风速
+2、日风向最大风速
+3、日风向次数
+4、日风向频率
+5、日风向静风次数
+6、日风向静风频率
+7、月风向平均风速
+8、月风向最大风速
+9、月风向次数
+10、月风向频率
+11、月风向静风次数
+12、月风向静风频率
+13、年风向平均风速
+14、年风向最大风速
+15、年风向次数
+16、年风向频率
+17、年风向静风次数
+18、年风向静风频率 Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-21
+ */
+public interface ProEconWtwindDayInfoMapper extends BaseMapper<ProEconWtwindDayInfo> {
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/WindpowerstationstandardpointMapper.java

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

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/WindpowerstationtestingpointMapper.java

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

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/WindturbinestandardpointMapper.java

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

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/WindturbinestatusdiMapper.java

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

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/WindturbinetestingpointaiMapper.java

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

realtime/generationXK-service/src/main/java/com/gyee/generation/model/auto/ProBasicCompany.java

@@ -1,143 +0,0 @@
-package com.gyee.generation.model.auto;
-
-import java.math.BigDecimal;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * <p>
- * 省公司表
- * </p>
- *
- * @author 石林
- * @since 2022-10-13
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class ProBasicCompany extends Model {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 编号
-     */
-    private String id;
-
-    /**
-     * 名称
-     */
-    private String name;
-
-    /**
-     * 别名
-     */
-    private String aname;
-
-    /**
-     * 风电装机容量
-     */
-    private BigDecimal windCapacity;
-
-    /**
-     * 风电容量单位
-     */
-    private String windCapacityUnit;
-
-    /**
-     * 风电装机数量
-     */
-    private Integer windQuantity;
-
-    /**
-     * 光伏装机容量
-     */
-    private BigDecimal capacity;
-
-    /**
-     * 光伏容量单位
-     */
-    private String capacityUnit;
-
-    /**
-     * 光伏装机数量集中
-     */
-    private Integer quantityJz;
-
-    /**
-     * 光伏装机数量组串
-     */
-    private Integer quantityZc;
-
-    /**
-     * 接入风电装机容量
-     */
-    private BigDecimal jrwindCapacity;
-
-    /**
-     * 接入风电容量单位
-     */
-    private String jrwindCapacityUnit;
-
-    /**
-     * 接入风电装机数量
-     */
-    private Integer jrwindQuantity;
-
-    /**
-     * 接入光伏装机容量
-     */
-    private BigDecimal jrCapacity;
-
-    /**
-     * 接入光伏容量单位
-     */
-    private String jrCapacityUnit;
-
-    /**
-     * 接入光伏装机数量集中
-     */
-    private Integer jrquantityJz;
-
-    /**
-     * 接入光伏装机数量组串
-     */
-    private Integer jrquantityZc;
-
-    /**
-     * 顺序
-     */
-    private Integer orderNum;
-
-    /**
-     * 风电场站数量
-     */
-    private Integer windNumber;
-
-    /**
-     * 光伏场站数量
-     */
-    private Integer number;
-
-    /**
-     * 接入风电场站数量
-     */
-    private Integer jrWindNumber;
-
-    /**
-     * 接入光伏场站数量
-     */
-    private Integer jrNumber;
-
-    /**
-     * 区域编号
-     */
-    private String regionId;
-
-    /**
-     * 集团编号
-     */
-    private String groupId;
-
-
-}

realtime/generationXK-service/src/main/java/com/gyee/generation/model/auto/ProBasicEnergyGroup.java

@@ -1,6 +1,6 @@
 package com.gyee.generation.model.auto;
 
-import java.math.BigDecimal;
+
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -10,8 +10,8 @@ import lombok.EqualsAndHashCode;
  * 集团
  * </p>
  *
- * @author 石林
- * @since 2022-10-13
+ * @author shilin
+ * @since 2022-10-21
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -37,7 +37,7 @@ public class ProBasicEnergyGroup extends Model {
     /**
      * 风电装机容量
      */
-    private BigDecimal windCapacity;
+    private Double windCapacity;
 
     /**
      * 风电容量单位
@@ -52,7 +52,7 @@ public class ProBasicEnergyGroup extends Model {
     /**
      * 光伏装机容量
      */
-    private BigDecimal capacity;
+    private Double capacity;
 
     /**
      * 光伏容量单位
@@ -72,7 +72,7 @@ public class ProBasicEnergyGroup extends Model {
     /**
      * 接入风电装机容量
      */
-    private BigDecimal jrwindCapacity;
+    private Double jrwindCapacity;
 
     /**
      * 接入风电容量单位
@@ -87,7 +87,7 @@ public class ProBasicEnergyGroup extends Model {
     /**
      * 接入光伏装机容量
      */
-    private BigDecimal jrCapacity;
+    private Double jrCapacity;
 
     /**
      * 接入光伏容量单位

realtime/generationXK-service/src/main/java/com/gyee/generation/model/auto/ProBasicEquipmentPoint.java

@@ -1,6 +1,5 @@
 package com.gyee.generation.model.auto;
 
-
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -10,8 +9,8 @@ import lombok.EqualsAndHashCode;
  * 设备测点
  * </p>
  *
- * @author 石林
- * @since 2022-10-13
+ * @author shilin
+ * @since 2022-10-21
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

realtime/generationXK-service/src/main/java/com/gyee/generation/model/auto/ProBasicLine.java

@@ -1,6 +1,6 @@
 package com.gyee.generation.model.auto;
 
-import java.math.BigDecimal;
+
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -10,8 +10,8 @@ import lombok.EqualsAndHashCode;
  * 集电线路
  * </p>
  *
- * @author 石林
- * @since 2022-10-13
+ * @author shilin
+ * @since 2022-10-21
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -52,7 +52,7 @@ public class ProBasicLine extends Model {
     /**
      * 装机容量
      */
-    private BigDecimal capacity;
+    private Double capacity;
 
     /**
      * 容量单位
@@ -64,5 +64,7 @@ public class ProBasicLine extends Model {
      */
     private Integer quantity;
 
+    private Integer isAble;
+
 
 }

realtime/generationXK-service/src/main/java/com/gyee/generation/model/auto/ProBasicMeterPoint.java

@@ -10,8 +10,8 @@ import lombok.EqualsAndHashCode;
  * 电计量点表
  * </p>
  *
- * @author 石林
- * @since 2022-10-13
+ * @author shilin
+ * @since 2022-10-21
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -114,5 +114,7 @@ public class ProBasicMeterPoint extends Model {
      */
     private Double initialValue;
 
+    private Integer isAble;
+
 
 }

realtime/generationXK-service/src/main/java/com/gyee/generation/model/auto/ProBasicProject.java

@@ -2,7 +2,7 @@ package com.gyee.generation.model.auto;
 
 
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import java.time.LocalDate;
+import java.util.Date;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -11,8 +11,8 @@ import lombok.EqualsAndHashCode;
  * 工程表
  * </p>
  *
- * @author 石林
- * @since 2022-10-13
+ * @author shilin
+ * @since 2022-10-21
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -68,7 +68,7 @@ public class ProBasicProject extends Model {
     /**
      * 投产日期
      */
-    private LocalDate commissionDate;
+    private Date commissionDate;
 
     /**
      * 主控电话
@@ -95,5 +95,7 @@ public class ProBasicProject extends Model {
      */
     private String windsubStationId;
 
+    private Integer isAble;
+
 
 }

realtime/generationXK-service/src/main/java/com/gyee/generation/model/auto/ProBasicProjectPlan.java

@@ -1,6 +1,6 @@
 package com.gyee.generation.model.auto;
 
-import java.math.BigDecimal;
+
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -10,8 +10,8 @@ import lombok.EqualsAndHashCode;
  * 工程计划表
  * </p>
  *
- * @author 石林
- * @since 2022-10-13
+ * @author shilin
+ * @since 2022-10-21
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -37,7 +37,7 @@ public class ProBasicProjectPlan extends Model {
     /**
      * 计划停运小时
      */
-    private BigDecimal outageHours;
+    private Double outageHours;
 
     /**
      * 年

realtime/generationXK-service/src/main/java/com/gyee/generation/model/auto/ProBasicRealtimeDbconfig.java

@@ -9,8 +9,8 @@ import lombok.EqualsAndHashCode;
  * 实时数据库配置表
  * </p>
  *
- * @author 石林
- * @since 2022-10-13
+ * @author shilin
+ * @since 2022-10-21
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

realtime/generationXK-service/src/main/java/com/gyee/generation/model/auto/ProBasicRegion.java

@@ -1,6 +1,6 @@
 package com.gyee.generation.model.auto;
 
-import java.math.BigDecimal;
+
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -10,8 +10,8 @@ import lombok.EqualsAndHashCode;
  * 区域
  * </p>
  *
- * @author 石林
- * @since 2022-10-13
+ * @author shilin
+ * @since 2022-10-21
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -37,7 +37,7 @@ public class ProBasicRegion extends Model {
     /**
      * 风电装机容量
      */
-    private BigDecimal windCapacity;
+    private Double windCapacity;
 
     /**
      * 风电容量单位
@@ -52,7 +52,7 @@ public class ProBasicRegion extends Model {
     /**
      * 光伏装机容量
      */
-    private BigDecimal capacity;
+    private Double capacity;
 
     /**
      * 光伏容量单位
@@ -72,7 +72,7 @@ public class ProBasicRegion extends Model {
     /**
      * 接入风电装机容量
      */
-    private BigDecimal jrwindCapacity;
+    private Double jrwindCapacity;
 
     /**
      * 接入风电容量单位
@@ -87,7 +87,7 @@ public class ProBasicRegion extends Model {
     /**
      * 接入光伏装机容量
      */
-    private BigDecimal jrCapacity;
+    private Double jrCapacity;
 
     /**
      * 接入光伏容量单位
@@ -134,5 +134,7 @@ public class ProBasicRegion extends Model {
      */
     private String groupId;
 
+    private Integer isAble;
+
 
 }

realtime/generationXK-service/src/main/java/com/gyee/generation/model/auto/ProBasicWindpowerstation.java

@@ -1,6 +1,6 @@
 package com.gyee.generation.model.auto;
 
-import java.math.BigDecimal;
+
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -10,8 +10,8 @@ import lombok.EqualsAndHashCode;
  * 场站表
  * </p>
  *
- * @author 石林
- * @since 2022-10-13
+ * @author shilin
+ * @since 2022-10-21
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -47,7 +47,7 @@ public class ProBasicWindpowerstation extends Model {
     /**
      * 装机容量
      */
-    private BigDecimal capacity;
+    private Double capacity;
 
     /**
      * 容量单位
@@ -67,12 +67,12 @@ public class ProBasicWindpowerstation extends Model {
     /**
      * 地球经度
      */
-    private BigDecimal longitude;
+    private Double longitude;
 
     /**
      * 地球纬度
      */
-    private BigDecimal latitude;
+    private Double latitude;
 
     /**
      * 图片
@@ -107,7 +107,7 @@ public class ProBasicWindpowerstation extends Model {
     /**
      * 海拔高度
      */
-    private BigDecimal height;
+    private Double height;
 
     /**
      * 场站类型
@@ -129,5 +129,7 @@ public class ProBasicWindpowerstation extends Model {
      */
     private String groupId;
 
+    private Integer isAble;
+
 
 }

realtime/generationXK-service/src/main/java/com/gyee/generation/model/auto/ProBasicWindsubStation.java

@@ -9,8 +9,8 @@ import lombok.EqualsAndHashCode;
  * 变电所
  * </p>
  *
- * @author 石林
- * @since 2022-10-13
+ * @author shilin
+ * @since 2022-10-21
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

realtime/generationXK-service/src/main/java/com/gyee/generation/model/auto/ProBasicWindturbine.java

@@ -2,9 +2,9 @@ package com.gyee.generation.model.auto;
 
 
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-
 import java.util.Date;
 
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -13,8 +13,8 @@ import lombok.EqualsAndHashCode;
  * 风机
  * </p>
  *
- * @author 石林
- * @since 2022-10-13
+ * @author shilin
+ * @since 2022-10-21
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -97,5 +97,7 @@ public class ProBasicWindturbine extends Model {
      */
     private String companyId;
 
+    private Integer isAble;
+
 
 }

realtime/generationXK-service/src/main/java/com/gyee/generation/model/auto/ProBasicWindturbinePower.java

@@ -10,8 +10,8 @@ import lombok.EqualsAndHashCode;
  * 风机功率曲线
  * </p>
  *
- * @author 石林
- * @since 2022-10-13
+ * @author shilin
+ * @since 2022-10-21
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

realtime/generationXK-service/src/main/java/com/gyee/generation/model/auto/ProBasicWppoint.java

@@ -1,6 +1,6 @@
 package com.gyee.generation.model.auto;
 
-import java.math.BigDecimal;
+
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -10,8 +10,8 @@ import lombok.EqualsAndHashCode;
  * 场站测点
  * </p>
  *
- * @author 石林
- * @since 2022-10-13
+ * @author shilin
+ * @since 2022-10-21
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -62,22 +62,22 @@ public class ProBasicWppoint extends Model {
     /**
      * 最大值
      */
-    private BigDecimal maxval;
+    private Double maxval;
 
     /**
      * 最小值
      */
-    private BigDecimal minval;
+    private Double minval;
 
     /**
      * 合理最大值
      */
-    private BigDecimal reasonableMaxval;
+    private Double reasonableMaxval;
 
     /**
      * 合理最小值
      */
-    private BigDecimal reasonableMinval;
+    private Double reasonableMinval;
 
     /**
      * 统一编码

realtime/generationXK-service/src/main/java/com/gyee/generation/model/auto/ProEcoWindspecificInfoDay.java

@@ -0,0 +1,174 @@
+package com.gyee.generation.model.auto;
+
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.util.Date;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 日专题分析
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProEcoWindspecificInfoDay extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    private Integer id;
+
+    /**
+     * 场站
+     */
+    private String windpowerstationId;
+
+    /**
+     * 日期
+     */
+    private Date recordDate;
+
+    /**
+     * 理论发电量
+     */
+    private Double theoreticalcapacity;
+
+    /**
+     * 实际发电量
+     */
+    private Double generatingcapacity;
+
+    /**
+     * 风能利用率
+     */
+    private Double windenergyRate;
+
+    /**
+     * 维护损失电量
+     */
+    private Double daynhwhssdl;
+
+    /**
+     * 维护损失率
+     */
+    private Double daynhwhssrate;
+
+    /**
+     * 故障损失电量
+     */
+    private Double daynhgzssdl;
+
+    /**
+     * 故障损失率
+     */
+    private Double daynhgzssrate;
+
+    /**
+     * 限电损失电量
+     */
+    private Double daynhxdssdl;
+
+    /**
+     * 限电损失率
+     */
+    private Double daynhxdssrate;
+
+    /**
+     * 性能损失电量
+     */
+    private Double daynhqfdl;
+
+    /**
+     * 性能损失率
+     */
+    private Double daynhqfrate;
+
+    /**
+     * 受累损失电量
+     */
+    private Double daynhcfdl;
+
+    /**
+     * 受累损失率
+     */
+    private Double daynhcfrate;
+
+    /**
+     * 故障次数
+     */
+    private Integer faultCount;
+
+    /**
+     * 故障时间
+     */
+    private Double faultTime;
+
+    /**
+     * 风机台数
+     */
+    private Integer wtcount;
+
+    /**
+     * 日历时间
+     */
+    private Double calendarTime;
+
+    /**
+     * 应复位次数
+     */
+    private Double theoresetTimes;
+
+    /**
+     * 实际复位次数
+     */
+    private Double resetTimes;
+
+    /**
+     * 应转换次数
+     */
+    private Double theoconversionTimes;
+
+    /**
+     * 实际转换次数
+     */
+    private Double conversionTimes;
+
+    /**
+     * 应消缺次数
+     */
+    private Double theofaultCount;
+
+    /**
+     * 实际消缺次数
+     */
+    private Double rightCount;
+
+    /**
+     * 年
+     */
+    private Integer year;
+
+    /**
+     * 月
+     */
+    private Integer month;
+
+    /**
+     * 综合场用电量
+     */
+    private Double zhcydl;
+
+    /**
+     * 实际发电量(电计量)
+     */
+    private Double generatingcapacity2;
+
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/model/auto/ProEconBenchmark.java

@@ -0,0 +1,194 @@
+package com.gyee.generation.model.auto;
+
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.util.Date;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 对标管理
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProEconBenchmark extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    private String id;
+
+    /**
+     * 日期
+     */
+    private Date recordDate;
+
+    /**
+     * 场站
+     */
+    private String foreignKeyId;
+
+    /**
+     * 评分
+     */
+    private Double mark;
+
+    /**
+     * 装机容量
+     */
+    private Double capacity;
+
+    /**
+     * 接入台数
+     */
+    private Integer units;
+
+    /**
+     * 理论发电量
+     */
+    private Double theoreticalPower;
+
+    /**
+     * 实际发电量
+     */
+    private Double actualPower;
+
+    /**
+     * 故障损失电量
+     */
+    private Double daynhgzssdl;
+
+    /**
+     * 维护损失电量
+     */
+    private Double daynhwhssdl;
+
+    /**
+     * 限电损失电量
+     */
+    private Double daynhxdssdl;
+
+    /**
+     * 性能损失电量
+     */
+    private Double daynhqfdl;
+
+    /**
+     * 受累损失电量
+     */
+    private Double daynhcfdl;
+
+    /**
+     * 风能利用率
+     */
+    private Double windenergy;
+
+    /**
+     * 限电率
+     */
+    private Double powerLossRate;
+
+    /**
+     * 性能率
+     */
+    private Double performanceLossRate;
+
+    /**
+     * 综合厂用电率
+     */
+    private Double comprehensiveRate;
+
+    /**
+     * 设备利用小时
+     */
+    private Double utilizationHours;
+
+    /**
+     * 风功率预测准确率
+     */
+    private Double windpowerAccuracy;
+
+    /**
+     * AGC曲线跟随率
+     */
+    private Double agcCurvefollowing;
+
+    /**
+     * mtbf
+     */
+    private Double mtbf;
+
+    /**
+     * mttf
+     */
+    private Double mttf;
+
+    /**
+     * 设备可利用率
+     */
+    private Double availability;
+
+    /**
+     * 等效可用系数
+     */
+    private Double availabilityFactor;
+
+    /**
+     * 非计划检修损失率
+     */
+    private Double failureLossRate;
+
+    /**
+     * 计划检修损失率
+     */
+    private Double mainLossRate;
+
+    /**
+     * mttr
+     */
+    private Double mttr;
+
+    /**
+     * 隐患发现及时率
+     */
+    private Double hiddenTimely;
+
+    /**
+     * 复位及时率
+     */
+    private Double resetTimelyRate;
+
+    /**
+     * 状态转换率
+     */
+    private Double stateTransitionRate;
+
+    /**
+     * 消缺及时率
+     */
+    private Double eliminationRate;
+
+    /**
+     * 平均风速
+     */
+    private Double speed;
+
+    /**
+     * 静风频率
+     */
+    private Double staticWindFrequency;
+
+    /**
+     * 有效风时率
+     */
+    private Double effectiveWindHourRate;
+
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/model/auto/ProEconBrownoutsEvent.java

@@ -0,0 +1,114 @@
+package com.gyee.generation.model.auto;
+
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.util.Date;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 与停机事件关联（限电停机时），数据库中无关联，程序控制
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProEconBrownoutsEvent extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    private String id;
+
+    /**
+     * 风场编号
+     */
+    private String windpowerstationId;
+
+    /**
+     * 停机时间
+     */
+    private String windturbineId;
+
+    /**
+     * 停机时间
+     */
+    private Date stopTime;
+
+    /**
+     * 恢复启动时间
+     */
+    private Date startTime;
+
+    /**
+     * 停机小时数
+     */
+    private Double stopHours;
+
+    /**
+     * 损失电量
+     */
+    private Double lossPower;
+
+    /**
+     * 故障停机、维护停机、限电停机、复位停机
+     */
+    private String stopTypeId;
+
+    /**
+     * 是否处理
+     */
+    private Integer isHandle;
+
+    /**
+     * 停机事件编号
+     */
+    private String shutdownEventId;
+
+    /**
+     * 工程编号
+     */
+    private String projectId;
+
+    /**
+     * 主表ID
+     */
+    private String mainId;
+
+    /**
+     * 限电负荷
+     */
+    private Double limitLoad;
+
+    /**
+     * 限电指令
+     */
+    private String brownoutsDirective;
+
+    /**
+     * 当时风速
+     */
+    private Double windSpeed;
+
+    /**
+     * 当时负荷
+     */
+    private Double thisLoad;
+
+    /**
+     * 限电原因
+     */
+    private String stopReason;
+
+    /**
+     * 线路编号
+     */
+    private String lineId;
+
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/model/auto/ProEconCurveFittMonthMain.java

@@ -0,0 +1,73 @@
+package com.gyee.generation.model.auto;
+
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 风电机月拟合曲线主表
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProEconCurveFittMonthMain extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    private String id;
+
+    /**
+     * 风机编号
+     */
+    private String windturbineId;
+
+    /**
+     * 年
+     */
+    private String year;
+
+    /**
+     * 月
+     */
+    private String month;
+
+    /**
+     * 环比
+     */
+    private Double monthDeviationRate;
+
+    /**
+     * 同比
+     */
+    private Double yearDeviationRate;
+
+    /**
+     * 与标杆风机比
+     */
+    private Double standardDeviationRate;
+
+    /**
+     * 实际/最优
+     */
+    private Double deviationRate1;
+
+    /**
+     * 实际/保证
+     */
+    private Double deviationRate2;
+
+    /**
+     * 最优/保证
+     */
+    private Double deviationRate3;
+
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/model/auto/ProEconCurveFittMonthSub.java

@@ -0,0 +1,78 @@
+package com.gyee.generation.model.auto;
+
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 风电机月拟合曲线子表
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProEconCurveFittMonthSub extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    private String id;
+
+    /**
+     * 风机编号
+     */
+    private String windturbineId;
+
+    /**
+     * 年
+     */
+    private String year;
+
+    /**
+     * 月
+     */
+    private String month;
+
+    /**
+     * 风速
+     */
+    private String speed;
+
+    /**
+     * 环比
+     */
+    private Double monthDeviationRate;
+
+    /**
+     * 同比
+     */
+    private Double yearDeviationRate;
+
+    /**
+     * 与标杆风机比
+     */
+    private Double standardDeviationRate;
+
+    /**
+     * 实际/最优
+     */
+    private Double deviationRate1;
+
+    /**
+     * 实际/保证
+     */
+    private Double deviationRate2;
+
+    /**
+     * 最优/保证
+     */
+    private Double deviationRate3;
+
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/model/auto/ProEconCurveFittingMain.java

@@ -0,0 +1,69 @@
+package com.gyee.generation.model.auto;
+
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.util.Date;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 风电机拟合曲线主表
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProEconCurveFittingMain extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    private String id;
+
+    /**
+     * 风机编号
+     */
+    private String windturbineId;
+
+    /**
+     * 环比
+     */
+    private Double monthDeviationRate;
+
+    /**
+     * 同比
+     */
+    private Double yearDeviationRate;
+
+    /**
+     * 与标杆风机比
+     */
+    private Double standardDeviationRate;
+
+    /**
+     * 日期
+     */
+    private Date recordDate;
+
+    /**
+     * 实际/最优
+     */
+    private Double deviationRate1;
+
+    /**
+     * 实际/保证
+     */
+    private Double deviationRate2;
+
+    /**
+     * 最优/保证
+     */
+    private Double deviationRate3;
+
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/model/auto/ProEconCurveFittingSub.java

@@ -0,0 +1,74 @@
+package com.gyee.generation.model.auto;
+
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.util.Date;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 风电机拟合曲线子表
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProEconCurveFittingSub extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    private String id;
+
+    /**
+     * 风机编号
+     */
+    private String windturbineId;
+
+    /**
+     * 环比
+     */
+    private Double monthDeviationRate;
+
+    /**
+     * 同比
+     */
+    private Double yearDeviationRate;
+
+    /**
+     * 与标杆风机比
+     */
+    private Double standardDeviationRate;
+
+    /**
+     * 日期
+     */
+    private Date recordDate;
+
+    /**
+     * 风速
+     */
+    private String speed;
+
+    /**
+     * 实际/最优
+     */
+    private Double deviationRate1;
+
+    /**
+     * 实际/保证
+     */
+    private Double deviationRate2;
+
+    /**
+     * 最优/保证
+     */
+    private Double deviationRate3;
+
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/model/auto/ProBasicPhotovoltaicPoint.java

@@ -1,21 +1,21 @@
 package com.gyee.generation.model.auto;
 
-import java.math.BigDecimal;
+
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 /**
  * <p>
- * 光伏测点
+ * 电气测点
  * </p>
  *
- * @author 石林
- * @since 2022-10-13
+ * @author shilin
+ * @since 2022-10-21
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class ProBasicPhotovoltaicPoint extends Model {
+public class ProEconElectricaltestPoint extends Model {
 
     private static final long serialVersionUID = 1L;
 
@@ -62,27 +62,27 @@ public class ProBasicPhotovoltaicPoint extends Model {
     /**
      * 最大值
      */
-    private BigDecimal maxval;
+    private Double maxval;
 
     /**
      * 最小值
      */
-    private BigDecimal minval;
+    private Double minval;
 
     /**
      * 合理最大值
      */
-    private BigDecimal reasonableMaxval;
+    private Double reasonableMaxval;
 
     /**
      * 合理最小值
      */
-    private BigDecimal reasonableMinval;
+    private Double reasonableMinval;
 
     /**
-     * 风机编号
+     * 变电所编号
      */
-    private String windturbineId;
+    private String electricalId;
 
     /**
      * 统一编码
@@ -107,32 +107,7 @@ public class ProBasicPhotovoltaicPoint extends Model {
     /**
      * 实时配置编号
      */
-    private String realtimeId;
-
-    /**
-     * 方阵编号
-     */
-    private String squareId;
-
-    /**
-     * 箱变编号
-     */
-    private String boxchangeId;
-
-    /**
-     * 逆变器编号
-     */
-    private String inverterId;
-
-    /**
-     * 汇流箱编号
-     */
-    private String junctionboxId;
-
-    /**
-     * 类型
-     */
-    private String type;
+    private String realTimeId;
 
 
 }

realtime/generationXK-service/src/main/java/com/gyee/generation/model/auto/ProEconEquipmentDayDetailed.java

@@ -0,0 +1,129 @@
+package com.gyee.generation.model.auto;
+
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.util.Date;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 设备日明细
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProEconEquipmentDayDetailed extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    private String id;
+
+    /**
+     * 风机编号
+     */
+    private String windturbineId;
+
+    /**
+     * 项目
+     */
+    private String projectId;
+
+    /**
+     * 线路
+     */
+    private String lineId;
+
+    /**
+     * 风场编号
+     */
+    private String windpowerstationId;
+
+    /**
+     * 日期
+     */
+    private Date recordDate;
+
+    /**
+     * 发电量
+     */
+    private Double genecapacity;
+
+    /**
+     * 理论发电量
+     */
+    private Double therogenecapacity;
+
+    /**
+     * 风速
+     */
+    private Double speed;
+
+    /**
+     * 检修损失
+     */
+    private Double daynhwhssdl1;
+
+    /**
+     * 受累检修
+     */
+    private Double daynhwhssdl2;
+
+    /**
+     * 故障损失电量
+     */
+    private Double daynhgzssdl1;
+
+    /**
+     * 受累故障
+     */
+    private Double daynhgzssdl2;
+
+    /**
+     * 欠发限电
+     */
+    private Double daynhxdssdl1;
+
+    /**
+     * 限电损失电量
+     */
+    private Double daynhxdssdl2;
+
+    /**
+     * 待机性能
+     */
+    private Double daynhqfdl1;
+
+    /**
+     * 手动停机
+     */
+    private Double daynhqfdl2;
+
+    /**
+     * 性能损失电量
+     */
+    private Double daynhqfdl3;
+
+    /**
+     * 缺陷损失性能
+     */
+    private Double daynhqfdl4;
+
+    /**
+     * 电网受累损失
+     */
+    private Double daynhcfdl1;
+
+    /**
+     * 天气受累损失
+     */
+    private Double daynhcfdl2;
+
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/model/auto/ProEconEquipmentDayInfo.java

@@ -0,0 +1,94 @@
+package com.gyee.generation.model.auto;
+
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.util.Date;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 风机绩效榜
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProEconEquipmentDayInfo extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    private String id;
+
+    /**
+     * 风机编号
+     */
+    private String windturbineId;
+
+    /**
+     * 项目
+     */
+    private String projectId;
+
+    /**
+     * 线路
+     */
+    private String lineId;
+
+    /**
+     * 风场编号
+     */
+    private String windpowerstationId;
+
+    /**
+     * 日期
+     */
+    private Date recordDate;
+
+    /**
+     * 发电量
+     */
+    private Double genecapacity;
+
+    /**
+     * 理论发电量
+     */
+    private Double therogenecapacity;
+
+    /**
+     * 风速
+     */
+    private Double speed;
+
+    /**
+     * 维护损失电量
+     */
+    private Double daynhwhssdl;
+
+    /**
+     * 故障损失电量
+     */
+    private Double daynhgzssdl;
+
+    /**
+     * 限电损失电量
+     */
+    private Double daynhxdssdl;
+
+    /**
+     * 性能损失电量
+     */
+    private Double daynhqfdl;
+
+    /**
+     * 受累损失电量
+     */
+    private Double daynhcfdl;
+
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/model/auto/ProEconEquipmentmodel.java

@@ -10,8 +10,8 @@ import lombok.EqualsAndHashCode;
  * 设备型号
  * </p>
  *
- * @author 谢生杰
- * @since 2022-10-13
+ * @author shilin
+ * @since 2022-10-21
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

realtime/generationXK-service/src/main/java/com/gyee/generation/model/auto/ProEconFaultLiminatedefects.java

@@ -0,0 +1,79 @@
+package com.gyee.generation.model.auto;
+
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.util.Date;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 故障消缺及时率
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProEconFaultLiminatedefects extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    private Double id;
+
+    /**
+     * 风场编号
+     */
+    private String windpowerstationId;
+
+    /**
+     * 风机编号
+     */
+    private String windturbineId;
+
+    /**
+     * 工程编号
+     */
+    private String projectId;
+
+    /**
+     * 线路编号
+     */
+    private String lineId;
+
+    /**
+     * 日期
+     */
+    private Date dateTime;
+
+    /**
+     * 报警类别
+     */
+    private String classifyId;
+
+    /**
+     * 故障次数
+     */
+    private Double faultCount;
+
+    /**
+     * 及时率
+     */
+    private Double rate;
+
+    /**
+     * 消缺及时次数
+     */
+    private Double rightCount;
+
+    /**
+     * 未消缺原因
+     */
+    private String cause;
+
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/model/auto/ProEconInOrOutSpeedTotal.java

@@ -0,0 +1,374 @@
+package com.gyee.generation.model.auto;
+
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.util.Date;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 切入切出风速整合
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProEconInOrOutSpeedTotal extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    private Integer id;
+
+    /**
+     * 风机编号
+     */
+    private String windturbineId;
+
+    /**
+     * 日期
+     */
+    private Date recordDate;
+
+    /**
+     * 日小风切入
+     */
+    private Double dayInputSmall;
+
+    /**
+     * 日小风切入最小值
+     */
+    private Double dayInputSmallMin;
+
+    /**
+     * 日小风切入最大值
+     */
+    private Double dayInputSmallMax;
+
+    /**
+     * 日大风切入
+     */
+    private Double dayInputBig;
+
+    /**
+     * 日大风切入最小值
+     */
+    private Double dayInputBigMin;
+
+    /**
+     * 日大风切入最大值
+     */
+    private Double dayInputBigMax;
+
+    /**
+     * 日小风切出
+     */
+    private Double dayOutputSmall;
+
+    /**
+     * 日小风切出最小值
+     */
+    private Double dayOutputSmallMin;
+
+    /**
+     * 日小风切出最大值
+     */
+    private Double dayOutputSmallMax;
+
+    /**
+     * 日大风切出
+     */
+    private Double dayOutputBig;
+
+    /**
+     * 日大风切出最小值
+     */
+    private Double dayOutputBigMin;
+
+    /**
+     * 日大风切出最大值
+     */
+    private Double dayOutputBigMax;
+
+    /**
+     * 月小风切入
+     */
+    private Double monthInputSmall;
+
+    /**
+     * 月小风切入最小值
+     */
+    private Double monthInputSmallMin;
+
+    /**
+     * 月小风切入最大值
+     */
+    private Double monthInputSmallMax;
+
+    /**
+     * 月大风切入
+     */
+    private Double monthInputBig;
+
+    /**
+     * 月大风切入最小值
+     */
+    private Double monthInputBigMin;
+
+    /**
+     * 月大风切入最大值
+     */
+    private Double monthInputBigMax;
+
+    /**
+     * 月小风切出
+     */
+    private Double monthOutputSmall;
+
+    /**
+     * 月小风切出最小值
+     */
+    private Double monthOutputSmallMin;
+
+    /**
+     * 月小风切出最大值
+     */
+    private Double monthOutputSmallMax;
+
+    /**
+     * 月大风切出
+     */
+    private Double monthOutputBig;
+
+    /**
+     * 月大风切出最小值
+     */
+    private Double monthOutputBigMin;
+
+    /**
+     * 月大风切出最大值
+     */
+    private Double monthOutputBigMax;
+
+    /**
+     * 年小风切入
+     */
+    private Double yearInputSmall;
+
+    /**
+     * 年小风切入最小值
+     */
+    private Double yearInputSmallMin;
+
+    /**
+     * 年小风切入最大值
+     */
+    private Double yearInputSmallMax;
+
+    /**
+     * 年大风切入
+     */
+    private Double yearInputBig;
+
+    /**
+     * 年大风切入最小值
+     */
+    private Double yearInputBigMin;
+
+    /**
+     * 年大风切入最大值
+     */
+    private Double yearInputBigMax;
+
+    /**
+     * 年小风切出
+     */
+    private Double yearOutputSmall;
+
+    /**
+     * 年小风切出最小值
+     */
+    private Double yearOutputSmallMin;
+
+    /**
+     * 年小风切出最大值
+     */
+    private Double yearOutputSmallMax;
+
+    /**
+     * 年大风切出
+     */
+    private Double yearOutputBig;
+
+    /**
+     * 年大风切出最小值
+     */
+    private Double yearOutputBigMin;
+
+    /**
+     * 年大风切出最大值
+     */
+    private Double yearOutputBigMax;
+
+    /**
+     * 小风切入
+     */
+    private Double inputSmall;
+
+    /**
+     * 小风切入最小值
+     */
+    private Double inputSmallMin;
+
+    /**
+     * 小风切入最大值
+     */
+    private Double inputSmallMax;
+
+    /**
+     * 大风切入
+     */
+    private Double inputBig;
+
+    /**
+     * 大风切入最小值
+     */
+    private Double inputBigMin;
+
+    /**
+     * 大风切入最大值
+     */
+    private Double inputBigMax;
+
+    /**
+     * 小风切出
+     */
+    private Double outputSmall;
+
+    /**
+     * 小风切出最小值
+     */
+    private Double outputSmallMin;
+
+    /**
+     * 小风切出最大值
+     */
+    private Double outputSmallMax;
+
+    /**
+     * 大风切出
+     */
+    private Double outputBig;
+
+    /**
+     * 大风切出最小值
+     */
+    private Double outputBigMin;
+
+    /**
+     * 大风切出最大值
+     */
+    private Double outputBigMax;
+
+    /**
+     * 日小风切入合格率
+     */
+    private Double dayInputSmallRatio;
+
+    /**
+     * 日小风切出合格率
+     */
+    private Double dayOutputSmallRatio;
+
+    /**
+     * 日大风切入合格率
+     */
+    private Double dayInputBigRatio;
+
+    /**
+     * 日大风切出合格率
+     */
+    private Double dayOutputBigRatio;
+
+    /**
+     * 月小风切入合格率
+     */
+    private Double monthInputSmallRatio;
+
+    /**
+     * 月小风切出合格率
+     */
+    private Double monthOutputSmallRatio;
+
+    /**
+     * 月大风切入合格率
+     */
+    private Double monthInputBigRatio;
+
+    /**
+     * 月大风切出合格率
+     */
+    private Double monthOutputBigRatio;
+
+    /**
+     * 年小风切入合格率
+     */
+    private Double yearInputSmallRatio;
+
+    /**
+     * 年小风切出合格率
+     */
+    private Double yearOutputSmallRatio;
+
+    /**
+     * 年大风切入合格率
+     */
+    private Double yearInputBigRatio;
+
+    /**
+     * 年大风切出合格率
+     */
+    private Double yearOutputBigRatio;
+
+    /**
+     * 总小风切入合格率
+     */
+    private Double inputSmallRatio;
+
+    /**
+     * 总小风切出合格率
+     */
+    private Double outputSmallRatio;
+
+    /**
+     * 总大风切入合格率
+     */
+    private Double inputBigRatio;
+
+    /**
+     * 总大风切出合格率
+     */
+    private Double outputBigMaxRatio;
+
+    /**
+     * 风场编号
+     */
+    private String windpowerstationId;
+
+    /**
+     * 工程编号
+     */
+    private String projectId;
+
+    /**
+     * 线路编号
+     */
+    private String lineId;
+
+
+}