Merge branch 'master' of http://49.4.49.126:3000/GYEE_R.D/Gyee_Frame_NX

 Conflicts:

	src/main/java/com/gyee/frame/service/websocket/WpInfoPushService.java

src/main/java/com/gyee/frame/common/spring/InitialRedis.java

@@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.gyee.frame.common.cache.IGlobalCache;
 import com.gyee.frame.model.auto.*;
 import com.gyee.frame.model.custom.PointData;
-import com.gyee.frame.service.WindPowerstationTestingPointService;
+import com.gyee.frame.service.WindPowerstationTestingPoint2Service;
 import com.gyee.frame.service.WindTurbineTestingPointAiService;
 import com.gyee.frame.service.WindturbinepowercurvefittingService;
 import com.gyee.frame.util.DateUtils;
@@ -53,7 +53,7 @@ public  class InitialRedis {
 
 
 
-        WindPowerstationTestingPointService windPowerstationTestingPointService= SpringUtils.getBean("windPowerstationTestingPointService");
+        WindPowerstationTestingPoint2Service windPowerstationTestingPoint2Service= SpringUtils.getBean("windPowerstationTestingPoint2Service");
         WindTurbineTestingPointAiService windTurbineTestingPointAiService= SpringUtils.getBean("windTurbineTestingPointAiService");
         IGlobalCache globalCache= SpringUtils.getBean("globalCache");
 
@@ -89,8 +89,8 @@ public  class InitialRedis {
             for(Windpowerstation wp:InitialRunner.wpls)
             {
                 String wpId=wp.getId();
-                WindPowerStationTestingPoint2  gl = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SJGL);
-                WindPowerStationTestingPoint2  fs = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SSFS);
+                WindPowerStationTestingPoint2  gl = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SJGL);
+                WindPowerStationTestingPoint2  fs = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SSFS);
 
                 int daynum = DateUtils.daysDiff(beginDate, endDate);
                 long pried = 600 ;
@@ -133,7 +133,7 @@ public  class InitialRedis {
 
 
 
-        WindPowerstationTestingPointService windPowerstationTestingPointService= SpringUtils.getBean("windPowerstationTestingPointService");
+        WindPowerstationTestingPoint2Service windPowerstationTestingPoint2Service= SpringUtils.getBean("windPowerstationTestingPoint2Service");
         WindTurbineTestingPointAiService windTurbineTestingPointAiService= SpringUtils.getBean("windTurbineTestingPointAiService");
         IGlobalCache globalCache= SpringUtils.getBean("globalCache");
 
@@ -169,8 +169,8 @@ public  class InitialRedis {
             for(Project pj:InitialRunner.pjls)
             {
                 String wpId=pj.getId();
-                WindPowerStationTestingPoint2  gl = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SJGL);
-                WindPowerStationTestingPoint2  fs = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SSFS);
+                WindPowerStationTestingPoint2  gl = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SJGL);
+                WindPowerStationTestingPoint2  fs = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SSFS);
 
                 int daynum = DateUtils.daysDiff(beginDate, endDate);
                 long pried = 600 ;
@@ -213,7 +213,7 @@ public  class InitialRedis {
 
 
 
-        WindPowerstationTestingPointService windPowerstationTestingPointService= SpringUtils.getBean("windPowerstationTestingPointService");
+        WindPowerstationTestingPoint2Service windPowerstationTestingPoint2Service= SpringUtils.getBean("windPowerstationTestingPoint2Service");
         WindTurbineTestingPointAiService windTurbineTestingPointAiService= SpringUtils.getBean("windTurbineTestingPointAiService");
         IGlobalCache globalCache= SpringUtils.getBean("globalCache");
 
@@ -249,8 +249,8 @@ public  class InitialRedis {
             for(Line wp:InitialRunner.linels)
             {
                 String wpId=wp.getId();
-                WindPowerStationTestingPoint2  gl = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SJGL);
-                WindPowerStationTestingPoint2  fs = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SSFS);
+                WindPowerStationTestingPoint2  gl = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SJGL);
+                WindPowerStationTestingPoint2  fs = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SSFS);
 
                 int daynum = DateUtils.daysDiff(beginDate, endDate);
                 long pried = 600 ;

src/main/java/com/gyee/frame/common/spring/InitialRunner.java

@@ -33,7 +33,7 @@ public class InitialRunner implements CommandLineRunner {
     @Resource
     private WindturbineService windturbineService;
     @Resource
-    private WindPowerstationTestingPointService windPowerstationTestingPointService;
+    private WindPowerstationTestingPoint2Service windPowerstationTestingPoint2Service;
     @Resource
     private WindTurbineTestingPointAiService windTurbineTestingPointAiService;
     @Resource
@@ -415,7 +415,7 @@ public class InitialRunner implements CommandLineRunner {
 
 //        WindPowerStationTestingPoint2Example windPowerstationTestingPointExample=new WindPowerStationTestingPoint2Example();
 //        windPowerstationTestingPointExample.createCriteria().getAllCriteria();
-//        List<WindPowerStationTestingPoint2> wpPointlist= windPowerstationTestingPointService.selectByExample(windPowerstationTestingPointExample);
+//        List<WindPowerStationTestingPoint2> wpPointlist= windPowerstationTestingPoint2Service.selectByExample(windPowerstationTestingPointExample);
 //
 //        Map<String,WindPowerStationTestingPoint2> items=null;
 //        if(wpPointlist!=null && !wpPointlist.isEmpty()){
@@ -496,7 +496,7 @@ public class InitialRunner implements CommandLineRunner {
                 }
             }
         }
-        wppointnummap= windPowerstationTestingPointService.getWpPointTotal();
+       // wppointnummap= windPowerstationTestingPoint2Service.getWpPointTotal();
     }
 
 }

src/main/java/com/gyee/frame/controller/health/ReliabilityAnalysisController.java

@@ -0,0 +1,98 @@
+package com.gyee.frame.controller.health;
+
+
+import com.gyee.frame.common.conf.AjaxStatus;
+import com.gyee.frame.common.domain.AjaxResult;
+import com.gyee.frame.common.exception.enums.QiNiuErrorEnum;
+import com.gyee.frame.common.feign.RemoteServiceBuilder;
+import com.gyee.frame.model.auto.Metrics;
+import com.gyee.frame.model.auto.MetricsUniformCode;
+import com.gyee.frame.model.auto.WindTurbineTestingPointAi2;
+import com.gyee.frame.model.auto.WindTurbineTestingPointDi2;
+import com.gyee.frame.model.custom.export.TsPointData;
+import com.gyee.frame.service.Alertrule2ervice;
+import com.gyee.frame.service.WindTurbineTestingPointAiService;
+import com.gyee.frame.service.WindTurbineTestingPointDiService;
+import com.gyee.frame.service.health.MetricsService;
+import com.gyee.frame.service.health.MetricsUniformCodeService;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping("/analysis")
+@Api(value = "可靠性分析" ,tags =  "可靠性分析")
+public class ReliabilityAnalysisController {
+
+    @Resource
+    private Alertrule2ervice alertrule2ervice;
+    @Resource
+    private RemoteServiceBuilder remoteService;
+    @Resource
+    private MetricsService metricsService;
+    @Resource
+    private MetricsUniformCodeService uniformCodeService;
+    @Resource
+    private WindTurbineTestingPointAiService windAIService;
+    @Resource
+    private WindTurbineTestingPointDiService windDIService;
+
+
+    /**
+     * 查询报警规则中点的数据
+     * @param station
+     * @param wtId
+     * @param name
+     * @param startTs
+     * @param endTs
+     * @return
+     */
+    @GetMapping("/detail")
+    public AjaxResult analysisDetails(
+            @RequestParam(name = "station") String station,
+            @RequestParam(name = "wtId") String wtId,
+            @RequestParam(name = "name") String name,
+            @RequestParam(name = "startTs") long startTs,
+            @RequestParam(name = "endTs") long endTs){
+
+        List<Object> list = new ArrayList<>();
+
+        List<String> codes = alertrule2ervice.getUniformCodeByNameAndStation(name, station, wtId);
+        if (codes == null || codes.size() == 0)
+            return AjaxResult.successData(AjaxStatus.success.code, list);
+
+        for (String code : codes){
+            Map<String, Object> map = new HashMap<>();
+            if (code.startsWith("AI")){
+                WindTurbineTestingPointAi2 windAI = windAIService.getWindTurbineTestingPointAi2(wtId, code);
+                List<TsPointData> data = remoteService.ShardingService().getHistorySnap(windAI.getId(), startTs, endTs, 60);
+
+                // 查询点的单位和描述属性
+                String unit = "";
+                String desc = "";
+                List<MetricsUniformCode> metricsList = uniformCodeService.getListByStationAndUniforCode(station, windAI.getUniformcode());
+                if (metricsList != null && metricsList.size() > 0) {
+                    MetricsUniformCode metricsUniformCode = metricsList.get(0);
+                    List<Metrics> metrics = metricsService.getMetricsByMetricsId(metricsUniformCode.getMetricid());
+                    if (metrics != null && metrics.size() > 0){
+                        unit = metrics.get(0).getUnitname();
+                        desc = metrics.get(1).getMetricname();
+                    }
+                }
+                map.put("unit", unit);
+                map.put("name", desc);
+                map.put("data", data);
+
+                list.add(map);
+            }
+        }
+
+        return AjaxResult.successData(AjaxStatus.success.code, list);
+    }
+
+}

src/main/java/com/gyee/frame/controller/scatter/ScatterController.java

@@ -10,7 +10,7 @@ import com.gyee.frame.model.auto.WindPowerStationTestingPoint2;
 import com.gyee.frame.model.auto.WindTurbineTestingPointAi2;
 import com.gyee.frame.model.auto.Windturbinecurvefittingmonth;
 import com.gyee.frame.model.custom.PointData;
-import com.gyee.frame.service.WindPowerstationTestingPointService;
+import com.gyee.frame.service.WindPowerstationTestingPoint2Service;
 import com.gyee.frame.service.WindTurbineTestingPointAiService;
 import com.gyee.frame.service.WindturbinecurvefittingmonthService;
 import com.gyee.frame.util.DateUtils;
@@ -39,7 +39,7 @@ public class ScatterController {
     private WindturbinecurvefittingmonthService windturbinecurvefittingmonthService;
 
     @Resource
-    private WindPowerstationTestingPointService windPowerstationTestingPointService;
+    private WindPowerstationTestingPoint2Service windPowerstationTestingPoint2Service;
 
     @Resource
     private WindTurbineTestingPointAiService windTurbineTestingPointAiService;
@@ -103,15 +103,15 @@ public class ScatterController {
                 WindPowerStationTestingPoint2 fs = null;
 
                 if (StringUtils.notEmp(wpId)) {
-                    gl = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SJGL);
-                    fs = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SSFS);
+                    gl = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SJGL);
+                    fs = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SSFS);
                 } else if (StringUtils.notEmp(pjId)) {
-                    gl = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(pjId, Constant.TPOINT_WP_SJGL);
-                    fs = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SSFS);
+                    gl = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(pjId, Constant.TPOINT_WP_SJGL);
+                    fs = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SSFS);
 
                 } else if (StringUtils.notEmp(lnId)) {
-                    gl = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(lnId, Constant.TPOINT_WP_SJGL);
-                    fs = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SSFS);
+                    gl = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(lnId, Constant.TPOINT_WP_SJGL);
+                    fs = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SSFS);
                 }
 
 

src/main/java/com/gyee/frame/mapper/auto/MetricsMapper.java

