From 7856b00d126f8859f1e39b2e15fefe2040455dde Mon Sep 17 00:00:00 2001 From: "ZHOUZ\\Noble'lift" <1014987728@qq.com> Date: Wed, 27 Jul 2022 17:04:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DeviceScreenServiceImpl.java | 7 ++++++- .../wms/ext/bigScreen/wql/QDEVICE_SCREEN.wql | 18 ++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/impl/DeviceScreenServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/impl/DeviceScreenServiceImpl.java index f2a3ab02..b6682cd2 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/impl/DeviceScreenServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/impl/DeviceScreenServiceImpl.java @@ -325,6 +325,11 @@ public class DeviceScreenServiceImpl implements DeviceScreenService { @Override public JSONObject errCensus(JSONObject param) { - return null; + JSONArray result = WQL.getWO("QDEVICE_SCREEN").addParam("flag", "6").process().getResultJSONArray(0); + JSONObject returnjo = new JSONObject(); + returnjo.put("code", "1"); + returnjo.put("desc", "查询成功!"); + returnjo.put("result", result); + return returnjo; } } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/wql/QDEVICE_SCREEN.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/wql/QDEVICE_SCREEN.wql index f450cafe..fb4bf518 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/wql/QDEVICE_SCREEN.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/wql/QDEVICE_SCREEN.wql @@ -139,6 +139,24 @@ ENDQUERY ENDIF + IF 输入.flag = "6" + QUERY + SELECT + COUNT( record_id ) AS err_times + MAX( device.device_name ) AS device_name + FROM + pdm_bi_devicerunstatusrecord run + LEFT JOIN pdm_bi_device device ON device.device_id = run.device_id + WHERE + run.status_type = '05' + AND DATE_SUB( CURDATE(), INTERVAL 30 DAY ) <= date( start_time ) + GROUP BY + run.device_id + LIMIT 10 + ENDSELECT + ENDQUERY + ENDIF +