fix:修复导入报错和数据初始化

data/init/sys_dict_data.json

@@ -131,7 +131,7 @@
       "dictSort": 1,
       "dictLabel": "是",
       "dictValue": "Y",
-      "dictType": "sys_yesNo",
+      "dictType": "sys_yes_no",
       "cssClass": "",
       "listClass": "primary",
       "isDefault": "Y",
@@ -149,7 +149,7 @@
       "dictSort": 2,
       "dictLabel": "否",
       "dictValue": "N",
-      "dictType": "sys_yesNo",
+      "dictType": "sys_yes_no",
       "cssClass": "",
       "listClass": "danger",
       "isDefault": "N",
@@ -167,7 +167,7 @@
       "dictSort": 1,
       "dictLabel": "通知",
       "dictValue": "1",
-      "dictType": "sysNoticeType",
+      "dictType": "sys_notice_type",
       "cssClass": "",
       "listClass": "warning",
       "isDefault": "Y",
@@ -185,7 +185,7 @@
       "dictSort": 2,
       "dictLabel": "公告",
       "dictValue": "2",
-      "dictType": "sysNoticeType",
+      "dictType": "sys_notice_type",
       "cssClass": "",
       "listClass": "success",
       "isDefault": "N",
@@ -203,7 +203,7 @@
       "dictSort": 1,
       "dictLabel": "正常",
       "dictValue": "0",
-      "dictType": "sysNotice_status",
+      "dictType": "sys_notice_status",
       "cssClass": "",
       "listClass": "primary",
       "isDefault": "Y",
@@ -221,7 +221,7 @@
       "dict_sort": 2,
       "dictLabel": "关闭",
       "dictValue": "1",
-      "dictType": "sysNotice_status",
+      "dictType": "sys_notice_status",
       "cssClass": "",
       "listClass": "danger",
       "isDefault": "N",
@@ -239,7 +239,7 @@
       "dict_sort": 1,
       "dictLabel": "新增",
       "dictValue": "1",
-      "dictType": "sys_operType",
+      "dictType": "sys_oper_type",
       "cssClass": "",
       "listClass": "info",
       "isDefault": "N",
@@ -257,7 +257,7 @@
       "dict_sort": 2,
       "dictLabel": "修改",
       "dictValue": "2",
-      "dictType": "sys_operType",
+      "dictType": "sys_oper_type",
       "cssClass": "",
       "listClass": "info",
       "isDefault": "N",
@@ -275,7 +275,7 @@
       "dict_sort": 3,
       "dictLabel": "删除",
       "dictValue": "3",
-      "dictType": "sys_operType",
+      "dictType": "sys_oper_type",
       "cssClass": "",
       "listClass": "danger",
       "isDefault": "N",
@@ -293,7 +293,7 @@
       "dict_sort": 4,
       "dictLabel": "授权",
       "dictValue": "4",
-      "dictType": "sys_operType",
+      "dictType": "sys_oper_type",
       "cssClass": "",
       "listClass": "primary",
       "isDefault": "N",
@@ -311,7 +311,7 @@
       "dict_sort": 5,
       "dictLabel": "导出",
       "dictValue": "5",
-      "dictType": "sys_operType",
+      "dictType": "sys_oper_type",
       "cssClass": "",
       "listClass": "warning",
       "isDefault": "N",
@@ -329,7 +329,7 @@
       "dict_sort": 6,
       "dictLabel": "导入",
       "dictValue": "6",
-      "dictType": "sys_operType",
+      "dictType": "sys_oper_type",
       "cssClass": "",
       "listClass": "warning",
       "isDefault": "N",
@@ -347,7 +347,7 @@
       "dict_sort": 7,
       "dictLabel": "强退",
       "dictValue": "7",
-      "dictType": "sys_operType",
+      "dictType": "sys_oper_type",
       "cssClass": "",
       "listClass": "danger",
       "isDefault": "N",
@@ -365,7 +365,7 @@
       "dict_sort": 8,
       "dictLabel": "生成代码",
       "dictValue": "8",
-      "dictType": "sys_operType",
+      "dictType": "sys_oper_type",
       "cssClass": "",
       "listClass": "warning",
       "isDefault": "N",
