zcy
/
iotkit-parent
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

V0.5.x
tangfudong 2023-06-13 14:07:08 +08:00
parent c6ea4a9759
commit bd79f6d4bc
4 changed files with 31 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
data/init/sys_dict_data.json
View File

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

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

@ -9,15 +9,16 @@
*/ */
package cc.iotkit.temporal.ts.service; 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.model.rule.TaskLog;
import cc.iotkit.temporal.ITaskLogData; import cc.iotkit.temporal.ITaskLogData;
import cc.iotkit.temporal.ts.dao.TsTemplate; 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.dm.TableManager;
import cc.iotkit.temporal.ts.model.TsTaskLog; import cc.iotkit.temporal.ts.model.TsTaskLog;
import cc.iotkit.temporal.ts.dao.TsTemplate; import org.jooq.InsertValuesStep4;
import org.jooq.*; import org.jooq.Record;
import org.jooq.Record4;
import org.jooq.SelectForUpdateStep;
import org.jooq.conf.ParamType; import org.jooq.conf.ParamType;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.BeanPropertyRowMapper; 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.field;
import static org.jooq.impl.DSL.table; import static org.jooq.impl.DSL.table;
//import cc.iotkit.temporal.ts.dm.TableManager;
@Service @Service
public class TaskLogDataImpl implements ITaskLogData { public class TaskLogDataImpl implements ITaskLogData {

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

@ -9,8 +9,8 @@
*/ */
package cc.iotkit.temporal.ts.service; package cc.iotkit.temporal.ts.service;
import cc.iotkit.common.api.Paging;
import cc.iotkit.common.utils.JsonUtils; import cc.iotkit.common.utils.JsonUtils;
import cc.iotkit.model.Paging;
import cc.iotkit.model.device.message.ThingModelMessage; import cc.iotkit.model.device.message.ThingModelMessage;
import cc.iotkit.model.stats.TimeData; import cc.iotkit.model.stats.TimeData;
import cc.iotkit.temporal.IThingModelMessageData; 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.jdbc.core.BeanPropertyRowMapper;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static org.jooq.impl.DSL.field; import static org.jooq.impl.DSL.field;

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

@ -9,13 +9,16 @@
*/ */
package cc.iotkit.temporal.ts.service; 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.model.device.VirtualDeviceLog;
import cc.iotkit.temporal.IVirtualDeviceLogData; import cc.iotkit.temporal.IVirtualDeviceLogData;
import cc.iotkit.temporal.ts.dao.TsTemplate; 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.TsVirtualDeviceLog; 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.jooq.conf.ParamType;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.BeanPropertyRowMapper; import org.springframework.jdbc.core.BeanPropertyRowMapper;