代码优化

power-fitting-JN/src/main/java/com.gyee.power.fitting/MapperGenerator.java

@@ -40,8 +40,8 @@ public class MapperGenerator {
 //    private static String password = "";
 
     private static String driverName = "org.postgresql.Driver";
-    private static String url = "jdbc:postgresql://10.81.3.151:5432/IMS_NEM_JN";
-    private static String username = "postgres";
+    private static String url = "jdbc:postgresql://10.81.3.151:5432/wisdom";
+    private static String username = "gdprod";
     private static String password = "gd123";
 
 //    private static String driverName = "oracle.jdbc.driver.OracleDriver";

power-fitting-JN/src/main/java/com.gyee.power.fitting/service/custom/curve/DataPrepareService.java

@@ -66,7 +66,7 @@ public class DataPrepareService {
 
                 for (int i = 0; i < points.size(); i++){
                     ProBasicEquipmentPoint point = collect.get(points.get(i)).get(0);
-                    log.info("测点：" + point.getId() + "----" + point.getName());
+                    log.info("测点：" + point.getNemCode() + "----" + point.getName());
                     List<TsDoubleData> data = remoteService.adapterfd().getHistorySnap(point.getNemCode(), st, et, interval);
                     if (data == null || data.size() < 0)
                         break;
@@ -152,7 +152,12 @@ public class DataPrepareService {
             sb.append(DateUtil.format(data.get(i).getTs(), DateUtil.DATE_TIME_PATTERN)).append(",");
             sb.append(data.get(i).getDoubleValue()).append(",");
             for (int j = 1; j < list.size(); j++){
-                sb.append(list.get(j).get(i).getDoubleValue()).append(",");
+
+                if(null != list.get(j) && list.get(j).size()>0){
+                    sb.append(list.get(j).get(i).getDoubleValue()).append(",");
+                }else {
+                    sb.append(0).append(",");
+                }
             }
             sb.deleteCharAt(sb.lastIndexOf(","));
             sb.append("\n");