rev:修改了设备监控表相关字段

lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/FaultDeviceServiceImpl.java

@@ -62,8 +62,8 @@ public class FaultDeviceServiceImpl implements FaultDeviceService {
         String device_code = MapUtil.getStr(whereJson, "device_code");
         String is_fault = MapUtil.getStr(whereJson, "is_fault");
         String region_code = MapUtil.getStr(whereJson, "region_code");
-        String plant_code = MapUtil.getStr(whereJson, "plant_code");
-        if (StrUtil.isEmpty(plant_code)){
+        String product_area = MapUtil.getStr(whereJson, "plant_code");
+        if (StrUtil.isEmpty(product_area)){
             throw new BadRequestException("输入的区域不能为空！");
         }
 
@@ -71,13 +71,13 @@ public class FaultDeviceServiceImpl implements FaultDeviceService {
         if (ObjectUtil.isNotEmpty(device_code)) {
             JSONObject device_jo = WQLObject.getWQLObject("EM_BI_MonitorDevice").query("device_code = '"+device_code+"'").uniqueResult(0);
             param.put("device_code",device_code);
-            param.put("product_area",device_jo.getString("plant_code"));
+            param.put("product_area",device_jo.getString("product_area"));
         } else {
             // 不为空则只需要查询专机设备
             JSONObject jsonStr = WQL.getWO("QMD_BI_FAULT").addParam("flag", "3").process().uniqueResult(0);
             String str = jsonStr.getString("str");
             param.put("device_code",str);
-            param.put("product_area",plant_code);
+            param.put("product_area",product_area);
         }
 
         // 调用acs接口获取设备
@@ -120,7 +120,7 @@ public class FaultDeviceServiceImpl implements FaultDeviceService {
             JSONObject map = new JSONObject();
             map.put("flag", "2");
             map.put("region_code", region_code);
-            map.put("plant_code", plant_code);
+            map.put("product_area", product_area);
             map.put("device_code", json.getString("device_code"));
 
             JSONObject jsonDevice = WQL.getWO("QMD_BI_FAULT").addParamMap(map).process().uniqueResult(0);

lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_BI_FAULT.wql

@@ -17,7 +17,7 @@
 	输入.fault_code					    TYPEAS s_string
 	输入.fault_type					    TYPEAS s_string
 	输入.region_code					    TYPEAS s_string
-	输入.plant_code					    TYPEAS s_string
+	输入.product_area					TYPEAS s_string
 	输入.device_code					    TYPEAS s_string
 
 [临时表]
@@ -76,8 +76,8 @@
                     region_code = 输入.region_code
                 ENDOPTION
 
-                OPTION 输入.plant_code <> ""
-                    plant_code = 输入.plant_code
+                OPTION 输入.product_area <> ""
+                    product_area = 输入.product_area
                 ENDOPTION
 
                 OPTION 输入.device_code <> ""

lms/nladmin-system/src/main/java/org/nl/wms/ext/szls/service/impl/LmsToBigScreenServiceImpl.java

@@ -36,8 +36,8 @@ public class LmsToBigScreenServiceImpl implements LmsToBigScreenService {
         JSONObject json = new JSONObject();
         for (URLEnum url : URLEnum.values()) {
             String product_area = url.getProduct_area();
-            JSONArray rows = WQLObject.getWQLObject("em_bi_monitordevice").query("send_szls = '1' AND plant_code = '" + product_area + "'").getResultJSONArray(0);
-            JSONObject device_info = wmsToAcsService.getPointStatus(rows);
+            JSONArray rows = WQLObject.getWQLObject("em_bi_monitordevice").query("send_szls = '1' AND product_area = '" + product_area + "'").getResultJSONArray(0);
+            JSONObject device_info = wmsToAcsService.getHotPointStatus(rows);
             json.put(product_area, device_info.getJSONArray("data"));
         }
         return json;
@@ -71,7 +71,7 @@ public class LmsToBigScreenServiceImpl implements LmsToBigScreenService {
                     json.put("quanlity_in_box", object.getString("quanlity_in_box"));
                     json.put("box_weight", object.getString("box_weight"));
                     JSONArray detail = new JSONArray();
-                    for (int j = 0; i < array.size(); i++) {
+                    for (int j = 0; j < array.size(); j++) {
                         JSONObject dtl = array.getJSONObject(j);
                         String container_name = dtl.getString("container_name");
                         String net_weight = dtl.getString("net_weight");
@@ -82,8 +82,8 @@ public class LmsToBigScreenServiceImpl implements LmsToBigScreenService {
                     }
                     json.put("detail", detail);
                 }
-                data.add(json);
             }
+            data.add(json);
         }
         return data;
     }