From a3cd273234d56c5a36bd0a793a67e533a2141d6d Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期五, 25 四月 2025 08:23:47 +0800
Subject: [PATCH] 初步调试
---
src/main/java/com/zy/asrs/controller/ConsoleController.java | 363 +++------------------------------------------------
1 files changed, 22 insertions(+), 341 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index 3c08969..a7beef5 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -1,51 +1,26 @@
package com.zy.asrs.controller;
import com.alibaba.fastjson.JSON;
+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.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.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.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;
-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.ScaleThread;
-import com.zy.core.thread.SiemensCrnThread;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStreamReader;
+import javax.servlet.http.HttpServletRequest;
import java.util.*;
/**
@@ -60,15 +35,13 @@
@Autowired
private SlaveProperties slaveProperties;
@Autowired
- private WrkMastService wrkMastService;
- @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 = "绯荤粺杩愯鐘舵��")
@@ -95,216 +68,18 @@
return R.ok().add(Cools.add("status", SystemProperties.WCS_RUNNING_STATUS.get()));
}
- /****************************************************************/
- /************************** 瀹炴椂鏁版嵁 ******************************/
- /****************************************************************/
-
- @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());
- }
+ /**
+ * 鑾峰彇鍦板浘妤煎眰鏁版嵁
+ */
+ @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());
}
- 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<>();
- 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);
- }
-
- @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("/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);
- }
-
- /****************************************************************/
- /************************** 璇︽儏鎿嶄綔 ******************************/
- /****************************************************************/
-
- @PostMapping("/site/detail")
- @ManagerAuth(memo = "杈撻�佽澶囨暟鎹鎯�")
- public R siteDetail(@RequestParam Integer siteId){
- if (Cools.isEmpty(siteId)){
- return R.parse(CodeRes.EMPTY);
- }
- SiteDetailVo vo = new SiteDetailVo();
- for (DevpSlave devp : slaveProperties.getDevp()) {
- DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
- if (null != devpThread) {
- StaProtocol staProtocol = devpThread.getStation().get(siteId);
- if (staProtocol != null) {
- BasDevp basDevp = basDevpService.selectById(siteId);
- if (basDevp == null) {
- return R.error("鏁版嵁搴撶淮鎶ゅ紓甯�");
- }
- vo.setSiteId(siteId); // 绔欑偣缂栧彿
- vo.setWorkNo(staProtocol.getWorkNo()); // 宸ヤ綔鍙�
-
- if (staProtocol.getWorkNo() > 0) {
- WrkMast wrkMast = wrkMastService.selectById(staProtocol.getWorkNo());
- if (wrkMast != null) {
- vo.setWrkSts(wrkMast.getWrkSts$()); // 宸ヤ綔鐘舵��
- vo.setIoType(wrkMast.getIoType$()); // 鍏ュ嚭搴撶被鍨�
- vo.setSourceStaNo(wrkMast.getSourceStaNo$());
- vo.setStaNo(wrkMast.getStaNo$());
- vo.setSourceLocNo(wrkMast.getSourceLocNo$());
- vo.setLocNo(wrkMast.getLocNo$());
- }
- }
-
- vo.setAutoing(staProtocol.isAutoing()?"Y":"N"); // 鑷姩
- vo.setLoading(staProtocol.isLoading()?"Y":"N"); // 鏈夌墿
-
- vo.setCanining(basDevp.getCanining()); // 鑳藉叆
- vo.setCanouting(basDevp.getCanouting()); // 鑳藉嚭
-
- return R.ok().add(vo);
- }
- }
- }
- return R.error();
-
- }
-
- @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)) {
- SiemensCrnThread crnThread = (SiemensCrnThread) 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 = "杈撻�佽澶囨暟鎹慨鏀�")
- public R updateSite(){
- return R.ok();
- }
-
- @Deprecated
- @PostMapping("/crn/update")
- @ManagerAuth(memo = "鍫嗗灈鏈烘暟鎹慨鏀�")
- public R updateCrn(){
- 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)));
+ return R.ok().add(levList);
}
/**
@@ -321,53 +96,8 @@
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();
}
/**
@@ -377,32 +107,7 @@
@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));
+ redisUtil.del(RedisKeyType.MAP.key + i);
}
return R.ok();
}
@@ -411,33 +116,9 @@
* 閲嶇疆redis涓殑鍦板浘锛屽皢鍗犵敤鐨勫簱浣嶅叏閮ㄨВ闄�
*/
@GetMapping("/map/resetMap/{lev}")
- public R resetMapToRedisByLev(@PathVariable Integer lev) {
- 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));
+ @ManagerAuth(memo = "閲嶇疆Redis鍦板浘")
+ public R resetMapToRedisByLev(@PathVariable Integer lev, HttpServletRequest request) {
+ redisUtil.del(RedisKeyType.MAP.key + lev);
return R.ok();
}
--
Gitblit v1.9.1