From 1dd5d8f8a616f5cf3caa7828d46989c7d3dcafc4 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Thu, 19 Oct 2023 15:01:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/service/impl/DangerReportServiceImpl.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/service/impl/DangerReportServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/service/impl/DangerReportServiceImpl.java
index 48bd969..6280c56 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/service/impl/DangerReportServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/service/impl/DangerReportServiceImpl.java
@@ -85,23 +85,28 @@
String encodeCreateUserName = "";
//转码后的处理人
String encodeToUserName = "";
+ String encodeDesinfo = "";
R<User> userR = userClient.userInfoById(Long.parseLong(dangerReportSUPO.getToUser()));
+ R<User> createUser = userClient.userInfoById(dangerReportSUPO.getCreateUser());
try {
encodeReservoirName= URLEncoder.encode(attResBase.getName(), "UTF-8");
- encodeCreateUserName = URLEncoder.encode(AuthUtil.getUser().getUserName(), "UTF-8");
+ encodeCreateUserName = URLEncoder.encode(createUser.getData().getName(), "UTF-8");
encodeToUserName=URLEncoder.encode(userR.getData().getName(), "UTF-8");
+ encodeDesinfo = URLEncoder.encode(dangerReport.getDesinfo(), "UTF-8");
}catch (Exception e){
System.out.println(e);
}
dangerReportSUPO.setReservoirName(encodeReservoirName);
- dangerReport.setReservoirName(encodeReservoirName); // 保存水库名称
+ dangerReport.setReservoirName(attResBase.getName()); // 保存水库名称
+ dangerReport.setReservoirId(attResBase.getGuid());
// 获取用户
dangerReportSUPO.setCreateUserName(encodeCreateUserName);
dangerReportSUPO.setToUserName(encodeToUserName);
+ dangerReportSUPO.setDesinfo(encodeDesinfo);
String message = JSONObject.toJSONString(dangerReportSUPO);
R<CBCResultDTO> cbcResultDTOR = pwdClient.getCBCMacEncipher(message);
--
Gitblit v1.9.3