|
|
f5b9f7290c
|
rev:替换下发kep数据为MQTT
|
2024-03-28 13:43:39 +08:00 |
|
|
|
b8cb53d8b8
|
rev:驱动
|
2024-03-19 15:46:18 +08:00 |
|
|
|
6489ad259c
|
rev：mqtt
|
2024-03-19 15:46:02 +08:00 |
|
|
|
d7917a9d38
|
rev:ndc netty
|
2024-03-19 15:45:14 +08:00 |
|
|
|
1bfc70d6c7
|
rev:lucene
|
2024-03-15 08:53:31 +08:00 |
|
|
|
ddc10ecc10
|
rev:netty ndc
|
2024-02-20 14:55:04 +08:00 |
|
zhangzq
|
f1a5c41128
|
rev:日志修改（未完成）
|
2024-02-19 17:06:26 +08:00 |
|
zhangzq
|
4afc8d43b2
|
Merge branch 'feature/sanxian_acs_1213' into feature/sanxianacs1213
# Conflicts:
# wcs/nladmin-system/src/main/java/org/nl/modules/loki/service/impl/LokiServiceImpl.java
# wcs/nladmin-system/src/main/java/org/nl/modules/lucene/service/impl/LuceneServiceImpl.java
# wcs/nladmin-system/src/main/resources/config/application-dev.yml
# wcs/nladmin-system/src/main/resources/config/application-prod.yml
# wcs/nladmin-system/src/main/resources/config/application-test.yml
# wcs/nladmin-system/src/main/resources/config/application.yml
# wcs/nladmin-system/src/main/resources/logback-spring.xml
|
2024-02-19 17:00:49 +08:00 |
|
|
|
93185c9bfa
|
add:测试
|
2024-02-19 14:41:01 +08:00 |
|
zhangzq
|
990fcb563a
|
add:接入mqtt2
|
2024-02-19 14:36:33 +08:00 |
|
zhangzq
|
de54a09c5b
|
add:接入mqtt2
|
2024-02-19 14:36:09 +08:00 |
|
zhangzq
|
ccbcccfef3
|
add:接入mqtt(td:项目启停时设备信号读写2)
|
2024-02-19 13:45:48 +08:00 |
|
zhangzq
|
0d78f68bac
|
add:接入mqtt(td:项目启停时设备信号读写)
|
2024-02-04 14:14:55 +08:00 |
|
zhangzq
|
b0b9dedaee
|
add:接入mqtt(td:项目启停时设备信号读写)
|
2024-02-01 17:54:08 +08:00 |
|
zhangzq
|
86935740fc
|
add:接入mqtt(td:项目启停时设备信号读写)
|
2024-02-01 17:27:03 +08:00 |
|
|
|
300278e1c8
|
rev:更新
|
2024-01-26 15:42:39 +08:00 |
|
|
|
ce5dcdf1f4
|
rev:更新
|
2024-01-22 08:55:25 +08:00 |
|
|
|
720699bdd5
|
rev:更新
|
2024-01-15 08:54:50 +08:00 |
|
|
|
26fd3d1919
|
rev:海柔业务
|
2024-01-11 10:40:27 +08:00 |
|
|
|
3ee52d3fbc
|
rev:删除驱动里面电气信号变化记录日志
|
2024-01-03 09:00:59 +08:00 |
|
|
|
16b4e1bef3
|
add:忽略lucene生成的文件
|
2024-01-02 17:34:10 +08:00 |
|
|
|
16878950bc
|
rev:替换lucene
|
2024-01-02 17:22:47 +08:00 |
|
|
|
d967103c17
|
rev:替换lucene
|
2024-01-02 17:21:53 +08:00 |
|
|
|
93bf10bd79
|
add:海柔输送线申请空框任务
|
2023-12-29 13:49:21 +08:00 |
|
|
|
a3c6f9bb3b
|
rev:删除loki
|
2023-12-19 08:51:01 +08:00 |
|
周俊杰
|
6713250a56
|
add 海荣成品空载具入库
|
2023-12-13 16:34:23 +08:00 |
|
周俊杰
|
680159531d
|
111
|
2023-12-13 15:30:33 +08:00 |
|
zhangzq
|
007bd043f3
|
rev:工单编号
|
2023-12-13 14:44:51 +08:00 |
|
zhangzq
|
45a102eed0
|
rev:pom
|
2023-12-04 16:42:12 +08:00 |
|
zhangzq
|
1d28c7cf9e
|
rev:工单下发接口兼容暂停工单;opt:删除useragent
|
2023-12-04 16:02:16 +08:00 |
|
USER-20220102CG\noblelift
|
11a007ea36
|
rev 修改逻辑
|
2023-11-22 13:46:16 +08:00 |
|
USER-20220102CG\noblelift
|
d34baf0cce
|
rev 海柔输送线驱动
|
2023-11-22 13:31:45 +08:00 |
|
USER-20220102CG\noblelift
|
90b1e12f4f
|
rev 读取线程
|
2023-10-09 16:11:54 +08:00 |
|
jiaoliming
|
6af1fbb14c
|
rev ：acs
Signed-off-by: jiaoliming <dawnjiao@foxmail.com>
|
2023-09-25 09:53:33 +08:00 |
|
|
|
e8f6b19560
|
rev:提交aps相关代码
|
2023-09-18 13:26:48 +08:00 |
|
jiaoliming
|
c72824dd92
|
rev：中文日志改造，lucene索引排序问题优化
Signed-off-by: jiaoliming <dawnjiao@foxmail.com>
|
2023-09-12 17:06:36 +08:00 |
|
jiaoliming
|
97f23b2b0b
|
no message
Signed-off-by: jiaoliming <dawnjiao@foxmail.com>
|
2023-09-01 10:33:17 +08:00 |
|
jiaoliming
|
a25a51efa4
|
rev :lucene
Signed-off-by: jiaoliming <dawnjiao@foxmail.com>
|
2023-09-01 10:32:42 +08:00 |
|
jiaoliming
|
f3e26048f2
|
rev：设备监控
Signed-off-by: jiaoliming <dawnjiao@foxmail.com>
|
2023-09-01 10:32:04 +08:00 |
|
jiaoliming
|
1a2dcfc24c
|
add：海柔
Signed-off-by: jiaoliming <dawnjiao@foxmail.com>
|
2023-09-01 10:30:34 +08:00 |
|
jiaoliming
|
53c8103546
|
Revert "Revert "rev：系统配置，设备监控""
This reverts commit ff22772908.
|
2023-09-01 10:25:31 +08:00 |
|
jiaoliming
|
ff22772908
|
Revert "rev：系统配置，设备监控"
This reverts commit 408afd8e01.
|
2023-09-01 10:16:13 +08:00 |
|
jiaoliming
|
408afd8e01
|
rev：系统配置，设备监控
Signed-off-by: jiaoliming <dawnjiao@foxmail.com>
|
2023-09-01 10:14:18 +08:00 |
|
jiaoliming
|
ba52db4d18
|
add：新增lms业务接口
Signed-off-by: jiaoliming <dawnjiao@foxmail.com>
|
2023-09-01 10:10:36 +08:00 |
|
jiaoliming
|
d7d4341684
|
rev：指令下发
Signed-off-by: jiaoliming <dawnjiao@foxmail.com>
|
2023-09-01 10:08:22 +08:00 |
|
jiaoliming
|
4b8d2a7814
|
rev：lucene
Signed-off-by: jiaoliming <dawnjiao@foxmail.com>
|
2023-09-01 10:07:22 +08:00 |
|
jiaoliming
|
7727ca0699
|
rev： 刻字机
Signed-off-by: jiaoliming <dawnjiao@foxmail.com>
|
2023-09-01 10:06:02 +08:00 |
|
jiaoliming
|
57c10fd2fc
|
rev：清洗上料
Signed-off-by: jiaoliming <dawnjiao@foxmail.com>
|
2023-09-01 10:05:42 +08:00 |
|
jiaoliming
|
99554a6376
|
rev：包装机
Signed-off-by: jiaoliming <dawnjiao@foxmail.com>
|
2023-09-01 10:05:11 +08:00 |
|
jiaoliming
|
2ea54295a4
|
rev：机械手码垛
Signed-off-by: jiaoliming <dawnjiao@foxmail.com>
|
2023-09-01 10:04:20 +08:00 |
|