@@ -0,0 +1,96 @@
+package com.gyee.frame.mapper.auto;
+
+import com.gyee.frame.model.auto.Metrics;
+import com.gyee.frame.model.auto.MetricsExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface MetricsMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table METRICS
+     *
+     * @mbg.generated
+     */
+    long countByExample(MetricsExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table METRICS
+     *
+     * @mbg.generated
+     */
+    int deleteByExample(MetricsExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table METRICS
+     *
+     * @mbg.generated
+     */
+    int deleteByPrimaryKey(Short id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table METRICS
+     *
+     * @mbg.generated
+     */
+    int insert(Metrics record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table METRICS
+     *
+     * @mbg.generated
+     */
+    int insertSelective(Metrics record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table METRICS
+     *
+     * @mbg.generated
+     */
+    List<Metrics> selectByExample(MetricsExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table METRICS
+     *
+     * @mbg.generated
+     */
+    Metrics selectByPrimaryKey(Short id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table METRICS
+     *
+     * @mbg.generated
+     */
+    int updateByExampleSelective(@Param("record") Metrics record, @Param("example") MetricsExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table METRICS
+     *
+     * @mbg.generated
+     */
+    int updateByExample(@Param("record") Metrics record, @Param("example") MetricsExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table METRICS
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKeySelective(Metrics record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table METRICS
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKey(Metrics record);
+}

src/main/java/com/gyee/frame/mapper/auto/MetricsUniformCodeMapper.java

@@ -0,0 +1,96 @@
+package com.gyee.frame.mapper.auto;
+
+import com.gyee.frame.model.auto.MetricsUniformCode;
+import com.gyee.frame.model.auto.MetricsUniformCodeExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface MetricsUniformCodeMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table METRICS_UNIFORMCODE
+     *
+     * @mbg.generated
+     */
+    long countByExample(MetricsUniformCodeExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table METRICS_UNIFORMCODE
+     *
+     * @mbg.generated
+     */
+    int deleteByExample(MetricsUniformCodeExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table METRICS_UNIFORMCODE
+     *
+     * @mbg.generated
+     */
+    int deleteByPrimaryKey(Short id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table METRICS_UNIFORMCODE
+     *
+     * @mbg.generated
+     */
+    int insert(MetricsUniformCode record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table METRICS_UNIFORMCODE
+     *
+     * @mbg.generated
+     */
+    int insertSelective(MetricsUniformCode record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table METRICS_UNIFORMCODE
+     *
+     * @mbg.generated
+     */
+    List<MetricsUniformCode> selectByExample(MetricsUniformCodeExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table METRICS_UNIFORMCODE
+     *
+     * @mbg.generated
+     */
+    MetricsUniformCode selectByPrimaryKey(Short id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table METRICS_UNIFORMCODE
+     *
+     * @mbg.generated
+     */
+    int updateByExampleSelective(@Param("record") MetricsUniformCode record, @Param("example") MetricsUniformCodeExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table METRICS_UNIFORMCODE
+     *
+     * @mbg.generated
+     */
+    int updateByExample(@Param("record") MetricsUniformCode record, @Param("example") MetricsUniformCodeExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table METRICS_UNIFORMCODE
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKeySelective(MetricsUniformCode record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table METRICS_UNIFORMCODE
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKey(MetricsUniformCode record);
+}

src/main/java/com/gyee/frame/mapper/auto/WindPowerStationTestingPointMapper.java

@@ -0,0 +1,101 @@
+package com.gyee.frame.mapper.auto;
+
+import com.gyee.frame.model.auto.WindPowerStationTestingPoint;
+import com.gyee.frame.model.auto.WindPowerStationTestingPointExample;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface WindPowerStationTestingPointMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WINDPOWERSTATIONTESTINGPOINT
+     *
+     * @mbg.generated
+     */
+    long countByExample(WindPowerStationTestingPointExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WINDPOWERSTATIONTESTINGPOINT
+     *
+     * @mbg.generated
+     */
+    int deleteByExample(WindPowerStationTestingPointExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WINDPOWERSTATIONTESTINGPOINT
+     *
+     * @mbg.generated
+     */
+    int deleteByPrimaryKey(String code);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WINDPOWERSTATIONTESTINGPOINT
+     *
+     * @mbg.generated
+     */
+    int insert(WindPowerStationTestingPoint record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WINDPOWERSTATIONTESTINGPOINT
+     *
+     * @mbg.generated
+     */
+    int insertSelective(WindPowerStationTestingPoint record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WINDPOWERSTATIONTESTINGPOINT
+     *
+     * @mbg.generated
+     */
+    List<WindPowerStationTestingPoint> selectByExample(WindPowerStationTestingPointExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WINDPOWERSTATIONTESTINGPOINT
+     *
+     * @mbg.generated
+     */
+    WindPowerStationTestingPoint selectByPrimaryKey(String code);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WINDPOWERSTATIONTESTINGPOINT
+     *
+     * @mbg.generated
+     */
+    int updateByExampleSelective(@Param("record") WindPowerStationTestingPoint record, @Param("example") WindPowerStationTestingPointExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WINDPOWERSTATIONTESTINGPOINT
+     *
+     * @mbg.generated
+     */
+    int updateByExample(@Param("record") WindPowerStationTestingPoint record, @Param("example") WindPowerStationTestingPointExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WINDPOWERSTATIONTESTINGPOINT
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKeySelective(WindPowerStationTestingPoint record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WINDPOWERSTATIONTESTINGPOINT
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKey(WindPowerStationTestingPoint record);
+
+    int deleteAll();
+
+    int insertBatch(List<WindPowerStationTestingPoint> ls);
+}

src/main/java/com/gyee/frame/mapper/auto/WindpowerstationstandardpointMapper.java

@@ -0,0 +1,97 @@
+package com.gyee.frame.mapper.auto;
+
+import com.gyee.frame.model.auto.Windpowerstationstandardpoint;
+import com.gyee.frame.model.auto.WindpowerstationstandardpointExample;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface WindpowerstationstandardpointMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WINDPOWERSTATIONSTANDARDPOINT
+     *
+     * @mbg.generated
+     */
+    long countByExample(WindpowerstationstandardpointExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WINDPOWERSTATIONSTANDARDPOINT
+     *
+     * @mbg.generated
+     */
+    int deleteByExample(WindpowerstationstandardpointExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WINDPOWERSTATIONSTANDARDPOINT
+     *
+     * @mbg.generated
+     */
+    int deleteByPrimaryKey(String id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WINDPOWERSTATIONSTANDARDPOINT
+     *
+     * @mbg.generated
+     */
+    int insert(Windpowerstationstandardpoint record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WINDPOWERSTATIONSTANDARDPOINT
+     *
+     * @mbg.generated
+     */
+    int insertSelective(Windpowerstationstandardpoint record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WINDPOWERSTATIONSTANDARDPOINT
+     *
+     * @mbg.generated
+     */
+    List<Windpowerstationstandardpoint> selectByExample(WindpowerstationstandardpointExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WINDPOWERSTATIONSTANDARDPOINT
+     *
+     * @mbg.generated
+     */
+    Windpowerstationstandardpoint selectByPrimaryKey(String id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WINDPOWERSTATIONSTANDARDPOINT
+     *
+     * @mbg.generated
+     */
+    int updateByExampleSelective(@Param("record") Windpowerstationstandardpoint record, @Param("example") WindpowerstationstandardpointExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WINDPOWERSTATIONSTANDARDPOINT
+     *
+     * @mbg.generated
+     */
+    int updateByExample(@Param("record") Windpowerstationstandardpoint record, @Param("example") WindpowerstationstandardpointExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WINDPOWERSTATIONSTANDARDPOINT
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKeySelective(Windpowerstationstandardpoint record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WINDPOWERSTATIONSTANDARDPOINT
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKey(Windpowerstationstandardpoint record);
+}

src/main/java/com/gyee/frame/mapper/auto/WindturbinestandardpointMapper.java

@@ -2,9 +2,10 @@ package com.gyee.frame.mapper.auto;
 
 import com.gyee.frame.model.auto.Windturbinestandardpoint;
 import com.gyee.frame.model.auto.WindturbinestandardpointExample;
-import java.util.List;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 public interface WindturbinestandardpointMapper {
     /**
      * This method was generated by MyBatis Generator.
@@ -93,4 +94,7 @@ public interface WindturbinestandardpointMapper {
      * @mbg.generated
      */
     int updateByPrimaryKey(Windturbinestandardpoint record);
+
+    int deleteAll();
+
 }

src/main/java/com/gyee/frame/mapper/auto/WindturbinetestingpointMapper.java

@@ -94,4 +94,9 @@ public interface WindturbinetestingpointMapper {
      * @mbg.generated
      */
     int updateByPrimaryKey(Windturbinetestingpoint record);
+
+    int deleteAll();
+
+    int insertBatch(List<Windturbinetestingpoint> ls);
+
 }

src/main/java/com/gyee/frame/model/auto/Metrics.java

@@ -0,0 +1,574 @@
+package com.gyee.frame.model.auto;
+
+import java.io.Serializable;
+
+public class Metrics implements Serializable {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column METRICS.ID
+     *
+     * @mbg.generated
+     */
+    private Short id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column METRICS.THING
+     *
+     * @mbg.generated
+     */
+    private String thing;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column METRICS.METRICID
+     *
+     * @mbg.generated
+     */
+    private String metricid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column METRICS.METRICNAME
+     *
+     * @mbg.generated
+     */
+    private String metricname;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column METRICS.UNITNAME
+     *
+     * @mbg.generated
+     */
+    private String unitname;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column METRICS.UNITNAMECN
+     *
+     * @mbg.generated
+     */
+    private String unitnamecn;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column METRICS.THINGSUB
+     *
+     * @mbg.generated
+     */
+    private String thingsub;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column METRICS.THINGSUBSUB
+     *
+     * @mbg.generated
+     */
+    private String thingsubsub;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column METRICS.CATEGORYDATA
+     *
+     * @mbg.generated
+     */
+    private String categorydata;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column METRICS.CATEGORYSCI
+     *
+     * @mbg.generated
+     */
+    private String categorysci;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column METRICS.CATEGORYSYS
+     *
+     * @mbg.generated
+     */
+    private String categorysys;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column METRICS.CATEGORYRES1
+     *
+     * @mbg.generated
+     */
+    private String categoryres1;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column METRICS.CATEGORYRES2
+     *
+     * @mbg.generated
+     */
+    private String categoryres2;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column METRICS.CATEGORYRES3
+     *
+     * @mbg.generated
+     */
+    private String categoryres3;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column METRICS.CATEGORYRES4
+     *
+     * @mbg.generated
+     */
+    private String categoryres4;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column METRICS.CATEGORYRES5
+     *
+     * @mbg.generated
+     */
+    private String categoryres5;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column METRICS.DESCRIPTION
+     *
+     * @mbg.generated
+     */
+    private String description;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table METRICS
+     *
+     * @mbg.generated
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column METRICS.ID
+     *
+     * @return the value of METRICS.ID
+     *
+     * @mbg.generated
+     */
+    public Short getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column METRICS.ID
+     *
+     * @param id the value for METRICS.ID
+     *
+     * @mbg.generated
+     */
+    public void setId(Short id) {
+        this.id = id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column METRICS.THING
+     *
+     * @return the value of METRICS.THING
+     *
+     * @mbg.generated
+     */
+    public String getThing() {
+        return thing;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column METRICS.THING
+     *
+     * @param thing the value for METRICS.THING
+     *
+     * @mbg.generated
+     */
+    public void setThing(String thing) {
+        this.thing = thing == null ? null : thing.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column METRICS.METRICID
+     *
+     * @return the value of METRICS.METRICID
+     *
+     * @mbg.generated
+     */
+    public String getMetricid() {
+        return metricid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column METRICS.METRICID
+     *
+     * @param metricid the value for METRICS.METRICID
+     *
+     * @mbg.generated
+     */
+    public void setMetricid(String metricid) {
+        this.metricid = metricid == null ? null : metricid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column METRICS.METRICNAME
+     *
+     * @return the value of METRICS.METRICNAME
+     *
+     * @mbg.generated
+     */
+    public String getMetricname() {
+        return metricname;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column METRICS.METRICNAME
+     *
+     * @param metricname the value for METRICS.METRICNAME
+     *
+     * @mbg.generated
+     */
+    public void setMetricname(String metricname) {
+        this.metricname = metricname == null ? null : metricname.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column METRICS.UNITNAME
+     *
+     * @return the value of METRICS.UNITNAME
+     *
+     * @mbg.generated
+     */
+    public String getUnitname() {
+        return unitname;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column METRICS.UNITNAME
+     *
+     * @param unitname the value for METRICS.UNITNAME
+     *
+     * @mbg.generated
+     */
+    public void setUnitname(String unitname) {
+        this.unitname = unitname == null ? null : unitname.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column METRICS.UNITNAMECN
+     *
+     * @return the value of METRICS.UNITNAMECN
+     *
+     * @mbg.generated
+     */
+    public String getUnitnamecn() {
+        return unitnamecn;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column METRICS.UNITNAMECN
+     *
+     * @param unitnamecn the value for METRICS.UNITNAMECN
+     *
+     * @mbg.generated
+     */
+    public void setUnitnamecn(String unitnamecn) {
+        this.unitnamecn = unitnamecn == null ? null : unitnamecn.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column METRICS.THINGSUB
+     *
+     * @return the value of METRICS.THINGSUB
+     *
+     * @mbg.generated
+     */
+    public String getThingsub() {
+        return thingsub;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column METRICS.THINGSUB
+     *
+     * @param thingsub the value for METRICS.THINGSUB
+     *
+     * @mbg.generated
+     */
+    public void setThingsub(String thingsub) {
+        this.thingsub = thingsub == null ? null : thingsub.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column METRICS.THINGSUBSUB
+     *
+     * @return the value of METRICS.THINGSUBSUB
+     *
+     * @mbg.generated
+     */
+    public String getThingsubsub() {
+        return thingsubsub;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column METRICS.THINGSUBSUB
+     *
+     * @param thingsubsub the value for METRICS.THINGSUBSUB
+     *
+     * @mbg.generated
+     */
+    public void setThingsubsub(String thingsubsub) {
+        this.thingsubsub = thingsubsub == null ? null : thingsubsub.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column METRICS.CATEGORYDATA
+     *
+     * @return the value of METRICS.CATEGORYDATA
+     *
+     * @mbg.generated
+     */
+    public String getCategorydata() {
+        return categorydata;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column METRICS.CATEGORYDATA
+     *
+     * @param categorydata the value for METRICS.CATEGORYDATA
+     *
+     * @mbg.generated
+     */
+    public void setCategorydata(String categorydata) {
+        this.categorydata = categorydata == null ? null : categorydata.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column METRICS.CATEGORYSCI
+     *
+     * @return the value of METRICS.CATEGORYSCI
+     *
+     * @mbg.generated
+     */
+    public String getCategorysci() {
+        return categorysci;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column METRICS.CATEGORYSCI
+     *
+     * @param categorysci the value for METRICS.CATEGORYSCI
+     *
+     * @mbg.generated
+     */
+    public void setCategorysci(String categorysci) {
+        this.categorysci = categorysci == null ? null : categorysci.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column METRICS.CATEGORYSYS
+     *
+     * @return the value of METRICS.CATEGORYSYS
+     *
+     * @mbg.generated
+     */
+    public String getCategorysys() {
+        return categorysys;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column METRICS.CATEGORYSYS
+     *
+     * @param categorysys the value for METRICS.CATEGORYSYS
+     *
+     * @mbg.generated
+     */
+    public void setCategorysys(String categorysys) {
+        this.categorysys = categorysys == null ? null : categorysys.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column METRICS.CATEGORYRES1
+     *
+     * @return the value of METRICS.CATEGORYRES1
+     *
+     * @mbg.generated
+     */
+    public String getCategoryres1() {
+        return categoryres1;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column METRICS.CATEGORYRES1
+     *
+     * @param categoryres1 the value for METRICS.CATEGORYRES1
+     *
+     * @mbg.generated
+     */
+    public void setCategoryres1(String categoryres1) {
+        this.categoryres1 = categoryres1 == null ? null : categoryres1.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column METRICS.CATEGORYRES2
+     *
+     * @return the value of METRICS.CATEGORYRES2
+     *
+     * @mbg.generated
+     */
+    public String getCategoryres2() {
+        return categoryres2;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column METRICS.CATEGORYRES2
+     *
+     * @param categoryres2 the value for METRICS.CATEGORYRES2
+     *
+     * @mbg.generated
+     */
+    public void setCategoryres2(String categoryres2) {
+        this.categoryres2 = categoryres2 == null ? null : categoryres2.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column METRICS.CATEGORYRES3
+     *
+     * @return the value of METRICS.CATEGORYRES3
+     *
+     * @mbg.generated
+     */
+    public String getCategoryres3() {
+        return categoryres3;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column METRICS.CATEGORYRES3
+     *
+     * @param categoryres3 the value for METRICS.CATEGORYRES3
+     *
+     * @mbg.generated
+     */
+    public void setCategoryres3(String categoryres3) {
+        this.categoryres3 = categoryres3 == null ? null : categoryres3.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column METRICS.CATEGORYRES4
+     *
+     * @return the value of METRICS.CATEGORYRES4
+     *
+     * @mbg.generated
+     */
+    public String getCategoryres4() {
+        return categoryres4;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column METRICS.CATEGORYRES4
+     *
+     * @param categoryres4 the value for METRICS.CATEGORYRES4
+     *
+     * @mbg.generated
+     */
+    public void setCategoryres4(String categoryres4) {
+        this.categoryres4 = categoryres4 == null ? null : categoryres4.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column METRICS.CATEGORYRES5
+     *
+     * @return the value of METRICS.CATEGORYRES5
+     *
+     * @mbg.generated
+     */
+    public String getCategoryres5() {
+        return categoryres5;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column METRICS.CATEGORYRES5
+     *
+     * @param categoryres5 the value for METRICS.CATEGORYRES5
+     *
+     * @mbg.generated
+     */
+    public void setCategoryres5(String categoryres5) {
+        this.categoryres5 = categoryres5 == null ? null : categoryres5.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column METRICS.DESCRIPTION
+     *
+     * @return the value of METRICS.DESCRIPTION
+     *
+     * @mbg.generated
+     */
+    public String getDescription() {
+        return description;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column METRICS.DESCRIPTION
+     *
+     * @param description the value for METRICS.DESCRIPTION
+     *
+     * @mbg.generated
+     */
+    public void setDescription(String description) {
+        this.description = description == null ? null : description.trim();
+    }
+}

src/main/java/com/gyee/frame/model/auto/MetricsUniformCode.java

@@ -0,0 +1,244 @@
+package com.gyee.frame.model.auto;
+
+import java.io.Serializable;
+
+public class MetricsUniformCode implements Serializable {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column METRICS_UNIFORMCODE.ID
+     *
+     * @mbg.generated
+     */
+    private Short id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column METRICS_UNIFORMCODE.THING
+     *
+     * @mbg.generated
+     */
+    private String thing;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column METRICS_UNIFORMCODE.METRICID
+     *
+     * @mbg.generated
+     */
+    private String metricid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column METRICS_UNIFORMCODE.MODEL
+     *
+     * @mbg.generated
+     */
+    private String model;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column METRICS_UNIFORMCODE.STATIONID
+     *
+     * @mbg.generated
+     */
+    private String stationid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column METRICS_UNIFORMCODE.UNIFORMCODE
+     *
+     * @mbg.generated
+     */
+    private String uniformcode;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column METRICS_UNIFORMCODE.MULTIPLIER
+     *
+     * @mbg.generated
+     */
+    private Short multiplier;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table METRICS_UNIFORMCODE
+     *
+     * @mbg.generated
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column METRICS_UNIFORMCODE.ID
+     *
+     * @return the value of METRICS_UNIFORMCODE.ID
+     *
+     * @mbg.generated
+     */
+    public Short getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column METRICS_UNIFORMCODE.ID
+     *
+     * @param id the value for METRICS_UNIFORMCODE.ID
+     *
+     * @mbg.generated
+     */
+    public void setId(Short id) {
+        this.id = id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column METRICS_UNIFORMCODE.THING
+     *
+     * @return the value of METRICS_UNIFORMCODE.THING
+     *
+     * @mbg.generated
+     */
+    public String getThing() {
+        return thing;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column METRICS_UNIFORMCODE.THING
+     *
+     * @param thing the value for METRICS_UNIFORMCODE.THING
+     *
+     * @mbg.generated
+     */
+    public void setThing(String thing) {
+        this.thing = thing == null ? null : thing.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column METRICS_UNIFORMCODE.METRICID
+     *
+     * @return the value of METRICS_UNIFORMCODE.METRICID
+     *
+     * @mbg.generated
+     */
+    public String getMetricid() {
+        return metricid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column METRICS_UNIFORMCODE.METRICID
+     *
+     * @param metricid the value for METRICS_UNIFORMCODE.METRICID
+     *
+     * @mbg.generated
+     */
+    public void setMetricid(String metricid) {
+        this.metricid = metricid == null ? null : metricid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column METRICS_UNIFORMCODE.MODEL
+     *
+     * @return the value of METRICS_UNIFORMCODE.MODEL
+     *
+     * @mbg.generated
+     */
+    public String getModel() {
+        return model;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column METRICS_UNIFORMCODE.MODEL
+     *
+     * @param model the value for METRICS_UNIFORMCODE.MODEL
+     *
+     * @mbg.generated
+     */
+    public void setModel(String model) {
+        this.model = model == null ? null : model.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column METRICS_UNIFORMCODE.STATIONID
+     *
+     * @return the value of METRICS_UNIFORMCODE.STATIONID
+     *
+     * @mbg.generated
+     */
+    public String getStationid() {
+        return stationid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column METRICS_UNIFORMCODE.STATIONID
+     *
+     * @param stationid the value for METRICS_UNIFORMCODE.STATIONID
+     *
+     * @mbg.generated
+     */
+    public void setStationid(String stationid) {
+        this.stationid = stationid == null ? null : stationid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column METRICS_UNIFORMCODE.UNIFORMCODE
+     *
+     * @return the value of METRICS_UNIFORMCODE.UNIFORMCODE
+     *
+     * @mbg.generated
+     */
+    public String getUniformcode() {
+        return uniformcode;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column METRICS_UNIFORMCODE.UNIFORMCODE
+     *
+     * @param uniformcode the value for METRICS_UNIFORMCODE.UNIFORMCODE
+     *
+     * @mbg.generated
+     */
+    public void setUniformcode(String uniformcode) {
+        this.uniformcode = uniformcode == null ? null : uniformcode.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column METRICS_UNIFORMCODE.MULTIPLIER
+     *
+     * @return the value of METRICS_UNIFORMCODE.MULTIPLIER
+     *
+     * @mbg.generated
+     */
+    public Short getMultiplier() {
+        return multiplier;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column METRICS_UNIFORMCODE.MULTIPLIER
+     *
+     * @param multiplier the value for METRICS_UNIFORMCODE.MULTIPLIER
+     *
+     * @mbg.generated
+     */
+    public void setMultiplier(Short multiplier) {
+        this.multiplier = multiplier;
+    }
+}

src/main/java/com/gyee/frame/model/auto/MetricsUniformCodeExample.java

@@ -0,0 +1,772 @@
+package com.gyee.frame.model.auto;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class MetricsUniformCodeExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table METRICS_UNIFORMCODE
+     *
+     * @mbg.generated
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table METRICS_UNIFORMCODE
+     *
+     * @mbg.generated
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table METRICS_UNIFORMCODE
+     *
+     * @mbg.generated
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table METRICS_UNIFORMCODE
+     *
+     * @mbg.generated
+     */
+    public MetricsUniformCodeExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table METRICS_UNIFORMCODE
+     *
+     * @mbg.generated
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table METRICS_UNIFORMCODE
+     *
+     * @mbg.generated
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table METRICS_UNIFORMCODE
+     *
+     * @mbg.generated
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table METRICS_UNIFORMCODE
+     *
+     * @mbg.generated
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table METRICS_UNIFORMCODE
+     *
+     * @mbg.generated
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table METRICS_UNIFORMCODE
+     *
+     * @mbg.generated
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table METRICS_UNIFORMCODE
+     *
+     * @mbg.generated
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table METRICS_UNIFORMCODE
+     *
+     * @mbg.generated
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table METRICS_UNIFORMCODE
+     *
+     * @mbg.generated
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table METRICS_UNIFORMCODE
+     *
+     * @mbg.generated
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table METRICS_UNIFORMCODE
+     *
+     * @mbg.generated
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Short value) {
+            addCriterion("ID =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Short value) {
+            addCriterion("ID <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Short value) {
+            addCriterion("ID >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Short value) {
+            addCriterion("ID >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Short value) {
+            addCriterion("ID <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Short value) {
+            addCriterion("ID <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Short> values) {
+            addCriterion("ID in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Short> values) {
+            addCriterion("ID not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Short value1, Short value2) {
+            addCriterion("ID between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Short value1, Short value2) {
+            addCriterion("ID not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andThingIsNull() {
+            addCriterion("THING is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andThingIsNotNull() {
+            addCriterion("THING is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andThingEqualTo(String value) {
+            addCriterion("THING =", value, "thing");
+            return (Criteria) this;
+        }
+
+        public Criteria andThingNotEqualTo(String value) {
+            addCriterion("THING <>", value, "thing");
+            return (Criteria) this;
+        }
+
+        public Criteria andThingGreaterThan(String value) {
+            addCriterion("THING >", value, "thing");
+            return (Criteria) this;
+        }
+
+        public Criteria andThingGreaterThanOrEqualTo(String value) {
+            addCriterion("THING >=", value, "thing");
+            return (Criteria) this;
+        }
+
+        public Criteria andThingLessThan(String value) {
+            addCriterion("THING <", value, "thing");
+            return (Criteria) this;
+        }
+
+        public Criteria andThingLessThanOrEqualTo(String value) {
+            addCriterion("THING <=", value, "thing");
+            return (Criteria) this;
+        }
+
+        public Criteria andThingLike(String value) {
+            addCriterion("THING like", value, "thing");
+            return (Criteria) this;
+        }
+
+        public Criteria andThingNotLike(String value) {
+            addCriterion("THING not like", value, "thing");
+            return (Criteria) this;
+        }
+
+        public Criteria andThingIn(List<String> values) {
+            addCriterion("THING in", values, "thing");
+            return (Criteria) this;
+        }
+
+        public Criteria andThingNotIn(List<String> values) {
+            addCriterion("THING not in", values, "thing");
+            return (Criteria) this;
+        }
+
+        public Criteria andThingBetween(String value1, String value2) {
+            addCriterion("THING between", value1, value2, "thing");
+            return (Criteria) this;
+        }
+
+        public Criteria andThingNotBetween(String value1, String value2) {
+            addCriterion("THING not between", value1, value2, "thing");
+            return (Criteria) this;
+        }
+
+        public Criteria andMetricidIsNull() {
+            addCriterion("METRICID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMetricidIsNotNull() {
+            addCriterion("METRICID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMetricidEqualTo(String value) {
+            addCriterion("METRICID =", value, "metricid");
+            return (Criteria) this;
+        }
+
+        public Criteria andMetricidNotEqualTo(String value) {
+            addCriterion("METRICID <>", value, "metricid");
+            return (Criteria) this;
+        }
+
+        public Criteria andMetricidGreaterThan(String value) {
+            addCriterion("METRICID >", value, "metricid");
+            return (Criteria) this;
+        }
+
+        public Criteria andMetricidGreaterThanOrEqualTo(String value) {
+            addCriterion("METRICID >=", value, "metricid");
+            return (Criteria) this;
+        }
+
+        public Criteria andMetricidLessThan(String value) {
+            addCriterion("METRICID <", value, "metricid");
+            return (Criteria) this;
+        }
+
+        public Criteria andMetricidLessThanOrEqualTo(String value) {
+            addCriterion("METRICID <=", value, "metricid");
+            return (Criteria) this;
+        }
+
+        public Criteria andMetricidLike(String value) {
+            addCriterion("METRICID like", value, "metricid");
+            return (Criteria) this;
+        }
+
+        public Criteria andMetricidNotLike(String value) {
+            addCriterion("METRICID not like", value, "metricid");
+            return (Criteria) this;
+        }
+
+        public Criteria andMetricidIn(List<String> values) {
+            addCriterion("METRICID in", values, "metricid");
+            return (Criteria) this;
+        }
+
+        public Criteria andMetricidNotIn(List<String> values) {
+            addCriterion("METRICID not in", values, "metricid");
+            return (Criteria) this;
+        }
+
+        public Criteria andMetricidBetween(String value1, String value2) {
+            addCriterion("METRICID between", value1, value2, "metricid");
+            return (Criteria) this;
+        }
+
+        public Criteria andMetricidNotBetween(String value1, String value2) {
+            addCriterion("METRICID not between", value1, value2, "metricid");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelIsNull() {
+            addCriterion("MODEL is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelIsNotNull() {
+            addCriterion("MODEL is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelEqualTo(String value) {
+            addCriterion("MODEL =", value, "model");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelNotEqualTo(String value) {
+            addCriterion("MODEL <>", value, "model");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelGreaterThan(String value) {
+            addCriterion("MODEL >", value, "model");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelGreaterThanOrEqualTo(String value) {
+            addCriterion("MODEL >=", value, "model");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelLessThan(String value) {
+            addCriterion("MODEL <", value, "model");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelLessThanOrEqualTo(String value) {
+            addCriterion("MODEL <=", value, "model");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelLike(String value) {
+            addCriterion("MODEL like", value, "model");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelNotLike(String value) {
+            addCriterion("MODEL not like", value, "model");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelIn(List<String> values) {
+            addCriterion("MODEL in", values, "model");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelNotIn(List<String> values) {
+            addCriterion("MODEL not in", values, "model");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelBetween(String value1, String value2) {
+            addCriterion("MODEL between", value1, value2, "model");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelNotBetween(String value1, String value2) {
+            addCriterion("MODEL not between", value1, value2, "model");
+            return (Criteria) this;
+        }
+
+        public Criteria andStationidIsNull() {
+            addCriterion("STATIONID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStationidIsNotNull() {
+            addCriterion("STATIONID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStationidEqualTo(String value) {
+            addCriterion("STATIONID =", value, "stationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andStationidNotEqualTo(String value) {
+            addCriterion("STATIONID <>", value, "stationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andStationidGreaterThan(String value) {
+            addCriterion("STATIONID >", value, "stationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andStationidGreaterThanOrEqualTo(String value) {
+            addCriterion("STATIONID >=", value, "stationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andStationidLessThan(String value) {
+            addCriterion("STATIONID <", value, "stationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andStationidLessThanOrEqualTo(String value) {
+            addCriterion("STATIONID <=", value, "stationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andStationidLike(String value) {
+            addCriterion("STATIONID like", value, "stationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andStationidNotLike(String value) {
+            addCriterion("STATIONID not like", value, "stationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andStationidIn(List<String> values) {
+            addCriterion("STATIONID in", values, "stationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andStationidNotIn(List<String> values) {
+            addCriterion("STATIONID not in", values, "stationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andStationidBetween(String value1, String value2) {
+            addCriterion("STATIONID between", value1, value2, "stationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andStationidNotBetween(String value1, String value2) {
+            addCriterion("STATIONID not between", value1, value2, "stationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniformcodeIsNull() {
+            addCriterion("UNIFORMCODE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniformcodeIsNotNull() {
+            addCriterion("UNIFORMCODE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniformcodeEqualTo(String value) {
+            addCriterion("UNIFORMCODE =", value, "uniformcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniformcodeNotEqualTo(String value) {
+            addCriterion("UNIFORMCODE <>", value, "uniformcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniformcodeGreaterThan(String value) {
+            addCriterion("UNIFORMCODE >", value, "uniformcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniformcodeGreaterThanOrEqualTo(String value) {
+            addCriterion("UNIFORMCODE >=", value, "uniformcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniformcodeLessThan(String value) {
+            addCriterion("UNIFORMCODE <", value, "uniformcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniformcodeLessThanOrEqualTo(String value) {
+            addCriterion("UNIFORMCODE <=", value, "uniformcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniformcodeLike(String value) {
+            addCriterion("UNIFORMCODE like", value, "uniformcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniformcodeNotLike(String value) {
+            addCriterion("UNIFORMCODE not like", value, "uniformcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniformcodeIn(List<String> values) {
+            addCriterion("UNIFORMCODE in", values, "uniformcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniformcodeNotIn(List<String> values) {
+            addCriterion("UNIFORMCODE not in", values, "uniformcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniformcodeBetween(String value1, String value2) {
+            addCriterion("UNIFORMCODE between", value1, value2, "uniformcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniformcodeNotBetween(String value1, String value2) {
+            addCriterion("UNIFORMCODE not between", value1, value2, "uniformcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andMultiplierIsNull() {
+            addCriterion("MULTIPLIER is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMultiplierIsNotNull() {
+            addCriterion("MULTIPLIER is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMultiplierEqualTo(Short value) {
+            addCriterion("MULTIPLIER =", value, "multiplier");
+            return (Criteria) this;
+        }
+
+        public Criteria andMultiplierNotEqualTo(Short value) {
+            addCriterion("MULTIPLIER <>", value, "multiplier");
+            return (Criteria) this;
+        }
+
+        public Criteria andMultiplierGreaterThan(Short value) {
+            addCriterion("MULTIPLIER >", value, "multiplier");
+            return (Criteria) this;
+        }
+
+        public Criteria andMultiplierGreaterThanOrEqualTo(Short value) {
+            addCriterion("MULTIPLIER >=", value, "multiplier");
+            return (Criteria) this;
+        }
+
+        public Criteria andMultiplierLessThan(Short value) {
+            addCriterion("MULTIPLIER <", value, "multiplier");
+            return (Criteria) this;
+        }
+
+        public Criteria andMultiplierLessThanOrEqualTo(Short value) {
+            addCriterion("MULTIPLIER <=", value, "multiplier");
+            return (Criteria) this;
+        }
+
+        public Criteria andMultiplierIn(List<Short> values) {
+            addCriterion("MULTIPLIER in", values, "multiplier");
+            return (Criteria) this;
+        }
+
+        public Criteria andMultiplierNotIn(List<Short> values) {
+            addCriterion("MULTIPLIER not in", values, "multiplier");
+            return (Criteria) this;
+        }
+
+        public Criteria andMultiplierBetween(Short value1, Short value2) {
+            addCriterion("MULTIPLIER between", value1, value2, "multiplier");
+            return (Criteria) this;
+        }
+
+        public Criteria andMultiplierNotBetween(Short value1, Short value2) {
+            addCriterion("MULTIPLIER not between", value1, value2, "multiplier");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table METRICS_UNIFORMCODE
+     *
+     * @mbg.generated do_not_delete_during_merge
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table METRICS_UNIFORMCODE
+     *
+     * @mbg.generated
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

src/main/java/com/gyee/frame/model/auto/WindPowerStationTestingPoint.java

@@ -0,0 +1,542 @@
+package com.gyee.frame.model.auto;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+public class WindPowerStationTestingPoint implements Serializable {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDPOWERSTATIONTESTINGPOINT.CODE
+     *
+     * @mbg.generated
+     */
+    private String code;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDPOWERSTATIONTESTINGPOINT.NAME
+     *
+     * @mbg.generated
+     */
+    private String name;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDPOWERSTATIONTESTINGPOINT.MODEL
+     *
+     * @mbg.generated
+     */
+    private String model;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDPOWERSTATIONTESTINGPOINT.VALUEUNIT
+     *
+     * @mbg.generated
+     */
+    private String valueunit;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDPOWERSTATIONTESTINGPOINT.ENGLISHNAME
+     *
+     * @mbg.generated
+     */
+    private String englishname;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDPOWERSTATIONTESTINGPOINT.TYPEID
+     *
+     * @mbg.generated
+     */
+    private String typeid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDPOWERSTATIONTESTINGPOINT.MODELID
+     *
+     * @mbg.generated
+     */
+    private String modelid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDPOWERSTATIONTESTINGPOINT.MAXVAL
+     *
+     * @mbg.generated
+     */
+    private BigDecimal maxval;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDPOWERSTATIONTESTINGPOINT.MINVAL
+     *
+     * @mbg.generated
+     */
+    private BigDecimal minval;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDPOWERSTATIONTESTINGPOINT.REASONABLEMAXVAL
+     *
+     * @mbg.generated
+     */
+    private BigDecimal reasonablemaxval;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDPOWERSTATIONTESTINGPOINT.REASONABLEMINVAL
+     *
+     * @mbg.generated
+     */
+    private BigDecimal reasonableminval;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDPOWERSTATIONTESTINGPOINT.UNIFORMCODE
+     *
+     * @mbg.generated
+     */
+    private String uniformcode;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDPOWERSTATIONTESTINGPOINT.SHORTID
+     *
+     * @mbg.generated
+     */
+    private String shortid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDPOWERSTATIONTESTINGPOINT.LONGID
+     *
+     * @mbg.generated
+     */
+    private String longid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDPOWERSTATIONTESTINGPOINT.WINDPOWERSTATIONID
+     *
+     * @mbg.generated
+     */
+    private String windpowerstationid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDPOWERSTATIONTESTINGPOINT.REALTIMEID
+     *
+     * @mbg.generated
+     */
+    private String realtimeid;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table WINDPOWERSTATIONTESTINGPOINT
+     *
+     * @mbg.generated
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WINDPOWERSTATIONTESTINGPOINT.CODE
+     *
+     * @return the value of WINDPOWERSTATIONTESTINGPOINT.CODE
+     *
+     * @mbg.generated
+     */
+    public String getCode() {
+        return code;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WINDPOWERSTATIONTESTINGPOINT.CODE
+     *
+     * @param code the value for WINDPOWERSTATIONTESTINGPOINT.CODE
+     *
+     * @mbg.generated
+     */
+    public void setCode(String code) {
+        this.code = code == null ? null : code.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WINDPOWERSTATIONTESTINGPOINT.NAME
+     *
+     * @return the value of WINDPOWERSTATIONTESTINGPOINT.NAME
+     *
+     * @mbg.generated
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WINDPOWERSTATIONTESTINGPOINT.NAME
+     *
+     * @param name the value for WINDPOWERSTATIONTESTINGPOINT.NAME
+     *
+     * @mbg.generated
+     */
+    public void setName(String name) {
+        this.name = name == null ? null : name.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WINDPOWERSTATIONTESTINGPOINT.MODEL
+     *
+     * @return the value of WINDPOWERSTATIONTESTINGPOINT.MODEL
+     *
+     * @mbg.generated
+     */
+    public String getModel() {
+        return model;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WINDPOWERSTATIONTESTINGPOINT.MODEL
+     *
+     * @param model the value for WINDPOWERSTATIONTESTINGPOINT.MODEL
+     *
+     * @mbg.generated
+     */
+    public void setModel(String model) {
+        this.model = model == null ? null : model.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WINDPOWERSTATIONTESTINGPOINT.VALUEUNIT
+     *
+     * @return the value of WINDPOWERSTATIONTESTINGPOINT.VALUEUNIT
+     *
+     * @mbg.generated
+     */
+    public String getValueunit() {
+        return valueunit;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WINDPOWERSTATIONTESTINGPOINT.VALUEUNIT
+     *
+     * @param valueunit the value for WINDPOWERSTATIONTESTINGPOINT.VALUEUNIT
+     *
+     * @mbg.generated
+     */
+    public void setValueunit(String valueunit) {
+        this.valueunit = valueunit == null ? null : valueunit.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WINDPOWERSTATIONTESTINGPOINT.ENGLISHNAME
+     *
+     * @return the value of WINDPOWERSTATIONTESTINGPOINT.ENGLISHNAME
+     *
+     * @mbg.generated
+     */
+    public String getEnglishname() {
+        return englishname;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WINDPOWERSTATIONTESTINGPOINT.ENGLISHNAME
+     *
+     * @param englishname the value for WINDPOWERSTATIONTESTINGPOINT.ENGLISHNAME
+     *
+     * @mbg.generated
+     */
+    public void setEnglishname(String englishname) {
+        this.englishname = englishname == null ? null : englishname.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WINDPOWERSTATIONTESTINGPOINT.TYPEID
+     *
+     * @return the value of WINDPOWERSTATIONTESTINGPOINT.TYPEID
+     *
+     * @mbg.generated
+     */
+    public String getTypeid() {
+        return typeid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WINDPOWERSTATIONTESTINGPOINT.TYPEID
+     *
+     * @param typeid the value for WINDPOWERSTATIONTESTINGPOINT.TYPEID
+     *
+     * @mbg.generated
+     */
+    public void setTypeid(String typeid) {
+        this.typeid = typeid == null ? null : typeid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WINDPOWERSTATIONTESTINGPOINT.MODELID
+     *
+     * @return the value of WINDPOWERSTATIONTESTINGPOINT.MODELID
+     *
+     * @mbg.generated
+     */
+    public String getModelid() {
+        return modelid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WINDPOWERSTATIONTESTINGPOINT.MODELID
+     *
+     * @param modelid the value for WINDPOWERSTATIONTESTINGPOINT.MODELID
+     *
+     * @mbg.generated
+     */
+    public void setModelid(String modelid) {
+        this.modelid = modelid == null ? null : modelid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WINDPOWERSTATIONTESTINGPOINT.MAXVAL
+     *
+     * @return the value of WINDPOWERSTATIONTESTINGPOINT.MAXVAL
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getMaxval() {
+        return maxval;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WINDPOWERSTATIONTESTINGPOINT.MAXVAL
+     *
+     * @param maxval the value for WINDPOWERSTATIONTESTINGPOINT.MAXVAL
+     *
+     * @mbg.generated
+     */
+    public void setMaxval(BigDecimal maxval) {
+        this.maxval = maxval;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WINDPOWERSTATIONTESTINGPOINT.MINVAL
+     *
+     * @return the value of WINDPOWERSTATIONTESTINGPOINT.MINVAL
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getMinval() {
+        return minval;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WINDPOWERSTATIONTESTINGPOINT.MINVAL
+     *
+     * @param minval the value for WINDPOWERSTATIONTESTINGPOINT.MINVAL
+     *
+     * @mbg.generated
+     */
+    public void setMinval(BigDecimal minval) {
+        this.minval = minval;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WINDPOWERSTATIONTESTINGPOINT.REASONABLEMAXVAL
+     *
+     * @return the value of WINDPOWERSTATIONTESTINGPOINT.REASONABLEMAXVAL
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getReasonablemaxval() {
+        return reasonablemaxval;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WINDPOWERSTATIONTESTINGPOINT.REASONABLEMAXVAL
+     *
+     * @param reasonablemaxval the value for WINDPOWERSTATIONTESTINGPOINT.REASONABLEMAXVAL
+     *
+     * @mbg.generated
+     */
+    public void setReasonablemaxval(BigDecimal reasonablemaxval) {
+        this.reasonablemaxval = reasonablemaxval;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WINDPOWERSTATIONTESTINGPOINT.REASONABLEMINVAL
+     *
+     * @return the value of WINDPOWERSTATIONTESTINGPOINT.REASONABLEMINVAL
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getReasonableminval() {
+        return reasonableminval;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WINDPOWERSTATIONTESTINGPOINT.REASONABLEMINVAL
+     *
+     * @param reasonableminval the value for WINDPOWERSTATIONTESTINGPOINT.REASONABLEMINVAL
+     *
+     * @mbg.generated
+     */
+    public void setReasonableminval(BigDecimal reasonableminval) {
+        this.reasonableminval = reasonableminval;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WINDPOWERSTATIONTESTINGPOINT.UNIFORMCODE
+     *
+     * @return the value of WINDPOWERSTATIONTESTINGPOINT.UNIFORMCODE
+     *
+     * @mbg.generated
+     */
+    public String getUniformcode() {
+        return uniformcode;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WINDPOWERSTATIONTESTINGPOINT.UNIFORMCODE
+     *
+     * @param uniformcode the value for WINDPOWERSTATIONTESTINGPOINT.UNIFORMCODE
+     *
+     * @mbg.generated
+     */
+    public void setUniformcode(String uniformcode) {
+        this.uniformcode = uniformcode == null ? null : uniformcode.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WINDPOWERSTATIONTESTINGPOINT.SHORTID
+     *
+     * @return the value of WINDPOWERSTATIONTESTINGPOINT.SHORTID
+     *
+     * @mbg.generated
+     */
+    public String getShortid() {
+        return shortid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WINDPOWERSTATIONTESTINGPOINT.SHORTID
+     *
+     * @param shortid the value for WINDPOWERSTATIONTESTINGPOINT.SHORTID
+     *
+     * @mbg.generated
+     */
+    public void setShortid(String shortid) {
+        this.shortid = shortid == null ? null : shortid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WINDPOWERSTATIONTESTINGPOINT.LONGID
+     *
+     * @return the value of WINDPOWERSTATIONTESTINGPOINT.LONGID
+     *
+     * @mbg.generated
+     */
+    public String getLongid() {
+        return longid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WINDPOWERSTATIONTESTINGPOINT.LONGID
+     *
+     * @param longid the value for WINDPOWERSTATIONTESTINGPOINT.LONGID
+     *
+     * @mbg.generated
+     */
+    public void setLongid(String longid) {
+        this.longid = longid == null ? null : longid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WINDPOWERSTATIONTESTINGPOINT.WINDPOWERSTATIONID
+     *
+     * @return the value of WINDPOWERSTATIONTESTINGPOINT.WINDPOWERSTATIONID
+     *
+     * @mbg.generated
+     */
+    public String getWindpowerstationid() {
+        return windpowerstationid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WINDPOWERSTATIONTESTINGPOINT.WINDPOWERSTATIONID
+     *
+     * @param windpowerstationid the value for WINDPOWERSTATIONTESTINGPOINT.WINDPOWERSTATIONID
+     *
+     * @mbg.generated
+     */
+    public void setWindpowerstationid(String windpowerstationid) {
+        this.windpowerstationid = windpowerstationid == null ? null : windpowerstationid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WINDPOWERSTATIONTESTINGPOINT.REALTIMEID
+     *
+     * @return the value of WINDPOWERSTATIONTESTINGPOINT.REALTIMEID
+     *
+     * @mbg.generated
+     */
+    public String getRealtimeid() {
+        return realtimeid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WINDPOWERSTATIONTESTINGPOINT.REALTIMEID
+     *
+     * @param realtimeid the value for WINDPOWERSTATIONTESTINGPOINT.REALTIMEID
+     *
+     * @mbg.generated
+     */
+    public void setRealtimeid(String realtimeid) {
+        this.realtimeid = realtimeid == null ? null : realtimeid.trim();
+    }
+}

src/main/java/com/gyee/frame/model/auto/Windpowerstationstandardpoint.java

@@ -0,0 +1,178 @@
+package com.gyee.frame.model.auto;
+
+import java.io.Serializable;
+
+public class Windpowerstationstandardpoint implements Serializable {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDPOWERSTATIONSTANDARDPOINT.ID
+     *
+     * @mbg.generated
+     */
+    private String id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDPOWERSTATIONSTANDARDPOINT.CODE
+     *
+     * @mbg.generated
+     */
+    private String code;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDPOWERSTATIONSTANDARDPOINT.NAME
+     *
+     * @mbg.generated
+     */
+    private String name;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDPOWERSTATIONSTANDARDPOINT.UNIFORMCODE
+     *
+     * @mbg.generated
+     */
+    private String uniformcode;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDPOWERSTATIONSTANDARDPOINT.ORDERNUM
+     *
+     * @mbg.generated
+     */
+    private String ordernum;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table WINDPOWERSTATIONSTANDARDPOINT
+     *
+     * @mbg.generated
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WINDPOWERSTATIONSTANDARDPOINT.ID
+     *
+     * @return the value of WINDPOWERSTATIONSTANDARDPOINT.ID
+     *
+     * @mbg.generated
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WINDPOWERSTATIONSTANDARDPOINT.ID
+     *
+     * @param id the value for WINDPOWERSTATIONSTANDARDPOINT.ID
+     *
+     * @mbg.generated
+     */
+    public void setId(String id) {
+        this.id = id == null ? null : id.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WINDPOWERSTATIONSTANDARDPOINT.CODE
+     *
+     * @return the value of WINDPOWERSTATIONSTANDARDPOINT.CODE
+     *
+     * @mbg.generated
+     */
+    public String getCode() {
+        return code;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WINDPOWERSTATIONSTANDARDPOINT.CODE
+     *
+     * @param code the value for WINDPOWERSTATIONSTANDARDPOINT.CODE
+     *
+     * @mbg.generated
+     */
+    public void setCode(String code) {
+        this.code = code == null ? null : code.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WINDPOWERSTATIONSTANDARDPOINT.NAME
+     *
+     * @return the value of WINDPOWERSTATIONSTANDARDPOINT.NAME
+     *
+     * @mbg.generated
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WINDPOWERSTATIONSTANDARDPOINT.NAME
+     *
+     * @param name the value for WINDPOWERSTATIONSTANDARDPOINT.NAME
+     *
+     * @mbg.generated
+     */
+    public void setName(String name) {
+        this.name = name == null ? null : name.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WINDPOWERSTATIONSTANDARDPOINT.UNIFORMCODE
+     *
+     * @return the value of WINDPOWERSTATIONSTANDARDPOINT.UNIFORMCODE
+     *
+     * @mbg.generated
+     */
+    public String getUniformcode() {
+        return uniformcode;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WINDPOWERSTATIONSTANDARDPOINT.UNIFORMCODE
+     *
+     * @param uniformcode the value for WINDPOWERSTATIONSTANDARDPOINT.UNIFORMCODE
+     *
+     * @mbg.generated
+     */
+    public void setUniformcode(String uniformcode) {
+        this.uniformcode = uniformcode == null ? null : uniformcode.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column WINDPOWERSTATIONSTANDARDPOINT.ORDERNUM
+     *
+     * @return the value of WINDPOWERSTATIONSTANDARDPOINT.ORDERNUM
+     *
+     * @mbg.generated
+     */
+    public String getOrdernum() {
+        return ordernum;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column WINDPOWERSTATIONSTANDARDPOINT.ORDERNUM
+     *
+     * @param ordernum the value for WINDPOWERSTATIONSTANDARDPOINT.ORDERNUM
+     *
+     * @mbg.generated
+     */
+    public void setOrdernum(String ordernum) {
+        this.ordernum = ordernum == null ? null : ordernum.trim();
+    }
+}

src/main/java/com/gyee/frame/model/auto/WindpowerstationstandardpointExample.java

@@ -0,0 +1,652 @@
+package com.gyee.frame.model.auto;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class WindpowerstationstandardpointExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table WINDPOWERSTATIONSTANDARDPOINT
+     *
+     * @mbg.generated
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table WINDPOWERSTATIONSTANDARDPOINT
+     *
+     * @mbg.generated
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table WINDPOWERSTATIONSTANDARDPOINT
+     *
+     * @mbg.generated
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WINDPOWERSTATIONSTANDARDPOINT
+     *
+     * @mbg.generated
+     */
+    public WindpowerstationstandardpointExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WINDPOWERSTATIONSTANDARDPOINT
+     *
+     * @mbg.generated
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WINDPOWERSTATIONSTANDARDPOINT
+     *
+     * @mbg.generated
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WINDPOWERSTATIONSTANDARDPOINT
+     *
+     * @mbg.generated
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WINDPOWERSTATIONSTANDARDPOINT
+     *
+     * @mbg.generated
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WINDPOWERSTATIONSTANDARDPOINT
+     *
+     * @mbg.generated
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WINDPOWERSTATIONSTANDARDPOINT
+     *
+     * @mbg.generated
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WINDPOWERSTATIONSTANDARDPOINT
+     *
+     * @mbg.generated
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WINDPOWERSTATIONSTANDARDPOINT
+     *
+     * @mbg.generated
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WINDPOWERSTATIONSTANDARDPOINT
+     *
+     * @mbg.generated
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table WINDPOWERSTATIONSTANDARDPOINT
+     *
+     * @mbg.generated
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table WINDPOWERSTATIONSTANDARDPOINT
+     *
+     * @mbg.generated
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(String value) {
+            addCriterion("ID =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(String value) {
+            addCriterion("ID <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(String value) {
+            addCriterion("ID >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(String value) {
+            addCriterion("ID >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(String value) {
+            addCriterion("ID <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(String value) {
+            addCriterion("ID <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLike(String value) {
+            addCriterion("ID like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotLike(String value) {
+            addCriterion("ID not like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<String> values) {
+            addCriterion("ID in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<String> values) {
+            addCriterion("ID not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(String value1, String value2) {
+            addCriterion("ID between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(String value1, String value2) {
+            addCriterion("ID not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeIsNull() {
+            addCriterion("CODE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeIsNotNull() {
+            addCriterion("CODE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeEqualTo(String value) {
+            addCriterion("CODE =", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeNotEqualTo(String value) {
+            addCriterion("CODE <>", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeGreaterThan(String value) {
+            addCriterion("CODE >", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeGreaterThanOrEqualTo(String value) {
+            addCriterion("CODE >=", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeLessThan(String value) {
+            addCriterion("CODE <", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeLessThanOrEqualTo(String value) {
+            addCriterion("CODE <=", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeLike(String value) {
+            addCriterion("CODE like", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeNotLike(String value) {
+            addCriterion("CODE not like", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeIn(List<String> values) {
+            addCriterion("CODE in", values, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeNotIn(List<String> values) {
+            addCriterion("CODE not in", values, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeBetween(String value1, String value2) {
+            addCriterion("CODE between", value1, value2, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeNotBetween(String value1, String value2) {
+            addCriterion("CODE not between", value1, value2, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIsNull() {
+            addCriterion("NAME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIsNotNull() {
+            addCriterion("NAME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameEqualTo(String value) {
+            addCriterion("NAME =", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotEqualTo(String value) {
+            addCriterion("NAME <>", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameGreaterThan(String value) {
+            addCriterion("NAME >", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameGreaterThanOrEqualTo(String value) {
+            addCriterion("NAME >=", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLessThan(String value) {
+            addCriterion("NAME <", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLessThanOrEqualTo(String value) {
+            addCriterion("NAME <=", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLike(String value) {
+            addCriterion("NAME like", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotLike(String value) {
+            addCriterion("NAME not like", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIn(List<String> values) {
+            addCriterion("NAME in", values, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotIn(List<String> values) {
+            addCriterion("NAME not in", values, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameBetween(String value1, String value2) {
+            addCriterion("NAME between", value1, value2, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotBetween(String value1, String value2) {
+            addCriterion("NAME not between", value1, value2, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniformcodeIsNull() {
+            addCriterion("UNIFORMCODE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniformcodeIsNotNull() {
+            addCriterion("UNIFORMCODE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniformcodeEqualTo(String value) {
+            addCriterion("UNIFORMCODE =", value, "uniformcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniformcodeNotEqualTo(String value) {
+            addCriterion("UNIFORMCODE <>", value, "uniformcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniformcodeGreaterThan(String value) {
+            addCriterion("UNIFORMCODE >", value, "uniformcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniformcodeGreaterThanOrEqualTo(String value) {
+            addCriterion("UNIFORMCODE >=", value, "uniformcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniformcodeLessThan(String value) {
+            addCriterion("UNIFORMCODE <", value, "uniformcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniformcodeLessThanOrEqualTo(String value) {
+            addCriterion("UNIFORMCODE <=", value, "uniformcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniformcodeLike(String value) {
+            addCriterion("UNIFORMCODE like", value, "uniformcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniformcodeNotLike(String value) {
+            addCriterion("UNIFORMCODE not like", value, "uniformcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniformcodeIn(List<String> values) {
+            addCriterion("UNIFORMCODE in", values, "uniformcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniformcodeNotIn(List<String> values) {
+            addCriterion("UNIFORMCODE not in", values, "uniformcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniformcodeBetween(String value1, String value2) {
+            addCriterion("UNIFORMCODE between", value1, value2, "uniformcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniformcodeNotBetween(String value1, String value2) {
+            addCriterion("UNIFORMCODE not between", value1, value2, "uniformcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrdernumIsNull() {
+            addCriterion("ORDERNUM is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrdernumIsNotNull() {
+            addCriterion("ORDERNUM is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrdernumEqualTo(String value) {
+            addCriterion("ORDERNUM =", value, "ordernum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrdernumNotEqualTo(String value) {
+            addCriterion("ORDERNUM <>", value, "ordernum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrdernumGreaterThan(String value) {
+            addCriterion("ORDERNUM >", value, "ordernum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrdernumGreaterThanOrEqualTo(String value) {
+            addCriterion("ORDERNUM >=", value, "ordernum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrdernumLessThan(String value) {
+            addCriterion("ORDERNUM <", value, "ordernum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrdernumLessThanOrEqualTo(String value) {
+            addCriterion("ORDERNUM <=", value, "ordernum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrdernumLike(String value) {
+            addCriterion("ORDERNUM like", value, "ordernum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrdernumNotLike(String value) {
+            addCriterion("ORDERNUM not like", value, "ordernum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrdernumIn(List<String> values) {
+            addCriterion("ORDERNUM in", values, "ordernum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrdernumNotIn(List<String> values) {
+            addCriterion("ORDERNUM not in", values, "ordernum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrdernumBetween(String value1, String value2) {
+            addCriterion("ORDERNUM between", value1, value2, "ordernum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrdernumNotBetween(String value1, String value2) {
+            addCriterion("ORDERNUM not between", value1, value2, "ordernum");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table WINDPOWERSTATIONSTANDARDPOINT
+     *
+     * @mbg.generated do_not_delete_during_merge
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table WINDPOWERSTATIONSTANDARDPOINT
+     *
+     * @mbg.generated
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

src/main/java/com/gyee/frame/service/Alertrule2ervice.java

@@ -10,6 +10,7 @@ import com.gyee.frame.model.auto.Alertrule2Example;
 import com.gyee.frame.model.custom.AlarmTotalVo;
 import com.gyee.frame.model.custom.SimpleVo;
 import com.gyee.frame.model.custom.Tablepar;
+import com.gyee.frame.model.custom.weather.Sys;
 import com.gyee.frame.util.DateUtils;
 import com.gyee.frame.util.SnowflakeIdWorker;
 import com.gyee.frame.util.StringUtils;
@@ -235,4 +236,29 @@ public class Alertrule2ervice implements BaseService<Alertrule2, Alertrule2Examp
         ls=alertrule2Mapper.getAlarmTypenum();
         return ls;
     }
+
+    /**
+     * 通过规则描述，场站，风机ID查询一条
+     * 解析规则表达式，提取出所有uniformCode
+     * @param name
+     * @param station
+     * @param wtId
+     * @return
+     */
+    public List<String> getUniformCodeByNameAndStation(String name, String station, String wtId){
+        Alertrule2Example example = new Alertrule2Example();
+        example.createCriteria().andNameEqualTo(name)
+               .andStationEqualTo(station)
+               .andWindturbineLike("%" + wtId + "%");
+
+        List<Alertrule2> rules = alertrule2Mapper.selectByExample(example);
+        if (rules == null || rules.size() == 0)
+            return null;
+
+        Alertrule2 rule = rules.get(0);
+        String expression = "[AI,DI](.{4})";
+        List<String> list = StringUtils.pattern(rule.getExpression(), expression);
+
+        return list;
+    }
 }

src/main/java/com/gyee/frame/service/WindPowerstationTestingPoint2Service.java

@@ -0,0 +1,222 @@
+package com.gyee.frame.service;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.gyee.frame.common.base.BaseService;
+import com.gyee.frame.common.spring.Constant;
+import com.gyee.frame.common.spring.InitialRunner;
+import com.gyee.frame.common.support.Convert;
+import com.gyee.frame.mapper.auto.WindPowerStationTestingPoint2Mapper;
+import com.gyee.frame.model.auto.WindPowerStationTestingPoint2;
+import com.gyee.frame.model.auto.WindPowerStationTestingPoint2Example;
+import com.gyee.frame.model.auto.Windpowerstation;
+import com.gyee.frame.model.custom.SimpleVo;
+import com.gyee.frame.model.custom.Tablepar;
+import com.gyee.frame.util.SnowflakeIdWorker;
+import com.gyee.frame.util.StringUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 风场测点 windPowerstationTestingPoint2Service
+ * @Title: windPowerstationTestingPoint2Service.java 
+ * @Package com.gyee.frame.service 
+ * @author gyee_自动生成
+ * @email 1@qq.com
+ * @date 2019-12-31 14:58:09  
+ **/
+@Service
+public class WindPowerstationTestingPoint2Service implements BaseService<WindPowerStationTestingPoint2, WindPowerStationTestingPoint2Example> {
+	@Resource
+	private WindPowerStationTestingPoint2Mapper windPowerStationTestingPoint2Mapper;
+	
+      	   	      	      	      	      	      	      	      	      	      	
+	/**
+	 * 分页查询
+	 * @param tablepar
+	 * @param name
+	 * @return
+	 */
+	 public PageInfo<WindPowerStationTestingPoint2> list(Tablepar tablepar, String name){
+	        WindPowerStationTestingPoint2Example testExample=new WindPowerStationTestingPoint2Example();
+	        testExample.setOrderByClause("id ASC");
+	        if(name!=null&&!"".equals(name)){
+	        	testExample.createCriteria().andCodeLike("%"+name+"%");
+	        }
+
+	        PageHelper.startPage(tablepar.getPageNum(), tablepar.getPageSize());
+	        List<WindPowerStationTestingPoint2> list= windPowerStationTestingPoint2Mapper.selectByExample(testExample);
+	        PageInfo<WindPowerStationTestingPoint2> pageInfo = new PageInfo<WindPowerStationTestingPoint2>(list);
+	        return  pageInfo;
+	 }
+
+	@Override
+	public int deleteByPrimaryKey(String ids) {
+				
+			List<String> lista=Convert.toListStrArray(ids);
+			WindPowerStationTestingPoint2Example example=new WindPowerStationTestingPoint2Example();
+			example.createCriteria().andCodeIn(lista);
+			return windPowerStationTestingPoint2Mapper.deleteByExample(example);
+			
+				
+	}
+	
+	
+	@Override
+	public WindPowerStationTestingPoint2 selectByPrimaryKey(String id) {
+				
+			return windPowerStationTestingPoint2Mapper.selectByPrimaryKey(id);
+				
+	}
+
+	
+	@Override
+	public int updateByPrimaryKeySelective(WindPowerStationTestingPoint2 record) {
+		return windPowerStationTestingPoint2Mapper.updateByPrimaryKeySelective(record);
+	}
+	
+	
+	/**
+	 * 添加
+	 */
+	@Override
+	public int insertSelective(WindPowerStationTestingPoint2 record) {
+				
+		//添加雪花主键id
+		record.setCode(SnowflakeIdWorker.getUUID());
+			
+				
+		return windPowerStationTestingPoint2Mapper.insertSelective(record);
+	}
+	
+	
+	@Override
+	public int updateByExampleSelective(WindPowerStationTestingPoint2 record, WindPowerStationTestingPoint2Example example) {
+		
+		return windPowerStationTestingPoint2Mapper.updateByExampleSelective(record, example);
+	}
+
+	
+	@Override
+	public int updateByExample(WindPowerStationTestingPoint2 record, WindPowerStationTestingPoint2Example example) {
+		
+		return windPowerStationTestingPoint2Mapper.updateByExample(record, example);
+	}
+
+	@Override
+	public List<WindPowerStationTestingPoint2> selectByExample(WindPowerStationTestingPoint2Example example) {
+		
+		return windPowerStationTestingPoint2Mapper.selectByExample(example);
+	}
+
+	
+	@Override
+	public long countByExample(WindPowerStationTestingPoint2Example example) {
+		
+		return windPowerStationTestingPoint2Mapper.countByExample(example);
+	}
+
+	
+	@Override
+	public int deleteByExample(WindPowerStationTestingPoint2Example example) {
+		
+		return windPowerStationTestingPoint2Mapper.deleteByExample(example);
+	}
+	
+	/**
+	 * 检查name
+	 * @param windPowerstationTestingPoint
+	 * @return
+	 */
+	public int checkNameUnique(WindPowerStationTestingPoint2 windPowerstationTestingPoint){
+		WindPowerStationTestingPoint2Example example=new WindPowerStationTestingPoint2Example();
+		example.createCriteria().andCodeEqualTo(windPowerstationTestingPoint.getCode());
+		List<WindPowerStationTestingPoint2> list=windPowerStationTestingPoint2Mapper.selectByExample(example);
+		return list.size();
+	}
+
+	public WindPowerStationTestingPoint2 getWindPowerStationTestingPoint2(String wpId, String unicode)  {
+		WindPowerStationTestingPoint2 point=new WindPowerStationTestingPoint2();
+
+		if(StringUtils.notEmp(wpId) && StringUtils.notEmp(unicode) )
+		{
+			if(wpId.equals("0") || wpId.equals("-1") ||wpId.equals("-2") || InitialRunner.wpmap.containsKey(wpId))
+			{
+				if(InitialRunner.wpPointmap.containsKey(wpId))
+				{
+					Map<String, WindPowerStationTestingPoint2> map=InitialRunner.wpPointmap.get(wpId);
+					if(map.containsKey(unicode))
+					{
+						point=map.get(unicode);
+					}
+				}
+			}else if(InitialRunner.pjmap.containsKey(wpId))
+			{
+				if(InitialRunner.pjPointmap.containsKey(wpId))
+				{
+					Map<String, WindPowerStationTestingPoint2> map=InitialRunner.pjPointmap.get(wpId);
+					if(map.containsKey(unicode))
+					{
+						point=map.get(unicode);
+					}
+				}
+			}else if(InitialRunner.lnmap.containsKey(wpId))
+			{
+				if(InitialRunner.lnPointmap.containsKey(wpId))
+				{
+					Map<String, WindPowerStationTestingPoint2> map=InitialRunner.lnPointmap.get(wpId);
+					if(map.containsKey(unicode))
+					{
+						point=map.get(unicode);
+					}
+				}
+			}
+		}
+
+
+		return point;
+	}
+
+	public Map<String,Integer> getWpPointTotal(){
+		Map<String,Integer> map=new HashMap<>();
+		for(Windpowerstation wp:InitialRunner.wpallls)
+		{
+			String str=wp.getId().substring(0,wp.getId().indexOf("_"));
+			List<SimpleVo> vos=windPowerStationTestingPoint2Mapper.getWpPointTotal(str,null);
+			if(!vos.isEmpty())
+			{
+				SimpleVo vo=vos.get(0);
+				map.put(wp.getId(),vo.getValue());
+			}
+
+		}
+		List<SimpleVo> vos=windPowerStationTestingPoint2Mapper.getWpPointTotal(null,"jsfw");
+		if(!vos.isEmpty())
+		{
+			SimpleVo vo=vos.get(0);
+			map.put("JSFW",vo.getValue());
+		}
+		return map;
+	}
+
+
+	public List<WindPowerStationTestingPoint2> getJsztList(String wpId){
+
+		List<WindPowerStationTestingPoint2> wpoints=new ArrayList<>();
+		if(StringUtils.notEmp(wpId) )
+		{
+			WindPowerStationTestingPoint2Example example=new WindPowerStationTestingPoint2Example();
+			WindPowerStationTestingPoint2Example.Criteria criteria =example.createCriteria();
+			criteria.andWindpowerstationidEqualTo(wpId);
+			criteria.andUniformcodeEqualTo(Constant.JSZT);
+			wpoints=windPowerStationTestingPoint2Mapper.selectByExample(example);
+		}
+
+		return wpoints;
+	}
+}

src/main/java/com/gyee/frame/service/WindPowerstationTestingPointService.java

@@ -3,37 +3,29 @@ package com.gyee.frame.service;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.gyee.frame.common.base.BaseService;
-import com.gyee.frame.common.spring.Constant;
-import com.gyee.frame.common.spring.InitialRunner;
 import com.gyee.frame.common.support.Convert;
-import com.gyee.frame.mapper.auto.WindPowerStationTestingPoint2Mapper;
-import com.gyee.frame.model.auto.WindPowerStationTestingPoint2;
-import com.gyee.frame.model.auto.WindPowerStationTestingPoint2Example;
-import com.gyee.frame.model.auto.Windpowerstation;
-import com.gyee.frame.model.custom.SimpleVo;
+import com.gyee.frame.mapper.auto.WindPowerStationTestingPointMapper;
+import com.gyee.frame.model.auto.WindPowerStationTestingPoint;
+import com.gyee.frame.model.auto.WindPowerStationTestingPointExample;
 import com.gyee.frame.model.custom.Tablepar;
 import com.gyee.frame.util.SnowflakeIdWorker;
-import com.gyee.frame.util.StringUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
- * 风场测点 WindPowerstationTestingPointService
- * @Title: WindPowerstationTestingPointService.java 
+ * 风场测点 windPowerStationTestingPointService
+ * @Title: windPowerStationTestingPointService.java 
  * @Package com.gyee.frame.service 
  * @author gyee_自动生成
  * @email 1@qq.com
  * @date 2019-12-31 14:58:09  
  **/
 @Service
-public class WindPowerstationTestingPointService implements BaseService<WindPowerStationTestingPoint2, WindPowerStationTestingPoint2Example> {
+public class WindPowerstationTestingPointService implements BaseService<WindPowerStationTestingPoint, WindPowerStationTestingPointExample> {
 	@Resource
-	private WindPowerStationTestingPoint2Mapper windPowerStationTestingPoint2Mapper;
+	private WindPowerStationTestingPointMapper windPowerStationTestingPointMapper;
 	
       	   	      	      	      	      	      	      	      	      	      	
 	/**
@@ -42,16 +34,16 @@ public class WindPowerstationTestingPointService implements BaseService<WindPowe
 	 * @param name
 	 * @return
 	 */
-	 public PageInfo<WindPowerStationTestingPoint2> list(Tablepar tablepar, String name){
-	        WindPowerStationTestingPoint2Example testExample=new WindPowerStationTestingPoint2Example();
+	 public PageInfo<WindPowerStationTestingPoint> list(Tablepar tablepar, String name){
+	        WindPowerStationTestingPointExample testExample=new WindPowerStationTestingPointExample();
 	        testExample.setOrderByClause("id ASC");
 	        if(name!=null&&!"".equals(name)){
 	        	testExample.createCriteria().andCodeLike("%"+name+"%");
 	        }
 
 	        PageHelper.startPage(tablepar.getPageNum(), tablepar.getPageSize());
-	        List<WindPowerStationTestingPoint2> list= windPowerStationTestingPoint2Mapper.selectByExample(testExample);
-	        PageInfo<WindPowerStationTestingPoint2> pageInfo = new PageInfo<WindPowerStationTestingPoint2>(list);
+	        List<WindPowerStationTestingPoint> list= windPowerStationTestingPointMapper.selectByExample(testExample);
+	        PageInfo<WindPowerStationTestingPoint> pageInfo = new PageInfo<WindPowerStationTestingPoint>(list);
 	        return  pageInfo;
 	 }
 
@@ -59,25 +51,25 @@ public class WindPowerstationTestingPointService implements BaseService<WindPowe
 	public int deleteByPrimaryKey(String ids) {
 				
 			List<String> lista=Convert.toListStrArray(ids);
-			WindPowerStationTestingPoint2Example example=new WindPowerStationTestingPoint2Example();
+			WindPowerStationTestingPointExample example=new WindPowerStationTestingPointExample();
 			example.createCriteria().andCodeIn(lista);
-			return windPowerStationTestingPoint2Mapper.deleteByExample(example);
+			return windPowerStationTestingPointMapper.deleteByExample(example);
 			
 				
 	}
 	
 	
 	@Override
-	public WindPowerStationTestingPoint2 selectByPrimaryKey(String id) {
+	public WindPowerStationTestingPoint selectByPrimaryKey(String id) {
 				
-			return windPowerStationTestingPoint2Mapper.selectByPrimaryKey(id);
+			return windPowerStationTestingPointMapper.selectByPrimaryKey(id);
 				
 	}
 
 	
 	@Override
-	public int updateByPrimaryKeySelective(WindPowerStationTestingPoint2 record) {
-		return windPowerStationTestingPoint2Mapper.updateByPrimaryKeySelective(record);
+	public int updateByPrimaryKeySelective(WindPowerStationTestingPoint record) {
+		return windPowerStationTestingPointMapper.updateByPrimaryKeySelective(record);
 	}
 	
 	
@@ -85,138 +77,66 @@ public class WindPowerstationTestingPointService implements BaseService<WindPowe
 	 * 添加
 	 */
 	@Override
-	public int insertSelective(WindPowerStationTestingPoint2 record) {
+	public int insertSelective(WindPowerStationTestingPoint record) {
 				
 		//添加雪花主键id
 		record.setCode(SnowflakeIdWorker.getUUID());
 			
 				
-		return windPowerStationTestingPoint2Mapper.insertSelective(record);
+		return windPowerStationTestingPointMapper.insertSelective(record);
 	}
 	
 	
 	@Override
-	public int updateByExampleSelective(WindPowerStationTestingPoint2 record, WindPowerStationTestingPoint2Example example) {
+	public int updateByExampleSelective(WindPowerStationTestingPoint record, WindPowerStationTestingPointExample example) {
 		
-		return windPowerStationTestingPoint2Mapper.updateByExampleSelective(record, example);
+		return windPowerStationTestingPointMapper.updateByExampleSelective(record, example);
 	}
 
 	
 	@Override
-	public int updateByExample(WindPowerStationTestingPoint2 record, WindPowerStationTestingPoint2Example example) {
+	public int updateByExample(WindPowerStationTestingPoint record, WindPowerStationTestingPointExample example) {
 		
-		return windPowerStationTestingPoint2Mapper.updateByExample(record, example);
+		return windPowerStationTestingPointMapper.updateByExample(record, example);
 	}
 
 	@Override
-	public List<WindPowerStationTestingPoint2> selectByExample(WindPowerStationTestingPoint2Example example) {
+	public List<WindPowerStationTestingPoint> selectByExample(WindPowerStationTestingPointExample example) {
 		
-		return windPowerStationTestingPoint2Mapper.selectByExample(example);
+		return windPowerStationTestingPointMapper.selectByExample(example);
 	}
 
 	
 	@Override
-	public long countByExample(WindPowerStationTestingPoint2Example example) {
+	public long countByExample(WindPowerStationTestingPointExample example) {
 		
-		return windPowerStationTestingPoint2Mapper.countByExample(example);
+		return windPowerStationTestingPointMapper.countByExample(example);
 	}
 
 	
 	@Override
-	public int deleteByExample(WindPowerStationTestingPoint2Example example) {
+	public int deleteByExample(WindPowerStationTestingPointExample example) {
 		
-		return windPowerStationTestingPoint2Mapper.deleteByExample(example);
-	}
-	
-	/**
-	 * 检查name
-	 * @param windPowerstationTestingPoint
-	 * @return
-	 */
-	public int checkNameUnique(WindPowerStationTestingPoint2 windPowerstationTestingPoint){
-		WindPowerStationTestingPoint2Example example=new WindPowerStationTestingPoint2Example();
-		example.createCriteria().andCodeEqualTo(windPowerstationTestingPoint.getCode());
-		List<WindPowerStationTestingPoint2> list=windPowerStationTestingPoint2Mapper.selectByExample(example);
-		return list.size();
+		return windPowerStationTestingPointMapper.deleteByExample(example);
 	}
 
-	public WindPowerStationTestingPoint2 getWindPowerStationTestingPoint2(String wpId, String unicode)  {
-		WindPowerStationTestingPoint2 point=new WindPowerStationTestingPoint2();
-
-		if(StringUtils.notEmp(wpId) && StringUtils.notEmp(unicode) )
-		{
-			if(wpId.equals("0") || wpId.equals("-1") ||wpId.equals("-2") || InitialRunner.wpmap.containsKey(wpId))
-			{
-				if(InitialRunner.wpPointmap.containsKey(wpId))
-				{
-					Map<String, WindPowerStationTestingPoint2> map=InitialRunner.wpPointmap.get(wpId);
-					if(map.containsKey(unicode))
-					{
-						point=map.get(unicode);
-					}
-				}
-			}else if(InitialRunner.pjmap.containsKey(wpId))
-			{
-				if(InitialRunner.pjPointmap.containsKey(wpId))
-				{
-					Map<String, WindPowerStationTestingPoint2> map=InitialRunner.pjPointmap.get(wpId);
-					if(map.containsKey(unicode))
-					{
-						point=map.get(unicode);
-					}
-				}
-			}else if(InitialRunner.lnmap.containsKey(wpId))
-			{
-				if(InitialRunner.lnPointmap.containsKey(wpId))
-				{
-					Map<String, WindPowerStationTestingPoint2> map=InitialRunner.lnPointmap.get(wpId);
-					if(map.containsKey(unicode))
-					{
-						point=map.get(unicode);
-					}
-				}
-			}
-		}
-
-
-		return point;
-	}
+	public int deleteAll() {
+
+
+		int result= windPowerStationTestingPointMapper.deleteAll();
+
+
+		return result;
 
-	public Map<String,Integer> getWpPointTotal(){
-		Map<String,Integer> map=new HashMap<>();
-		for(Windpowerstation wp:InitialRunner.wpallls)
-		{
-			String str=wp.getId().substring(0,wp.getId().indexOf("_"));
-			List<SimpleVo> vos=windPowerStationTestingPoint2Mapper.getWpPointTotal(str,null);
-			if(!vos.isEmpty())
-			{
-				SimpleVo vo=vos.get(0);
-				map.put(wp.getId(),vo.getValue());
-			}
-
-		}
-		List<SimpleVo> vos=windPowerStationTestingPoint2Mapper.getWpPointTotal(null,"jsfw");
-		if(!vos.isEmpty())
-		{
-			SimpleVo vo=vos.get(0);
-			map.put("JSFW",vo.getValue());
-		}
-		return map;
 	}
 
+	public int insertBatch(List<WindPowerStationTestingPoint> ls) {
+
+
+		int result= windPowerStationTestingPointMapper.insertBatch(ls);
 
-	public List<WindPowerStationTestingPoint2> getJsztList(String wpId){
 
-		List<WindPowerStationTestingPoint2> wpoints=new ArrayList<>();
-		if(StringUtils.notEmp(wpId) )
-		{
-			WindPowerStationTestingPoint2Example example=new WindPowerStationTestingPoint2Example();
-			WindPowerStationTestingPoint2Example.Criteria criteria =example.createCriteria();
-			criteria.andWindpowerstationidEqualTo(wpId);
-			criteria.andUniformcodeEqualTo(Constant.JSZT);
-			wpoints=windPowerStationTestingPoint2Mapper.selectByExample(example);
-		}
+		return result;
 
-		return wpoints;
 	}
 }

src/main/java/com/gyee/frame/service/WinddirectionService.java

@@ -26,7 +26,7 @@ public class WinddirectionService {
 
 	IRealTimeDataBaseUtil realApiUtil = RealTimeDataBaseFactory.createRealTimeDataBase();
 	@Resource
-	private WindPowerstationTestingPointService windPowerstationTestingPointService;
+	private WindPowerstationTestingPoint2Service windPowerstationTestingPoint2Service;
 
 	public List<DataVo>  winddirectionAjax(String wpId,Date recorddate) throws Exception {
 		List<DataVo> vos = new ArrayList<DataVo>();
@@ -39,8 +39,8 @@ public class WinddirectionService {
 			Date endDate = sdfs.parse(sdf.format(DateUtils.addDays(recorddate, 1)) + " 00:00:00");
 			Date beginDate = sdfs.parse(sdf.format(recorddate) + " 00:00:00");
 
-			WindPowerStationTestingPoint2 fspoint = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.FCCFTFS70);
-			WindPowerStationTestingPoint2 fxpoint = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.FCCFTFX70);
+			WindPowerStationTestingPoint2 fspoint = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.FCCFTFS70);
+			WindPowerStationTestingPoint2 fxpoint = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.FCCFTFX70);
 
 			List<PointData> fxls = realApiUtil.getHistoryDatasSnap(fxpoint, beginDate.getTime() / 1000, endDate.getTime() / 1000, 24l, 3600L);
 			List<PointData> fsls = realApiUtil.getHistoryDatasSnap(fspoint, beginDate.getTime() / 1000, endDate.getTime() / 1000, 24l, 3600L);

src/main/java/com/gyee/frame/service/WindpowerstationstandardpointService.java

@@ -0,0 +1,107 @@
+package com.gyee.frame.service;
+
+import com.gyee.frame.common.base.BaseService;
+import com.gyee.frame.common.support.Convert;
+import com.gyee.frame.mapper.auto.WindpowerstationstandardpointMapper;
+import com.gyee.frame.model.auto.Windpowerstationstandardpoint;
+import com.gyee.frame.model.auto.WindpowerstationstandardpointExample;
+import com.gyee.frame.util.SnowflakeIdWorker;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+
+@Service
+public class WindpowerstationstandardpointService implements BaseService<Windpowerstationstandardpoint, WindpowerstationstandardpointExample> {
+    @Resource
+    private WindpowerstationstandardpointMapper windpowerstationstandardpointMapper;
+
+
+    @Override
+    public int deleteByPrimaryKey(String ids) {
+
+        List<String> lista = Convert.toListStrArray(ids);
+        WindpowerstationstandardpointExample example = new WindpowerstationstandardpointExample();
+        example.createCriteria().andIdIn(lista);
+        return windpowerstationstandardpointMapper.deleteByExample(example);
+
+
+    }
+
+
+    @Override
+    public Windpowerstationstandardpoint selectByPrimaryKey(String id) {
+
+        return windpowerstationstandardpointMapper.selectByPrimaryKey(id);
+
+    }
+
+
+    @Override
+    public int updateByPrimaryKeySelective(Windpowerstationstandardpoint record) {
+        return windpowerstationstandardpointMapper.updateByPrimaryKeySelective(record);
+    }
+
+
+    /**
+     * 添加
+     */
+    @Override
+    public int insertSelective(Windpowerstationstandardpoint record) {
+
+        //添加雪花主键id
+        record.setId(SnowflakeIdWorker.getUUID());
+
+
+        return windpowerstationstandardpointMapper.insertSelective(record);
+    }
+
+
+    @Override
+    public int updateByExampleSelective(Windpowerstationstandardpoint record, WindpowerstationstandardpointExample example) {
+
+        return windpowerstationstandardpointMapper.updateByExampleSelective(record, example);
+    }
+
+
+    @Override
+    public int updateByExample(Windpowerstationstandardpoint record, WindpowerstationstandardpointExample example) {
+
+        return windpowerstationstandardpointMapper.updateByExample(record, example);
+    }
+
+    @Override
+    public List<Windpowerstationstandardpoint> selectByExample(WindpowerstationstandardpointExample example) {
+
+        return windpowerstationstandardpointMapper.selectByExample(example);
+    }
+
+
+    @Override
+    public long countByExample(WindpowerstationstandardpointExample example) {
+
+        return windpowerstationstandardpointMapper.countByExample(example);
+    }
+
+
+    @Override
+    public int deleteByExample(WindpowerstationstandardpointExample example) {
+
+        return windpowerstationstandardpointMapper.deleteByExample(example);
+    }
+
+
+    public  List<Windpowerstationstandardpoint> findAllList() {
+
+        WindpowerstationstandardpointExample example = new WindpowerstationstandardpointExample();
+
+        List<Windpowerstationstandardpoint> vos = windpowerstationstandardpointMapper.selectByExample(example);
+
+
+        return vos;
+
+    }
+
+
+}

src/main/java/com/gyee/frame/service/WindturbinestandardpointService.java

@@ -103,4 +103,5 @@ public class WindturbinestandardpointService implements BaseService<Windturbines
 
     }
 
+
 }

src/main/java/com/gyee/frame/service/WindturbinetestingpointService.java

@@ -100,4 +100,23 @@ public class WindturbinetestingpointService implements BaseService<Windturbinete
 
     }
 
+    public int deleteAll() {
+
+
+        int result= windturbinetestingpointMapper.deleteAll();
+
+
+        return result;
+
+    }
+
+    public int insertBatch(List<Windturbinetestingpoint> ls) {
+
+
+        int result= windturbinetestingpointMapper.insertBatch(ls);
+
+
+        return result;
+
+    }
 }

src/main/java/com/gyee/frame/service/health/HealthMainService.java

@@ -27,7 +27,7 @@ public class HealthMainService {
     @Resource
     private ShutdowneventService shutdowneventService;
     @Resource
-    private WindPowerstationTestingPointService windPowerstationTestingPointService;
+    private WindPowerstationTestingPoint2Service windPowerstationTestingPoint2Service;
     @Resource
     private WeatherService weatherService;
     @Resource
@@ -385,7 +385,7 @@ public class HealthMainService {
                 }
                 // 获得实时风速测点编号
 
-                WindPowerStationTestingPoint2 point = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WP_SSFS);
+                WindPowerStationTestingPoint2 point = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WP_SSFS);
                 String wppintId = point.getCode();
 
                 PointData ssfspoint = realApiUtil.getRealData(wppintId);
@@ -586,12 +586,12 @@ public class HealthMainService {
 
                 // 获得实时风速测点编号
 
-                WindPowerStationTestingPoint2 point = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_RFDL);
+                WindPowerStationTestingPoint2 point = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_RFDL);
                 String wppintId1 = point.getCode();
                 PointData ssfspoint1 = realApiUtil.getRealData(wppintId1);
                 double rfdl = StringUtils.round(ssfspoint1.getPointValueInDouble(), digit);
 
-                WindPowerStationTestingPoint2 point2 = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_YFDL);
+                WindPowerStationTestingPoint2 point2 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_YFDL);
                 String wppintId2 = point2.getCode();
                 PointData ssfspoint2 = realApiUtil.getRealData(wppintId2);
                 double yfdl = StringUtils.round(ssfspoint2.getPointValueInDouble(), digit);
@@ -974,13 +974,13 @@ public class HealthMainService {
 
             List<String> jczbls = new ArrayList<>();
             //良好状态数量
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.FJLHSL).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.FJLHSL).getCode());
             //正常状态数量
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.FJZCSL).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.FJZCSL).getCode());
             //注意状态数量
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.FJZYSL).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.FJZYSL).getCode());
             //严重状态数量
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.FJYZSL).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.FJYZSL).getCode());
 
 
 

src/main/java/com/gyee/frame/service/health/HealthOperationService.java

@@ -27,7 +27,7 @@ public class HealthOperationService {
     @Resource
     private ShutdowneventService shutdowneventService;
     @Resource
-    private WindPowerstationTestingPointService windPowerstationTestingPointService;
+    private WindPowerstationTestingPoint2Service windPowerstationTestingPoint2Service;
 
     private final String QS = "0";
 
@@ -47,13 +47,13 @@ public class HealthOperationService {
 
         List<String> idls=new ArrayList<>();
 
-        WindPowerStationTestingPoint2 point = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(QS, Constant.FJZCSL);
+        WindPowerStationTestingPoint2 point = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(QS, Constant.FJZCSL);
         idls.add(point.getCode());// 合格(正常)
-        point = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(QS, Constant.FJLHSL);
+        point = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(QS, Constant.FJLHSL);
         idls.add(point.getCode());// 良好
-        point = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(QS, Constant.FJZYSL);
+        point = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(QS, Constant.FJZYSL);
         idls.add(point.getCode());// 注意
-        point = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(QS, Constant.FJYZSL);
+        point = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(QS, Constant.FJYZSL);
         idls.add(point.getCode());// 严重
 
 
@@ -98,13 +98,13 @@ public class HealthOperationService {
                 if (wpList.get(i).getCode().indexOf("_FDC") > 0) {
                     List<String> idls=new ArrayList<>();
 
-                    WindPowerStationTestingPoint2 point = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpList.get(i).getId(), Constant.FJZCSL);
+                    WindPowerStationTestingPoint2 point = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpList.get(i).getId(), Constant.FJZCSL);
                     idls.add(point.getCode());// 合格(正常)
-                    point = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpList.get(i).getId(), Constant.FJLHSL);
+                    point = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpList.get(i).getId(), Constant.FJLHSL);
                     idls.add(point.getCode());// 良好
-                    point = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpList.get(i).getId(), Constant.FJZYSL);
+                    point = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpList.get(i).getId(), Constant.FJZYSL);
                     idls.add(point.getCode());// 注意
-                    point = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpList.get(i).getId(), Constant.FJYZSL);
+                    point = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpList.get(i).getId(), Constant.FJYZSL);
                     idls.add(point.getCode());// 严重
 
                     List<PointData> pols=realApiUtil.getRealData(idls);
@@ -138,13 +138,13 @@ public class HealthOperationService {
                 if (pList.get(i).getWindpowerstationid().indexOf("_FDC") > 0) {
                     List<String> idls=new ArrayList<>();
 
-                    WindPowerStationTestingPoint2 point = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(pList.get(i).getId(), Constant.FJZCSL);
+                    WindPowerStationTestingPoint2 point = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(pList.get(i).getId(), Constant.FJZCSL);
                     idls.add(point.getCode());// 合格(正常)
-                    point = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(pList.get(i).getId(), Constant.FJLHSL);
+                    point = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(pList.get(i).getId(), Constant.FJLHSL);
                     idls.add(point.getCode());// 良好
-                    point = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(pList.get(i).getId(), Constant.FJZYSL);
+                    point = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(pList.get(i).getId(), Constant.FJZYSL);
                     idls.add(point.getCode());// 注意
-                    point = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(pList.get(i).getId(), Constant.FJYZSL);
+                    point = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(pList.get(i).getId(), Constant.FJYZSL);
                     idls.add(point.getCode());// 严重
 
                     List<PointData> pols=realApiUtil.getRealData(idls);
@@ -199,9 +199,9 @@ public class HealthOperationService {
 
                 if (wpList.get(i).getCode().indexOf("_FDC") > 0) {
                     if ("1".equals(status)) {
-                        WindPowerStationTestingPoint2 point = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpList.get(i).getId(), Constant.FJZCSL);
+                        WindPowerStationTestingPoint2 point = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpList.get(i).getId(), Constant.FJZCSL);
                         String hgCode = point.getCode();// 合格(正常)
-                         point = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpList.get(i).getId(), Constant.FJLHSL);
+                         point = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpList.get(i).getId(), Constant.FJLHSL);
                         String lhCode = point.getCode();// 良好
                         List<PointData> phgList = realApiUtil.getHistoryDatasSnap(hgCode, start / 1000, end / 1000, 1L,
                                 15 * 60L);
@@ -257,9 +257,9 @@ public class HealthOperationService {
 
                     } else {
 
-                        WindPowerStationTestingPoint2 point = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpList.get(i).getId(), Constant.FJZYSL);
+                        WindPowerStationTestingPoint2 point = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpList.get(i).getId(), Constant.FJZYSL);
                         String zyCode = point.getCode();// 注意
-                        point = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpList.get(i).getId(), Constant.FJYZSL);
+                        point = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpList.get(i).getId(), Constant.FJYZSL);
                         String yzCode = point.getCode();// 严重
                         List<PointData> pzyList = realApiUtil.getHistoryDatasSnap(zyCode, start / 1000, end / 1000, 0L,
                                 15 * 60L);
@@ -330,9 +330,9 @@ public class HealthOperationService {
 
                 if (pList.get(i).getWindpowerstationid().indexOf("_FDC") > 0) {
                     if ("1".equals(status)) {
-                        WindPowerStationTestingPoint2 point = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(pList.get(i).getId(), Constant.FJZCSL);
+                        WindPowerStationTestingPoint2 point = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(pList.get(i).getId(), Constant.FJZCSL);
                         String hgCode = point.getCode();// 合格(正常)
-                        point = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(pList.get(i).getId(), Constant.FJLHSL);
+                        point = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(pList.get(i).getId(), Constant.FJLHSL);
                         String lhCode = point.getCode();// 良好
                         List<PointData> phgList = realApiUtil.getHistoryDatasSnap(hgCode, start / 1000, end / 1000, 0L,
                                 15 * 60L);
@@ -386,9 +386,9 @@ public class HealthOperationService {
                         }
 
                     } else {
-                        WindPowerStationTestingPoint2 point = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(pList.get(i).getId(), Constant.FJZYSL);
+                        WindPowerStationTestingPoint2 point = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(pList.get(i).getId(), Constant.FJZYSL);
                         String zyCode = point.getCode();// 注意
-                        point = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(pList.get(i).getId(), Constant.FJYZSL);
+                        point = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(pList.get(i).getId(), Constant.FJYZSL);
                         String yzCode = point.getCode();// 严重
                         List<PointData> pzyList = realApiUtil.getHistoryDatasSnap(zyCode, start / 1000, end / 1000, 0L,
                                 15 * 60L);

src/main/java/com/gyee/frame/service/health/MetricsService.java

@@ -0,0 +1,37 @@
+package com.gyee.frame.service.health;
+
+import com.gyee.frame.common.exception.QiNiuException;
+import com.gyee.frame.common.exception.enums.QiNiuErrorEnum;
+import com.gyee.frame.mapper.auto.MetricsMapper;
+import com.gyee.frame.model.auto.Metrics;
+import com.gyee.frame.model.auto.MetricsExample;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Service
+public class MetricsService {
+
+    @Resource
+    private MetricsMapper metricsMapper;
+
+    /**
+     * 通过MetricsId查询
+     * @param metricId
+     * @return
+     */
+    public List<Metrics> getMetricsByMetricsId(String metricId){
+        MetricsExample example = new MetricsExample();
+
+        List<Metrics> list;
+        try{
+            example.createCriteria().andMetricidEqualTo(metricId);
+            list = metricsMapper.selectByExample(example);
+        }catch (Exception e){
+            throw new QiNiuException(QiNiuErrorEnum.ERROR_DATA);
+        }
+
+        return list;
+    }
+}

src/main/java/com/gyee/frame/service/health/MetricsUniformCodeService.java

@@ -0,0 +1,43 @@
+package com.gyee.frame.service.health;
+
+import com.gyee.frame.common.exception.QiNiuException;
+import com.gyee.frame.common.exception.enums.QiNiuErrorEnum;
+import com.gyee.frame.mapper.auto.MetricsUniformCodeMapper;
+import com.gyee.frame.model.auto.MetricsUniformCode;
+import com.gyee.frame.model.auto.MetricsUniformCodeExample;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Service
+public class MetricsUniformCodeService {
+
+    @Resource
+    private MetricsUniformCodeMapper uniformCodeMapper;
+
+
+    /**
+     * 使用场站、统一编码查询
+     * @param station   场站
+     * @param uniformCode 统一编码
+     * @return
+     */
+    public List<MetricsUniformCode> getListByStationAndUniforCode(String station, String uniformCode){
+        MetricsUniformCodeExample example = new MetricsUniformCodeExample();
+
+        List<MetricsUniformCode> list;
+        try{
+            example.createCriteria().andStationidEqualTo(station)
+                    .andUniformcodeEqualTo(uniformCode);
+
+            list = uniformCodeMapper.selectByExample(example);
+
+        }catch (Exception e){
+            throw new QiNiuException(QiNiuErrorEnum.ERROR_DATA);
+        }
+
+        return list;
+    }
+
+}

src/main/java/com/gyee/frame/service/initialpoint/IinitialPoint.java

@@ -0,0 +1,37 @@
+package com.gyee.frame.service.initialpoint;
+
+
+
+public interface IinitialPoint {
+    /**
+     * 初始化风机
+     * @throws Exception
+     */
+    public void initalFj();
+    /**
+     * 初始化场站
+     * @throws Exception
+     */
+    public void initalFc();
+    /**
+     * 初始化升压站
+     * @throws Exception
+     */
+    public void initalSyz();
+    /**
+     * 初始化电计量
+     * @throws Exception
+     */
+    public void initalDjl();
+    /**
+     * 初始化风功率预测
+     * @throws Exception
+     */
+    public void inital();
+    /**
+     * 初始化AGC
+     * @throws Exception
+     */
+    public void initalAgc();
+
+}

src/main/java/com/gyee/frame/service/initialpoint/InitialPointService.java

@@ -1,21 +1,17 @@
 package com.gyee.frame.service.initialpoint;
 
 import com.gyee.frame.common.spring.InitialRunner;
-import com.gyee.frame.model.auto.Windpowerstation;
-import com.gyee.frame.model.auto.Windturbine;
-import com.gyee.frame.model.auto.Windturbinestandardpoint;
-import com.gyee.frame.model.auto.Windturbinetestingpoint;
-import com.gyee.frame.service.CompanysService;
-import com.gyee.frame.service.RegionService;
-import com.gyee.frame.service.WindturbinestandardpointService;
-import com.gyee.frame.service.WindturbinetestingpointService;
+import com.gyee.frame.model.auto.*;
+import com.gyee.frame.service.*;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
 
 @Service
-public class InitialPointService {
+public class InitialPointGoldenService implements  IinitialPoint{
+
     @Resource
     private RegionService regionService;
     @Resource
@@ -23,20 +19,107 @@ public class InitialPointService {
     @Resource
     private WindturbinestandardpointService windturbinestandardpointService;
     @Resource
+    private WindpowerstationstandardpointService windpowerstationstandardpointService;
+    @Resource
     private WindturbinetestingpointService windturbinetestingpointService;
+    @Resource
+    private WindPowerstationTestingPointService windPowerstationTestingPointService;
 
 
     private final  String AI="AI";
     private final  String DI="DI";
     private final  String CI="CI";
-    public void initalFj()
-    {
 
-            for (Windpowerstation wp:InitialRunner.wpls)
+    @Override
+    public void initalFc() {
+
+        windPowerstationTestingPointService.deleteAll();
+
+        for (Windpowerstation wp:InitialRunner.wpls)
+        {
+
+
+            List<Windpowerstationstandardpoint>  stpointls=windpowerstationstandardpointService.findAllList();
+
+            if(!stpointls.isEmpty())
             {
 
+                List<WindPowerStationTestingPoint> points=new ArrayList<>();
+                for(int i=0;i<stpointls.size();i++)
+                {
+                    StringBuilder sbtable =new StringBuilder();
+
+                    Windpowerstationstandardpoint stp=stpointls.get(i);
+                    StringBuilder sb =new StringBuilder();
+                    sb.append(wp.getPhoto());
+                    String temp=wp.getId().substring(0,wp.getId().indexOf("_"));
+
+                    sbtable.append(temp).append("FC");
+                    sb.append(temp).append("F_").append("XX_XXX_XXX_XXX_");
+
+
+                    sb.append(CI);
+
+                    sb.append(stp.getOrdernum());
+
+                    if(stp.getCode().equals(CI))
+                    {
+                        sbtable.append("JSFW.");
+                        sbtable.append(sb);
+                    }
+
+                    WindPowerStationTestingPoint po=new WindPowerStationTestingPoint();
+                    po.setCode(String.valueOf(sbtable));
+                    sb =new StringBuilder();
+                    sb.append(wp.getName()).append(stp.getName());
+                    po.setName(String.valueOf(sb));
+                    po.setModel(null);
+                    po.setModelid(null);
+                    po.setWindpowerstationid(wp.getId());
+                    po.setUniformcode(stp.getUniformcode());
+
+
+                    if(stp.getCode().equals(CI))
+                    {
+                        sb =new StringBuilder();
+                        temp=wp.getId().substring(0,wp.getId().indexOf("_"));
+                        sb.append(temp).append(".JSFW");
+                        po.setRealtimeid(String.valueOf(sb));
+                    }
+                    points.add(po);
+                }
+                windPowerstationTestingPointService.insertBatch(points);
+            }
+        }
+    }
+
+    @Override
+    public void initalSyz() {
+
+    }
+
+    @Override
+    public void initalDjl() {
+
+    }
+
+    @Override
+    public void inital() {
+
+    }
 
+    @Override
+    public void initalAgc() {
 
+    }
+
+    public void initalFj()
+    {
+
+        windturbinetestingpointService.deleteAll();
+
+            for (Windpowerstation wp:InitialRunner.wpls)
+            {
 
                 if(wp.getId().endsWith("FDC"))
                 {
@@ -49,6 +132,7 @@ public class InitialPointService {
                     {
                         for(Windturbine wt:wtls)
                         {
+                            List<Windturbinetestingpoint> points=new ArrayList<>();
                             for(int i=0;i<stpointls.size();i++)
                             {
                                 StringBuilder sbtable =new StringBuilder();
@@ -56,9 +140,9 @@ public class InitialPointService {
                                 Windturbinestandardpoint stp=stpointls.get(i);
                                 StringBuilder sb =new StringBuilder();
                                 sb.append(wp.getPhoto());
-                                String temp=wp.getId().substring(0,wp.getId().indexOf("_")-1);
+                                String temp=wp.getId().substring(0,wp.getId().indexOf("_"));
 
-                                sbtable.append(temp);
+                                sbtable.append(temp).append("FJ");
                                 sb.append(temp).append("F_").append("FJ_");
                                 temp=wt.getProjectid().substring(0,wt.getProjectid().lastIndexOf("_"));
                                 sb.append("P").append(temp.substring(temp.length()-2)).append("_");
@@ -92,10 +176,17 @@ public class InitialPointService {
 
                                 sb.append(stp.getOrdernum());
 
-
+                                if(stp.getCode().equals(CI))
+                                {
+                                    sbtable.append("JSFW.");
+                                    sbtable.append(sb);
+                                }else
+                                {
+                                    sbtable.append(".").append(sb);
+                                }
                                 Windturbinetestingpoint po=new Windturbinetestingpoint();
-                                po.setId(String.valueOf(sb));
-                                po.setCode(String.valueOf(sb));
+                                po.setId(String.valueOf(sbtable));
+                                po.setCode(String.valueOf(sbtable));
                                 sb =new StringBuilder();
                                 sb.append(wt.getName()).append(stp.getName());
                                 po.setName(String.valueOf(sb));
@@ -112,9 +203,11 @@ public class InitialPointService {
                                     sb.append(temp).append(".JSFW");
                                     po.setRealtimeid(String.valueOf(sb));
                                 }
-
-                                windturbinetestingpointService.insertSelective(po);
+                                points.add(po);
+//                                windturbinetestingpointService.insertSelective(po);
                             }
+
+                            windturbinetestingpointService.insertBatch(points);
                         }
                     }
 
@@ -124,5 +217,4 @@ public class InitialPointService {
 
     }
 
-
 }

src/main/java/com/gyee/frame/service/websocket/AgcService.java

@@ -6,7 +6,7 @@ import com.gyee.frame.model.agc.AgcVo;
 import com.gyee.frame.model.auto.WindPowerStationTestingPoint2;
 import com.gyee.frame.model.auto.Windpowerstation;
 import com.gyee.frame.model.custom.PointData;
-import com.gyee.frame.service.WindPowerstationTestingPointService;
+import com.gyee.frame.service.WindPowerstationTestingPoint2Service;
 import com.gyee.frame.util.DateUtils;
 import com.gyee.frame.util.IRealTimeDataBaseUtil;
 import com.gyee.frame.util.MathUtil;
@@ -30,7 +30,7 @@ public class AgcService {
 
     private IRealTimeDataBaseUtil ednaApiUtil = new EdosUtil();
     @Resource
-    private WindPowerstationTestingPointService windPowerstationTestingPointService;
+    private WindPowerstationTestingPoint2Service windPowerstationTestingPoint2Service;
     String[] ycPoints1 = Constant.TPOINT_WP_FGLYC.split(",");
 
     public List<Map<String, Object>> getAgcValues() throws Exception {
@@ -182,9 +182,9 @@ public class AgcService {
 
             }
 
-            PointData data = ednaApiUtil.getRealData(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), ycPoints1[0]));
+            PointData data = ednaApiUtil.getRealData(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), ycPoints1[0]));
             resultmap.put("ycgl",MathUtil.decimal(data.getPointValueInDouble(), 2));
-            data = ednaApiUtil.getRealData(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.FJZT));
+            data = ednaApiUtil.getRealData(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.FJZT));
             double zt=data.getPointValueInDouble();
             if(zt==5)
             {
@@ -250,7 +250,7 @@ public class AgcService {
                 tempmap.put("name",wp.getName());
                 tempmap.put("ddmc","牛首山第五风电场");
 
-                data = ednaApiUtil.getRealData(windPowerstationTestingPointService.getWindPowerStationTestingPoint2("SBQ04_GC", Constant.FJZT));
+                data = ednaApiUtil.getRealData(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2("SBQ04_GC", Constant.FJZT));
                 zt=data.getPointValueInDouble();
                 if(zt==5)
                 {
@@ -311,7 +311,7 @@ public class AgcService {
                 tempmap.put("ycgl",0.0);
                 tempmap.put("name",wp.getName());
                 tempmap.put("ddmc","宋堡第六风电场");
-                data = ednaApiUtil.getRealData(windPowerstationTestingPointService.getWindPowerStationTestingPoint2("QS03_GC", Constant.FJZT));
+                data = ednaApiUtil.getRealData(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2("QS03_GC", Constant.FJZT));
                 zt=data.getPointValueInDouble();
                 if(zt==5)
                 {

src/main/java/com/gyee/frame/service/websocket/CftInfoPushService.java

@@ -6,7 +6,7 @@ import com.gyee.frame.model.auto.WindPowerStationTestingPoint2;
 import com.gyee.frame.model.custom.DataVo;
 import com.gyee.frame.model.custom.PointData;
 import com.gyee.frame.service.ProjectPlanService;
-import com.gyee.frame.service.WindPowerstationTestingPointService;
+import com.gyee.frame.service.WindPowerstationTestingPoint2Service;
 import com.gyee.frame.service.WindpowerinfodayService;
 import com.gyee.frame.service.WindpowerstationthewindinfoService;
 import com.gyee.frame.util.DateUtils;
@@ -23,7 +23,7 @@ public class CftInfoPushService {
 
 
     @Resource
-    private WindPowerstationTestingPointService windPowerstationTestingPointService;
+    private WindPowerstationTestingPoint2Service windPowerstationTestingPoint2Service;
     @Resource
     private WindpowerinfodayService windpowerinfodayService;
     @Resource
@@ -64,7 +64,7 @@ public class CftInfoPushService {
 
             for(int i=0;i<cftstrs.length;i++)
             {
-                WindPowerStationTestingPoint2 point2 =windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, cftstrs[i]);
+                WindPowerStationTestingPoint2 point2 =windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, cftstrs[i]);
 
                 if(StringUtils.notEmp(point2.getCode()))
                 {

src/main/java/com/gyee/frame/service/websocket/GenreSetPushDetailPjService.java

@@ -12,7 +12,7 @@ import com.gyee.frame.model.custom.PointData;
 import com.gyee.frame.model.custom.resultVo;
 import com.gyee.frame.service.ProjectPlanService;
 import com.gyee.frame.service.ShutdowneventService;
-import com.gyee.frame.service.WindPowerstationTestingPointService;
+import com.gyee.frame.service.WindPowerstationTestingPoint2Service;
 import com.gyee.frame.service.WindpowerinfodayService;
 import com.gyee.frame.util.DateUtils;
 import com.gyee.frame.util.IRealTimeDataBaseUtil;
@@ -31,7 +31,7 @@ public class GenreSetPushDetailPjService {
 
 
     @Resource
-    private WindPowerstationTestingPointService windPowerstationTestingPointService;
+    private WindPowerstationTestingPoint2Service windPowerstationTestingPoint2Service;
     @Resource
     private WindpowerinfodayService windpowerinfodayService;
     @Resource
@@ -132,7 +132,7 @@ public class GenreSetPushDetailPjService {
                 // public static final String RWZSSDL = "RWZSSDL"; // 日场外受累电网
                 // public static final String RTZSSDL = "RTZSSDL"; // 日场外受累天气
                 if (targetName.equals(RFDL)) {
-                    WindPowerStationTestingPoint2 rfdlai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WP_RFDL);// 日发电量
+                    WindPowerStationTestingPoint2 rfdlai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WP_RFDL);// 日发电量
                     List<PointData> rfdls = new ArrayList<PointData>();
                     try {
                         rfdls = realApiUtil.getHistoryDatasSnap(rfdlai, beginDate.getTime() / 1000,
@@ -143,7 +143,7 @@ public class GenreSetPushDetailPjService {
                     }
                     setPointValueFdl(wp, vo, rfdls, summap);
                 } else if (targetName.equals(RXDSSDL)) {
-                    WindPowerStationTestingPoint2 xdai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.RXDSSDL);
+                    WindPowerStationTestingPoint2 xdai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RXDSSDL);
                     List<PointData> xdls = new ArrayList<PointData>();
                     try {
                         xdls = realApiUtil.getHistoryDatasSnap(xdai, beginDate.getTime() / 1000,
@@ -154,10 +154,10 @@ public class GenreSetPushDetailPjService {
                     }
                     setPointValue(wp, vo, xdls, summap);
                 } else if (targetName.equals(RXNSSDL)) {
-                    WindPowerStationTestingPoint2 qfai1 = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.RSDJZSDL);
-                    WindPowerStationTestingPoint2 qfai2 = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.RSSTZSDL);
-                    WindPowerStationTestingPoint2 qfai3 = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.RXNZSDL);
-                    WindPowerStationTestingPoint2 qfai4 = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.RSQXZSDL);
+                    WindPowerStationTestingPoint2 qfai1 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RSDJZSDL);
+                    WindPowerStationTestingPoint2 qfai2 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RSSTZSDL);
+                    WindPowerStationTestingPoint2 qfai3 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RXNZSDL);
+                    WindPowerStationTestingPoint2 qfai4 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RSQXZSDL);
 
                     List<PointData> qfls1 = new ArrayList<PointData>();
                     List<PointData> qfls2 = new ArrayList<PointData>();
@@ -197,8 +197,8 @@ public class GenreSetPushDetailPjService {
                         setPointValue(wp, vo, qfls, summap);
                     }
                 } else if (targetName.equals(RGZSSDL)) {
-                    WindPowerStationTestingPoint2 gzai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.RGZSSDL);
-                    WindPowerStationTestingPoint2 gzslai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.RSZSSDL);
+                    WindPowerStationTestingPoint2 gzai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RGZSSDL);
+                    WindPowerStationTestingPoint2 gzslai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RSZSSDL);
                     List<PointData> gzls = new ArrayList<PointData>();
                     try {
                         gzls = realApiUtil.getHistoryDatasSnap(gzai, beginDate.getTime() / 1000,
@@ -217,8 +217,8 @@ public class GenreSetPushDetailPjService {
                     }
                     setPointValue(wp, vo, gzls, gzslls, summap);
                 } else if (targetName.equals(RJXSSDL)) {
-                    WindPowerStationTestingPoint2 jxai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.RJXSSDL);
-                    WindPowerStationTestingPoint2 jxslai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.RLZSSDL);
+                    WindPowerStationTestingPoint2 jxai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RJXSSDL);
+                    WindPowerStationTestingPoint2 jxslai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RLZSSDL);
                     List<PointData> jxls = new ArrayList<PointData>();
                     try {
                         jxls = realApiUtil.getHistoryDatasSnap(jxai, beginDate.getTime() / 1000,
@@ -238,8 +238,8 @@ public class GenreSetPushDetailPjService {
 
                     setPointValue(wp, vo, jxls, jxslls, summap);
                 } else if (targetName.equals(RSLSSDL)) {
-                    WindPowerStationTestingPoint2 dwai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.RWZSSDL);
-                    WindPowerStationTestingPoint2 tqai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.RTZSSDL);
+                    WindPowerStationTestingPoint2 dwai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RWZSSDL);
+                    WindPowerStationTestingPoint2 tqai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RTZSSDL);
                     List<PointData> dwls = new ArrayList<PointData>();
                     try {
                         dwls = realApiUtil.getHistoryDatasSnap(dwai, beginDate.getTime() / 1000,
@@ -593,7 +593,7 @@ public class GenreSetPushDetailPjService {
                 Date endDate = c.getTime();
                 Date beginDate = c.getTime();
                 if (targetName.equals(YFDL)) {
-                    WindPowerStationTestingPoint2 yfdlai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WP_YFDL);// 月发电量
+                    WindPowerStationTestingPoint2 yfdlai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WP_YFDL);// 月发电量
                     List<PointData> yfdls = new ArrayList<PointData>();
                     double value2 = 0.0;
                     double value3 = 0.0;
@@ -649,7 +649,7 @@ public class GenreSetPushDetailPjService {
                     vo.setValue3(String.valueOf(value3));
                     vo.setValue4(String.valueOf(value4));
                 } else if (targetName.equals(YXDSSDL)) {
-                    WindPowerStationTestingPoint2 xdai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.YXDSSDL);
+                    WindPowerStationTestingPoint2 xdai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YXDSSDL);
                     List<PointData> xdls = new ArrayList<PointData>();
                     double value2 = 0.0;
                     double value3 = 0.0;
@@ -711,10 +711,10 @@ public class GenreSetPushDetailPjService {
                     vo.setValue3(String.valueOf(value3));
                     vo.setValue4(String.valueOf(value4));
                 } else if (targetName.equals(YXNSSDL)) {
-                    WindPowerStationTestingPoint2 qfai1 = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.YSDJZSDL);
-                    WindPowerStationTestingPoint2 qfai2 = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.YSSTZSDL);
-                    WindPowerStationTestingPoint2 qfai3 = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.YXNZSDL);
-                    WindPowerStationTestingPoint2 qfai4 = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.YSQXZSDL);
+                    WindPowerStationTestingPoint2 qfai1 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YSDJZSDL);
+                    WindPowerStationTestingPoint2 qfai2 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YSSTZSDL);
+                    WindPowerStationTestingPoint2 qfai3 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YXNZSDL);
+                    WindPowerStationTestingPoint2 qfai4 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YSQXZSDL);
                     List<PointData> qfls = new ArrayList<PointData>();
 
                     double value2 = 0.0;
@@ -820,8 +820,8 @@ public class GenreSetPushDetailPjService {
                     vo.setValue3(String.valueOf(value3));
                     vo.setValue4(String.valueOf(value4));
                 } else if (targetName.equals(YGZSSDL)) {
-                    WindPowerStationTestingPoint2 gzai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.YGZSSDL);
-                    WindPowerStationTestingPoint2 gzslai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.YSZSSDL);
+                    WindPowerStationTestingPoint2 gzai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YGZSSDL);
+                    WindPowerStationTestingPoint2 gzslai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YSZSSDL);
                     vo.setValue1(wp.getName());
                     double value2 = 0.0;
                     double value12 = 0.0;
@@ -930,8 +930,8 @@ public class GenreSetPushDetailPjService {
                     vo.setValue3(String.valueOf(value3));
                     vo.setValue4(String.valueOf(value4));
                 } else if (targetName.equals(YJXSSDL)) {
-                    WindPowerStationTestingPoint2 jxai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.YJXSSDL);
-                    WindPowerStationTestingPoint2 jxslai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.YLZSSDL);
+                    WindPowerStationTestingPoint2 jxai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YJXSSDL);
+                    WindPowerStationTestingPoint2 jxslai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YLZSSDL);
                     vo.setValue1(wp.getName());
                     double value2 = 0.0;
                     double value12 = 0.0;
@@ -1037,8 +1037,8 @@ public class GenreSetPushDetailPjService {
                     vo.setValue3(String.valueOf(value3));
                     vo.setValue4(String.valueOf(value4));
                 } else if (targetName.equals(YSLSSDL)) {
-                    WindPowerStationTestingPoint2 dwai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.YWZSSDL);
-                    WindPowerStationTestingPoint2 tqai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.YTZSSDL);
+                    WindPowerStationTestingPoint2 dwai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YWZSSDL);
+                    WindPowerStationTestingPoint2 tqai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YTZSSDL);
                     vo.setValue1(wp.getName());
                     double value2 = 0.0;
                     double value12 = 0.0;
@@ -1253,7 +1253,7 @@ public class GenreSetPushDetailPjService {
                 Date endDate = c.getTime();
                 Date beginDate = c.getTime();
                 if (targetName.equals(NFDL)) {
-                    WindPowerStationTestingPoint2 yfdlai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WP_NFDL);
+                    WindPowerStationTestingPoint2 yfdlai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WP_NFDL);
                     List<PointData> yfdls = new ArrayList<PointData>();
                     double value2 = 0.0;
                     double value3 = 0.0;
@@ -1309,7 +1309,7 @@ public class GenreSetPushDetailPjService {
                     vo.setValue3(String.valueOf(value3));
                     vo.setValue4(String.valueOf(value4));
                 } else if (targetName.equals(NXDSSDL)) {
-                    WindPowerStationTestingPoint2 xdai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.NXDSSDL);
+                    WindPowerStationTestingPoint2 xdai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NXDSSDL);
                     List<PointData> xdls = new ArrayList<PointData>();
                     double value2 = 0.0;
                     double value3 = 0.0;
@@ -1373,10 +1373,10 @@ public class GenreSetPushDetailPjService {
                     vo.setValue3(String.valueOf(value3));
                     vo.setValue4(String.valueOf(value4));
                 } else if (targetName.equals(NXNSSDL)) {
-                    WindPowerStationTestingPoint2 qfai1 = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.NSDJZSDL);
-                    WindPowerStationTestingPoint2 qfai2 = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.NSSTZSDL);
-                    WindPowerStationTestingPoint2 qfai3 = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.NXNZSDL);
-                    WindPowerStationTestingPoint2 qfai4 = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.NSQXZSDL);
+                    WindPowerStationTestingPoint2 qfai1 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NSDJZSDL);
+                    WindPowerStationTestingPoint2 qfai2 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NSSTZSDL);
+                    WindPowerStationTestingPoint2 qfai3 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NXNZSDL);
+                    WindPowerStationTestingPoint2 qfai4 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NSQXZSDL);
                     List<PointData> qfls = new ArrayList<PointData>();
 
                     double value2 = 0.0;
@@ -1482,8 +1482,8 @@ public class GenreSetPushDetailPjService {
                     vo.setValue3(String.valueOf(value3));
                     vo.setValue4(String.valueOf(value4));
                 } else if (targetName.equals(NGZSSDL)) {
-                    WindPowerStationTestingPoint2 gzai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.NGZSSDL);
-                    WindPowerStationTestingPoint2 gzslai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.NSZSSDL);
+                    WindPowerStationTestingPoint2 gzai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NGZSSDL);
+                    WindPowerStationTestingPoint2 gzslai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NSZSSDL);
                     vo.setValue1(wp.getName());
                     double value2 = 0.0;
                     double value12 = 0.0;
@@ -1592,8 +1592,8 @@ public class GenreSetPushDetailPjService {
                     vo.setValue3(String.valueOf(value3));
                     vo.setValue4(String.valueOf(value4));
                 } else if (targetName.equals(NJXSSDL)) {
-                    WindPowerStationTestingPoint2 jxai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.NJXSSDL);
-                    WindPowerStationTestingPoint2 jxslai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.NLZSSDL);
+                    WindPowerStationTestingPoint2 jxai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NJXSSDL);
+                    WindPowerStationTestingPoint2 jxslai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NLZSSDL);
                     vo.setValue1(wp.getName());
                     double value2 = 0.0;
                     double value12 = 0.0;
@@ -1699,8 +1699,8 @@ public class GenreSetPushDetailPjService {
                     vo.setValue3(String.valueOf(value3));
                     vo.setValue4(String.valueOf(value4));
                 } else if (targetName.equals(NSLSSDL)) {
-                    WindPowerStationTestingPoint2 dwai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.NWZSSDL);
-                    WindPowerStationTestingPoint2 tqai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.NTZSSDL);
+                    WindPowerStationTestingPoint2 dwai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NWZSSDL);
+                    WindPowerStationTestingPoint2 tqai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NTZSSDL);
                     vo.setValue1(wp.getName());
                     double value2 = 0.0;
                     double value12 = 0.0;
@@ -1877,8 +1877,8 @@ public class GenreSetPushDetailPjService {
                 if (line.getProjectid().equals(id)) {
                     DataVo vo = new DataVo();
                     vo.setName(line.getName());
-                    WindPowerStationTestingPoint2 yfdlpoint=windPowerstationTestingPointService.getWindPowerStationTestingPoint2(line.getId(), Constant.TPOINT_WP_YFDL);
-                    WindPowerStationTestingPoint2 nfdlpoint=windPowerstationTestingPointService.getWindPowerStationTestingPoint2(line.getId(), Constant.TPOINT_WP_NFDL);
+                    WindPowerStationTestingPoint2 yfdlpoint=windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(line.getId(), Constant.TPOINT_WP_YFDL);
+                    WindPowerStationTestingPoint2 nfdlpoint=windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(line.getId(), Constant.TPOINT_WP_NFDL);
 
                     double yfdl = realApiUtil.getRealData(yfdlpoint).getPointValueInDouble();
                     double nfdl = realApiUtil.getRealData(nfdlpoint).getPointValueInDouble();

src/main/java/com/gyee/frame/service/websocket/GenreSetPushDetailService.java

@@ -11,7 +11,7 @@ import com.gyee.frame.model.custom.PointData;
 import com.gyee.frame.model.custom.resultVo;
 import com.gyee.frame.service.ProjectPlanService;
 import com.gyee.frame.service.ShutdowneventService;
-import com.gyee.frame.service.WindPowerstationTestingPointService;
+import com.gyee.frame.service.WindPowerstationTestingPoint2Service;
 import com.gyee.frame.service.WindpowerinfodayService;
 import com.gyee.frame.util.DateUtils;
 import com.gyee.frame.util.IRealTimeDataBaseUtil;
@@ -29,7 +29,7 @@ public class GenreSetPushDetailService {
 
 
     @Resource
-    private WindPowerstationTestingPointService windPowerstationTestingPointService;
+    private WindPowerstationTestingPoint2Service windPowerstationTestingPoint2Service;
     @Resource
     private WindpowerinfodayService windpowerinfodayService;
     @Resource
@@ -156,7 +156,7 @@ public class GenreSetPushDetailService {
                 // public static final String RWZSSDL = "RWZSSDL"; // 日场外受累电网
                 // public static final String RTZSSDL = "RTZSSDL"; // 日场外受累天气
                 if (targetName.equals(RFDL)) {
-                    WindPowerStationTestingPoint2 rfdlai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WP_RFDL);// 日发电量
+                    WindPowerStationTestingPoint2 rfdlai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WP_RFDL);// 日发电量
 
                     List<PointData> rfdls = new ArrayList<PointData>();
                     try {
@@ -167,7 +167,7 @@ public class GenreSetPushDetailService {
                     }
                     setPointValueFdl(wp, vo, rfdls, summap);
                 } else if (targetName.equals(RXDSSDL)) {
-                    WindPowerStationTestingPoint2 xdai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.RXDSSDL);
+                    WindPowerStationTestingPoint2 xdai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RXDSSDL);
                     List<PointData> xdls = new ArrayList<PointData>();
                     try {
                         xdls = realApiUtil.getHistoryDatasSnap(xdai, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, 86400L);
@@ -178,10 +178,10 @@ public class GenreSetPushDetailService {
                     setPointValue(wp, vo, xdls, summap);
                 } else if (targetName.equals(RXNSSDL)) {
 
-                    WindPowerStationTestingPoint2 qfai1 = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.RSDJZSDL);
-                    WindPowerStationTestingPoint2 qfai2 = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.RSSTZSDL);
-                    WindPowerStationTestingPoint2 qfai3 = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.RXNZSDL);
-                    WindPowerStationTestingPoint2 qfai4 = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.RSQXZSDL);
+                    WindPowerStationTestingPoint2 qfai1 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RSDJZSDL);
+                    WindPowerStationTestingPoint2 qfai2 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RSSTZSDL);
+                    WindPowerStationTestingPoint2 qfai3 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RXNZSDL);
+                    WindPowerStationTestingPoint2 qfai4 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RSQXZSDL);
 
                     List<PointData> qfls1 = new ArrayList<PointData>();
                     List<PointData> qfls2 = new ArrayList<PointData>();
@@ -220,8 +220,8 @@ public class GenreSetPushDetailService {
                     }
 
                 } else if (targetName.equals(RGZSSDL)) {
-                    WindPowerStationTestingPoint2 gzai =  windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.RGZSSDL);
-                    WindPowerStationTestingPoint2 gzslai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.RSZSSDL);
+                    WindPowerStationTestingPoint2 gzai =  windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RGZSSDL);
+                    WindPowerStationTestingPoint2 gzslai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RSZSSDL);
                     List<PointData> gzls = new ArrayList<PointData>();
                     try {
                         gzls = realApiUtil.getHistoryDatasSnap(gzai, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, 86400L);
@@ -239,8 +239,8 @@ public class GenreSetPushDetailService {
                     }
                     setPointValue(wp, vo, gzls, gzslls, summap);
                 } else if (targetName.equals(RJXSSDL)) {
-                    WindPowerStationTestingPoint2 jxai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.RJXSSDL);
-                    WindPowerStationTestingPoint2 jxslai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.RLZSSDL);
+                    WindPowerStationTestingPoint2 jxai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RJXSSDL);
+                    WindPowerStationTestingPoint2 jxslai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RLZSSDL);
                     List<PointData> jxls = new ArrayList<PointData>();
                     try {
                         jxls = realApiUtil.getHistoryDatasSnap(jxai, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, 86400L);
@@ -258,8 +258,8 @@ public class GenreSetPushDetailService {
 
                     setPointValue(wp, vo, jxls, jxslls, summap);
                 } else if (targetName.equals(RSLSSDL)) {
-                    WindPowerStationTestingPoint2 dwai =  windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.RWZSSDL);
-                    WindPowerStationTestingPoint2 tqai =  windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.RTZSSDL);
+                    WindPowerStationTestingPoint2 dwai =  windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RWZSSDL);
+                    WindPowerStationTestingPoint2 tqai =  windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RTZSSDL);
                     List<PointData> dwls = new ArrayList<PointData>();
                     try {
                         dwls = realApiUtil.getHistoryDatasSnap(dwai, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, 86400L);
@@ -611,7 +611,7 @@ public class GenreSetPushDetailService {
                 Date endDate = c.getTime();
                 Date beginDate = c.getTime();
                 if (targetName.equals(YFDL)) {
-                    WindPowerStationTestingPoint2 yfdlai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WP_YFDL);// 月发电量
+                    WindPowerStationTestingPoint2 yfdlai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WP_YFDL);// 月发电量
                     List<PointData> yfdls = new ArrayList<PointData>();
                     double value2 = 0.0;
                     double value3 = 0.0;
@@ -670,7 +670,7 @@ public class GenreSetPushDetailService {
                     vo.setValue3(String.valueOf(value3));
                     vo.setValue4(String.valueOf(value4));
                 } else if (targetName.equals(YXDSSDL)) {
-                    WindPowerStationTestingPoint2 xdai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.YXDSSDL);
+                    WindPowerStationTestingPoint2 xdai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YXDSSDL);
                     List<PointData> xdls = new ArrayList<PointData>();
                     double value2 = 0.0;
                     double value3 = 0.0;
@@ -732,10 +732,10 @@ public class GenreSetPushDetailService {
                     vo.setValue3(String.valueOf(value3));
                     vo.setValue4(String.valueOf(value4));
                 } else if (targetName.equals(YXNSSDL)) {
-                    WindPowerStationTestingPoint2 qfai1 =windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.YSDJZSDL);
-                    WindPowerStationTestingPoint2 qfai2 =windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.YSSTZSDL);
-                    WindPowerStationTestingPoint2 qfai3 =windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.YXNZSDL);
-                    WindPowerStationTestingPoint2 qfai4 =windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.YSQXZSDL);
+                    WindPowerStationTestingPoint2 qfai1 =windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YSDJZSDL);
+                    WindPowerStationTestingPoint2 qfai2 =windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YSSTZSDL);
+                    WindPowerStationTestingPoint2 qfai3 =windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YXNZSDL);
+                    WindPowerStationTestingPoint2 qfai4 =windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YSQXZSDL);
                     List<PointData> qfls = new ArrayList<PointData>();
 
                     double value2 = 0.0;
@@ -838,8 +838,8 @@ public class GenreSetPushDetailService {
                     vo.setValue3(String.valueOf(value3));
                     vo.setValue4(String.valueOf(value4));
                 } else if (targetName.equals(YGZSSDL)) {
-                    WindPowerStationTestingPoint2 gzai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.YGZSSDL);
-                    WindPowerStationTestingPoint2 gzslai =windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.YGZSSDL);
+                    WindPowerStationTestingPoint2 gzai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YGZSSDL);
+                    WindPowerStationTestingPoint2 gzslai =windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YGZSSDL);
                     vo.setValue1(wp.getName());
                     double value2 = 0.0;
                     double value12 = 0.0;
@@ -951,8 +951,8 @@ public class GenreSetPushDetailService {
                     vo.setValue3(String.valueOf(value3));
                     vo.setValue4(String.valueOf(value4));
                 } else if (targetName.equals(YJXSSDL)) {
-                    WindPowerStationTestingPoint2 jxai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.YJXSSDL);
-                    WindPowerStationTestingPoint2 jxslai =windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.YLZSSDL);
+                    WindPowerStationTestingPoint2 jxai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YJXSSDL);
+                    WindPowerStationTestingPoint2 jxslai =windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YLZSSDL);
                     vo.setValue1(wp.getName());
                     double value2 = 0.0;
                     double value12 = 0.0;
@@ -1061,8 +1061,8 @@ public class GenreSetPushDetailService {
                     vo.setValue3(String.valueOf(value3));
                     vo.setValue4(String.valueOf(value4));
                 } else if (targetName.equals(YSLSSDL)) {
-                    WindPowerStationTestingPoint2 dwai =windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.YWZSSDL);
-                    WindPowerStationTestingPoint2 tqai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.YTZSSDL);
+                    WindPowerStationTestingPoint2 dwai =windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YWZSSDL);
+                    WindPowerStationTestingPoint2 tqai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YTZSSDL);
                     vo.setValue1(wp.getName());
                     double value2 = 0.0;
                     double value12 = 0.0;
@@ -1310,7 +1310,7 @@ public class GenreSetPushDetailService {
                 Date endDate = c.getTime();
                 Date beginDate = c.getTime();
                 if (targetName.equals(NFDL)) {
-                    WindPowerStationTestingPoint2 yfdlai =windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WP_NFDL);
+                    WindPowerStationTestingPoint2 yfdlai =windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WP_NFDL);
                     List<PointData> yfdls = new ArrayList<PointData>();
                     double value2 = 0.0;
                     double value3 = 0.0;
@@ -1368,7 +1368,7 @@ public class GenreSetPushDetailService {
                     vo.setValue3(String.valueOf(value3));
                     vo.setValue4(String.valueOf(value4));
                 } else if (targetName.equals(NXDSSDL)) {
-                    WindPowerStationTestingPoint2 xdai =windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.NXDSSDL);
+                    WindPowerStationTestingPoint2 xdai =windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NXDSSDL);
                     List<PointData> xdls = new ArrayList<PointData>();
                     double value2 = 0.0;
                     double value3 = 0.0;
@@ -1431,10 +1431,10 @@ public class GenreSetPushDetailService {
                     vo.setValue3(String.valueOf(value3));
                     vo.setValue4(String.valueOf(value4));
                 } else if (targetName.equals(NXNSSDL)) {
-                    WindPowerStationTestingPoint2 qfai1 =windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.NSDJZSDL);
-                    WindPowerStationTestingPoint2 qfai2 = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.NSSTZSDL);
-                    WindPowerStationTestingPoint2 qfai3 =windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.NXNZSDL);
-                    WindPowerStationTestingPoint2 qfai4 =windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.NSQXZSDL);
+                    WindPowerStationTestingPoint2 qfai1 =windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NSDJZSDL);
+                    WindPowerStationTestingPoint2 qfai2 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NSSTZSDL);
+                    WindPowerStationTestingPoint2 qfai3 =windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NXNZSDL);
+                    WindPowerStationTestingPoint2 qfai4 =windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NSQXZSDL);
                     List<PointData> qfls = new ArrayList<PointData>();
 
                     double value2 = 0.0;
@@ -1537,8 +1537,8 @@ public class GenreSetPushDetailService {
                     vo.setValue3(String.valueOf(value3));
                     vo.setValue4(String.valueOf(value4));
                 } else if (targetName.equals("ngzssdl")) {
-                    WindPowerStationTestingPoint2 gzai =windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.NGZSSDL);
-                    WindPowerStationTestingPoint2 gzslai =windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.NSZSSDL);
+                    WindPowerStationTestingPoint2 gzai =windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NGZSSDL);
+                    WindPowerStationTestingPoint2 gzslai =windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NSZSSDL);
                     vo.setValue1(wp.getName());
                     double value2 = 0.0;
                     double value12 = 0.0;
@@ -1649,8 +1649,8 @@ public class GenreSetPushDetailService {
                     vo.setValue3(String.valueOf(value3));
                     vo.setValue4(String.valueOf(value4));
                 } else if (targetName.equals(NJXSSDL)) {
-                    WindPowerStationTestingPoint2 jxai =windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.NJXSSDL);
-                    WindPowerStationTestingPoint2 jxslai =windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.NLZSSDL);
+                    WindPowerStationTestingPoint2 jxai =windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NJXSSDL);
+                    WindPowerStationTestingPoint2 jxslai =windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NLZSSDL);
                     vo.setValue1(wp.getName());
                     double value2 = 0.0;
                     double value12 = 0.0;
@@ -1758,8 +1758,8 @@ public class GenreSetPushDetailService {
                     vo.setValue3(String.valueOf(value3));
                     vo.setValue4(String.valueOf(value4));
                 } else if (targetName.equals(NSLSSDL)) {
-                    WindPowerStationTestingPoint2 dwai =windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.NWZSSDL);
-                    WindPowerStationTestingPoint2 tqai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.NTZSSDL);
+                    WindPowerStationTestingPoint2 dwai =windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NWZSSDL);
+                    WindPowerStationTestingPoint2 tqai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NTZSSDL);
                     vo.setValue1(wp.getName());
                     double value2 = 0.0;
                     double value12 = 0.0;
@@ -1961,8 +1961,8 @@ public class GenreSetPushDetailService {
             Map.Entry<String, DataVo> entry = (Map.Entry<String, DataVo>) it.next();
             DataVo vo = entry.getValue();
 
-            WindPowerStationTestingPoint2 yfdlpoint=windPowerstationTestingPointService.getWindPowerStationTestingPoint2(entry.getKey(), Constant.TPOINT_WP_YFDL);
-            WindPowerStationTestingPoint2 nfdlpoint=windPowerstationTestingPointService.getWindPowerStationTestingPoint2(entry.getKey(), Constant.TPOINT_WP_NFDL);
+            WindPowerStationTestingPoint2 yfdlpoint=windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(entry.getKey(), Constant.TPOINT_WP_YFDL);
+            WindPowerStationTestingPoint2 nfdlpoint=windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(entry.getKey(), Constant.TPOINT_WP_NFDL);
             double yfdl = realApiUtil.getRealData(yfdlpoint).getPointValueInDouble();
             double nfdl = realApiUtil.getRealData(nfdlpoint).getPointValueInDouble();
 

src/main/java/com/gyee/frame/service/websocket/GenreSetPushDetailWpService.java

@@ -10,7 +10,7 @@ import com.gyee.frame.model.custom.DataVo;
 import com.gyee.frame.model.custom.PointData;
 import com.gyee.frame.model.custom.resultVo;
 import com.gyee.frame.service.ProjectPlanService;
-import com.gyee.frame.service.WindPowerstationTestingPointService;
+import com.gyee.frame.service.WindPowerstationTestingPoint2Service;
 import com.gyee.frame.service.WindTurbineTestingPointAiService;
 import com.gyee.frame.util.DateUtils;
 import com.gyee.frame.util.IRealTimeDataBaseUtil;
@@ -28,7 +28,7 @@ public class GenreSetPushDetailWpService {
 
 
     @Resource
-    private WindPowerstationTestingPointService windPowerstationTestingPointService;
+    private WindPowerstationTestingPoint2Service windPowerstationTestingPoint2Service;
     @Resource
     private WindTurbineTestingPointAiService windTurbineTestingPointAiService;
     @Resource
@@ -128,7 +128,7 @@ public class GenreSetPushDetailWpService {
                 // public static final String RWZSSDL = "RWZSSDL"; // 日场外受累电网
                 // public static final String RTZSSDL = "RTZSSDL"; // 日场外受累天气
                 if (targetName.equals(RFDL)) {
-                    WindPowerStationTestingPoint2 rfdlai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WP_RFDL);// 日发电量
+                    WindPowerStationTestingPoint2 rfdlai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WP_RFDL);// 日发电量
                     List<PointData> rfdls = new ArrayList<PointData>();
                     try {
                         rfdls = realApiUtil.getHistoryDatasSnap(rfdlai, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, 86400L);
@@ -138,7 +138,7 @@ public class GenreSetPushDetailWpService {
                     }
                     setPointValueFdl(wp, vo, rfdls, summap);
                 } else if (targetName.equals(RXDSSDL)) {
-                    WindPowerStationTestingPoint2 xdai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.RXDSSDL);
+                    WindPowerStationTestingPoint2 xdai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RXDSSDL);
                     List<PointData> xdls = new ArrayList<PointData>();
                     try {
                         xdls = realApiUtil.getHistoryDatasSnap(xdai, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, 86400L);
@@ -148,10 +148,10 @@ public class GenreSetPushDetailWpService {
                     }
                     setPointValue(wp, vo, xdls, summap);
                 } else if (targetName.equals(RXNSSDL)) {
-                    WindPowerStationTestingPoint2 qfai1 = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.RSDJZSDL);
-                    WindPowerStationTestingPoint2 qfai2 = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.RSSTZSDL);
-                    WindPowerStationTestingPoint2 qfai3 = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.RXNZSDL);
-                    WindPowerStationTestingPoint2 qfai4 = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.RSQXZSDL);
+                    WindPowerStationTestingPoint2 qfai1 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RSDJZSDL);
+                    WindPowerStationTestingPoint2 qfai2 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RSSTZSDL);
+                    WindPowerStationTestingPoint2 qfai3 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RXNZSDL);
+                    WindPowerStationTestingPoint2 qfai4 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RSQXZSDL);
 
                     List<PointData> qfls1 = new ArrayList<PointData>();
                     List<PointData> qfls2 = new ArrayList<PointData>();
@@ -189,8 +189,8 @@ public class GenreSetPushDetailWpService {
                         setPointValue(wp, vo, qfls, summap);
                     }
                 } else if (targetName.equals(RGZSSDL)) {
-                    WindPowerStationTestingPoint2 gzai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.RGZSSDL);
-                    WindPowerStationTestingPoint2 gzslai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.RSZSSDL);
+                    WindPowerStationTestingPoint2 gzai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RGZSSDL);
+                    WindPowerStationTestingPoint2 gzslai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RSZSSDL);
                     List<PointData> gzls = new ArrayList<PointData>();
                     try {
                         gzls = realApiUtil.getHistoryDatasSnap(gzai, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, 86400L);
@@ -207,8 +207,8 @@ public class GenreSetPushDetailWpService {
                     }
                     setPointValue(wp, vo, gzls, gzslls, summap);
                 } else if (targetName.equals(RJXSSDL)) {
-                    WindPowerStationTestingPoint2 jxai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.RJXSSDL);
-                    WindPowerStationTestingPoint2 jxslai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.RLZSSDL);
+                    WindPowerStationTestingPoint2 jxai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RJXSSDL);
+                    WindPowerStationTestingPoint2 jxslai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RLZSSDL);
                     List<PointData> jxls = new ArrayList<PointData>();
                     try {
                         jxls = realApiUtil.getHistoryDatasSnap(jxai, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, 86400L);
@@ -226,8 +226,8 @@ public class GenreSetPushDetailWpService {
 
                     setPointValue(wp, vo, jxls, jxslls, summap);
                 } else if (targetName.equals(RSLSSDL)) {
-                    WindPowerStationTestingPoint2 dwai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.RWZSSDL);
-                    WindPowerStationTestingPoint2 tqai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.RTZSSDL);
+                    WindPowerStationTestingPoint2 dwai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RWZSSDL);
+                    WindPowerStationTestingPoint2 tqai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.RTZSSDL);
                     List<PointData> dwls = new ArrayList<PointData>();
                     try {
                         dwls = realApiUtil.getHistoryDatasSnap(dwai, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, 86400L);
@@ -548,7 +548,7 @@ public class GenreSetPushDetailWpService {
                 Date endDate = c.getTime();
                 Date beginDate = c.getTime();
                 if (targetName.equals(YFDL)) {
-                    WindPowerStationTestingPoint2 yfdlai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WP_YFDL);// 月发电量
+                    WindPowerStationTestingPoint2 yfdlai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WP_YFDL);// 月发电量
                     List<PointData> yfdls = new ArrayList<PointData>();
                     double value2 = 0.0;
                     double value3 = 0.0;
@@ -607,7 +607,7 @@ public class GenreSetPushDetailWpService {
                     vo.setValue3(String.valueOf(value3));
                     vo.setValue4(String.valueOf(value4));
                 } else if (targetName.equals(YXDSSDL)) {
-                    WindPowerStationTestingPoint2 xdai =windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.YXDSSDL);
+                    WindPowerStationTestingPoint2 xdai =windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YXDSSDL);
                     List<PointData> xdls = new ArrayList<PointData>();
                     double value2 = 0.0;
                     double value3 = 0.0;
@@ -669,10 +669,10 @@ public class GenreSetPushDetailWpService {
                     vo.setValue3(String.valueOf(value3));
                     vo.setValue4(String.valueOf(value4));
                 } else if (targetName.equals(YXNSSDL)) {
-                    WindPowerStationTestingPoint2 qfai1 = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.YSDJZSDL);
-                    WindPowerStationTestingPoint2 qfai2 = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.YSSTZSDL);
-                    WindPowerStationTestingPoint2 qfai3 = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.YXNZSDL);
-                    WindPowerStationTestingPoint2 qfai4 = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.YSQXZSDL);
+                    WindPowerStationTestingPoint2 qfai1 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YSDJZSDL);
+                    WindPowerStationTestingPoint2 qfai2 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YSSTZSDL);
+                    WindPowerStationTestingPoint2 qfai3 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YXNZSDL);
+                    WindPowerStationTestingPoint2 qfai4 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YSQXZSDL);
                     List<PointData> qfls = new ArrayList<PointData>();
 
                     double value2 = 0.0;
@@ -775,8 +775,8 @@ public class GenreSetPushDetailWpService {
                     vo.setValue3(String.valueOf(value3));
                     vo.setValue4(String.valueOf(value4));
                 } else if (targetName.equals(YGZSSDL)) {
-                    WindPowerStationTestingPoint2 gzai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.YGZSSDL);
-                    WindPowerStationTestingPoint2 gzslai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.YSZSSDL);
+                    WindPowerStationTestingPoint2 gzai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YGZSSDL);
+                    WindPowerStationTestingPoint2 gzslai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YSZSSDL);
                     vo.setValue1(wp.getName());
                     double value2 = 0.0;
                     double value12 = 0.0;
@@ -888,8 +888,8 @@ public class GenreSetPushDetailWpService {
                     vo.setValue3(String.valueOf(value3));
                     vo.setValue4(String.valueOf(value4));
                 } else if (targetName.equals(YJXSSDL)) {
-                    WindPowerStationTestingPoint2 jxai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.YJXSSDL);
-                    WindPowerStationTestingPoint2 jxslai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.YLZSSDL);
+                    WindPowerStationTestingPoint2 jxai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YJXSSDL);
+                    WindPowerStationTestingPoint2 jxslai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YLZSSDL);
                     vo.setValue1(wp.getName());
                     double value2 = 0.0;
                     double value12 = 0.0;
@@ -998,8 +998,8 @@ public class GenreSetPushDetailWpService {
                     vo.setValue3(String.valueOf(value3));
                     vo.setValue4(String.valueOf(value4));
                 } else if (targetName.equals(YSLSSDL)) {
-                    WindPowerStationTestingPoint2 dwai =windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.YWZSSDL);
-                    WindPowerStationTestingPoint2 tqai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.YTZSSDL);
+                    WindPowerStationTestingPoint2 dwai =windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YWZSSDL);
+                    WindPowerStationTestingPoint2 tqai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.YTZSSDL);
                     vo.setValue1(wp.getName());
                     double value2 = 0.0;
                     double value12 = 0.0;
@@ -1215,7 +1215,7 @@ public class GenreSetPushDetailWpService {
                 Date endDate = c.getTime();
                 Date beginDate = c.getTime();
                 if (targetName.equals(NFDL)) {
-                    WindPowerStationTestingPoint2 yfdlai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WP_NFDL);// 月发电量
+                    WindPowerStationTestingPoint2 yfdlai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WP_NFDL);// 月发电量
                     List<PointData> yfdls = new ArrayList<PointData>();
                     double value2 = 0.0;
                     double value3 = 0.0;
@@ -1273,7 +1273,7 @@ public class GenreSetPushDetailWpService {
                     vo.setValue3(String.valueOf(value3));
                     vo.setValue4(String.valueOf(value4));
                 } else if (targetName.equals(NXDSSDL)) {
-                    WindPowerStationTestingPoint2 xdai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.NXDSSDL);
+                    WindPowerStationTestingPoint2 xdai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NXDSSDL);
                     List<PointData> xdls = new ArrayList<PointData>();
                     double value2 = 0.0;
                     double value3 = 0.0;
@@ -1336,10 +1336,10 @@ public class GenreSetPushDetailWpService {
                     vo.setValue3(String.valueOf(value3));
                     vo.setValue4(String.valueOf(value4));
                 } else if (targetName.equals(NXNSSDL)) {
-                    WindPowerStationTestingPoint2 qfai1 = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.NSDJZSDL);
-                    WindPowerStationTestingPoint2 qfai2 = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.NSSTZSDL);
-                    WindPowerStationTestingPoint2 qfai3 = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.NXNZSDL);
-                    WindPowerStationTestingPoint2 qfai4 = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.NSQXZSDL);
+                    WindPowerStationTestingPoint2 qfai1 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NSDJZSDL);
+                    WindPowerStationTestingPoint2 qfai2 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NSSTZSDL);
+                    WindPowerStationTestingPoint2 qfai3 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NXNZSDL);
+                    WindPowerStationTestingPoint2 qfai4 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NSQXZSDL);
                     List<PointData> qfls = new ArrayList<PointData>();
 
                     double value2 = 0.0;
@@ -1442,8 +1442,8 @@ public class GenreSetPushDetailWpService {
                     vo.setValue3(String.valueOf(value3));
                     vo.setValue4(String.valueOf(value4));
                 } else if (targetName.equals(NGZSSDL)) {
-                    WindPowerStationTestingPoint2 gzai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.NGZSSDL);
-                    WindPowerStationTestingPoint2 gzslai =windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.NSZSSDL);
+                    WindPowerStationTestingPoint2 gzai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NGZSSDL);
+                    WindPowerStationTestingPoint2 gzslai =windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NSZSSDL);
                     vo.setValue1(wp.getName());
                     double value2 = 0.0;
                     double value12 = 0.0;
@@ -1554,8 +1554,8 @@ public class GenreSetPushDetailWpService {
                     vo.setValue3(String.valueOf(value3));
                     vo.setValue4(String.valueOf(value4));
                 } else if (targetName.equals(NJXSSDL)) {
-                    WindPowerStationTestingPoint2 jxai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.NJXSSDL);
-                    WindPowerStationTestingPoint2 jxslai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.NLZSSDL);
+                    WindPowerStationTestingPoint2 jxai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NJXSSDL);
+                    WindPowerStationTestingPoint2 jxslai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NLZSSDL);
                     vo.setValue1(wp.getName());
                     double value2 = 0.0;
                     double value12 = 0.0;
@@ -1663,8 +1663,8 @@ public class GenreSetPushDetailWpService {
                     vo.setValue3(String.valueOf(value3));
                     vo.setValue4(String.valueOf(value4));
                 } else if (targetName.equals(NSLSSDL)) {
-                    WindPowerStationTestingPoint2 dwai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.NWZSSDL);
-                    WindPowerStationTestingPoint2 tqai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.NWZSSDL);
+                    WindPowerStationTestingPoint2 dwai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NWZSSDL);
+                    WindPowerStationTestingPoint2 tqai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.NWZSSDL);
                     vo.setValue1(wp.getName());
                     double value2 = 0.0;
                     double value12 = 0.0;
@@ -1842,8 +1842,8 @@ public class GenreSetPushDetailWpService {
             Map.Entry<String, DataVo> entry = (Map.Entry<String, DataVo>) it.next();
             DataVo vo = entry.getValue();
 
-            WindPowerStationTestingPoint2 yfdlpoint=windPowerstationTestingPointService.getWindPowerStationTestingPoint2(entry.getKey(), Constant.TPOINT_WP_YFDL);
-            WindPowerStationTestingPoint2 nfdlpoint=windPowerstationTestingPointService.getWindPowerStationTestingPoint2(entry.getKey(), Constant.TPOINT_WP_NFDL);
+            WindPowerStationTestingPoint2 yfdlpoint=windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(entry.getKey(), Constant.TPOINT_WP_YFDL);
+            WindPowerStationTestingPoint2 nfdlpoint=windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(entry.getKey(), Constant.TPOINT_WP_NFDL);
 
             double yfdl = realApiUtil.getRealData(yfdlpoint).getPointValueInDouble();
             double nfdl = realApiUtil.getRealData(nfdlpoint).getPointValueInDouble();

src/main/java/com/gyee/frame/service/websocket/GenreSetPushService.java

@@ -27,7 +27,7 @@ public class GenreSetPushService {
 
 
     @Resource
-    private WindPowerstationTestingPointService windPowerstationTestingPointService;
+    private WindPowerstationTestingPoint2Service windPowerstationTestingPoint2Service;
     @Resource
     private WindpowerinfodayService windpowerinfodayService;
     @Resource
@@ -131,8 +131,8 @@ public class GenreSetPushService {
                     zjrl += wp.getCapacity();
                     zjts += wp.getQuantity();
 
-                    WindPowerStationTestingPoint2 fczt = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.FJZT);
-                    WindPowerStationTestingPoint2 fcgl = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WP_SJGL);
+                    WindPowerStationTestingPoint2 fczt = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.FJZT);
+                    WindPowerStationTestingPoint2 fcgl = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WP_SJGL);
 
                     Double fcztvalue = realApiUtil.getRealData(fczt).getPointValueInDouble();
                     Double fcglvalue = realApiUtil.getRealData(fcgl).getPointValueInDouble();
@@ -166,8 +166,8 @@ public class GenreSetPushService {
                                 zjrl += ln.getCapacity();
                                 zjts += ln.getQuantity();
 
-                                WindPowerStationTestingPoint2 fczt = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(ln.getId(), Constant.FJZT);
-                                WindPowerStationTestingPoint2 fcgl = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(ln.getId(), Constant.TPOINT_WP_SJGL);
+                                WindPowerStationTestingPoint2 fczt = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(ln.getId(), Constant.FJZT);
+                                WindPowerStationTestingPoint2 fcgl = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(ln.getId(), Constant.TPOINT_WP_SJGL);
 
                                 Double fcztvalue = realApiUtil.getRealData(fczt).getPointValueInDouble();
                                 Double fcglvalue = realApiUtil.getRealData(fcgl).getPointValueInDouble();
@@ -198,8 +198,8 @@ public class GenreSetPushService {
                         zjrl += ln.getCapacity();
                         zjts += ln.getQuantity();
 
-                        WindPowerStationTestingPoint2 fczt = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(ln.getId(), Constant.FJZT);
-                        WindPowerStationTestingPoint2 fcgl = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(ln.getId(), Constant.TPOINT_WP_SJGL);
+                        WindPowerStationTestingPoint2 fczt = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(ln.getId(), Constant.FJZT);
+                        WindPowerStationTestingPoint2 fcgl = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(ln.getId(), Constant.TPOINT_WP_SJGL);
 
                         Double fcztvalue = realApiUtil.getRealData(fczt).getPointValueInDouble();
                         Double fcglvalue = realApiUtil.getRealData(fcgl).getPointValueInDouble();
@@ -228,8 +228,8 @@ public class GenreSetPushService {
                         zjrl += ln.getCapacity();
                         zjts += ln.getQuantity();
 
-                        WindPowerStationTestingPoint2 fczt = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(ln.getId(), Constant.FJZT);
-                        WindPowerStationTestingPoint2 fcgl = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(ln.getId(), Constant.TPOINT_WP_SJGL);
+                        WindPowerStationTestingPoint2 fczt = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(ln.getId(), Constant.FJZT);
+                        WindPowerStationTestingPoint2 fcgl = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(ln.getId(), Constant.TPOINT_WP_SJGL);
 
                         Double fcztvalue = realApiUtil.getRealData(fczt).getPointValueInDouble();
                         Double fcglvalue = realApiUtil.getRealData(fcgl).getPointValueInDouble();
@@ -294,14 +294,14 @@ public class GenreSetPushService {
 
             List<String> jczbls = new ArrayList<>();
 
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_SJGL).getCode());
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_RFDL).getCode());
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_YFDL).getCode());
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_NFDL).getCode());
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_SSFS).getCode());
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_SWDL).getCode());
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.ZBZGL).getCode());
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_ZZSGL).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_SJGL).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_RFDL).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_YFDL).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_NFDL).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_SSFS).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_SWDL).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.ZBZGL).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_ZZSGL).getCode());
 
 
             double rfdl = 0.0;
@@ -372,7 +372,7 @@ public class GenreSetPushService {
                 // 节约水
                 Double jys = realApiUtil.getRealData(ConstantTR.JYS).getPointValueInDouble();
 
-                Double gfsjgl = realApiUtil.getRealData(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(GF, Constant.TPOINT_WP_SJGL)).getPointValueInDouble();
+                Double gfsjgl = realApiUtil.getRealData(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(GF, Constant.TPOINT_WP_SJGL)).getPointValueInDouble();
 
                 bzgl = bzgl + gfsjgl;
                 yfgl = yfgl + gfsjgl;
@@ -629,31 +629,31 @@ public class GenreSetPushService {
             } else {
                 List<String> mxztls = new ArrayList<>();
                 //待机台数
-                mxztls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.DJNUM).getCode());
+                mxztls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.DJNUM).getCode());
                 //手动停机台数
-                mxztls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.TJNUM).getCode());
+                mxztls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.TJNUM).getCode());
                 //正常发电台数
-                mxztls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.FDNUM).getCode());
+                mxztls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.FDNUM).getCode());
                 // 缺陷降出力台数
-                mxztls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.FDJCLNUM).getCode());
+                mxztls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.FDJCLNUM).getCode());
                 // 限电降出力台数
-                mxztls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.XDJCLNUM).getCode());
+                mxztls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.XDJCLNUM).getCode());
                 // 限电停机台数
-                mxztls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.XDTJNUM).getCode());
+                mxztls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.XDTJNUM).getCode());
                 // 故障停机台数
-                mxztls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.GZNUM).getCode());
+                mxztls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.GZNUM).getCode());
                 // 场内受累停机台数
-                mxztls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.CNGZNUM).getCode());
+                mxztls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.CNGZNUM).getCode());
                 // 检修停机台数
-                mxztls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.JXNUM).getCode());
+                mxztls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.JXNUM).getCode());
                 // 场内受累检修台数
-                mxztls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.CNJXNUM).getCode());
+                mxztls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.CNJXNUM).getCode());
                 // 电网受累台数
-                mxztls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.DWSLNUM).getCode());
+                mxztls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.DWSLNUM).getCode());
                 // 环境受累台数
-                mxztls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.HJSLNUM).getCode());
+                mxztls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.HJSLNUM).getCode());
                 // 风机离线台数
-                mxztls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.LXNUM).getCode());
+                mxztls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.LXNUM).getCode());
 
 
                 List<PointData> mxztlist = realApiUtil.getRealData(mxztls);
@@ -734,79 +734,79 @@ public class GenreSetPushService {
             List<String> wxssls = new ArrayList<>();
 
             // 日场内受累检修
-            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.RLZSSDL).getCode());
+            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.RLZSSDL).getCode());
             // 日场内受累故障
-            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.RSZSSDL).getCode());
+            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.RSZSSDL).getCode());
             // 月场内受累检修
-            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.YLZSSDL).getCode());
+            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.YLZSSDL).getCode());
             // 月场内受累故障
-            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.YSZSSDL).getCode());
+            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.YSZSSDL).getCode());
             // 年场内受累检修
-            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.NLZSSDL).getCode());
+            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.NLZSSDL).getCode());
             // 年场内受累故障
-            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.NSZSSDL).getCode());
+            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.NSZSSDL).getCode());
 
             //日待机损失
-            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.RSDJZSDL).getCode());
+            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.RSDJZSDL).getCode());
             //日手动停机损失
-            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.RSSTZSDL).getCode());
+            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.RSSTZSDL).getCode());
             //日性能损失
-            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.RXNZSDL).getCode());
+            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.RXNZSDL).getCode());
             //日缺陷降出力损失
-            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.RSQXZSDL).getCode());
+            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.RSQXZSDL).getCode());
             //日故障损失
-            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.RGZSSDL).getCode());
+            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.RGZSSDL).getCode());
             //日检修损失
-            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.RJXSSDL).getCode());
+            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.RJXSSDL).getCode());
 
             //月待机损失
-            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.YSDJZSDL).getCode());
+            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.YSDJZSDL).getCode());
             //月手动停机损失
-            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.YSSTZSDL).getCode());
+            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.YSSTZSDL).getCode());
             //月性能损失
