From 40d95599c1ac6ef89d465e031132d9c627a7f0bc Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 19 十一月 2025 13:38:54 +0800
Subject: [PATCH] #增加出入库模式
---
src/main/java/com/zy/asrs/controller/ConsoleController.java | 159 ++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 151 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index 61390cd..00aa8a4 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.ManagerAuth;
import com.core.common.Arith;
import com.core.common.Cools;
@@ -15,31 +16,37 @@
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.mapper.BasCrnErrorMapper;
-import com.zy.asrs.mapper.LocMastMapper;
import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.WrkMastService;
import com.zy.common.CodeRes;
+import com.zy.common.service.CommonService;
+import com.zy.common.utils.RedisUtil;
import com.zy.core.CrnThread;
import com.zy.core.DevpThread;
import com.zy.core.Slave;
+import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.CrnModeType;
import com.zy.core.enums.SlaveType;
-import com.zy.core.model.CrnSlave;
-import com.zy.core.model.DevpSlave;
+import com.zy.core.model.*;
import com.zy.core.model.protocol.CrnProtocol;
+import com.zy.core.model.protocol.LiftProtocol;
+import com.zy.core.model.protocol.RgvProtocol;
import com.zy.core.model.protocol.StaProtocol;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.properties.SystemProperties;
import com.zy.core.thread.BarcodeThread;
-import com.zy.core.thread.MelsecCrnThread;
+import com.zy.core.thread.RgvThread;
import com.zy.core.thread.ScaleThread;
import com.zy.core.thread.SiemensCrnThread;
+import com.zy.system.entity.Config;
+import com.zy.system.service.ConfigService;
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.*;
/**
@@ -58,9 +65,13 @@
@Autowired
private BasDevpService basDevpService;
@Autowired
- private LocMastMapper locMastMapper;
- @Autowired
private BasCrnErrorMapper basCrnErrorMapper;
+ @Autowired
+ private ConfigService configService;
+ @Autowired
+ private CommonService commonService;
+ @Autowired
+ private RedisUtil redisUtil;
@PostMapping("/system/running/status")
@ManagerAuth(memo = "绯荤粺杩愯鐘舵��")
@@ -91,6 +102,24 @@
/************************** 瀹炴椂鏁版嵁 ******************************/
/****************************************************************/
+ @PostMapping("/devpTaskCount")
+ @ManagerAuth(memo = "杈撻�佺嚎浠诲姟鏁伴噺")
+ public R devpTaskCount(){
+ int devpTaskStackOver = 20;
+ Config config = configService.selectOne(new EntityWrapper<Config>()
+ .eq("code", "devpTaskStackOver"));
+ if (config != null) {
+ devpTaskStackOver = Integer.parseInt(config.getValue());
+ }
+
+ Integer devpWorkingCount = commonService.queryDevpWorkingCount();
+
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("devpTaskStackOver", devpTaskStackOver);
+ map.put("devpWorkingCount", devpWorkingCount);
+ return R.ok().add(map);
+ }
+
@PostMapping("/latest/data/site")
@ManagerAuth(memo = "绔欑偣瀹炴椂鏁版嵁")
public R siteLatestData(){
@@ -108,9 +137,9 @@
vo.setSiteId(String.valueOf(entry.getKey())); // 绔欑偣缂栧彿
vo.setWorkNo(staProtocol.getWorkNo()); // 宸ヤ綔鍙�
vo.setSiteStatus(SiteStatusType.process(staProtocol)); // 鐘舵��
- vo.setNearbySta(staProtocol.getNearbySta());
vos.add(vo);
}
+ redisUtil.set("siteLatestData", JSON.toJSONString(vos));
return R.ok().add(vos);
}
@@ -155,6 +184,32 @@
vos.add(vo);
}
+ redisUtil.set("crnLatestData", JSON.toJSONString(vos));
+ return R.ok().add(vos);
+ }
+
+ @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);
+
+ }
+ redisUtil.set("rgvLatestData", JSON.toJSONString(vos));
return R.ok().add(vos);
}
@@ -250,7 +305,7 @@
CrnDetailVo vo = new CrnDetailVo();
for (CrnSlave crnSlave : slaveProperties.getCrn()) {
if (crnSlave.getId().equals(crnNo)) {
- MelsecCrnThread crnThread = (MelsecCrnThread) SlaveConnection.get(SlaveType.Crn, crnSlave.getId());
+ SiemensCrnThread crnThread = (SiemensCrnThread) SlaveConnection.get(SlaveType.Crn, crnSlave.getId());
CrnProtocol crnProtocol = crnThread.getCrnProtocol();
vo.setCrnNo(crnNo);
vo.setWorkNo(crnProtocol.getTaskNo());
@@ -272,6 +327,41 @@
vo.setLocNo(wrkMast.getLocNo$());
vo.setCrnStatus(crnProtocol.getStatusType().desc);
vo.setError(""); // todo
+ }
+ }
+ return R.ok().add(vo);
+ }
+ }
+ return R.error();
+ }
+
+ @PostMapping("/rgv/detail")
+ @ManagerAuth(memo = "RGV璁惧鏁版嵁璇︽儏")
+ public R rgvDetail(@RequestParam Integer rgvNo){
+ if (Cools.isEmpty(rgvNo)){
+ return R.parse(CodeRes.EMPTY);
+ }
+ RgvDetailVo vo = new RgvDetailVo();
+ for (RgvSlave rgvSlave : slaveProperties.getRgv()) {
+ if (rgvSlave.getId().equals(rgvNo)) {
+ RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, rgvSlave.getId());
+ RgvProtocol rgvProtocol = rgvThread.getRgvProtocol();
+ vo.setRgvNo(rgvNo);
+ vo.setWorkNo(rgvProtocol.getTaskNo1());
+ vo.setRgvStatus(rgvProtocol.getStatusType().desc);
+
+ vo.setError(String.valueOf(rgvProtocol.getAlarm()));
+
+ if (rgvProtocol.getTaskNo1() > 0) {
+ WrkMast wrkMast = wrkMastService.selectById(rgvProtocol.getTaskNo1());
+ if (wrkMast != null) {
+ vo.setSourceStaNo(wrkMast.getSourceStaNo$());
+ vo.setStaNo(wrkMast.getStaNo$());
+ vo.setWrkSts(wrkMast.getWrkSts$()); // 宸ヤ綔鐘舵��
+ vo.setIoType(wrkMast.getIoType$()); // 鍏ュ嚭搴撶被鍨�
+ vo.setSourceLocNo(wrkMast.getSourceLocNo$());
+ vo.setLocNo(wrkMast.getLocNo$());
+ vo.setRgvStatus(rgvProtocol.getStatusType().desc);
}
}
return R.ok().add(vo);
@@ -308,4 +398,57 @@
return R.ok().add(JSON.toJSONString(jsonObjects));
}
+ @GetMapping("/getLedInfos")
+ public R getLedInfos(HttpServletRequest request) {
+ String remoteAddr = request.getRemoteAddr();
+ for (LedSlave slave : slaveProperties.getLed()) {
+ if (slave.getIp().equals(remoteAddr)) {
+ return R.ok().add(slave);
+ }
+ }
+ return R.ok();
+ }
+
+ @GetMapping("/getIoMode")
+ public R getIoMode() {
+ DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, 1);
+ if (devpThread == null) {
+ return R.error("绾跨▼涓嶅瓨鍦�");
+ }
+
+ LiftProtocol liftProtocol = devpThread.getLiftStatus();
+ if (liftProtocol == null) {
+ return R.error("绾跨▼涓嶅瓨鍦�");
+ }
+
+ return R.ok().add(liftProtocol.getIoMode());
+ }
+
+ @PostMapping("/switchIoMode")
+ public R switchIoMode() {
+ DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, 1);
+ if (devpThread == null) {
+ return R.error("绾跨▼涓嶅瓨鍦�");
+ }
+
+ LiftProtocol liftProtocol = devpThread.getLiftStatus();
+ if (liftProtocol == null) {
+ return R.error("绾跨▼涓嶅瓨鍦�");
+ }
+
+ //妫�娴嬫槸鍚﹁繕鏈変换鍔℃病鍋氬畬
+ List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>());
+ if (!wrkMasts.isEmpty()) {
+ return R.error("绯荤粺浠诲姟鏈畬鎴愶紝璇峰畬鎴愬悗鍐嶅垏鎹㈡ā寮�");
+ }
+
+ int switchIoMode = 1;
+ if (liftProtocol.getIoMode() == 1) {
+ switchIoMode = 2;
+ }
+
+ boolean result = MessageQueue.offer(SlaveType.Devp, 1, new Task(3, switchIoMode));
+ return R.ok();
+ }
+
}
--
Gitblit v1.9.1