From 58d3d34b740a07099384152e0024e6c09891eca5 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 28 十月 2025 16:30:30 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/ConsoleController.java | 135 ++++++++++++++++++++++++++++++++++++++++----
1 files changed, 121 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index 168562a..f159b5f 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -1,9 +1,12 @@
package com.zy.asrs.controller;
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;
+import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.domain.enums.CrnStatusType;
import com.zy.asrs.domain.enums.SiteStatusType;
@@ -13,10 +16,11 @@
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;
@@ -26,17 +30,24 @@
import com.zy.core.enums.SlaveType;
import com.zy.core.model.CrnSlave;
import com.zy.core.model.DevpSlave;
+import com.zy.core.model.LedSlave;
+import com.zy.core.model.RgvSlave;
import com.zy.core.model.protocol.CrnProtocol;
+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.*;
/**
@@ -55,9 +66,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 = "绯荤粺杩愯鐘舵��")
@@ -88,6 +103,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(){
@@ -107,6 +140,7 @@
vo.setSiteStatus(SiteStatusType.process(staProtocol)); // 鐘舵��
vos.add(vo);
}
+ redisUtil.set("siteLatestData", JSON.toJSONString(vos));
return R.ok().add(vos);
}
@@ -151,6 +185,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);
}
@@ -246,7 +306,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());
@@ -276,6 +336,41 @@
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);
+ }
+ }
+ return R.error();
+ }
+
@Deprecated
@PostMapping("/site/update")
@ManagerAuth(memo = "杈撻�佽澶囨暟鎹慨鏀�")
@@ -292,15 +387,27 @@
@GetMapping("/barcode/output/site")
public R crnOutput(){
-// StringBuilder str = new StringBuilder();
-// String s;
-// int i = 0;
-// while((s = OutputQueue.CRN.poll()) != null && i <=32) {
-// str.append("\n").append(s);
-// i++;
-// }
-// return R.ok().add(str.toString());
- return R.ok().add(JSON.toJSONString(new ArrayList<>(OutputQueue.BARCODE)));
+ ArrayList<JSONObject> jsonObjects = new ArrayList<>(OutputQueue.BARCODE);
+ jsonObjects.sort(new Comparator<JSONObject>() {
+ @Override
+ public int compare(JSONObject o1, JSONObject o2) {
+ Date o1Time = DateUtils.convert(o1.getString("time"), DateUtils.yyyyMMddHHmmss_F);
+ Date o2Time = DateUtils.convert(o2.getString("time"), DateUtils.yyyyMMddHHmmss_F);
+ return (int) (o2Time.getTime() - o1Time.getTime());
+ }
+ });
+ 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();
}
}
--
Gitblit v1.9.1