-            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.YXNZSDL).getCode());
+            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.YXNZSDL).getCode());
             //月缺陷降出力损失
-            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.YSQXZSDL).getCode());
+            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.YSQXZSDL).getCode());
             //月故障损失
-            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.YGZSSDL).getCode());
+            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.YGZSSDL).getCode());
             //月检修损失
-            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.YJXSSDL).getCode());
+            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.YJXSSDL).getCode());
 
 
             //年待机损失
-            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.NSDJZSDL).getCode());
+            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.NSDJZSDL).getCode());
             //年手动停机损失
-            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.NSSTZSDL).getCode());
+            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.NSSTZSDL).getCode());
             //年性能损失
-            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.NXNZSDL).getCode());
+            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.NXNZSDL).getCode());
             //年缺陷降出力损失
-            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.NSQXZSDL).getCode());
+            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.NSQXZSDL).getCode());
             //年故障损失
-            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.NGZSSDL).getCode());
+            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.NGZSSDL).getCode());
             //年检修损失
-            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.NJXSSDL).getCode());
+            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.NJXSSDL).getCode());
 
 
             //日限电损失
-            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.RXDSSDL).getCode());
+            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.RXDSSDL).getCode());
             //月限电损失
-            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.YXDSSDL).getCode());
+            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.YXDSSDL).getCode());
             //年限电损失
