山西后台修改

web/gdsx-ghost/src/main/java/com/gyee/ghost/service/auto/GhostService.java

@@ -481,49 +481,66 @@ public class GhostService {
 
     public List<Object> freedomList(String wtid, Long beginDate, Long endDate, Integer interval, String uniformcodes) throws Exception {
         String[] codes = uniformcodes.split(",");
-        Map<String, Map<String, Windturbinetestingpointai>> wtpAimap = CacheContext.wtpAimap;
-
-        Map<String, Windturbinetestingpointai> windturbinetestingpointaiMap = wtpAimap.get(wtid);
 
+        String[] wtids = wtid.split(",");
 
         List<Object> resultList = new ArrayList<>();
 
-        Map<String,List<PointData>> pointDataMap = new HashMap<>();
-        for (int i =0;i<codes.length;i++){
-            Windturbinetestingpointai windturbinetestingpointai = windturbinetestingpointaiMap.get(StringUtils.upperCase(codes[i]));
-            if (StringUtils.isNotNull(windturbinetestingpointai)){
-                try {
-                    List<PointData> historyDatas = edosUtil.getHistoryDatasSnap(windturbinetestingpointai, beginDate / 1000, endDate / 1000, null, interval * 60l);
-                    pointDataMap.put(codes[i],historyDatas);
-                } catch (Exception e) {
-                    e.printStackTrace();
+        for(int x=0;x<wtids.length;x++)
+        {
+            Map<String, Map<String, Windturbinetestingpointai>> wtpAimap = CacheContext.wtpAimap;
+
+            Map<String, Windturbinetestingpointai> windturbinetestingpointaiMap = wtpAimap.get(wtids[x]);
+
+
+
+
+            Map<String,List<PointData>> pointDataMap = new HashMap<>();
+            for (int i =0;i<codes.length;i++){
+                Windturbinetestingpointai windturbinetestingpointai = windturbinetestingpointaiMap.get(StringUtils.upperCase(codes[i]));
+                if (StringUtils.isNotNull(windturbinetestingpointai)){
+                    try {
+                        List<PointData> historyDatas = edosUtil.getHistoryDatasSnap(windturbinetestingpointai, beginDate / 1000, endDate / 1000, null, interval * 60l);
+                        pointDataMap.put(codes[i],historyDatas);
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
                 }
+
             }
 
-        }
+            List<PointData> pointData = pointDataMap.get(codes[0]);
+            if (StringUtils.isNotNull(pointData)){
+                for (int i = 0;i<pointData.size();i++){
+                    InitVo initVo = new InitVo();
+                    initVo.setWtid(wtids[x]);
+                    initVo.setWtname(CacheContext.wtmap.get(wtids[x]).getCode());
+                    LinkedHashMap addMap = new LinkedHashMap();
+                    LinkedHashMap addValMap = new LinkedHashMap();
+
+                    addMap.put("time", Class.forName("java.lang.Long"));
+                    addValMap.put("time", pointData.get(i).getPointTime()*1000);
+
+                    for (int j=0;j<codes.length;j++){
+                        addMap.put(StringUtils.upperCase(codes[j]), Class.forName("java.lang.Double"));
+
+                        if(StringUtils.empty(pointDataMap.get(codes[j])) || StringUtils.empty(pointDataMap.get(codes[j]).get(i)))
+                        {
+                            addValMap.put(StringUtils.upperCase(codes[j]), null);
+                        }else
+                        {
+                            addValMap.put(StringUtils.upperCase(codes[j]), DoubleUtils.keepPrecision(pointDataMap.get(codes[j]).get(i).getPointValueInDouble(),2));
+                        }
 
-        List<PointData> pointData = pointDataMap.get(codes[0]);
-        if (StringUtils.isNotNull(pointData)){
-            for (int i = 0;i<pointData.size();i++){
-                InitVo initVo = new InitVo();
-                initVo.setWtid(wtid);
-                initVo.setWtname(CacheContext.wtmap.get(wtid).getCode());
-                LinkedHashMap addMap = new LinkedHashMap();
-                LinkedHashMap addValMap = new LinkedHashMap();
-
-                addMap.put("time", Class.forName("java.lang.Long"));
-                addValMap.put("time", pointData.get(i).getPointTime()*1000);
-
-                for (int j=0;j<codes.length;j++){
-                    addMap.put(StringUtils.upperCase(codes[j]), Class.forName("java.lang.Double"));
-                    addValMap.put(StringUtils.upperCase(codes[j]), DoubleUtils.keepPrecision(pointDataMap.get(codes[j]).get(i).getPointValueInDouble(),2));
+                    }
+                    Object o = new ClassUtil().dynamicClass(initVo, addMap, addValMap);
+                    resultList.add(o);
                 }
-                Object o = new ClassUtil().dynamicClass(initVo, addMap, addValMap);
-                resultList.add(o);
             }
         }
 
 
+
         return resultList;
     }
 

web/gdsx-ghost/src/main/resources/application-dev.yml

@@ -46,7 +46,7 @@ spring:
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: oracle.jdbc.OracleDriver
     #外网
-    url: jdbc:oracle:thin:@11.0.118.57:1521:gdsj
+    url: jdbc:oracle:thin:@11.0.118.62:1521:gdsj
     username: gdprod
     password: gd123
     oracle-schema=:

web/gdsx-ghost/src/main/resources/application.yml

@@ -1,4 +1,4 @@
 spring:
   profiles:
-#    active: dev
-    active: test
+    active: dev
+#    active: test