From 7c90a6fdbad423c172074e0506352354ac7b05bb Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Mon, 14 Aug 2023 16:48:58 +0800
Subject: [PATCH] 险情上报加密

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/service/impl/DangerReportServiceImpl.java |   14 ++++++--------
 1 files changed, 6 insertions(+), 8 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 ba0ac19..88930ac 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
@@ -50,7 +50,7 @@
 	@Override
 	@Transactional
 	public boolean saveUp(DangerReport dangerReport) {
-		this.save(dangerReport);
+		// 填充加密内容
 		DangerReportSUPO dangerReportSUPO = BeanUtil.copy(dangerReport, DangerReportSUPO.class);
 		String message = JSONObject.toJSONString(dangerReportSUPO);
 		R<CBCResultDTO> cbcResultDTOR =  pwdClient.getCBCMacEncipher(message);
@@ -60,18 +60,16 @@
 		String maced = cbcResultDTOR.getData().getMaced();
 		String keyIndex = cbcResultDTOR.getData().getKeyIndex();
 		String sm4iv = cbcResultDTOR.getData().getSm4IV();
-		DangerReport ympo = new DangerReport();
-		ympo.setId(dangerReport.getId());
-		ympo.setMaced(maced);
-		ympo.setKeyindexs(keyIndex);
-		ympo.setSm4iv(sm4iv);
+		dangerReport.setMaced(maced);
+		dangerReport.setKeyindexs(keyIndex);
+		dangerReport.setSm4iv(sm4iv);
 		R<ResultDTO> resultDTOR = pwdClient.getEncrypt(sm4iv, keyIndex, message);
 		if (resultDTOR.getCode() != 200) {
 			return false;
 		}
-		ympo.setEncdata(resultDTOR.getData().getData());
+		dangerReport.setEncdata(resultDTOR.getData().getData());
 
-		return this.updateById(ympo);
+		return this.save(dangerReport);
 	}
 
 }

--
Gitblit v1.9.3