From e8bccfced16756589046f7f6fbffb79891270ba2 Mon Sep 17 00:00:00 2001 From: zhouz <> Date: Wed, 3 Jul 2024 15:36:33 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=8F=91=E9=80=81=E6=95=B0=E5=AD=97?= =?UTF-8?q?=E5=AD=AA=E7=94=9F=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/ext/szls/service/impl/LmsToBigScreenServiceImpl.java | 3 +++ lms/nladmin-system/src/main/java/org/nl/wms/sch/AcsUtil.java | 4 +--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/szls/service/impl/LmsToBigScreenServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/szls/service/impl/LmsToBigScreenServiceImpl.java index 4b8ce6f29..da45ed1e8 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/szls/service/impl/LmsToBigScreenServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/szls/service/impl/LmsToBigScreenServiceImpl.java @@ -32,6 +32,9 @@ public class LmsToBigScreenServiceImpl implements LmsToBigScreenService { JSONObject json = new JSONObject(); for (URLEnum url : URLEnum.values()) { String product_area = url.getProduct_area(); + if (product_area.equals("BLK") || product_area.equals("B2")) { + continue; + } 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")); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/AcsUtil.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/AcsUtil.java index 7b7bd1623..79a096006 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/AcsUtil.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/AcsUtil.java @@ -117,9 +117,7 @@ public class AcsUtil { throw new BadRequestException("未查询到区域对应的acs地址！"); } - //String url = acs_url + api; - //String url ="10.1.3.96:8011/"+ api; - String url ="10.21.1.196:8011/"+ api; + String url = acs_url + api; try { String resultMsg = HttpRequest.post(url) .body(String.valueOf(list))