From 9dd748e0352f31b6255be2860c177db0d20ac40e Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 21 十月 2025 14:41:35 +0800
Subject: [PATCH] Merge branch 'master' into 0929-master
---
ruoyi-common/src/main/java/com/ruoyi/common/enums/MsgLSEnum.java | 45 ++++++++++++++++++++++++++++++++++++---------
1 files changed, 36 insertions(+), 9 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/MsgLSEnum.java b/ruoyi-common/src/main/java/com/ruoyi/common/enums/MsgLSEnum.java
index 5f02818..602d6d5 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/MsgLSEnum.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/enums/MsgLSEnum.java
@@ -1,9 +1,8 @@
package com.ruoyi.common.enums;
import com.ruoyi.common.utils.uuid.IdUtils;
-import com.sun.org.apache.bcel.internal.generic.NEW;
-import javax.xml.crypto.Data;
+import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
import java.util.LinkedHashMap;
@@ -15,18 +14,23 @@
* XiaoXiMC 鐭俊鍙戦��
*/
public enum MsgLSEnum {
- ZYY("47231022633110211A2101", "https://9.0.124.104:13011/mediinfo-grus-fuwuzxwg/api/esb/lyraAsyncRun", "1400360867068907520", "涓芥按甯備腑鍖婚櫌"), JN("47255004333112711A1001", null, "1400361376454545408", "鏅畞鐣叉棌鑷不鍘夸汉姘戝尰闄�");
+ ZYY("47231022633110211A2101", "https://9.0.124.104:13011/mediinfo-grus-fuwuzxwg/api/esb/lyraAsyncRun", "1400360867068907520", "涓芥按甯備腑鍖婚櫌", "2361", "閮戠弽鎱�"),
+ JN("47255004333112711A1001", null, "1400361376454545408", "鏅畞鐣叉棌鑷不鍘夸汉姘戝尰闄�", "", "");
private String orgid;
private String address;
private String ZuHuID;
private String ZuHuMC;
+ private String sendPersonId;
+ private String sendPersonName;
- MsgLSEnum(String orgid, String address, String ZuHuID, String ZuHuMC) {
+ MsgLSEnum(String orgid, String address, String ZuHuID, String ZuHuMC, String sendPersonId, String sendPersonName) {
this.orgid = orgid;
this.ZuHuID = ZuHuID;
this.ZuHuMC = ZuHuMC;
this.address = address;
+ this.sendPersonId = sendPersonId;
+ this.sendPersonName = sendPersonName;
}
public static Map<String, Object> getHeaderByCode(String orgid) {
@@ -34,16 +38,21 @@
MsgLSEnum[] organEnums = values();
for (int i = 0; i < organEnums.length; i++) {
MsgLSEnum organEnum = organEnums[i];
+ //鑾峰彇鏃堕棿
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ String formattedDate = sdf.format(new Date());
if (organEnum.getOrgid().equals(orgid)) {
map.put("XiaoXiID", IdUtils.simpleUUID());
- map.put("FaSongSJ", new Date());
+ map.put("FaSongSJ", formattedDate);
map.put("ZuHuID", organEnum.getZuHuID());
map.put("ZuHuMC", organEnum.getZuHuMC());
map.put("FaSongJGID", organEnum.getOrgid());
map.put("FaSongJGMC", organEnum.getZuHuMC());
- map.put("FaSongXTJC", "闅忚绯荤粺");
+ //map.put("FaSongXTJC", "闅忚绯荤粺");
+ map.put("FaSongXTJC", "SUIFANGXT");
map.put("FaSongXTMC", "闅忚绯荤粺");
- map.put("FaSongFCSJC", "浜ュ皵鏃�");
+ //map.put("FaSongFCSJC", "浜ュ皵鏃�");
+ map.put("FaSongFCSJC", "ZJHES");
map.put("XiaoXiLX", "FZ_PT_DuanXinFS");
map.put("XiaoXiMC", "鐭俊鍙戦��");
}
@@ -51,12 +60,16 @@
return map;
}
- public static String getAddressByCode(String orgid) {
+ public static Map<String, String> getAddressByCode(String orgid) {
MsgLSEnum[] organEnums = values();
+ Map<String, String> map = new HashMap<>();
for (int i = 0; i < organEnums.length; i++) {
MsgLSEnum organEnum = organEnums[i];
if (organEnum.getOrgid().equals(orgid)) {
- return organEnum.getAddress();
+ map.put("address", organEnum.getAddress());
+ map.put("sendPersonId", organEnum.getSendPersonId());
+ map.put("sendPersonName", organEnum.getSendPersonName());
+ return map;
}
}
return null;
@@ -94,5 +107,19 @@
ZuHuMC = zuHuMC;
}
+ public String getSendPersonId() {
+ return sendPersonId;
+ }
+ public void setSendPersonId(String sendPersonId) {
+ this.sendPersonId = sendPersonId;
+ }
+
+ public String getSendPersonName() {
+ return sendPersonName;
+ }
+
+ public void setSendPersonName(String sendPersonName) {
+ this.sendPersonName = sendPersonName;
+ }
}
--
Gitblit v1.9.3