-            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.NXDSSDL).getCode());
+            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.NXDSSDL).getCode());
 
 
             //日场外受累电网
-            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.RWZSSDL).getCode());
+            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.RWZSSDL).getCode());
             // 日场外受累天气
-            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.RTZSSDL).getCode());
+            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.RTZSSDL).getCode());
             // 月场外受累电网
-            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.YWZSSDL).getCode());
+            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.YWZSSDL).getCode());
             // 月场外受累天气
-            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.YTZSSDL).getCode());
+            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.YTZSSDL).getCode());
             // 年场外受累电网
-            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.NWZSSDL).getCode());
+            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.NWZSSDL).getCode());
             // 年场外受累天气
-            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.NTZSSDL).getCode());
+            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.NTZSSDL).getCode());
 
             List<PointData> wxsslist = realApiUtil.getRealData(wxssls);
 
@@ -1302,10 +1302,10 @@ public class GenreSetPushService {
         long num = c.get(Calendar.DAY_OF_MONTH);
         // long num = 30;
 
-        WindPowerStationTestingPoint2 rfdlai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_RFDL);
-        WindPowerStationTestingPoint2 swdlai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SWDL);
-        WindPowerStationTestingPoint2 gwdlai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_GWDL);
-        WindPowerStationTestingPoint2 ssfs = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SSFS);
+        WindPowerStationTestingPoint2 rfdlai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_RFDL);
+        WindPowerStationTestingPoint2 swdlai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SWDL);
+        WindPowerStationTestingPoint2 gwdlai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_GWDL);
+        WindPowerStationTestingPoint2 ssfs = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SSFS);
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         List<PointData> rfdls = realApiUtil.getHistoryDatasSnap(rfdlai, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, 86400L);
@@ -1378,82 +1378,82 @@ private   Map<String, Double> getHbWs(String id) throws Exception {
     List<String> wxssls = new ArrayList<>();
 
     // 日场内受累检修
-    wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.RLZSSDL).getCode());
+    wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.RLZSSDL).getCode());
     // 日场内受累故障
