From 4aac3790aa54d8ee50879400c62eedce57170102 Mon Sep 17 00:00:00 2001
From: stone <827672943@qq.com>
Date: Mon, 1 Apr 2024 09:35:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=AA=8C=E8=AF=81=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F=EF=BC=8C=E6=A8=A1=E5=9E=8B=E7=BC=96=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/dky/tool/ModelTool.java | 25 ++++++++++++-------
 .../src/main/resources/modelCode.properties   | 12 ++++-----
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/dntd-tool/src/main/java/com/dky/tool/ModelTool.java b/dntd-tool/src/main/java/com/dky/tool/ModelTool.java
index 7a24681..7c85c7a 100644
--- a/dntd-tool/src/main/java/com/dky/tool/ModelTool.java
+++ b/dntd-tool/src/main/java/com/dky/tool/ModelTool.java
@@ -10,6 +10,7 @@ import com.dky.utils.result.ResponseUtil;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
@@ -89,19 +90,25 @@ public class ModelTool {
             //创建表日期
             Date createTimeDate = null;
             try{
-                // 假设 table.get("CREATE_TIME") 返回的是 LocalDateTime 对象
-                LocalDateTime createTimeDateTime = (LocalDateTime) table.get("CREATE_TIME");
-                // 将 LocalDateTime 转换为字符串
-                createTimeDate = formatter.parse(createTimeDateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-            } catch (NullPointerException e){
+                //处理查询出的类型是String
+                String createTimeDateStr = (String) table.get("CREATE_TIME");
+                createTimeDate = formatter.parse(createTimeDateStr);
+            } catch (ParseException e){
                 try{
                     // 假设 table.get("CREATE_TIME") 返回的是 LocalDateTime 对象
-                    LocalDateTime createTimeDateTime = (LocalDateTime) table.get("create_time");
+                    LocalDateTime createTimeDateTime = (LocalDateTime) table.get("CREATE_TIME");
                     // 将 LocalDateTime 转换为字符串
                     createTimeDate = formatter.parse(createTimeDateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-                } catch (NullPointerException e1){
-                    e1.printStackTrace();
-                    return ResponseUtil.createResponse(Code.KEY_UNAUTHORIZED.getCode(), Code.KEY_UNAUTHORIZED.getDesc(), null);
+                } catch (NullPointerException e2){
+                    try{
+                        // 假设 table.get("CREATE_TIME") 返回的是 LocalDateTime 对象
+                        LocalDateTime createTimeDateTime = (LocalDateTime) table.get("create_time");
+                        // 将 LocalDateTime 转换为字符串
+                        createTimeDate = formatter.parse(createTimeDateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+                    } catch (NullPointerException e1){
+                        e1.printStackTrace();
+                        return ResponseUtil.createResponse(Code.KEY_UNAUTHORIZED.getCode(), Code.KEY_UNAUTHORIZED.getDesc(), null);
+                    }
                 }
             }
             //key中验证日期
diff --git a/dntd-tool/src/main/resources/modelCode.properties b/dntd-tool/src/main/resources/modelCode.properties
index dda7bc4..fe21f94 100644
--- a/dntd-tool/src/main/resources/modelCode.properties
+++ b/dntd-tool/src/main/resources/modelCode.properties
@@ -1,6 +1,6 @@
-0101=generate.BuildHeatingScene
-0102=generate.HeatBoilerScene
-0103=generate.KitchenCookScene
-0104=generate.MaterialKilnScene
-0105=generate.MetalKilnScene
-0106=stirtpar.StirparModelCalculate
\ No newline at end of file
+0101=generate.HeatBoilerScene
+0102=generate.MaterialKilnScene
+0201=generate.BuildHeatingScene
+0501=generate.KitchenCookScene
+0805=generate.MetalKilnScene
+0806=stirtpar.StirparModelCalculate
\ No newline at end of file