监视模块产品化计算服务修改

web/monitor-web-hbnew/src/main/java/com/gyee/frame/common/spring/InitialRunner.java

@@ -209,7 +209,7 @@ public class InitialRunner implements CommandLineRunner {
 
         WindpowerstationExample windpowerstationExample = new WindpowerstationExample();
         windpowerstationExample.setOrderByClause("ordernum ASC");
-        windpowerstationExample.createCriteria().andIdNotLike("%SY_FDC%");
+//        windpowerstationExample.createCriteria().andIdNotLike("%SY_FDC%");
         wpallls = windpowerstationService.selectByExample(windpowerstationExample);
         if (!wpallls.isEmpty()) {
             for (Windpowerstation wp : wpallls) {
@@ -226,7 +226,7 @@ public class InitialRunner implements CommandLineRunner {
 
         ProjectExample projectExample = new ProjectExample();
         projectExample.setOrderByClause("ordernum ASC");
-        projectExample.createCriteria().andWindpowerstationidNotLike("%SY_FDC%");
+//        projectExample.createCriteria().andWindpowerstationidNotLike("%SY_FDC%");
         pjallls = projectService.selectByExample(projectExample);
 
         if (!pjallls.isEmpty()) {

web/monitor-web-hbnew/src/main/java/com/gyee/frame/controller/monitor/GenreSetPushController.java

@@ -13,7 +13,6 @@ import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
@@ -44,6 +43,7 @@ public class GenreSetPushController {
     private AgcService agcService;
     @Resource
     private ForecastwindspeedService forecastwindspeedService;
+
     @GetMapping("/getAgcValues")
     @ResponseBody
     @ApiOperation(value = "获取AGC信息", notes = "获取AGC信息")

web/monitor-web-hbnew/src/main/java/com/gyee/frame/service/websocket/GenreSetPushService.java

@@ -800,10 +800,20 @@ public class GenreSetPushService {
                         mxztmap.put("jrts", 0.0);
                     }
 
-                }else if (id.endsWith("GDC")){
+                }else if (id.endsWith("GDC") || InitialRunner.pjmap.containsKey(id) || InitialRunner.lnmap.containsKey(id)){
                     List<String> gfzbls = new ArrayList<>();
+                    List<Windturbine> wtls =null;
+                    if(id.endsWith("GDC"))
+                    {
+                        wtls =InitialRunner.wp_wtmap.get(id);
+                    }else  if(InitialRunner.pjmap.containsKey(id))
+                    {
+                        wtls =InitialRunner.pj_wtmap.get(id);
+                    }else  if(InitialRunner.lnmap.containsKey(id))
+                    {
+                        wtls =InitialRunner.ln_wtmap.get(id);
+                    }
 
-                    List<Windturbine> wtls = InitialRunner.wp_wtmap.get(id);
                     for(Windturbine wt:wtls) {
                         //状态
                         gfzbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(), Constant.FJZT).getCode());

web/monitor-web-hbnew/src/main/java/com/gyee/frame/util/golden/EdosUtil.java

@@ -756,7 +756,7 @@ public class EdosUtil implements IRealTimeDataBaseUtil {
                     idls.add(str);
                 }
             }
-            if(!idls.isEmpty()   )
+            if(!idls.isEmpty())
             {
                 String pointIdString = StringUtil.join(idls.toArray(), ",");
                 Optional<String> keys = Optional.ofNullable(pointIdString);

web/monitor-web-hbnew/src/main/resources/application.yml

@@ -27,8 +27,8 @@ gyee:
   rollVerification: true
   #实时数据库Url
   #baseurl: http://10.0.118.73:8011/ts
-  #baseurl: http://10.83.68.205:8011/ts
-  baseurl: http://192.168.2.205:8011/ts
+  #baseurl: http://10.83.68.97:8011/ts
+  baseurl: http://192.168.2.216:8011/ts
 
   #API访问ip
   #swaggerip: 49.4.50.80:8082