From 796a586ef2e589b1b99ed5192a2a74315bfda66e Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期一, 18 十一月 2024 13:30:01 +0800 Subject: [PATCH] # --- src/main/resources/mapper/WrkMastMapper.xml | 4 ++-- src/main/java/com/zy/common/web/WcsController.java | 27 ++++++++++++++++++++++++--- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java index 2690163..6107b1f 100644 --- a/src/main/java/com/zy/common/web/WcsController.java +++ b/src/main/java/com/zy/common/web/WcsController.java @@ -1,5 +1,6 @@ package com.zy.common.web; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.mapper.Wrapper; import com.core.common.Cools; @@ -10,6 +11,7 @@ import com.zy.asrs.entity.result.KeyValueVo; import com.zy.asrs.service.*; import com.zy.common.CodeRes; +import com.zy.common.config.WebSocketServer; import com.zy.common.model.LocTypeDto; import com.zy.common.model.StartupDto; import com.zy.common.service.CommonService; @@ -20,9 +22,7 @@ import org.springframework.transaction.interceptor.TransactionAspectSupport; import org.springframework.web.bind.annotation.*; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; +import java.util.*; import java.util.stream.Collectors; /** @@ -53,6 +53,27 @@ private WorkService workService; @Autowired private StaDescService staDescService; + @Autowired + private WebSocketServer webSocketServer; + + @PostMapping("/led/getError") + @ResponseBody + public synchronized R getLocNo(@RequestBody Map<String, String> param) { + String sta = param.get("sta"); + String message = param.get("msg"); + if (Cools.isEmpty(sta) || Cools.isEmpty(message)) { + return R.error(); + } + Map<String,Object> map=new HashMap<String, Object>(); + + map.put("to",sta); + map.put("message",Cools.add("type", "error").add("errMsg",message)); + webSocketServer.onMessage(JSONObject.toJSONString(map),null,sta); + + + return R.ok(); + + } @Transactional diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml index 54d0dbf..2272b9a 100644 --- a/src/main/resources/mapper/WrkMastMapper.xml +++ b/src/main/resources/mapper/WrkMastMapper.xml @@ -70,8 +70,8 @@ select * from asr_wrk_mast where wrk_sts=5 or (wrk_sts=15 and ove_mk='Y' and wrk_no not in (select wrk_no from asr_bas_devp)) - or (wrk_sts=15 and (dateadd(mi,5,crn_end_time) <= getdate() or dateadd(mi,1,modi_time) <= getdate()) and wrk_no not in (select wrk_no from asr_bas_devp)) - or (wrk_sts=15 and (dateadd(mi,5,crn_end_time) <= getdate() or dateadd(mi,1,modi_time) <= getdate()) and crn_end_time is null and wrk_no not in (select wrk_no from asr_bas_devp)) + or (wrk_sts=15 and (dateadd(mi,15,crn_end_time) <= getdate()) and wrk_no not in (select wrk_no from asr_bas_devp)) + or (wrk_sts=15 and (dateadd(mi,15,crn_end_time) <= getdate()) and crn_end_time is null and wrk_no not in (select wrk_no from asr_bas_devp)) order by io_time,wrk_no asc </select> -- Gitblit v1.9.1