-    wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.RSZSSDL).getCode());
+    wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.RSZSSDL).getCode());
     // 月场内受累检修
-    wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.YLZSSDL).getCode());
+    wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.YLZSSDL).getCode());
     // 月场内受累故障
-    wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.YSZSSDL).getCode());
+    wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.YSZSSDL).getCode());
     // 年场内受累检修
-    wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.NLZSSDL).getCode());
+    wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.NLZSSDL).getCode());
     // 年场内受累故障
-    wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.NSZSSDL).getCode());
+    wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.NSZSSDL).getCode());
 
     //日待机损失
-    wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.RSDJZSDL).getCode());
+    wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.RSDJZSDL).getCode());
     //日手动停机损失
-    wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.RSSTZSDL).getCode());
+    wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.RSSTZSDL).getCode());
     //日性能损失
-    wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.RXNZSDL).getCode());
+    wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.RXNZSDL).getCode());
     //日缺陷降出力损失
-    wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.RSQXZSDL).getCode());
+    wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.RSQXZSDL).getCode());
     //日故障损失
-    wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.RGZSSDL).getCode());
+    wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.RGZSSDL).getCode());
     //日检修损失
-    wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.RJXSSDL).getCode());
+    wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.RJXSSDL).getCode());
 
     //月待机损失
