From c007f0ca1785db093d48f4846cda82fe8e955765 Mon Sep 17 00:00:00 2001
From: kimi <kimi42345@gmail.com>
Date: 星期三, 27 五月 2020 09:59:29 +0800
Subject: [PATCH] merage
---
src/main/java/com/highdatas/mdm/util/pool/MqMessage.java | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/highdatas/mdm/util/pool/MqMessage.java b/src/main/java/com/highdatas/mdm/util/pool/MqMessage.java
index 10d9797..b05dc65 100644
--- a/src/main/java/com/highdatas/mdm/util/pool/MqMessage.java
+++ b/src/main/java/com/highdatas/mdm/util/pool/MqMessage.java
@@ -7,6 +7,7 @@
import com.highdatas.mdm.util.Constant;
import com.highdatas.mdm.util.DbUtils;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
import java.util.Date;
import java.util.List;
@@ -32,6 +33,7 @@
public void run() {
log.info("mq: {} ---------- run", mqEntity.toString());
String type = mqEntity.getType();
+ SysDispenseLogs logByMqEntity = DbUtils.dispenseLogsService.getLogByMqEntity(mqEntity);
try{
if (type.equalsIgnoreCase(Constant.Master)) {
sendMasterData();
@@ -41,7 +43,9 @@
}
catch (Exception e) {
e.printStackTrace();
- //log
+ if (logByMqEntity != null) {
+ logByMqEntity.setErrorInfo(e.getMessage()).updateById();
+ }
}
}
@@ -84,6 +88,9 @@
String fields = fieldByMaintain.stream().map(sysField -> sysField.getField()).collect(Collectors.joining(Constant.COMMA));
String filter = DbUtils.masterAuthorService.getFilter(user, maintain.getId());
+ if (StringUtils.isEmpty(filter)) {
+ filter = Constant.WHERE_DEFAULT;
+ }
String content;
if (increment) {
String maintainTableName = maintain.getTableName();
@@ -92,6 +99,10 @@
page.setPageSize(mqEntity.getPageSize().get());
page.setPageNo(mqEntity.getPageNo().get());
List<Map<String, Object>> maps = DbUtils.maintainDetailMapper.selectMaintainDetail(fields, tempTableName, maintain.getId(), filter, page.getLimitSQL());
+
+ Map<String, AntianaphylaxisResult> helpfulField = DbUtils.antianaphylaxisClient.getHelpfulField(fields, maintainTableName);
+ DbUtils.antianaphylaxisClient.fixMasterData(maps,helpfulField);
+
JSONObject object = new JSONObject();
object.fluentPut("total", page.getRecordCount());
object.fluentPut("size", page.getPageSize());
@@ -162,9 +173,14 @@
String size = (bytes.length / 1024) + "k";
log.info(size);
Date now = new Date();
-
-// String mqBody = com.datacvg.common.AESUtil.getInstance().encoder(content, mqEntity.getUserId(),"http://180.169.94.250:9107");
- String mqBody = content;
+ Boolean aes = DbUtils.dispenseService.getAes();
+ String mqBody;
+ if (aes) {
+ String aesUrl = DbUtils.dispenseService.getAesUrl();
+ mqBody = com.datacvg.common.AESUtil.getInstance().encoder(content, mqEntity.getUserId(), aesUrl);
+ } else {
+ mqBody = content;
+ }
bytes = mqBody.getBytes("UTF-8");
size = (bytes.length / 1024) + "k";
log.info(size);
@@ -176,7 +192,7 @@
msgBody.setData(mqBody);
msgBody.setTotal(pageSize);
mqEntity.setMsgBody(msgBody);
- Thread.sleep(1000 * 60 * 3);
+// Thread.sleep(1000 * 60 * 3);
mqEntity.send2Mq();
}
}
--
Gitblit v1.8.0