From 14943f4a30e027dcf8956272192666524a851eff Mon Sep 17 00:00:00 2001
From: Houjie <714924425@qq.com>
Date: 星期一, 18 八月 2025 20:31:00 +0800
Subject: [PATCH] 安灯发起、安灯处理 安灯响应
---
src/main/java/org/jeecg/modules/feishu/service/FeishuUserService.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/feishu/service/FeishuUserService.java b/src/main/java/org/jeecg/modules/feishu/service/FeishuUserService.java
index 92d6b09..4492d4d 100644
--- a/src/main/java/org/jeecg/modules/feishu/service/FeishuUserService.java
+++ b/src/main/java/org/jeecg/modules/feishu/service/FeishuUserService.java
@@ -5,7 +5,7 @@
import org.jeecg.common.util.PasswordUtil;
import org.jeecg.common.util.RestUtil;
import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.andon.dto.AndonButtonDTO;
+import org.jeecg.modules.andon.dto.AndonOrdeDto;
import org.jeecg.modules.mes.entity.FeishuUser;
import org.jeecg.modules.system.entity.SysUser;
import org.jeecg.modules.system.service.ISysUserService;
@@ -139,7 +139,7 @@
* 2. 涓�绾у搷搴旀椂闀垮悗妫�鏌ョ姸鎬侊紝鏈鐞嗗垯鍙戦�佷簩绾�
* 3. 浜岀骇鍝嶅簲鏃堕暱鍚庢鏌ョ姸鎬侊紝鏈鐞嗗垯鍙戦�佷笁绾�
*/
- public boolean sendAndonNotification(String accessToken, AndonButtonDTO andonOrde) {
+ public boolean sendAndonNotification(String accessToken, AndonOrdeDto andonOrde) {
try {
String currentTime = sdf.format(new Date());
log.info("銆恵}銆戣Е鍙戜竴绾у搷搴旓紙鍒濈骇鍝嶅簲锛夛紝瀹夌伅ID: {}", currentTime, andonOrde.getId());
@@ -178,7 +178,7 @@
* 鍙戦�佹寚瀹氱骇鍒殑閫氱煡
* @param level 1-涓�绾э紝2-浜岀骇锛�3-涓夌骇
*/
- private boolean sendLevelNotification(String accessToken, AndonButtonDTO andonOrde, int level) {
+ private boolean sendLevelNotification(String accessToken, AndonOrdeDto andonOrde, int level) {
try {
String levelDesc = getLevelDesc(level);
String openId = getResponderOpenId(andonOrde, level);
@@ -250,7 +250,7 @@
* @param currentLevel 褰撳墠绾у埆
* @param delayMinutes 寤惰繜鍒嗛挓鏁帮紙鐢卞綋鍓嶇骇鍒搷搴旀椂闀垮喅瀹氾級
*/
- private void scheduleNextLevelNotification(String accessToken, AndonButtonDTO andonOrde, int currentLevel, int delayMinutes) {
+ private void scheduleNextLevelNotification(String accessToken, AndonOrdeDto andonOrde, int currentLevel, int delayMinutes) {
int nextLevel = currentLevel + 1;
if (nextLevel > 3) {
log.info("宸插埌杈炬渶楂樼骇鍒�氱煡锛屾棤闇�缁х画璋冨害锛屽畨鐏疘D: {}", andonOrde.getId());
@@ -306,7 +306,7 @@
/**
* 鏋勫缓閫氱煡鍐呭锛堜紭鍖栧垎闅旂锛屾彁鍗囧彲璇绘�э級
*/
- private String buildNotificationContent(AndonButtonDTO andonOrde, int level) {
+ private String buildNotificationContent(AndonOrdeDto andonOrde, int level) {
// 鑾峰彇宸ュ巶鍚嶇О鍜屼骇绾垮悕绉帮紝鍋氱┖鍊间繚鎶�
String parentFactoryName = andonOrde.getParentFactoryName() != null ? andonOrde.getParentFactoryName() : "鏈煡宸ュ巶";
String factoryName = andonOrde.getFactoryName() != null ? andonOrde.getFactoryName() : "鏈煡浜х嚎";
@@ -358,7 +358,7 @@
/**
* 楠岃瘉閫氱煡鐩稿叧鍙傛暟
*/
- private boolean validateNotificationParams(AndonButtonDTO andonOrde) {
+ private boolean validateNotificationParams(AndonOrdeDto andonOrde) {
if (andonOrde == null) {
log.error("瀹夌伅璁㈠崟淇℃伅涓虹┖");
return false;
@@ -401,7 +401,7 @@
}
// 宸ュ叿鏂规硶锛氳幏鍙栧搷搴斾汉openId
- private String getResponderOpenId(AndonButtonDTO andonOrde, int level) {
+ private String getResponderOpenId(AndonOrdeDto andonOrde, int level) {
switch (level) {
case 1: return andonOrde.getResponderOpenId();
case 2: return andonOrde.getSecondResponderOpenId();
@@ -411,7 +411,7 @@
}
// 宸ュ叿鏂规硶锛氳幏鍙栧搷搴斾汉鍚嶇О
- private String getResponderName(AndonButtonDTO andonOrde, int level) {
+ private String getResponderName(AndonOrdeDto andonOrde, int level) {
String name = null;
switch (level) {
case 1:
@@ -430,7 +430,7 @@
}
// 宸ュ叿鏂规硶锛氳幏鍙栧搷搴旀椂闀匡紙涓�绾�=浜岀骇寤惰繜锛屼簩绾�=涓夌骇寤惰繜锛�
- private int getResponseDuration(AndonButtonDTO andonOrde, int level) {
+ private int getResponseDuration(AndonOrdeDto andonOrde, int level) {
int duration = 0;
switch (level) {
case 1:
@@ -449,7 +449,7 @@
}
// 宸ュ叿鏂规硶锛氬垽鏂寚瀹氱骇鍒搷搴斾汉鏄惁鏈夋晥
- private boolean hasValidResponder(AndonButtonDTO andonOrde, int level) {
+ private boolean hasValidResponder(AndonOrdeDto andonOrde, int level) {
String openId = getResponderOpenId(andonOrde, level);
return openId != null && !openId.isEmpty();
}
--
Gitblit v1.9.3