From aca6700c8da7e729975b4944bfd2c9559a5d46d9 Mon Sep 17 00:00:00 2001
From: stone <827672943@qq.com>
Date: Wed, 20 Mar 2024 15:29:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A4=E8=AF=81=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F=EF=BC=8C=E9=83=A8=E5=88=86=E6=A8=A1=E5=9D=97=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dntd-tool/pom.xml                                     |  2 +-
 .../src/main/java/com/dky/security/SM4Utils.java      |  5 -----
 dntd-tool/src/main/java/com/dky/test/TestMain.java    | 11 ++++++++++-
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/dntd-tool/pom.xml b/dntd-tool/pom.xml
index ccadd7c..fc1539d 100644
--- a/dntd-tool/pom.xml
+++ b/dntd-tool/pom.xml
@@ -53,7 +53,7 @@
         <dependency>
             <groupId>com.dky</groupId>
             <artifactId>dntd-model-heatboiler</artifactId>
-            <version>1.1-SNAPSHOT</version>
+            <version>1.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
diff --git a/dntd-tool/src/main/java/com/dky/security/SM4Utils.java b/dntd-tool/src/main/java/com/dky/security/SM4Utils.java
index b733152..c5586f2 100644
--- a/dntd-tool/src/main/java/com/dky/security/SM4Utils.java
+++ b/dntd-tool/src/main/java/com/dky/security/SM4Utils.java
@@ -77,11 +77,6 @@ public class SM4Utils {
         return map;
     }
 
-    public static void main(String[] args) throws Exception {
-        String s =
-                "ELjXfd24Nl0LrqAIgE5pDAolhmR0ARb5qJpGuoQHMO4q8zq8F84zVFJC+WoUMgVUCUroZHemAUp06HUO2iYGBavkllg/tp1+dum7FSZilOkBJhFQqRsgHftdznSXX02l7iqX+vPZyNKyLubVgDoPjYj7GyhXZ/pOm6AthNcRV2E=";
-        List<Map<String, String>> decryptList = decrypt(s);
-        decryptList.forEach(System.out::println);
 
     /**
      * SM2私钥解密
diff --git a/dntd-tool/src/main/java/com/dky/test/TestMain.java b/dntd-tool/src/main/java/com/dky/test/TestMain.java
index 64ec534..d5e5f23 100644
--- a/dntd-tool/src/main/java/com/dky/test/TestMain.java
+++ b/dntd-tool/src/main/java/com/dky/test/TestMain.java
@@ -15,12 +15,21 @@ import com.dky.tool.ModelTool;
 import com.dky.utils.entity.SysDeviceHeatScene;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 public class TestMain {
 
     public static void main(String[] args) {
 
+        //模拟数据库查询，构造出加密解密方式
+        List<Map> mafwefaefwaefawfapList = new ArrayList<>();
+        HashMap<String, Object> fawdfweawerwgggawfg = new HashMap<>();
+        fawdfweawerwgggawfg.put("CREATE_TIME","2024-02-20 14:46:34");
+        mafwefaefwaefawfapList.add(fawdfweawerwgggawfg);
+        mafwefaefwaefawfapList.add(fawdfweawerwgggawfg);
+
         JSONObject param = new JSONObject();
         param.put("type", "0104");
         /*param.put("lastYearFee", 500000.2);
@@ -53,7 +62,7 @@ public class TestMain {
         // 将这个JSONObject对象list作为入参调用ModelTool的create方法实现产品库初始化。
         ModelTool modelTool = ModelTool.create(list);
         // 调用ModelTool的唯一入口函数exeModel2Report，将场景参数param和密钥key作为入参传进去，得到输出结果电能替代报告。
-        System.out.println(modelTool.exeModel2Report(param, key));
+        System.out.println(modelTool.exeModel2Report(param, key,mafwefaefwaefawfapList));
 
     }