tiger_zhou
|
e7dd8162dc
|
调整mock 结构
|
2023-06-15 13:42:29 +08:00 |
|
tiger_zhou
|
7ade47acac
|
Merge remote-tracking branch 'origin/master'
|
2023-06-15 13:25:14 +08:00 |
|
tiger_zhou
|
ddb8cd2b78
|
收集模拟数据，事后删除
|
2023-06-15 13:25:04 +08:00 |
|
weizhihong
|
49fa9ef858
|
【设备状态存储集合】
|
2023-06-15 13:19:15 +08:00 |
|
weizhihong
|
6c549b4b39
|
【判断设备状态信息不同逻辑修改】
|
2023-06-15 11:04:31 +08:00 |
|
weizhihong
|
fe25394e96
|
【状态信息对比逻辑】
|
2023-06-15 09:17:49 +08:00 |
|
weizhihong
|
718e0c7770
|
【删除无效引入】
|
2023-06-14 17:09:31 +08:00 |
|
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
|
16e7da5494
|
非实时消息
|
2023-06-09 17:55:34 +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
|
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 |
|
weizhihong
|
86826cdfb3
|
Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-server
|
2023-06-08 17:42:20 +08:00 |
|
weizhihong
|
be85419ab6
|
【线路、发布逻辑修改】
|
2023-06-08 17:42:08 +08:00 |
|
xzb
|
46f1de9c75
|
ncc协议x
|
2023-06-08 17:29:37 +08:00 |
|
xzb
|
2e9a85c962
|
ncc协议x
|
2023-06-08 17:27:20 +08:00 |
|
tiger_zhou
|
5c87f6a2bb
|
非实时消息
|
2023-06-08 17:16:28 +08:00 |
|
tiger_zhou
|
2f8a895764
|
非实时消息
|
2023-06-08 17:14:38 +08:00 |
|
tiger_zhou
|
5035199d0f
|
Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-server into master-zy
|
2023-06-08 17:14:27 +08:00 |
|
xzb
|
6104c3c6de
|
ncc协议x
|
2023-06-08 17:12:47 +08:00 |
|
tiger_zhou
|
6b0905f8fb
|
非实时消息
|
2023-06-08 17:12:29 +08:00 |
|
xzb
|
c926a4a6b5
|
Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-server
|
2023-06-08 17:06:54 +08:00 |
|
xzb
|
bb9f1d9f5b
|
ncc协议x
|
2023-06-08 17:06:40 +08:00 |
|
tiger_zhou
|
d3d856d45d
|
非实时消息
|
2023-06-08 17:05:43 +08:00 |
|
tiger_zhou
|
836d4b484b
|
Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-server into master-zy
|
2023-06-08 15:48:30 +08:00 |
|
xzb
|
e8ca05baa4
|
ncc协议x
|
2023-06-08 15:47:48 +08:00 |
|
xzb
|
d3ddc5e158
|
ncc协议x
|
2023-06-08 15:42:33 +08:00 |
|
tiger_zhou
|
7735b3e63b
|
Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-server into master-zy
|
2023-06-08 15:14:04 +08:00 |
|
xzb
|
78e8c82a46
|
Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-server
|
2023-06-08 15:14:02 +08:00 |
|
xzb
|
f20698d484
|
ncc协议x
|
2023-06-08 15:13:49 +08:00 |
|
tiger_zhou
|
7f72d50572
|
非实时消息
|
2023-06-08 15:12:02 +08:00 |
|
weizhihong
|
f1cb61ddf4
|
Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-server
|
2023-06-08 15:07:47 +08:00 |
|
weizhihong
|
2c3567ff2c
|
【修改发布图形接口、线路接口】
|
2023-06-08 15:07:36 +08:00 |
|
xzb
|
67c85e8594
|
ncc协议x
|
2023-06-08 14:59:05 +08:00 |
|
xzb
|
98f39938ab
|
ncc协议x
|
2023-06-08 14:54:43 +08:00 |
|
tiger_zhou
|
6c476e2f90
|
Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-server into master-zy
|
2023-06-08 14:27:40 +08:00 |
|
tiger_zhou
|
482d868824
|
非实时消息
|
2023-06-08 14:27:20 +08:00 |
|
weizhihong
|
a02837c2a9
|
Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-server
|
2023-06-08 14:26:00 +08:00 |
|
weizhihong
|
f213530179
|
【线路管理接口;发布图形接口】
|
2023-06-08 14:25:51 +08:00 |
|
xzb
|
ef9f091308
|
ncc协议x
|
2023-06-08 14:19:50 +08:00 |
|
xzb
|
0ca0971f07
|
ncc协议x
|
2023-06-08 14:05:19 +08:00 |
|
xzb
|
0434283e24
|
ncc协议x
|
2023-06-08 14:02:50 +08:00 |
|
xzb
|
6f5c63565e
|
ncc协议x
|
2023-06-08 13:57:16 +08:00 |
|
xzb
|
b2ff6a0334
|
ncc协议x
|
2023-06-08 13:47:47 +08:00 |
|
xzb
|
c023c4889a
|
ncc协议x
|
2023-06-08 13:40:44 +08:00 |
|
xzb
|
f6cc6bcba5
|
ncc协议x
|
2023-06-08 13:30:06 +08:00 |
|
xzb
|
631009eff1
|
Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-server
|
2023-06-08 13:20:34 +08:00 |
|
xzb
|
6023ff23ef
|
ncc协议x
|
2023-06-08 13:20:24 +08:00 |
|
tiger_zhou
|
4b8f32b146
|
Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-server into master-zy
|
2023-06-08 13:09:34 +08:00 |
|
tiger_zhou
|
61b15b4cdf
|
非实时消息
|
2023-06-08 13:09:16 +08:00 |
|
weizhihong
|
a295a59f06
|
【线路增删改查】
|
2023-06-08 13:04:29 +08:00 |
|
xzb
|
873a0d297b
|
ncc协议x
|
2023-06-08 11:26:06 +08:00 |
|
xzb
|
21567c062f
|
ncc协议x
|
2023-06-08 11:22:12 +08:00 |
|
xzb
|
bf3267a695
|
ncc协议x
|
2023-06-08 11:18:53 +08:00 |
|
tiger_zhou
|
50129e0e87
|
Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-server into master-zy
|
2023-06-08 11:09:15 +08:00 |
|
tiger_zhou
|
b7f6e20ce5
|
非实时消息
|
2023-06-08 11:08:55 +08:00 |
|
xzb
|
f6f30a083f
|
ncc协议x
|
2023-06-08 11:03:37 +08:00 |
|
tiger_zhou
|
2c0fbf4193
|
非实时消息
|
2023-06-08 10:36:18 +08:00 |
|
xzb
|
a6a09fc920
|
Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-server
|
2023-06-08 10:35:55 +08:00 |
|
xzb
|
bd6c3a080f
|
ncc协议x
|
2023-06-08 10:35:35 +08:00 |
|
|
|
0031c952ba
|
添加发布图形数据库相关
|
2023-06-08 10:17:50 +08:00 |
|
|
|
6582255309
|
调整OCC客户端及连接、超时重连逻辑
调整OCC测试服务，添加非实时服务
|
2023-06-07 17:51:49 +08:00 |
|
xzb
|
11827d6b7b
|
ncc协议x
|
2023-06-07 17:28:16 +08:00 |
|
xzb
|
f63ff8c28a
|
ncc协议x
|
2023-06-07 17:14:33 +08:00 |
|
xzb
|
10446891eb
|
ncc协议x
|
2023-06-07 17:07:20 +08:00 |
|
xzb
|
e71876efd7
|
ncc协议x
|
2023-06-07 16:31:24 +08:00 |
|
xzb
|
99f101a06f
|
ncc协议x
|
2023-06-07 16:02:42 +08:00 |
|
xzb
|
7b401840ad
|
ncc协议x
|
2023-06-07 15:49:35 +08:00 |
|
xzb
|
fa5c8ba927
|
ncc协议x
|
2023-06-07 15:18:04 +08:00 |
|
tiger_zhou
|
469f9ba7d2
|
Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-server into master-zy
# Conflicts:
# src/main/java/club/joylink/xiannccda/ats/message/MessageId.java
|
2023-06-07 15:13:19 +08:00 |
|
tiger_zhou
|
3f44f18645
|
非实时消息
|
2023-06-07 15:12:20 +08:00 |
|
xzb
|
86b4e39390
|
ncc协议x
|
2023-06-07 14:57:17 +08:00 |
|
xzb
|
9117df92bf
|
Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-server
|
2023-06-07 14:32:18 +08:00 |
|
xzb
|
91c7fb7480
|
ncc协议x
|
2023-06-07 14:32:06 +08:00 |
|
|
|
6027607c21
|
添加心跳监测断线重连逻辑
|
2023-06-07 14:10:38 +08:00 |
|
xzb
|
0333c5d220
|
ncc协议x
|
2023-06-07 14:02:56 +08:00 |
|
xzb
|
e8d3d4ca40
|
ncc协议x
|
2023-06-07 13:58:37 +08:00 |
|
xzb
|
8ecc9637a1
|
ncc协议x
|
2023-06-07 13:55:36 +08:00 |
|
xzb
|
4a47eb1c68
|
ncc协议x
|
2023-06-07 13:39:43 +08:00 |
|
xzb
|
aa0542d4e6
|
ncc协议x
|
2023-06-07 10:50:04 +08:00 |
|
xzb
|
75c7078230
|
ncc协议x
|
2023-06-07 10:41:13 +08:00 |
|
tiger_zhou
|
f87c8f860e
|
非实时消息
|
2023-06-07 10:39:56 +08:00 |
|
tiger_zhou
|
9a4e749d9b
|
非实时消息
|
2023-06-07 10:23:37 +08:00 |
|
tiger_zhou
|
e4679441dd
|
非实时消息
|
2023-06-07 10:13:33 +08:00 |
|
tiger_zhou
|
b944a9a6cf
|
Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-server into master-zy
|
2023-06-07 10:13:24 +08:00 |
|
xzb
|
d0adc3f394
|
ncc协议x
|
2023-06-07 10:12:42 +08:00 |
|
xzb
|
3d62192cdc
|
ncc协议x
|
2023-06-07 10:07:59 +08:00 |
|
tiger_zhou
|
af876d856d
|
Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-server into master-zy
# Conflicts:
# src/main/java/club/joylink/xiannccda/ats/message/MessageId.java
|
2023-06-07 10:05:48 +08:00 |
|
tiger_zhou
|
5d0d822da9
|
非实时消息
|
2023-06-07 10:04:20 +08:00 |
|
|
|
009ebd4bb2
|
消息分为Request和Response
|
2023-06-07 10:02:58 +08:00 |
|
xzb
|
d29438a1cd
|
ncc协议x
|
2023-06-07 09:44:16 +08:00 |
|
tiger_zhou
|
27fc8b8d8b
|
实时消息2.7.2-2.7.7
|
2023-06-07 09:42:43 +08:00 |
|
tiger_zhou
|
00e7d53212
|
Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-server into master-zy
# Conflicts:
# src/main/java/club/joylink/xiannccda/ats/message/MessageId.java
|
2023-06-07 09:41:58 +08:00 |
|
tiger_zhou
|
fd1a1061af
|
实时消息2.7.2-2.7.7
|
2023-06-07 09:40:42 +08:00 |
|
xzb
|
e0116281d7
|
ncc协议x
|
2023-06-07 09:37:06 +08:00 |
|
xzb
|
bfe2e437d6
|
ncc协议x
|
2023-06-07 09:25:45 +08:00 |
|
|
|
0ec14986e2
|
添加消息解析异常处理
|
2023-06-07 09:09:44 +08:00 |
|
|
|
51ecc2fed8
|
Occ消息编解码逻辑调整
完成OCC消息帧和消息解析逻辑
MessageId添加创建消息对象接口参数
|
2023-06-06 18:37:44 +08:00 |
|
tiger_zhou
|
502eb413e5
|
实时消息2.7.2-2.7.7
|
2023-06-06 17:31:42 +08:00 |
|
xzb
|
50f23d3502
|
ncc协议x
|
2023-06-06 16:48:51 +08:00 |
|
xzb
|
d33f6366ac
|
ncc协议x
|
2023-06-06 16:38:19 +08:00 |
|
xzb
|
a94d64947e
|
ncc协议x
|
2023-06-06 16:10:30 +08:00 |
|
xzb
|
5a39fd2ba4
|
ncc协议x
|
2023-06-06 16:04:46 +08:00 |
|
xzb
|
9cf0715459
|
ncc协议x
|
2023-06-06 15:59:26 +08:00 |
|
|
|
eecf834bdc
|
Merge remote-tracking branch 'origin/master'
|
2023-06-06 15:56:23 +08:00 |
|
|
|
fd617a14b9
|
1,修改encode编码接口
2,完善frame定义及构造
3,添加OCC测试服务
4,添加绘图操作保存、另存为等接口
|
2023-06-06 15:56:11 +08:00 |
|
xzb
|
89085700f4
|
ncc协议x
|
2023-06-06 15:54:05 +08:00 |
|
xzb
|
7b24842278
|
ncc协议x
|
2023-06-06 15:38:55 +08:00 |
|
xzb
|
821e3e74a3
|
ncc协议x
|
2023-06-06 15:30:48 +08:00 |
|
xzb
|
206495212a
|
ncc协议x
|
2023-06-06 15:05:16 +08:00 |
|
|
|
87cae1312d
|
修改encode编码接口
|
2023-06-06 11:18:03 +08:00 |
|
|
|
282276e80e
|
添加encode编码接口
|
2023-06-06 11:13:24 +08:00 |
|
|
|
1be24d9298
|
添加线路信息、绘图草稿数据及一些接口
|
2023-06-06 11:01:39 +08:00 |
|
|
|
2615bbf3d6
|
消息解析接口
|
2023-06-06 09:43:17 +08:00 |
|
|
|
ea4cfdd042
|
OCC消息客户端对象抽象初版
|
2023-06-05 18:14:57 +08:00 |
|
|
|
ecf561d015
|
配置微调
|
2023-06-05 13:19:15 +08:00 |
|
|
|
946e329c42
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/main/java/club/joylink/xiannccda/config/SwaggerConfig.java
# src/main/java/club/joylink/xiannccda/configuration/SpringSecurityConfiguration.java
# src/main/java/club/joylink/xiannccda/controller/TestController.java
# src/main/java/club/joylink/xiannccda/controller/advice/CommonResponseBody.java
|
2023-06-02 18:32:06 +08:00 |
|
|
|
4fad0498f8
|
SpringSecurity配置
swagger配置
注册登录、分页查询用户接口开发
|
2023-06-02 18:31:14 +08:00 |
|
tiger_zhou
|
a8f886a743
|
系统基本构成
|
2023-06-02 15:58:50 +08:00 |
|
|
|
32b90339d3
|
报警相关抽象
|
2023-05-26 18:33:47 +08:00 |
|
tiger_zhou
|
26e1b92726
|
系统基本构成
|
2023-05-25 14:06:18 +08:00 |
|
tiger_zhou
|
c8f71d1d25
|
测试基本proto生成
|
2023-05-24 15:53:50 +08:00 |
|
|
|
23843a1522
|
基础代码
|
2023-05-24 13:47:38 +08:00 |
|
