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 @@ com.dky dntd-model-heatboiler - 1.1-SNAPSHOT + 1.0-SNAPSHOT compile 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> 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 mafwefaefwaefawfapList = new ArrayList<>(); + HashMap 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)); }