From 578639bf4bb9be9808d7c482345b8c35b02510b7 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期一, 18 八月 2025 17:02:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/jeecg/modules/andon/service/impl/AndonResponseConfigServiceImpl.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/andon/service/impl/AndonResponseConfigServiceImpl.java b/src/main/java/org/jeecg/modules/andon/service/impl/AndonResponseConfigServiceImpl.java
index c895470..f6f23ae 100644
--- a/src/main/java/org/jeecg/modules/andon/service/impl/AndonResponseConfigServiceImpl.java
+++ b/src/main/java/org/jeecg/modules/andon/service/impl/AndonResponseConfigServiceImpl.java
@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang.StringUtils;
+import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.andon.dto.AndonButtonDTO;
import org.jeecg.modules.andon.entity.AndonButtonConfig;
import org.jeecg.modules.andon.entity.AndonOrder;
@@ -49,10 +51,7 @@
return baseMapper.getAndonResponseConfigByFactoryIdAndButtonId(factoryId, buttonId);
}
- @Override
- public List<AndonButtonDTO> queryAndonButtonList(String factoryId) {
- return Collections.emptyList();
- }
+
@Override
public void sendAndonNotification(AndonButtonDTO andonButtonDTO) {
@@ -64,6 +63,10 @@
throw new IllegalArgumentException("璇锋眰鍙傛暟涓嶈兘涓虹┖");
}
/**
+ * 璁剧疆瀹夌伅浜�
+ */
+
+ /**
* 2. 鑾峰彇鍝嶅簲閰嶇疆
*/
AndonResponseConfig andonResponseConfig = this.getById(andonButtonDTO.getId());
@@ -73,6 +76,14 @@
log.warn("鏈壘鍒癐D涓篬{}]鐨勫畨鐏鍗�");
throw new IllegalArgumentException("鏈壘鍒板搴旂殑瀹夌伅璁㈠崟");
}
+ // 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛
+ LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ if (loginUser != null) {
+ log.warn("鏈壘鍒板綋鍓嶇敤鎴�");
+
+ }
+ assert loginUser != null;
+ andonOrder.setResponder(loginUser.getId());
String orderStatus = andonOrder.getOrderStatus();
andonButtonDTO.setOrderStatus(orderStatus);
if (andonResponseConfig == null) {
--
Gitblit v1.9.3