From aa6fd3986a72524dea1547f2b1cce85ea71228bd Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 19 Oct 2023 17:16:31 +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 | 14 ++++++++++++--
1 files changed, 12 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..441c853 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
@@ -1,5 +1,6 @@
package cn.gistack.sm.jcsb.service.impl;
+import cn.gistack.common.utils.Base64Utils;
import cn.gistack.pwd.dto.CBCResultDTO;
import cn.gistack.pwd.dto.ResultDTO;
import cn.gistack.pwd.fegin.IPwdClient;
@@ -85,23 +86,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);
@@ -131,11 +137,15 @@
newEntity.setId(item.getId());
R<ResultDTO> res = pwdClient.getDecrypt(item.getSm4iv(), item.getKeyindexs(), item.getEncdata());
+
if (res.getCode() == 200){
newEntity.setBase64Data(res.getData().getData());
newEntity.setCreateTime(item.getCreateTime());
}
+ String jsonStr = Base64Utils.getBase64Decode(res.getData().getData());
+ pwdClient.verify(item.getMaced(),item.getSm4iv(),item.getKeyindexs(),jsonStr,id,"sm_danger_report");
+
return newEntity;
}
--
Gitblit v1.9.3