Browse Source

健康管理功能修改

shilin 1 year ago
parent
commit
39e1552df3

+ 2 - 1
web/health/src/main/java/com/gyee/health/init/CacheContext.java

@@ -190,7 +190,8 @@ public class CacheContext implements CommandLineRunner {
         //       wptempls.stream().filter(i->i.getId().equals("FS_FDC")).forEach(i->{
         wptempls.stream().forEach(i->{
 
-            if(!i.getId().contains("GDC") && !i.getId().contains("MLJ"))
+//            if(!i.getId().contains("GDC") && !i.getId().contains("MLJ"))
+            if(!i.getId().contains("MLJ"))
             {
                 wpls.add(i);
                 wpmap.put(i.getId(),i);

+ 5 - 5
web/health/src/main/java/com/gyee/health/service/health/HealthMainService.java

@@ -334,7 +334,7 @@ public class HealthMainService {
 
             String wpId = wp.getId();
 
-            if (wpId.contains("FDC")) {
+//            if (wpId.contains("FDC")) {
 
                 double tqyb = 1.0;// 天气预报
                 double ycfs = 0.0;// 预测风速
@@ -542,7 +542,7 @@ public class HealthMainService {
                 wpmap.put("gzd", gzd);
                 wpmap.put("gzId", gzIdLs);
                 wpmapls.add(wpmap);
-            }
+//            }
 
         }
         map.put("wpmap", wpmapls);
@@ -576,7 +576,7 @@ public class HealthMainService {
         List<Map<String, String>> gzls = new ArrayList<>();
         if (StringUtils.notEmp(wpId) && CacheContext.wpmap.containsKey(wpId)) {
 
-            if (wpId.contains("FDC")) {
+//            if (wpId.contains("FDC")) {
                 int ysl = 0;// 优数量
                 int lsl = 0;// 良数量
                 int csl = 0;// 差数量
@@ -940,8 +940,8 @@ public class HealthMainService {
                 map.put("gzls", gzls);
 
 
-            }
-        }
+//             }
+       }
 
         return map;
     }