From 936f1e6d23927a93381e3eb4949fdce273d6d77c Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期五, 22 三月 2024 13:53:25 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/entity/ShuttleDeviceStatus.java | 232 +++++++
zy-asrs-wcs/src/main/resources/mapper/rcs/ShuttleDeviceStatusMapper.xml | 5
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/service/impl/ShuttleDeviceStatusServiceImpl.java | 12
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/enums/ShuttleProtocolStatusType.java | 50 +
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/protocol/StaProtocol.java | 2
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/controller/ShuttleController.java | 73 ++
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/enums/LiftProtocolStatusType.java | 43 +
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SurayShuttleThread.java | 209 ++++++
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/ServerBootstrap.java | 105 +++
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/News.java | 2
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/Task.java | 2
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/asrs/controller/FlowController.java | 2
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/CrnThread.java | 2
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/controller/LiftController.java | 76 ++
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/FlowExecute.java | 2
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/utils/CodeBuilder.java | 6
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/protocol/LiftProtocol.java | 149 ++++
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/DevpThread.java | 2
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/cache/OutputQueue.java | 25
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SurayLiftThread.java | 210 +++++++
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/protocol/ShuttleProtocol.java | 214 +++++++
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/enums/SlaveType.java | 2
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/LiftThread.java | 9
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/ThreadHandler.java | 9
/dev/null | 126 ----
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/cache/MessageQueue.java | 6
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/controller/ShuttleDeviceStatusController.java | 101 +++
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SiemensCrnThread.java | 4
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/mapper/ShuttleDeviceStatusMapper.java | 12
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/cache/SlaveConnection.java | 63 ++
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/enums/ShuttleDeviceStatusType.java | 21
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/ShuttleThread.java | 9
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SiemensDevpThread.java | 6
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/service/ShuttleDeviceStatusService.java | 8
34 files changed, 1,654 insertions(+), 145 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/asrs/controller/FlowController.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/asrs/controller/FlowController.java
index 8b75166..e8a5ed6 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/asrs/controller/FlowController.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/asrs/controller/FlowController.java
@@ -5,7 +5,7 @@
import com.zy.asrs.wcs.asrs.entity.FlowGraph;
import com.zy.asrs.wcs.asrs.entity.param.FlowLogicCodeParam;
import com.zy.asrs.wcs.asrs.service.FlowGraphService;
-import com.zy.asrs.wcs.core.thread.FlowExecute;
+import com.zy.asrs.wcs.rcs.thread.FlowExecute;
import com.zy.asrs.wcs.system.controller.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/ServerBootstrap.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/ServerBootstrap.java
deleted file mode 100644
index 2d0ccf6..0000000
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/ServerBootstrap.java
+++ /dev/null
@@ -1,126 +0,0 @@
-package com.zy.asrs.wcs.core;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.zy.asrs.wcs.core.cache.MessageQueue;
-import com.zy.asrs.wcs.core.model.enums.SlaveType;
-import com.zy.asrs.wcs.core.utils.RedisUtil;
-import com.zy.asrs.wcs.rcs.entity.Device;
-import com.zy.asrs.wcs.rcs.entity.DeviceType;
-import com.zy.asrs.wcs.rcs.service.DeviceService;
-import com.zy.asrs.wcs.rcs.service.DeviceTypeService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import java.util.List;
-
-/**
- * Created by vincent on 2020/8/4
- */
-@Slf4j
-@Component
-public class ServerBootstrap {
-
- @Autowired
- private MainProcess mainProcess;
- @Autowired
- private RedisUtil redisUtil;
- @Autowired
- private DeviceService deviceService;
- @Autowired
- private DeviceTypeService deviceTypeService;
-
- @PostConstruct
- @Async
- public void init() throws InterruptedException {
- News.info("鏍稿績鎺у埗灞傚紑濮嬪垵濮嬪寲...............................................");
- Thread.sleep(2000);
- // 鍒濆鍖栨秷鎭槦鍒�
- initMq();
- // 鍒濆鍖栦笅浣嶆満绾跨▼
- initThread();
- // 寮�濮嬩富娴佺▼杩涚▼
- mainProcess.start();
- News.info("鏍稿績鎺у埗灞傚凡鍚姩...............................................");
- }
-
- private void initMq(){
- // 鍒濆鍖栬澶噈q
- for (Device device : deviceService.list()) {
- DeviceType type = deviceTypeService.getById(device.getDeviceType());
- SlaveType slaveType = SlaveType.findInstance(type.getFlag());
- if (slaveType != null) {
- MessageQueue.init(slaveType, device.getId().intValue());
- }
- }
- }
-
- private void initThread(){
- List<DeviceType> list1 = deviceTypeService.list();
- for (DeviceType type : deviceTypeService.list()) {
- List<Device> list = deviceService.list(new LambdaQueryWrapper<Device>()
- .eq(Device::getDeviceType, type.getId())
- .eq(Device::getStatus, 1)
- );
- if (list.isEmpty()) {
- continue;
- }
-
- News.info("鍒濆鍖杮}绾跨▼...................................................", type.getName());
- }
-
-
-// // 鍒濆鍖栬緭閫佺嚎绾跨▼
-// News.info("鍒濆鍖栬緭閫佺嚎绾跨▼...................................................");
-// for (DevpSlave devp : slaveProperties.getDevp()) {
-// DevpThread devpThread = new SiemensDevpThread(devp);
-// new Thread((Runnable) devpThread).start();
-// SlaveConnection.put(SlaveType.Devp, devp.getId(), devpThread);
-// }
-// // 鍒濆鍖栨彁鍗囨満
-// News.info("鍒濆鍖栨彁鍗囨満........................................................");
-// for (LiftSlave liftSlave : slaveProperties.getLift()) {
-// SiemensLiftThread liftThread = new SiemensLiftThread(liftSlave, redisUtil);
-// new Thread(liftThread).start();
-// SlaveConnection.put(SlaveType.Lift, liftSlave.getId(), liftThread);
-// }
-// // 鍒濆鍖栧洓鍚戠┛姊溅
-// News.info("鍒濆鍖栧洓鍚戠┛姊溅......................................................");
-// for (ShuttleSlave shuttleSlave : slaveProperties.getShuttle()) {
-// ShuttleThread shuttleThread = new ShuttleThread(shuttleSlave,redisUtil);
-// new Thread(shuttleThread).start();
-// SlaveConnection.put(SlaveType.Shuttle, shuttleSlave.getId(), shuttleThread);
-// }
-// // 鍒濆鍖栨潯鐮佹壂鎻忎华绾跨▼
-// News.info("鍒濆鍖栨潯鐮佹壂鎻忎华绾跨▼...................................................");
-// for (Slave barcode : slaveProperties.getBarcode()) {
-// BarcodeThread barcodeThread = new BarcodeThread(barcode);
-// new Thread(barcodeThread).start();
-// SlaveConnection.put(SlaveType.Barcode, barcode.getId(), barcodeThread);
-// }
-// // 鍒濆鍖朙ED绾跨▼
-// News.info("鍒濆鍖朙ED绾跨▼...................................................");
-// for (LedSlave led : slaveProperties.getLed()) {
-// LedThread ledThread = new LedThread(led);
-// new Thread(ledThread).start();
-// SlaveConnection.put(SlaveType.Led, led.getId(), ledThread);
-// }
- // 鍒濆鍖栫绉ょ嚎绋�
-// News.info("鍒濆鍖栫绉ょ嚎绋�...................................................");
-// for (Slave scale : slaveProperties.getScale()) {
-// ScaleThread barcodeThread = new ScaleThread(scale);
-// new Thread(barcodeThread).start();
-// SlaveConnection.put(SlaveType.Scale, scale.getId(), barcodeThread);
-// }
- }
-
-
- @PreDestroy
- public void destroy() {
- }
-
-
-}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/News.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/News.java
similarity index 99%
rename from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/News.java
rename to zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/News.java
index 3389ad3..85d6e9d 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/News.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/News.java
@@ -1,4 +1,4 @@
-package com.zy.asrs.wcs.core;
+package com.zy.asrs.wcs.rcs;
import lombok.extern.slf4j.Slf4j;
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/ServerBootstrap.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/ServerBootstrap.java
new file mode 100644
index 0000000..90934c5
--- /dev/null
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/ServerBootstrap.java
@@ -0,0 +1,105 @@
+package com.zy.asrs.wcs.rcs;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.zy.asrs.wcs.core.MainProcess;
+import com.zy.asrs.wcs.rcs.cache.MessageQueue;
+import com.zy.asrs.wcs.rcs.cache.SlaveConnection;
+import com.zy.asrs.wcs.rcs.model.enums.SlaveType;
+import com.zy.asrs.wcs.rcs.thread.ThreadHandler;
+import com.zy.asrs.wcs.core.utils.RedisUtil;
+import com.zy.asrs.wcs.rcs.entity.Device;
+import com.zy.asrs.wcs.rcs.entity.DevicePlc;
+import com.zy.asrs.wcs.rcs.entity.DeviceType;
+import com.zy.asrs.wcs.rcs.service.DevicePlcService;
+import com.zy.asrs.wcs.rcs.service.DeviceService;
+import com.zy.asrs.wcs.rcs.service.DeviceTypeService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+import java.lang.reflect.Constructor;
+import java.util.List;
+
+/**
+ * Created by vincent on 2020/8/4
+ */
+@Slf4j
+@Component
+public class ServerBootstrap {
+
+ @Autowired
+ private MainProcess mainProcess;
+ @Autowired
+ private RedisUtil redisUtil;
+ @Autowired
+ private DeviceService deviceService;
+ @Autowired
+ private DeviceTypeService deviceTypeService;
+ @Autowired
+ private DevicePlcService devicePlcService;
+
+ @PostConstruct
+ @Async
+ public void init() throws InterruptedException {
+ News.info("鏍稿績鎺у埗灞傚紑濮嬪垵濮嬪寲...............................................");
+ Thread.sleep(2000);
+ // 鍒濆鍖栨秷鎭槦鍒�
+ initMq();
+ // 鍒濆鍖栦笅浣嶆満绾跨▼
+ initThread();
+ // 寮�濮嬩富娴佺▼杩涚▼
+ mainProcess.start();
+ News.info("鏍稿績鎺у埗灞傚凡鍚姩...............................................");
+ }
+
+ private void initMq(){
+ // 鍒濆鍖栬澶噈q
+ for (Device device : deviceService.list()) {
+ DeviceType type = deviceTypeService.getById(device.getDeviceType());
+ SlaveType slaveType = SlaveType.findInstance(type.getFlag());
+ if (slaveType != null) {
+ MessageQueue.init(slaveType, device.getId().intValue());
+ }
+ }
+ }
+
+ private void initThread(){
+ for (DeviceType type : deviceTypeService.list()) {
+ List<Device> list = deviceService.list(new LambdaQueryWrapper<Device>()
+ .eq(Device::getDeviceType, type.getId())
+ .eq(Device::getStatus, 1)
+ );
+ if (list.isEmpty()) {
+ continue;
+ }
+
+ News.info("鍒濆鍖杮}绾跨▼...................................................", type.getName());
+ for (Device device : list) {
+ DevicePlc devicePlc = devicePlcService.getById(device.getDevicePlc());
+ if (devicePlc == null) {
+ continue;
+ }
+
+ try {
+ Class<?> clazz = Class.forName("com.zy.asrs.wcs.rcs.thread.impl." + devicePlc.getFlag());
+ Constructor<?> constructor = clazz.getConstructor(Device.class, RedisUtil.class);
+ Object instance = constructor.newInstance(device, redisUtil);
+ new Thread((Runnable) instance).start();
+ SlaveConnection.put(SlaveType.findInstance(type.getFlag()), device.getId().intValue(), (ThreadHandler) instance);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ }
+ }
+
+
+ @PreDestroy
+ public void destroy() {
+ }
+
+
+}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/cache/MessageQueue.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/cache/MessageQueue.java
similarity index 97%
rename from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/cache/MessageQueue.java
rename to zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/cache/MessageQueue.java
index 82670eb..e6361a6 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/cache/MessageQueue.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/cache/MessageQueue.java
@@ -1,7 +1,7 @@
-package com.zy.asrs.wcs.core.cache;
+package com.zy.asrs.wcs.rcs.cache;
-import com.zy.asrs.wcs.core.model.Task;
-import com.zy.asrs.wcs.core.model.enums.SlaveType;
+import com.zy.asrs.wcs.rcs.model.Task;
+import com.zy.asrs.wcs.rcs.model.enums.SlaveType;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/cache/OutputQueue.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/cache/OutputQueue.java
new file mode 100644
index 0000000..a91b50d
--- /dev/null
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/cache/OutputQueue.java
@@ -0,0 +1,25 @@
+package com.zy.asrs.wcs.rcs.cache;
+
+import com.alibaba.fastjson.JSONObject;
+
+import java.util.concurrent.ArrayBlockingQueue;
+
+/**
+ * Created by vincent on 2020/8/17
+ */
+public class OutputQueue {
+
+ // 鍫嗗灈鏈鸿緭鍑烘棩蹇�
+ public static ArrayBlockingQueue<String> CRN = new ArrayBlockingQueue<>(32);
+ // 杈撻�佺嚎杈撳嚭鏃ュ織
+ public static ArrayBlockingQueue<String> DEVP = new ArrayBlockingQueue<>(32);
+ // 鏉＄爜鍣ㄨ緭鍑烘棩蹇�
+ public static ArrayBlockingQueue<JSONObject> BARCODE = new ArrayBlockingQueue<>(32);
+ // 绌挎杞﹁緭鍑烘棩蹇�
+ public static ArrayBlockingQueue<String> STE = new ArrayBlockingQueue<>(32);
+ //鍥涘悜绌挎杞﹁緭鍑烘棩蹇�
+ public static ArrayBlockingQueue<String> SHUTTLE = new ArrayBlockingQueue<>(32);
+ //鎻愬崌鏈鸿緭鍑烘棩蹇�
+ public static ArrayBlockingQueue<String> LIFT = new ArrayBlockingQueue<>(32);
+
+}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/cache/SlaveConnection.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/cache/SlaveConnection.java
new file mode 100644
index 0000000..12e4d13
--- /dev/null
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/cache/SlaveConnection.java
@@ -0,0 +1,63 @@
+package com.zy.asrs.wcs.rcs.cache;
+
+import com.zy.asrs.wcs.rcs.model.enums.SlaveType;
+import com.zy.asrs.wcs.rcs.thread.ThreadHandler;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * 绾跨▼缂撳瓨瀹瑰櫒
+ * Created by vincent on 2020/8/4
+ */
+public class SlaveConnection {
+
+ private static final String _LINK = "_";
+
+ private static final Map<String, ThreadHandler> conContain = new ConcurrentHashMap<>();
+
+ public static void put(SlaveType type, Integer id, ThreadHandler threadHandler) {
+ String key = toKey(type, id);
+ remove(type, id);
+ conContain.put(key, threadHandler);
+ }
+
+ public static ThreadHandler get(SlaveType type, Integer id) {
+ return conContain.get(toKey(type, id));
+ }
+
+ public static void remove(SlaveType type, Integer id) {
+ ThreadHandler threadHandler = get(type, id);
+ if (null == threadHandler) {
+ return;
+ }
+ conContain.remove(toKey(type, id));
+ threadHandler.close();
+ }
+
+ public static Integer remove(ThreadHandler threadHandler) {
+ if (null == threadHandler) {
+ return null;
+ }
+ String key = null;
+ for (Map.Entry<String, ThreadHandler> entry : conContain.entrySet()){
+ if (entry.getValue() == threadHandler) {
+ key = entry.getKey();
+ break;
+ }
+ }
+ if (null != key) {
+ SlaveType type = SlaveType.findInstance(key);
+ Integer id = Integer.parseInt(key.split(_LINK)[1]);
+ remove(type, id);
+ return id;
+ } else {
+ return null;
+ }
+ }
+
+ private static String toKey(SlaveType type, Integer id){
+ return type.toString()+_LINK+id;
+ }
+
+}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/controller/LiftController.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/controller/LiftController.java
new file mode 100644
index 0000000..c297209
--- /dev/null
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/controller/LiftController.java
@@ -0,0 +1,76 @@
+package com.zy.asrs.wcs.rcs.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.zy.asrs.framework.common.R;
+import com.zy.asrs.wcs.rcs.cache.SlaveConnection;
+import com.zy.asrs.wcs.rcs.entity.Device;
+import com.zy.asrs.wcs.rcs.entity.DeviceType;
+import com.zy.asrs.wcs.rcs.model.enums.SlaveType;
+import com.zy.asrs.wcs.rcs.model.protocol.LiftProtocol;
+import com.zy.asrs.wcs.rcs.service.DeviceService;
+import com.zy.asrs.wcs.rcs.service.DeviceTypeService;
+import com.zy.asrs.wcs.rcs.thread.LiftThread;
+import com.zy.asrs.wcs.system.controller.BaseController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@RestController
+@RequestMapping("/api")
+public class LiftController extends BaseController {
+
+ @Autowired
+ private DeviceService deviceService;
+ @Autowired
+ private DeviceTypeService deviceTypeService;
+
+ @GetMapping("/lift/status/list")
+ public R getLiftStatusList() {
+ DeviceType deviceType = deviceTypeService.getOne(new LambdaQueryWrapper<DeviceType>()
+ .eq(DeviceType::getHostId, getHostId())
+ .eq(DeviceType::getStatus, 1)
+ .eq(DeviceType::getFlag, String.valueOf(SlaveType.Lift)));
+ if (deviceType == null) {
+ return R.error("璁惧绫诲瀷涓嶅瓨鍦�");
+ }
+
+ ArrayList<LiftProtocol> data = new ArrayList<>();
+ List<Device> list = deviceService.list(new LambdaQueryWrapper<Device>()
+ .eq(Device::getHostId, getHostId())
+ .eq(Device::getStatus, 1)
+ .eq(Device::getDeviceType, deviceType.getId()));
+ for (Device device : list) {
+ LiftThread liftThread = (LiftThread) SlaveConnection.get(SlaveType.Lift, device.getId().intValue());
+ LiftProtocol status = liftThread.getStatus();
+ data.add(status);
+ }
+ return R.ok().add(data);
+ }
+
+ @GetMapping("/lift/status/one/{deviceNo}")
+ public R getLiftStatus(@PathVariable String deviceNo) {
+ DeviceType deviceType = deviceTypeService.getOne(new LambdaQueryWrapper<DeviceType>()
+ .eq(DeviceType::getHostId, getHostId())
+ .eq(DeviceType::getStatus, 1)
+ .eq(DeviceType::getFlag, String.valueOf(SlaveType.Lift)));
+ if (deviceType == null) {
+ return R.error("璁惧绫诲瀷涓嶅瓨鍦�");
+ }
+
+ Device device = deviceService.getOne(new LambdaQueryWrapper<Device>()
+ .eq(Device::getHostId, getHostId())
+ .eq(Device::getStatus, 1)
+ .eq(Device::getDeviceType, deviceType.getId())
+ .eq(Device::getDeviceNo, deviceNo));
+
+ LiftThread liftThread = (LiftThread) SlaveConnection.get(SlaveType.Lift, device.getId().intValue());
+ LiftProtocol status = liftThread.getStatus();
+ return R.ok().add(status);
+ }
+
+}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/controller/ShuttleController.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/controller/ShuttleController.java
new file mode 100644
index 0000000..f7e64ab
--- /dev/null
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/controller/ShuttleController.java
@@ -0,0 +1,73 @@
+package com.zy.asrs.wcs.rcs.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.zy.asrs.framework.common.R;
+import com.zy.asrs.wcs.rcs.cache.SlaveConnection;
+import com.zy.asrs.wcs.rcs.entity.Device;
+import com.zy.asrs.wcs.rcs.entity.DeviceType;
+import com.zy.asrs.wcs.rcs.model.enums.SlaveType;
+import com.zy.asrs.wcs.rcs.model.protocol.ShuttleProtocol;
+import com.zy.asrs.wcs.rcs.service.DeviceService;
+import com.zy.asrs.wcs.rcs.service.DeviceTypeService;
+import com.zy.asrs.wcs.rcs.thread.ShuttleThread;
+import com.zy.asrs.wcs.system.controller.BaseController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@RestController
+@RequestMapping("/api")
+public class ShuttleController extends BaseController {
+
+ @Autowired
+ private DeviceService deviceService;
+ @Autowired
+ private DeviceTypeService deviceTypeService;
+
+ @GetMapping("/shuttle/status/list")
+ public R getShuttleStatusList() {
+ DeviceType deviceType = deviceTypeService.getOne(new LambdaQueryWrapper<DeviceType>()
+ .eq(DeviceType::getHostId, getHostId())
+ .eq(DeviceType::getStatus, 1)
+ .eq(DeviceType::getFlag, String.valueOf(SlaveType.Shuttle)));
+ if (deviceType == null) {
+ return R.error("璁惧绫诲瀷涓嶅瓨鍦�");
+ }
+
+ ArrayList<ShuttleProtocol> data = new ArrayList<>();
+ List<Device> list = deviceService.list(new LambdaQueryWrapper<Device>()
+ .eq(Device::getHostId, getHostId())
+ .eq(Device::getStatus, 1)
+ .eq(Device::getDeviceType, deviceType.getId()));
+ for (Device device : list) {
+ ShuttleThread shuttleThread = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, device.getId().intValue());
+ ShuttleProtocol status = shuttleThread.getStatus();
+ data.add(status);
+ }
+ return R.ok().add(data);
+ }
+
+ @GetMapping("/shuttle/status/one/{deviceNo}")
+ public R getShuttleStatus(@PathVariable String deviceNo) {
+ DeviceType deviceType = deviceTypeService.getOne(new LambdaQueryWrapper<DeviceType>()
+ .eq(DeviceType::getHostId, getHostId())
+ .eq(DeviceType::getStatus, 1)
+ .eq(DeviceType::getFlag, String.valueOf(SlaveType.Shuttle)));
+ if (deviceType == null) {
+ return R.error("璁惧绫诲瀷涓嶅瓨鍦�");
+ }
+
+ Device device = deviceService.getOne(new LambdaQueryWrapper<Device>()
+ .eq(Device::getHostId, getHostId())
+ .eq(Device::getStatus, 1)
+ .eq(Device::getDeviceType, deviceType.getId())
+ .eq(Device::getDeviceNo, deviceNo));
+
+ ShuttleThread shuttleThread = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, device.getId().intValue());
+ ShuttleProtocol status = shuttleThread.getStatus();
+ return R.ok().add(status);
+ }
+
+}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/controller/ShuttleDeviceStatusController.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/controller/ShuttleDeviceStatusController.java
new file mode 100644
index 0000000..5d8329a
--- /dev/null
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/controller/ShuttleDeviceStatusController.java
@@ -0,0 +1,101 @@
+package com.zy.asrs.wcs.system.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zy.asrs.framework.common.Cools;
+import com.zy.asrs.framework.common.R;
+import com.zy.asrs.wcs.common.annotation.OperationLog;
+import com.zy.asrs.wcs.common.domain.BaseParam;
+import com.zy.asrs.wcs.common.domain.KeyValVo;
+import com.zy.asrs.wcs.common.domain.PageParam;
+import com.zy.asrs.wcs.rcs.entity.ShuttleDeviceStatus;
+import com.zy.asrs.wcs.rcs.service.ShuttleDeviceStatusService;
+import com.zy.asrs.wcs.utils.ExcelUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping("/api")
+public class ShuttleDeviceStatusController extends BaseController {
+
+ @Autowired
+ private ShuttleDeviceStatusService shuttleDeviceStatusService;
+
+ @PreAuthorize("hasAuthority('rcs:shuttleDeviceStatus:list')")
+ @PostMapping("/shuttleDeviceStatus/page")
+ public R page(@RequestBody Map<String, Object> map) {
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<ShuttleDeviceStatus, BaseParam> pageParam = new PageParam<>(baseParam, ShuttleDeviceStatus.class);
+ return R.ok().add(shuttleDeviceStatusService.page(pageParam, pageParam.buildWrapper(true)));
+ }
+
+ @PreAuthorize("hasAuthority('rcs:shuttleDeviceStatus:list')")
+ @PostMapping("/shuttleDeviceStatus/list")
+ public R list(@RequestBody Map<String, Object> map) {
+ return R.ok().add(shuttleDeviceStatusService.list());
+ }
+
+ @PreAuthorize("hasAuthority('rcs:shuttleDeviceStatus:list')")
+ @GetMapping("/shuttleDeviceStatus/{id}")
+ public R get(@PathVariable("id") Long id) {
+ return R.ok().add(shuttleDeviceStatusService.getById(id));
+ }
+
+ @PreAuthorize("hasAuthority('rcs:shuttleDeviceStatus:save')")
+ @OperationLog("娣诲姞鍥涘悜杞﹁澶囩姸鎬佸垪琛�")
+ @PostMapping("/shuttleDeviceStatus/save")
+ public R save(@RequestBody ShuttleDeviceStatus shuttleDeviceStatus) {
+ if (!shuttleDeviceStatusService.save(shuttleDeviceStatus)) {
+ return R.error("娣诲姞澶辫触");
+ }
+ return R.ok("娣诲姞鎴愬姛");
+ }
+
+ @PreAuthorize("hasAuthority('rcs:shuttleDeviceStatus:update')")
+ @OperationLog("淇敼鍥涘悜杞﹁澶囩姸鎬佸垪琛�")
+ @PostMapping("/shuttleDeviceStatus/update")
+ public R update(@RequestBody ShuttleDeviceStatus shuttleDeviceStatus) {
+ if (!shuttleDeviceStatusService.updateById(shuttleDeviceStatus)) {
+ return R.error("淇敼澶辫触");
+ }
+ return R.ok("淇敼鎴愬姛");
+ }
+
+ @PreAuthorize("hasAuthority('rcs:shuttleDeviceStatus:remove')")
+ @OperationLog("鍒犻櫎鍥涘悜杞﹁澶囩姸鎬佸垪琛�")
+ @PostMapping("/shuttleDeviceStatus/remove/{ids}")
+ public R remove(@PathVariable Long[] ids) {
+ if (!shuttleDeviceStatusService.removeByIds(Arrays.asList(ids))) {
+ return R.error("鍒犻櫎澶辫触");
+ }
+ return R.ok("鍒犻櫎鎴愬姛");
+ }
+
+ @PreAuthorize("hasAuthority('rcs:shuttleDeviceStatus:list')")
+ @PostMapping("/shuttleDeviceStatus/query")
+ public R query(@RequestParam(required = false) String condition) {
+ List<KeyValVo> vos = new ArrayList<>();
+ LambdaQueryWrapper<ShuttleDeviceStatus> wrapper = new LambdaQueryWrapper<>();
+ if (!Cools.isEmpty(condition)) {
+ wrapper.like(ShuttleDeviceStatus::getName, condition);
+ }
+ shuttleDeviceStatusService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
+ item -> vos.add(new KeyValVo(item.getId(), item.getName()))
+ );
+ return R.ok().add(vos);
+ }
+
+ @PreAuthorize("hasAuthority('rcs:shuttleDeviceStatus:list')")
+ @PostMapping("/shuttleDeviceStatus/export")
+ public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
+ ExcelUtil.build(ExcelUtil.create(shuttleDeviceStatusService.list(), ShuttleDeviceStatus.class), response);
+ }
+
+}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/entity/ShuttleDeviceStatus.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/entity/ShuttleDeviceStatus.java
new file mode 100644
index 0000000..af77b51
--- /dev/null
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/entity/ShuttleDeviceStatus.java
@@ -0,0 +1,232 @@
+package com.zy.asrs.wcs.rcs.entity;
+
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import com.zy.asrs.wcs.rcs.service.DevicePlcService;
+import com.zy.asrs.wcs.system.entity.Host;
+import com.zy.asrs.wcs.system.entity.User;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.zy.asrs.framework.common.Cools;
+import com.zy.asrs.framework.common.SpringUtils;
+import com.zy.asrs.wcs.system.service.UserService;
+import com.zy.asrs.wcs.system.service.HostService;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@TableName("wcs_shuttle_device_status")
+public class ShuttleDeviceStatus implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ID
+ */
+ @ApiModelProperty(value= "ID")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 缂栧彿
+ */
+ @ApiModelProperty(value= "缂栧彿")
+ private String uuid;
+
+ /**
+ * 鐘舵�佸悕绉�
+ */
+ @ApiModelProperty(value= "鐘舵�佸悕绉�")
+ private String name;
+
+ /**
+ * 鏍囪瘑
+ */
+ @ApiModelProperty(value= "鏍囪瘑")
+ private String flag;
+
+ /**
+ * 鎵�灞炴満鏋�
+ */
+ @ApiModelProperty(value= "鎵�灞炴満鏋�")
+ private Long hostId;
+
+ /**
+ * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
+ */
+ @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
+ private Integer status;
+
+ /**
+ * 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
+ */
+ @ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
+ private Integer deleted;
+
+ /**
+ * 娣诲姞鏃堕棿
+ */
+ @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ /**
+ * 娣诲姞浜哄憳
+ */
+ @ApiModelProperty(value= "娣诲姞浜哄憳")
+ private Long createBy;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ @ApiModelProperty(value= "淇敼鏃堕棿")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
+
+ /**
+ * 淇敼浜哄憳
+ */
+ @ApiModelProperty(value= "淇敼浜哄憳")
+ private Long updateBy;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value= "澶囨敞")
+ private String memo;
+
+ /**
+ * 璁惧鐘舵��
+ */
+ @ApiModelProperty(value= "璁惧鐘舵��")
+ private String deviceStatus;
+
+ /**
+ * PLC绫诲瀷
+ */
+ @ApiModelProperty(value= "PLC绫诲瀷")
+ private Long devicePlc;
+
+ public ShuttleDeviceStatus() {}
+
+ public ShuttleDeviceStatus(String uuid,String name,String flag,Long hostId,Integer status,Integer deleted,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo,String deviceStatus,Long devicePlc) {
+ this.uuid = uuid;
+ this.name = name;
+ this.flag = flag;
+ this.hostId = hostId;
+ this.status = status;
+ this.deleted = deleted;
+ this.createTime = createTime;
+ this.createBy = createBy;
+ this.updateTime = updateTime;
+ this.updateBy = updateBy;
+ this.memo = memo;
+ this.deviceStatus = deviceStatus;
+ this.devicePlc = devicePlc;
+ }
+
+// ShuttleDeviceStatus shuttleDeviceStatus = new ShuttleDeviceStatus(
+// null, // 缂栧彿
+// null, // 鐘舵�佸悕绉�
+// null, // 鏍囪瘑
+// null, // 鎵�灞炴満鏋�
+// null, // 鐘舵��
+// null, // 鏄惁鍒犻櫎
+// null, // 娣诲姞鏃堕棿
+// null, // 娣诲姞浜哄憳
+// null, // 淇敼鏃堕棿
+// null, // 淇敼浜哄憳
+// null, // 澶囨敞
+// null, // 璁惧鐘舵��
+// null // PLC绫诲瀷
+// );
+
+ public String getHostId$(){
+ HostService service = SpringUtils.getBean(HostService.class);
+ Host host = service.getById(this.hostId);
+ if (!Cools.isEmpty(host)){
+ return String.valueOf(host.getName());
+ }
+ return null;
+ }
+
+ public String getStatus$(){
+ if (null == this.status){ return null; }
+ switch (this.status){
+ case 1:
+ return "姝ｅ父";
+ case 0:
+ return "绂佺敤";
+ default:
+ return String.valueOf(this.status);
+ }
+ }
+
+ public String getDeleted$(){
+ if (null == this.deleted){ return null; }
+ switch (this.deleted){
+ case 1:
+ return "鏄�";
+ case 0:
+ return "鍚�";
+ default:
+ return String.valueOf(this.deleted);
+ }
+ }
+
+ public String getCreateTime$(){
+ if (Cools.isEmpty(this.createTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
+ }
+
+ public String getCreateBy$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.getById(this.createBy);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getNickname());
+ }
+ return null;
+ }
+
+ public String getUpdateTime$(){
+ if (Cools.isEmpty(this.updateTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
+ }
+
+ public String getUpdateBy$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.getById(this.updateBy);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getNickname());
+ }
+ return null;
+ }
+
+ public String getDevicePlc$(){
+ DevicePlcService service = SpringUtils.getBean(DevicePlcService.class);
+ DevicePlc devicePlc = service.getById(this.devicePlc);
+ if (!Cools.isEmpty(devicePlc)){
+ return String.valueOf(devicePlc.getName());
+ }
+ return null;
+ }
+
+
+}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/mapper/ShuttleDeviceStatusMapper.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/mapper/ShuttleDeviceStatusMapper.java
new file mode 100644
index 0000000..3fdb9d3
--- /dev/null
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/mapper/ShuttleDeviceStatusMapper.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.wcs.rcs.mapper;
+
+import com.zy.asrs.wcs.rcs.entity.ShuttleDeviceStatus;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface ShuttleDeviceStatusMapper extends BaseMapper<ShuttleDeviceStatus> {
+
+}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/model/Task.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/Task.java
similarity index 88%
rename from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/model/Task.java
rename to zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/Task.java
index 2c4f222..911f686 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/model/Task.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/Task.java
@@ -1,4 +1,4 @@
-package com.zy.asrs.wcs.core.model;
+package com.zy.asrs.wcs.rcs.model;
import lombok.Data;
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/enums/LiftProtocolStatusType.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/enums/LiftProtocolStatusType.java
new file mode 100644
index 0000000..565d3d1
--- /dev/null
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/enums/LiftProtocolStatusType.java
@@ -0,0 +1,43 @@
+package com.zy.asrs.wcs.rcs.model.enums;
+
+public enum LiftProtocolStatusType {
+
+ NONE(-1, "鏈煡"),
+ IDLE(1, "绌洪棽"),
+ WORKING(2, "浣滀笟涓�"),
+ WAITING(3, "绛夊緟纭"),
+ OFFLINE(4, "绂荤嚎"),
+ ;
+
+ public Integer id;
+ public String desc;
+
+ LiftProtocolStatusType(Integer id, String desc) {
+ this.id = id;
+ this.desc = desc;
+ }
+
+ public static LiftProtocolStatusType get(Integer id) {
+ if (null == id) {
+ return null;
+ }
+ for (LiftProtocolStatusType type : LiftProtocolStatusType.values()) {
+ if (type.id.equals(id.intValue())) {
+ return type;
+ }
+ }
+ return null;
+ }
+
+ public static LiftProtocolStatusType get(LiftProtocolStatusType type) {
+ if (null == type) {
+ return null;
+ }
+ for (LiftProtocolStatusType type2 : LiftProtocolStatusType.values()) {
+ if (type2 == type) {
+ return type2;
+ }
+ }
+ return null;
+ }
+}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/enums/ShuttleDeviceStatusType.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/enums/ShuttleDeviceStatusType.java
new file mode 100644
index 0000000..0fd61b9
--- /dev/null
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/enums/ShuttleDeviceStatusType.java
@@ -0,0 +1,21 @@
+package com.zy.asrs.wcs.rcs.model.enums;
+
+public enum ShuttleDeviceStatusType {
+
+ NONE,//鏈煡
+ IDLE,//绌洪棽
+ OFFLINE,//绂荤嚎
+ WORKING,//宸ヤ綔涓�
+ CHARGING,//鍏呯數涓�
+ ;
+
+ public static ShuttleDeviceStatusType findInstance(String s){
+ for (ShuttleDeviceStatusType type : ShuttleDeviceStatusType.values()) {
+ if (type.toString().equals(s)) {
+ return type;
+ }
+ }
+ return null;
+ }
+
+}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/enums/ShuttleProtocolStatusType.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/enums/ShuttleProtocolStatusType.java
new file mode 100644
index 0000000..49ed18b
--- /dev/null
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/enums/ShuttleProtocolStatusType.java
@@ -0,0 +1,50 @@
+package com.zy.asrs.wcs.rcs.model.enums;
+
+/**
+ * 鍥涘悜绌挎杞﹀唴閮ㄧ姸鎬佹灇涓�
+ */
+public enum ShuttleProtocolStatusType {
+
+ NONE(0, "鏈煡"),
+ IDLE(1, "绌洪棽"),
+ WORKING(2, "浣滀笟涓�"),
+ WAITING(3, "绛夊緟纭"),
+ CHARGING(4, "鍏呯數涓�"),
+ CHARGING_WAITING(5, "鍏呯數浠诲姟绛夊緟纭"),
+ FIXING(6, "鏁呴殰淇涓�"),
+ OFFLINE(7, "绂荤嚎"),
+ ;
+
+ public Integer id;
+ public String desc;
+
+ ShuttleProtocolStatusType(Integer id, String desc) {
+ this.id = id;
+ this.desc = desc;
+ }
+
+ public static ShuttleProtocolStatusType get(Integer id) {
+ if (null == id) {
+ return null;
+ }
+ for (ShuttleProtocolStatusType type : ShuttleProtocolStatusType.values()) {
+ if (type.id.equals(id.intValue())) {
+ return type;
+ }
+ }
+ return null;
+ }
+
+ public static ShuttleProtocolStatusType get(ShuttleProtocolStatusType type) {
+ if (null == type) {
+ return null;
+ }
+ for (ShuttleProtocolStatusType type2 : ShuttleProtocolStatusType.values()) {
+ if (type2 == type) {
+ return type2;
+ }
+ }
+ return null;
+ }
+
+}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/model/enums/SlaveType.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/enums/SlaveType.java
similarity index 89%
rename from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/model/enums/SlaveType.java
rename to zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/enums/SlaveType.java
index 1118943..15d572d 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/model/enums/SlaveType.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/enums/SlaveType.java
@@ -1,4 +1,4 @@
-package com.zy.asrs.wcs.core.model.enums;
+package com.zy.asrs.wcs.rcs.model.enums;
public enum SlaveType {
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/protocol/LiftProtocol.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/protocol/LiftProtocol.java
new file mode 100644
index 0000000..7ea5a7f
--- /dev/null
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/protocol/LiftProtocol.java
@@ -0,0 +1,149 @@
+package com.zy.asrs.wcs.rcs.model.protocol;
+
+import com.zy.asrs.wcs.rcs.entity.Device;
+import com.zy.asrs.wcs.rcs.model.enums.LiftProtocolStatusType;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@Data
+public class LiftProtocol {
+
+ //**********************蹇呴』瀛樺湪灞炴��**********************
+ /**
+ * 鎻愬崌鏈哄彿
+ */
+ private String liftNo;
+
+ /**
+ * 浠诲姟鍙�
+ */
+ private String taskNo;
+
+ /**
+ * 鍥涘悜绌挎杞﹀彿
+ */
+ private Integer shuttleNo = 0;
+
+ /**
+ * 褰撳墠鎻愬崌鏈虹姸鎬侊紙鍐呴儴鑷垜缁存姢锛�
+ */
+ private Integer protocolStatus = -1;
+
+ /**
+ * 褰撳墠鎻愬崌鏈虹姸鎬佹灇涓�
+ */
+ private LiftProtocolStatusType protocolStatusType = LiftProtocolStatusType.NONE;
+
+ /**
+ * 妯″紡 => 鑷姩/鎵嬪姩
+ */
+ private Boolean model;
+
+ /**
+ * 杩愯鐘舵��
+ */
+ private Boolean run;
+
+ /**
+ * 灏辩华鐘舵��
+ */
+ private Boolean ready;
+
+ /**
+ * 鍓嶈秴闄�
+ */
+ private Boolean frontOverrun;
+
+ /**
+ * 鍚庤秴闄�
+ */
+ private Boolean backOverrun;
+
+ /**
+ * 宸﹁秴闄�
+ */
+ private Boolean leftOverrun;
+
+ /**
+ * 鍙宠秴闄�
+ */
+ private Boolean rightOverrun;
+
+ /**
+ * 瓒呴珮
+ */
+ private Boolean overHeight;
+
+ /**
+ * 瓒呴噸
+ */
+ private Boolean overWeight;
+
+ /**
+ * 鏈夋墭鐩�
+ */
+ private Boolean hasTray;
+
+ /**
+ * 鏈夊皬杞�
+ */
+ private Boolean hasCar;
+
+ /**
+ * 鏁呴殰鐮�
+ */
+ private String errorCode;
+
+ /**
+ * 浠诲姟鍦板潃
+ */
+ private Short taskAddress;
+
+ /**
+ * 鐩殑鍦板潃
+ */
+ private Short distAddress;
+
+ /**
+ * 宸插畬鎴愮殑浠诲姟鍙�
+ */
+ private String completeTaskNo;
+
+ /**
+ * 灞�
+ */
+ private Integer lev;
+
+ /**
+ * 浣滀笟鏍囪
+ */
+ private Boolean pakMk = false;
+
+ /**
+ * 鏃ュ織閲囬泦鏃堕棿
+ */
+ private Long deviceDataLog = System.currentTimeMillis();
+
+ /**
+ * 璁惧淇℃伅
+ */
+ private Device device;
+
+ /**
+ * 璁剧疆鎻愬崌鏈虹姸鎬�
+ */
+ public void setProtocolStatus(Integer status) {
+ this.protocolStatus = status;
+ this.protocolStatusType = LiftProtocolStatusType.get(status);
+ }
+
+ /**
+ * 璁剧疆鎻愬崌鏈虹姸鎬�
+ */
+ public void setProtocolStatus(LiftProtocolStatusType status) {
+ this.protocolStatus = status.id;
+ this.protocolStatusType = status;
+ }
+
+}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/protocol/ShuttleProtocol.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/protocol/ShuttleProtocol.java
new file mode 100644
index 0000000..325a2f5
--- /dev/null
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/protocol/ShuttleProtocol.java
@@ -0,0 +1,214 @@
+package com.zy.asrs.wcs.rcs.model.protocol;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.zy.asrs.framework.common.SpringUtils;
+import com.zy.asrs.wcs.rcs.model.enums.ShuttleDeviceStatusType;
+import com.zy.asrs.wcs.rcs.model.enums.ShuttleProtocolStatusType;
+import com.zy.asrs.wcs.rcs.entity.Device;
+import com.zy.asrs.wcs.rcs.entity.ShuttleDeviceStatus;
+import com.zy.asrs.wcs.rcs.service.ShuttleDeviceStatusService;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 鍥涘悜绌挎杞�
+ */
+@Slf4j
+@Data
+public class ShuttleProtocol {
+
+ //**********************蹇呴』瀛樺湪灞炴��**********************
+ /**
+ * 鍥涘悜绌挎杞﹀彿
+ */
+ private String shuttleNo;
+
+ /**
+ * 浠诲姟鍙�
+ */
+ private String taskNo;
+
+ /**
+ * 褰撳墠灏忚溅鐘舵�侊紙鍐呴儴鑷垜缁存姢锛�
+ */
+ private Integer protocolStatus;
+
+ /**
+ * 褰撳墠灏忚溅浣滀笟鐘舵�佹灇涓�
+ */
+ private ShuttleProtocolStatusType protocolStatusType;
+
+ /**
+ * 婧愬簱浣�
+ */
+ private String sourceLocNo;
+
+ /**
+ * 鐩爣搴撲綅
+ */
+ private String locNo;
+
+ /**
+ * 灏忚溅璁惧鐘舵��
+ */
+ private Integer deviceStatus;
+
+ /**
+ * 褰撳墠浜岀淮鐮�
+ * 0涓虹┖
+ */
+ private String currentCode;
+
+ /**
+ * 鐢垫睜鐢甸噺
+ */
+ private String batteryPower;
+
+ /**
+ * 閿欒缂栧彿
+ */
+ private String errorCode;
+
+
+ //**********************闈炲繀椤诲睘鎬э紝瀹為檯浣跨敤涓彲鑳藉瓨鍦ㄧ┖鍊�**********************
+
+ /**
+ * 鐢垫睜娓╁害
+ */
+ private String batteryTemp;
+
+ /**
+ * 鏄惁椤跺崌
+ */
+ private Boolean hasLift;
+
+ /**
+ * 琛岄┒鏂瑰悜
+ */
+ private String runDirection;
+
+ /**
+ * 鏄惁涓哄厖鐢电姸鎬�
+ */
+ private Boolean hasCharge;
+
+ /**
+ * 鐢垫睜鐢靛帇
+ */
+ private Integer batteryVoltage;
+
+
+ //**********************绯荤粺鑷韩鎵�闇�灞炴��**********************
+ /**
+ * 浣滀笟鏍囪 false琛ㄧず姝ｅ湪浣滀笟
+ */
+ private Boolean pakMk = true;
+
+ /**
+ * 璺戝簱鐘舵��
+ */
+ private Boolean moveLoc = false;
+
+ /**
+ * 璺戝簱绫诲瀷锛�0:璺戣建閬擄紝1锛氳窇搴撲綅
+ */
+ private Integer moveType = 0;
+
+ /**
+ * 璺戝簱X璧风偣
+ */
+ private Integer xStart = 0;
+
+ /**
+ * 璺戝簱X缁堢偣
+ */
+ private Integer xTarget = 0;
+
+ /**
+ * 璺戝簱X褰撳墠鐐逛綅
+ */
+ private Integer xCurrent = 0;
+
+ /**
+ * 璺戝簱Y璧风偣
+ */
+ private Integer yStart = 0;
+
+ /**
+ * 璺戝簱Y缁堢偣
+ */
+ private Integer yTarget = 0;
+
+ /**
+ * 璺戝簱Y褰撳墠鐐逛綅
+ */
+ private Integer yCurrent = 0;
+
+ /**
+ * 鏃ュ織閲囬泦鏃堕棿
+ */
+ private Long deviceDataLog = System.currentTimeMillis();
+
+ /**
+ * 璁惧淇℃伅
+ */
+ private Device device;
+
+ /**
+ * 璁剧疆灏忚溅鐘舵��
+ */
+ public void setProtocolStatus(Integer status) {
+ this.protocolStatus = status;
+ this.protocolStatusType = ShuttleProtocolStatusType.get(status);
+ }
+
+ /**
+ * 璁剧疆灏忚溅鐘舵��
+ */
+ public void setProtocolStatus(ShuttleProtocolStatusType status) {
+ this.protocolStatus = status.id;
+ this.protocolStatusType = status;
+ }
+
+ /**
+ * 鑾峰彇灏忚溅璁惧鐘舵��
+ */
+ public String getDeviceStatus$() {
+ if (this.deviceStatus == null) {
+ return "";
+ }
+ ShuttleDeviceStatusService shuttleDeviceStatusService = SpringUtils.getBean(ShuttleDeviceStatusService.class);
+ ShuttleDeviceStatus status = shuttleDeviceStatusService.getOne(new LambdaQueryWrapper<ShuttleDeviceStatus>()
+ .eq(ShuttleDeviceStatus::getHostId, this.device.getHostId())
+ .eq(ShuttleDeviceStatus::getDevicePlc, this.device.getDevicePlc())
+ .eq(ShuttleDeviceStatus::getStatus, 1)
+ .eq(ShuttleDeviceStatus::getDeviceStatus, this.deviceStatus));
+ if (status != null) {
+ return status.getName();
+ }
+ return "";
+ }
+
+ /**
+ * 鑾峰彇灏忚溅绌洪棽鐘舵��
+ */
+ public Boolean getIdle() {
+ if (this.deviceStatus == null) {
+ return false;
+ }
+
+ ShuttleDeviceStatusService shuttleDeviceStatusService = SpringUtils.getBean(ShuttleDeviceStatusService.class);
+ ShuttleDeviceStatus status = shuttleDeviceStatusService.getOne(new LambdaQueryWrapper<ShuttleDeviceStatus>()
+ .eq(ShuttleDeviceStatus::getHostId, this.device.getHostId())
+ .eq(ShuttleDeviceStatus::getDevicePlc, this.device.getDevicePlc())
+ .eq(ShuttleDeviceStatus::getStatus, 1)
+ .eq(ShuttleDeviceStatus::getDeviceStatus, this.deviceStatus));
+ if (status != null) {
+ if (status.getFlag() != null && status.getFlag().equals(String.valueOf(ShuttleDeviceStatusType.IDLE))) {
+ return true;//绌洪棽涓�
+ }
+ }
+ return false;//榛樿涓嶇┖闂�
+ }
+
+}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/model/protocol/StaProtocol.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/protocol/StaProtocol.java
similarity index 96%
rename from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/model/protocol/StaProtocol.java
rename to zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/protocol/StaProtocol.java
index bc3d5d3..26eeb64 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/model/protocol/StaProtocol.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/protocol/StaProtocol.java
@@ -1,4 +1,4 @@
-package com.zy.asrs.wcs.core.model.protocol;
+package com.zy.asrs.wcs.rcs.model.protocol;
import lombok.Data;
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/service/ShuttleDeviceStatusService.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/service/ShuttleDeviceStatusService.java
new file mode 100644
index 0000000..516c4dd
--- /dev/null
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/service/ShuttleDeviceStatusService.java
@@ -0,0 +1,8 @@
+package com.zy.asrs.wcs.rcs.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zy.asrs.wcs.rcs.entity.ShuttleDeviceStatus;
+
+public interface ShuttleDeviceStatusService extends IService<ShuttleDeviceStatus> {
+
+}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/service/impl/ShuttleDeviceStatusServiceImpl.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/service/impl/ShuttleDeviceStatusServiceImpl.java
new file mode 100644
index 0000000..3cd4f73
--- /dev/null
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/service/impl/ShuttleDeviceStatusServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.wcs.rcs.service.impl;
+
+import com.zy.asrs.wcs.rcs.mapper.ShuttleDeviceStatusMapper;
+import com.zy.asrs.wcs.rcs.entity.ShuttleDeviceStatus;
+import com.zy.asrs.wcs.rcs.service.ShuttleDeviceStatusService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("shuttleDeviceStatusService")
+public class ShuttleDeviceStatusServiceImpl extends ServiceImpl<ShuttleDeviceStatusMapper, ShuttleDeviceStatus> implements ShuttleDeviceStatusService {
+
+}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/thread/CrnThread.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/CrnThread.java
similarity index 66%
rename from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/thread/CrnThread.java
rename to zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/CrnThread.java
index 1431322..adddf1c 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/thread/CrnThread.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/CrnThread.java
@@ -1,4 +1,4 @@
-package com.zy.asrs.wcs.core.thread;
+package com.zy.asrs.wcs.rcs.thread;
public interface CrnThread {
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/thread/DevpThread.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/DevpThread.java
similarity index 79%
rename from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/thread/DevpThread.java
rename to zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/DevpThread.java
index b826dc2..0ff12e7 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/thread/DevpThread.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/DevpThread.java
@@ -1,4 +1,4 @@
-package com.zy.asrs.wcs.core.thread;
+package com.zy.asrs.wcs.rcs.thread;
public interface DevpThread {
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/thread/FlowExecute.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/FlowExecute.java
similarity index 98%
rename from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/thread/FlowExecute.java
rename to zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/FlowExecute.java
index 082a163..2725023 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/thread/FlowExecute.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/FlowExecute.java
@@ -1,4 +1,4 @@
-package com.zy.asrs.wcs.core.thread;
+package com.zy.asrs.wcs.rcs.thread;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/LiftThread.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/LiftThread.java
new file mode 100644
index 0000000..55ef4c4
--- /dev/null
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/LiftThread.java
@@ -0,0 +1,9 @@
+package com.zy.asrs.wcs.rcs.thread;
+
+import com.zy.asrs.wcs.rcs.model.protocol.LiftProtocol;
+
+public interface LiftThread extends ThreadHandler{
+
+ LiftProtocol getStatus();//鑾峰彇鎻愬崌鏈虹姸鎬�
+
+}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/ShuttleThread.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/ShuttleThread.java
new file mode 100644
index 0000000..c5e096b
--- /dev/null
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/ShuttleThread.java
@@ -0,0 +1,9 @@
+package com.zy.asrs.wcs.rcs.thread;
+
+import com.zy.asrs.wcs.rcs.model.protocol.ShuttleProtocol;
+
+public interface ShuttleThread extends ThreadHandler{
+
+ ShuttleProtocol getStatus();//鑾峰彇鍥涘悜绌挎杞︾姸鎬�
+
+}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/ThreadHandler.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/ThreadHandler.java
new file mode 100644
index 0000000..0760569
--- /dev/null
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/ThreadHandler.java
@@ -0,0 +1,9 @@
+package com.zy.asrs.wcs.rcs.thread;
+
+public interface ThreadHandler extends Runnable {
+
+ boolean connect();
+
+ void close();
+
+}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/thread/impl/SiemensCrnThread.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SiemensCrnThread.java
similarity index 68%
rename from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/thread/impl/SiemensCrnThread.java
rename to zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SiemensCrnThread.java
index 2c6db5c..da80f37 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/thread/impl/SiemensCrnThread.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SiemensCrnThread.java
@@ -1,6 +1,6 @@
-package com.zy.asrs.wcs.core.thread.impl;
+package com.zy.asrs.wcs.rcs.thread.impl;
-import com.zy.asrs.wcs.core.thread.CrnThread;
+import com.zy.asrs.wcs.rcs.thread.CrnThread;
public class SiemensCrnThread implements CrnThread {
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/thread/impl/SiemensDevpThread.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SiemensDevpThread.java
similarity index 72%
rename from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/thread/impl/SiemensDevpThread.java
rename to zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SiemensDevpThread.java
index 01928d1..3590546 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/thread/impl/SiemensDevpThread.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SiemensDevpThread.java
@@ -1,7 +1,7 @@
-package com.zy.asrs.wcs.core.thread.impl;
+package com.zy.asrs.wcs.rcs.thread.impl;
-import com.zy.asrs.wcs.core.model.protocol.StaProtocol;
-import com.zy.asrs.wcs.core.thread.DevpThread;
+import com.zy.asrs.wcs.rcs.model.protocol.StaProtocol;
+import com.zy.asrs.wcs.rcs.thread.DevpThread;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SurayLiftThread.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SurayLiftThread.java
new file mode 100644
index 0000000..79077ae
--- /dev/null
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SurayLiftThread.java
@@ -0,0 +1,210 @@
+package com.zy.asrs.wcs.rcs.thread.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.zy.asrs.common.utils.HttpHandler;
+import com.zy.asrs.framework.common.DateUtils;
+import com.zy.asrs.framework.exception.CoolException;
+import com.zy.asrs.wcs.rcs.News;
+import com.zy.asrs.wcs.rcs.cache.OutputQueue;
+import com.zy.asrs.wcs.rcs.model.enums.LiftProtocolStatusType;
+import com.zy.asrs.wcs.rcs.model.protocol.LiftProtocol;
+import com.zy.asrs.wcs.rcs.thread.LiftThread;
+import com.zy.asrs.wcs.core.utils.RedisUtil;
+import com.zy.asrs.wcs.rcs.entity.Device;
+import lombok.extern.slf4j.Slf4j;
+
+import java.text.MessageFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+
+@Slf4j
+@SuppressWarnings("all")
+public class SurayLiftThread implements LiftThread {
+
+ private static final String API_URL = "http://127.0.0.1:8082";
+
+ private Device device;
+ private RedisUtil redisUtil;
+ private LiftProtocol liftProtocol;
+
+ public SurayLiftThread(Device device,RedisUtil redisUtil) {
+ this.device = device;
+ this.redisUtil = redisUtil;
+ }
+
+ @Override
+ public void run() {
+ News.info("{}鍙锋彁鍗囨満绾跨▼鍚姩", device.getDeviceNo());
+ this.connect();
+ while (true) {
+ try {
+ read();
+ Thread.sleep(500);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ }
+
+ private void read() {
+ try {
+ readStatus();
+
+// //鎻愬崌鏈哄浜庤繍琛岀姸鎬侊紝灏嗘爣璁扮疆涓篺alse
+// if (liftProtocol.getBusy()) {
+// liftProtocol.setPakMk(false);
+// }
+//
+// //鎻愬崌鏈哄浜庢湭杩愯銆佸氨缁�佹爣璁皌rue銆佹湁浠诲姟鍙�
+// if (!liftProtocol.getBusy()
+// && !liftProtocol.getPakMk()
+// && liftProtocol.getTaskNo() != 0) {
+// //杩樻湁鏈畬鎴愮殑鍛戒护
+// executeWork(liftProtocol.getTaskNo());
+// }
+ } catch (Exception e) {
+ OutputQueue.LIFT.offer(MessageFormat.format("銆恵0}銆戣鍙栨彁鍗囨満鐘舵�佷俊鎭け璐� ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), device.getId(), device.getIp(), device.getPort()));
+ }
+ }
+
+ private void readStatus() {
+ try {
+ //鑾峰彇鎻愬崌鏈烘暟鎹�
+ JSONObject data = requestDeviceStatus();
+ if (data != null) {
+ if (null == liftProtocol) {
+ liftProtocol = new LiftProtocol();
+ liftProtocol.setLiftNo(device.getDeviceNo());
+ liftProtocol.setProtocolStatus(LiftProtocolStatusType.IDLE);
+ liftProtocol.setDevice(device);
+ }
+
+ //----------璇诲彇鎻愬崌鏈虹姸鎬�-----------
+ //妯″紡
+ liftProtocol.setModel(true);
+ //杩愯鐘舵��
+ liftProtocol.setRun(data.getInteger("runningstate") == 1);
+ //灏辩华鐘舵��
+ liftProtocol.setReady(data.getInteger("readyState") == 1);
+ //鏈夋墭鐩�
+ liftProtocol.setHasTray(data.getString("haveCargo").equals("Y"));
+ //鏈夊皬杞�
+ liftProtocol.setHasCar(data.getString("haveCar").equals("Y"));
+ //鏁呴殰鐮�
+ liftProtocol.setErrorCode("");
+ //灞�
+ liftProtocol.setLev(data.getInteger("curFloor"));
+// //鍓嶈秴闄�
+// liftProtocol.setFrontOverrun(status1[4]);
+// //鍚庤秴闄�
+// liftProtocol.setBackOverrun(status1[5]);
+// //宸﹁秴闄�
+// liftProtocol.setLeftOverrun(status1[6]);
+// //鍙宠秴闄�
+// liftProtocol.setRightOverrun(status1[7]);
+// //瓒呴珮
+// liftProtocol.setOverHeight(status2[0]);
+// //瓒呴噸
+// liftProtocol.setOverWeight(status2[1]);
+// //鏈夋墭鐩�
+// liftProtocol.setHasTray(status2[5]);
+// //鏈夊皬杞�
+// liftProtocol.setHasCar(status2[6]);
+// //璁惧鏁呴殰
+// liftProtocol.setDeviceError(status2[7]);
+// //浠诲姟鍙�
+// liftProtocol.setTaskNo(siemensS7Net.getByteTransform().TransInt16(result1.Content, 2));
+// //鐩殑鍦板潃
+// liftProtocol.setDistAddress(siemensS7Net.getByteTransform().TransInt16(result1.Content, 4));
+// //宸插畬鎴愪换鍔″彿
+// liftProtocol.setCompleteTaskNo(siemensS7Net.getByteTransform().TransInt16(result1.Content, 6));
+// liftProtocol.setLev(lev);
+ }else {
+ OutputQueue.LIFT.offer(MessageFormat.format("銆恵0}銆憑1}璇诲彇鎻愬崌鏈虹姸鎬佷俊鎭け璐�", DateUtils.convert(new Date()), device.getId()));
+ throw new CoolException(MessageFormat.format( "璇诲彇鎻愬崌鏈虹姸鎬佷俊鎭け璐� ===>> [id:{0}] [ip:{1}] [port:{2}]", device.getId(), device.getIp(), device.getPort()));
+ }
+ Thread.sleep(200);
+ } catch (Exception e) {
+ OutputQueue.LIFT.offer(MessageFormat.format("銆恵0}銆戣鍙栨彁鍗囨満鐘舵�佷俊鎭け璐� ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), device.getId(), device.getIp(), device.getPort()));
+ }
+ }
+
+ @Override
+ public boolean connect() {
+ return false;
+ }
+
+ @Override
+ public void close() {
+
+ }
+
+ @Override
+ public LiftProtocol getStatus() {
+ return this.liftProtocol;
+ }
+
+ //***************璁惧灞傞�氳-涓嶅悓鍘傚晢璁惧閫氳鏂规涓嶄竴鑷�***************
+
+ //璇锋眰鐧诲綍
+ private String requestLoginToken() {
+ try {
+ HashMap<String, Object> param = new HashMap<>();
+ param.put("username", "admin");
+ param.put("password", "admin123");
+ param.put("msgTime", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+ String response = new HttpHandler.Builder()
+ .setUri(API_URL)
+ .setPath("/RDS/loginToken")
+ .setJson(JSON.toJSONString(param))
+ .build()
+ .doPost();
+ JSONObject jsonObject = JSON.parseObject(response);
+ Integer code = jsonObject.getInteger("code");
+ if (code.equals(200)) {
+ return jsonObject.getString("token");
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
+
+ //鑾峰彇璁惧鐘舵��
+ private JSONObject requestDeviceStatus() {
+ //妯℃嫙鏁版嵁
+ String data = "[{\"taskNo\":1244,\"curFloor\":2,\"readyState\":1,\"haveCar\":'N',\"completeTaskNo\":0,\"haveCargo\":\"Y\",\"runningstate\":0,\"floors\":[{\"floor\":1,\"location\":1,\"run\":1,\"error\":1,\"cargoState\":\"Y\"},{\"floor\":1,\"location\":2,\"run\":0,\"error\":0,\"cargoState\":\"N\"}]}]";
+ return JSON.parseArray(data).getJSONObject(0);
+// try {
+// String loginToken = requestLoginToken();
+// if (loginToken == null) {
+// return null;
+// }
+//
+// HashMap<String, Object> headers = new HashMap<>();
+// headers.put("Authorization", "Bearer " + loginToken);
+//
+// HashMap<String, Object> param = new HashMap<>();
+// param.put("messageName", "deviceRgvStatus");
+// param.put("msgTime", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+// param.put("deviceNo", device.getDeviceNo());
+// String response = new HttpHandler.Builder()
+// .setUri(API_URL)
+// .setPath("/RDS/deviceLifterStatus")
+// .setHeaders(headers)
+// .setJson(JSON.toJSONString(param))
+// .build()
+// .doPost();
+// JSONObject jsonObject = JSON.parseObject(response);
+// Integer code = jsonObject.getInteger("code");
+// if (code.equals(200)) {
+// return jsonObject.getJSONArray("data").getJSONObject(0);
+// }
+// } catch (Exception e) {
+// e.printStackTrace();
+// }
+// return null;
+ }
+}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SurayShuttleThread.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SurayShuttleThread.java
new file mode 100644
index 0000000..2780f6e
--- /dev/null
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SurayShuttleThread.java
@@ -0,0 +1,209 @@
+package com.zy.asrs.wcs.rcs.thread.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.zy.asrs.common.utils.HttpHandler;
+import com.zy.asrs.framework.common.DateUtils;
+import com.zy.asrs.framework.exception.CoolException;
+import com.zy.asrs.wcs.rcs.News;
+import com.zy.asrs.wcs.rcs.cache.OutputQueue;
+import com.zy.asrs.wcs.rcs.model.enums.ShuttleProtocolStatusType;
+import com.zy.asrs.wcs.rcs.model.protocol.ShuttleProtocol;
+import com.zy.asrs.wcs.rcs.thread.ShuttleThread;
+import com.zy.asrs.wcs.core.utils.RedisUtil;
+import com.zy.asrs.wcs.rcs.entity.Device;
+import lombok.extern.slf4j.Slf4j;
+
+import java.text.MessageFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+
+@Slf4j
+@SuppressWarnings("all")
+public class SurayShuttleThread implements ShuttleThread {
+
+ private static final String API_URL = "http://127.0.0.1:8082";
+
+ private Device device;
+ private RedisUtil redisUtil;
+ private ShuttleProtocol shuttleProtocol;
+
+ public SurayShuttleThread(Device device,RedisUtil redisUtil) {
+ this.device = device;
+ this.redisUtil = redisUtil;
+ }
+
+ @Override
+ public void run() {
+ News.info("{}鍙峰洓鍚戣溅绾跨▼鍚姩", device.getDeviceNo());
+ this.connect();
+ while (true) {
+ try {
+ read();
+ Thread.sleep(500);
+ } catch (Exception e) {
+ log.error("ShuttleThread Fail", e);
+ }
+ }
+ }
+
+ private void read() {
+ try {
+ readStatus();
+// //鍥涘悜绌挎杞︾┖闂层�佹湁浠诲姟銆佹爣璁颁负true銆佸瓨鍦ㄤ换鍔℃寚浠わ紝闇�瑕佹墽琛屼换鍔＄殑涓嬩竴鏉℃寚浠�
+// if (shuttleProtocol.getTaskNo() != 0) {
+// Object obj = redisUtil.get(DeviceRedisConstant.SHUTTLE_WORK_FLAG + shuttleProtocol.getTaskNo());
+// if (null != obj) {
+// ShuttleRedisCommand redisCommand = JSON.parseObject(obj.toString(), ShuttleRedisCommand.class);
+// executeWork(redisCommand);
+// }
+// }
+//
+// //灏忚溅绌洪棽涓旀湁璺戝簱绋嬪簭
+// if (shuttleProtocol.isIdle() && shuttleProtocol.getMoveLoc()) {
+// moveLoc();
+// }
+ } catch (Exception e) {
+ log.error("ShuttleThread Fail!", e);
+ OutputQueue.SHUTTLE.offer(MessageFormat.format("銆恵0}銆戣鍙栧洓鍚戠┛姊溅鐘舵�佷俊鎭け璐� ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), device.getDeviceNo(), device.getIp(), device.getPort()));
+ }
+ }
+
+ private void readStatus() {
+ try {
+ JSONObject data = requestDeviceStatus();
+ if (data != null) {
+ if (null == shuttleProtocol) {
+ shuttleProtocol = new ShuttleProtocol();
+ shuttleProtocol.setShuttleNo(device.getDeviceNo());
+ shuttleProtocol.setProtocolStatus(ShuttleProtocolStatusType.IDLE);
+ shuttleProtocol.setDevice(device);
+ }
+
+ //----------璇诲彇鍥涘悜绌挎杞︾姸鎬�-----------
+ //灏忚溅蹇欑姸鎬佷綅
+ shuttleProtocol.setDeviceStatus(data.getInteger("deviceStatus"));
+ //褰撳墠浜岀淮鐮�
+ shuttleProtocol.setCurrentCode(data.getString("deviceLocation"));
+ //鐢垫睜鐢甸噺
+ shuttleProtocol.setBatteryPower(data.getString("battery"));
+
+
+ //鏄惁椤跺崌
+ shuttleProtocol.setHasLift(data.getInteger("palletStatus") == 1 ? true : false);
+ //琛岄┒鏂瑰悜
+ shuttleProtocol.setRunDirection(data.getString("direction"));
+
+ ///璇诲彇鍥涘悜绌挎杞︾姸鎬�-end
+
+// //灏忚溅澶勪簬蹇欑鐘舵�侊紝灏嗘爣璁扮疆涓簍rue
+// if (shuttleProtocol.getDeviceStatusType() == ShuttleDeviceStatusType.BUSY) {
+// shuttleProtocol.setPakMk(true);
+// }
+//
+// if (shuttleProtocol.getProtocolStatusType() == null && shuttleProtocol.getDeviceStatus().intValue() == ShuttleDeviceStatusType.IDLE.id) {
+// //灏忚溅绌洪棽鐘舵�併�佸皬杞︿换鍔＄姸鎬佷负鏈煡锛岃瀹氭浘绂荤嚎杩囷紝闇�瑕佸浣嶆垚绌洪棽
+// shuttleProtocol.setProtocolStatusType(ShuttleProtocolStatusType.IDLE);
+// }
+
+// if (System.currentTimeMillis() - shuttleProtocol.getDeviceDataLog() > 1000 * 5) {
+// //閲囬泦鏃堕棿瓒呰繃5s锛屼繚瀛樹竴娆℃暟鎹褰�
+// //淇濆瓨鏁版嵁璁板綍
+// DeviceDataLogService deviceDataLogService = SpringUtils.getBean(DeviceDataLogService.class);
+// DeviceDataLog deviceDataLog = new DeviceDataLog();
+// deviceDataLog.setOriginData(Base64.getEncoder().encodeToString(result.Content));
+// deviceDataLog.setWcsData(JSON.toJSONString(shuttleProtocol));
+// deviceDataLog.setType("shuttle");
+// deviceDataLog.setDeviceNo(shuttleProtocol.getShuttleNo().intValue());
+// deviceDataLog.setCreateTime(new Date());
+// deviceDataLogService.insert(deviceDataLog);
+//
+// //鏇存柊閲囬泦鏃堕棿
+// shuttleProtocol.setDeviceDataLog(System.currentTimeMillis());
+// }
+ } else {
+ OutputQueue.SHUTTLE.offer(MessageFormat.format("銆恵0}銆憑1}璇诲彇鍥涘悜绌挎杞︾姸鎬佷俊鎭け璐�", DateUtils.convert(new Date()), device.getDeviceNo()));
+ throw new CoolException(MessageFormat.format("璇诲彇鍥涘悜绌挎杞︾姸鎬佷俊鎭け璐� ===>> [id:{0}] [ip:{1}] [port:{2}]", device.getDeviceNo(), device.getIp(), device.getPort()));
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ OutputQueue.SHUTTLE.offer(MessageFormat.format("銆恵0}銆戣鍙栧洓鍚戠┛姊溅鐘舵�佷俊鎭け璐� ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), device.getDeviceNo(), device.getIp(), device.getPort()));
+ }
+ }
+
+ @Override
+ public boolean connect() {
+ return true;
+ }
+
+ @Override
+ public void close() {
+
+ }
+
+ @Override
+ public ShuttleProtocol getStatus() {
+ return this.shuttleProtocol;
+ }
+
+
+ //***************璁惧灞傞�氳-涓嶅悓鍘傚晢璁惧閫氳鏂规涓嶄竴鑷�***************
+
+ //璇锋眰鐧诲綍
+ private String requestLoginToken() {
+ try {
+ HashMap<String, Object> param = new HashMap<>();
+ param.put("username", "admin");
+ param.put("password", "admin123");
+ param.put("msgTime", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+ String response = new HttpHandler.Builder()
+ .setUri(API_URL)
+ .setPath("/RDS/loginToken")
+ .setJson(JSON.toJSONString(param))
+ .build()
+ .doPost();
+ JSONObject jsonObject = JSON.parseObject(response);
+ Integer code = jsonObject.getInteger("code");
+ if (code.equals(200)) {
+ return jsonObject.getString("token");
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
+
+ //鑾峰彇璁惧鐘舵��
+ private JSONObject requestDeviceStatus() {
+ try {
+ String loginToken = requestLoginToken();
+ if (loginToken == null) {
+ return null;
+ }
+
+ HashMap<String, Object> headers = new HashMap<>();
+ headers.put("Authorization", "Bearer " + loginToken);
+
+ HashMap<String, Object> param = new HashMap<>();
+ param.put("messageName", "deviceRgvStatus");
+ param.put("msgTime", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+ param.put("deviceNo", device.getDeviceNo());
+ String response = new HttpHandler.Builder()
+ .setUri(API_URL)
+ .setPath("/RDS/deviceRgvStatus")
+ .setHeaders(headers)
+ .setJson(JSON.toJSONString(param))
+ .build()
+ .doPost();
+ JSONObject jsonObject = JSON.parseObject(response);
+ Integer code = jsonObject.getInteger("code");
+ if (code.equals(200)) {
+ return jsonObject.getJSONArray("data").getJSONObject(0);
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
+}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/utils/CodeBuilder.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/utils/CodeBuilder.java
index bdfe754..a5c8d29 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/utils/CodeBuilder.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/utils/CodeBuilder.java
@@ -22,9 +22,9 @@
// generator.username="sa";
// generator.password="Zoneyung@zy56$";
- generator.table="sys_dict";
- generator.tableName="瀛楀吀";
- generator.packagePath="com.zy.asrs.wcs.system";
+ generator.table="wcs_shuttle_device_status";
+ generator.tableName="鍥涘悜杞﹁澶囩姸鎬佸垪琛�";
+ generator.packagePath="com.zy.asrs.wcs.rcs";
generator.build();
}
diff --git a/zy-asrs-wcs/src/main/resources/mapper/rcs/ShuttleDeviceStatusMapper.xml b/zy-asrs-wcs/src/main/resources/mapper/rcs/ShuttleDeviceStatusMapper.xml
new file mode 100644
index 0000000..793fc44
--- /dev/null
+++ b/zy-asrs-wcs/src/main/resources/mapper/rcs/ShuttleDeviceStatusMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zy.asrs.wcs.rcs.mapper.ShuttleDeviceStatusMapper">
+
+</mapper>
--
Gitblit v1.9.1