From d500950add4a43fbd02135a5cb59de0493a8261a Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期五, 01 十二月 2023 09:20:44 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/ConsoleController.java | 267 +++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 239 insertions(+), 28 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index 1b7ef38..f450cd2 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -1,6 +1,9 @@
package com.zy.asrs.controller;
+import com.alibaba.fastjson.JSON;
import com.core.annotations.ManagerAuth;
+import com.core.common.Arith;
+import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
import com.zy.asrs.domain.enums.CrnStatusType;
@@ -8,12 +11,25 @@
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.common.model.MapNode;
+import com.zy.common.model.enums.NavigationMapType;
+import com.zy.common.utils.Http;
+import com.zy.common.utils.NavigateMapData;
+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.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;
@@ -21,17 +37,20 @@
import com.zy.core.model.protocol.StaProtocol;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.properties.SystemProperties;
-import com.zy.core.thread.CrnThread;
-import com.zy.core.thread.DevpThread;
+import com.zy.core.thread.BarcodeThread;
+import com.zy.core.thread.ScaleThread;
+import com.zy.core.thread.SiemensCrnThread;
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.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStreamReader;
import java.util.*;
-import java.util.concurrent.atomic.AtomicInteger;
/**
* 涓绘帶鍥炬帴鍙�
@@ -48,8 +67,14 @@
private WrkMastService wrkMastService;
@Autowired
private BasDevpService basDevpService;
-
- public static AtomicInteger integer = new AtomicInteger();
+ @Autowired
+ private BasMapService basMapService;
+ @Autowired
+ private LocMastMapper locMastMapper;
+ @Autowired
+ private RedisUtil redisUtil;
+ @Value("${super.pwd}")
+ private String superPwd;
@PostMapping("/system/running/status")
@ManagerAuth(memo = "绯荤粺杩愯鐘舵��")
@@ -71,7 +96,7 @@
return R.error("鍙ｄ护閿欒");
}
}
- Thread.sleep(2000L);
+ Thread.sleep(200L);
SystemProperties.WCS_RUNNING_STATUS.set(param.getOperatorType()==1?Boolean.TRUE:Boolean.FALSE);
return R.ok().add(Cools.add("status", SystemProperties.WCS_RUNNING_STATUS.get()));
}
@@ -110,27 +135,35 @@
// 鑾峰彇鍫嗗灈鏈轰俊鎭�
CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
if (crnThread == null) {
- log.error("{}鍙峰爢鍨涙満杩炴帴澶辫触", crn.getId());
continue;
}
CrnProtocol crnProtocol = crnThread.getCrnProtocol();
if (crnProtocol == null) {
- log.error("{}鍙峰爢鍨涙満杩炴帴澶辫触", crn.getId());
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 (crnProtocol.getTaskNo()>0) {
- WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
- if (wrkMast != null) {
- vo.setCrnStatusType(CrnStatusType.process(wrkMast.getIoType()));
- }
+ if (crn.getId() == 1 && crnProtocol.getAlarm() > 0) {
+ vo.setCrnStatus(CrnStatusType.MACHINE_ERROR);
} else {
- vo.setCrnStatusType(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.AUTO: CrnStatusType.UN_AUTO);
+ 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);
@@ -141,16 +174,32 @@
@PostMapping("/latest/data/barcode")
@ManagerAuth(memo = "鏉＄爜鎵弿浠疄鏃舵暟鎹�")
public R barcodeLatestData(){
- integer.getAndIncrement();
List<BarcodeDataVo> list = new ArrayList<>();
- for (int i=1;i<=1;i++){
- BarcodeDataVo vo = new BarcodeDataVo();
- vo.setBarcodeId("1");
- if (integer.get()%5 != 0) {
- vo.setCodeValue("0");
- } else {
- vo.setCodeValue(String.valueOf(new Random().nextInt(5000)));
+ 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("/latest/data/scale")
+ @ManagerAuth(memo = "纾呯Г瀹炴椂鏁版嵁")
+ public R scaleLatestData(){
+ List<ScaleDataVo> list = new ArrayList<>();
+ for (Slave scale : slaveProperties.getScale()) {
+ ScaleThread scaleThread = (ScaleThread) SlaveConnection.get(SlaveType.Scale, scale.getId());
+ if (null == scaleThread) {
+ continue;
+ }
+ ScaleDataVo vo = new ScaleDataVo();
+ vo.setScaleId(scale.getId());
+ vo.setValue(String.valueOf(Arith.multiplys(1, scaleThread.getScale(), 1)));
list.add(vo);
}
return R.ok().add(list);
@@ -214,7 +263,7 @@
CrnDetailVo vo = new CrnDetailVo();
for (CrnSlave crnSlave : slaveProperties.getCrn()) {
if (crnSlave.getId().equals(crnNo)) {
- CrnThread crnThread = (CrnThread) 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());
@@ -231,9 +280,10 @@
vo.setError(""); // todo
}
}
+ return R.ok().add(vo);
}
}
- return R.ok().add(vo);
+ return R.error();
}
@Deprecated
@@ -250,4 +300,165 @@
return R.ok();
}
+ @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)));
+ }
+
+ /**
+ * 鑾峰彇鍦板浘鏁版嵁
+ */
+ @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);
+ NavigateMapData navigateMapData = new NavigateMapData(lev);
+ List<List<MapNode>> lists = navigateMapData.filterMap(NavigationMapType.NONE.id, arrayList, lev, null, null);//杩囨护鍦板浘鏁版嵁
+ return R.ok().add(lists);
+ }
+
+ /**
+ * 鑾峰彇PLC2鏁版嵁
+ */
+ @GetMapping("/plc2/auth")
+ @ManagerAuth
+ public R getMapFromPlc2() {
+ try {
+ String mapFilename = "plc2.json";
+ String fileName = this.getClass().getClassLoader().getResource(mapFilename).getPath();//鑾峰彇鏂囦欢璺緞
+ File file = new File(fileName);
+ StringBuffer stringBuffer = new StringBuffer();
+ if (file.isFile() && file.exists()) {
+ InputStreamReader isr = new InputStreamReader(new FileInputStream(file), "GBK");
+ BufferedReader br = new BufferedReader(isr);
+ String lineTxt = null;
+ while ((lineTxt = br.readLine()) != null) {
+ stringBuffer.append(lineTxt);
+ }
+ br.close();
+ }
+
+ NavigateMapData navigateMapData = new NavigateMapData();
+
+ //瑙ｆ瀽json鍦板浘鏁版嵁
+ ArrayList arrayList = JSON.parseObject(stringBuffer.toString(), ArrayList.class);
+ List<List<MapNode>> lists = new ArrayList<>();
+ //閲嶅缓鏁版嵁鏍煎紡
+ for (int i = 0; i < arrayList.size(); i++) {
+ Object obj = arrayList.get(i);
+ List<MapNode> list = JSON.parseArray(obj.toString(), MapNode.class);
+ for (int j = 0; j < list.size(); j++) {
+ MapNode mapNode = list.get(j);
+ list.set(j, mapNode);
+ }
+ lists.add(list);
+ }
+ return R.ok().add(lists);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ return R.error();
+ }
+
+ /**
+ * 閲嶇疆redis涓殑鍦板浘锛屽皢鍗犵敤鐨勫簱浣嶅叏閮ㄨВ闄�
+ */
+ @GetMapping("/map/resetMap/auth")
+ @ManagerAuth
+ public R resetMapToRedis() {
+ for (int i = 1; i <= 10; i++) {//鎬诲叡10灞傛ゼ
+ BasMap basMap = basMapService.selectLatestMap(i);
+ //杞藉叆鍦板浘
+ NavigateMapData mapData = new NavigateMapData(i);
+ List<List<MapNode>> lists = mapData.getJsonData(-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);
+ //杞藉叆鍦板浘
+ NavigateMapData mapData = new NavigateMapData(lev);
+ List<List<MapNode>> lists = mapData.getJsonData(-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