From 1d1d34b48e6e80bea350d805d8ff2564ca226f25 Mon Sep 17 00:00:00 2001
From: 杜洪波 <1074825718@qq.com>
Date: 星期一, 19 八月 2024 13:44:17 +0800
Subject: [PATCH] Merge branch 'master' of http://nonxin.cn:8090/r/product/product-server-administration/V2.0.0
---
src/main/java/com/product/administration/service/EarlyWarningManagerService.java | 40 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 39 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/product/administration/service/EarlyWarningManagerService.java b/src/main/java/com/product/administration/service/EarlyWarningManagerService.java
index b3c34e0..ac7b876 100644
--- a/src/main/java/com/product/administration/service/EarlyWarningManagerService.java
+++ b/src/main/java/com/product/administration/service/EarlyWarningManagerService.java
@@ -27,6 +27,7 @@
import com.product.org.admin.service.StaffManagerService;
import com.product.quartz.service.impl.SysJobService;
import com.product.util.BaseUtil;
+import com.product.util.SystemParamReplace;
import org.apache.commons.codec.binary.Base64;
import org.quartz.SchedulerException;
import org.springframework.beans.factory.annotation.Autowired;
@@ -304,13 +305,15 @@
Map<String, String> fieldReference = new HashMap<>(); //缁勫悎鐩稿叧瀛楁鐨勫弬鐓�,tableName1fieldName-->referenceName
StringBuilder concatField = new StringBuilder(); //缁勫悎鐩稿叧瀛楁,tableName1.fieldName tableName1fieldName
earlyWarningServer.parseWarningContent(warnCondition, concatField, tableNameAndAlias, fieldAndAlias, fieldReference);
+ // 鏇挎崲绯荤粺鍙傛暟
+ warnCondition = SystemParamReplace.systemParamsReplace(warnCondition);
//鐢熸垚涓诲瓙琛ㄥ叧鑱擲QL
String relationSQL = earlyWarningServer.createTableRelation(tableNameAndAlias, mainTableName);
StringBuilder serviceSQL = new StringBuilder();
serviceSQL.append(" SELECT ");
- serviceSQL.append(concatField.subSequence(1, concatField.length()));
+ serviceSQL.append(StringUtils.isEmpty(concatField) ? "*" : concatField.subSequence(1, concatField.length()));
serviceSQL.append(" FROM ");
serviceSQL.append(relationSQL);
serviceSQL.append(" WHERE ");
@@ -492,4 +495,39 @@
}
return dte;
}
+
+ /**
+ * 杞彂
+ * @param fse
+ */
+ @Override
+ public void transmit(FieldSetEntity fse) {
+ String uuid = fse.getUUID();
+ String messageAccepter = fse.getString("user");
+ FieldSetEntity warnMsgFse = baseDao.getFieldSetEntity(CmnConst.PRODUCT_SYS_EARLY_WARNING_INFO, uuid, false);
+ String preReceiver = warnMsgFse.getString(CmnConst.RECEIVER);
+ Set<String> preReceiverSet = Sets.newHashSet(preReceiver.split(","));
+ if (StringUtils.isEmpty(messageAccepter)) {
+ throw new BaseException(SystemCode.WARN_TRANSMIT_USER_IS_NULL);
+ }
+ Set<String> transmitUserSet = Sets.newHashSet(messageAccepter.split(","));
+ transmitUserSet.forEach(transmitUser -> {
+ if (preReceiverSet.contains(transmitUser)) {
+ FieldSetEntity transmitUserFse = baseDao.getFieldSetByFilter(CmnConst.PRODUCT_SYS_USERS, "user_id=?", new Object[]{transmitUser}, false);
+ throw new BaseException(SystemCode.WARN_TRANSMIT_USER_REPEAT.getValue(), String.format("%s:%s", SystemCode.WARN_TRANSMIT_USER_REPEAT.getText(), transmitUserFse.getString(CmnConst.USER_NAME)));
+ }
+ });
+ // 鏇存柊棰勮淇℃伅琛�
+ warnMsgFse.setValue(CmnConst.RECEIVER, preReceiver + "," + messageAccepter);
+ baseDao.saveFieldSetEntity(warnMsgFse);
+
+ // 鍙戦�佹秷鎭粰杞彂浜�
+ SystemUser curUser = SpringMVCContextHolder.getCurrentUser();
+ FieldSetEntity msgFse = baseDao.getFieldSetByFilter(CmnConst.PRODUCT_SYS_MESSAGE, "source_table=? and source_uuid=?", new Object[]{CmnConst.PRODUCT_SYS_EARLY_WARNING_INFO, uuid}, false);
+ String title = String.format("%s鍚戞偍杞彂浜嗛璀︽秷鎭��%s銆�", curUser.getUser_name(), msgFse.getString(CmnConst.TITLE));
+ String content = msgFse.getString("content");
+ WebsocketMesssageServiceThread.getInstance().appendMessage(messageAccepter, content, title, curUser.getUser_id(),
+ "31", CmnConst.BUTTON_URL_WARN_MESSAGE_INFO + "?uuid=" + fse.getUUID(),
+ CmnConst.PRODUCT_SYS_EARLY_WARNING_INFO, fse.getUUID(), curUser.getUser_id(), 0, 0, null);
+ }
}
--
Gitblit v1.9.2