Commit Graph

363 Commits

Author SHA1 Message Date
weizhihong
c36cda43e2 【设备状态信息存储、对比】 2023-06-14 17:08:37 +08:00
tiger_zhou
982f5613db mock 接口 2023-06-14 13:14:15 +08:00
tiger_zhou
b49a8a3805 mock 接口 2023-06-14 10:01:45 +08:00
49a955deb6 Merge remote-tracking branch 'origin/master' 2023-06-13 18:40:12 +08:00
f7ed4ffa36 添加websocket配置 2023-06-13 18:40:02 +08:00
tiger_zhou
72839b5870 mock 接口 2023-06-13 16:45:48 +08:00
tiger_zhou
483b4fb01c 代码调整 2023-06-13 13:42:10 +08:00
xzb
f1cdafac78 ncc协议x 2023-06-13 13:37:59 +08:00
xzb
94b37287ab ncc协议x 2023-06-13 13:32:34 +08:00
xzb
624d2715f7 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-server
# Conflicts:
#	src/main/java/club/joylink/xiannccda/ats/message/convertor/DeviceStatusConvertor.java
2023-06-13 13:14:44 +08:00
xzb
77f4d6f43d ncc协议x 2023-06-13 13:12:30 +08:00
tiger_zhou
2ccb69710c 代码调整 2023-06-13 10:08:15 +08:00
tiger_zhou
2599d0bef3 调整移位计算 2023-06-13 10:05:29 +08:00
tiger_zhou
f475a82217 文件调整 2023-06-13 09:51:19 +08:00
xzb
8d00fa337b ncc协议x 2023-06-12 16:56:17 +08:00
xzb
5a94989472 ncc协议x 2023-06-12 10:37:26 +08:00
xzb
4488352fa1 ncc协议x 2023-06-12 10:30:21 +08:00
xzb
d216411cf8 ncc协议x 2023-06-12 10:25:15 +08:00
xzb
46da540963 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-server 2023-06-12 10:02:30 +08:00
xzb
f6f14d4e71 ncc协议x 2023-06-12 10:02:19 +08:00
xzb
69220a6edf ncc协议x 2023-06-12 09:58:16 +08:00
tiger_zhou
9fd40e0803 非实时消息 2023-06-09 17:55:53 +08:00
tiger_zhou
16e7da5494 非实时消息 2023-06-09 17:55:34 +08:00
xzb
7045749cf2 ncc协议x 2023-06-09 17:30:57 +08:00
xzb
e185c2fe77 ncc协议x--设备位图复合状态转换为proto定义的状态 2023-06-09 16:09:52 +08:00
xzb
f930f97a08 ncc协议x--设备位图复合状态转换为proto定义的状态 2023-06-09 15:37:51 +08:00
xzb
d47214cc32 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-server 2023-06-09 14:59:14 +08:00
xzb
ed5de037bc ncc协议x 2023-06-09 14:58:59 +08:00
tiger_zhou
da77905c1a Merge remote-tracking branch 'origin/master' 2023-06-09 14:47:26 +08:00
tiger_zhou
c721febcc0 非实时消息 2023-06-09 14:47:06 +08:00
weizhihong
e6925eea9c 【增加发布信息判断】 2023-06-09 14:46:27 +08:00
weizhihong
4e84442313 【线路管理非空验证BUG】 2023-06-09 14:32:29 +08:00
xzb
55cbaf5aef ncc协议x 2023-06-09 14:15:50 +08:00
xzb
096861d643 ncc协议x 2023-06-09 14:10:35 +08:00
xzb
24c06a6122 ncc协议x 2023-06-09 10:42:00 +08:00
xzb
08c1c0ef3b ncc协议x 2023-06-09 10:34:47 +08:00
xzb
64fb58a9d8 ncc协议x 2023-06-09 10:31:44 +08:00
xzb
d6e15c8977 ncc协议x 2023-06-09 10:27:50 +08:00
xzb
fc3a511749 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-server 2023-06-09 10:14:17 +08:00
xzb
c6ac513148 ncc协议x 2023-06-09 10:13:44 +08:00
tiger_zhou
251e99b63c 非实时消息 2023-06-09 09:57:59 +08:00
tiger_zhou
f4c54a0424 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-server into master-zy 2023-06-09 09:43:38 +08:00
tiger_zhou
68c7cb0a4d 非实时消息 2023-06-09 09:43:27 +08:00
xzb
30a4372b17 ncc协议x 2023-06-09 09:37:16 +08:00
xzb
2021a5d921 ncc协议x 2023-06-09 09:18:09 +08:00
tiger_zhou
2687a98b76 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-server into master-zy 2023-06-08 18:08:09 +08:00
tiger_zhou
670a103e7b 非实时消息 2023-06-08 18:07:58 +08:00
xzb
986aa282b9 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-server 2023-06-08 18:02:47 +08:00
xzb
a4dfde4ffe ncc协议x 2023-06-08 18:02:20 +08:00
weizhihong
5aac47bbac 【提取功能代码】 2023-06-08 17:51:30 +08:00