From 23f360358e078f65655e31b652b9f999c6cbe01b Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 15 Aug 2023 10:38:22 +0800
Subject: [PATCH] 险情上报中文转码保存
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/service/impl/DangerReportServiceImpl.java | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 51 insertions(+), 6 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 e873ac9..48bd969 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
@@ -24,6 +24,9 @@
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
+import java.io.Serializable;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
import java.util.List;
/**
@@ -50,7 +53,18 @@
@Override
public IPage<DangerReportVO> selectPage(IPage<DangerReportVO> page, DangerReportVO dangerReportVO) {
- return page.setRecords(baseMapper.selectRecordPage(page,dangerReportVO));
+ List<DangerReportVO> dangerReportVOS = baseMapper.selectRecordPage(page, dangerReportVO);
+ dangerReportVOS.forEach(item->{
+ R<ResultDTO> res = pwdClient.getDecrypt(item.getSm4iv(), item.getKeyindexs(), item.getEncdata());
+ if (res.getCode() == 200){
+ item.setBase64Data(res.getData().getData());
+ }
+
+ item.setEncdata("");
+ item.setKeyindexs("");
+ item.setSm4iv("");
+ });
+ return page.setRecords(dangerReportVOS);
}
@Override
@@ -65,13 +79,29 @@
// 获取水库名称
AttResBase attResBase = attResBaseService.getDetailByCode(dangerReport.getReservoirId());
- dangerReportSUPO.setReservoirName(attResBase.getName());
- dangerReport.setReservoirName(attResBase.getName()); // 保存水库名称
+ //转码后的水库名
+ String encodeReservoirName = "";
+ //转码后的上报人
+ String encodeCreateUserName = "";
+ //转码后的处理人
+ String encodeToUserName = "";
+ R<User> userR = userClient.userInfoById(Long.parseLong(dangerReportSUPO.getToUser()));
+
+ try {
+ encodeReservoirName= URLEncoder.encode(attResBase.getName(), "UTF-8");
+ encodeCreateUserName = URLEncoder.encode(AuthUtil.getUser().getUserName(), "UTF-8");
+ encodeToUserName=URLEncoder.encode(userR.getData().getName(), "UTF-8");
+ }catch (Exception e){
+ System.out.println(e);
+ }
+
+
+ dangerReportSUPO.setReservoirName(encodeReservoirName);
+ dangerReport.setReservoirName(encodeReservoirName); // 保存水库名称
// 获取用户
- dangerReportSUPO.setCreateUserName(AuthUtil.getUser().getUserName());
- R<User> userR = userClient.userInfoById(Long.parseLong(dangerReportSUPO.getToUser()));
- dangerReportSUPO.setToUserName(userR.getData().getName());
+ dangerReportSUPO.setCreateUserName(encodeCreateUserName);
+ dangerReportSUPO.setToUserName(encodeToUserName);
String message = JSONObject.toJSONString(dangerReportSUPO);
R<CBCResultDTO> cbcResultDTOR = pwdClient.getCBCMacEncipher(message);
@@ -94,4 +124,19 @@
}
+ @Override
+ public DangerReportVO getVODetail(String id) {
+ DangerReport item = super.getById(id);
+ DangerReportVO newEntity = new DangerReportVO();
+ 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());
+ }
+
+ return newEntity;
+ }
+
}
--
Gitblit v1.9.3