Commit Graph

397 Commits

Author SHA1 Message Date
谷成伟
3779033bc9 websocket并发发送消息 2024-10-22 12:58:04 +08:00
谷成伟
b7b11e4a26 websocket并发发送消息 2024-10-22 12:46:25 +08:00
谷成伟
5af50a92df websocket并发发送消息 2024-10-22 12:40:22 +08:00
huguanghan
c6bf4efae2 实时数据查询,历史区间数据查询接口新增 2024-10-22 09:19:12 +08:00
yu
021837f209 Merge remote-tracking branch 'origin/main' 2024-10-21 17:19:53 +08:00
yu
79785c70d5 枚举类配置接口update 2024-10-21 17:19:27 +08:00
huguanghan
ca0195cb38 实时数据查询,历史区间数据查询接口新增 2024-10-21 17:11:57 +08:00
huguanghan
e3c6d293b6 实时数据查询,历史区间数据查询接口新增 2024-10-21 17:04:29 +08:00
chenhaojie
f58f0cc26a Merge remote-tracking branch 'origin/main' 2024-10-21 16:56:26 +08:00
chenhaojie
82e104e21e 润阳项目
新增相关字段和判断
2024-10-21 16:55:46 +08:00
yu
5d06748303 枚举类配置接口; 2024-10-21 15:31:56 +08:00
yu
4dde3b98a7 菜单配置update 2024-10-21 10:16:51 +08:00
huguanghan
92284f55a8 高频,低频数据tdengine入库时间修改 2024-10-21 09:15:37 +08:00
huguanghan
68b2827515 高频,低频数据tdengine入库 2024-10-18 17:07:12 +08:00
huguanghan
c4d3e3b1e9 高频,低频数据tdengine入库 2024-10-18 16:51:31 +08:00
chenhaojie
7a7fa73a12 润阳项目
新增相关字段和判断
2024-10-18 16:32:18 +08:00
chenhaojie
32878aa152 润阳项目
新增相关字段和判断
2024-10-18 16:14:15 +08:00
chenhaojie
e434dd3d4c 润阳项目
新增相关字段和判断
2024-10-18 15:26:48 +08:00
chenhaojie
70ab47f82e Merge remote-tracking branch 'origin/main' 2024-10-18 13:41:17 +08:00
chenhaojie
22709f5f8f 润阳项目
新增相关字段和判断
2024-10-18 13:40:43 +08:00
huguanghan
4340f439cb 高频,低频数据tdengine入库 2024-10-18 13:38:55 +08:00
chenhaojie
225f5d2d81 润阳项目
新增相关字段和判断
2024-10-18 13:20:05 +08:00
chenhaojie
db405cb285 润阳项目
新增相关字段和判断
2024-10-18 13:16:50 +08:00
chenhaojie
81b850522d 润阳项目
新增相关字段和判断
2024-10-18 13:09:45 +08:00
chenhaojie
befc5d29e5 Merge remote-tracking branch 'origin/main' 2024-10-17 18:06:46 +08:00
chenhaojie
b3752a31af 润阳项目
新增相关字段和判断
2024-10-17 18:06:02 +08:00
huguanghan
b7ff6d1f84 tdengine数据按设备分为高频和低频表,入库,redis数据同步 2024-10-17 16:56:34 +08:00
huguanghan
c87c0de17b tdengine数据按设备分为高频和低频表,入库,redis数据同步 2024-10-17 15:56:57 +08:00
chenhaojie
7bdfa19716 [301]
设备编码 没做唯一性校验,可以新增相同编码的设备
2024-10-17 09:40:59 +08:00
chenhaojie
1d42ee709d [301]
设备编码 没做唯一性校验,可以新增相同编码的设备
2024-10-17 09:37:11 +08:00
yu
78f5af7e3e 设备管理增加额度容量字段;
首页API文档;
2024-10-16 16:58:31 +08:00
chenhaojie
1087f539af [301]
设备编码 没做唯一性校验,可以新增相同编码的设备
2024-10-16 15:05:52 +08:00
chenhaojie
0faf0601ff [301]
设备编码 没做唯一性校验,可以新增相同编码的设备
2024-10-16 10:26:18 +08:00
chenhaojie
fc7297cbc3 [301]
设备编码 没做唯一性校验,可以新增相同编码的设备
2024-10-16 10:14:42 +08:00
yu
7755b45b59 菜单路由,添加中文描述字段; 设备清单,添加所属 线路和是否为标杆机组字段; 2024-10-15 14:51:39 +08:00
houwei
d7c3254874 Merge remote-tracking branch 'origin/main' 2024-10-14 17:31:07 +08:00
houwei
adf09789e3 权限主键ID类型修改成int 2024-10-14 17:30:07 +08:00
huguanghan
10c0014253 tdengine数据按设备分为高频和低频表 2024-10-11 17:30:44 +08:00
huguanghan
81ccbd9c04 物模型属性管理功能接口调整 2024-10-11 15:41:29 +08:00
chenhaojie
6574babc9e das接口修改 2024-08-15 16:43:36 +08:00
chenhaojie
4bf71ac950 接口修改 2024-08-14 08:47:32 +08:00
chenhaojie
d63d79cda3 接口修改 2024-08-14 08:43:07 +08:00
chenhaojie
6771ee6345 同步数据接口修改 2024-08-13 17:07:42 +08:00
chenhaojie
8c259e6551 das接口修改 2024-08-12 17:07:13 +08:00
chenhaojie
c71c03bf55 das接口修改 2024-08-12 14:58:26 +08:00
chenhaojie
170b15c5c2 das接口修改 2024-08-12 14:38:17 +08:00
chenhaojie
b95332dd9b das接口修改 2024-08-12 09:16:24 +08:00
谷成伟
9dcfd613ad 更新队列库版本 2024-08-09 09:25:12 +08:00
chenhaojie
05b9559e62 das接口修改 2024-08-09 08:53:49 +08:00
chenhaojie
e9e4693fed das接口修改 2024-08-08 09:53:09 +08:00
chenhaojie
648169ac57 das接口修改 2024-08-02 16:24:09 +08:00
chenhaojie
62aac9e519 das接口修改 2024-08-01 16:12:33 +08:00
chenhaojie
b31e628ded das接口修改,映射表相关 2024-07-29 17:37:20 +08:00
chenhaojie
ddec414dbe das接口修改,映射表相关 2024-07-29 17:33:56 +08:00
chenhaojie
bbccc14fd8 das接口文档修改,das新增映射表相关接口 2024-07-29 16:22:15 +08:00
chenhaojie
2a43e8f33c das接口修改 2024-07-22 10:04:18 +08:00
chenhaojie
74b7b0ee0a das接口修改 2024-07-19 17:16:18 +08:00
chenhaojie
baef5890d3 das接口修改 2024-07-19 17:13:13 +08:00
谷成伟
0e2cac5f3d 添加内存队列用于终端消息通讯 2024-07-17 09:57:33 +08:00
谷成伟
73f48a4c96 添加内存队列用于终端消息通讯 2024-07-16 17:29:11 +08:00
chenhaojie
3f172ef426 das接口修改 2024-07-15 17:30:26 +08:00
chenhaojie
5a03ca40a8 das接口修改 2024-07-15 17:11:19 +08:00
chenhaojie
4af603d7c1 Merge remote-tracking branch 'origin/main' 2024-07-15 16:49:44 +08:00
chenhaojie
e10c5d919d das接口修改 2024-07-15 16:48:20 +08:00
谷成伟
1844d47ea9 移除无用代码 2024-07-15 13:31:05 +08:00
谷成伟
3069c1f687 增加websocket支持 2024-07-15 13:29:57 +08:00
谷成伟
899abc15c3 Merge branch 'main' into das-ws 2024-07-15 09:08:02 +08:00
chenhaojie
6da3805f64 das接口修改 2024-07-12 15:26:33 +08:00
houwei
098907139a 添加协议类型定义和查询接口 2024-07-12 10:37:41 +08:00
houwei
d5590d5e2b 添加协议类型定义和查询接口 2024-07-12 10:36:22 +08:00
houwei
05a1e90d3c 添加协议类型定义 2024-07-12 10:00:48 +08:00
houwei
f86df95fa9 Merge remote-tracking branch 'origin/main' 2024-07-12 09:47:42 +08:00
houwei
117b79830f 添加了一些TODO:需要实现一下 2024-07-12 09:47:20 +08:00
chenhaojie
a11d3637d3 das接口修改 2024-07-12 09:23:30 +08:00
houwei
b6cc806b77 消除告警信息 2024-07-12 09:11:37 +08:00
chenhaojie
215e547656 das接口修改 2024-07-11 17:29:07 +08:00
chenhaojie
5099975f72 das接口新增 2024-07-11 17:15:36 +08:00
chenhaojie
e7317e0caf das接口修改 2024-07-11 15:16:12 +08:00
chenhaojie
99dd570624 das接口修改 2024-07-11 14:39:00 +08:00
chenhaojie
64df0d71b0 das接口修改 2024-07-11 10:22:16 +08:00
chenhaojie
4df3d25597 das接口新增 2024-07-10 17:34:21 +08:00
chenhaojie
3807c2c7e6 das接口新增 2024-07-10 15:19:59 +08:00
chenhaojie
c4b3973727 das接口修改 2024-07-10 10:04:16 +08:00
chenhaojie
dcbb1e9dc6 das接口修改 2024-07-10 09:47:00 +08:00
chenhaojie
3ee64d5f47 das接口新增 2024-07-09 17:12:30 +08:00
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
chenhaojie
4b7f154362 das接口新增 2024-06-25 18:22:54 +08:00
chenhaojie
04f383191d das接口新增 2024-06-25 18:17:04 +08:00
chenhaojie
205c25e5f9 das接口新增 2024-06-25 17:51:01 +08:00
chenhaojie
b2912466a9 das接口新增 2024-06-25 17:41:41 +08:00
houwei
086fd8c1e3 修改告警提示 2024-06-25 16:31:06 +08:00
chenhaojie
b28f4758ef Merge remote-tracking branch 'origin/main' 2024-06-25 14:57:52 +08:00
chenhaojie
9227b6b447 das接口新增 2024-06-25 14:57:19 +08:00
houwei
361e90e20c 修改告警提示 2024-06-25 14:48:48 +08:00
houwei
0f719c9356 权限服务代码调整 2024-06-25 14:28:03 +08:00
houwei
0aeddb7de1 修改定义 添加@Serial 注解 2024-06-25 13:43:06 +08:00
houwei
fa5f9df452 增加机构list接口 2024-06-25 13:37:07 +08:00
houwei
a9eb68bc45 增加菜单接口 2024-06-25 13:34:58 +08:00
chenhaojie
f979d93e7f das接口新增 2024-06-25 09:47:19 +08:00
houwei
1b6df0decc 修改部分告警提示 2024-06-25 08:43:39 +08:00
houwei
25bb8a6d21 code cleanup 2024-06-24 17:38:30 +08:00