修改增加经编正向电能数据

jjt-admin/src/main/resources/application-prod.yml

@@ -2,7 +2,7 @@ local:
   rzCompare: D:\twin\service\rzCompare.json
 mssql:
   driver: com.microsoft.sqlserver.jdbc.SQLServerDriver
-  url: jdbc:sqlserver://192.168.33.153:1433;databaseName=WMS_V2_1
+  url: jdbc:sqlserver://wmsdb.tlct.com.cn:1433;databaseName=WMS_V2_1
   user: MES
   pass: MES
 # 数据源配置

jjt-biz/src/main/java/com/jjt/utils/AsyncService.java

@@ -45,7 +45,7 @@ public class AsyncService {
             "Alarm_unit_2", "Alarm_unit_20", "Alarm_unit_21", "Alarm_unit_22", "Alarm_unit_23",
             "Alarm_unit_24", "Alarm_unit_25", "Alarm_unit_26", "Alarm_unit_27", "Alarm_unit_3",
             "Alarm_unit_4", "Alarm_unit_5", "Alarm_unit_6", "Alarm_unit_7", "Alarm_unit_8",
-            "Alarm_unit_9", "Formula_data_36"
+            "Alarm_unit_9", "Formula_data_36", "Capacity_data_34"
     };
 
     /**
@@ -247,12 +247,16 @@ public class AsyncService {
         for (int i = 0; i < values.size(); i++) {
             JSONArray da = values.getJSONArray(i);
             //当前时间数据 米长，正向电能，牵拉密度 2025-06-19 取消电量计算没必要了
-            //0.米长 1.已废弃 2.密度 3.规格
+            //0.米长 1.电量 2.密度 3.规格
             //增加判断米长为空的数据
             if (StringUtils.isEmpty(da.getStr(fieldList.indexOf("Capacity_data_2")))) {
                 continue;
             }
-            float[] curr = {da.getFloat(fieldList.indexOf("Capacity_data_2")), 0f, da.getFloat(fieldList.indexOf("Formula_data_24"))};
+            float eff = 0f;
+            if (flag) {
+                eff = da.getFloat(fieldList.indexOf("Capacity_data_34"));
+            }
+            float[] curr = {da.getFloat(fieldList.indexOf("Capacity_data_2")), eff, da.getFloat(fieldList.indexOf("Formula_data_24"))};
             String spec = da.getStr(fieldList.indexOf("Formula_data_36"));
             int curr48 = da.getInt(fieldList.indexOf("Capacity_data_48"));
 
@@ -309,6 +313,8 @@ public class AsyncService {
         //还是只计算米长
         calcTotal(0, last, first, total, lastMkz, coefficient);
         calcSpec(total[0], lastSpecLength, last[2], lastMkz, lastHeight, lastSpec, specList);
+        //计算电量
+        total[1] = last[1] - first[1];
         total[3] = 3600 - total[4];
         total[5] = lastHeight;
         Map<String, Object> result = new HashMap<>(16);