From 57eebe38dbae1a057e3e0678b8523a58d7f68c14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=95=B8=E9=9D=9E?= <8153694@qq.com>
Date: Fri, 11 Apr 2025 14:32:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B6=88=E6=81=AF=E5=8F=91?=
=?UTF-8?q?=E9=80=81=E7=B3=BB=E7=BB=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../xhx/common/code/AppSourceEnum.java | 66 +++++++++++++++++++
.../task/SyncAppointWaitAndFinTaskImpl.java | 2 +-
.../impl/MessageConfigServiceImpl.java | 26 +++++++-
3 files changed, 92 insertions(+), 2 deletions(-)
create mode 100644 portal-manager/src/main/java/com/mortals/xhx/common/code/AppSourceEnum.java
diff --git a/portal-manager/src/main/java/com/mortals/xhx/common/code/AppSourceEnum.java b/portal-manager/src/main/java/com/mortals/xhx/common/code/AppSourceEnum.java
new file mode 100644
index 00000000..e8ce30fb
--- /dev/null
+++ b/portal-manager/src/main/java/com/mortals/xhx/common/code/AppSourceEnum.java
@@ -0,0 +1,66 @@
+package com.mortals.xhx.common.code;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+* 娑堟伅绫诲瀷(绛夊緟瓒呮椂棰勮锛屽姙鐞嗚秴鏃堕璀︼紝宸瘎棰勮)鏋氫妇绫�
+*
+* @author zxfei
+*/
+public enum AppSourceEnum {
+ 绛夊緟瓒呮椂棰勮("绛夊緟瓒呮椂棰勮", "鎺掑彿绯荤粺"),
+ 鍔炵悊瓒呮椂棰勮("鍔炵悊瓒呮椂棰勮", "鎺掑彿绯荤粺"),
+ 宸瘎棰勮("宸瘎棰勮", "璇勪环绯荤粺");
+ private String value;
+ private String desc;
+
+ AppSourceEnum(String value, String desc) {
+ this.value = value;
+ this.desc = desc;
+ }
+
+ public String getValue() {
+ return this.value;
+ }
+
+ public String getDesc() {
+ return this.desc;
+ }
+
+ public static AppSourceEnum getByValue(String value) {
+ for (AppSourceEnum messageTypeEnum : AppSourceEnum.values()) {
+ if (messageTypeEnum.getValue() == value) {
+ return messageTypeEnum;
+ }
+ }
+ return null;
+ }
+
+ /**
+ * 鑾峰彇Map闆嗗悎
+ *
+ * @param eItem 涓嶅寘鍚」
+ * @return
+ */
+ public static Map<String, String> getEnumMap(String... eItem) {
+ Map<String, String> resultMap = new LinkedHashMap<>();
+ for (AppSourceEnum item : AppSourceEnum.values()) {
+ try {
+ boolean hasE = false;
+ for (String e : eItem) {
+ if (item.getValue() == e) {
+ hasE = true;
+ break;
+ }
+ }
+ if (!hasE) {
+ resultMap.put(item.getValue() + "", item.getDesc());
+ }
+ } catch (Exception ex) {
+
+ }
+ }
+ return resultMap;
+ }
+}
\ No newline at end of file
diff --git a/portal-manager/src/main/java/com/mortals/xhx/daemon/task/SyncAppointWaitAndFinTaskImpl.java b/portal-manager/src/main/java/com/mortals/xhx/daemon/task/SyncAppointWaitAndFinTaskImpl.java
index 0266c486..cfde020f 100644
--- a/portal-manager/src/main/java/com/mortals/xhx/daemon/task/SyncAppointWaitAndFinTaskImpl.java
+++ b/portal-manager/src/main/java/com/mortals/xhx/daemon/task/SyncAppointWaitAndFinTaskImpl.java
@@ -239,7 +239,7 @@ public class SyncAppointWaitAndFinTaskImpl implements ITaskExcuteService {
//涓氬姟:XX,娴佹按鍙�:XX,绐楀彛:XX,宸ヤ綔浜哄憳:XX,宸插姙鐞嗚秴鏃�
String alarmContent = String.format("涓氬姟:%s,娴佹按鍙�:%s,绐楀彛:%s,宸ヤ綔浜哄憳:%s,鍔炵悊鏃堕棿涓�%.1f鍒嗛挓锛岃秴杩囦簡骞冲潎鍔炵悊鏃堕暱%.1f鍒嗛挓!",
item.getBussinessName(), item.getQueueNo(),
- item.getWindowName(), item.getWorkman(),
+ item.getWindowNum(), item.getWorkman(),
doTime, upTime);
MessageTaskEntity messageTaskEntity = new MessageTaskEntity();
messageTaskEntity.initAttrValue();
diff --git a/portal-manager/src/main/java/com/mortals/xhx/module/message/service/impl/MessageConfigServiceImpl.java b/portal-manager/src/main/java/com/mortals/xhx/module/message/service/impl/MessageConfigServiceImpl.java
index 7c045880..a604fafa 100644
--- a/portal-manager/src/main/java/com/mortals/xhx/module/message/service/impl/MessageConfigServiceImpl.java
+++ b/portal-manager/src/main/java/com/mortals/xhx/module/message/service/impl/MessageConfigServiceImpl.java
@@ -1,5 +1,7 @@
package com.mortals.xhx.module.message.service.impl;
import com.mortals.framework.model.PageInfo;
+import com.mortals.xhx.common.code.AppSourceEnum;
+import com.mortals.xhx.common.code.MessageTypeEnum;
import org.springframework.beans.BeanUtils;
import java.util.function.Function;
import org.springframework.stereotype.Service;
@@ -10,6 +12,8 @@ import com.mortals.xhx.module.message.dao.MessageConfigDao;
import com.mortals.xhx.module.message.model.MessageConfigEntity;
import com.mortals.xhx.module.message.service.MessageConfigService;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.util.ObjectUtils;
+
/**
* MessageConfigService
* 娑堟伅鍙戦€侀厤缃� service瀹炵幇
@@ -20,5 +24,25 @@ import lombok.extern.slf4j.Slf4j;
@Service("messageConfigService")
@Slf4j
public class MessageConfigServiceImpl extends AbstractCRUDServiceImpl<MessageConfigDao, MessageConfigEntity, Long> implements MessageConfigService {
-
+
+
+ @Override
+ protected void saveBefore(MessageConfigEntity entity, Context context) throws AppException {
+ updateAppName(entity);
+ super.saveBefore(entity, context);
+ }
+
+ @Override
+ protected void updateBefore(MessageConfigEntity entity, Context context) throws AppException {
+ updateAppName(entity);
+ }
+
+ private void updateAppName(MessageConfigEntity entity) {
+ AppSourceEnum appSourceEnum = AppSourceEnum.getByValue(entity.getMessageType());
+ if(!ObjectUtils.isEmpty(appSourceEnum)){
+ entity.setAppName(appSourceEnum.getDesc());
+ }
+ }
+
+
}
\ No newline at end of file
--
2.24.3