Commit Graph

212 Commits

Author SHA1 Message Date
chenhaojie
2f0ea30756 das接口新增 2024-07-09 16:49:55 +08:00
chenhaojie
966f6deb6c das接口修改 2024-07-09 15:30:48 +08:00
chenhaojie
6187a866df das接口修改 2024-07-09 14:26:28 +08:00
chenhaojie
b2d872bbdb das接口修改 2024-07-09 09:42:09 +08:00
houwei
d38c06587c 消除告警信息 2024-07-08 18:03:10 +08:00
houwei
2bac9fc44c 消除告警信息 2024-07-08 18:02:10 +08:00
houwei
9a708e8afa Merge remote-tracking branch 'origin/main' 2024-07-08 18:00:07 +08:00
houwei
5366fba42a 消除告警信息 2024-07-08 17:59:39 +08:00
chenhaojie
a5587966ba das接口文档修改 2024-07-08 17:16:28 +08:00
chenhaojie
6b7bdb7442 das接口修改 2024-07-08 15:44:40 +08:00
谷成伟
d9bdd9ecbb Merge branch 'main' into das-ws 2024-07-08 14:47:38 +08:00
谷成伟
564c3ded3b 增加websocket支持 2024-07-08 14:45:53 +08:00
chenhaojie
4f6cc3ce20 das接口修改 2024-07-08 14:32:23 +08:00
chenhaojie
1c0ab0ab19 das接口修改 2024-07-08 13:46:33 +08:00
谷成伟
2a51fa284f 增加websocket支持 2024-07-08 13:04:18 +08:00
chj
c5219e0053 接口修改 2024-07-05 23:00:01 +08:00
chj
3a522f0166 接口修改 2024-07-05 22:45:44 +08:00
chj
ded6ff4821 接口修改 2024-07-05 22:16:02 +08:00
chj
2fff275f58 接口修改 2024-07-05 21:45:50 +08:00
chenhaojie
8340d356c3 das接口新增 2024-07-05 14:53:44 +08:00
chenhaojie
b341ebb2bc das接口新增 2024-07-05 10:55:30 +08:00
chenhaojie
4ebb3d9d34 das接口文档修改,设备类型接口修改 2024-07-05 09:14:57 +08:00
chenhaojie
7109feb3bb das接口新增 2024-07-04 17:40:19 +08:00
chenhaojie
4968948903 das接口新增 2024-07-04 17:34:26 +08:00
chenhaojie
82f0872123 das物模型接口修改 2024-07-04 09:48:36 +08:00
chenhaojie
40d89f9050 das接口修改(物模型相关) 2024-07-03 16:59:20 +08:00
chenhaojie
e8a4acc352 das接口修改(物模型相关) 2024-07-03 16:41:11 +08:00
chenhaojie
49bef6be8c das新增物模型导出接口 2024-07-03 16:25:51 +08:00
chenhaojie
808ddec3a1 das接口修改(物模型相关) 2024-07-03 15:14:15 +08:00
chenhaojie
a23db55a94 das接口修改 2024-07-03 10:21:47 +08:00
chenhaojie
299823ab2a das接口修改 2024-07-02 10:14:10 +08:00
chenhaojie
b484ab0000 das接口新增 2024-07-02 09:55:01 +08:00
houwei
0c61b4b6f7 消除告警信息 2024-07-02 08:50:09 +08:00
chenhaojie
6976ce31cd das接口新增(物模型相关) 2024-07-01 17:20:29 +08:00
chenhaojie
f1bfc30d9c das接口新增(物模型相关) 2024-07-01 17:18:07 +08:00
houwei
8ee0eb4aca 设置验证码图片背景色为灰色 2024-07-01 17:08:53 +08:00
houwei
562ec7eb3d Merge remote-tracking branch 'origin/main' 2024-07-01 09:20:20 +08:00
houwei
92779b8097 修复告警信息 2024-07-01 09:19:56 +08:00
chenhaojie
1ac6ae6f38 das接口修改 2024-07-01 09:15:07 +08:00
chenhaojie
1a96933111 das接口新增 2024-06-28 17:32:45 +08:00
chenhaojie
002590e86e das接口新增 2024-06-28 17:15:13 +08:00
chenhaojie
0db62973ac das接口新增 2024-06-28 16:56:04 +08:00
houwei
3f48cd06f8 修复告警信息 2024-06-28 16:49:55 +08:00
houwei
95ca045418 修复告警信息 2024-06-28 16:46:28 +08:00
houwei
a3004e5462 修复告警信息 2024-06-28 16:40:19 +08:00
houwei
3ea495b594 Merge remote-tracking branch 'origin/main' 2024-06-28 16:24:48 +08:00
houwei
da3b24f3a7 修复告警信息 2024-06-28 16:24:23 +08:00
chenhaojie
58c9513993 das接口新增 2024-06-28 16:05:10 +08:00
houwei
f2946fcc77 Merge remote-tracking branch 'origin/main' 2024-06-28 15:53:23 +08:00
houwei
da91bb7ef2 修复告警信息 2024-06-28 15:52:43 +08:00
chenhaojie
08f103e569 das接口新增 2024-06-28 15:44:11 +08:00
chenhaojie
a45a6162bf das接口新增 2024-06-28 11:09:57 +08:00
chenhaojie
577d92ca1a das接口新增 2024-06-28 10:59:57 +08:00
chenhaojie
5f2374e96d das接口新增 2024-06-28 10:09:30 +08:00
谷成伟
4c5edaa140 更改数据库分页插件类型 2024-06-27 17:40:32 +08:00
chenhaojie
eb611ae799 das接口新增 2024-06-27 17:24:28 +08:00
chenhaojie
d4a89f7cae das接口新增 2024-06-27 17:18:42 +08:00
chenhaojie
979e2b2b28 das接口新增 2024-06-27 16:45:38 +08:00
chenhaojie
7ab7b08a9a das接口新增 2024-06-27 15:50:21 +08:00
chenhaojie
ecf094f70e das接口新增 2024-06-27 15:01:29 +08:00
houwei
f9f61bf74b 修复告警信息 2024-06-27 14:17:18 +08:00
谷成伟
854c6178ad 解决编译时枚举量找不到的警告提示 2024-06-27 13:15:44 +08:00
houwei
091569e4a0 修复告警信息 2024-06-27 10:57:29 +08:00
houwei
1bdb6bf1b8 修复告警信息 2024-06-27 10:51:48 +08:00
houwei
2cdcf68e0e Merge remote-tracking branch 'origin/main' 2024-06-27 10:35:17 +08:00
houwei
95c2e66178 清除未使用的import 2024-06-27 10:35:03 +08:00
chenhaojie
4a4a0d96aa das接口新增 2024-06-27 10:27:07 +08:00
houwei
0802e723af Merge remote-tracking branch 'origin/main' 2024-06-27 10:22:14 +08:00
houwei
944c4aae66 添加设备类型定义 2024-06-27 10:21:52 +08:00
chenhaojie
b0c0c6badb das接口修改 2024-06-27 10:20:43 +08:00
houwei
14a8b5cc1c 权限定义调整 2024-06-27 09:48:04 +08:00
houwei
29b36dbe6d 修复告警西信息 2024-06-27 09:12:12 +08:00
houwei
324df9a288 菜单树添加权限过滤 2024-06-27 08:55:14 +08:00
houwei
46237c74c0 菜单树添加权限过滤 2024-06-27 08:51:44 +08:00
chenhaojie
957396d654 das接口新增 2024-06-26 16:15:25 +08:00
houwei
c1e5190a75 添加权限判断 2024-06-26 15:31:45 +08:00
houwei
02d5c8df7e Merge remote-tracking branch 'origin/main'
# Conflicts:
#	das/src/main/java/com/das/modules/auth/domain/vo/SysUserVo.java
#	das/src/main/java/com/das/modules/auth/mapper/SysUserMapper.java
2024-06-26 15:30:08 +08:00
houwei
2625c01f05 添加权限判断 2024-06-26 15:25:06 +08:00
chenhaojie
230ae01b9e das接口新增 2024-06-26 15:23:58 +08:00
chenhaojie
9db5556eca das接口文档修改 2024-06-26 15:08:23 +08:00
chenhaojie
22ae74d761 das接口新增 2024-06-26 14:55:32 +08:00
chenhaojie
f9507acb06 das接口新增 2024-06-26 14:54:29 +08:00
houwei
4c0123db96 修改告警提示 2024-06-26 13:52:12 +08:00
chenhaojie
070748eb56 das接口新增 2024-06-26 13:16:43 +08:00
chenhaojie
6688dca0f3 das接口新增 2024-06-26 09:43:50 +08:00
chenhaojie
737b130a66 das接口新增 2024-06-26 09:32:17 +08:00
houwei
7435327f8c 修改告警提示 2024-06-26 09:01:41 +08:00
houwei
665220df35 Merge remote-tracking branch 'origin/main' 2024-06-26 08:59:49 +08:00
houwei
169edc3dbe 修改告警提示 2024-06-26 08:59:28 +08:00
chenhaojie
9612e5fc5b das接口新增 2024-06-26 08:46:18 +08:00
chenhaojie
9a866632b6 das接口新增 2024-06-25 22:10:30 +08:00
chenhaojie
1dd23567fe das接口新增 2024-06-25 22:03:37 +08:00
chenhaojie
9f72c58a75 das接口新增 2024-06-25 21:08:38 +08:00
chenhaojie
c14bcfce08 das接口新增 2024-06-25 19:48:11 +08:00
chenhaojie
14814a8486 das接口新增 2024-06-25 19:31:23 +08:00
chenhaojie
d9e1481654 das接口新增 2024-06-25 19:16:27 +08:00
chenhaojie
8abfe0426c das接口新增 2024-06-25 18:56:59 +08:00
chenhaojie
3f737deb57 das接口新增 2024-06-25 18:52:39 +08:00
chenhaojie
96e43f6c7e das接口新增 2024-06-25 18:51:58 +08:00
chenhaojie
d78344c9af das接口新增 2024-06-25 18:34:27 +08:00