From f20611265f7d34fd4fbcdfdaff6cb9cccd0b25fc Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Fri, 21 Jun 2024 11:53:21 +0800
Subject: [PATCH] 湖北水库：施工：项目查询过滤无效修复、根据角色查询用户
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/service/impl/DangerReportServiceImpl.java | 36 +++++++++++++++++++++++++-----------
1 files changed, 25 insertions(+), 11 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 4cf1373..e37cb1d 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;
@@ -53,18 +54,26 @@
@Override
public IPage<DangerReportVO> selectPage(IPage<DangerReportVO> page, DangerReportVO 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);
+
+ try {
+ 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);
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ return page;
+
}
@Override
@@ -101,6 +110,7 @@
dangerReportSUPO.setReservoirName(encodeReservoirName);
dangerReport.setReservoirName(attResBase.getName()); // 保存水库名称
+ dangerReport.setReservoirId(attResBase.getGuid());
// 获取用户
dangerReportSUPO.setCreateUserName(encodeCreateUserName);
@@ -135,11 +145,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