健康管理优化

web/health-hb/src/main/java/com/gyee/frame/common/spring/InitialRunner.java

@@ -1,8 +1,5 @@
 package com.gyee.frame.common.spring;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.alibaba.fastjson.TypeReference;
 import com.gyee.frame.common.cache.IGlobalCache;
 import com.gyee.frame.model.auto.*;
 import com.gyee.frame.service.*;
@@ -238,8 +235,10 @@ public class InitialRunner implements CommandLineRunner {
         WindpowerstationExample windpowerstationExample = new WindpowerstationExample();
         windpowerstationExample.setOrderByClause("ordernum ASC");
 
-        windpowerstationExample.createCriteria().andIdLike("%FDC%");
-
+        List<String> wpidls=new ArrayList<>();
+        WindpowerstationExample.Criteria cr=windpowerstationExample.createCriteria();
+        cr.andIdLike("%FDC%");
+        cr.andIdNotLike("%MLJ_FDC%");
 
         wpallls = windpowerstationService.selectByExample(windpowerstationExample);
         if (!wpallls.isEmpty()) {
@@ -251,6 +250,7 @@ public class InitialRunner implements CommandLineRunner {
                 	spls.add(wp);
                 }
                 wpmap.put(wp.getId(), wp);
+                wpidls.add(wp.getId());
             }
         }
 
@@ -258,7 +258,7 @@ public class InitialRunner implements CommandLineRunner {
         ProjectExample projectExample = new ProjectExample();
         projectExample.setOrderByClause("ordernum ASC");
 
-       projectExample.createCriteria().andWindpowerstationidLike("%FDC%");
+       projectExample.createCriteria().andWindpowerstationidIn(wpidls);
 
        List<String> pjidls=new ArrayList<>();
         pjallls = projectService.selectByExample(projectExample);
@@ -314,7 +314,7 @@ public class InitialRunner implements CommandLineRunner {
 
         WindturbineExample windturbineExample = new WindturbineExample();
         windturbineExample.setOrderByClause("ID ASC");
-        windturbineExample.createCriteria().andWindpowerstationidLike("%FDC%");
+        windturbineExample.createCriteria().andWindpowerstationidIn(wpidls);
         wtallls = windturbineService.selectByExample(windturbineExample);
 
         if (!wtallls.isEmpty()) {