@@ -383,7 +383,7 @@
       "dict_sort": 9,
       "dictLabel": "清空数据",
       "dictValue": "9",
-      "dictType": "sys_operType",
+      "dictType": "sys_oper_type",
       "cssClass": "",
       "listClass": "danger",
       "isDefault": "N",
@@ -401,7 +401,7 @@
       "dict_sort": 1,
       "dictLabel": "成功",
       "dictValue": "0",
-      "dictType": "sysCommon_status",
+      "dictType": "sys_common_status",
       "cssClass": "",
       "listClass": "primary",
       "isDefault": "N",
@@ -419,7 +419,7 @@
       "dict_sort": 2,
       "dictLabel": "失败",
       "dictValue": "1",
-      "dictType": "sysCommon_status",
+      "dictType": "sys_common_status",
       "cssClass": "",
       "listClass": "danger",
       "isDefault": "N",
@@ -437,7 +437,7 @@
       "dict_sort": 99,
       "dictLabel": "其他",
       "dictValue": "0",
-      "dictType": "sys_operType",
+      "dictType": "sys_oper_type",
       "cssClass": "",
       "listClass": "info",
       "isDefault": "N",

iot-common/iot-common-dao/iot-temporal-serviceImpl-ts/src/main/java/cc/iotkit/temporal/ts/service/TaskLogDataImpl.java

@@ -9,15 +9,16 @@
  */
 package cc.iotkit.temporal.ts.service;
 
-import cc.iotkit.model.Paging;
+import cc.iotkit.common.api.Paging;
 import cc.iotkit.model.rule.TaskLog;
 import cc.iotkit.temporal.ITaskLogData;
 import cc.iotkit.temporal.ts.dao.TsTemplate;
-//import cc.iotkit.temporal.ts.dm.TableManager;
 import cc.iotkit.temporal.ts.dm.TableManager;
 import cc.iotkit.temporal.ts.model.TsTaskLog;
-import cc.iotkit.temporal.ts.dao.TsTemplate;
-import org.jooq.*;
+import org.jooq.InsertValuesStep4;
+import org.jooq.Record;
+import org.jooq.Record4;
+import org.jooq.SelectForUpdateStep;
 import org.jooq.conf.ParamType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.BeanPropertyRowMapper;
@@ -30,6 +31,8 @@ import java.util.stream.Collectors;
 import static org.jooq.impl.DSL.field;
 import static org.jooq.impl.DSL.table;
 
+//import cc.iotkit.temporal.ts.dm.TableManager;
+
 @Service
 public class TaskLogDataImpl implements ITaskLogData {
 

iot-common/iot-common-dao/iot-temporal-serviceImpl-ts/src/main/java/cc/iotkit/temporal/ts/service/ThingModelMessageDataImpl.java

@@ -9,8 +9,8 @@
  */
 package cc.iotkit.temporal.ts.service;
 
+import cc.iotkit.common.api.Paging;
 import cc.iotkit.common.utils.JsonUtils;
-import cc.iotkit.model.Paging;
 import cc.iotkit.model.device.message.ThingModelMessage;
 import cc.iotkit.model.stats.TimeData;
 import cc.iotkit.temporal.IThingModelMessageData;
@@ -25,10 +25,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.BeanPropertyRowMapper;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
 
 import static org.jooq.impl.DSL.field;

iot-common/iot-common-dao/iot-temporal-serviceImpl-ts/src/main/java/cc/iotkit/temporal/ts/service/VirtualDeviceLogDataImpl.java

@@ -9,13 +9,16 @@
  */
 package cc.iotkit.temporal.ts.service;
 
-import cc.iotkit.model.Paging;
+import cc.iotkit.common.api.Paging;
 import cc.iotkit.model.device.VirtualDeviceLog;
 import cc.iotkit.temporal.IVirtualDeviceLogData;
 import cc.iotkit.temporal.ts.dao.TsTemplate;
 import cc.iotkit.temporal.ts.dm.TableManager;
 import cc.iotkit.temporal.ts.model.TsVirtualDeviceLog;
-import org.jooq.*;
+import org.jooq.Condition;
+import org.jooq.DSLContext;
+import org.jooq.Record;
+import org.jooq.Table;
 import org.jooq.conf.ParamType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.BeanPropertyRowMapper;