diff --git a/iot/app.log b/iot/app.log
deleted file mode 100644
index e69de29..0000000
diff --git a/iot/pom.xml b/iot/pom.xml
index d2ca3f5..e9941c2 100644
--- a/iot/pom.xml
+++ b/iot/pom.xml
@@ -12,7 +12,7 @@
17
17
UTF-8
- 3.0.0
+ 5.0.0
diff --git a/iot/src/main/java/com/zeto/iot/controller/Activity.java b/iot/src/main/java/com/zeto/iot/controller/Activity.java
index ba24dad..b6588a1 100644
--- a/iot/src/main/java/com/zeto/iot/controller/Activity.java
+++ b/iot/src/main/java/com/zeto/iot/controller/Activity.java
@@ -5,7 +5,7 @@ import com.zeto.ZenEngine;
import com.zeto.ZenResult;
import com.zeto.annotation.AccessRole;
import com.zeto.annotation.Inject;
-import com.zeto.domain.ZenRole;
+import com.zeto.enums.ZenRole;
import com.zeto.kit.DateKit;
import lombok.extern.slf4j.Slf4j;
diff --git a/iot/src/main/resources/logback.xml b/iot/src/main/resources/logback.xml
index 9c1d346..d3bcab9 100644
--- a/iot/src/main/resources/logback.xml
+++ b/iot/src/main/resources/logback.xml
@@ -1,7 +1,7 @@
- app.log
+ log/app.log
%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
diff --git a/vue/src/pages/machine/index.js b/vue/src/pages/machine/index.js
index 9d27920..c67c0e7 100644
--- a/vue/src/pages/machine/index.js
+++ b/vue/src/pages/machine/index.js
@@ -1,4 +1,5 @@
export default {
'machine/category': () => import( /* webpackChunkName: "pages/machine/category" */ "./category/category.vue"),
- 'machine/list': () => import( /* webpackChunkName: "pages/machine/list" */ "./list/list.vue")
+ 'machine/list': () => import( /* webpackChunkName: "pages/machine/list" */ "./list/list.vue"),
+ 'machine/test': () => import( /* webpackChunkName: "pages/machine/test" */ "./test/test.vue")
};
\ No newline at end of file
diff --git a/vue/src/pages/machine/list/.lowcode/configs.jsx b/vue/src/pages/machine/list/.lowcode/configs.jsx
index 5a3b920..d2bc13a 100644
--- a/vue/src/pages/machine/list/.lowcode/configs.jsx
+++ b/vue/src/pages/machine/list/.lowcode/configs.jsx
@@ -1,4 +1,5 @@
export default {
+ url:"/do/select/machine",
title: "设备列表",
entitys: [{"name":"id","label":"编号"},{"name":"title","label":"产品描述"},{"name":"describe","label":"描述"},{"name":"categoryId","label":"分类","type":"search","depend":"machine_category"},{"name":"status","label":"设备状态","code":"machineStatus"},{"name":"inline","label":"接入方式","code":"inlineMode"},{"name":"createGmt","label":"创建时间","type":"date"},{"name":"updateGmt","label":"更新时间","type":"date"}],
columns: ["id","title","describe","categoryId","status","inline","createGmt","updateGmt"],
@@ -15,7 +16,7 @@ export default {
return (
<>
-
+
>
)
}
diff --git a/vue/src/pages/machine/list/.lowcode/data b/vue/src/pages/machine/list/.lowcode/data
index 4cb9333..e7cd920 100644
--- a/vue/src/pages/machine/list/.lowcode/data
+++ b/vue/src/pages/machine/list/.lowcode/data
@@ -1 +1 @@
-{"table":"machine","blocks":[],"counter":6788,"basic":{"title":"设备列表","selectable":0,"showIndex":0,"compact":0,"size":"","url":"/do/select/machine","actions":[{"label":"新增设备","mode":"wicket","type":"primary","url":"/do/put/machine","from":null,"fields":[{"id":"title","name":"title","width":null,"rule":{},"block":null,"blockType":null},{"id":"describe","name":"describe","width":null,"rule":{},"block":null,"blockType":null},{"id":"categoryId","name":"categoryId","width":null,"rule":{},"block":null,"blockType":null},{"id":"status","name":"status","width":null,"rule":{},"block":null,"blockType":null},{"id":"inline","name":"inline","width":null,"rule":{},"block":null,"blockType":null}],"name":"J_6786","_id":6787}]},"columns":[{"id":"id","name":"id","width":null,"rule":{},"block":null,"blockType":null},{"id":"title","name":"title","width":null,"rule":{},"block":null,"blockType":null},{"id":"describe","name":"describe","width":null,"rule":{},"block":null,"blockType":null},{"id":"category_id","name":"category_id","width":null,"rule":{},"block":null,"blockType":null},{"id":"status","name":"status","width":null,"rule":{},"block":null,"blockType":null},{"id":"inline","name":"inline","width":null,"rule":{},"block":null,"blockType":null},{"id":"create_gmt","name":"create_gmt","width":null,"rule":{},"block":null,"blockType":null},{"id":"update_gmt","name":"update_gmt","width":null,"rule":{},"block":null,"blockType":null}],"tabs":{"code":null,"defaultVal":null,"list":[],"keyword":null},"condition":[],"conditionLimit":null,"actions":[{"label":"编辑","mode":"wicket","type":"text","url":"/do/patch/machine","from":null,"fields":[{"id":"title","name":"title","width":null,"rule":{},"block":null,"blockType":null},{"id":"describe","name":"describe","width":null,"rule":{},"block":null,"blockType":null},{"id":"status","name":"status","width":null,"rule":{},"block":null,"blockType":null},{"id":"inline","name":"inline","width":null,"rule":{},"block":null,"blockType":null},{"id":"categoryId","name":"categoryId","width":null,"rule":{},"block":null,"blockType":null}],"name":"J_6787","_id":6788},{"label":"删除","mode":"confirm","type":"text","url":"/do/delete/machine","params":[],"tip":"确定删除该产品吗?","_id":6789}],"_id":6789}
\ No newline at end of file
+{"table":"machine","blocks":[],"counter":6788,"basic":{"title":"设备列表","selectable":1,"showIndex":1,"compact":0,"size":"","url":"/do/select/machine","actions":[{"label":"新增设备","mode":"wicket","type":"primary","url":"/do/put/machine","from":null,"fields":[{"id":"title","name":"title","width":null,"rule":{},"block":null,"blockType":null},{"id":"describe","name":"describe","width":null,"rule":{},"block":null,"blockType":null},{"id":"categoryId","name":"categoryId","width":null,"rule":{},"block":null,"blockType":null},{"id":"status","name":"status","width":null,"rule":{},"block":null,"blockType":null},{"id":"inline","name":"inline","width":null,"rule":{},"block":null,"blockType":null}],"name":"J_6786","_id":6787}]},"columns":[{"id":"id","name":"id","width":null,"rule":{},"block":null,"blockType":null},{"id":"title","name":"title","width":null,"rule":{},"block":null,"blockType":null},{"id":"describe","name":"describe","width":null,"rule":{},"block":null,"blockType":null},{"id":"category_id","name":"category_id","width":null,"rule":{},"block":null,"blockType":null},{"id":"status","name":"status","width":null,"rule":{},"block":null,"blockType":null},{"id":"inline","name":"inline","width":null,"rule":{},"block":null,"blockType":null},{"id":"create_gmt","name":"create_gmt","width":null,"rule":{},"block":null,"blockType":null},{"id":"update_gmt","name":"update_gmt","width":null,"rule":{},"block":null,"blockType":null}],"tabs":{"code":null,"defaultVal":null,"list":[],"keyword":null},"condition":[],"conditionLimit":null,"actions":[{"label":"编辑","mode":"wicket","type":"text","url":"/do/patch/machine","from":null,"fields":[{"id":"title","name":"title","width":null,"rule":{},"block":null,"blockType":null},{"id":"describe","name":"describe","width":null,"rule":{},"block":null,"blockType":null},{"id":"status","name":"status","width":null,"rule":{},"block":null,"blockType":null},{"id":"inline","name":"inline","width":null,"rule":{},"block":null,"blockType":null},{"id":"categoryId","name":"categoryId","width":null,"rule":{},"block":null,"blockType":null}],"name":"J_6787","_id":6788},{"label":"删除","mode":"confirm","type":"text","url":"/do/delete/machine","params":[],"tip":"确定删除该产品吗?","_id":6789}],"_id":6789}
\ No newline at end of file
diff --git a/vue/src/pages/machine/list/list.vue b/vue/src/pages/machine/list/list.vue
index a7dcc52..19f5fca 100644
--- a/vue/src/pages/machine/list/list.vue
+++ b/vue/src/pages/machine/list/list.vue
@@ -1,5 +1,6 @@
+ {{ row }}dddd
diff --git a/vue/src/pages/machine/test/.lowcode/configs.jsx b/vue/src/pages/machine/test/.lowcode/configs.jsx
new file mode 100644
index 0000000..a4793b2
--- /dev/null
+++ b/vue/src/pages/machine/test/.lowcode/configs.jsx
@@ -0,0 +1,68 @@
+export default {
+ title: '测试',
+ entitys: [
+ { name: 'id', label: '编号' },
+ { name: 'name', type: 'input', label: '名称' },
+ { name: 'nick', label: '昵称' },
+ { name: 'ukey', label: '密钥' },
+ { name: 'createUid', type: 'input', label: '创建人' },
+ {
+ name: 'status',
+ type: 'switch',
+ label: '状态',
+ url: '/app/updateStatus.do',
+ },
+ {
+ name: 'config',
+ type: 'map',
+ default: {},
+ fields: [
+ { name: 'api', label: '接口地址', type: 'input' },
+ { name: 'version', label: '资源版本', type: 'input' },
+ ],
+ },
+ ],
+ columns: ['id', 'createUid', 'nick', 'unionid', 'dingId', 'ukey'],
+ condition: ['id', 'createUid', 'nick', 'unionid', 'dingId', 'ukey'],
+ slots: {
+ header$() {
+ return (
+ <>
+
+ >
+ )
+ },
+ action$({ row }) {
+ return (
+ <>
+
+
+
+ >
+ )
+ },
+ },
+}
diff --git a/vue/src/pages/machine/test/.lowcode/data b/vue/src/pages/machine/test/.lowcode/data
new file mode 100644
index 0000000..c481c41
--- /dev/null
+++ b/vue/src/pages/machine/test/.lowcode/data
@@ -0,0 +1 @@
+{"table":"","blocks":[],"counter":6786,"basic":{"title":"测试","selectable":0,"showIndex":0,"compact":0,"size":"","url":"/do/select/site","actions":[]},"columns":[],"tabs":{"code":null,"defaultVal":null,"list":[],"keyword":null},"condition":[],"conditionLimit":null,"actions":[],"_id":6786}
\ No newline at end of file
diff --git a/vue/src/pages/machine/test/test.vue b/vue/src/pages/machine/test/test.vue
new file mode 100644
index 0000000..e4783c2
--- /dev/null
+++ b/vue/src/pages/machine/test/test.vue
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
\ No newline at end of file