-    wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.YSDJZSDL).getCode());
+    wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.YSDJZSDL).getCode());
     //月手动停机损失
-    wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.YSSTZSDL).getCode());
+    wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.YSSTZSDL).getCode());
     //月性能损失
-    wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.YXNZSDL).getCode());
+    wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.YXNZSDL).getCode());
     //月缺陷降出力损失
-    wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.YSQXZSDL).getCode());
+    wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.YSQXZSDL).getCode());
     //月故障损失
-    wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.YGZSSDL).getCode());
+    wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.YGZSSDL).getCode());
     //月检修损失
-    wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.YJXSSDL).getCode());
+    wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.YJXSSDL).getCode());
 
 
     //年待机损失
-    wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.NSDJZSDL).getCode());
+    wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.NSDJZSDL).getCode());
     //年手动停机损失
-    wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.NSSTZSDL).getCode());
+    wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.NSSTZSDL).getCode());
     //年性能损失
-    wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.NXNZSDL).getCode());
+    wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.NXNZSDL).getCode());
     //年缺陷降出力损失
-    wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.NSQXZSDL).getCode());
+    wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.NSQXZSDL).getCode());
     //年故障损失
-    wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.NGZSSDL).getCode());
+    wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.NGZSSDL).getCode());
     //年检修损失
-    wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.NJXSSDL).getCode());
+    wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.NJXSSDL).getCode());
 
 
     //日限电损失
-    wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.RXDSSDL).getCode());
+    wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.RXDSSDL).getCode());
     //月限电损失
-    wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.YXDSSDL).getCode());
+    wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.YXDSSDL).getCode());
     //年限电损失
-    wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.NXDSSDL).getCode());
+    wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.NXDSSDL).getCode());
 
 
     //日场外受累电网
-    wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.RWZSSDL).getCode());
+    wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.RWZSSDL).getCode());
     // 日场外受累天气
-    wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.RTZSSDL).getCode());
+    wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.RTZSSDL).getCode());
     // 月场外受累电网
-    wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.YWZSSDL).getCode());
+    wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.YWZSSDL).getCode());
     // 月场外受累天气
-    wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.YTZSSDL).getCode());
+    wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.YTZSSDL).getCode());
     // 年场外受累电网
-    wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.NWZSSDL).getCode());
+    wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.NWZSSDL).getCode());
     // 年场外受累天气
-    wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.NTZSSDL).getCode());
-    wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_RFDL).getCode());
-    wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_YFDL).getCode());
-    wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_NFDL).getCode());
+    wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.NTZSSDL).getCode());
+    wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_RFDL).getCode());
+    wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_YFDL).getCode());
+    wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_NFDL).getCode());
 
 
     String[] ids=new String[wxssls.size()];
@@ -1669,10 +1669,10 @@ private   Map<String, Double> getHbWs(String id) throws Exception {
 
         // long num = 30;
 
-        WindPowerStationTestingPoint2 rfdlai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_RFDL);
-        WindPowerStationTestingPoint2 sjgl = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SJGL);
+        WindPowerStationTestingPoint2 rfdlai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_RFDL);
+        WindPowerStationTestingPoint2 sjgl = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SJGL);
 
-        WindPowerStationTestingPoint2 ssfs =ssfs = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SSFS);
+        WindPowerStationTestingPoint2 ssfs =ssfs = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SSFS);
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         List<PointData> rfdls = realApiUtil.getHistoryDatasSnap(rfdlai, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, 3600L);
@@ -1797,11 +1797,11 @@ private   Map<String, Double> getHbWs(String id) throws Exception {
                 Map<String, WindPowerStationTestingPoint2> map;
 
 
-//                WindPowerStationTestingPoint2 yxts = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WT_YXTS);
-//                WindPowerStationTestingPoint2 djts = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WT_DJTS);
-//                WindPowerStationTestingPoint2 jxts = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WT_WHTJ);
-//                WindPowerStationTestingPoint2 tjts = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WT_GZTJ);
-//                WindPowerStationTestingPoint2 lxts = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WT_TXZD);
+//                WindPowerStationTestingPoint2 yxts = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WT_YXTS);
+//                WindPowerStationTestingPoint2 djts = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WT_DJTS);
+//                WindPowerStationTestingPoint2 jxts = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WT_WHTJ);
+//                WindPowerStationTestingPoint2 tjts = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WT_GZTJ);
+//                WindPowerStationTestingPoint2 lxts = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WT_TXZD);
 //
 //                PointData ptValue = realApiUtil.getRealData(yxts);
 //                retValue.put("yxts", StringUtils.round(ptValue.getPointValueInDouble(), 0));
@@ -1819,7 +1819,7 @@ private   Map<String, Double> getHbWs(String id) throws Exception {
 //                retValue.put("lxts", StringUtils.round(ptValue.getPointValueInDouble(), 0));
 //
 //                if (wpId.endsWith("GDC")) {
-//                    WindPowerStationTestingPoint2 wd = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_FCCFTWD);
+//                    WindPowerStationTestingPoint2 wd = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_FCCFTWD);
 //
 //                    if (StringUtils.notEmp(wd)) {
 //                        ptValue = realApiUtil.getRealData(wd);
@@ -1893,7 +1893,7 @@ private   Map<String, Double> getHbWs(String id) throws Exception {
                     retValue.put("ssfs", StringUtils.round(ptValue.getPointValueInDouble(), 0));
                 }
 
-                WindPowerStationTestingPoint2 glpoint = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SJGL);
+                WindPowerStationTestingPoint2 glpoint = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SJGL);
                 ptValue = realApiUtil.getRealData(glpoint.getCode());
                 retValue.put("gl", StringUtils.round(ptValue.getPointValueInDouble(), 0));
             }

src/main/java/com/gyee/frame/service/websocket/MatrixDetialGfPushService.java

@@ -8,7 +8,7 @@ import com.gyee.frame.model.auto.Windturbine;
 import com.gyee.frame.model.custom.MatrixVo;
 import com.gyee.frame.model.custom.PointData;
 import com.gyee.frame.service.ProjectPlanService;
-import com.gyee.frame.service.WindPowerstationTestingPointService;
+import com.gyee.frame.service.WindPowerstationTestingPoint2Service;
 import com.gyee.frame.service.WindTurbineTestingPointAiService;
 import com.gyee.frame.service.WindpowerinfodayService;
 import com.gyee.frame.util.IRealTimeDataBaseUtil;
@@ -30,7 +30,7 @@ public class MatrixDetialGfPushService {
 
 
     @Resource
-    private WindPowerstationTestingPointService windPowerstationTestingPointService;
+    private WindPowerstationTestingPoint2Service windPowerstationTestingPoint2Service;
     @Resource
     private WindpowerinfodayService windpowerinfodayService;
     @Resource
@@ -86,19 +86,19 @@ public class MatrixDetialGfPushService {
 
             List<String> jczbls = new ArrayList<>();
             //实时风速
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WP_SSFS).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WP_SSFS).getCode());
             //预测功率
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), ycPoints1[0]).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), ycPoints1[0]).getCode());
             //保证功率
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.ZBZGL).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.ZBZGL).getCode());
             //应发功率
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WP_ZZSGL).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WP_ZZSGL).getCode());
             //实际功率
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WP_SJGL).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WP_SJGL).getCode());
             //AGC出线有功
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.AGC001).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.AGC001).getCode());
             //AGC有功设定
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.AGC002).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.AGC002).getCode());
 
 
 

src/main/java/com/gyee/frame/service/websocket/MatrixDetialPushService.java

@@ -9,7 +9,7 @@ import com.gyee.frame.model.auto.Windturbine;
 import com.gyee.frame.model.custom.MatrixVo;
 import com.gyee.frame.model.custom.PointData;
 import com.gyee.frame.service.ProjectPlanService;
-import com.gyee.frame.service.WindPowerstationTestingPointService;
+import com.gyee.frame.service.WindPowerstationTestingPoint2Service;
 import com.gyee.frame.service.WindTurbineTestingPointAiService;
 import com.gyee.frame.service.WindpowerinfodayService;
 import com.gyee.frame.util.IRealTimeDataBaseUtil;
@@ -31,7 +31,7 @@ public class MatrixDetialPushService {
 
 
     @Resource
-    private WindPowerstationTestingPointService windPowerstationTestingPointService;
+    private WindPowerstationTestingPoint2Service windPowerstationTestingPoint2Service;
     @Resource
     private WindpowerinfodayService windpowerinfodayService;
     @Resource
@@ -100,46 +100,46 @@ public class MatrixDetialPushService {
 
             List<String> jczbls = new ArrayList<>();
             //实时风速
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WP_SSFS).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WP_SSFS).getCode());
             //预测功率
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), ycPoints1[0]).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), ycPoints1[0]).getCode());
             //保证功率
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.ZBZGL).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.ZBZGL).getCode());
             //应发功率
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WP_ZZSGL).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WP_ZZSGL).getCode());
             //实际功率
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WP_SJGL).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WP_SJGL).getCode());
             //AGC出线有功
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.AGC001).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.AGC001).getCode());
             //AGC有功设定
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.AGC002).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.AGC002).getCode());
 
             //待机台数
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.DJNUM).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.DJNUM).getCode());
             //手动停机台数
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.TJNUM).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.TJNUM).getCode());
             //正常发电台数
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.FDNUM).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.FDNUM).getCode());
             // 缺陷降出力台数
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.FDJCLNUM).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.FDJCLNUM).getCode());
             // 限电降出力台数
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.XDJCLNUM).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.XDJCLNUM).getCode());
             // 限电停机台数
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.XDTJNUM).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.XDTJNUM).getCode());
             // 故障停机台数
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.GZNUM).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.GZNUM).getCode());
             // 场内受累停机台数
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.CNGZNUM).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.CNGZNUM).getCode());
             // 检修停机台数
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.JXNUM).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.JXNUM).getCode());
             // 场内受累检修台数
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.CNJXNUM).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.CNJXNUM).getCode());
             // 电网受累台数
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.DWSLNUM).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.DWSLNUM).getCode());
             // 环境受累台数
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.HJSLNUM).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.HJSLNUM).getCode());
             // 风机离线台数
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.LXNUM).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.LXNUM).getCode());
 
 
             List<PointData> jczblist = realApiUtil.getRealData(jczbls);

src/main/java/com/gyee/frame/service/websocket/MatrixPushByWpService.java

@@ -20,7 +20,7 @@ public class MatrixPushByWpService {
 
 
     @Resource
-    private WindPowerstationTestingPointService windPowerstationTestingPointService;
+    private WindPowerstationTestingPoint2Service windPowerstationTestingPoint2Service;
     @Resource
     private WindpowerinfodayService windpowerinfodayService;
     @Resource
@@ -107,31 +107,31 @@ public class MatrixPushByWpService {
 
                 List<String> jczbls = new ArrayList<>();
                 //实时风速
-                jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SSFS).getCode());
+                jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SSFS).getCode());
                 //预测功率
-                jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, ycPoints1[0]).getCode());
+                jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, ycPoints1[0]).getCode());
                 //保证功率
-                jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.ZBZGL).getCode());
+                jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.ZBZGL).getCode());
                 //应发功率
-                jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_ZZSGL).getCode());
+                jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_ZZSGL).getCode());
                 //实际功率
-                jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SJGL).getCode());
+                jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SJGL).getCode());
                 //AGC出线有功
-                jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.AGC001).getCode());
+                jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.AGC001).getCode());
                 //AGC有功设定
-                jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.AGC002).getCode());
+                jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.AGC002).getCode());
                 //待机台数
-                jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WT_DJTS).getCode());
+                jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WT_DJTS).getCode());
                 //运行台数
-                jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WT_YXTS).getCode());
+                jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WT_YXTS).getCode());
                 //故障台数
-                jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WT_GZTJ).getCode());
+                jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WT_GZTJ).getCode());
                 //离线台数
-                jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WT_TXZD).getCode());
+                jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WT_TXZD).getCode());
                 //维护台数
-                jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WT_WHTJ).getCode());
+                jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WT_WHTJ).getCode());
                 //限电台数
-                jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WT_XDTS).getCode());
+                jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WT_XDTS).getCode());
 
 
                 List<PointData> jczblist = realApiUtil.getRealData(jczbls);
@@ -384,31 +384,31 @@ public class MatrixPushByWpService {
 
                 List<String> jczbls = new ArrayList<>();
                 //实时风速
-                jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SSFS).getCode());
+                jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SSFS).getCode());
                 //预测功率
-                jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, ycPoints1[0]).getCode());
+                jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, ycPoints1[0]).getCode());
                 //保证功率
-                jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.ZBZGL).getCode());
+                jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.ZBZGL).getCode());
                 //应发功率
-                jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_ZZSGL).getCode());
+                jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_ZZSGL).getCode());
                 //实际功率
-                jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SJGL).getCode());
+                jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SJGL).getCode());
                 //AGC出线有功
-                jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.AGC001).getCode());
+                jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.AGC001).getCode());
                 //AGC有功设定
-                jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.AGC002).getCode());
+                jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.AGC002).getCode());
                 //待机台数
-                jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WT_DJTS).getCode());
+                jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WT_DJTS).getCode());
                 //运行台数
-                jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WT_YXTS).getCode());
+                jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WT_YXTS).getCode());
                 //故障台数
-                jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WT_GZTJ).getCode());
+                jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WT_GZTJ).getCode());
                 //离线台数
-                jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WT_TXZD).getCode());
+                jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WT_TXZD).getCode());
                 //维护台数
-                jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WT_WHTJ).getCode());
+                jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WT_WHTJ).getCode());
                 //限电台数
-                jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WT_XDTS).getCode());
+                jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WT_XDTS).getCode());
 
 
                 List<PointData> jczblist = realApiUtil.getRealData(jczbls);
@@ -500,79 +500,79 @@ public class MatrixPushByWpService {
                 List<String> wxssls = new ArrayList<>();
 
                 // 日场内受累检修
-                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.RLZSSDL).getCode());
+                wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.RLZSSDL).getCode());
                 // 日场内受累故障
-                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.RSZSSDL).getCode());
+                wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.RSZSSDL).getCode());
                 // 月场内受累检修
-                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.YLZSSDL).getCode());
+                wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.YLZSSDL).getCode());
                 // 月场内受累故障
-                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.YSZSSDL).getCode());
+                wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.YSZSSDL).getCode());
                 // 年场内受累检修
-                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.NLZSSDL).getCode());
+                wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.NLZSSDL).getCode());
                 // 年场内受累故障
-                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.NSZSSDL).getCode());
+                wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.NSZSSDL).getCode());
 
                 //日待机损失
-                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.RSDJZSDL).getCode());
+                wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.RSDJZSDL).getCode());
                 //日手动停机损失
-                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.RSSTZSDL).getCode());
+                wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.RSSTZSDL).getCode());
                 //日性能损失
-                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.RXNZSDL).getCode());
+                wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.RXNZSDL).getCode());
                 //日缺陷降出力损失
-                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.RSQXZSDL).getCode());
+                wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.RSQXZSDL).getCode());
                 //日故障损失
-                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.RGZSSDL).getCode());
+                wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.RGZSSDL).getCode());
                 //日检修损失
-                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.RJXSSDL).getCode());
+                wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.RJXSSDL).getCode());
 
                 //月待机损失
-                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.YSDJZSDL).getCode());
+                wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.YSDJZSDL).getCode());
                 //月手动停机损失
-                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.YSSTZSDL).getCode());
+                wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.YSSTZSDL).getCode());
                 //月性能损失
-                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.YXNZSDL).getCode());
+                wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.YXNZSDL).getCode());
                 //月缺陷降出力损失
-                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.YSQXZSDL).getCode());
+                wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.YSQXZSDL).getCode());
                 //月故障损失
-                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.YGZSSDL).getCode());
+                wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.YGZSSDL).getCode());
                 //月检修损失
-                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.YJXSSDL).getCode());
+                wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.YJXSSDL).getCode());
 
 
                 //年待机损失
-                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.NSDJZSDL).getCode());
+                wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.NSDJZSDL).getCode());
                 //年手动停机损失
-                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.NSSTZSDL).getCode());
+                wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.NSSTZSDL).getCode());
                 //年性能损失
-                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.NXNZSDL).getCode());
+                wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.NXNZSDL).getCode());
                 //年缺陷降出力损失
-                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.NSQXZSDL).getCode());
+                wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.NSQXZSDL).getCode());
                 //年故障损失
-                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.NGZSSDL).getCode());
+                wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.NGZSSDL).getCode());
                 //年检修损失
-                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.NJXSSDL).getCode());
+                wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.NJXSSDL).getCode());
 
 
                 //日限电损失
-                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.RXDSSDL).getCode());
+                wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.RXDSSDL).getCode());
                 //月限电损失
-                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.YXDSSDL).getCode());
+                wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.YXDSSDL).getCode());
                 //年限电损失
-                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.NXDSSDL).getCode());
+                wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.NXDSSDL).getCode());
 
 
                 //日场外受累电网
-                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.RWZSSDL).getCode());
+                wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.RWZSSDL).getCode());
                 // 日场外受累天气
-                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.RTZSSDL).getCode());
+                wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.RTZSSDL).getCode());
                 // 月场外受累电网
-                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.YWZSSDL).getCode());
+                wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.YWZSSDL).getCode());
                 // 月场外受累天气
-                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.YTZSSDL).getCode());
+                wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.YTZSSDL).getCode());
                 // 年场外受累电网
-                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.NWZSSDL).getCode());
+                wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.NWZSSDL).getCode());
                 // 年场外受累天气
-                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.NTZSSDL).getCode());
+                wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.NTZSSDL).getCode());
 
 
                 List<PointData> wxsslist = realApiUtil.getRealData(wxssls);

src/main/java/com/gyee/frame/service/websocket/MatrixPushService.java

@@ -8,7 +8,7 @@ import com.gyee.frame.model.auto.Windturbine;
 import com.gyee.frame.model.custom.MatrixVo;
 import com.gyee.frame.model.custom.PointData;
 import com.gyee.frame.service.ProjectPlanService;
-import com.gyee.frame.service.WindPowerstationTestingPointService;
+import com.gyee.frame.service.WindPowerstationTestingPoint2Service;
 import com.gyee.frame.service.WindTurbineTestingPointAiService;
 import com.gyee.frame.service.WindpowerinfodayService;
 import com.gyee.frame.util.IRealTimeDataBaseUtil;
@@ -30,7 +30,7 @@ public class MatrixPushService {
 
 
     @Resource
-    private WindPowerstationTestingPointService windPowerstationTestingPointService;
+    private WindPowerstationTestingPoint2Service windPowerstationTestingPoint2Service;
     @Resource
     private WindpowerinfodayService windpowerinfodayService;
     @Resource
@@ -87,31 +87,31 @@ public class MatrixPushService {
 
             List<String> jczbls = new ArrayList<>();
             //实时风速
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WP_SSFS).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WP_SSFS).getCode());
             //预测功率
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), ycPoints1[0]).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), ycPoints1[0]).getCode());
             //保证功率
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.ZBZGL).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.ZBZGL).getCode());
             //应发功率
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WP_ZZSGL).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WP_ZZSGL).getCode());
             //实际功率
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WP_SJGL).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WP_SJGL).getCode());
             //AGC出线有功
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.AGC001).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.AGC001).getCode());
             //AGC有功设定
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.AGC002).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.AGC002).getCode());
             //待机台数
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WT_DJTS).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WT_DJTS).getCode());
             //运行台数
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WT_YXTS).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WT_YXTS).getCode());
             //故障台数
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WT_GZTJ).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WT_GZTJ).getCode());
             //离线台数
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WT_TXZD).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WT_TXZD).getCode());
             //维护台数
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WT_WHTJ).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WT_WHTJ).getCode());
             //限电台数
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WT_XDTS).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WT_XDTS).getCode());
 
 
             List<PointData> jczblist = realApiUtil.getRealData(jczbls);

src/main/java/com/gyee/frame/service/websocket/MatrixQfPushService.java

@@ -9,7 +9,7 @@ import com.gyee.frame.model.auto.Windturbine;
 import com.gyee.frame.model.custom.MatrixVo;
 import com.gyee.frame.model.custom.PointData;
 import com.gyee.frame.service.ProjectPlanService;
-import com.gyee.frame.service.WindPowerstationTestingPointService;
+import com.gyee.frame.service.WindPowerstationTestingPoint2Service;
 import com.gyee.frame.service.WindTurbineTestingPointAiService;
 import com.gyee.frame.service.WindpowerinfodayService;
 import com.gyee.frame.util.IRealTimeDataBaseUtil;
@@ -31,7 +31,7 @@ public class MatrixQfPushService {
 
 
     @Resource
-    private WindPowerstationTestingPointService windPowerstationTestingPointService;
+    private WindPowerstationTestingPoint2Service windPowerstationTestingPoint2Service;
     @Resource
     private WindpowerinfodayService windpowerinfodayService;
     @Resource
@@ -88,31 +88,31 @@ public class MatrixQfPushService {
 
             List<String> jczbls = new ArrayList<>();
             //实时风速
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WP_SSFS).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WP_SSFS).getCode());
             //预测功率
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), ycPoints1[0]).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), ycPoints1[0]).getCode());
             //保证功率
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.ZBZGL).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.ZBZGL).getCode());
             //应发功率
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WP_ZZSGL).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WP_ZZSGL).getCode());
             //实际功率
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WP_SJGL).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WP_SJGL).getCode());
             //AGC出线有功
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.AGC001).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.AGC001).getCode());
             //AGC有功设定
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.AGC002).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.AGC002).getCode());
             //待机台数
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WT_DJTS).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WT_DJTS).getCode());
             //运行台数
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WT_YXTS).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WT_YXTS).getCode());
             //故障台数
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WT_GZTJ).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WT_GZTJ).getCode());
             //离线台数
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WT_TXZD).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WT_TXZD).getCode());
             //维护台数
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WT_WHTJ).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WT_WHTJ).getCode());
             //限电台数
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WT_XDTS).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WT_XDTS).getCode());
 
 
             List<PointData> jczblist = realApiUtil.getRealData(jczbls);
@@ -307,15 +307,15 @@ public class MatrixQfPushService {
         map.put("fcjrnum", fcdjnum+fcyxnum+fcgznum+fclxnum+fcwhnum+fcxdnum+fcslnum);
         List<String> qfzbls = new ArrayList<>();
         //日0欠发电量
-        qfzbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(FD, Constant.R0QFZT).getCode());
+        qfzbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(FD, Constant.R0QFZT).getCode());
         //日1欠发电量
-        qfzbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(FD, Constant.R1QFZT).getCode());
+        qfzbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(FD, Constant.R1QFZT).getCode());
         //日2欠发电量
-        qfzbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(FD, Constant.R2QFZT).getCode());
+        qfzbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(FD, Constant.R2QFZT).getCode());
         //日3欠发电量
-        qfzbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(FD, Constant.R3QFZT).getCode());
+        qfzbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(FD, Constant.R3QFZT).getCode());
         //日4欠发电量
