From 1c820ee794944a3686e2f1245b716a93b4d605b1 Mon Sep 17 00:00:00 2001
From: zhangzhiqiang <zhangzhiqiang@yoycol.com>
Date: Thu, 24 Nov 2022 09:34:57 +0800
Subject: [PATCH] =?UTF-8?q?mdf:=E6=92=AD=E6=8A=A5=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bigscreen/service/impl/DeviceBigScreenServiceImpl.java  | 6 +++---
 .../java/org/nl/wms/sb/stat/wql/TASK_AUTOWEBSOCKETTSK.wql   | 3 ---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/bigscreen/service/impl/DeviceBigScreenServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/bigscreen/service/impl/DeviceBigScreenServiceImpl.java
index 4775d8c3..c753caa1 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/bigscreen/service/impl/DeviceBigScreenServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/bigscreen/service/impl/DeviceBigScreenServiceImpl.java
@@ -541,7 +541,7 @@ public class DeviceBigScreenServiceImpl implements DeviceBigScreenService {
         for(int i=0;i<resultJSONArray.size();i++){
             JSONObject jo = resultJSONArray.getJSONObject(i);
             String repair_code = jo.getString("repair_code");
-            jo.put("needcast","0");
+            jo.put("needCast","0");
             if(repair_code.contains("BXD")){
                 String id = jo.getString("id");
                 JSONObject jonow = EM_BI_DeviceRepairRequest.query("request_id='"+id+"'").uniqueResult(0);
@@ -550,7 +550,7 @@ public class DeviceBigScreenServiceImpl implements DeviceBigScreenService {
                     String warn_time = jonow.getString("warn_time");
                     if(StrUtil.isEmpty(process_id)){
                         if(StrUtil.isEmpty(warn_time)){
-                            jo.put("needcast","1");
+                            jo.put("needCast","1");
                         }else{
                             Date warn_date = DateUtil.parse(warn_time);
                             //毫秒数 = 当前时间-上次播报时间
@@ -558,7 +558,7 @@ public class DeviceBigScreenServiceImpl implements DeviceBigScreenService {
                             // 10*60*1000 10分钟
                             long min_10 = 10*60*1000;
                             if(ms >= min_10){
-                                jo.put("needcast","1");
+                                jo.put("needCast","1");
                             }
                         }
                     }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/wql/TASK_AUTOWEBSOCKETTSK.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/wql/TASK_AUTOWEBSOCKETTSK.wql
index 1e151774..3056e629 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/wql/TASK_AUTOWEBSOCKETTSK.wql
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/wql/TASK_AUTOWEBSOCKETTSK.wql
@@ -261,7 +261,6 @@
 		QUERY
 			SELECT
 			    mst.repair_id as id,
-			    false as needcast,
 			    mst.input_time AS input_time,
 			    mst.repair_code AS repair_code,
 			    (
@@ -315,7 +314,6 @@
 
 			SELECT
 			    st.request_id AS id,
-			    false  AS needcast,
 			    st.create_time AS input_time,
 			    st.request_code AS repair_code,
 			    class.class_name AS maintenancecycle,
@@ -378,7 +376,6 @@
 
 			SELECT
 			    mst.maint_id as id,
-			    false as needcast,
 			    mst.input_time AS input_time,
 			    mst.maint_code AS repair_code,
                 (