Merge remote-tracking branch 'origin/master'

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

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

realtime/generationXK-service/src/main/java/com/gyee/generation/controller/ProBasicBoxchangeController.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 石林
+ * @since 2022-10-13
+ */
+@RestController
+@RequestMapping("//pro-basic-boxchange")
+public class ProBasicBoxchangeController {
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/controller/ProBasicCompanyController.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 石林
+ * @since 2022-10-13
+ */
+@RestController
+@RequestMapping("//pro-basic-company")
+public class ProBasicCompanyController {
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/controller/ProBasicEnergyGroupController.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 石林
+ * @since 2022-10-13
+ */
+@RestController
+@RequestMapping("//pro-basic-energy-group")
+public class ProBasicEnergyGroupController {
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/controller/ProBasicEquipmentPointController.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 石林
+ * @since 2022-10-13
+ */
+@RestController
+@RequestMapping("//pro-basic-equipment-point")
+public class ProBasicEquipmentPointController {
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/controller/ProBasicInverterController.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 石林
+ * @since 2022-10-13
+ */
+@RestController
+@RequestMapping("//pro-basic-inverter")
+public class ProBasicInverterController {
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/controller/ProBasicJunctionboxController.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 石林
+ * @since 2022-10-13
+ */
+@RestController
+@RequestMapping("//pro-basic-junctionbox")
+public class ProBasicJunctionboxController {
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/controller/ProBasicLineController.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 石林
+ * @since 2022-10-13
+ */
+@RestController
+@RequestMapping("//pro-basic-line")
+public class ProBasicLineController {
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/controller/ProBasicMeterPointController.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 石林
+ * @since 2022-10-13
+ */
+@RestController
+@RequestMapping("//pro-basic-meter-point")
+public class ProBasicMeterPointController {
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/controller/ProBasicPhotovoltaicPointController.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 石林
+ * @since 2022-10-13
+ */
+@RestController
+@RequestMapping("//pro-basic-photovoltaic-point")
+public class ProBasicPhotovoltaicPointController {
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/controller/ProBasicProjectController.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 石林
+ * @since 2022-10-13
+ */
+@RestController
+@RequestMapping("//pro-basic-project")
+public class ProBasicProjectController {
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/controller/ProBasicProjectPlanController.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 石林
+ * @since 2022-10-13
+ */
+@RestController
+@RequestMapping("//pro-basic-project-plan")
+public class ProBasicProjectPlanController {
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/controller/ProBasicRealtimeDbconfigController.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 石林
+ * @since 2022-10-13
+ */
+@RestController
+@RequestMapping("//pro-basic-realtime-dbconfig")
+public class ProBasicRealtimeDbconfigController {
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/controller/ProBasicRegionController.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 石林
+ * @since 2022-10-13
+ */
+@RestController
+@RequestMapping("//pro-basic-region")
+public class ProBasicRegionController {
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/controller/ProBasicSquareController.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 石林
+ * @since 2022-10-13
+ */
+@RestController
+@RequestMapping("//pro-basic-square")
+public class ProBasicSquareController {
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/controller/ProBasicWindpowerstationController.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 石林
+ * @since 2022-10-13
+ */
+@RestController
+@RequestMapping("//pro-basic-windpowerstation")
+public class ProBasicWindpowerstationController {
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/controller/ProBasicWindsubStationController.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 石林
+ * @since 2022-10-13
+ */
+@RestController
+@RequestMapping("//pro-basic-windsub-station")
+public class ProBasicWindsubStationController {
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/controller/ProBasicWindturbineController.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 石林
+ * @since 2022-10-13
+ */
+@RestController
+@RequestMapping("//pro-basic-windturbine")
+public class ProBasicWindturbineController {
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/controller/ProBasicWindturbinePowerController.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 石林
+ * @since 2022-10-13
+ */
+@RestController
+@RequestMapping("//pro-basic-windturbine-power")
+public class ProBasicWindturbinePowerController {
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/controller/ProBasicWppointController.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 石林
+ * @since 2022-10-13
+ */
+@RestController
+@RequestMapping("//pro-basic-wppoint")
+public class ProBasicWppointController {
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/controller/ProEconManufacturerController.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 石林
+ * @since 2022-10-13
+ */
+@RestController
+@RequestMapping("//pro-econ-manufacturer")
+public class ProEconManufacturerController {
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/controller/ProEconMeterPointValueController.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 石林
+ * @since 2022-10-14
+ */
+@RestController
+@RequestMapping("//pro-econ-meter-point-value")
+public class ProEconMeterPointValueController {
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/controller/ProEconModelPowerController.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 石林
+ * @since 2022-10-13
+ */
+@RestController
+@RequestMapping("//pro-econ-model-power")
+public class ProEconModelPowerController {
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/controller/ProEconShutdowneventController.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 石林
+ * @since 2022-10-13
+ */
+@RestController
+@RequestMapping("//pro-econ-shutdownevent")
+public class ProEconShutdowneventController {
+
+}

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

@@ -28,43 +28,43 @@ public class CacheContext implements CommandLineRunner {
     Logger logger = LoggerFactory.getLogger(CacheContext.class);
 
     @Resource
-    private IWindturbineService windturbineService;
+    private IProBasicWindturbineService proBasicWindturbineService;
     @Resource
-    private ILineService lineService;
+    private IProBasicLineService proBasicLineService;
     @Resource
-    private IProjectService projectService;
+    private IProBasicProjectService proBasicProjectService;
     @Resource
-    private IWindpowerstationService windpowerstationService;
+    private IProBasicWindpowerstationService proBasicWindpowerstationService;
     @Resource
-    private IMeterpointService meterpointService;
+    private IProBasicMeterPointService proBasicMeterPointService;
     @Resource
-    private IEquipmentmodelService equipmentmodelService;
+    private IProEconEquipmentmodelService proEconEquipmentmodelService;
     @Resource
     private IWindturbinestatusdiService windturbinestatusdiService;
     @Resource
-    private IWindturbinepowerService windturbinepowerService;
+    private IProBasicWindturbinePowerService proBasicWindturbinePowerService;
     @Resource
     private RedisService redisService;
     @Value("${runWindpowerstation}")
     private String runWindpowerstation;
 
-    public static List<Windturbine> wtls = new ArrayList<>();
-    public static List<Project> projects = new ArrayList<>();
-    public static List<Line>  lines = new ArrayList<>();
-    public static List<Windpowerstation>  wpls = new ArrayList<>();
-    public static List<Meterpoint>  meterpoints = new ArrayList<>();
-    public static Map<String,Meterpoint>  meterpointMap = new HashMap<>();
-    public static Map<String,List<Project>> wppromap = new HashMap<>();
-    public static Map<String,List<Line>> prolinemap = new HashMap<>();
-    public static Map<String,List<Windturbine>> linewtmap = new HashMap<>();
-    public static Map<String, Map<String, Windturbinetestingpointnew>> wtpAimap = new HashMap<>();// 风电机测点AI表
-    public static Map<String,Map<String, Windpowerstationpointnew>> linepointmap =new HashMap<>();
-    public static Map<String,Map<String, Windpowerstationpointnew>> propointmap =new HashMap<>();
-    public static Map<String,Map<String, Windpowerstationpointnew>> wppointmap =new HashMap<>();
-    public static Map<String,Project> proMap = new HashMap<>();
+    public static List<ProBasicWindturbine> wtls = new ArrayList<>();
+    public static List<ProBasicProject> projects = new ArrayList<>();
+    public static List<ProBasicLine>  lines = new ArrayList<>();
+    public static List<ProBasicWindpowerstation>  wpls = new ArrayList<>();
+    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<ProBasicLine>> prolinemap = new HashMap<>();
+    public static Map<String,List<ProBasicWindturbine>> linewtmap = new HashMap<>();
+    public static Map<String, Map<String, ProBasicEquipmentPoint>> wtpAimap = new HashMap<>();// 风电机测点AI表
+    public static Map<String,Map<String, ProBasicWppoint>> linepointmap =new HashMap<>();
+    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,Equipmentmodel> modelMap = 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<>();
     @Override
@@ -73,65 +73,65 @@ public class CacheContext implements CommandLineRunner {
         List<String> runWpids = Arrays.asList(runWindpowerstation.split(","));
         logger.info(runWpids.get(0)+"------------------"+runWpids.size());
 
-        List<Equipmentmodel> equipmentmodels = equipmentmodelService.list();
+        List<ProEconEquipmentmodel> equipmentmodels = proEconEquipmentmodelService.list();
         equipmentmodels.stream().forEach(e->{
             modelMap.put(e.getId(),e);
         });
 
-        wtls = windturbineService.list().stream().filter(i->runWpids.contains(i.getWindpowerstationid())).collect(Collectors.toList());
+        wtls = proBasicWindturbineService.list().stream().filter(i->runWpids.contains(i.getWindpowerstationId())).collect(Collectors.toList());
         logger.info(wtls.size()+"");
         wtls.forEach(wt->{
-            Equipmentmodel equipmentmodel = modelMap.get(wt.getModelid());
-            modelpower.put(wt.getId(),equipmentmodel.getPowerproduction());
+            ProEconEquipmentmodel equipmentmodel = modelMap.get(wt.getModelId());
+            modelpower.put(wt.getId(),equipmentmodel.getPowerProduction().doubleValue());
 
             String wtString = redisService.get(wt.getId());
-            Map<String, Windturbinetestingpointnew> stringWindturbinetestingpointnewMap = JSONObject.parseObject(wtString, new TypeReference<Map<String, Windturbinetestingpointnew>>() {
+            Map<String, ProBasicEquipmentPoint> stringWindturbinetestingpointnewMap = JSONObject.parseObject(wtString, new TypeReference<Map<String, ProBasicEquipmentPoint>>() {
             });
             wtpAimap.put(wt.getId(),stringWindturbinetestingpointnewMap);
 
-            if (linewtmap.containsKey(wt.getLineid())){
-                linewtmap.get(wt.getLineid()).add(wt);
+            if (linewtmap.containsKey(wt.getLineId())){
+                linewtmap.get(wt.getLineId()).add(wt);
             }else {
-                List<Windturbine> lines = new ArrayList<>();
+                List<ProBasicWindturbine> lines = new ArrayList<>();
                 lines.add(wt);
-                linewtmap.put(wt.getLineid(),lines);
+                linewtmap.put(wt.getLineId(),lines);
             }
         });
 
-        projects = projectService.list().stream().filter(i->runWpids.contains(i.getWindpowerstationid())).collect(Collectors.toList());
+        projects = proBasicProjectService.list().stream().filter(i->runWpids.contains(i.getWindpowerstationId())).collect(Collectors.toList());
         projects.stream().forEach(p->{
             proMap.put(p.getId(),p);
-            if (wppromap.containsKey(p.getWindpowerstationid())){
-                wppromap.get(p.getWindpowerstationid()).add(p);
+            if (wppromap.containsKey(p.getWindpowerstationId())){
+                wppromap.get(p.getWindpowerstationId()).add(p);
             }else {
-                List<Project> prolist = new ArrayList<>();
+                List<ProBasicProject> prolist = new ArrayList<>();
                 prolist.add(p);
-                wppromap.put(p.getWindpowerstationid(),prolist);
+                wppromap.put(p.getWindpowerstationId(),prolist);
             }
             String pjString = redisService.get(p.getId());
-            Map<String, Windpowerstationpointnew> stringWindpowerstationpointnewMap = JSONObject.parseObject(pjString, new TypeReference<Map<String, Windpowerstationpointnew>>() {
+            Map<String, ProBasicWppoint> stringWindpowerstationpointnewMap = JSONObject.parseObject(pjString, new TypeReference<Map<String, ProBasicWppoint>>() {
             });
             propointmap.put(p.getId(),stringWindpowerstationpointnewMap);
 
         });
 
-        lines = lineService.list().stream().filter(i-> StringUtils.isNotNull(proMap.get(i.getProjectid())) && runWpids.contains(proMap.get(i.getProjectid()).getWindpowerstationid())).collect(Collectors.toList());
+        lines = proBasicLineService.list().stream().filter(i-> StringUtils.isNotNull(proMap.get(i.getProjectId())) && runWpids.contains(proMap.get(i.getProjectId()).getWindpowerstationId())).collect(Collectors.toList());
         lines.stream().forEach(l->{
-            if (prolinemap.containsKey(l.getProjectid())){
-                prolinemap.get(l.getProjectid()).add(l);
+            if (prolinemap.containsKey(l.getProjectId())){
+                prolinemap.get(l.getProjectId()).add(l);
             }else {
-                List<Line> lineList = new ArrayList<>();
+                List<ProBasicLine> lineList = new ArrayList<>();
                 lineList.add(l);
-                prolinemap.put(l.getProjectid(),lineList);
+                prolinemap.put(l.getProjectId(),lineList);
             }
             String lnString = redisService.get(l.getId());
-            Map<String, Windpowerstationpointnew> stringWindpowerstationpointnewMap = JSONObject.parseObject(lnString, new TypeReference<Map<String, Windpowerstationpointnew>>() {
+            Map<String, ProBasicWppoint> stringWindpowerstationpointnewMap = JSONObject.parseObject(lnString, new TypeReference<Map<String, ProBasicWppoint>>() {
             });
             linepointmap.put(l.getId(),stringWindpowerstationpointnewMap);
         });
 
-        wpls = windpowerstationService.list().stream().filter(i->runWpids.contains(i.getId())).collect(Collectors.toList());;
-        meterpoints = meterpointService.list().stream().filter(i->runWpids.contains(i.getWindpowerstationid())).collect(Collectors.toList());
+        wpls = proBasicWindpowerstationService.list().stream().filter(i->runWpids.contains(i.getId())).collect(Collectors.toList());;
+        meterpoints = proBasicMeterPointService.list().stream().filter(i->runWpids.contains(i.getWindpowerstationId())).collect(Collectors.toList());
         meterpoints.stream().forEach(meterpoint -> {
             meterpointMap.put(meterpoint.getId(),meterpoint);
         });
@@ -139,7 +139,7 @@ public class CacheContext implements CommandLineRunner {
 
         wpls.stream().forEach(wp->{
             String wpString = redisService.get(wp.getId());
-            Map<String, Windpowerstationpointnew> stringMapMap = JSONObject.parseObject(wpString, new TypeReference<Map<String, Windpowerstationpointnew>>() {
+            Map<String, ProBasicWppoint> stringMapMap = JSONObject.parseObject(wpString, new TypeReference<Map<String, ProBasicWppoint>>() {
             });
             wppointmap.put(wp.getId(),stringMapMap);
         });
@@ -154,30 +154,30 @@ public class CacheContext implements CommandLineRunner {
         zbzglMap = JSONObject.parseObject(zbzgl, new TypeReference<Map<String,Map<Double,Double>>>() {
         });
 
-        List<Windturbinepower> windturbinepowerList = windturbinepowerService.list().stream().filter(windturbinepower -> runWindpowerstation.contains(windturbinepower.getWindpowerstationid())).collect(Collectors.toList());
+        List<ProBasicWindturbinePower> windturbinepowerList = proBasicWindturbinePowerService.list().stream().filter(windturbinepower -> runWindpowerstation.contains(windturbinepower.getWindpowerstationId())).collect(Collectors.toList());
         windturbinepowerList.stream().forEach(w -> {
-            if (zzsglMap.containsKey(w.getWindturbineid())){
-                zzsglMap.get(w.getWindturbineid()).put(w.getSpeed(),w.getTheorypower());
+            if (zzsglMap.containsKey(w.getWindturbineId())){
+                zzsglMap.get(w.getWindturbineId()).put(w.getSpeed(),w.getTheoryPower());
             }else {
                 Map<Double,Double> tempMap = new HashMap<>();
-                tempMap.put(w.getSpeed(),w.getTheorypower());
-                zzsglMap.put(w.getWindturbineid(),tempMap);
+                tempMap.put(w.getSpeed(),w.getTheoryPower());
+                zzsglMap.put(w.getWindturbineId(),tempMap);
             }
 
         });
 
 //        String wpString = redisService.get("PRODUCT-WP");
-//        wppointmap = JSONObject.parseObject(wpString, new TypeReference<Map<String, Map<String, Windpowerstationpointnew>>>() {
+//        wppointmap = JSONObject.parseObject(wpString, new TypeReference<Map<String, Map<String, ProBasicWppoint>>>() {
 //        });
 //        String pjString = redisService.get("PRODUCT-PJ");
-//        propointmap = JSONObject.parseObject(pjString, new TypeReference<Map<String, Map<String, Windpowerstationpointnew>>>() {
+//        propointmap = JSONObject.parseObject(pjString, new TypeReference<Map<String, Map<String, ProBasicWppoint>>>() {
 //        });
 //        String lnString = redisService.get("PRODUCT-LN");
-//        linepointmap = JSONObject.parseObject(lnString, new TypeReference<Map<String, Map<String, Windpowerstationpointnew>>>() {
+//        linepointmap = JSONObject.parseObject(lnString, new TypeReference<Map<String, Map<String, ProBasicWppoint>>>() {
 //        });
 
 //        String wtString = redisService.get("PRODUCT-WT");
-//        wtpAimap = JSONObject.parseObject(wtString, new TypeReference<Map<String, Map<String, Windturbinetestingpointnew>>>() {
+//        wtpAimap = JSONObject.parseObject(wtString, new TypeReference<Map<String, Map<String, ProBasicEquipmentPoint>>>() {
 //        });
         logger.info("缓存结束------------------------------------------------------------");
     }

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,16 @@
+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

@@ -0,0 +1,16 @@
+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

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

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

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

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

@@ -0,0 +1,16 @@
+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

@@ -0,0 +1,16 @@
+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

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

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

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

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

@@ -0,0 +1,16 @@
+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

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

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

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

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

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

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

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

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

@@ -0,0 +1,16 @@
+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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,16 @@
+package com.gyee.generation.mapper.auto;
+
+import com.gyee.generation.model.auto.ProEconEquipmentmodel;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 设备型号 Mapper 接口
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-10-13
+ */
+public interface ProEconEquipmentmodelMapper extends BaseMapper<ProEconEquipmentmodel> {
+
+}

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

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

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

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

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

@@ -0,0 +1,16 @@
+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/ProEconShutdowneventMapper.java

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,65 +0,0 @@
-package com.gyee.generation.model.auto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author 谢生杰
- * @since 2022-03-28
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("EQUIPMENTMODEL")
-public class Equipmentmodel extends Model {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId("ID")
-    private String id;
-
-    @TableField("CODE")
-    private String code;
-
-    @TableField("NAME")
-    private String name;
-
-    @TableField("DESCRIPTION")
-    private String description;
-
-    @TableField("POWERPRODUCTION")
-    private Double powerproduction;
-
-    @TableField("CUTINWINDSPEED")
-    private Double cutinwindspeed;
-
-    @TableField("RATEDWINDSPEED")
-    private Double ratedwindspeed;
-
-    @TableField("CUTOUTWINDSPEED")
-    private String cutoutwindspeed;
-
-    @TableField("WINDTURBINEMANUFACTURERID")
-    private String windturbinemanufacturerid;
-
-    @TableField("PHOTO")
-    private String photo;
-
-    @TableField("UNIT")
-    private String unit;
-
-    @TableField("SWEPTAREA")
-    private Double sweptarea;
-
-    @TableField("EQUIPMENTCATEGORY")
-    private Double equipmentcategory;
-
-
-}

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

@@ -1,53 +0,0 @@
-package com.gyee.generation.model.auto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author 谢生杰
- * @since 2022-02-28
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("LINE")
-public class Line extends Model {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId("ID")
-    private String id;
-
-    @TableField("CODE")
-    private String code;
-
-    @TableField("NAME")
-    private String name;
-
-    @TableField("ANAME")
-    private String aname;
-
-    @TableField("PROJECTID")
-    private String projectid;
-
-    @TableField("ORDERNUM")
-    private Integer ordernum;
-
-    @TableField("CAPACITY")
-    private Integer capacity;
-
-    @TableField("CAPACITYUNIT")
-    private String capacityunit;
-
-    @TableField("QUANTITY")
-    private Integer quantity;
-
-
-}

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

@@ -1,91 +0,0 @@
-package com.gyee.generation.model.auto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author 谢生杰
- * @since 2022-02-28
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("METERPOINT")
-public class Meterpoint extends Model {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId("ID")
-    private String id;
-
-    @TableField("CODE")
-    private String code;
-
-    @TableField("NAME")
-    private String name;
-
-    @TableField("DESCRIPTION")
-    private String description;
-
-    @TableField("WINDPOWERSTATIONID")
-    private String windpowerstationid;
-
-    @TableField("PROJECTID")
-    private String projectid;
-
-    @TableField("LINEID")
-    private String lineid;
-
-    @TableField("METERTYPE")
-    private String metertype;
-
-    @TableField("METERCODE")
-    private String metercode;
-
-    @TableField("METERSORT")
-    private String metersort;
-
-    @TableField("DISPLAYTYPE")
-    private String displaytype;
-
-    @TableField("UNIFORMCODE")
-    private String uniformcode;
-
-    @TableField("MAGNIFICATION")
-    private Double magnification;
-
-    @TableField("SHORTID")
-    private String shortid;
-
-    @TableField("LONGID")
-    private String longid;
-
-    @TableField("REALTIMEID")
-    private String realtimeid;
-
-    @TableField("INITIALVALUE")
-    private Double initialvalue;
-
-    @TableField("XS")
-    private Double xs;
-
-    @TableField("MAGNIFICATIONXS")
-    private Double magnificationxs;
-
-    @TableField("OTHERVALUE")
-    private Double othervalue;
-
-    @TableField("OTHERDATE")
-    private Date otherdate;
-
-
-}

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

@@ -1,74 +0,0 @@
-package com.gyee.generation.model.auto;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author 谢生杰
- * @since 2022-03-21
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("METERPOINTVALUE")
-public class Meterpointvalue extends Model {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
-    private Long id;
-
-    @TableField("RECORDDATE")
-    private Date recorddate;
-
-    @TableField("METERID")
-    private String meterid;
-
-    @TableField("YEAR")
-    private Double year;
-
-    @TableField("MONTH")
-    private Double month;
-
-    @TableField("DAY")
-    private Double day;
-
-    @TableField("NOW")
-    private Double now;
-
-    @TableField("TOTALVALUE")
-    private Double totalvalue;
-
-    @TableField("YEARVALUE")
-    private Double yearvalue;
-
-    @TableField("MONTHVALUE")
-    private Double monthvalue;
-
-    @TableField("DAYVALUE")
-    private Double dayvalue;
-
-    @TableField("YEAR4")
-    private Double year4;
-
-    @TableField("MONTH4")
-    private Double month4;
-
-    @TableField("DAY4")
-    private Double day4;
-
-    @TableField("NOW4")
-    private Double now4;
-
-
-}

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

@@ -0,0 +1,57 @@
+package com.gyee.generation.model.auto;
+
+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 ProBasicBoxchange extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    private String id;
+
+    /**
+     * 编码
+     */
+    private String code;
+
+    /**
+     * 风场编号(冗余)
+     */
+    private String windpowerstationId;
+
+    /**
+     * 工程编号(冗余)
+     */
+    private String projectId;
+
+    /**
+     * 风电线编号
+     */
+    private String lineId;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 方阵编号
+     */
+    private String squareId;
+
+
+}

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

@@ -0,0 +1,143 @@
+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

@@ -0,0 +1,133 @@
+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 ProBasicEnergyGroup 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;
+
+
+}

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

@@ -0,0 +1,113 @@
+package com.gyee.generation.model.auto;
+
+
+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 ProBasicEquipmentPoint extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    private String id;
+
+    /**
+     * 编码
+     */
+    private String code;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 型号
+     */
+    private String model;
+
+    /**
+     * 单位
+     */
+    private String valueUnit;
+
+    /**
+     * 英文名称
+     */
+    private String englishName;
+
+    /**
+     * 类型编号
+     */
+    private String typeId;
+
+    /**
+     * 所属型号
+     */
+    private String modelId;
+
+    /**
+     * 最大值
+     */
+    private Double maxval;
+
+    /**
+     * 最小值
+     */
+    private Double minval;
+
+    /**
+     * 合理最大值
+     */
+    private Double reasonableMaxval;
+
+    /**
+     * 合理最小值
+     */
+    private Double reasonableMinval;
+
+    /**
+     * 风机编号
+     */
+    private String windturbineId;
+
+    /**
+     * 统一编码
+     */
+    private String uniformCode;
+
+    /**
+     * 短ID
+     */
+    private String shortId;
+
+    /**
+     * 长ID
+     */
+    private String longId;
+
+    /**
+     * 场站编号
+     */
+    private String windpowerstationId;
+
+    /**
+     * 实时配置编号
+     */
+    private String realtimeId;
+
+
+}

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

@@ -0,0 +1,77 @@
+package com.gyee.generation.model.auto;
+
+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 ProBasicInverter extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    private String id;
+
+    /**
+     * 编码
+     */
+    private String code;
+
+    /**
+     * 风场编号(冗余)
+     */
+    private String windpowerstationId;
+
+    /**
+     * 工程编号(冗余)
+     */
+    private String projectId;
+
+    /**
+     * 风电线编号
+     */
+    private String lineId;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 方阵编号
+     */
+    private String squareId;
+
+    /**
+     * 箱变编号
+     */
+    private String boxchangeId;
+
+    /**
+     * 是否是标杆设备
+     */
+    private Integer isStandard;
+
+    /**
+     * 型号
+     */
+    private String modelId;
+
+    /**
+     * 汇流箱编号
+     */
+    private String junctionboxId;
+
+
+}

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

@@ -0,0 +1,67 @@
+package com.gyee.generation.model.auto;
+
+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 ProBasicJunctionbox extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    private String id;
+
+    /**
+     * 编码
+     */
+    private String code;
+
+    /**
+     * 风场编号(冗余)
+     */
+    private String windpowerstationId;
+
+    /**
+     * 工程编号(冗余)
+     */
+    private String projectId;
+
+    /**
+     * 风电线编号
+     */
+    private String lineId;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 方阵编号
+     */
+    private String squareId;
+
+    /**
+     * 箱变编号
+     */
+    private String boxchangeId;
+
+    /**
+     * 逆变器编号
+     */
+    private String inverterId;
+
+
+}

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

@@ -0,0 +1,68 @@
+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 ProBasicLine extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    private String id;
+
+    /**
+     * 编码
+     */
+    private String code;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 别名
+     */
+    private String aname;
+
+    /**
+     * 工程编号
+     */
+    private String projectId;
+
+    /**
+     * 顺序
+     */
+    private Integer orderNum;
+
+    /**
+     * 装机容量
+     */
+    private BigDecimal capacity;
+
+    /**
+     * 容量单位
+     */
+    private String capacityUnit;
+
+    /**
+     * 装机数量
+     */
+    private Integer quantity;
+
+
+}

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

@@ -0,0 +1,118 @@
+package com.gyee.generation.model.auto;
+
+
+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 ProBasicMeterPoint extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    private String id;
+
+    /**
+     * 编码
+     */
+    private String code;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 描述
+     */
+    private String description;
+
+    /**
+     * 风场编号
+     */
+    private String windpowerstationId;
+
+    /**
+     * 工程编号
+     */
+    private String projectId;
+
+    /**
+     * 线路编号
+     */
+    private String lineId;
+
+    /**
+     * 电表类型
+     */
+    private String meterType;
+
+    /**
+     * 电表编码
+     */
+    private String meterCode;
+
+    /**
+     * 电表主备
+     */
+    private String meterSort;
+
+    /**
+     * 显示类型
+     */
+    private String displayType;
+
+    /**
+     * 统一编码
+     */
+    private String uniformCode;
+
+    /**
+     * 倍率
+     */
+    private Double magnification;
+
+    /**
+     * 短ID
+     */
+    private String shortId;
+
+    /**
+     * 长ID
+     */
+    private String longId;
+
+    /**
+     * 实时配置编号
+     */
+    private String realtimeId;
+
+    /**
+     * 线损倍率
+     */
+    private Double magnificationxs;
+
+    /**
+     * 系数
+     */
+    private Double xs;
+
+    /**
+     * 初始值
+     */
+    private Double initialValue;
+
+
+}

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

@@ -0,0 +1,138 @@
+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 ProBasicPhotovoltaicPoint extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    private String id;
+
+    /**
+     * 编码
+     */
+    private String code;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 型号
+     */
+    private String model;
+
+    /**
+     * 单位
+     */
+    private String valueUnit;
+
+    /**
+     * 英文名称
+     */
+    private String englishName;
+
+    /**
+     * 类型编号
+     */
+    private String typeId;
+
+    /**
+     * 所属型号
+     */
+    private String modelId;
+
+    /**
+     * 最大值
+     */
+    private BigDecimal maxval;
+
+    /**
+     * 最小值
+     */
+    private BigDecimal minval;
+
+    /**
+     * 合理最大值
+     */
+    private BigDecimal reasonableMaxval;
+
+    /**
+     * 合理最小值
+     */
+    private BigDecimal reasonableMinval;
+
+    /**
+     * 风机编号
+     */
+    private String windturbineId;
+
+    /**
+     * 统一编码
+     */
+    private String uniformCode;
+
+    /**
+     * 短ID
+     */
+    private String shortId;
+
+    /**
+     * 长ID
+     */
+    private String longId;
+
+    /**
+     * 风场编号
+     */
+    private String windpowerstationId;
+
+    /**
+     * 实时配置编号
+     */
+    private String realtimeId;
+
+    /**
+     * 方阵编号
+     */
+    private String squareId;
+
+    /**
+     * 箱变编号
+     */
+    private String boxchangeId;
+
+    /**
+     * 逆变器编号
+     */
+    private String inverterId;
+
+    /**
+     * 汇流箱编号
+     */
+    private String junctionboxId;
+
+    /**
+     * 类型
+     */
+    private String type;
+
+
+}

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

@@ -0,0 +1,99 @@
+package com.gyee.generation.model.auto;
+
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.time.LocalDate;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 工程表
+ * </p>
+ *
+ * @author 石林
+ * @since 2022-10-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProBasicProject extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    private String id;
+
+    /**
+     * 编码
+     */
+    private String code;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 别名
+     */
+    private String aname;
+
+    /**
+     * 风场编号
+     */
+    private String windpowerstationId;
+
+    /**
+     * 装机容量
+     */
+    private Double capacity;
+
+    /**
+     * 容量单位
+     */
+    private String capacityUnit;
+
+    /**
+     * 装机数量
+     */
+    private Integer quantity;
+
+    /**
+     * 机型
+     */
+    private String model;
+
+    /**
+     * 投产日期
+     */
+    private LocalDate commissionDate;
+
+    /**
+     * 主控电话
+     */
+    private String masterPhone;
+
+    /**
+     * 值长
+     */
+    private String shiftforeMan;
+
+    /**
+     * 值长电话
+     */
+    private String shiftforeManPhone;
+
+    /**
+     * 顺序
+     */
+    private Integer orderNum;
+
+    /**
+     * 变电所ID
+     */
+    private String windsubStationId;
+
+
+}

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

@@ -0,0 +1,58 @@
+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 ProBasicProjectPlan extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    private String id;
+
+    /**
+     * 工程编号
+     */
+    private String projectId;
+
+    /**
+     * 计划发电量
+     */
+    private String generatingCapacity;
+
+    /**
+     * 计划停运小时
+     */
+    private BigDecimal outageHours;
+
+    /**
+     * 年
+     */
+    private String year;
+
+    /**
+     * 月
+     */
+    private String month;
+
+    /**
+     * 场站编号（冗余）
+     */
+    private String windpowerstationId;
+
+
+}

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

@@ -0,0 +1,87 @@
+package com.gyee.generation.model.auto;
+
+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 ProBasicRealtimeDbconfig extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    private String id;
+
+    /**
+     * 服务姓
+     */
+    private String surName;
+
+    /**
+     * 服务名(历史)
+     */
+    private String nameHist;
+
+    /**
+     * 服务名(配置)
+     */
+    private String nameCmcfg;
+
+    /**
+     * 服务名(实时)
+     */
+    private String nameRts;
+
+    /**
+     * 点标签
+     */
+    private String label;
+
+    /**
+     * 风场编号
+     */
+    private String windpowerstationId;
+
+    /**
+     * 端口(历史)
+     */
+    private String portHist;
+
+    /**
+     * 端口(配置)
+     */
+    private String portCmcfg;
+
+    /**
+     * 端口(实时)
+     */
+    private String portRts;
+
+    /**
+     * 地址(历史)
+     */
+    private String ipHist;
+
+    /**
+     * 地址(配置)
+     */
+    private String ipCmcfg;
+
+    /**
+     * 地址(实时)
+     */
+    private String ipRts;
+
+
+}

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

@@ -0,0 +1,138 @@
+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 ProBasicRegion 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 groupId;
+
+
+}

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

@@ -0,0 +1,57 @@
+package com.gyee.generation.model.auto;
+
+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 ProBasicSquare extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    private String id;
+
+    /**
+     * 编码
+     */
+    private String code;
+
+    /**
+     * 风场编号(冗余)
+     */
+    private String windpowerstationId;
+
+    /**
+     * 工程编号(冗余)
+     */
+    private String projectId;
+
+    /**
+     * 风电线编号
+     */
+    private String lineId;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 接入类型
+     */
+    private String types;
+
+
+}

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

@@ -0,0 +1,133 @@
+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 ProBasicWindpowerstation extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    private String id;
+
+    /**
+     * 编码
+     */
+    private String code;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 地址
+     */
+    private String address;
+
+    /**
+     * 电话
+     */
+    private String telephone;
+
+    /**
+     * 装机容量
+     */
+    private BigDecimal capacity;
+
+    /**
+     * 容量单位
+     */
+    private String capacityUnit;
+
+    /**
+     * 装机数量
+     */
+    private Integer quantity;
+
+    /**
+     * 别名
+     */
+    private String aname;
+
+    /**
+     * 地球经度
+     */
+    private BigDecimal longitude;
+
+    /**
+     * 地球纬度
+     */
+    private BigDecimal latitude;
+
+    /**
+     * 图片
+     */
+    private String photo;
+
+    /**
+     * 系统厂家
+     */
+    private String systemManufact;
+
+    /**
+     * 场长
+     */
+    private String headfarm;
+
+    /**
+     * 场长电话
+     */
+    private String headfarmPhone;
+
+    /**
+     * 机型
+     */
+    private String model;
+
+    /**
+     * 顺序
+     */
+    private Integer orderNum;
+
+    /**
+     * 海拔高度
+     */
+    private BigDecimal height;
+
+    /**
+     * 场站类型
+     */
+    private String windType;
+
+    /**
+     * 公司编号
+     */
+    private String companyId;
+
+    /**
+     * 区域编号
+     */
+    private String regionId;
+
+    /**
+     * 集团编号
+     */
+    private String groupId;
+
+
+}

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

@@ -0,0 +1,52 @@
+package com.gyee.generation.model.auto;
+
+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 ProBasicWindsubStation extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    private String id;
+
+    /**
+     * 编码
+     */
+    private String code;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 别名
+     */
+    private String aname;
+
+    /**
+     * 风场编号
+     */
+    private String windpowerstationId;
+
+    /**
+     * 顺序
+     */
+    private Integer orderNum;
+
+
+}

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

@@ -0,0 +1,101 @@
+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 石林
+ * @since 2022-10-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProBasicWindturbine extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    private String id;
+
+    /**
+     * 编码
+     */
+    private String code;
+
+    /**
+     * 场站编号(冗余)
+     */
+    private String windpowerstationId;
+
+    /**
+     * 地球经度
+     */
+    private Double longitude;
+
+    /**
+     * 地球纬度
+     */
+    private Double latitude;
+
+    /**
+     * 型号编号
+     */
+    private String modelId;
+
+    /**
+     * 状态
+     */
+    private String status;
+
+    /**
+     * 工程编号(冗余)
+     */
+    private String projectId;
+
+    /**
+     * 线路编号
+     */
+    private String lineId;
+
+    /**
+     * 首次并网时间
+     */
+    private Date firstIntegratedTime;
+
+    /**
+     * 图片
+     */
+    private String photo;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 是否是标杆设备
+     */
+    private Integer isStandard;
+
+    /**
+     * 区域编号
+     */
+    private String regionId;
+
+    /**
+     * 公司编号
+     */
+    private String companyId;
+
+
+}

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

@@ -0,0 +1,48 @@
+package com.gyee.generation.model.auto;
+
+
+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 ProBasicWindturbinePower extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    private String id;
+
+    /**
+     * 风机编号
+     */
+    private String windturbineId;
+
+    /**
+     * 场站编号
+     */
+    private String windpowerstationId;
+
+    /**
+     * 实时配置编号
+     */
+    private Double speed;
+
+    /**
+     * 理论功率
+     */
+    private Double theoryPower;
+
+
+}

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

@@ -0,0 +1,108 @@
+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 ProBasicWppoint extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    private String id;
+
+    /**
+     * 编码
+     */
+    private String code;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 型号
+     */
+    private String model;
+
+    /**
+     * 单位
+     */
+    private String valueUnit;
+
+    /**
+     * 英文名称
+     */
+    private String englishName;
+
+    /**
+     * 类型编号
+     */
+    private String typeId;
+
+    /**
+     * 所属型号
+     */
+    private String modelId;
+
+    /**
+     * 最大值
+     */
+    private BigDecimal maxval;
+
+    /**
+     * 最小值
+     */
+    private BigDecimal minval;
+
+    /**
+     * 合理最大值
+     */
+    private BigDecimal reasonableMaxval;
+
+    /**
+     * 合理最小值
+     */
+    private BigDecimal reasonableMinval;
+
+    /**
+     * 统一编码
+     */
+    private String uniformCode;
+
+    /**
+     * 短ID
+     */
+    private String shortId;
+
+    /**
+     * 长ID
+     */
+    private String longId;
+
+    /**
+     * 场站编号
+     */
+    private String windpowerstationId;
+
+    /**
+     * 实时配置编号
+     */
+    private String realtimeId;
+
+
+}

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

@@ -0,0 +1,88 @@
+package com.gyee.generation.model.auto;
+
+
+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 ProEconEquipmentmodel extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    private String id;
+
+    /**
+     * 编码
+     */
+    private String code;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 描述
+     */
+    private String description;
+
+    /**
+     * 容量
+     */
+    private Double powerProduction;
+
+    /**
+     * 厂商编号
+     */
+    private String windturbineManufacturerId;
+
+    /**
+     * 图片
+     */
+    private String photo;
+
+    /**
+     * 传输总发电量单位
+     */
+    private String unit;
+
+    /**
+     * 切入风速
+     */
+    private Double cutinwindSpeed;
+
+    /**
+     * 额定风速
+     */
+    private Double ratedwindSpeed;
+
+    /**
+     * 切出风速
+     */
+    private String cutoutwindSpeed;
+
+    /**
+     * 叶片切入面积
+     */
+    private Double sweptArea;
+
+    /**
+     * 设备类别
+     */
+    private Integer equipmentCategory;
+
+
+}

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

@@ -0,0 +1,47 @@
+package com.gyee.generation.model.auto;
+
+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 ProEconManufacturer extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    private String id;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 国家地区
+     */
+    private String country;
+
+    /**
+     * 地址
+     */
+    private String address;
+
+    /**
+     * 电话
+     */
+    private String telephone;
+
+
+}

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

@@ -0,0 +1,99 @@
+package com.gyee.generation.model.auto;
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * <p>
+ * 电计量点值表
+ * </p>
+ *
+ * @author 石林
+ * @since 2022-10-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProEconMeterPointValue extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    private Integer id;
+
+    /**
+     * 时间
+     */
+    private Date recordDate;
+
+    /**
+     * 电计量编号
+     */
+    private String meterId;
+
+    /**
+     * 年初底码
+     */
+    private Double year;
+
+    /**
+     * 月初底码
+     */
+    private Double month;
+
+    /**
+     * 昨日底码
+     */
+    private Double day;
+
+    /**
+     * 当日底码
+     */
+    private Double now;
+
+    /**
+     * 总值
+     */
+    private Double totalValue;
+
+    /**
+     * 年值
+     */
+    private Double yearValue;
+
+    /**
+     * 月值
+     */
+    private Double monthValue;
+
+    /**
+     * 日值
+     */
+    private Double dayValue;
+
+    /**
+     * 年初底码2
+     */
+    private Double year4;
+
+    /**
+     * 月初底码2
+     */
+    private Double month4;
+
+    /**
+     * 昨日底码2
+     */
+    private Double day4;
+
+    /**
+     * 当日底码2
+     */
+    private Double now4;
+
+
+}

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

@@ -0,0 +1,48 @@
+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 ProEconModelPower extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    private String id;
+
+    /**
+     * 型号编号
+     */
+    private String modelId;
+
+    /**
+     * 风速/光照度
+     */
+    private BigDecimal speed;
+
+    /**
+     * 稳态功率（相当于理论）
+     */
+    private BigDecimal theoryPower;
+
+    /**
+     * 动态功率（保证功率）
+     */
+    private BigDecimal ensurePower;
+
+
+}

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

@@ -0,0 +1,119 @@
+package com.gyee.generation.model.auto;
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * <p>
+ * 停机事件
+ * </p>
+ *
+ * @author 石林
+ * @since 2022-10-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProEconShutdownevent 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 warningId;
+
+    /**
+     * 工程编号
+     */
+    private String projectId;
+
+    /**
+     * 处理方式
+     */
+    private String handleWay;
+
+    /**
+     * 故障现象
+     */
+    private String faultView;
+
+    /**
+     * 风机状态
+     */
+    private Integer statusCode;
+
+    /**
+     * 限电主表ID
+     */
+    private String mainId;
+
+    /**
+     * 复位及时
+     */
+    private String resetRate;
+
+    /**
+     * 状态转换及时
+     */
+    private String stateRate;
+
+    /**
+     * 故障消缺及时
+     */
+    private String failRate;
+
+    /**
+     * 报警记录编号
+     */
+    private Integer warningRecordsId;
+
+
+}

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

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

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

@@ -1,66 +0,0 @@
-package com.gyee.generation.model.auto;
-
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.Value;
-import org.springframework.data.annotation.Id;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author 谢生杰
- * @since 2022-07-29
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class Shutdownevent extends Model {
-
-    private static final long serialVersionUID = 1L;
-    @TableId(value = "id",type = IdType.INPUT)
-    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 warningid;
-
-    private String projectid;
-
-    private String handleway;
-
-    private String faultview;
-
-    private Integer statuscode;
-
-    private String mainid;
-
-    private String resetrate;
-
-    private String staterate;
-
-    private String failrate;
-
-    private Integer warningrecordsid;
-
-
-}

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

@@ -1,86 +0,0 @@
-package com.gyee.generation.model.auto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author 谢生杰
- * @since 2022-02-28
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("WINDPOWERSTATION")
-public class Windpowerstation extends Model {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId("ID")
-    private String id;
-
-    @TableField("CODE")
-    private String code;
-
-    @TableField("NAME")
-    private String name;
-
-    @TableField("ADDRESS")
-    private String address;
-
-    @TableField("TELEPHONE")
-    private String telephone;
-
-    @TableField("CAPACITY")
-    private Double capacity;
-
-    @TableField("CAPACITYUNIT")
-    private String capacityunit;
-
-    @TableField("QUANTITY")
-    private Double quantity;
-
-    @TableField("ANAME")
-    private String aname;
-
-    @TableField("LONGITUDE")
-    private Double longitude;
-
-    @TableField("LATITUDE")
-    private Double latitude;
-
-    @TableField("PHOTO")
-    private String photo;
-
-    @TableField("COMPANYID")
-    private String companyid;
-
-    @TableField("SYSTEMMANUFACT")
-    private String systemmanufact;
-
-    @TableField("HEADFARM")
-    private String headfarm;
-
-    @TableField("HEADFARMPHONE")
-    private String headfarmphone;
-
-    @TableField("MODEL")
-    private String model;
-
-    @TableField("ORDERNUM")
-    private Double ordernum;
-
-    @TableField("ALTITUDE")
-    private Double altitude;
-
-    @TableField("HEIGHT")
-    private Double height;
-
-
-}

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

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

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

@@ -1,67 +0,0 @@
-package com.gyee.generation.model.auto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author 谢生杰
- * @since 2022-02-28
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("WINDTURBINE")
-public class Windturbine extends Model {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId("ID")
-    private String id;
-
-    @TableField("CODE")
-    private String code;
-
-    @TableField("WINDPOWERSTATIONID")
-    private String windpowerstationid;
-
-    @TableField("LONGITUDE")
-    private Double longitude;
-
-    @TableField("LATITUDE")
-    private Double latitude;
-
-    @TableField("MODELID")
-    private String modelid;
-
-    @TableField("STATUS")
-    private String status;
-
-    @TableField("PROJECTID")
-    private String projectid;
-
-    @TableField("LINEID")
-    private String lineid;
-
-    @TableField("FIRSTINTEGRATEDTIME")
-    private Date firstintegratedtime;
-
-    @TableField("PHOTO")
-    private String photo;
-
-    @TableField("NAME")
-    private String name;
-
-    @TableField("STANDARDID")
-    private String standardid;
-
-
-}

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

@@ -1,34 +0,0 @@
-package com.gyee.generation.model.auto;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author 谢生杰
- * @since 2022-04-26
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class Windturbinepower extends Model {
-
-    private static final long serialVersionUID = 1L;
-    @TableId(value = "ID",type = IdType.INPUT)
-    private String id;
-
-    private String windturbineid;
-
-    private String windpowerstationid;
-
-    private Double speed;
-
-    private Double theorypower;
-
-
-}

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

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

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

@@ -25,16 +25,16 @@ public class AverageAndGeneratingService {
     private Date monthFirstZero;
     private Date yearFirstZero;
     private Date currentDate;
-    private List<Windpowerstation> wpls;
-    private Map<String, List<Project>> wppromap;
-    private Map<String, List<Line>> prolinemap;
-    private Map<String, List<Windturbine>> linewtmap;
+    private List<ProBasicWindpowerstation> wpls;
+    private Map<String, List<ProBasicProject>> wppromap;
+    private Map<String, List<ProBasicLine>> prolinemap;
+    private Map<String, List<ProBasicWindturbine>> linewtmap;
     private Date tomorrow;
-    private List<Windturbine> wtls;
-    private Map<String, Map<String, Windpowerstationpointnew>> wppointmap;
-    private Map<String, Map<String, Windpowerstationpointnew>> linepointmap;
-    private Map<String, Map<String, Windpowerstationpointnew>> propointmap;
-    private Map<String, Map<String, Windturbinetestingpointnew>> wtpAimap;
+    private List<ProBasicWindturbine> wtls;
+    private Map<String, Map<String, ProBasicWppoint>> wppointmap;
+    private Map<String, Map<String, ProBasicWppoint>> linepointmap;
+    private Map<String, Map<String, ProBasicWppoint>> propointmap;
+    private Map<String, Map<String, ProBasicEquipmentPoint>> wtpAimap;
     @Resource
     private IEdosUtil edosUtil;
     @Value("${typeOfElectric.direct}")
@@ -67,22 +67,22 @@ public class AverageAndGeneratingService {
         List<PointData> resultList = new ArrayList<>();
         String monthbenchPoints = Contant.monthbenchPoints;
         wpls.stream().forEach(wp->{
-            List<Project> projects = wppromap.get(wp.getId());
-            Map<String, Windpowerstationpointnew> wppointnewmap = wppointmap.get(wp.getId());
-            Windpowerstationpointnew wppointnew = wppointnewmap.get(Contant.RPJFS);
-            Windpowerstationpointnew ywppointnew = wppointnewmap.get(Contant.YPJFS);
-            Windpowerstationpointnew nwppointnew = wppointnewmap.get(Contant.NPJFS);
-            Windpowerstationpointnew powerwppointnew = wppointnewmap.get(Contant.RPJGL);
-            Windpowerstationpointnew ypowerwppointnew = wppointnewmap.get(Contant.YPJGL);
-            Windpowerstationpointnew npowerwppointnew = wppointnewmap.get(Contant.NPJGL);
-            Windpowerstationpointnew fdlwppointnew = wppointnewmap.get(Contant.RFDL);
-            Windpowerstationpointnew yfdlwppointnew = wppointnewmap.get(Contant.YFDL);
-            Windpowerstationpointnew nfdlwppointnew = wppointnewmap.get(Contant.NFDL);
-            Windpowerstationpointnew fnlylwppointnew = wppointnewmap.get(Contant.FNLYL);
-            Windpowerstationpointnew jpeyhlwppointnew = wppointnewmap.get(Contant.JPEYHL);
-            Windpowerstationpointnew jpeyhtwppointnew = wppointnewmap.get(Contant.JPEYHT);
-            Windpowerstationpointnew jybmwppointnew = wppointnewmap.get(Contant.JYBM);
-            Windpowerstationpointnew jyswppointnew = wppointnewmap.get(Contant.JYS);
+            List<ProBasicProject> projects = wppromap.get(wp.getId());
+            Map<String, ProBasicWppoint> wppointnewmap = wppointmap.get(wp.getId());
+            ProBasicWppoint wppointnew = wppointnewmap.get(Contant.RPJFS);
+            ProBasicWppoint ywppointnew = wppointnewmap.get(Contant.YPJFS);
+            ProBasicWppoint nwppointnew = wppointnewmap.get(Contant.NPJFS);
+            ProBasicWppoint powerwppointnew = wppointnewmap.get(Contant.RPJGL);
+            ProBasicWppoint ypowerwppointnew = wppointnewmap.get(Contant.YPJGL);
+            ProBasicWppoint npowerwppointnew = wppointnewmap.get(Contant.NPJGL);
+            ProBasicWppoint fdlwppointnew = wppointnewmap.get(Contant.RFDL);
+            ProBasicWppoint yfdlwppointnew = wppointnewmap.get(Contant.YFDL);
+            ProBasicWppoint nfdlwppointnew = wppointnewmap.get(Contant.NFDL);
+            ProBasicWppoint fnlylwppointnew = wppointnewmap.get(Contant.FNLYL);
+            ProBasicWppoint jpeyhlwppointnew = wppointnewmap.get(Contant.JPEYHL);
+            ProBasicWppoint jpeyhtwppointnew = wppointnewmap.get(Contant.JPEYHT);
+            ProBasicWppoint jybmwppointnew = wppointnewmap.get(Contant.JYBM);
+            ProBasicWppoint jyswppointnew = wppointnewmap.get(Contant.JYS);
 
             List<PointData> projectavespeedList = new ArrayList<>();
             List<PointData> yprojectavespeedList = new ArrayList<>();
@@ -94,23 +94,23 @@ public class AverageAndGeneratingService {
             List<PointData> projectyfdlList = new ArrayList<>();
             List<PointData> projectnfdlList = new ArrayList<>();
             projects.stream().forEach(project -> {
-                List<Line> lines = prolinemap.get(project.getId());
-                Map<String, Windpowerstationpointnew> projectpointnewmap = propointmap.get(project.getId());
-                Windpowerstationpointnew projectpointnew = projectpointnewmap.get(Contant.RPJFS);
-                Windpowerstationpointnew yprojectpointnew = projectpointnewmap.get(Contant.YPJFS);
-                Windpowerstationpointnew nprojectpointnew = projectpointnewmap.get(Contant.NPJFS);
-                Windpowerstationpointnew powerprojectpointnew = projectpointnewmap.get(Contant.RPJGL);
-                Windpowerstationpointnew ypowerprojectpointnew = projectpointnewmap.get(Contant.YPJGL);
-                Windpowerstationpointnew npowerprojectpointnew = projectpointnewmap.get(Contant.NPJGL);
-                Windpowerstationpointnew fdlprojectpointnew = projectpointnewmap.get(Contant.RFDL);
-                Windpowerstationpointnew yfdlprojectpointnew = projectpointnewmap.get(Contant.YFDL);
-                Windpowerstationpointnew nfdlprojectpointnew = projectpointnewmap.get(Contant.NFDL);
-                Windpowerstationpointnew fnlylprojectpointnew = projectpointnewmap.get(Contant.FNLYL);
-
-                Windpowerstationpointnew jpeyhlprojectpointnew = projectpointnewmap.get(Contant.JPEYHL);
-                Windpowerstationpointnew jpeyhtprojectpointnew = projectpointnewmap.get(Contant.JPEYHT);
-                Windpowerstationpointnew jybmprojectpointnew = projectpointnewmap.get(Contant.JYBM);
-                Windpowerstationpointnew jysprojectpointnew = projectpointnewmap.get(Contant.JYS);
+                List<ProBasicLine> lines = prolinemap.get(project.getId());
+                Map<String, ProBasicWppoint> projectpointnewmap = propointmap.get(project.getId());
+                ProBasicWppoint projectpointnew = projectpointnewmap.get(Contant.RPJFS);
+                ProBasicWppoint yprojectpointnew = projectpointnewmap.get(Contant.YPJFS);
+                ProBasicWppoint nprojectpointnew = projectpointnewmap.get(Contant.NPJFS);
+                ProBasicWppoint powerprojectpointnew = projectpointnewmap.get(Contant.RPJGL);
+                ProBasicWppoint ypowerprojectpointnew = projectpointnewmap.get(Contant.YPJGL);
+                ProBasicWppoint npowerprojectpointnew = projectpointnewmap.get(Contant.NPJGL);
+                ProBasicWppoint fdlprojectpointnew = projectpointnewmap.get(Contant.RFDL);
+                ProBasicWppoint yfdlprojectpointnew = projectpointnewmap.get(Contant.YFDL);
+                ProBasicWppoint nfdlprojectpointnew = projectpointnewmap.get(Contant.NFDL);
+                ProBasicWppoint fnlylprojectpointnew = projectpointnewmap.get(Contant.FNLYL);
+
+                ProBasicWppoint jpeyhlprojectpointnew = projectpointnewmap.get(Contant.JPEYHL);
+                ProBasicWppoint jpeyhtprojectpointnew = projectpointnewmap.get(Contant.JPEYHT);
+                ProBasicWppoint jybmprojectpointnew = projectpointnewmap.get(Contant.JYBM);
+                ProBasicWppoint jysprojectpointnew = projectpointnewmap.get(Contant.JYS);
 
                 List<PointData> lineavespeedList = new ArrayList<>();
                 List<PointData> ylineavespeedList = new ArrayList<>();
@@ -122,23 +122,23 @@ public class AverageAndGeneratingService {
                 List<PointData> ylinefdlList = new ArrayList<>();
                 List<PointData> nlinefdlList = new ArrayList<>();
                 lines.stream().forEach(line -> {
-                    List<Windturbine> windturbines = linewtmap.get(line.getId());
-                    Map<String, Windpowerstationpointnew> linepointnewmap = linepointmap.get(line.getId());
-                    Windpowerstationpointnew linepointnew = linepointnewmap.get(Contant.RPJFS);
-                    Windpowerstationpointnew ylinepointnew = linepointnewmap.get(Contant.YPJFS);
-                    Windpowerstationpointnew nlinepointnew = linepointnewmap.get(Contant.NPJFS);
-                    Windpowerstationpointnew linepowerpointnew = linepointnewmap.get(Contant.RPJGL);
-                    Windpowerstationpointnew ylinepowerpointnew = linepointnewmap.get(Contant.YPJGL);
-                    Windpowerstationpointnew nlinepowerpointnew = linepointnewmap.get(Contant.NPJGL);
-                    Windpowerstationpointnew linefdlpointnew = linepointnewmap.get(Contant.RFDL);
-                    Windpowerstationpointnew ylinefdlpointnew = linepointnewmap.get(Contant.YFDL);
-                    Windpowerstationpointnew nlinefdlpointnew = linepointnewmap.get(Contant.NFDL);
-                    Windpowerstationpointnew linefnlylpointnew = linepointnewmap.get(Contant.FNLYL);
-
-                    Windpowerstationpointnew jpeyhlpointnew = linepointnewmap.get(Contant.JPEYHL);
-                    Windpowerstationpointnew jpeyhtpointnew = linepointnewmap.get(Contant.JPEYHT);
-                    Windpowerstationpointnew jybmpointnew = linepointnewmap.get(Contant.JYBM);
-                    Windpowerstationpointnew jyspointnew = linepointnewmap.get(Contant.JYS);
+                    List<ProBasicWindturbine> windturbines = linewtmap.get(line.getId());
+                    Map<String, ProBasicWppoint> linepointnewmap = linepointmap.get(line.getId());
+                    ProBasicWppoint linepointnew = linepointnewmap.get(Contant.RPJFS);
+                    ProBasicWppoint ylinepointnew = linepointnewmap.get(Contant.YPJFS);
+                    ProBasicWppoint nlinepointnew = linepointnewmap.get(Contant.NPJFS);
+                    ProBasicWppoint linepowerpointnew = linepointnewmap.get(Contant.RPJGL);
+                    ProBasicWppoint ylinepowerpointnew = linepointnewmap.get(Contant.YPJGL);
+                    ProBasicWppoint nlinepowerpointnew = linepointnewmap.get(Contant.NPJGL);
+                    ProBasicWppoint linefdlpointnew = linepointnewmap.get(Contant.RFDL);
+                    ProBasicWppoint ylinefdlpointnew = linepointnewmap.get(Contant.YFDL);
+                    ProBasicWppoint nlinefdlpointnew = linepointnewmap.get(Contant.NFDL);
+                    ProBasicWppoint linefnlylpointnew = linepointnewmap.get(Contant.FNLYL);
+
+                    ProBasicWppoint jpeyhlpointnew = linepointnewmap.get(Contant.JPEYHL);
+                    ProBasicWppoint jpeyhtpointnew = linepointnewmap.get(Contant.JPEYHT);
+                    ProBasicWppoint jybmpointnew = linepointnewmap.get(Contant.JYBM);
+                    ProBasicWppoint jyspointnew = linepointnewmap.get(Contant.JYS);
 
                     List<PointData> wtavespeedList = new ArrayList<>();
                     List<PointData> ywtavespeedList = new ArrayList<>();
@@ -151,27 +151,27 @@ public class AverageAndGeneratingService {
                     List<PointData> nfdlList = new ArrayList<>();
 
                     windturbines.stream().forEach(wt->{
-                        Map<String, Windturbinetestingpointnew> windturbinetestingpointnewMap = wtpAimap.get(wt.getId());
-                        Windturbinetestingpointnew aveSpeedPoint = windturbinetestingpointnewMap.get(Contant.RPJFS);
-                        Windturbinetestingpointnew monthAveSpeedPoint = windturbinetestingpointnewMap.get(Contant.YPJFS);
-                        Windturbinetestingpointnew yearAveSpeedPoint = windturbinetestingpointnewMap.get(Contant.NPJFS);
-                        Windturbinetestingpointnew fjssfs = windturbinetestingpointnewMap.get(Contant.AI022);
-                        Windturbinetestingpointnew avePowerPoint = windturbinetestingpointnewMap.get(Contant.RPJGL);
-                        Windturbinetestingpointnew yavePowerPoint = windturbinetestingpointnewMap.get(Contant.YPJGL);
-                        Windturbinetestingpointnew navePowerPoint = windturbinetestingpointnewMap.get(Contant.NPJGL);
-                        Windturbinetestingpointnew fjssgl = windturbinetestingpointnewMap.get(Contant.AI130);
-                        Windturbinetestingpointnew ai064 = windturbinetestingpointnewMap.get(Contant.AI064);
-                        Windturbinetestingpointnew fjfdl = windturbinetestingpointnewMap.get(Contant.RFDL);
-                        Windturbinetestingpointnew fjyfdl = windturbinetestingpointnewMap.get(Contant.YFDL);
-                        Windturbinetestingpointnew fjnfdl = windturbinetestingpointnewMap.get(Contant.NFDL);
-                        Windturbinetestingpointnew ai138 = windturbinetestingpointnewMap.get(Contant.AI138);
-                        Windturbinetestingpointnew ai139 = windturbinetestingpointnewMap.get(Contant.AI139);
+                        Map<String, ProBasicEquipmentPoint> windturbinetestingpointnewMap = wtpAimap.get(wt.getId());
+                        ProBasicEquipmentPoint aveSpeedPoint = windturbinetestingpointnewMap.get(Contant.RPJFS);
+                        ProBasicEquipmentPoint monthAveSpeedPoint = windturbinetestingpointnewMap.get(Contant.YPJFS);
+                        ProBasicEquipmentPoint yearAveSpeedPoint = windturbinetestingpointnewMap.get(Contant.NPJFS);
+                        ProBasicEquipmentPoint fjssfs = windturbinetestingpointnewMap.get(Contant.AI022);
+                        ProBasicEquipmentPoint avePowerPoint = windturbinetestingpointnewMap.get(Contant.RPJGL);
+                        ProBasicEquipmentPoint yavePowerPoint = windturbinetestingpointnewMap.get(Contant.YPJGL);
+                        ProBasicEquipmentPoint navePowerPoint = windturbinetestingpointnewMap.get(Contant.NPJGL);
+                        ProBasicEquipmentPoint fjssgl = windturbinetestingpointnewMap.get(Contant.AI130);
+                        ProBasicEquipmentPoint ai064 = windturbinetestingpointnewMap.get(Contant.AI064);
+                        ProBasicEquipmentPoint fjfdl = windturbinetestingpointnewMap.get(Contant.RFDL);
+                        ProBasicEquipmentPoint fjyfdl = windturbinetestingpointnewMap.get(Contant.YFDL);
+                        ProBasicEquipmentPoint fjnfdl = windturbinetestingpointnewMap.get(Contant.NFDL);
+                        ProBasicEquipmentPoint ai138 = windturbinetestingpointnewMap.get(Contant.AI138);
+                        ProBasicEquipmentPoint ai139 = windturbinetestingpointnewMap.get(Contant.AI139);
                         try {
                             //算发电量
                             Double rfdl = 0.0;
                             Double yfdl = 0.0;
                             Double nfdl = 0.0;
-                            if (direct.contains(wt.getProjectid())){
+                            if (direct.contains(wt.getProjectId())){
                                 rfdl = edosUtil.getSectionData(ai064,tomorrow.getTime()).getPointValueInDouble();
                                 yfdl = edosUtil.getSectionData(ai138,tomorrow.getTime()).getPointValueInDouble();
                                 nfdl = edosUtil.getSectionData(ai139,tomorrow.getTime()).getPointValueInDouble();
@@ -500,7 +500,7 @@ public class AverageAndGeneratingService {
         edosUtil.sendMultiPoint(resultList);
     }
 
-    private PointData createPointData(Windturbinetestingpointnew fjfdl, Double rfdl) {
+    private PointData createPointData(ProBasicEquipmentPoint fjfdl, Double rfdl) {
         PointData pointData = new PointData();
         pointData.setEdnaId(fjfdl.getCode());
         pointData.setPointName(fjfdl.getName());
@@ -510,7 +510,7 @@ public class AverageAndGeneratingService {
         return pointData;
     }
 
-    private PointData createWpPointData(Windpowerstationpointnew linepointnew, double linespeed) {
+    private PointData createWpPointData(ProBasicWppoint linepointnew, double linespeed) {
         PointData pointData = new PointData();
         pointData.setEdnaId(linepointnew.getCode());
         pointData.setPointTime(currentDate.getTime());
@@ -520,7 +520,7 @@ public class AverageAndGeneratingService {
         return pointData;
     }
 
-    private void createWtPointData(Windturbinetestingpointnew aveSpeedPoint, PointData pointData, double inDouble) {
+    private void createWtPointData(ProBasicEquipmentPoint aveSpeedPoint, PointData pointData, double inDouble) {
         pointData.setEdnaId(aveSpeedPoint.getCode());
         pointData.setPointName(aveSpeedPoint.getName());
         pointData.setPointValueInDouble(inDouble);

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

@@ -1,7 +1,6 @@
 package com.gyee.generation.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.gyee.common.contant.Contant;
 import com.gyee.common.model.PointData;
 import com.gyee.common.model.StringUtils;
@@ -9,7 +8,7 @@ import com.gyee.common.util.CommonUtils;
 import com.gyee.common.util.DateUtils;
 import com.gyee.generation.init.CacheContext;
 import com.gyee.generation.model.auto.*;
-import com.gyee.generation.service.auto.IShutdowneventService;
+import com.gyee.generation.service.auto.IProEconShutdowneventService;
 import com.gyee.generation.util.realtimesource.IEdosUtil;
 import org.springframework.stereotype.Service;
 
@@ -28,20 +27,20 @@ import java.util.stream.Collectors;
 public class FiveLossesService {
     @Resource
     private IEdosUtil edosUtil;
-    private List<Windturbine> wtls;
-    private Map<String, Map<String, Windturbinetestingpointnew>> wtpAimap;
+    private List<ProBasicWindturbine> wtls;
+    private Map<String, Map<String, ProBasicEquipmentPoint>> wtpAimap;
     private Date samedayZero;
     private Date currentDate;
     private Date tomorrow;
-    private List<Windpowerstation> wpls;
-    private Map<String, List<Project>> wppromap;
-    private Map<String, List<Line>> prolinemap;
-    private Map<String, List<Windturbine>> linewtmap;
-    private Map<String, Map<String, Windpowerstationpointnew>> wppointmap;
-    private Map<String, Map<String, Windpowerstationpointnew>> linepointmap;
-    private Map<String, Map<String, Windpowerstationpointnew>> propointmap;
+    private List<ProBasicWindpowerstation> wpls;
+    private Map<String, List<ProBasicProject>> wppromap;
+    private Map<String, List<ProBasicLine>> prolinemap;
+    private Map<String, List<ProBasicWindturbine>> linewtmap;
+    private Map<String, Map<String, ProBasicWppoint>> wppointmap;
+    private Map<String, Map<String, ProBasicWppoint>> linepointmap;
+    private Map<String, Map<String, ProBasicWppoint>> propointmap;
     @Resource
-    private IShutdowneventService shutdowneventService;
+    private IProEconShutdowneventService proEconShutdowneventService;
 
     private void init(){
         wpls = CacheContext.wpls;
@@ -72,26 +71,26 @@ public class FiveLossesService {
     public void saveShutdownevent(){
         init();
         List<PointData> resultList = new ArrayList<>();
-        QueryWrapper<Shutdownevent> qw = new QueryWrapper<>();
+        QueryWrapper<ProEconShutdownevent> qw = new QueryWrapper<>();
         qw.isNull("starttime");
         qw.isNotNull("stoptime");
         //查出有故障但没恢复的事件
-        List<Shutdownevent> shutdownevents = shutdowneventService.list(qw);
+        List<ProEconShutdownevent> shutdownevents = proEconShutdowneventService.list(qw);
         List<String> faultWinturbines = null;
         List<String> mainWinturbines = null;
         if (StringUtils.isNotEmpty(shutdownevents)){
-            faultWinturbines = shutdownevents.stream().filter(i->i.getStatuscode()==2).map(s -> s.getWindturbineid()).collect(Collectors.toList());
-            mainWinturbines = shutdownevents.stream().filter(i->i.getStatuscode()==4).map(s -> s.getWindturbineid()).collect(Collectors.toList());
+            faultWinturbines = shutdownevents.stream().filter(i->i.getStatusCode()==2).map(s -> s.getWindturbineId()).collect(Collectors.toList());
+            mainWinturbines = shutdownevents.stream().filter(i->i.getStatusCode()==4).map(s -> s.getWindturbineId()).collect(Collectors.toList());
         }
 
         List<String> finalFaultWinturbines = faultWinturbines;
         List<String> finalMainWinturbines = mainWinturbines;
         wtls.stream().forEach(wt->{
-            Map<String, Windturbinetestingpointnew> windturbinetestingpointnewMap = wtpAimap.get(wt.getId());
-            Windturbinetestingpointnew ztmxPoint = windturbinetestingpointnewMap.get(Contant.ZTMX);
-            Windturbinetestingpointnew bzglPoint = windturbinetestingpointnewMap.get(Contant.BZGL);
-            Windturbinetestingpointnew zsglPoint = windturbinetestingpointnewMap.get(Contant.ZSGL);
-            Windturbinetestingpointnew powerPoint = windturbinetestingpointnewMap.get(Contant.AI130);
+            Map<String, ProBasicEquipmentPoint> windturbinetestingpointnewMap = wtpAimap.get(wt.getId());
+            ProBasicEquipmentPoint ztmxPoint = windturbinetestingpointnewMap.get(Contant.ZTMX);
+            ProBasicEquipmentPoint bzglPoint = windturbinetestingpointnewMap.get(Contant.BZGL);
+            ProBasicEquipmentPoint zsglPoint = windturbinetestingpointnewMap.get(Contant.ZSGL);
+            ProBasicEquipmentPoint powerPoint = windturbinetestingpointnewMap.get(Contant.AI130);
             PointData sectionData = null;
             try {
                 sectionData = edosUtil.getSectionData(ztmxPoint, tomorrow.getTime());
@@ -102,14 +101,14 @@ public class FiveLossesService {
             if (StringUtils.isNotEmpty(finalFaultWinturbines) && finalFaultWinturbines.contains(wt.getId())){    //此风机在之前故障未恢复列表
                     if (fjzt!=6){
                         //将时间存储到结束时间，算时间与电量
-                        Optional<Shutdownevent> first = shutdownevents.stream().filter(i -> i.getWindturbineid().equals(wt.getId())).findFirst();
+                        Optional<ProEconShutdownevent> first = shutdownevents.stream().filter(i -> i.getWindturbineId().equals(wt.getId())).findFirst();
                         if (first.isPresent()){
-                            Shutdownevent shutdownevent = first.get();
+                            ProEconShutdownevent shutdownevent = first.get();
                             Date starttime = DateUtils.parseLongToDate(sectionData.getPointTime()*1000);
-                            shutdownevent.setStarttime(starttime);
-                            Date stoptime = shutdownevent.getStoptime();
+                            shutdownevent.setStartTime(starttime);
+                            Date stoptime = shutdownevent.getStopTime();
                             double hour = DateUtils.hoursDiff2(stoptime, starttime);
-                            shutdownevent.setStophours(hour);
+                            shutdownevent.setStopHours(hour);
 
                             List<PointData> ztmxDatasSnap = null;
                             List<PointData> bzglDatasSnap = null;
@@ -128,33 +127,33 @@ public class FiveLossesService {
                                 double gzss = generalLoss(ztmxDatasSnap, bzglDatasSnap, zsglDatasSnap, powerDatasSnap, 6.0, resultList, windturbinetestingpointnewMap.get(Contant.WTRGZSSDL));
                                 shutdownevent.setLosspower(gzss);
                             }
-                            shutdowneventService.saveOrUpdate(shutdownevent);
+                            proEconShutdowneventService.saveOrUpdate(shutdownevent);
                         }
                     }
                     if (fjzt==8){
-                        Shutdownevent shutdownevent = new Shutdownevent();
+                        ProEconShutdownevent shutdownevent = new ProEconShutdownevent();
                         shutdownevent.setId(CommonUtils.getUUID());
-                        shutdownevent.setWindpowerstationid(wt.getWindpowerstationid());
-                        shutdownevent.setWindturbineid(wt.getId());
+                        shutdownevent.setWindpowerstationId(wt.getWindpowerstationId());
+                        shutdownevent.setWindturbineId(wt.getId());
                         Date date = DateUtils.parseLongToDate(sectionData.getPointTime()*1000);
-                        shutdownevent.setStoptime(date);
-                        shutdownevent.setProjectid(wt.getProjectid());
-                        shutdownevent.setStatuscode(4);
-                        shutdowneventService.save(shutdownevent);
+                        shutdownevent.setStopTime(date);
+                        shutdownevent.setProjectId(wt.getProjectId());
+                        shutdownevent.setStatusCode(4);
+                        proEconShutdowneventService.save(shutdownevent);
                     }
                 }
 
             else if (StringUtils.isNotEmpty(finalMainWinturbines) && finalMainWinturbines.contains(wt.getId())){    //此风机在之前故障未恢复列表
                 if (fjzt!=8){
                     //将时间存储到结束时间，算时间与电量
-                    Optional<Shutdownevent> first = shutdownevents.stream().filter(i -> i.getWindturbineid().equals(wt.getId())).findFirst();
+                    Optional<ProEconShutdownevent> first = shutdownevents.stream().filter(i -> i.getWindturbineId().equals(wt.getId())).findFirst();
                     if (first.isPresent()){
-                        Shutdownevent shutdownevent = first.get();
+                        ProEconShutdownevent shutdownevent = first.get();
                         Date starttime = DateUtils.parseLongToDate(sectionData.getPointTime()*1000);
-                        shutdownevent.setStarttime(starttime);
-                        Date stoptime = shutdownevent.getStoptime();
+                        shutdownevent.setStartTime(starttime);
+                        Date stoptime = shutdownevent.getStopTime();
                         double hour = DateUtils.hoursDiff2(stoptime, starttime);
-                        shutdownevent.setStophours(hour);
+                        shutdownevent.setStopHours(hour);
 
                         List<PointData> ztmxDatasSnap = null;
                         List<PointData> bzglDatasSnap = null;
@@ -173,37 +172,37 @@ public class FiveLossesService {
                             double jxss = generalLoss(ztmxDatasSnap, bzglDatasSnap, zsglDatasSnap, powerDatasSnap, 8.0, resultList, windturbinetestingpointnewMap.get(Contant.WTRJXSSDL));
                             shutdownevent.setLosspower(jxss);
                         }
-                        shutdowneventService.saveOrUpdate(shutdownevent);
+                        proEconShutdowneventService.saveOrUpdate(shutdownevent);
                     }
                 }
                 if (fjzt==6){
-                    Shutdownevent shutdownevent = new Shutdownevent();
+                    ProEconShutdownevent shutdownevent = new ProEconShutdownevent();
                     shutdownevent.setId(CommonUtils.getUUID());
-                    shutdownevent.setWindpowerstationid(wt.getWindpowerstationid());
-                    shutdownevent.setWindturbineid(wt.getId());
+                    shutdownevent.setWindpowerstationId(wt.getWindpowerstationId());
+                    shutdownevent.setWindturbineId(wt.getId());
                     Date date = DateUtils.parseLongToDate(sectionData.getPointTime()*1000);
-                    shutdownevent.setStoptime(date);
-                    shutdownevent.setProjectid(wt.getProjectid());
-                    shutdownevent.setStatuscode(2);
-                    shutdowneventService.save(shutdownevent);
+                    shutdownevent.setStopTime(date);
+                    shutdownevent.setProjectId(wt.getProjectId());
+                    shutdownevent.setStatusCode(2);
+                    proEconShutdowneventService.save(shutdownevent);
                 }
             }
 
             else { //没有没结束的故障维护事件
                 if (fjzt==6 || fjzt==8){
-                    Shutdownevent shutdownevent = new Shutdownevent();
+                    ProEconShutdownevent shutdownevent = new ProEconShutdownevent();
                     shutdownevent.setId(CommonUtils.getUUID());
-                    shutdownevent.setWindpowerstationid(wt.getWindpowerstationid());
-                    shutdownevent.setWindturbineid(wt.getId());
+                    shutdownevent.setWindpowerstationId(wt.getWindpowerstationId());
+                    shutdownevent.setWindturbineId(wt.getId());
                     Date date = DateUtils.parseLongToDate(sectionData.getPointTime()*1000);
-                    shutdownevent.setStoptime(date);
-                    shutdownevent.setProjectid(wt.getProjectid());
+                    shutdownevent.setStopTime(date);
+                    shutdownevent.setProjectId(wt.getProjectId());
                     if (fjzt == 6){
-                        shutdownevent.setStatuscode(2);
+                        shutdownevent.setStatusCode(2);
                     }else {
-                        shutdownevent.setStatuscode(4);
+                        shutdownevent.setStatusCode(4);
                     }
-                    shutdowneventService.save(shutdownevent);
+                    proEconShutdowneventService.save(shutdownevent);
                 }
             }
         });
@@ -215,8 +214,8 @@ public class FiveLossesService {
     private void wpDaylossesReal() throws Exception {
         List<PointData> resultList = new ArrayList<>();
         wpls.stream().forEach(wp->{
-            List<Project> projects = wppromap.get(wp.getId());
-            Map<String, Windpowerstationpointnew> wppointnewMap = wppointmap.get(wp.getId());
+            List<ProBasicProject> projects = wppromap.get(wp.getId());
+            Map<String, ProBasicWppoint> wppointnewMap = wppointmap.get(wp.getId());
             AtomicReference<Double> wpdaydjloss = new AtomicReference<>(0.0);
             AtomicReference<Double> wpmonthdjloss = new AtomicReference<>(0.0);
             AtomicReference<Double> wpyeardjloss = new AtomicReference<>(0.0);
@@ -259,8 +258,8 @@ public class FiveLossesService {
             AtomicReference<Double> wpdayqf3 = new AtomicReference<>(0.0);
             AtomicReference<Double> wpdayqf4= new AtomicReference<>(0.0);
             projects.stream().forEach(project -> {
-                List<Line> lines = prolinemap.get(project.getId());
-                Map<String, Windpowerstationpointnew> projectpointnewMap = propointmap.get(project.getId());
+                List<ProBasicLine> lines = prolinemap.get(project.getId());
+                Map<String, ProBasicWppoint> projectpointnewMap = propointmap.get(project.getId());
                 AtomicReference<Double> projectdaydjloss = new AtomicReference<>(0.0);
                 AtomicReference<Double> projectmonthdjloss = new AtomicReference<>(0.0);
                 AtomicReference<Double> projectyeardjloss = new AtomicReference<>(0.0);
@@ -303,8 +302,8 @@ public class FiveLossesService {
                 AtomicReference<Double> projectdayqf3 = new AtomicReference<>(0.0);
                 AtomicReference<Double> projectdayqf4 = new AtomicReference<>(0.0);
                 lines.stream().forEach(line -> {
-                    List<Windturbine> windturbines = linewtmap.get(line.getId());
-                    Map<String, Windpowerstationpointnew> linepointnewMap = linepointmap.get(line.getId());
+                    List<ProBasicWindturbine> windturbines = linewtmap.get(line.getId());
+                    Map<String, ProBasicWppoint> linepointnewMap = linepointmap.get(line.getId());
                     AtomicReference<Double> linedaydjloss = new AtomicReference<>(0.0);
                     AtomicReference<Double> linemonthdjloss = new AtomicReference<>(0.0);
                     AtomicReference<Double> lineyeardjloss = new AtomicReference<>(0.0);
@@ -347,73 +346,73 @@ public class FiveLossesService {
                     AtomicReference<Double> linedayqf3 = new AtomicReference<>(0.0);
                     AtomicReference<Double> linedayqf4 = new AtomicReference<>(0.0);
                     windturbines.stream().forEach(wt->{
-                        Map<String, Windturbinetestingpointnew> windturbinetestingpointnewMap = wtpAimap.get(wt.getId());
+                        Map<String, ProBasicEquipmentPoint> windturbinetestingpointnewMap = wtpAimap.get(wt.getId());
                         //待机
-                        Windturbinetestingpointnew dayDjPoint = windturbinetestingpointnewMap.get(Contant.WTRDJSSDL);
-                        Windturbinetestingpointnew monthDjPoint = windturbinetestingpointnewMap.get(Contant.WTYDJSSDL);
-                        Windturbinetestingpointnew yearDjPoint = windturbinetestingpointnewMap.get(Contant.WTNDJSSDL);
+                        ProBasicEquipmentPoint dayDjPoint = windturbinetestingpointnewMap.get(Contant.WTRDJSSDL);
+                        ProBasicEquipmentPoint monthDjPoint = windturbinetestingpointnewMap.get(Contant.WTYDJSSDL);
+                        ProBasicEquipmentPoint yearDjPoint = windturbinetestingpointnewMap.get(Contant.WTNDJSSDL);
                         geneLineloss(linedaydjloss, linemonthdjloss, lineyeardjloss, dayDjPoint, monthDjPoint, yearDjPoint);
                         //手动停机
-                        Windturbinetestingpointnew daySdtjPoint = windturbinetestingpointnewMap.get(Contant.WTRSTSSDL);
-                        Windturbinetestingpointnew monthSdtjPoint = windturbinetestingpointnewMap.get(Contant.WTYSTSSDL);
-                        Windturbinetestingpointnew yearSdtjPoint = windturbinetestingpointnewMap.get(Contant.WTNSTSSDL);
+                        ProBasicEquipmentPoint daySdtjPoint = windturbinetestingpointnewMap.get(Contant.WTRSTSSDL);
+                        ProBasicEquipmentPoint monthSdtjPoint = windturbinetestingpointnewMap.get(Contant.WTYSTSSDL);
+                        ProBasicEquipmentPoint yearSdtjPoint = windturbinetestingpointnewMap.get(Contant.WTNSTSSDL);
                         geneLineloss(linedaysdtjloss, linemonthsdtjloss, lineyearsdtjloss, daySdtjPoint, monthSdtjPoint, yearSdtjPoint);
                         //性能
-                        Windturbinetestingpointnew dayXnPoint = windturbinetestingpointnewMap.get(Contant.WTRXNSSDL);
-                        Windturbinetestingpointnew monthXnPoint = windturbinetestingpointnewMap.get(Contant.WTYXNSSDL);
-                        Windturbinetestingpointnew yearXnPoint = windturbinetestingpointnewMap.get(Contant.WTNXNSSDL);
+                        ProBasicEquipmentPoint dayXnPoint = windturbinetestingpointnewMap.get(Contant.WTRXNSSDL);
+                        ProBasicEquipmentPoint monthXnPoint = windturbinetestingpointnewMap.get(Contant.WTYXNSSDL);
+                        ProBasicEquipmentPoint yearXnPoint = windturbinetestingpointnewMap.get(Contant.WTNXNSSDL);
                         geneLineloss(linedayxnloss, linemonthxnloss, lineyearxnloss, dayXnPoint, monthXnPoint, yearXnPoint);
                         //发电降出力
-                        Windturbinetestingpointnew dayFdjclPoint = windturbinetestingpointnewMap.get(Contant.WTRQXSSDL);
-                        Windturbinetestingpointnew monthFdjclPoint = windturbinetestingpointnewMap.get(Contant.WTYQXSSDL);
-                        Windturbinetestingpointnew yearFdjclPoint = windturbinetestingpointnewMap.get(Contant.WTNQXSSDL);
+                        ProBasicEquipmentPoint dayFdjclPoint = windturbinetestingpointnewMap.get(Contant.WTRQXSSDL);
+                        ProBasicEquipmentPoint monthFdjclPoint = windturbinetestingpointnewMap.get(Contant.WTYQXSSDL);
+                        ProBasicEquipmentPoint yearFdjclPoint = windturbinetestingpointnewMap.get(Contant.WTNQXSSDL);
                         geneLineloss(linedayfdjclloss, linemonthfdjclloss, lineyearfdjclloss, dayFdjclPoint, monthFdjclPoint, yearFdjclPoint);
                         //故障
-                        Windturbinetestingpointnew dayGzPoint = windturbinetestingpointnewMap.get(Contant.WTRGZSSDL);
-                        Windturbinetestingpointnew monthGzPoint = windturbinetestingpointnewMap.get(Contant.WTYGZSSDL);
-                        Windturbinetestingpointnew yearGzPoint = windturbinetestingpointnewMap.get(Contant.WTNGZSSDL);
+                        ProBasicEquipmentPoint dayGzPoint = windturbinetestingpointnewMap.get(Contant.WTRGZSSDL);
+                        ProBasicEquipmentPoint monthGzPoint = windturbinetestingpointnewMap.get(Contant.WTYGZSSDL);
+                        ProBasicEquipmentPoint yearGzPoint = windturbinetestingpointnewMap.get(Contant.WTNGZSSDL);
                         geneLineloss(linedaygzloss, linemonthgzloss, lineyeargzloss, dayGzPoint, monthGzPoint, yearGzPoint);
                         //故障受累
-                        Windturbinetestingpointnew dayGzslPoint = windturbinetestingpointnewMap.get(Contant.WTRSZSSDL);
-                        Windturbinetestingpointnew monthGzslPoint = windturbinetestingpointnewMap.get(Contant.WTYSZSSDL);
-                        Windturbinetestingpointnew yearGzslPoint = windturbinetestingpointnewMap.get(Contant.WTNSZSSDL);
+                        ProBasicEquipmentPoint dayGzslPoint = windturbinetestingpointnewMap.get(Contant.WTRSZSSDL);
+                        ProBasicEquipmentPoint monthGzslPoint = windturbinetestingpointnewMap.get(Contant.WTYSZSSDL);
+                        ProBasicEquipmentPoint yearGzslPoint = windturbinetestingpointnewMap.get(Contant.WTNSZSSDL);
                         geneLineloss(linedaygzslloss, linemonthgzslloss, lineyeargzslloss, dayGzslPoint, monthGzslPoint, yearGzslPoint);
                         //维护
-                        Windturbinetestingpointnew dayWhPoint = windturbinetestingpointnewMap.get(Contant.WTRJXSSDL);
-                        Windturbinetestingpointnew monthWhPoint = windturbinetestingpointnewMap.get(Contant.WTYJXSSDL);
-                        Windturbinetestingpointnew yearWhPoint = windturbinetestingpointnewMap.get(Contant.WTNJXSSDL);
+                        ProBasicEquipmentPoint dayWhPoint = windturbinetestingpointnewMap.get(Contant.WTRJXSSDL);
+                        ProBasicEquipmentPoint monthWhPoint = windturbinetestingpointnewMap.get(Contant.WTYJXSSDL);
+                        ProBasicEquipmentPoint yearWhPoint = windturbinetestingpointnewMap.get(Contant.WTNJXSSDL);
                         geneLineloss(linedaywhloss, linemonthwhloss, lineyearwhloss, dayWhPoint, monthWhPoint, yearWhPoint);
                         //维护受累
-                        Windturbinetestingpointnew dayWhslPoint = windturbinetestingpointnewMap.get(Contant.WTRLZSSDL);
-                        Windturbinetestingpointnew monthWhslPoint = windturbinetestingpointnewMap.get(Contant.WTYLZSSDL);
-                        Windturbinetestingpointnew yearWhslPoint = windturbinetestingpointnewMap.get(Contant.WTNLZSSDL);
+                        ProBasicEquipmentPoint dayWhslPoint = windturbinetestingpointnewMap.get(Contant.WTRLZSSDL);
+                        ProBasicEquipmentPoint monthWhslPoint = windturbinetestingpointnewMap.get(Contant.WTYLZSSDL);
+                        ProBasicEquipmentPoint yearWhslPoint = windturbinetestingpointnewMap.get(Contant.WTNLZSSDL);
                         geneLineloss(linedaywhslloss, linemonthwhslloss, lineyearwhslloss, dayWhslPoint, monthWhslPoint, yearWhslPoint);
                         //限电降出力
-                        Windturbinetestingpointnew dayXdjclPoint = windturbinetestingpointnewMap.get(Contant.WTRQFSSDL);
-                        Windturbinetestingpointnew monthXdjclPoint = windturbinetestingpointnewMap.get(Contant.WTYQFSSDL);
-                        Windturbinetestingpointnew yearXdjclPoint = windturbinetestingpointnewMap.get(Contant.WTNQFSSDL);
+                        ProBasicEquipmentPoint dayXdjclPoint = windturbinetestingpointnewMap.get(Contant.WTRQFSSDL);
+                        ProBasicEquipmentPoint monthXdjclPoint = windturbinetestingpointnewMap.get(Contant.WTYQFSSDL);
+                        ProBasicEquipmentPoint yearXdjclPoint = windturbinetestingpointnewMap.get(Contant.WTNQFSSDL);
                         geneLineloss(linedayxdjclloss, linemonthxdjclloss, lineyearxdjclloss, dayXdjclPoint, monthXdjclPoint, yearXdjclPoint);
                         //限电停机
-                        Windturbinetestingpointnew dayXdtjPoint = windturbinetestingpointnewMap.get(Contant.WTRXDSSDL);
-                        Windturbinetestingpointnew monthXdtjPoint = windturbinetestingpointnewMap.get(Contant.WTYXDSSDL);
-                        Windturbinetestingpointnew yearXdtjPoint = windturbinetestingpointnewMap.get(Contant.WTNXDSSDL);
+                        ProBasicEquipmentPoint dayXdtjPoint = windturbinetestingpointnewMap.get(Contant.WTRXDSSDL);
+                        ProBasicEquipmentPoint monthXdtjPoint = windturbinetestingpointnewMap.get(Contant.WTYXDSSDL);
+                        ProBasicEquipmentPoint yearXdtjPoint = windturbinetestingpointnewMap.get(Contant.WTNXDSSDL);
                         geneLineloss(linedayxdtjloss, linemonthxdtjloss, lineyearxdtjloss, dayXdtjPoint, monthXdtjPoint, yearXdtjPoint);
                         //电网受累
-                        Windturbinetestingpointnew dayDwslPoint = windturbinetestingpointnewMap.get(Contant.WTRWZSSDL);
-                        Windturbinetestingpointnew monthDwslPoint = windturbinetestingpointnewMap.get(Contant.WTYWZSSDL);
-                        Windturbinetestingpointnew yearDwslPoint = windturbinetestingpointnewMap.get(Contant.WTNWZSSDL);
+                        ProBasicEquipmentPoint dayDwslPoint = windturbinetestingpointnewMap.get(Contant.WTRWZSSDL);
+                        ProBasicEquipmentPoint monthDwslPoint = windturbinetestingpointnewMap.get(Contant.WTYWZSSDL);
+                        ProBasicEquipmentPoint yearDwslPoint = windturbinetestingpointnewMap.get(Contant.WTNWZSSDL);
                         geneLineloss(linedaydwslloss, linemonthdwslloss, lineyeardwslloss, dayDwslPoint, monthDwslPoint, yearDwslPoint);
                         //环境受累
-                        Windturbinetestingpointnew dayHjslPoint = windturbinetestingpointnewMap.get(Contant.WTRTZSSDL);
-                        Windturbinetestingpointnew monthHjslPoint = windturbinetestingpointnewMap.get(Contant.WTYTZSSDL);
-                        Windturbinetestingpointnew yearHjslPoint = windturbinetestingpointnewMap.get(Contant.WTNTZSSDL);
+                        ProBasicEquipmentPoint dayHjslPoint = windturbinetestingpointnewMap.get(Contant.WTRTZSSDL);
+                        ProBasicEquipmentPoint monthHjslPoint = windturbinetestingpointnewMap.get(Contant.WTYTZSSDL);
+                        ProBasicEquipmentPoint yearHjslPoint = windturbinetestingpointnewMap.get(Contant.WTNTZSSDL);
                         geneLineloss(linedayhjslloss, linemonthhjslloss, lineyearhjslloss, dayHjslPoint, monthHjslPoint, yearHjslPoint);
                         //欠发发电量
-                        Windturbinetestingpointnew dayqf0 = windturbinetestingpointnewMap.get(Contant.R0QFZT);
-                        Windturbinetestingpointnew dayqf1 = windturbinetestingpointnewMap.get(Contant.R1QFZT);
-                        Windturbinetestingpointnew dayqf2 = windturbinetestingpointnewMap.get(Contant.R2QFZT);
-                        Windturbinetestingpointnew dayqf3 = windturbinetestingpointnewMap.get(Contant.R3QFZT);
-                        Windturbinetestingpointnew dayqf4 = windturbinetestingpointnewMap.get(Contant.R4QFZT);
+                        ProBasicEquipmentPoint dayqf0 = windturbinetestingpointnewMap.get(Contant.R0QFZT);
+                        ProBasicEquipmentPoint dayqf1 = windturbinetestingpointnewMap.get(Contant.R1QFZT);
+                        ProBasicEquipmentPoint dayqf2 = windturbinetestingpointnewMap.get(Contant.R2QFZT);
+                        ProBasicEquipmentPoint dayqf3 = windturbinetestingpointnewMap.get(Contant.R3QFZT);
+                        ProBasicEquipmentPoint dayqf4 = windturbinetestingpointnewMap.get(Contant.R4QFZT);
                         geneLineQfloss(linedayqf0, linedayqf1, linedayqf2,linedayqf3,linedayqf4, dayqf0, dayqf1, dayqf2,dayqf3,dayqf4);
                     });
                     //待机
@@ -716,7 +715,7 @@ public class FiveLossesService {
         edosUtil.sendMultiPoint(resultList);
     }
 
-    private void geneLineQfloss(AtomicReference<Double> linedayqf0, AtomicReference<Double> linedayqf1, AtomicReference<Double> linedayqf2, AtomicReference<Double> linedayqf3, AtomicReference<Double> linedayqf4, Windturbinetestingpointnew dayqf0, Windturbinetestingpointnew dayqf1, Windturbinetestingpointnew dayqf2, Windturbinetestingpointnew dayqf3, Windturbinetestingpointnew dayqf4) {
+    private void geneLineQfloss(AtomicReference<Double> linedayqf0, AtomicReference<Double> linedayqf1, AtomicReference<Double> linedayqf2, AtomicReference<Double> linedayqf3, AtomicReference<Double> linedayqf4, ProBasicEquipmentPoint dayqf0, ProBasicEquipmentPoint dayqf1, ProBasicEquipmentPoint dayqf2, ProBasicEquipmentPoint dayqf3, ProBasicEquipmentPoint dayqf4) {
         double wtdayqf0 = 0.0;
         double wtdayqf1 = 0.0;
         double wtdayqf2 = 0.0;
@@ -744,13 +743,13 @@ public class FiveLossesService {
 
     }
 
-    private void addWpPoint(List<PointData> resultList, Windpowerstationpointnew pointnew, AtomicReference<Double> linedaydjloss) {
+    private void addWpPoint(List<PointData> resultList, ProBasicWppoint pointnew, AtomicReference<Double> linedaydjloss) {
         PointData wpPointData = createWpPointData(pointnew, linedaydjloss.get());
         resultList.add(wpPointData);
     }
 
 
-    private void geneLineloss(AtomicReference<Double> linedaydjloss, AtomicReference<Double> linemonthdjloss, AtomicReference<Double> lineyeardjloss, Windturbinetestingpointnew dayDjPoint, Windturbinetestingpointnew monthDjPoint, Windturbinetestingpointnew yearDjPoint) {
+    private void geneLineloss(AtomicReference<Double> linedaydjloss, AtomicReference<Double> linemonthdjloss, AtomicReference<Double> lineyeardjloss, ProBasicEquipmentPoint dayDjPoint, ProBasicEquipmentPoint monthDjPoint, ProBasicEquipmentPoint yearDjPoint) {
         double wtdaydj = 0.0;
         double wtmonthdj = 0.0;
         double wtyeardj = 0.0;
@@ -776,12 +775,12 @@ public class FiveLossesService {
     private void wtDaylossesReal() throws Exception {
         List<PointData> resultList = new ArrayList<>();
         wtls.stream().forEach(wt->{
-            Map<String, Windturbinetestingpointnew> windturbinetestingpointnewMap = wtpAimap.get(wt.getId());
-            Windturbinetestingpointnew powerPoint = windturbinetestingpointnewMap.get(Contant.AI130);
-            Windturbinetestingpointnew ztmxPoint = windturbinetestingpointnewMap.get(Contant.ZTMX);
-            Windturbinetestingpointnew bzglPoint = windturbinetestingpointnewMap.get(Contant.BZGL);
-            Windturbinetestingpointnew zsglPoint = windturbinetestingpointnewMap.get(Contant.ZSGL);
-            Windturbinetestingpointnew qfztPoint = windturbinetestingpointnewMap.get(Contant.RSSQFZT);
+            Map<String, ProBasicEquipmentPoint> windturbinetestingpointnewMap = wtpAimap.get(wt.getId());
+            ProBasicEquipmentPoint powerPoint = windturbinetestingpointnewMap.get(Contant.AI130);
+            ProBasicEquipmentPoint ztmxPoint = windturbinetestingpointnewMap.get(Contant.ZTMX);
+            ProBasicEquipmentPoint bzglPoint = windturbinetestingpointnewMap.get(Contant.BZGL);
+            ProBasicEquipmentPoint zsglPoint = windturbinetestingpointnewMap.get(Contant.ZSGL);
+            ProBasicEquipmentPoint qfztPoint = windturbinetestingpointnewMap.get(Contant.RSSQFZT);
             List<PointData> powerDatasSnap = null;
             List<PointData> ztmxDatasSnap = null;
             List<PointData> bzglDatasSnap = null;
@@ -855,7 +854,7 @@ public class FiveLossesService {
         edosUtil.sendMultiPoint(resultList);
     }
 
-    private double generalQfss(List<PointData> ztmxDatasSnap, List<PointData> bzglDatasSnap, List<PointData> zsglDatasSnap, List<PointData> powerDatasSnap,Double statusValue,List<PointData> resultList,Windturbinetestingpointnew point) {
+    private double generalQfss(List<PointData> ztmxDatasSnap, List<PointData> bzglDatasSnap, List<PointData> zsglDatasSnap, List<PointData> powerDatasSnap,Double statusValue,List<PointData> resultList,ProBasicEquipmentPoint point) {
         List<PointData> pointDataList = ztmxDatasSnap.stream().filter(zt -> zt.getPointValueInDouble() == statusValue).collect(Collectors.toList());
         Double bzss = 0.0;
         Double zsss = 0.0;
@@ -889,7 +888,7 @@ public class FiveLossesService {
     }
 
 
-    private void generalQfzt(List<PointData> powerDatasSnap, List<PointData> ztmxDatasSnap, List<PointData> zsglDatasSnap,Windturbinetestingpointnew qfztPoint,List<PointData> resultList)  {
+    private void generalQfzt(List<PointData> powerDatasSnap, List<PointData> ztmxDatasSnap, List<PointData> zsglDatasSnap,ProBasicEquipmentPoint qfztPoint,List<PointData> resultList)  {
         double zs = 0;
         double pp = 0;
         int i = 1;
@@ -925,7 +924,7 @@ public class FiveLossesService {
     }
 
 
-    private PointData createWpPointData(Windpowerstationpointnew linepointnew, double linespeed) {
+    private PointData createWpPointData(ProBasicWppoint linepointnew, double linespeed) {
         PointData pointData = new PointData();
         pointData.setEdnaId(linepointnew.getCode());
         pointData.setPointTime(currentDate.getTime());
@@ -944,77 +943,77 @@ public class FiveLossesService {
         boolean firstDayOfMonth = DateUtils.isFirstDayOfMonth(currentDate);
         boolean firstDayOfYear = DateUtils.isFirstDayOfYear(currentDate);
         wtls.stream().forEach(wt->{
-            Map<String, Windturbinetestingpointnew> windturbinetestingpointnewMap = wtpAimap.get(wt.getId());
+            Map<String, ProBasicEquipmentPoint> windturbinetestingpointnewMap = wtpAimap.get(wt.getId());
             //待机
-            Windturbinetestingpointnew dayDjPoint = windturbinetestingpointnewMap.get(Contant.WTRDJSSDL);
-            Windturbinetestingpointnew monthDjPoint = windturbinetestingpointnewMap.get(Contant.WTYDJSSDL);
-            Windturbinetestingpointnew yearDjPoint = windturbinetestingpointnewMap.get(Contant.WTNDJSSDL);
+            ProBasicEquipmentPoint dayDjPoint = windturbinetestingpointnewMap.get(Contant.WTRDJSSDL);
+            ProBasicEquipmentPoint monthDjPoint = windturbinetestingpointnewMap.get(Contant.WTYDJSSDL);
+            ProBasicEquipmentPoint yearDjPoint = windturbinetestingpointnewMap.get(Contant.WTNDJSSDL);
             geneMonthOrYearLoss(resultList, dayDjPoint,monthDjPoint,firstDayOfMonth);
             geneMonthOrYearLoss(resultList, dayDjPoint,yearDjPoint,firstDayOfYear);
             //手动停机
-            Windturbinetestingpointnew daySdtjPoint = windturbinetestingpointnewMap.get(Contant.WTRSTSSDL);
-            Windturbinetestingpointnew monthSdtjPoint = windturbinetestingpointnewMap.get(Contant.WTYSTSSDL);
-            Windturbinetestingpointnew yearSdtjPoint = windturbinetestingpointnewMap.get(Contant.WTNSTSSDL);
+            ProBasicEquipmentPoint daySdtjPoint = windturbinetestingpointnewMap.get(Contant.WTRSTSSDL);
+            ProBasicEquipmentPoint monthSdtjPoint = windturbinetestingpointnewMap.get(Contant.WTYSTSSDL);
+            ProBasicEquipmentPoint yearSdtjPoint = windturbinetestingpointnewMap.get(Contant.WTNSTSSDL);
             geneMonthOrYearLoss(resultList, daySdtjPoint,monthSdtjPoint,firstDayOfMonth);
             geneMonthOrYearLoss(resultList, daySdtjPoint,yearSdtjPoint,firstDayOfYear);
             //性能
-            Windturbinetestingpointnew dayXnPoint = windturbinetestingpointnewMap.get(Contant.WTRXNSSDL);
-            Windturbinetestingpointnew monthXnPoint = windturbinetestingpointnewMap.get(Contant.WTYXNSSDL);
-            Windturbinetestingpointnew yearXnPoint = windturbinetestingpointnewMap.get(Contant.WTNXNSSDL);
+            ProBasicEquipmentPoint dayXnPoint = windturbinetestingpointnewMap.get(Contant.WTRXNSSDL);
+            ProBasicEquipmentPoint monthXnPoint = windturbinetestingpointnewMap.get(Contant.WTYXNSSDL);
+            ProBasicEquipmentPoint yearXnPoint = windturbinetestingpointnewMap.get(Contant.WTNXNSSDL);
             geneMonthOrYearLoss(resultList, dayXnPoint,monthXnPoint,firstDayOfMonth);
             geneMonthOrYearLoss(resultList, dayXnPoint,yearXnPoint,firstDayOfYear);
             //发电降出力
-            Windturbinetestingpointnew dayFdjclPoint = windturbinetestingpointnewMap.get(Contant.WTRQXSSDL);
-            Windturbinetestingpointnew monthFdjclPoint = windturbinetestingpointnewMap.get(Contant.WTYQXSSDL);
-            Windturbinetestingpointnew yearFdjclPoint = windturbinetestingpointnewMap.get(Contant.WTNQXSSDL);
+            ProBasicEquipmentPoint dayFdjclPoint = windturbinetestingpointnewMap.get(Contant.WTRQXSSDL);
+            ProBasicEquipmentPoint monthFdjclPoint = windturbinetestingpointnewMap.get(Contant.WTYQXSSDL);
+            ProBasicEquipmentPoint yearFdjclPoint = windturbinetestingpointnewMap.get(Contant.WTNQXSSDL);
             geneMonthOrYearLoss(resultList, dayFdjclPoint,monthFdjclPoint,firstDayOfMonth);
             geneMonthOrYearLoss(resultList, dayFdjclPoint,yearFdjclPoint,firstDayOfYear);
             //故障
-            Windturbinetestingpointnew dayGzPoint = windturbinetestingpointnewMap.get(Contant.WTRGZSSDL);
-            Windturbinetestingpointnew monthGzPoint = windturbinetestingpointnewMap.get(Contant.WTYGZSSDL);
-            Windturbinetestingpointnew yearGzPoint = windturbinetestingpointnewMap.get(Contant.WTNGZSSDL);
+            ProBasicEquipmentPoint dayGzPoint = windturbinetestingpointnewMap.get(Contant.WTRGZSSDL);
+            ProBasicEquipmentPoint monthGzPoint = windturbinetestingpointnewMap.get(Contant.WTYGZSSDL);
+            ProBasicEquipmentPoint yearGzPoint = windturbinetestingpointnewMap.get(Contant.WTNGZSSDL);
             geneMonthOrYearLoss(resultList, dayGzPoint,monthGzPoint,firstDayOfMonth);
             geneMonthOrYearLoss(resultList, dayGzPoint,yearGzPoint,firstDayOfYear);
             //故障受累
-            Windturbinetestingpointnew dayGzslPoint = windturbinetestingpointnewMap.get(Contant.WTRSZSSDL);
-            Windturbinetestingpointnew monthGzslPoint = windturbinetestingpointnewMap.get(Contant.WTYSZSSDL);
-            Windturbinetestingpointnew yearGzslPoint = windturbinetestingpointnewMap.get(Contant.WTNSZSSDL);
+            ProBasicEquipmentPoint dayGzslPoint = windturbinetestingpointnewMap.get(Contant.WTRSZSSDL);
+            ProBasicEquipmentPoint monthGzslPoint = windturbinetestingpointnewMap.get(Contant.WTYSZSSDL);
+            ProBasicEquipmentPoint yearGzslPoint = windturbinetestingpointnewMap.get(Contant.WTNSZSSDL);
             geneMonthOrYearLoss(resultList, dayGzslPoint,monthGzslPoint,firstDayOfMonth);
             geneMonthOrYearLoss(resultList, dayGzslPoint,yearGzslPoint,firstDayOfYear);
             //维护
-            Windturbinetestingpointnew dayWhPoint = windturbinetestingpointnewMap.get(Contant.WTRJXSSDL);
-            Windturbinetestingpointnew monthWhPoint = windturbinetestingpointnewMap.get(Contant.WTYJXSSDL);
-            Windturbinetestingpointnew yearWhPoint = windturbinetestingpointnewMap.get(Contant.WTNJXSSDL);
+            ProBasicEquipmentPoint dayWhPoint = windturbinetestingpointnewMap.get(Contant.WTRJXSSDL);
+            ProBasicEquipmentPoint monthWhPoint = windturbinetestingpointnewMap.get(Contant.WTYJXSSDL);
+            ProBasicEquipmentPoint yearWhPoint = windturbinetestingpointnewMap.get(Contant.WTNJXSSDL);
             geneMonthOrYearLoss(resultList, dayWhPoint,monthWhPoint,firstDayOfMonth);
             geneMonthOrYearLoss(resultList, dayWhPoint,yearWhPoint,firstDayOfYear);
             //维护受累
-            Windturbinetestingpointnew dayWhslPoint = windturbinetestingpointnewMap.get(Contant.WTRLZSSDL);
-            Windturbinetestingpointnew monthWhslPoint = windturbinetestingpointnewMap.get(Contant.WTYLZSSDL);
-            Windturbinetestingpointnew yearWhslPoint = windturbinetestingpointnewMap.get(Contant.WTNLZSSDL);
+            ProBasicEquipmentPoint dayWhslPoint = windturbinetestingpointnewMap.get(Contant.WTRLZSSDL);
+            ProBasicEquipmentPoint monthWhslPoint = windturbinetestingpointnewMap.get(Contant.WTYLZSSDL);
+            ProBasicEquipmentPoint yearWhslPoint = windturbinetestingpointnewMap.get(Contant.WTNLZSSDL);
             geneMonthOrYearLoss(resultList, dayWhslPoint,monthWhslPoint,firstDayOfMonth);
             geneMonthOrYearLoss(resultList, dayWhslPoint,yearWhslPoint,firstDayOfYear);
             //限电降出力
-            Windturbinetestingpointnew dayXdjclPoint = windturbinetestingpointnewMap.get(Contant.WTRQFSSDL);
-            Windturbinetestingpointnew monthXdjclPoint = windturbinetestingpointnewMap.get(Contant.WTYQFSSDL);
-            Windturbinetestingpointnew yearXdjclPoint = windturbinetestingpointnewMap.get(Contant.WTNQFSSDL);
+            ProBasicEquipmentPoint dayXdjclPoint = windturbinetestingpointnewMap.get(Contant.WTRQFSSDL);
+            ProBasicEquipmentPoint monthXdjclPoint = windturbinetestingpointnewMap.get(Contant.WTYQFSSDL);
+            ProBasicEquipmentPoint yearXdjclPoint = windturbinetestingpointnewMap.get(Contant.WTNQFSSDL);
             geneMonthOrYearLoss(resultList, dayXdjclPoint,monthXdjclPoint,firstDayOfMonth);
             geneMonthOrYearLoss(resultList, dayXdjclPoint,yearXdjclPoint,firstDayOfYear);
             //限电停机
-            Windturbinetestingpointnew dayXdtjPoint = windturbinetestingpointnewMap.get(Contant.WTRXDSSDL);
-            Windturbinetestingpointnew monthXdtjPoint = windturbinetestingpointnewMap.get(Contant.WTYXDSSDL);
-            Windturbinetestingpointnew yearXdtjPoint = windturbinetestingpointnewMap.get(Contant.WTNXDSSDL);
+            ProBasicEquipmentPoint dayXdtjPoint = windturbinetestingpointnewMap.get(Contant.WTRXDSSDL);
+            ProBasicEquipmentPoint monthXdtjPoint = windturbinetestingpointnewMap.get(Contant.WTYXDSSDL);
+            ProBasicEquipmentPoint yearXdtjPoint = windturbinetestingpointnewMap.get(Contant.WTNXDSSDL);
             geneMonthOrYearLoss(resultList, dayXdtjPoint,monthXdtjPoint,firstDayOfMonth);
             geneMonthOrYearLoss(resultList, dayXdtjPoint,yearXdtjPoint,firstDayOfYear);
             //电网受累
-            Windturbinetestingpointnew dayDwslPoint = windturbinetestingpointnewMap.get(Contant.WTRWZSSDL);
-            Windturbinetestingpointnew monthDwslPoint = windturbinetestingpointnewMap.get(Contant.WTYWZSSDL);
-            Windturbinetestingpointnew yearDwslPoint = windturbinetestingpointnewMap.get(Contant.WTNWZSSDL);
+            ProBasicEquipmentPoint dayDwslPoint = windturbinetestingpointnewMap.get(Contant.WTRWZSSDL);
+            ProBasicEquipmentPoint monthDwslPoint = windturbinetestingpointnewMap.get(Contant.WTYWZSSDL);
+            ProBasicEquipmentPoint yearDwslPoint = windturbinetestingpointnewMap.get(Contant.WTNWZSSDL);
             geneMonthOrYearLoss(resultList, dayDwslPoint,monthDwslPoint,firstDayOfMonth);
             geneMonthOrYearLoss(resultList, dayDwslPoint,yearDwslPoint,firstDayOfYear);
             //环境受累
-            Windturbinetestingpointnew dayHjslPoint = windturbinetestingpointnewMap.get(Contant.WTRTZSSDL);
-            Windturbinetestingpointnew monthHjslPoint = windturbinetestingpointnewMap.get(Contant.WTYTZSSDL);
-            Windturbinetestingpointnew yearHjslPoint = windturbinetestingpointnewMap.get(Contant.WTNTZSSDL);
+            ProBasicEquipmentPoint dayHjslPoint = windturbinetestingpointnewMap.get(Contant.WTRTZSSDL);
+            ProBasicEquipmentPoint monthHjslPoint = windturbinetestingpointnewMap.get(Contant.WTYTZSSDL);
+            ProBasicEquipmentPoint yearHjslPoint = windturbinetestingpointnewMap.get(Contant.WTNTZSSDL);
             geneMonthOrYearLoss(resultList, dayHjslPoint,monthHjslPoint,firstDayOfMonth);
             geneMonthOrYearLoss(resultList, dayHjslPoint,yearHjslPoint,firstDayOfYear);
         });
@@ -1023,7 +1022,7 @@ public class FiveLossesService {
 
 
 
-    private void geneMonthOrYearLoss(List<PointData> resultList,Windturbinetestingpointnew dayPoint,Windturbinetestingpointnew monthPoint,boolean firstDayOfMonthOrYear) {
+    private void geneMonthOrYearLoss(List<PointData> resultList,ProBasicEquipmentPoint dayPoint,ProBasicEquipmentPoint monthPoint,boolean firstDayOfMonthOrYear) {
         Double dayValue = 0.0;
         Double yestodayMonth = 0.0;
         try {
@@ -1038,7 +1037,7 @@ public class FiveLossesService {
         resultList.add(createWtPointData(monthPoint,monthValue));
     }
 
-    private double generalLoss(List<PointData> ztmxDatasSnap, List<PointData> bzglDatasSnap, List<PointData> zsglDatasSnap, List<PointData> powerDatasSnap,Double statusValue,List<PointData> resultList,Windturbinetestingpointnew point) {
+    private double generalLoss(List<PointData> ztmxDatasSnap, List<PointData> bzglDatasSnap, List<PointData> zsglDatasSnap, List<PointData> powerDatasSnap,Double statusValue,List<PointData> resultList,ProBasicEquipmentPoint point) {
         List<PointData> pointDataList = ztmxDatasSnap.stream().filter(zt -> zt.getPointValueInDouble() == statusValue).collect(Collectors.toList());
         Double bzss = 0.0;
         Double zsss = 0.0;
@@ -1089,7 +1088,7 @@ public class FiveLossesService {
     }
 
 
-    private PointData createWtPointData(Windturbinetestingpointnew fjfdl, Double rfdl) {
+    private PointData createWtPointData(ProBasicEquipmentPoint fjfdl, Double rfdl) {
         PointData pointData = new PointData();
         pointData.setEdnaId(fjfdl.getCode());
         pointData.setPointName(fjfdl.getName());

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

@@ -8,7 +8,7 @@ import com.gyee.common.util.DateUtils;
 import com.gyee.common.util.DoubleUtils;
 import com.gyee.generation.init.CacheContext;
 import com.gyee.generation.model.auto.*;
-import com.gyee.generation.service.auto.IMeterpointvalueService;
+import com.gyee.generation.service.auto.IProEconMeterPointValueService;
 import com.gyee.generation.util.realtimesource.IEdosUtil;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -31,7 +31,7 @@ public class GenerationService {
     @Resource
     private IEdosUtil edosUtil;
     @Resource
-    private IMeterpointvalueService meterpointvalueService;
+    private IProEconMeterPointValueService proEconMeterPointValueService;
 
 
     /**
@@ -41,14 +41,14 @@ public class GenerationService {
     public void saveGenerationDatas() throws Exception {
         List<PointData> resultList = new ArrayList<>();
         List<PointData> fdlList = new ArrayList<>();
-        List<Windpowerstation> wpls = CacheContext.wpls;
-        List<Line> lines = CacheContext.lines;
-        Map<String, List<Project>> wppromap = CacheContext.wppromap;
-        Map<String, List<Line>> prolinemap = CacheContext.prolinemap;
-        List<Meterpoint> meterpoints = CacheContext.meterpoints;
-        Map<String, Map<String, Windpowerstationpointnew>> wppointmap = CacheContext.wppointmap;
-        Map<String, Map<String, Windpowerstationpointnew>> linepointmap = CacheContext.linepointmap;
-        Map<String, Map<String, Windpowerstationpointnew>> propointmap = CacheContext.propointmap;
+        List<ProBasicWindpowerstation> wpls = CacheContext.wpls;
+        List<ProBasicLine> lines = CacheContext.lines;
+        Map<String, List<ProBasicProject>> wppromap = CacheContext.wppromap;
+        Map<String, List<ProBasicLine>> prolinemap = CacheContext.prolinemap;
+        List<ProBasicMeterPoint> meterpoints = CacheContext.meterpoints;
+        Map<String, Map<String, ProBasicWppoint>> wppointmap = CacheContext.wppointmap;
+        Map<String, Map<String, ProBasicWppoint>> linepointmap = CacheContext.linepointmap;
+        Map<String, Map<String, ProBasicWppoint>> propointmap = CacheContext.propointmap;
         Date samedayZero = DateUtils.getSamedayZero();
         Date monthFirstZero = DateUtils.getMonthFirstZero();
         Date yearFirstZero = DateUtils.getYearFirstZero();
@@ -56,13 +56,13 @@ public class GenerationService {
         Date tomorrow = DateUtils.addDays(samedayZero,1);
 
         lines.stream().forEach(line->{
-            Map<String, Windpowerstationpointnew> linemap = linepointmap.get(line.getId());
+            Map<String, ProBasicWppoint> linemap = linepointmap.get(line.getId());
             //线路发电量
-            Optional<Meterpoint> fdlOptional = meterpoints.stream().filter(me -> me.getLineid().equals(line.getId()) &&  me.getUniformcode().equals("ZXYG") && me.getMetertype().equals("进线") && me.getMetersort().equals("主")).findFirst();
+            Optional<ProBasicMeterPoint> fdlOptional = meterpoints.stream().filter(me -> me.getLineId().equals(line.getId()) &&  me.getUniformCode().equals("ZXYG") && me.getMeterType().equals("进线") && me.getMeterSort().equals("主")).findFirst();
             computeFdl(fdlList, tomorrow,samedayZero, monthFirstZero, yearFirstZero, currentDate, linemap, fdlOptional);
         });
         wpls.stream().forEach(wp->{
-            Map<String, Windpowerstationpointnew> wpmap = wppointmap.get(wp.getId());
+            Map<String, ProBasicWppoint> wpmap = wppointmap.get(wp.getId());
             AtomicReference<Double> fcrfdl = new AtomicReference<>((double) 0);
             AtomicReference<Double> fcyfdl = new AtomicReference<>((double) 0);
             AtomicReference<Double> fcnfdl = new AtomicReference<>((double) 0);
@@ -76,7 +76,7 @@ public class GenerationService {
             AtomicReference<Double> fcycydl = new AtomicReference<>((double) 0);
             AtomicReference<Double> fcncydl = new AtomicReference<>((double) 0);
             wppromap.get(wp.getId()).stream().forEach(project -> {
-                Map<String, Windpowerstationpointnew> projectmap = propointmap.get(project.getId());
+                Map<String, ProBasicWppoint> projectmap = propointmap.get(project.getId());
                 AtomicReference<Double> qcrfdl = new AtomicReference<>(0.0);
                 AtomicReference<Double> qcyfdl = new AtomicReference<>(0.0);
                 AtomicReference<Double> qcnfdl = new AtomicReference<>(0.0);
@@ -90,20 +90,20 @@ public class GenerationService {
                 AtomicReference<Double> qcycydl = new AtomicReference<>(0.0);
                 AtomicReference<Double> qcncydl = new AtomicReference<>(0.0);
                 prolinemap.get(project.getId()).stream().forEach(line -> {
-                    Map<String, Windpowerstationpointnew> linemap = linepointmap.get(line.getId());
+                    Map<String, ProBasicWppoint> linemap = linepointmap.get(line.getId());
                     //线路发电量
-                    Optional<Meterpoint> fdlOptional = meterpoints.stream().filter(me -> me.getLineid().equals(line.getId()) &&   me.getUniformcode().equals("ZXYG") && me.getMetertype().equals("进线") && me.getMetersort().equals("主")).findFirst();
+                    Optional<ProBasicMeterPoint> fdlOptional = meterpoints.stream().filter(me -> me.getLineId().equals(line.getId()) &&   me.getUniformCode().equals("ZXYG") && me.getMeterType().equals("进线") && me.getMeterSort().equals("主")).findFirst();
                     lineFdl(resultList,tomorrow, samedayZero, monthFirstZero, yearFirstZero, currentDate, qcrfdl, qcyfdl, qcnfdl, linemap, fdlOptional);
                     log.info(line.getName()+"电计量电量计算完毕！");
                     //线路上网电量
-                    Optional<Meterpoint> swdlOptional= null;
-                    Optional<Meterpoint> gwdlOptional=null;
+                    Optional<ProBasicMeterPoint> swdlOptional= null;
+                    Optional<ProBasicMeterPoint> gwdlOptional=null;
                     if (wp.getId().equals("GJY_FDC")){
-                        swdlOptional = meterpoints.stream().filter(me ->   me.getUniformcode().equals("ZXYG") && me.getMetertype().equals("主变高压侧") && me.getMetersort().equals("主") && me.getLineid().contains(line.getId())).findFirst();
-                        gwdlOptional = meterpoints.stream().filter(me ->  me.getUniformcode().equals("FXYG") && me.getMetertype().equals("主变高压侧") && me.getMetersort().equals("主") && me.getLineid().contains(line.getId())).findFirst();
+                        swdlOptional = meterpoints.stream().filter(me ->   me.getUniformCode().equals("ZXYG") && me.getMeterType().equals("主变高压侧") && me.getMeterSort().equals("主") && me.getLineId().contains(line.getId())).findFirst();
+                        gwdlOptional = meterpoints.stream().filter(me ->  me.getUniformCode().equals("FXYG") && me.getMeterType().equals("主变高压侧") && me.getMeterSort().equals("主") && me.getLineId().contains(line.getId())).findFirst();
                     }else{
-                        swdlOptional = meterpoints.stream().filter(me ->   me.getUniformcode().equals("ZXYG") && me.getMetertype().equals("出线") && me.getMetersort().equals("主") && me.getLineid().contains(line.getId())).findFirst();
-                        gwdlOptional = meterpoints.stream().filter(me ->  me.getUniformcode().equals("FXYG") && me.getMetertype().equals("出线") && me.getMetersort().equals("主") && me.getLineid().contains(line.getId())).findFirst();
+                        swdlOptional = meterpoints.stream().filter(me ->   me.getUniformCode().equals("ZXYG") && me.getMeterType().equals("出线") && me.getMeterSort().equals("主") && me.getLineId().contains(line.getId())).findFirst();
+                        gwdlOptional = meterpoints.stream().filter(me ->  me.getUniformCode().equals("FXYG") && me.getMeterType().equals("出线") && me.getMeterSort().equals("主") && me.getLineId().contains(line.getId())).findFirst();
                     }
                      lineOrtherdl(fdlList,tomorrow,resultList, linepointmap, samedayZero, monthFirstZero, yearFirstZero, currentDate, qcrswdl, qcyswdl, qcnswdl, line, linemap, swdlOptional,Contant.SWDLB,Contant.SWDLY,Contant.SWDLN);
                     log.info(line.getName()+"上网电量计算完毕！");
@@ -111,7 +111,7 @@ public class GenerationService {
                     lineOrtherdl(fdlList,tomorrow,resultList, linepointmap, samedayZero, monthFirstZero, yearFirstZero, currentDate, qcrgwdl, qcygwdl, qcngwdl, line, linemap, gwdlOptional,Contant.GWGWB,Contant.GWGWY,Contant.GWGWN);
                     log.info(line.getName()+"工网购网电量计算完毕！");
                     //厂用电量
-                    Optional<Meterpoint> zybOptional = meterpoints.stream().filter(me->   me.getUniformcode().equals("ZXYG") && me.getMetertype().equals("站用变") && me.getMetersort().equals("主") && me.getLineid().contains(line.getId())).findFirst();
+                    Optional<ProBasicMeterPoint> zybOptional = meterpoints.stream().filter(me->   me.getUniformCode().equals("ZXYG") && me.getMeterType().equals("站用变") && me.getMeterSort().equals("主") && me.getLineId().contains(line.getId())).findFirst();
                     lineOrtherdl(fdlList,tomorrow,resultList, linepointmap, samedayZero, monthFirstZero, yearFirstZero, currentDate, qcrcydl, qcycydl, qcncydl, line, linemap, zybOptional,Contant.CYDLB,Contant.CYDLY,Contant.CYDLN);
                     log.info(line.getName()+"场用电量计算完毕！");
                     //农网购网电量
@@ -161,25 +161,25 @@ public class GenerationService {
      * 实时+0点算前一天
      */
     public void saveMeterpointValueRealtime(String beginDate,String endDate){
-        List<Meterpoint> meterpoints = CacheContext.meterpoints;
+        List<ProBasicMeterPoint> meterpoints = CacheContext.meterpoints;
         List<String> days = DateUtils.getDays(beginDate, endDate);
         days.stream().forEach(day->{
             Date samedayZero = DateUtils.getSamedayZero(day);
             Date monthFirstZero = DateUtils.getMonthFirstZero(day);
             Date yearFirstZero = DateUtils.getYearFirstZero(day);
             Date date = DateUtils.addDays(samedayZero, 1);
-            List<Meterpointvalue> resultList = new ArrayList<>();
-            QueryWrapper<Meterpointvalue> qw = new QueryWrapper();
+            List<ProEconMeterPointValue> resultList = new ArrayList<>();
+            QueryWrapper<ProEconMeterPointValue> qw = new QueryWrapper();
             qw.eq("recorddate",date);
-            meterpointvalueService.remove(qw);
+            proEconMeterPointValueService.remove(qw);
             meterpoints.stream().forEach(meterpoint -> {
                 String meterid = meterpoint.getId();
                 Double magnification = meterpoint.getMagnification();
                 Double xs = meterpoint.getXs();
-                Meterpointvalue meterpointvalue = new Meterpointvalue();
+                ProEconMeterPointValue meterpointvalue = new ProEconMeterPointValue();
 
-                meterpointvalue.setRecorddate(date);
-                meterpointvalue.setMeterid(meterpoint.getId());
+                meterpointvalue.setRecordDate(date);
+                meterpointvalue.setMeterId(meterpoint.getId());
                 Double real = 0.0;
                 Double sameday = 0.0;
                 Double month = 0.0;
@@ -204,12 +204,12 @@ public class GenerationService {
                 Double yearvalue = (real/xs - year/xs) * magnification;
                 Double monthvalue = (real/xs - month/xs) * magnification;
                 Double dayvalue = (real/xs - sameday/xs) * magnification;
-                meterpointvalue.setYearvalue(yearvalue);
-                meterpointvalue.setMonthvalue(monthvalue);
-                meterpointvalue.setDayvalue(dayvalue);
+                meterpointvalue.setYearValue(yearvalue);
+                meterpointvalue.setMonthValue(monthvalue);
+                meterpointvalue.setDayValue(dayvalue);
                 resultList.add(meterpointvalue);
             });
-            meterpointvalueService.saveBatch(resultList);
+            proEconMeterPointValueService.saveBatch(resultList);
         });
 
 
@@ -217,25 +217,25 @@ public class GenerationService {
     }
 
     public void updateMeterpointValueHistory(String beginDate,String endDate){
-        List<Meterpointvalue> resultLsit = new ArrayList<>();
-        Map<String,Meterpoint> meterpointMap = CacheContext.meterpointMap;
+        List<ProEconMeterPointValue> resultLsit = new ArrayList<>();
+        Map<String,ProBasicMeterPoint> meterpointMap = CacheContext.meterpointMap;
         List<String> days = DateUtils.getDays(beginDate, endDate);
         days.stream().forEach(day->{
             Date date = DateUtils.parseDate(beginDate);
             Date date1 = DateUtils.addDays(date, 1);
             Date date2= DateUtils.addDays(date1, 1);
-            QueryWrapper<Meterpointvalue> qw = new QueryWrapper<>();
+            QueryWrapper<ProEconMeterPointValue> qw = new QueryWrapper<>();
             qw.eq("recorddate",date1);
-            List<Meterpointvalue> meterpointvalues = meterpointvalueService.list(qw);
+            List<ProEconMeterPointValue> meterpointvalues = proEconMeterPointValueService.list(qw);
 
             meterpointvalues.stream().forEach(meterpointvalue -> {
-                Meterpoint meterpoint = meterpointMap.get(meterpointvalue.getMeterid());
+                ProBasicMeterPoint meterpoint = meterpointMap.get(meterpointvalue.getMeterId());
                 Double magnification = meterpoint.getMagnification();
                 Double xs = meterpoint.getXs();
                 Double real = 0.0;
 
                 try {
-                    real = edosUtil.getSectionData(meterpointvalue.getMeterid(),date1.getTime()).getPointValueInDouble();
+                    real = edosUtil.getSectionData(meterpointvalue.getMeterId(),date1.getTime()).getPointValueInDouble();
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -244,17 +244,17 @@ public class GenerationService {
                 Double dayvalue = (real/xs - meterpointvalue.getDay4()) * magnification;
                 meterpointvalue.setNow(DoubleUtils.keepPrecision(real,2));
                 meterpointvalue.setNow4(DoubleUtils.keepPrecision(real,4));
-                meterpointvalue.setYearvalue(yearvalue);
-                meterpointvalue.setMonthvalue(monthvalue);
-                meterpointvalue.setDayvalue(dayvalue);
+                meterpointvalue.setYearValue(yearvalue);
+                meterpointvalue.setMonthValue(monthvalue);
+                meterpointvalue.setDayValue(dayvalue);
                 resultLsit.add(meterpointvalue);
             });
-            meterpointvalueService.saveOrUpdateBatch(resultLsit);
+            proEconMeterPointValueService.saveOrUpdateBatch(resultLsit);
         });
     }
 
 
-    private void setGsZero(List<PointData> resultList,Date currentDate,Map<String, Map<String, Windpowerstationpointnew>> linemap,String foreignkeyid,String rcode,String ycode,String ncode) {
+    private void setGsZero(List<PointData> resultList,Date currentDate,Map<String, Map<String, ProBasicWppoint>> linemap,String foreignkeyid,String rcode,String ycode,String ncode) {
         //线路日发电量
         PointData r = new PointData();
         r.setPointTime(currentDate.getTime());
@@ -280,7 +280,7 @@ public class GenerationService {
         n.setPointName(linemap.get(foreignkeyid).get(ncode).getName());
         resultList.add(n);
     }
-    private void setZero(List<PointData> resultList,Date currentDate,Map<String, Windpowerstationpointnew> linemap,String rcode,String ycode,String ncode) {
+    private void setZero(List<PointData> resultList,Date currentDate,Map<String, ProBasicWppoint> linemap,String rcode,String ycode,String ncode) {
         //线路日发电量
         PointData r = new PointData();
         r.setPointTime(currentDate.getTime());
@@ -307,10 +307,10 @@ public class GenerationService {
         resultList.add(n);
     }
 
-    private Map<String,Double> getPercentage(List<PointData> fdlList,Meterpoint swdlMeterpoint,List<PointData> resultList,Map<String, Map<String, Windpowerstationpointnew>> linepointmap,Line line){
+    private Map<String,Double> getPercentage(List<PointData> fdlList,ProBasicMeterPoint swdlMeterpoint,List<PointData> resultList,Map<String, Map<String, ProBasicWppoint>> linepointmap,ProBasicLine line){
 
         Map<String,Double> percentageMap = new HashMap<>();
-        String[] swdlLines = swdlMeterpoint.getLineid().split("\\|");
+        String[] swdlLines = swdlMeterpoint.getLineId().split("\\|");
         AtomicReference<Double> xldl = new AtomicReference<>((double) 0);
         AtomicReference<Double> xlzdl = new AtomicReference<>((double) 0);
         AtomicReference<Double> xlydl = new AtomicReference<>((double) 0);
@@ -355,9 +355,9 @@ public class GenerationService {
         percentageMap.put("npercentage",npercentage);
         return percentageMap;
     }
-    private void lineOrtherdl(List<PointData> fdlList,Date tomorrow,List<PointData> resultList, Map<String, Map<String, Windpowerstationpointnew>> linepointmap, Date samedayZero, Date monthFirstZero, Date yearFirstZero, Date currentDate, AtomicReference<Double> qcrswdl, AtomicReference<Double> qcyswdl, AtomicReference<Double> qcnswdl, Line line, Map<String, Windpowerstationpointnew> linemap, Optional<Meterpoint> optionalMeterpoint,String rcode,String ycode,String ncode) {
+    private void lineOrtherdl(List<PointData> fdlList,Date tomorrow,List<PointData> resultList, Map<String, Map<String, ProBasicWppoint>> linepointmap, Date samedayZero, Date monthFirstZero, Date yearFirstZero, Date currentDate, AtomicReference<Double> qcrswdl, AtomicReference<Double> qcyswdl, AtomicReference<Double> qcnswdl, ProBasicLine line, Map<String, ProBasicWppoint> linemap, Optional<ProBasicMeterPoint> optionalMeterpoint,String rcode,String ycode,String ncode) {
         if (optionalMeterpoint.isPresent()){
-            Meterpoint swdlMeterpoint = optionalMeterpoint.get();
+            ProBasicMeterPoint swdlMeterpoint = optionalMeterpoint.get();
             //获取电量百分比，算其他电量
             Map<String, Double> percentageMap = getPercentage(fdlList,swdlMeterpoint, resultList, linepointmap, line);
 
@@ -410,7 +410,7 @@ public class GenerationService {
             }
         }
     }
-    private void computeFdl(List<PointData> fdlList, Date tomorrow,Date samedayZero, Date monthFirstZero, Date yearFirstZero, Date currentDate, Map<String, Windpowerstationpointnew> linemap, Optional<Meterpoint> fdlOptional) {
+    private void computeFdl(List<PointData> fdlList, Date tomorrow,Date samedayZero, Date monthFirstZero, Date yearFirstZero, Date currentDate, Map<String, ProBasicWppoint> linemap, Optional<ProBasicMeterPoint> fdlOptional) {
         if (fdlOptional.isPresent()){
             String pointid = fdlOptional.get().getId();
             Double real = 0.0;
@@ -458,7 +458,7 @@ public class GenerationService {
         }
     }
 
-    private void lineFdl(List<PointData> resultList, Date tomorrow,Date samedayZero, Date monthFirstZero, Date yearFirstZero, Date currentDate, AtomicReference<Double> qcrfdl, AtomicReference<Double> qcyfdl, AtomicReference<Double> qcnfdl, Map<String, Windpowerstationpointnew> linemap, Optional<Meterpoint> optionalMeterpoint) {
+    private void lineFdl(List<PointData> resultList, Date tomorrow,Date samedayZero, Date monthFirstZero, Date yearFirstZero, Date currentDate, AtomicReference<Double> qcrfdl, AtomicReference<Double> qcyfdl, AtomicReference<Double> qcnfdl, Map<String, ProBasicWppoint> linemap, Optional<ProBasicMeterPoint> optionalMeterpoint) {
         if (optionalMeterpoint.isPresent()){
             String pointid = optionalMeterpoint.get().getId();
             Double real = 0.0;
@@ -511,7 +511,7 @@ public class GenerationService {
 
 
 
-    private void windpowerFdl(List<PointData> resultList, Date currentDate, Map<String, Windpowerstationpointnew> wpmap, AtomicReference<Double> fcrswdl, AtomicReference<Double> fcyswdl, AtomicReference<Double> fcnswdl,String rcode,String ycode,String ncode) {
+    private void windpowerFdl(List<PointData> resultList, Date currentDate, Map<String, ProBasicWppoint> wpmap, AtomicReference<Double> fcrswdl, AtomicReference<Double> fcyswdl, AtomicReference<Double> fcnswdl,String rcode,String ycode,String ncode) {
         //风场日上网发电量
         PointData r = new PointData();
         r.setPointTime(currentDate.getTime());
@@ -538,7 +538,7 @@ public class GenerationService {
         resultList.add(n);
     }
 
-    private void qygsFdl(List<PointData> resultList, Map<String, Map<String, Windpowerstationpointnew>> wppointmap, Date currentDate, Double gsrfdl, Double gsyfdl, Double gsnfdl, AtomicReference<Double> fdrfdl, AtomicReference<Double> fdyfdl, AtomicReference<Double> fdnfdl, AtomicReference<Double> gfrfdl, AtomicReference<Double> gfyfdl, AtomicReference<Double> gfnfdl, String rcode, String ycode, String ncode) {
+    private void qygsFdl(List<PointData> resultList, Map<String, Map<String, ProBasicWppoint>> wppointmap, Date currentDate, Double gsrfdl, Double gsyfdl, Double gsnfdl, AtomicReference<Double> fdrfdl, AtomicReference<Double> fdyfdl, AtomicReference<Double> fdnfdl, AtomicReference<Double> gfrfdl, AtomicReference<Double> gfyfdl, AtomicReference<Double> gfnfdl, String rcode, String ycode, String ncode) {
         if (StringUtils.isNotEmpty(wppointmap.get("-1"))){
             PointData fdr = new PointData();
             fdr.setPointTime(currentDate.getTime());
@@ -623,7 +623,7 @@ public class GenerationService {
 
 
 
-    private void projectOrther(List<PointData> resultList, Date currentDate, AtomicReference<Double> fcrswdl, AtomicReference<Double> fcyswdl, AtomicReference<Double> fcnswdl, Map<String, Windpowerstationpointnew> projectmap, AtomicReference<Double> qcrswdl, AtomicReference<Double> qcyswdl, AtomicReference<Double> qcnswdl,String rcode,String ycode,String ncode) {
+    private void projectOrther(List<PointData> resultList, Date currentDate, AtomicReference<Double> fcrswdl, AtomicReference<Double> fcyswdl, AtomicReference<Double> fcnswdl, Map<String, ProBasicWppoint> projectmap, AtomicReference<Double> qcrswdl, AtomicReference<Double> qcyswdl, AtomicReference<Double> qcnswdl,String rcode,String ycode,String ncode) {
         //-------------------------------------------期次上网电量
         fcrswdl.updateAndGet(v -> new Double((double) (v + qcrswdl.get())));
         //期次日上网发电量
@@ -654,7 +654,7 @@ public class GenerationService {
         resultList.add(n);
     }
 
-    private void projectFdl(List<PointData> resultList, Date currentDate, AtomicReference<Double> fcrfdl, AtomicReference<Double> fcyfdl, AtomicReference<Double> fcnfdl, Map<String, Windpowerstationpointnew> projectmap, AtomicReference<Double> qcrfdl, AtomicReference<Double> qcyfdl, AtomicReference<Double> qcnfdl) {
+    private void projectFdl(List<PointData> resultList, Date currentDate, AtomicReference<Double> fcrfdl, AtomicReference<Double> fcyfdl, AtomicReference<Double> fcnfdl, Map<String, ProBasicWppoint> projectmap, AtomicReference<Double> qcrfdl, AtomicReference<Double> qcyfdl, AtomicReference<Double> qcnfdl) {
         //-------------------------------------------期次发电量
         fcrfdl.updateAndGet(v -> new Double((double) (v + qcrfdl.get())));
         //期次日发电量

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

@@ -25,15 +25,15 @@ import java.util.concurrent.atomic.AtomicReference;
 public class RealtimeSpeedPowerService {
     @Resource
     private IEdosUtil edosUtil;
-    private List<Windpowerstation> wpls;
-    private Map<String, List<Project>> wppromap;
-    private Map<String, List<Line>> prolinemap;
-    private Map<String, List<Windturbine>> linewtmap;
+    private List<ProBasicWindpowerstation> wpls;
+    private Map<String, List<ProBasicProject>> wppromap;
+    private Map<String, List<ProBasicLine>> prolinemap;
+    private Map<String, List<ProBasicWindturbine>> linewtmap;
     private Date currentDate;
-    private Map<String, Map<String, Windpowerstationpointnew>> wppointmap;
-    private Map<String, Map<String, Windpowerstationpointnew>> linepointmap;
-    private Map<String, Map<String, Windpowerstationpointnew>> propointmap;
-    private Map<String, Map<String, Windturbinetestingpointnew>> wtpAimap;
+    private Map<String, Map<String, ProBasicWppoint>> wppointmap;
+    private Map<String, Map<String, ProBasicWppoint>> linepointmap;
+    private Map<String, Map<String, ProBasicWppoint>> propointmap;
+    private Map<String, Map<String, ProBasicEquipmentPoint>> wtpAimap;
 
     private void init(){
         wpls = CacheContext.wpls;
@@ -57,29 +57,29 @@ public class RealtimeSpeedPowerService {
         wpls.stream().forEach(wp->{
             AtomicReference<Double> wpSpeed = new AtomicReference<>(0.0);
             AtomicReference<Double> wpPower = new AtomicReference<>(0.0);
-            Map<String, Windpowerstationpointnew> wppointnewMap = wppointmap.get(wp.getId());
-            Windpowerstationpointnew wpspeedpointnew = wppointnewMap.get(Contant.SSFS);
-            Windpowerstationpointnew wppowerpointnew = wppointnewMap.get(Contant.SSZGL);
+            Map<String, ProBasicWppoint> wppointnewMap = wppointmap.get(wp.getId());
+            ProBasicWppoint wpspeedpointnew = wppointnewMap.get(Contant.SSFS);
+            ProBasicWppoint wppowerpointnew = wppointnewMap.get(Contant.SSZGL);
             AtomicReference<Double> wpcount = new AtomicReference<>(0.0);
             wppromap.get(wp.getId()).stream().forEach(project -> {
                 AtomicReference<Double> projectSpeed = new AtomicReference<>(0.0);
                 AtomicReference<Double> projectPower = new AtomicReference<>(0.0);
-                Map<String, Windpowerstationpointnew> propointnewMap = propointmap.get(project.getId());
-                Windpowerstationpointnew prospeedpointnew = propointnewMap.get(Contant.SSFS);
-                Windpowerstationpointnew propowerpointnew = propointnewMap.get(Contant.SSZGL);
+                Map<String, ProBasicWppoint> propointnewMap = propointmap.get(project.getId());
+                ProBasicWppoint prospeedpointnew = propointnewMap.get(Contant.SSFS);
+                ProBasicWppoint propowerpointnew = propointnewMap.get(Contant.SSZGL);
                 AtomicReference<Double> procount = new AtomicReference<>(0.0);
                 prolinemap.get(project.getId()).stream().forEach(line->{
                     AtomicReference<Double> lineSpeed = new AtomicReference<>(0.0);
                     AtomicReference<Double> linePower = new AtomicReference<>(0.0);
-                    Map<String, Windpowerstationpointnew> linepointnewMap = linepointmap.get(line.getId());
-                    Windpowerstationpointnew linespeedpointnew = linepointnewMap.get(Contant.SSFS);
-                    Windpowerstationpointnew linepowerpointnew = linepointnewMap.get(Contant.SSZGL);
+                    Map<String, ProBasicWppoint> linepointnewMap = linepointmap.get(line.getId());
+                    ProBasicWppoint linespeedpointnew = linepointnewMap.get(Contant.SSFS);
+                    ProBasicWppoint linepowerpointnew = linepointnewMap.get(Contant.SSZGL);
                     AtomicReference<Double> count = new AtomicReference<>(0.0);
                     linewtmap.get(line.getId()).stream().forEach(wt->{
-                        Map<String, Windturbinetestingpointnew> windturbinetestingpointnewMap = wtpAimap.get(wt.getId());
-                        Windturbinetestingpointnew speedpoint = windturbinetestingpointnewMap.get(Contant.AI022);
-                        Windturbinetestingpointnew powerpoint = windturbinetestingpointnewMap.get(Contant.AI130);
-                        Windturbinetestingpointnew ztpoint = windturbinetestingpointnewMap.get(Contant.ZTMX);
+                        Map<String, ProBasicEquipmentPoint> windturbinetestingpointnewMap = wtpAimap.get(wt.getId());
+                        ProBasicEquipmentPoint speedpoint = windturbinetestingpointnewMap.get(Contant.AI022);
+                        ProBasicEquipmentPoint powerpoint = windturbinetestingpointnewMap.get(Contant.AI130);
+                        ProBasicEquipmentPoint ztpoint = windturbinetestingpointnewMap.get(Contant.ZTMX);
                         Boolean isOffline = false;
                         try {
                             Double ztvalue  = edosUtil.getRealData(ztpoint).getPointValueInDouble();
@@ -139,7 +139,7 @@ public class RealtimeSpeedPowerService {
 
     }
 
-    private PointData createWpPointData(Windpowerstationpointnew linepointnew, double linespeed) {
+    private PointData createWpPointData(ProBasicWppoint linepointnew, double linespeed) {
         PointData pointData = new PointData();
         pointData.setEdnaId(linepointnew.getCode());
         pointData.setPointTime(currentDate.getTime());