-        qfzbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(FD, Constant.R4QFZT).getCode());
+        qfzbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(FD, Constant.R4QFZT).getCode());
         List<PointData> qfzblist = realApiUtil.getRealData(qfzbls);
 
         if (!qfzblist.isEmpty() && qfzblist.size() == qfzbls.size()) {

src/main/java/com/gyee/frame/service/websocket/RealPowerPushService.java

@@ -6,7 +6,7 @@ import com.gyee.frame.common.spring.InitialRunner;
 import com.gyee.frame.model.auto.*;
 import com.gyee.frame.model.custom.DataVo;
 import com.gyee.frame.model.custom.PointData;
-import com.gyee.frame.service.WindPowerstationTestingPointService;
+import com.gyee.frame.service.WindPowerstationTestingPoint2Service;
 import com.gyee.frame.service.WindTurbineTestingPointAiService;
 import com.gyee.frame.util.DateUtils;
 import com.gyee.frame.util.IRealTimeDataBaseUtil;
@@ -24,7 +24,7 @@ public class RealPowerPushService {
 
 
     @Resource
-    private WindPowerstationTestingPointService windPowerstationTestingPointService;
+    private WindPowerstationTestingPoint2Service windPowerstationTestingPoint2Service;
     @Resource
     private WindTurbineTestingPointAiService windTurbineTestingPointAiService;
 
@@ -169,7 +169,7 @@ public class RealPowerPushService {
                     if (num > 0) {
 
 /***************************************************************超短期功率预测***************************************************************************/
-                        WindPowerStationTestingPoint2 ycgl1 = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(station.getId(), ycPoints1[0]);
+                        WindPowerStationTestingPoint2 ycgl1 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(station.getId(), ycPoints1[0]);
 
                         if (null != ycgl1) {
                             List<PointData> datas = realApiUtil.getHistoryDatasSnap(ycgl1, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, pried);
@@ -225,7 +225,7 @@ public class RealPowerPushService {
                                                 cal.add(Calendar.HOUR_OF_DAY, 1);
                                                 vos.get(datas.size() + i).setTime(cal.getTime().getTime());
                                                 String qs3_ycgl = ycPoints3[i];
-                                                WindPowerStationTestingPoint2 ycglpoint = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(station.getId(), ycPoints2[i]);
+                                                WindPowerStationTestingPoint2 ycglpoint = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(station.getId(), ycPoints2[i]);
 
                                                 vos.get(datas.size() + i).setValue4(StringUtils.round(realApiUtil.getRealData(ycglpoint).getPointValueInDouble() + realApiUtil.getRealData(qs3_ycgl).getPointValueInDouble(), 2));
                                             }
@@ -237,7 +237,7 @@ public class RealPowerPushService {
                                             cal.add(Calendar.HOUR_OF_DAY, 1);
                                             vos.get(datas.size() + i).setTime(cal.getTime().getTime());
 
-                                            WindPowerStationTestingPoint2 ycglpoint = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(station.getId(), ycPoints2[i]);
+                                            WindPowerStationTestingPoint2 ycglpoint = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(station.getId(), ycPoints2[i]);
 
                                             double ycgl = realApiUtil.getRealData(ycglpoint).getPointValueInDouble();
 
@@ -266,7 +266,7 @@ public class RealPowerPushService {
 
 
 /***************************************************************短期功率预测***************************************************************************/
-                        WindPowerStationTestingPoint2 dqgl1 = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(station.getId(), ycDqPoints1[0]);
+                        WindPowerStationTestingPoint2 dqgl1 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(station.getId(), ycDqPoints1[0]);
 
                         if (null != dqgl1) {
                             List<PointData> datas = realApiUtil.getHistoryDatasSnap(dqgl1, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, pried);
@@ -322,7 +322,7 @@ public class RealPowerPushService {
                                                 cal.add(Calendar.HOUR_OF_DAY, 1);
                                                 vos.get(datas.size() + i).setTime(cal.getTime().getTime());
                                                 String qs3_ycgl = ycPoints3[i];
-                                                WindPowerStationTestingPoint2 ycglpoint = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(station.getId(), ycDqPoints2[i]);
+                                                WindPowerStationTestingPoint2 ycglpoint = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(station.getId(), ycDqPoints2[i]);
 
                                                 vos.get(datas.size() + i).setValue7(StringUtils.round(realApiUtil.getRealData(ycglpoint).getPointValueInDouble() + realApiUtil.getRealData(qs3_ycgl).getPointValueInDouble(), 2));
                                             }
@@ -334,7 +334,7 @@ public class RealPowerPushService {
                                             cal.add(Calendar.HOUR_OF_DAY, 1);
                                             vos.get(datas.size() + i).setTime(cal.getTime().getTime());
 
-                                            WindPowerStationTestingPoint2 ycglpoint = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(station.getId(), ycDqPoints2[i]);
+                                            WindPowerStationTestingPoint2 ycglpoint = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(station.getId(), ycDqPoints2[i]);
 
                                             double ycgl = realApiUtil.getRealData(ycglpoint).getPointValueInDouble();
 
@@ -368,21 +368,21 @@ public class RealPowerPushService {
 
 
                 // 实际发功率
-                WindPowerStationTestingPoint2 sjgl = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_SJGL);
+                WindPowerStationTestingPoint2 sjgl = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_SJGL);
                 // 总应发功率
-                WindPowerStationTestingPoint2 yfgl = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_ZZSGL);
+                WindPowerStationTestingPoint2 yfgl = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_ZZSGL);
                 // 总理论功率
-                WindPowerStationTestingPoint2 llgl = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_ZLLGL);
+                WindPowerStationTestingPoint2 llgl = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_ZLLGL);
                 // 总保证功率
-                WindPowerStationTestingPoint2 bzgl = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.ZBZGL);
+                WindPowerStationTestingPoint2 bzgl = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.ZBZGL);
                 //实时平均风速
-                WindPowerStationTestingPoint2 pjfs = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_SSFS);
+                WindPowerStationTestingPoint2 pjfs = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_SSFS);
                 // 最优功率
-                WindPowerStationTestingPoint2 zygl = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_ZZYGL);
+                WindPowerStationTestingPoint2 zygl = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_ZZYGL);
 
 
                 // 光伏实际发功率
-                WindPowerStationTestingPoint2 gdsjgl = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(GF, Constant.TPOINT_WP_SJGL);
+                WindPowerStationTestingPoint2 gdsjgl = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(GF, Constant.TPOINT_WP_SJGL);
                 List<PointData> gdsjglls = realApiUtil.getHistoryDatasSnap(gdsjgl, beginDate.getTime() / 1000, endDate.getTime() / 1000, (long) length, pried);
 
                 try {
@@ -583,7 +583,7 @@ public class RealPowerPushService {
                 if (InitialRunner.wpmap.containsKey(id)) {
                     if (num > 0) {
  /***************************************************************超短期功率预测***************************************************************************/
-                        WindPowerStationTestingPoint2 ycgl1 = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, ycPoints1[0]);
+                        WindPowerStationTestingPoint2 ycgl1 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, ycPoints1[0]);
 
                         if (null != ycgl1) {
                             List<PointData> datas = realApiUtil.getHistoryDatasSnap(ycgl1, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, pried);
@@ -638,7 +638,7 @@ public class RealPowerPushService {
                                                 cal.add(Calendar.HOUR_OF_DAY, 1);
                                                 vos.get(datas.size() + i).setTime(cal.getTime().getTime());
                                                 String qs3_ycgl = ycPoints3[i];
-                                                WindPowerStationTestingPoint2 ycglpoint = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, ycPoints2[i]);
+                                                WindPowerStationTestingPoint2 ycglpoint = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, ycPoints2[i]);
 
                                                 vos.get(datas.size() + i).setValue4(StringUtils.round(realApiUtil.getRealData(ycglpoint).getPointValueInDouble() + realApiUtil.getRealData(qs3_ycgl).getPointValueInDouble(), 2));
                                             }
@@ -650,7 +650,7 @@ public class RealPowerPushService {
 
                                             vos.get(datas.size() + i).setTime(cal.getTime().getTime());
 
-                                            WindPowerStationTestingPoint2 ycglpoint = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, ycPoints2[i]);
+                                            WindPowerStationTestingPoint2 ycglpoint = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, ycPoints2[i]);
 
                                             double ycgl = realApiUtil.getRealData(ycglpoint).getPointValueInDouble();
 
@@ -679,7 +679,7 @@ public class RealPowerPushService {
 
 
 /***************************************************************短期功率预测***************************************************************************/
-                        WindPowerStationTestingPoint2 dqgl1 = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, ycDqPoints1[0]);
+                        WindPowerStationTestingPoint2 dqgl1 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, ycDqPoints1[0]);
 
                         if (null != dqgl1) {
                             List<PointData> datas = realApiUtil.getHistoryDatasSnap(dqgl1, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, pried);
@@ -734,7 +734,7 @@ public class RealPowerPushService {
                                                 cal.add(Calendar.HOUR_OF_DAY, 1);
                                                 vos.get(datas.size() + i).setTime(cal.getTime().getTime());
                                                 String qs3_ycgl = ycPoints3[i];
-                                                WindPowerStationTestingPoint2 ycglpoint = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, ycDqPoints2[i]);
+                                                WindPowerStationTestingPoint2 ycglpoint = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, ycDqPoints2[i]);
 
                                                 vos.get(datas.size() + i).setValue7(StringUtils.round(realApiUtil.getRealData(ycglpoint).getPointValueInDouble() + realApiUtil.getRealData(qs3_ycgl).getPointValueInDouble(), 2));
                                             }
@@ -746,7 +746,7 @@ public class RealPowerPushService {
 
                                             vos.get(datas.size() + i).setTime(cal.getTime().getTime());
 
-                                            WindPowerStationTestingPoint2 ycglpoint = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, ycDqPoints2[i]);
+                                            WindPowerStationTestingPoint2 ycglpoint = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, ycDqPoints2[i]);
 
                                             double ycgl = realApiUtil.getRealData(ycglpoint).getPointValueInDouble();
 
@@ -777,17 +777,17 @@ public class RealPowerPushService {
 
 
                 // 实际发功率
-                WindPowerStationTestingPoint2 sjgl = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_SJGL);
+                WindPowerStationTestingPoint2 sjgl = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_SJGL);
                 // 总应发功率
-                WindPowerStationTestingPoint2 yfgl = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_ZZSGL);
+                WindPowerStationTestingPoint2 yfgl = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_ZZSGL);
                 // 总理论功率
-                WindPowerStationTestingPoint2 llgl = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_ZLLGL);
+                WindPowerStationTestingPoint2 llgl = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_ZLLGL);
                 // 总保证功率
-                WindPowerStationTestingPoint2 bzgl = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.ZBZGL);
+                WindPowerStationTestingPoint2 bzgl = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.ZBZGL);
                 //实时平均风速
-                WindPowerStationTestingPoint2 pjfs = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_SSFS);
+                WindPowerStationTestingPoint2 pjfs = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_SSFS);
                 // 最优功率
-                WindPowerStationTestingPoint2 zygl = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_ZZYGL);
+                WindPowerStationTestingPoint2 zygl = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_ZZYGL);
 
 
                 try {
@@ -1083,7 +1083,7 @@ public class RealPowerPushService {
                         case "sjgl":
 
                             // 实际发功率
-                            WindPowerStationTestingPoint2 sjgl = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(vo.getId(), Constant.TPOINT_WP_SJGL);
+                            WindPowerStationTestingPoint2 sjgl = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(vo.getId(), Constant.TPOINT_WP_SJGL);
 
                             if(null!=sjgl && null!=sjgl.getCode())
                             {
@@ -1092,7 +1092,7 @@ public class RealPowerPushService {
                             break;
                         case "bzgl":
                             // 总保证功率
-                            WindPowerStationTestingPoint2 bzgl = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(vo.getId(), Constant.ZBZGL);
+                            WindPowerStationTestingPoint2 bzgl = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(vo.getId(), Constant.ZBZGL);
                             if(null!=bzgl && null!=bzgl.getCode())
                             {
                                 pointid=bzgl.getCode();
@@ -1100,7 +1100,7 @@ public class RealPowerPushService {
                             break;
                         case "yfgl":
                             // 总应发功率
-                            WindPowerStationTestingPoint2 yfgl = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(vo.getId(), Constant.TPOINT_WP_ZZSGL);
+                            WindPowerStationTestingPoint2 yfgl = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(vo.getId(), Constant.TPOINT_WP_ZZSGL);
                             if(null!=yfgl && null!=yfgl.getCode())
                             {
                                 pointid=yfgl.getCode();
@@ -1108,7 +1108,7 @@ public class RealPowerPushService {
                             break;
                         case "ssfs":
                             //实时平均风速
-                            WindPowerStationTestingPoint2 ssfs = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(vo.getId(), Constant.TPOINT_WP_SSFS);
+                            WindPowerStationTestingPoint2 ssfs = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(vo.getId(), Constant.TPOINT_WP_SSFS);
                             if(null!=ssfs && null!=ssfs.getCode())
                             {
                                 pointid=ssfs.getCode();

src/main/java/com/gyee/frame/service/websocket/SandtableService.java

@@ -23,7 +23,7 @@ public class SandtableService {
 
 
     @Resource
-    private WindPowerstationTestingPointService windPowerstationTestingPointService;
+    private WindPowerstationTestingPoint2Service windPowerstationTestingPoint2Service;
     @Resource
     private WindTurbineTestingPointAiService windTurbineTestingPointAiService;
     @Resource

src/main/java/com/gyee/frame/service/websocket/WpInfoPushService.java

@@ -5,13 +5,15 @@ import com.gyee.frame.common.spring.Constant;
 import com.gyee.frame.common.spring.InitialRunner;
 import com.gyee.frame.model.auto.WindPowerStationTestingPoint2;
 import com.gyee.frame.model.auto.Windpowerstation;
-import com.gyee.frame.model.auto.Windturbine;
 import com.gyee.frame.model.auto.WpMttrAndMtbMonth;
 import com.gyee.frame.model.custom.DNAVal;
 import com.gyee.frame.model.custom.DataVo;
 import com.gyee.frame.model.custom.PointData;
 import com.gyee.frame.model.custom.ZtjsVo;
-import com.gyee.frame.service.*;
+import com.gyee.frame.service.ProjectPlanService;
+import com.gyee.frame.service.WindPowerstationTestingPoint2Service;
+import com.gyee.frame.service.WindpowerinfodayService;
+import com.gyee.frame.service.WpMttrAndMtbMonthService;
 import com.gyee.frame.service.weather.WeatherService;
 import com.gyee.frame.util.IRealTimeDataBaseUtil;
 import com.gyee.frame.util.MathUtil;
@@ -30,7 +32,7 @@ public class WpInfoPushService {
 
 
     @Resource
-    private WindPowerstationTestingPointService windPowerstationTestingPointService;
+    private WindPowerstationTestingPoint2Service windPowerstationTestingPoint2Service;
     @Resource
     private WindpowerinfodayService windpowerinfodayService;
     @Resource
@@ -44,9 +46,6 @@ public class WpInfoPushService {
     @Resource
     private WeatherService weatherService;
 
-    @Resource
-    private WindTurbineTestingPointAiService windTurbineTestingPointAiService;
-
     IRealTimeDataBaseUtil realApiUtil = RealTimeDataBaseFactory.createRealTimeDataBase();
     private final double YCFDLXS = 1.08;
     String[] ycPoints1 = Constant.TPOINT_WP_FGLYC.split(",");
@@ -118,21 +117,21 @@ public class WpInfoPushService {
             jczbmap.put("name", wp.getName());
             List<String> jczbls = new ArrayList<>();
 
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_SJGL).getCode());
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_RFDL).getCode());
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_YFDL).getCode());
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_NFDL).getCode());
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_SSFS).getCode());
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_SWDL).getCode());
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.ZBZGL).getCode());
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_ZZSGL).getCode());
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.FJZT).getCode());
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WT_RFDL).getCode());
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, ycPoints1[0]).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_SJGL).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_RFDL).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_YFDL).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_NFDL).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_SSFS).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_SWDL).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.ZBZGL).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_ZZSGL).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.FJZT).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WT_RFDL).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, ycPoints1[0]).getCode());
 
             if (InitialRunner.wpmap.containsKey(id)) {
-                jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.AGC001).getCode());
-                jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.AGC002).getCode());
+                jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.AGC001).getCode());
+                jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.AGC002).getCode());
             }
 
 
@@ -234,7 +233,7 @@ public class WpInfoPushService {
             }
 
 
-            List<WindPowerStationTestingPoint2> wpoints= windPowerstationTestingPointService.getJsztList(id);
+            List<WindPowerStationTestingPoint2> wpoints= windPowerstationTestingPoint2Service.getJsztList(id);
 
             if(!wpoints.isEmpty())
             {
@@ -529,13 +528,13 @@ public class WpInfoPushService {
 /*************************************************测风塔*************************************************************/
 
             if (InitialRunner.wpmap.containsKey(id)) {
-                WindPowerStationTestingPoint2 point2 = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.FCCFTFX30);
+                WindPowerStationTestingPoint2 point2 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.FCCFTFX30);
 
                 if (StringUtils.notEmp(point2.getCode())) {
                     PointData value = realApiUtil.getRealData(point2);
                     jczbmap.put("cftfx", MathUtil.twoBit(value.getPointValueInDouble()));
                 }
-                point2 = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.FCCFTFS30);
+                point2 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.FCCFTFS30);
 
                 if (StringUtils.notEmp(point2.getCode())) {
                     PointData value = realApiUtil.getRealData(point2);
@@ -553,17 +552,17 @@ public class WpInfoPushService {
 
             List<String> ztls = new ArrayList<>();
             //待机台数
-            ztls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WT_DJTS).getCode());
+            ztls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WT_DJTS).getCode());
             //运行台数
-            ztls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WT_YXTS).getCode());
+            ztls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WT_YXTS).getCode());
             //故障台数
-            ztls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WT_GZTJ).getCode());
+            ztls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WT_GZTJ).getCode());
             //离线台数
-            ztls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WT_TXZD).getCode());
+            ztls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WT_TXZD).getCode());
             //维护台数
-            ztls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WT_WHTJ).getCode());
+            ztls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WT_WHTJ).getCode());
             //限电台数
-            ztls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WT_XDTS).getCode());
+            ztls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WT_XDTS).getCode());
 
 
             List<PointData> ztlist = realApiUtil.getRealData(ztls);
@@ -597,79 +596,79 @@ public class WpInfoPushService {
 //            List<String> wxssls = new ArrayList<>();
 //
 //            // 日场内受累检修
-//            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.RLZSSDL).getCode());
+//            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.RLZSSDL).getCode());
 //            // 日场内受累故障
-//            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.RSZSSDL).getCode());
+//            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.RSZSSDL).getCode());
 //            // 月场内受累检修
-//            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.YLZSSDL).getCode());
+//            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.YLZSSDL).getCode());
 //            // 月场内受累故障
-//            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.YSZSSDL).getCode());
+//            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.YSZSSDL).getCode());
 //            // 年场内受累检修
-//            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.NLZSSDL).getCode());
+//            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.NLZSSDL).getCode());
 //            // 年场内受累故障
-//            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.NSZSSDL).getCode());
+//            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.NSZSSDL).getCode());
 //
 //            //日待机损失
-//            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.RSDJZSDL).getCode());
+//            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.RSDJZSDL).getCode());
 //            //日手动停机损失
-//            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.RSSTZSDL).getCode());
+//            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.RSSTZSDL).getCode());
 //            //日性能损失
-//            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.RXNZSDL).getCode());
+//            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.RXNZSDL).getCode());
 //            //日缺陷降出力损失
-//            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.RSQXZSDL).getCode());
+//            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.RSQXZSDL).getCode());
 //            //日故障损失
-//            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.RGZSSDL).getCode());
+//            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.RGZSSDL).getCode());
 //            //日检修损失
-//            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.RJXSSDL).getCode());
+//            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.RJXSSDL).getCode());
 //
 //            //月待机损失
-//            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.YSDJZSDL).getCode());
+//            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.YSDJZSDL).getCode());
 //            //月手动停机损失
-//            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.YSSTZSDL).getCode());
+//            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.YSSTZSDL).getCode());
 //            //月性能损失
-//            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.YXNZSDL).getCode());
+//            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.YXNZSDL).getCode());
 //            //月缺陷降出力损失
-//            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.YSQXZSDL).getCode());
+//            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.YSQXZSDL).getCode());
 //            //月故障损失
-//            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.YGZSSDL).getCode());
+//            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.YGZSSDL).getCode());
 //            //月检修损失
-//            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.YJXSSDL).getCode());
+//            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.YJXSSDL).getCode());
 //
 //
 //            //年待机损失
-//            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.NSDJZSDL).getCode());
+//            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.NSDJZSDL).getCode());
 //            //年手动停机损失
-//            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.NSSTZSDL).getCode());
+//            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.NSSTZSDL).getCode());
 //            //年性能损失
-//            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.NXNZSDL).getCode());
+//            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.NXNZSDL).getCode());
 //            //年缺陷降出力损失
-//            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.NSQXZSDL).getCode());
+//            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.NSQXZSDL).getCode());
 //            //年故障损失
-//            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.NGZSSDL).getCode());
+//            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.NGZSSDL).getCode());
 //            //年检修损失
-//            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.NJXSSDL).getCode());
+//            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.NJXSSDL).getCode());
 //
 //
 //            //日限电损失
-//            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.RXDSSDL).getCode());
+//            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.RXDSSDL).getCode());
 //            //月限电损失
-//            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.YXDSSDL).getCode());
+//            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.YXDSSDL).getCode());
 //            //年限电损失
-//            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.NXDSSDL).getCode());
+//            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.NXDSSDL).getCode());
 //
 //
 //            //日场外受累电网
-//            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.RWZSSDL).getCode());
+//            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.RWZSSDL).getCode());
 //            // 日场外受累天气
-//            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.RTZSSDL).getCode());
+//            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.RTZSSDL).getCode());
 //            // 月场外受累电网
-//            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.YWZSSDL).getCode());
+//            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.YWZSSDL).getCode());
 //            // 月场外受累天气
-//            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.YTZSSDL).getCode());
+//            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.YTZSSDL).getCode());
 //            // 年场外受累电网
-//            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.NWZSSDL).getCode());
+//            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.NWZSSDL).getCode());
 //            // 年场外受累天气
-//            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.NTZSSDL).getCode());
+//            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.NTZSSDL).getCode());
 //
 //
 //            List<PointData> wxsslist = realApiUtil.getRealData(wxssls);
@@ -827,28 +826,28 @@ public class WpInfoPushService {
             List<String> wxssls = new ArrayList<>();
 
             // 日场内受累检修
-            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.RLZSSDL).getCode());
+            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.RLZSSDL).getCode());
             // 日场内受累故障
-            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.RSZSSDL).getCode());
+            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.RSZSSDL).getCode());
             //日待机损失
-            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.RSDJZSDL).getCode());
+            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.RSDJZSDL).getCode());
             //日手动停机损失
-            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.RSSTZSDL).getCode());
+            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.RSSTZSDL).getCode());
             //日性能损失
-            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.RXNZSDL).getCode());
+            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.RXNZSDL).getCode());
             //日缺陷降出力损失
-            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.RSQXZSDL).getCode());
+            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.RSQXZSDL).getCode());
             //日故障损失
-            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.RGZSSDL).getCode());
+            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.RGZSSDL).getCode());
             //日检修损失
-            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.RJXSSDL).getCode());
+            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.RJXSSDL).getCode());
             //日限电损失
-            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.RXDSSDL).getCode());
+            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.RXDSSDL).getCode());
 
             //日场外受累电网
-            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.RWZSSDL).getCode());
+            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.RWZSSDL).getCode());
             // 日场外受累天气
-            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.RTZSSDL).getCode());
+            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.RTZSSDL).getCode());
 
             List<PointData> wxsslist = realApiUtil.getRealData(wxssls);
 
@@ -1155,38 +1154,38 @@ public class WpInfoPushService {
             map.put("tqmap", tqmap);
             List<String> jczbls = new ArrayList<>();
 
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_RFDL).getCode());
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_YFDL).getCode());
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_NFDL).getCode());
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_SSFS).getCode());
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_SJGL).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_RFDL).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_YFDL).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_NFDL).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_SSFS).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.TPOINT_WP_SJGL).getCode());
 
             //待机台数
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.DJNUM).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.DJNUM).getCode());
             //手动停机台数
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.TJNUM).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.TJNUM).getCode());
             //正常发电台数
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.FDNUM).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.FDNUM).getCode());
             // 缺陷降出力台数
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.FDJCLNUM).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.FDJCLNUM).getCode());
             // 限电降出力台数
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.XDJCLNUM).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.XDJCLNUM).getCode());
             // 限电停机台数
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.XDTJNUM).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.XDTJNUM).getCode());
             // 故障停机台数
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.GZNUM).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.GZNUM).getCode());
             // 场内受累停机台数
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.CNGZNUM).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.CNGZNUM).getCode());
             // 检修停机台数
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.JXNUM).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.JXNUM).getCode());
             // 场内受累检修台数
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.CNJXNUM).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.CNJXNUM).getCode());
             // 电网受累台数
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.DWSLNUM).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.DWSLNUM).getCode());
             // 环境受累台数
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.HJSLNUM).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.HJSLNUM).getCode());
             // 风机离线台数
-            jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wp.getId(), Constant.LXNUM).getCode());
+            jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.LXNUM).getCode());
 
 
             List<PointData> jczblist = realApiUtil.getRealData(jczbls);
@@ -1218,7 +1217,7 @@ public class WpInfoPushService {
                 jczbmap.put("sjgl", sjgl);
 
 
-                //待机台数
+//待机台数
                 Double djnum = MathUtil.twoBit(jczblist.get(5).getPointValueInDouble());
                 jczbmap.put("djnum", djnum);
                 //手动停机台数
@@ -1258,75 +1257,6 @@ public class WpInfoPushService {
                 Double lxnum = MathUtil.twoBit(jczblist.get(17).getPointValueInDouble());
                 jczbmap.put("lxnum", lxnum);
 
-                /*************************************************光伏状态统计*************************************************************/
-
-                if(wp.getId().endsWith("GDC")){
-
-                    List<String> fjzbls = new ArrayList<>();
-                    List<Windturbine> wtls=InitialRunner.wp_wtmap.get(wp.getId());
-                    for(Windturbine wt:wtls) {
-
-                        //状态
-                        fjzbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(), Constant.FJZT).getId());
-                    }
-                    List<PointData> fjzblist = realApiUtil.getRealData(fjzbls);
-                    if (!fjzblist.isEmpty() && fjzblist.size() == fjzbls.size()) {
-//                        double djnum=0.0;
-//                        double yxts=0.0;
-//                        double gzts=0.0;
-//                        double lxts=0.0;
-//                        double whts=0.0;
-//                        double xdts=0.0;
-//                        double slts=0.0;
-                        for(int i=0;i<wtls.size();i++){
-                            double fjzt = MathUtil.twoBit(MathUtil.twoBit(fjzblist.get(i).getPointValueInDouble()));
-                            switch (Double.valueOf(fjzt).intValue()) {
-                                case 0:
-                                    djnum++;
-                                    break;
-                                case 1:
-                                    zcfdnum++;
-                                    break;
-                                case 2:
-                                    gztjnum++;
-                                    break;
-                                case 3:
-                                    lxnum++;
-                                    break;
-                                case 4:
-                                    jxtjnum++;
-                                    break;
-                                case 5:
-                                    xdjclnum++;
-                                    break;
-                                case 6:
-                                    xdjclnum++;
-                                    break;
-
-                                default:
-
-                                    break;
-                            }
-                        }
-
-                    }
-
-                    //待机台数
-                    jczbmap.put("djnum", djnum);
-                    //正常发电台数
-                    jczbmap.put("zcfdnum", zcfdnum);
-                    // 限电降出力台数
-                    jczbmap.put("xdjclnum", xdjclnum);
-                    // 故障停机台数
-                    jczbmap.put("gztjnum", gztjnum);
-                    // 检修停机台数
-                    jczbmap.put("jxtjnum", jxtjnum);
-                    // 电网受累台数
-                    jczbmap.put("dwslnum", dwslnum);
-                    // 风机离线台数
-                    jczbmap.put("lxnum", lxnum);
-                }
-
 //
 //                double djts=djnum+sdtjnum;
 //                double yxts=zcfdnum+qxjclnum;
@@ -1425,79 +1355,79 @@ public class WpInfoPushService {
             List<String> wxssls = new ArrayList<>();
 
             // 日场内受累检修
-            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.RLZSSDL).getCode());
+            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.RLZSSDL).getCode());
             // 日场内受累故障
-            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.RSZSSDL).getCode());
+            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.RSZSSDL).getCode());
             // 月场内受累检修
-            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.YLZSSDL).getCode());
+            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.YLZSSDL).getCode());
             // 月场内受累故障
-            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.YSZSSDL).getCode());
+            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.YSZSSDL).getCode());
             // 年场内受累检修
-            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.NLZSSDL).getCode());
+            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.NLZSSDL).getCode());
             // 年场内受累故障
-            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.NSZSSDL).getCode());
+            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.NSZSSDL).getCode());
 
             //日待机损失
-            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.RSDJZSDL).getCode());
+            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.RSDJZSDL).getCode());
             //日手动停机损失
-            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.RSSTZSDL).getCode());
+            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.RSSTZSDL).getCode());
             //日性能损失
-            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.RXNZSDL).getCode());
+            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.RXNZSDL).getCode());
             //日缺陷降出力损失
-            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.RSQXZSDL).getCode());
+            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.RSQXZSDL).getCode());
             //日故障损失
-            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.RGZSSDL).getCode());
+            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.RGZSSDL).getCode());
             //日检修损失
-            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.RJXSSDL).getCode());
+            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.RJXSSDL).getCode());
 
             //月待机损失
-            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.YSDJZSDL).getCode());
+            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.YSDJZSDL).getCode());
             //月手动停机损失
-            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.YSSTZSDL).getCode());
+            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.YSSTZSDL).getCode());
             //月性能损失
-            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.YXNZSDL).getCode());
+            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.YXNZSDL).getCode());
             //月缺陷降出力损失
-            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.YSQXZSDL).getCode());
+            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.YSQXZSDL).getCode());
             //月故障损失
-            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.YGZSSDL).getCode());
+            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.YGZSSDL).getCode());
             //月检修损失
-            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.YJXSSDL).getCode());
+            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.YJXSSDL).getCode());
 
 
             //年待机损失
-            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.NSDJZSDL).getCode());
+            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.NSDJZSDL).getCode());
             //年手动停机损失
-            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.NSSTZSDL).getCode());
+            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.NSSTZSDL).getCode());
             //年性能损失
-            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.NXNZSDL).getCode());
+            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.NXNZSDL).getCode());
             //年缺陷降出力损失
-            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.NSQXZSDL).getCode());
+            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.NSQXZSDL).getCode());
             //年故障损失
-            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.NGZSSDL).getCode());
+            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.NGZSSDL).getCode());
             //年检修损失
-            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.NJXSSDL).getCode());
+            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.NJXSSDL).getCode());
 
 
             //日限电损失
-            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.RXDSSDL).getCode());
+            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.RXDSSDL).getCode());
             //月限电损失
-            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.YXDSSDL).getCode());
+            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.YXDSSDL).getCode());
             //年限电损失
-            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.NXDSSDL).getCode());
+            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.NXDSSDL).getCode());
 
 
             //日场外受累电网
-            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.RWZSSDL).getCode());
+            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.RWZSSDL).getCode());
             // 日场外受累天气
-            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.RTZSSDL).getCode());
+            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.RTZSSDL).getCode());
             // 月场外受累电网
-            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.YWZSSDL).getCode());
+            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.YWZSSDL).getCode());
             // 月场外受累天气
-            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.YTZSSDL).getCode());
+            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.YTZSSDL).getCode());
             // 年场外受累电网
-            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.NWZSSDL).getCode());
+            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.NWZSSDL).getCode());
             // 年场外受累天气
-            wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(id, Constant.NTZSSDL).getCode());
+            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.NTZSSDL).getCode());
 
 
             List<PointData> wxsslist = realApiUtil.getRealData(wxssls);
@@ -1757,20 +1687,20 @@ public class WpInfoPushService {
         long monthdaynum = c.getActualMaximum(Calendar.DAY_OF_MONTH);
 
 
-        WindPowerStationTestingPoint2 gzslai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.RSZSSDL);
-        WindPowerStationTestingPoint2 jxslai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.RLZSSDL);
+        WindPowerStationTestingPoint2 gzslai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.RSZSSDL);
+        WindPowerStationTestingPoint2 jxslai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.RLZSSDL);
 
-        WindPowerStationTestingPoint2 gzssai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.RGZSSDL);
-        WindPowerStationTestingPoint2 jxssai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.RJXSSDL);
+        WindPowerStationTestingPoint2 gzssai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.RGZSSDL);
+        WindPowerStationTestingPoint2 jxssai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.RJXSSDL);
 
-        WindPowerStationTestingPoint2 djssai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.RSDJZSDL);
-        WindPowerStationTestingPoint2 sdtjai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.RSSTZSDL);
-        WindPowerStationTestingPoint2 xnssai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.RXNZSDL);
-        WindPowerStationTestingPoint2 qxjclai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.RSQXZSDL);
+        WindPowerStationTestingPoint2 djssai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.RSDJZSDL);
+        WindPowerStationTestingPoint2 sdtjai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.RSSTZSDL);
+        WindPowerStationTestingPoint2 xnssai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.RXNZSDL);
+        WindPowerStationTestingPoint2 qxjclai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.RSQXZSDL);
 
