root/wuHanXinRui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mdf:播报字段修改3

Browse Source
This commit is contained in:
zhangzhiqiang
2022-11-24 09:34:57 +08:00
parent 30eb5ad0f2
commit 1c820ee794
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/bigscreen/service/impl/DeviceBigScreenServiceImpl.java
View File

@@ -541,7 +541,7 @@ public class DeviceBigScreenServiceImpl implements DeviceBigScreenService {
for(int i=0;i<resultJSONArray.size();i++){ for(int i=0;i<resultJSONArray.size();i++){
JSONObject jo = resultJSONArray.getJSONObject(i); JSONObject jo = resultJSONArray.getJSONObject(i);
String repair_code = jo.getString("repair_code"); String repair_code = jo.getString("repair_code");
jo.put("needcast","0"); jo.put("needCast","0");
if(repair_code.contains("BXD")){ if(repair_code.contains("BXD")){
String id = jo.getString("id"); String id = jo.getString("id");
JSONObject jonow = EM_BI_DeviceRepairRequest.query("request_id='"+id+"'").uniqueResult(0); 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"); String warn_time = jonow.getString("warn_time");
if(StrUtil.isEmpty(process_id)){ if(StrUtil.isEmpty(process_id)){
if(StrUtil.isEmpty(warn_time)){ if(StrUtil.isEmpty(warn_time)){
jo.put("needcast","1"); jo.put("needCast","1");
}else{ }else{
Date warn_date = DateUtil.parse(warn_time); Date warn_date = DateUtil.parse(warn_time);
//毫秒数 = 当前时间-上次播报时间 //毫秒数 = 当前时间-上次播报时间
@@ -558,7 +558,7 @@ public class DeviceBigScreenServiceImpl implements DeviceBigScreenService {
// 10*60*1000 10分钟 // 10*60*1000 10分钟
long min_10 = 10*60*1000; long min_10 = 10*60*1000;
if(ms >= min_10){ if(ms >= min_10){
jo.put("needcast","1"); jo.put("needCast","1");
} }
} }
} }

3
mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/wql/TASK_AUTOWEBSOCKETTSK.wql
View File

@@ -261,7 +261,6 @@
QUERY QUERY
SELECT SELECT
mst.repair_id as id, mst.repair_id as id,
false as needcast,
mst.input_time AS input_time, mst.input_time AS input_time,
mst.repair_code AS repair_code, mst.repair_code AS repair_code,
( (
@@ -315,7 +314,6 @@
SELECT SELECT
st.request_id AS id, st.request_id AS id,
false AS needcast,
st.create_time AS input_time, st.create_time AS input_time,
st.request_code AS repair_code, st.request_code AS repair_code,
class.class_name AS maintenancecycle, class.class_name AS maintenancecycle,
@@ -378,7 +376,6 @@
SELECT SELECT
mst.maint_id as id, mst.maint_id as id,
false as needcast,
mst.input_time AS input_time, mst.input_time AS input_time,
mst.maint_code AS repair_code, mst.maint_code AS repair_code,
( (