From bfe469c7fa604a6431d58ea5e5143c959d76bd86 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 11 十一月 2025 16:09:38 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/ConsoleController.java | 221 +++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 166 insertions(+), 55 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index c3e061d..5509d4b 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -5,20 +5,31 @@
import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
import com.core.common.R;
+import com.core.exception.CoolException;
+import com.zy.asrs.domain.enums.CrnStatusType;
import com.zy.asrs.domain.param.SystemSwitchParam;
-import com.zy.asrs.entity.BasMap;
-import com.zy.asrs.service.BasMapService;
-import com.zy.common.model.MapNode;
-import com.zy.common.model.enums.NavigationMapType;
-import com.zy.common.utils.NavigateMapData;
-import com.zy.common.utils.RedisUtil;
-import com.zy.core.enums.RedisKeyType;
+import com.zy.asrs.domain.vo.CrnDetailVo;
+import com.zy.asrs.domain.vo.CrnLatestDataVo;
+import com.zy.asrs.entity.BasCrnpErr;
+import com.zy.asrs.entity.DeviceConfig;
+import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.service.BasCrnpErrService;
+import com.zy.asrs.service.DeviceConfigService;
+import com.zy.asrs.service.WrkMastService;
+import com.zy.common.CodeRes;
+import com.zy.core.Slave;
+import com.zy.core.ThreadHandler;
+import com.zy.core.cache.SlaveConnection;
+import com.zy.core.enums.CrnModeType;
+import com.zy.core.enums.SlaveType;
+import com.zy.core.model.protocol.CrnProtocol;
import com.zy.core.properties.SystemProperties;
+import com.zy.core.thread.CrnThread;
+import com.zy.core.thread.impl.ZySiemensCrnThread;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletRequest;
import java.util.*;
/**
@@ -31,11 +42,11 @@
public class ConsoleController {
@Autowired
- private BasMapService basMapService;
+ private DeviceConfigService deviceConfigService;
@Autowired
- private RedisUtil redisUtil;
+ private WrkMastService wrkMastService;
@Autowired
- private NavigateMapData navigateMapData;
+ private BasCrnpErrService basCrnpErrService;
@PostMapping("/system/running/status")
@ManagerAuth(memo = "绯荤粺杩愯鐘舵��")
@@ -62,58 +73,158 @@
return R.ok().add(Cools.add("status", SystemProperties.WCS_RUNNING_STATUS.get()));
}
- /**
- * 鑾峰彇鍦板浘妤煎眰鏁版嵁
- */
- @GetMapping("/map/lev/list")
- @ManagerAuth
- public R getMapLevList() {
- List<BasMap> basMaps = basMapService.selectList(new EntityWrapper<BasMap>().orderBy("lev", true));
- ArrayList<Integer> levList = new ArrayList<>();
- for (BasMap basMap : basMaps) {
- levList.add(basMap.getLev());
+// @PostMapping("/latest/data/site")
+// @ManagerAuth(memo = "绔欑偣瀹炴椂鏁版嵁")
+// public R siteLatestData(){
+// List<SiteLatestDataVo> vos = new ArrayList<>();
+// Map<Integer, StaProtocol> stations = new HashMap<>();
+// for (DevpSlave devp : slaveProperties.getDevp()) {
+// DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
+// if (null != devpThread) {
+// stations.putAll(devpThread.getStation());
+// }
+// }
+// for (Map.Entry<Integer, StaProtocol> entry : stations.entrySet()) {
+// SiteLatestDataVo vo = new SiteLatestDataVo();
+// StaProtocol staProtocol = entry.getValue();
+// vo.setSiteId(String.valueOf(entry.getKey())); // 绔欑偣缂栧彿
+// vo.setWorkNo(staProtocol.getWorkNo()); // 宸ヤ綔鍙�
+// vo.setSiteStatus(SiteStatusType.process(staProtocol)); // 鐘舵��
+// vos.add(vo);
+// }
+// return R.ok().add(vos);
+// }
+
+ @PostMapping("/latest/data/crn")
+ @ManagerAuth(memo = "鍫嗗灈鏈哄疄鏃舵暟鎹�")
+ public R crnLatestData(){
+ List<CrnLatestDataVo> vos = new ArrayList<>();
+
+ List<DeviceConfig> crnList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
+ .eq("device_type", String.valueOf(SlaveType.Crn)));
+ for (DeviceConfig deviceConfig : crnList) {
+ // 鑾峰彇鍫嗗灈鏈轰俊鎭�
+ CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, deviceConfig.getDeviceNo());
+ if (crnThread == null) {
+ continue;
+ }
+
+ CrnProtocol crnProtocol = crnThread.getStatus();
+ if (crnProtocol == null) {
+ continue;
+ }
+ CrnLatestDataVo vo = new CrnLatestDataVo();
+ vo.setCrnId(crnProtocol.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
+
+ vo.setOffset((double) new Random().nextInt(560)); // 鍫嗗灈鏈哄亸绉婚噺
+ vo.setBay(crnProtocol.getBay()); // 褰撳墠鍒�
+ /**
+ * 鍫嗗灈鏈虹姸鎬佸垽鏂�
+ */
+ if (crnProtocol.getAlarm() > 0) {
+ vo.setCrnStatus(CrnStatusType.MACHINE_ERROR);
+ } else {
+ if (crnProtocol.getTaskNo()>0) {
+ WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
+ if (wrkMast != null) {
+ vo.setCrnStatus(CrnStatusType.process(wrkMast.getIoType()));
+ } else {
+ vo.setCrnStatus(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.MACHINE_AUTO: CrnStatusType.MACHINE_UN_AUTO);
+ }
+ } else {
+ vo.setCrnStatus(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.MACHINE_AUTO: CrnStatusType.MACHINE_UN_AUTO);
+ }
+ }
+ vos.add(vo);
}
- return R.ok().add(levList);
+ return R.ok().add(vos);
}
- /**
- * 鑾峰彇鍦板浘鏁版嵁
- */
- @GetMapping("/map/{lev}/auth")
- @ManagerAuth
- public R getMapFromRedis(@PathVariable Integer lev) {
- Object data = redisUtil.get(RedisKeyType.MAP.key + lev);
- if (data == null) {
- return R.error();
+// @PostMapping("/latest/data/rgv")
+// @ManagerAuth(memo = "RGV瀹炴椂鏁版嵁")
+// public R rgvLatestData(){
+// List<RgvLatestDataVo> vos = new ArrayList<>();
+// for (RgvSlave rgvSlave : slaveProperties.getRgv()) {
+// // 鑾峰彇鍫嗗灈鏈轰俊鎭�
+// RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, rgvSlave.getId());
+// if (rgvThread == null) {
+// continue;
+// }
+// RgvProtocol rgvProtocol = rgvThread.getRgvProtocol();
+// if (rgvProtocol == null) {
+// continue;
+// }
+// RgvLatestDataVo vo = new RgvLatestDataVo();
+// vo.setRgvId(rgvProtocol.getRgvNo()); // RGV缂栧彿
+// vo.setTrackSiteNo(String.valueOf(rgvProtocol.getRgvPos()));
+// vo.setRgvStatus(rgvProtocol.getStatusType());
+// vos.add(vo);
+//
+// }
+// Object object = redisUtil.get("rgvLatestData");
+// List<Object> siteLatestDataVos = JSON.parseArray(object.toString());
+// return R.ok().add(siteLatestDataVos);
+// }
+
+// @PostMapping("/latest/data/barcode")
+// @ManagerAuth(memo = "鏉＄爜鎵弿浠疄鏃舵暟鎹�")
+// public R barcodeLatestData(){
+// List<BarcodeDataVo> list = new ArrayList<>();
+// for (Slave barcode : slaveProperties.getBarcode()) {
+// BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, barcode.getId());
+// if (null == barcodeThread) {
+// continue;
+// }
+// BarcodeDataVo vo = new BarcodeDataVo();
+// vo.setBarcodeId(barcode.getId());
+// vo.setCodeValue(barcodeThread.getBarcode());
+// list.add(vo);
+// }
+// return R.ok().add(list);
+// }
+
+ @PostMapping("/crn/detail")
+ @ManagerAuth(memo = "鍫嗗灈鏈鸿澶囨暟鎹鎯�")
+ public R crnDetail(@RequestParam Integer crnNo){
+ if (Cools.isEmpty(crnNo)){
+ return R.parse(CodeRes.EMPTY);
+ }
+ CrnDetailVo vo = new CrnDetailVo();
+
+ DeviceConfig deviceConfig = deviceConfigService.selectOne(new EntityWrapper<DeviceConfig>()
+ .eq("device_type", String.valueOf(SlaveType.Crn))
+ .eq("device_no", crnNo)
+ );
+
+ if (deviceConfig == null) {
+ return R.error("璁惧涓嶅瓨鍦�");
}
- BasMap basMap = JSON.parseObject(data.toString(), BasMap.class);
- //瑙ｆ瀽json鍦板浘鏁版嵁
- ArrayList arrayList = JSON.parseObject(basMap.getData(), ArrayList.class);
- List<List<MapNode>> lists = navigateMapData.filterMap(NavigationMapType.NONE.id, arrayList, lev, null, null);//杩囨护鍦板浘鏁版嵁
- return R.ok().add(lists);
- }
+ CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crnNo);
+ CrnProtocol crnProtocol = crnThread.getStatus();
+ vo.setCrnNo(crnNo);
+ vo.setWorkNo(crnProtocol.getTaskNo());
+ vo.setCrnStatus(crnProtocol.getStatusType().desc);
- /**
- * 閲嶇疆redis涓殑鍦板浘锛屽皢鍗犵敤鐨勫簱浣嶅叏閮ㄨВ闄�
- */
- @GetMapping("/map/resetMap/auth")
- @ManagerAuth
- public R resetMapToRedis() {
- for (int i = 1; i <= 10; i++) {//鎬诲叡10灞傛ゼ
- redisUtil.del(RedisKeyType.MAP.key + i);
+ if (crnProtocol.getAlarm() > 0) {
+ BasCrnpErr crnError = basCrnpErrService.selectById(crnProtocol.getAlarm());
+ vo.setError(crnError == null ? "鏈煡寮傚父" : crnError.getErrName());
}
- return R.ok();
- }
- /**
- * 閲嶇疆redis涓殑鍦板浘锛屽皢鍗犵敤鐨勫簱浣嶅叏閮ㄨВ闄�
- */
- @GetMapping("/map/resetMap/{lev}")
- @ManagerAuth(memo = "閲嶇疆Redis鍦板浘")
- public R resetMapToRedisByLev(@PathVariable Integer lev, HttpServletRequest request) {
- redisUtil.del(RedisKeyType.MAP.key + lev);
- return R.ok();
+ if (crnProtocol.getTaskNo() > 0) {
+ WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
+ if (wrkMast != null) {
+ vo.setSourceStaNo(String.valueOf(wrkMast.getSourceStaNo()));
+ vo.setStaNo(String.valueOf(wrkMast.getStaNo()));
+ vo.setWrkSts(wrkMast.getWrkSts$()); // 宸ヤ綔鐘舵��
+ vo.setIoType(wrkMast.getIoType$()); // 鍏ュ嚭搴撶被鍨�
+ vo.setSourceLocNo(wrkMast.getSourceLocNo$());
+ vo.setLocNo(wrkMast.getLocNo$());
+ vo.setCrnStatus(crnProtocol.getStatusType().desc);
+ vo.setError(""); // todo
+ }
+ }
+ return R.ok().add(vo);
}
}
--
Gitblit v1.9.1