-        WindPowerStationTestingPoint2 xdssai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.RSSTZSDL);
-        WindPowerStationTestingPoint2 dwslai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.RXNZSDL);
-        WindPowerStationTestingPoint2 tqslai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.RSQXZSDL);
+        WindPowerStationTestingPoint2 xdssai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.RSSTZSDL);
+        WindPowerStationTestingPoint2 dwslai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.RXNZSDL);
+        WindPowerStationTestingPoint2 tqslai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.RSQXZSDL);
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -1905,9 +1835,9 @@ public class WpInfoPushService {
         // long num = 30;
 
 
-        WindPowerStationTestingPoint2 rfdlai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_RFDL);
+        WindPowerStationTestingPoint2 rfdlai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_RFDL);
 
-        WindPowerStationTestingPoint2 fsai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SSFS);
+        WindPowerStationTestingPoint2 fsai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SSFS);
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         List<PointData> rfdlls = realApiUtil.getHistoryDatasSnap(rfdlai, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, 86400L);
@@ -1956,8 +1886,8 @@ public class WpInfoPushService {
             wpId = "0";
         }
 
-        WindPowerStationTestingPoint2 fsai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SSFS);
-        WindPowerStationTestingPoint2 yfdlai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_YFDL);
+        WindPowerStationTestingPoint2 fsai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SSFS);
+        WindPowerStationTestingPoint2 yfdlai = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_YFDL);
         String[] fdlpoints = new String[2];
         fdlpoints[0] = yfdlai.getCode();
         fdlpoints[1] = fsai.getCode();

src/main/java/com/gyee/frame/util/StringUtils.java

@@ -7,10 +7,7 @@ import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.Collection;
-import java.util.Date;
-import java.util.Map;
-import java.util.UUID;
+import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -535,4 +532,28 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
 
         return true;
     }
+
+
+    /**
+     * 正则表达式
+     * @param input     需要匹配的字符串
+     * @param expression 正则表达公式
+     * @return
+     */
+    public static List<String> pattern(String input, String expression){
+        // 创建 Pattern 对象
+        Pattern p = Pattern.compile(expression);
+        Matcher m = p.matcher(input);
+
+        ArrayList list = new ArrayList();
+        while (m.find()) {
+            list.add(m.group(0));
+        }
+        //去除重复值
+        HashSet hs=new HashSet(list);
+        list.clear();
+        list.addAll(hs);
+
+        return list;
+    }
 }

src/main/resources/application.yml

@@ -190,6 +190,6 @@ exportcode:
   template2cft:
     MHS_FDC: MHSFCJSFW.NX_GD_MHSF_XX_XX_XXX_XXX_CI0106,MHSFGL.NX_GD_MHSF_YC_P1_L1_001_FGLD70,MHSFGL.NX_GD_MHSF_YC_P1_L1_001_FGLTEM,MHSFGL.NX_GD_MHSF_YC_P1_L1_001_FGLPRE,MHSFGL.NX_GD_MHSF_YC_P1_L1_001_FGLHUM
     NSS_FDC: NSSFCJSFW.NX_GD_NSSF_XX_XX_XXX_XXX_CI0106,NSSFGL.NX_GD_NSSF_YC_P1_L1_001_FGLD70,NSSFGL.NX_GD_NSSF_YC_P1_L1_001_FGLTEM,NSSFGL.NX_GD_NSSF_YC_P1_L1_001_FGLPRE,NSSFGL.NX_GD_NSSF_YC_P1_L1_001_FGLHUM
-    QS_FDC: QSFCJSFW.NX_GD_QSF_XX_XX_XXX_XXX_CI0106,QSFGL.NX_GD_QSF_YC_P1_L1_001_FGLD70,QSFGL.NX_GD_QSF_YC_P1_L1_001_FGLTEM,QSFGL.NX_GD_QSF_YC_P1_L1_001_FGLPRE,QSFGL.NX_GD_QSF_YC_P1_L1_001_FGLHUM
+    QS_FDC: QSFCJSFW.NX_GD_QSF_XX_XX_XXX_XXX_CI0106,QSFGL.NX_GD_QSF_YC_P1_L1_001_CFT018,QSFGL.NX_GD_QSF_YC_P1_L1_001_CFT019,QSFGL.NX_GD_QSF_YC_P1_L1_001_CFT020,QSFGL.NX_GD_QSF_YC_P1_L1_001_CFT021
     SBQ_FDC: SBQFCJSFW.NX_GD_SBQF_XX_XX_XXX_XXX_CI0106,SBQFGL.NX_GD_SBQF_YC_P1_L1_001_FGLD70,SBQFGL.NX_GD_SBQF_YC_P1_L1_001_FGLTEM,SBQFGL.NX_GD_SBQF_YC_P1_L1_001_FGLPRE,SBQFGL.NX_GD_SBQF_YC_P1_L1_001_FGLHUM
     XS_FDC: XSFCJSFW.NX_GD_XSF_XX_XX_XXX_XXX_CI0106,XSFGL.NX_GD_XSF_YC_P1_L1_001_FGLD70,XSFGL.NX_GD_XSF_YC_P1_L1_001_FGLTEM,XSFGL.NX_GD_XSF_YC_P1_L1_001_FGLPRE,XSFGL.NX_GD_XSF_YC_P1_L1_001_FGLHUM

src/main/resources/mybatis-generator.xml

@@ -109,7 +109,7 @@
 <!--        <table tableName='StopAnalysis' domainObjectName='StopAnalysis'/>-->
 <!--        <table tableName='StopAnalysismain' domainObjectName='StopAnalysismain'/>-->
 <!--        <table tableName='StopAnalysismainVo' domainObjectName='StopAnalysismainVo'/>-->
-        <table tableName='Windturbinestandardpoint' domainObjectName='Windturbinestandardpoint'/>
+        <table tableName='WindPowerStationTestingPoint' domainObjectName='WindPowerStationTestingPoint'/>
 
 
 

src/main/resources/mybatis/auto/MetricsMapper.xml

@@ -0,0 +1,461 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.gyee.frame.mapper.auto.MetricsMapper">
+  <resultMap id="BaseResultMap" type="com.gyee.frame.model.auto.Metrics">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <id column="ID" jdbcType="DECIMAL" property="id" />
+    <result column="THING" jdbcType="VARCHAR" property="thing" />
+    <result column="METRICID" jdbcType="VARCHAR" property="metricid" />
+    <result column="METRICNAME" jdbcType="VARCHAR" property="metricname" />
+    <result column="UNITNAME" jdbcType="VARCHAR" property="unitname" />
+    <result column="UNITNAMECN" jdbcType="VARCHAR" property="unitnamecn" />
+    <result column="THINGSUB" jdbcType="VARCHAR" property="thingsub" />
+    <result column="THINGSUBSUB" jdbcType="VARCHAR" property="thingsubsub" />
+    <result column="CATEGORYDATA" jdbcType="VARCHAR" property="categorydata" />
+    <result column="CATEGORYSCI" jdbcType="VARCHAR" property="categorysci" />
+    <result column="CATEGORYSYS" jdbcType="VARCHAR" property="categorysys" />
+    <result column="CATEGORYRES1" jdbcType="VARCHAR" property="categoryres1" />
+    <result column="CATEGORYRES2" jdbcType="VARCHAR" property="categoryres2" />
+    <result column="CATEGORYRES3" jdbcType="VARCHAR" property="categoryres3" />
+    <result column="CATEGORYRES4" jdbcType="VARCHAR" property="categoryres4" />
+    <result column="CATEGORYRES5" jdbcType="VARCHAR" property="categoryres5" />
+    <result column="DESCRIPTION" jdbcType="VARCHAR" property="description" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    ID, THING, METRICID, METRICNAME, UNITNAME, UNITNAMECN, THINGSUB, THINGSUBSUB, CATEGORYDATA, 
+    CATEGORYSCI, CATEGORYSYS, CATEGORYRES1, CATEGORYRES2, CATEGORYRES3, CATEGORYRES4, 
+    CATEGORYRES5, DESCRIPTION
+  </sql>
+  <select id="selectByExample" parameterType="com.gyee.frame.model.auto.MetricsExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from METRICS
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Short" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from METRICS
+    where ID = #{id,jdbcType=DECIMAL}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from METRICS
+    where ID = #{id,jdbcType=DECIMAL}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.gyee.frame.model.auto.MetricsExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from METRICS
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.gyee.frame.model.auto.Metrics">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into METRICS (ID, THING, METRICID, 
+      METRICNAME, UNITNAME, UNITNAMECN, 
+      THINGSUB, THINGSUBSUB, CATEGORYDATA, 
+      CATEGORYSCI, CATEGORYSYS, CATEGORYRES1, 
+      CATEGORYRES2, CATEGORYRES3, CATEGORYRES4, 
+      CATEGORYRES5, DESCRIPTION)
+    values (#{id,jdbcType=DECIMAL}, #{thing,jdbcType=VARCHAR}, #{metricid,jdbcType=VARCHAR}, 
+      #{metricname,jdbcType=VARCHAR}, #{unitname,jdbcType=VARCHAR}, #{unitnamecn,jdbcType=VARCHAR}, 
+      #{thingsub,jdbcType=VARCHAR}, #{thingsubsub,jdbcType=VARCHAR}, #{categorydata,jdbcType=VARCHAR}, 
+      #{categorysci,jdbcType=VARCHAR}, #{categorysys,jdbcType=VARCHAR}, #{categoryres1,jdbcType=VARCHAR}, 
+      #{categoryres2,jdbcType=VARCHAR}, #{categoryres3,jdbcType=VARCHAR}, #{categoryres4,jdbcType=VARCHAR}, 
+      #{categoryres5,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.gyee.frame.model.auto.Metrics">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into METRICS
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        ID,
+      </if>
+      <if test="thing != null">
+        THING,
+      </if>
+      <if test="metricid != null">
+        METRICID,
+      </if>
+      <if test="metricname != null">
+        METRICNAME,
+      </if>
+      <if test="unitname != null">
+        UNITNAME,
+      </if>
+      <if test="unitnamecn != null">
+        UNITNAMECN,
+      </if>
+      <if test="thingsub != null">
+        THINGSUB,
+      </if>
+      <if test="thingsubsub != null">
+        THINGSUBSUB,
+      </if>
+      <if test="categorydata != null">
+        CATEGORYDATA,
+      </if>
+      <if test="categorysci != null">
+        CATEGORYSCI,
+      </if>
+      <if test="categorysys != null">
+        CATEGORYSYS,
+      </if>
+      <if test="categoryres1 != null">
+        CATEGORYRES1,
+      </if>
+      <if test="categoryres2 != null">
+        CATEGORYRES2,
+      </if>
+      <if test="categoryres3 != null">
+        CATEGORYRES3,
+      </if>
+      <if test="categoryres4 != null">
+        CATEGORYRES4,
+      </if>
+      <if test="categoryres5 != null">
+        CATEGORYRES5,
+      </if>
+      <if test="description != null">
+        DESCRIPTION,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=DECIMAL},
+      </if>
+      <if test="thing != null">
+        #{thing,jdbcType=VARCHAR},
+      </if>
+      <if test="metricid != null">
+        #{metricid,jdbcType=VARCHAR},
+      </if>
+      <if test="metricname != null">
+        #{metricname,jdbcType=VARCHAR},
+      </if>
+      <if test="unitname != null">
+        #{unitname,jdbcType=VARCHAR},
+      </if>
+      <if test="unitnamecn != null">
+        #{unitnamecn,jdbcType=VARCHAR},
+      </if>
+      <if test="thingsub != null">
+        #{thingsub,jdbcType=VARCHAR},
+      </if>
+      <if test="thingsubsub != null">
+        #{thingsubsub,jdbcType=VARCHAR},
+      </if>
+      <if test="categorydata != null">
+        #{categorydata,jdbcType=VARCHAR},
+      </if>
+      <if test="categorysci != null">
+        #{categorysci,jdbcType=VARCHAR},
+      </if>
+      <if test="categorysys != null">
+        #{categorysys,jdbcType=VARCHAR},
+      </if>
+      <if test="categoryres1 != null">
+        #{categoryres1,jdbcType=VARCHAR},
+      </if>
+      <if test="categoryres2 != null">
+        #{categoryres2,jdbcType=VARCHAR},
+      </if>
+      <if test="categoryres3 != null">
+        #{categoryres3,jdbcType=VARCHAR},
+      </if>
+      <if test="categoryres4 != null">
+        #{categoryres4,jdbcType=VARCHAR},
+      </if>
+      <if test="categoryres5 != null">
+        #{categoryres5,jdbcType=VARCHAR},
+      </if>
+      <if test="description != null">
+        #{description,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.gyee.frame.model.auto.MetricsExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select count(*) from METRICS
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update METRICS
+    <set>
+      <if test="record.id != null">
+        ID = #{record.id,jdbcType=DECIMAL},
+      </if>
+      <if test="record.thing != null">
+        THING = #{record.thing,jdbcType=VARCHAR},
+      </if>
+      <if test="record.metricid != null">
+        METRICID = #{record.metricid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.metricname != null">
+        METRICNAME = #{record.metricname,jdbcType=VARCHAR},
+      </if>
+      <if test="record.unitname != null">
+        UNITNAME = #{record.unitname,jdbcType=VARCHAR},
+      </if>
+      <if test="record.unitnamecn != null">
+        UNITNAMECN = #{record.unitnamecn,jdbcType=VARCHAR},
+      </if>
+      <if test="record.thingsub != null">
+        THINGSUB = #{record.thingsub,jdbcType=VARCHAR},
+      </if>
+      <if test="record.thingsubsub != null">
+        THINGSUBSUB = #{record.thingsubsub,jdbcType=VARCHAR},
+      </if>
+      <if test="record.categorydata != null">
+        CATEGORYDATA = #{record.categorydata,jdbcType=VARCHAR},
+      </if>
+      <if test="record.categorysci != null">
+        CATEGORYSCI = #{record.categorysci,jdbcType=VARCHAR},
+      </if>
+      <if test="record.categorysys != null">
+        CATEGORYSYS = #{record.categorysys,jdbcType=VARCHAR},
+      </if>
+      <if test="record.categoryres1 != null">
+        CATEGORYRES1 = #{record.categoryres1,jdbcType=VARCHAR},
+      </if>
+      <if test="record.categoryres2 != null">
+        CATEGORYRES2 = #{record.categoryres2,jdbcType=VARCHAR},
+      </if>
+      <if test="record.categoryres3 != null">
+        CATEGORYRES3 = #{record.categoryres3,jdbcType=VARCHAR},
+      </if>
+      <if test="record.categoryres4 != null">
+        CATEGORYRES4 = #{record.categoryres4,jdbcType=VARCHAR},
+      </if>
+      <if test="record.categoryres5 != null">
+        CATEGORYRES5 = #{record.categoryres5,jdbcType=VARCHAR},
+      </if>
+      <if test="record.description != null">
+        DESCRIPTION = #{record.description,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update METRICS
+    set ID = #{record.id,jdbcType=DECIMAL},
+      THING = #{record.thing,jdbcType=VARCHAR},
+      METRICID = #{record.metricid,jdbcType=VARCHAR},
+      METRICNAME = #{record.metricname,jdbcType=VARCHAR},
+      UNITNAME = #{record.unitname,jdbcType=VARCHAR},
+      UNITNAMECN = #{record.unitnamecn,jdbcType=VARCHAR},
+      THINGSUB = #{record.thingsub,jdbcType=VARCHAR},
+      THINGSUBSUB = #{record.thingsubsub,jdbcType=VARCHAR},
+      CATEGORYDATA = #{record.categorydata,jdbcType=VARCHAR},
+      CATEGORYSCI = #{record.categorysci,jdbcType=VARCHAR},
+      CATEGORYSYS = #{record.categorysys,jdbcType=VARCHAR},
+      CATEGORYRES1 = #{record.categoryres1,jdbcType=VARCHAR},
+      CATEGORYRES2 = #{record.categoryres2,jdbcType=VARCHAR},
+      CATEGORYRES3 = #{record.categoryres3,jdbcType=VARCHAR},
+      CATEGORYRES4 = #{record.categoryres4,jdbcType=VARCHAR},
+      CATEGORYRES5 = #{record.categoryres5,jdbcType=VARCHAR},
+      DESCRIPTION = #{record.description,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.gyee.frame.model.auto.Metrics">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update METRICS
+    <set>
+      <if test="thing != null">
+        THING = #{thing,jdbcType=VARCHAR},
+      </if>
+      <if test="metricid != null">
+        METRICID = #{metricid,jdbcType=VARCHAR},
+      </if>
+      <if test="metricname != null">
+        METRICNAME = #{metricname,jdbcType=VARCHAR},
+      </if>
+      <if test="unitname != null">
+        UNITNAME = #{unitname,jdbcType=VARCHAR},
+      </if>
+      <if test="unitnamecn != null">
+        UNITNAMECN = #{unitnamecn,jdbcType=VARCHAR},
+      </if>
+      <if test="thingsub != null">
+        THINGSUB = #{thingsub,jdbcType=VARCHAR},
+      </if>
+      <if test="thingsubsub != null">
+        THINGSUBSUB = #{thingsubsub,jdbcType=VARCHAR},
+      </if>
+      <if test="categorydata != null">
+        CATEGORYDATA = #{categorydata,jdbcType=VARCHAR},
+      </if>
+      <if test="categorysci != null">
+        CATEGORYSCI = #{categorysci,jdbcType=VARCHAR},
+      </if>
+      <if test="categorysys != null">
+        CATEGORYSYS = #{categorysys,jdbcType=VARCHAR},
+      </if>
+      <if test="categoryres1 != null">
+        CATEGORYRES1 = #{categoryres1,jdbcType=VARCHAR},
+      </if>
+      <if test="categoryres2 != null">
+        CATEGORYRES2 = #{categoryres2,jdbcType=VARCHAR},
+      </if>
+      <if test="categoryres3 != null">
+        CATEGORYRES3 = #{categoryres3,jdbcType=VARCHAR},
+      </if>
+      <if test="categoryres4 != null">
+        CATEGORYRES4 = #{categoryres4,jdbcType=VARCHAR},
+      </if>
+      <if test="categoryres5 != null">
+        CATEGORYRES5 = #{categoryres5,jdbcType=VARCHAR},
+      </if>
+      <if test="description != null">
+        DESCRIPTION = #{description,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where ID = #{id,jdbcType=DECIMAL}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.gyee.frame.model.auto.Metrics">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update METRICS
+    set THING = #{thing,jdbcType=VARCHAR},
+      METRICID = #{metricid,jdbcType=VARCHAR},
+      METRICNAME = #{metricname,jdbcType=VARCHAR},
+      UNITNAME = #{unitname,jdbcType=VARCHAR},
+      UNITNAMECN = #{unitnamecn,jdbcType=VARCHAR},
+      THINGSUB = #{thingsub,jdbcType=VARCHAR},
+      THINGSUBSUB = #{thingsubsub,jdbcType=VARCHAR},
+      CATEGORYDATA = #{categorydata,jdbcType=VARCHAR},
+      CATEGORYSCI = #{categorysci,jdbcType=VARCHAR},
+      CATEGORYSYS = #{categorysys,jdbcType=VARCHAR},
+      CATEGORYRES1 = #{categoryres1,jdbcType=VARCHAR},
+      CATEGORYRES2 = #{categoryres2,jdbcType=VARCHAR},
+      CATEGORYRES3 = #{categoryres3,jdbcType=VARCHAR},
+      CATEGORYRES4 = #{categoryres4,jdbcType=VARCHAR},
+      CATEGORYRES5 = #{categoryres5,jdbcType=VARCHAR},
+      DESCRIPTION = #{description,jdbcType=VARCHAR}
+    where ID = #{id,jdbcType=DECIMAL}
+  </update>
+</mapper>

src/main/resources/mybatis/auto/MetricsUniformCodeMapper.xml

@@ -0,0 +1,303 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.gyee.frame.mapper.auto.MetricsUniformCodeMapper">
+  <resultMap id="BaseResultMap" type="com.gyee.frame.model.auto.MetricsUniformCode">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <id column="ID" jdbcType="DECIMAL" property="id" />
+    <result column="THING" jdbcType="VARCHAR" property="thing" />
+    <result column="METRICID" jdbcType="VARCHAR" property="metricid" />
+    <result column="MODEL" jdbcType="VARCHAR" property="model" />
+    <result column="STATIONID" jdbcType="VARCHAR" property="stationid" />
+    <result column="UNIFORMCODE" jdbcType="VARCHAR" property="uniformcode" />
+    <result column="MULTIPLIER" jdbcType="DECIMAL" property="multiplier" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    ID, THING, METRICID, MODEL, STATIONID, UNIFORMCODE, MULTIPLIER
+  </sql>
+  <select id="selectByExample" parameterType="com.gyee.frame.model.auto.MetricsUniformCodeExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from METRICS_UNIFORMCODE
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Short" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from METRICS_UNIFORMCODE
+    where ID = #{id,jdbcType=DECIMAL}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from METRICS_UNIFORMCODE
+    where ID = #{id,jdbcType=DECIMAL}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.gyee.frame.model.auto.MetricsUniformCodeExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from METRICS_UNIFORMCODE
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.gyee.frame.model.auto.MetricsUniformCode">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into METRICS_UNIFORMCODE (ID, THING, METRICID, 
+      MODEL, STATIONID, UNIFORMCODE, 
+      MULTIPLIER)
+    values (#{id,jdbcType=DECIMAL}, #{thing,jdbcType=VARCHAR}, #{metricid,jdbcType=VARCHAR}, 
+      #{model,jdbcType=VARCHAR}, #{stationid,jdbcType=VARCHAR}, #{uniformcode,jdbcType=VARCHAR}, 
+      #{multiplier,jdbcType=DECIMAL})
+  </insert>
+  <insert id="insertSelective" parameterType="com.gyee.frame.model.auto.MetricsUniformCode">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into METRICS_UNIFORMCODE
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        ID,
+      </if>
+      <if test="thing != null">
+        THING,
+      </if>
+      <if test="metricid != null">
+        METRICID,
+      </if>
+      <if test="model != null">
+        MODEL,
+      </if>
+      <if test="stationid != null">
+        STATIONID,
+      </if>
+      <if test="uniformcode != null">
+        UNIFORMCODE,
+      </if>
+      <if test="multiplier != null">
+        MULTIPLIER,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=DECIMAL},
+      </if>
+      <if test="thing != null">
+        #{thing,jdbcType=VARCHAR},
+      </if>
+      <if test="metricid != null">
+        #{metricid,jdbcType=VARCHAR},
+      </if>
+      <if test="model != null">
+        #{model,jdbcType=VARCHAR},
+      </if>
+      <if test="stationid != null">
+        #{stationid,jdbcType=VARCHAR},
+      </if>
+      <if test="uniformcode != null">
+        #{uniformcode,jdbcType=VARCHAR},
+      </if>
+      <if test="multiplier != null">
+        #{multiplier,jdbcType=DECIMAL},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.gyee.frame.model.auto.MetricsUniformCodeExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select count(*) from METRICS_UNIFORMCODE
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update METRICS_UNIFORMCODE
+    <set>
+      <if test="record.id != null">
+        ID = #{record.id,jdbcType=DECIMAL},
+      </if>
+      <if test="record.thing != null">
+        THING = #{record.thing,jdbcType=VARCHAR},
+      </if>
+      <if test="record.metricid != null">
+        METRICID = #{record.metricid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.model != null">
+        MODEL = #{record.model,jdbcType=VARCHAR},
+      </if>
+      <if test="record.stationid != null">
+        STATIONID = #{record.stationid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.uniformcode != null">
+        UNIFORMCODE = #{record.uniformcode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.multiplier != null">
+        MULTIPLIER = #{record.multiplier,jdbcType=DECIMAL},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update METRICS_UNIFORMCODE
+    set ID = #{record.id,jdbcType=DECIMAL},
+      THING = #{record.thing,jdbcType=VARCHAR},
+      METRICID = #{record.metricid,jdbcType=VARCHAR},
+      MODEL = #{record.model,jdbcType=VARCHAR},
+      STATIONID = #{record.stationid,jdbcType=VARCHAR},
+      UNIFORMCODE = #{record.uniformcode,jdbcType=VARCHAR},
+      MULTIPLIER = #{record.multiplier,jdbcType=DECIMAL}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.gyee.frame.model.auto.MetricsUniformCode">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update METRICS_UNIFORMCODE
+    <set>
+      <if test="thing != null">
+        THING = #{thing,jdbcType=VARCHAR},
+      </if>
+      <if test="metricid != null">
+        METRICID = #{metricid,jdbcType=VARCHAR},
+      </if>
+      <if test="model != null">
+        MODEL = #{model,jdbcType=VARCHAR},
+      </if>
+      <if test="stationid != null">
+        STATIONID = #{stationid,jdbcType=VARCHAR},
+      </if>
+      <if test="uniformcode != null">
+        UNIFORMCODE = #{uniformcode,jdbcType=VARCHAR},
+      </if>
+      <if test="multiplier != null">
+        MULTIPLIER = #{multiplier,jdbcType=DECIMAL},
+      </if>
+    </set>
+    where ID = #{id,jdbcType=DECIMAL}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.gyee.frame.model.auto.MetricsUniformCode">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update METRICS_UNIFORMCODE
+    set THING = #{thing,jdbcType=VARCHAR},
+      METRICID = #{metricid,jdbcType=VARCHAR},
+      MODEL = #{model,jdbcType=VARCHAR},
+      STATIONID = #{stationid,jdbcType=VARCHAR},
+      UNIFORMCODE = #{uniformcode,jdbcType=VARCHAR},
+      MULTIPLIER = #{multiplier,jdbcType=DECIMAL}
+    where ID = #{id,jdbcType=DECIMAL}
+  </update>
+</mapper>

src/main/resources/mybatis/auto/WindpowerstationstandardpointMapper.xml

@@ -0,0 +1,271 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.gyee.frame.mapper.auto.WindpowerstationstandardpointMapper">
+  <resultMap id="BaseResultMap" type="com.gyee.frame.model.auto.Windpowerstationstandardpoint">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <id column="ID" jdbcType="VARCHAR" property="id" />
+    <result column="CODE" jdbcType="VARCHAR" property="code" />
+    <result column="NAME" jdbcType="VARCHAR" property="name" />
+    <result column="UNIFORMCODE" jdbcType="VARCHAR" property="uniformcode" />
+    <result column="ORDERNUM" jdbcType="VARCHAR" property="ordernum" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    ID, CODE, NAME, UNIFORMCODE, ORDERNUM
+  </sql>
+  <select id="selectByExample" parameterType="com.gyee.frame.model.auto.WindpowerstationstandardpointExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from WINDPOWERSTATIONSTANDARDPOINT
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from WINDPOWERSTATIONSTANDARDPOINT
+    where ID = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from WINDPOWERSTATIONSTANDARDPOINT
+    where ID = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.gyee.frame.model.auto.WindpowerstationstandardpointExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from WINDPOWERSTATIONSTANDARDPOINT
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.gyee.frame.model.auto.Windpowerstationstandardpoint">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into WINDPOWERSTATIONSTANDARDPOINT (ID, CODE, NAME, 
+      UNIFORMCODE, ORDERNUM)
+    values (#{id,jdbcType=VARCHAR}, #{code,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, 
+      #{uniformcode,jdbcType=VARCHAR}, #{ordernum,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.gyee.frame.model.auto.Windpowerstationstandardpoint">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into WINDPOWERSTATIONSTANDARDPOINT
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        ID,
+      </if>
+      <if test="code != null">
+        CODE,
+      </if>
+      <if test="name != null">
+        NAME,
+      </if>
+      <if test="uniformcode != null">
+        UNIFORMCODE,
+      </if>
+      <if test="ordernum != null">
+        ORDERNUM,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="code != null">
+        #{code,jdbcType=VARCHAR},
+      </if>
+      <if test="name != null">
+        #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="uniformcode != null">
+        #{uniformcode,jdbcType=VARCHAR},
+      </if>
+      <if test="ordernum != null">
+        #{ordernum,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.gyee.frame.model.auto.WindpowerstationstandardpointExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select count(*) from WINDPOWERSTATIONSTANDARDPOINT
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update WINDPOWERSTATIONSTANDARDPOINT
+    <set>
+      <if test="record.id != null">
+        ID = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.code != null">
+        CODE = #{record.code,jdbcType=VARCHAR},
+      </if>
+      <if test="record.name != null">
+        NAME = #{record.name,jdbcType=VARCHAR},
+      </if>
+      <if test="record.uniformcode != null">
+        UNIFORMCODE = #{record.uniformcode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.ordernum != null">
+        ORDERNUM = #{record.ordernum,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update WINDPOWERSTATIONSTANDARDPOINT
+    set ID = #{record.id,jdbcType=VARCHAR},
+      CODE = #{record.code,jdbcType=VARCHAR},
+      NAME = #{record.name,jdbcType=VARCHAR},
+      UNIFORMCODE = #{record.uniformcode,jdbcType=VARCHAR},
+      ORDERNUM = #{record.ordernum,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.gyee.frame.model.auto.Windpowerstationstandardpoint">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update WINDPOWERSTATIONSTANDARDPOINT
+    <set>
+      <if test="code != null">
+        CODE = #{code,jdbcType=VARCHAR},
+      </if>
+      <if test="name != null">
+        NAME = #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="uniformcode != null">
+        UNIFORMCODE = #{uniformcode,jdbcType=VARCHAR},
+      </if>
+      <if test="ordernum != null">
+        ORDERNUM = #{ordernum,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where ID = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.gyee.frame.model.auto.Windpowerstationstandardpoint">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update WINDPOWERSTATIONSTANDARDPOINT
+    set CODE = #{code,jdbcType=VARCHAR},
+      NAME = #{name,jdbcType=VARCHAR},
+      UNIFORMCODE = #{uniformcode,jdbcType=VARCHAR},
+      ORDERNUM = #{ordernum,jdbcType=VARCHAR}
+    where ID = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>

src/main/resources/mybatis/auto/WindturbinestandardpointMapper.xml

@@ -268,4 +268,5 @@
       ORDERNUM = #{ordernum,jdbcType=VARCHAR}
     where ID = #{id,jdbcType=VARCHAR}
   </update>
+
 </mapper>

src/test/java/test/InitialPointServiceTest.java

@@ -2,7 +2,7 @@ package test;
 
 import com.gyee.SpringbootStart;
 import com.gyee.frame.common.spring.SpringUtils;
-import com.gyee.frame.service.initialpoint.InitialPointService;
+import com.gyee.frame.service.initialpoint.InitialPointGoldenService;
 import lombok.SneakyThrows;
 import org.springframework.boot.SpringApplication;
 
@@ -18,9 +18,12 @@ public class InitialPointServiceTest {
 
 
 
-        InitialPointService initialPointService= SpringUtils.getBean("initialPointService");
+        InitialPointGoldenService initialPointGoldenService= SpringUtils.getBean("initialPointGoldenService");
+
+//        initialPointGoldenService.initalFj();
+
+        initialPointGoldenService.initalFc();
 
-        initialPointService.initalFj();
 
         System.out.println("初始化结束！");
     }

src/test/java/test/WindPowerstationTestingPointServiceTest.java

@@ -2,12 +2,12 @@ package test;
 
 import com.gyee.SpringbootStart;
 import com.gyee.frame.common.spring.SpringUtils;
-import com.gyee.frame.service.WindPowerstationTestingPointService;
+import com.gyee.frame.service.WindPowerstationTestingPoint2Service;
 import org.springframework.boot.SpringApplication;
 
 import java.util.Map;
 
-public class WindPowerstationTestingPointServiceTest {
+public class windPowerstationTestingPoint2ServiceTest {
 
 
     public static void main(String[] args) throws Exception {
@@ -25,7 +25,7 @@ public class WindPowerstationTestingPointServiceTest {
 
 
 
-        WindPowerstationTestingPointService windPowerstationTestingPointService= SpringUtils.getBean("windPowerstationTestingPointService");
+        WindPowerstationTestingPoint2Service windPowerstationTestingPoint2Service= SpringUtils.getBean("windPowerstationTestingPoint2Service");
 //        Map<String, Object> map =genreSetPushController.findBasicDataInfo("0");
 //        Map<String, Object> map =genreSetPushController.findDayInfo("0","rfdl");
 
@@ -38,7 +38,7 @@ public class WindPowerstationTestingPointServiceTest {
 //        map.put(GF, genreSetPushService.findBasicDataInfo(GF));
 
 
-        Map<String,Integer> map= windPowerstationTestingPointService.getWpPointTotal();
+        Map<String,Integer> map= windPowerstationTestingPoint2Service.getWpPointTotal();
 
 //        List<YawValuesVo> vos2 = yawService.getYawValuesPowerTotal("MG01_01",beginDate,endDate,4);
 //