From d1ef13d1f116e69a7f44e78d64fd0fe4ce2cad80 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 10 二月 2025 13:17:10 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/ConsoleController.java | 230 +++++++++++++++++++++++++++++++++------------------------
1 files changed, 134 insertions(+), 96 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index 6379d35..7aa5a3b 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -5,39 +5,39 @@
import com.core.common.Arith;
import com.core.common.Cools;
import com.core.common.R;
-import com.zy.asrs.domain.enums.CrnStatusType;
import com.zy.asrs.domain.enums.SiteStatusType;
import com.zy.asrs.domain.param.SystemSwitchParam;
import com.zy.asrs.domain.vo.*;
import com.zy.asrs.entity.BasDevp;
+import com.zy.asrs.entity.BasMap;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.mapper.LocMastMapper;
import com.zy.asrs.service.BasDevpService;
+import com.zy.asrs.service.BasMapService;
import com.zy.asrs.service.WrkMastService;
import com.zy.common.CodeRes;
-import com.zy.core.CrnThread;
+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.DevpThread;
import com.zy.core.Slave;
import com.zy.core.cache.OutputQueue;
import com.zy.core.cache.SlaveConnection;
-import com.zy.core.enums.CrnModeType;
+import com.zy.core.enums.RedisKeyType;
import com.zy.core.enums.SlaveType;
-import com.zy.core.model.CrnSlave;
import com.zy.core.model.DevpSlave;
-import com.zy.core.model.protocol.CrnProtocol;
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.ScaleThread;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletRequest;
import java.util.*;
/**
@@ -56,7 +56,15 @@
@Autowired
private BasDevpService basDevpService;
@Autowired
+ private BasMapService basMapService;
+ @Autowired
private LocMastMapper locMastMapper;
+ @Autowired
+ private RedisUtil redisUtil;
+ @Value("${super.pwd}")
+ private String superPwd;
+ @Autowired
+ private NavigateMapData navigateMapData;
@PostMapping("/system/running/status")
@ManagerAuth(memo = "绯荤粺杩愯鐘舵��")
@@ -105,50 +113,6 @@
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<>();
- for (CrnSlave crn : slaveProperties.getCrn()) {
- // 鑾峰彇鍫嗗灈鏈轰俊鎭�
- CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
- if (crnThread == null) {
- continue;
- }
- CrnProtocol crnProtocol = crnThread.getCrnProtocol();
- if (crnProtocol == null) {
- continue;
- }
- CrnLatestDataVo vo = new CrnLatestDataVo();
- vo.setCrnId(crn.getId()); // 鍫嗗灈鏈虹紪鍙�
-
-// Short totalBay = locMastMapper.selectTotalBay();
-
- vo.setOffset((double) new Random().nextInt(560)); // 鍫嗗灈鏈哄亸绉婚噺
- vo.setBay((short) (crnProtocol.getBay() - crn.getOffset())); // 褰撳墠鍒�
- /**
- * 鍫嗗灈鏈虹姸鎬佸垽鏂�
- */
- if (crn.getId() == 1 && 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(vos);
}
@@ -236,38 +200,6 @@
}
- @PostMapping("/crn/detail")
- @ManagerAuth(memo = "鍫嗗灈鏈鸿澶囨暟鎹鎯�")
- public R crnDetail(@RequestParam Integer crnNo){
- if (Cools.isEmpty(crnNo)){
- return R.parse(CodeRes.EMPTY);
- }
- CrnDetailVo vo = new CrnDetailVo();
- for (CrnSlave crnSlave : slaveProperties.getCrn()) {
- if (crnSlave.getId().equals(crnNo)) {
- MelsecCrnThread crnThread = (MelsecCrnThread) SlaveConnection.get(SlaveType.Crn, crnSlave.getId());
- CrnProtocol crnProtocol = crnThread.getCrnProtocol();
- vo.setCrnNo(crnNo);
- vo.setWorkNo(crnProtocol.getTaskNo());
- if (crnProtocol.getTaskNo() > 0) {
- WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
- 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.setCrnStatus(crnProtocol.getStatusType().desc);
- vo.setError(""); // todo
- }
- }
- return R.ok().add(vo);
- }
- }
- return R.error();
- }
-
@Deprecated
@PostMapping("/site/update")
@ManagerAuth(memo = "杈撻�佽澶囨暟鎹慨鏀�")
@@ -282,17 +214,123 @@
return R.ok();
}
- @PostMapping("/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());
+ @GetMapping("/barcode/output/site")
+ public R barcodeOutput(){
return R.ok().add(JSON.toJSONString(new ArrayList<>(OutputQueue.BARCODE)));
}
+ @GetMapping("/barcode/list")
+ public R barcodeList(){
+ ArrayList<HashMap<String, Object>> list = new ArrayList<>();
+ for (Slave slave : slaveProperties.getBarcode()) {
+ HashMap<String, Object> map = new HashMap<>();
+ BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, slave.getId());
+ map.put("id", slave.getId());
+ map.put("barcode", barcodeThread.getBarcode());
+ list.add(map);
+ }
+ return R.ok().add(list);
+ }
+
+ /**
+ * 鑾峰彇鍦板浘鏁版嵁
+ */
+ @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();
+ }
+
+ 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);
+ }
+
+ /**
+ * 閲嶇疆redis涓殑鍦板浘锛屽皢鍗犵敤鐨勫簱浣嶅叏閮ㄨВ闄�
+ */
+ @GetMapping("/map/resetMap/auth")
+ @ManagerAuth
+ public R resetMapToRedis() {
+ for (int i = 1; i <= 10; i++) {//鎬诲叡10灞傛ゼ
+ BasMap basMap = basMapService.selectLatestMap(i);
+ //杞藉叆鍦板浘
+ List<List<MapNode>> lists = navigateMapData.getJsonData(i, -1, null, null);//鑾峰彇瀹屾暣鍦板浘(鍖呮嫭鍏ュ簱鍑哄簱)
+ if (basMap == null) {
+ //鏁版嵁搴撲腑涔熶笉瀛樺湪鍦板浘鏁版嵁锛屼粠鍦板浘鏂囦欢涓幏鍙�
+ //瀛樺叆鏁版嵁搴�
+ basMap = new BasMap();
+ basMap.setData(JSON.toJSONString(lists));
+ basMap.setCreateTime(new Date());
+ basMap.setUpdateTime(new Date());
+ basMap.setLev(i);
+
+ if (!basMapService.insert(basMap)) {
+ log.info("鍦板浘鏁版嵁瀛樺偍澶辫触");
+ }
+ }else {
+ basMap.setData(JSON.toJSONString(lists));
+ basMap.setUpdateTime(new Date());
+ if (!basMapService.updateById(basMap)) {
+ log.info("鍦板浘鏁版嵁瀛樺偍澶辫触");
+ }
+ }
+
+ //灏嗘暟鎹簱鍦板浘鏁版嵁瀛樺叆redis
+ redisUtil.set(RedisKeyType.MAP.key + i, JSON.toJSONString(basMap));
+ }
+ return R.ok();
+ }
+
+ /**
+ * 閲嶇疆redis涓殑鍦板浘锛屽皢鍗犵敤鐨勫簱浣嶅叏閮ㄨВ闄�
+ */
+ @GetMapping("/map/resetMap/{lev}")
+ @ManagerAuth(memo = "閲嶇疆Redis鍦板浘")
+ public R resetMapToRedisByLev(@PathVariable Integer lev, HttpServletRequest request) {
+ // super璐﹀彿
+ String token = request.getHeader("token");
+ if (token == null) {
+ return R.error();
+ }
+ String deToken = Cools.deTokn(token, superPwd);
+ if (deToken == null) {
+ return R.error("鏉冮檺涓嶈冻");
+ }
+ if (!"super".equals(deToken.substring(13))) {
+ return R.error("鏉冮檺涓嶈冻");
+ }
+
+ BasMap basMap = basMapService.selectLatestMap(lev);
+ //杞藉叆鍦板浘
+ List<List<MapNode>> lists = navigateMapData.getJsonData(lev, -1, null, null);//鑾峰彇瀹屾暣鍦板浘(鍖呮嫭鍏ュ簱鍑哄簱)
+ if (basMap == null) {
+ //鏁版嵁搴撲腑涔熶笉瀛樺湪鍦板浘鏁版嵁锛屼粠鍦板浘鏂囦欢涓幏鍙�
+ //瀛樺叆鏁版嵁搴�
+ basMap = new BasMap();
+ basMap.setData(JSON.toJSONString(lists));
+ basMap.setCreateTime(new Date());
+ basMap.setUpdateTime(new Date());
+ basMap.setLev(lev);
+
+ if (!basMapService.insert(basMap)) {
+ log.info("鍦板浘鏁版嵁瀛樺偍澶辫触");
+ }
+ } else {
+ basMap.setData(JSON.toJSONString(lists));
+ basMap.setUpdateTime(new Date());
+ if (!basMapService.updateById(basMap)) {
+ log.info("鍦板浘鏁版嵁瀛樺偍澶辫触");
+ }
+ }
+
+ //灏嗘暟鎹簱鍦板浘鏁版嵁瀛樺叆redis
+ redisUtil.set(RedisKeyType.MAP.key + lev, JSON.toJSONString(basMap));
+ return R.ok();
+ }
+
}
--
Gitblit v1.9.1