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/SiteController.java | 118 ++++++++++-------------------------------------------------
1 files changed, 20 insertions(+), 98 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/SiteController.java b/src/main/java/com/zy/asrs/controller/SiteController.java
index 6bf8805..2f5acc9 100644
--- a/src/main/java/com/zy/asrs/controller/SiteController.java
+++ b/src/main/java/com/zy/asrs/controller/SiteController.java
@@ -2,33 +2,20 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.ManagerAuth;
-import com.core.common.Cools;
import com.core.common.R;
import com.zy.asrs.domain.vo.PlcErrorTableVo;
import com.zy.asrs.domain.vo.SiteTableVo;
import com.zy.asrs.entity.BasDevp;
-import com.zy.asrs.entity.BasSte;
-import com.zy.asrs.entity.WrkCharge;
import com.zy.asrs.service.BasDevpService;
-import com.zy.asrs.service.BasSteService;
-import com.zy.asrs.service.WrkChargeService;
-import com.zy.common.model.enums.WrkChargeType;
-import com.zy.common.service.CommonService;
import com.zy.core.DevpThread;
-import com.zy.core.News;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.SlaveType;
-import com.zy.core.enums.SteChargeType;
-import com.zy.core.enums.SteStatusType;
import com.zy.core.model.DevpSlave;
import com.zy.core.model.Task;
import com.zy.core.model.protocol.StaProtocol;
-import com.zy.core.model.protocol.SteProtocol;
import com.zy.core.properties.SlaveProperties;
-import com.zy.core.thread.SiemensDevpThread;
-import com.zy.core.thread.SteThread;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -37,7 +24,6 @@
/**
* 杈撻�佽澶囨帴鍙�
- * Created by vincent on 2020-06-01
*/
@Slf4j
@RestController
@@ -48,80 +34,6 @@
private SlaveProperties slaveProperties;
@Autowired
private BasDevpService basDevpService;
- @Autowired
- private WrkChargeService wrkChargeService;
- @Autowired
- private BasSteService basSteService;
- @Autowired
- private CommonService commonService;
-
- @GetMapping("/io/mode/info/site")
- @ManagerAuth(memo = "鍏呯數妯″紡")
- public R ioMode(){
- List<Map<String, Object>> res = new ArrayList<>();
- for (DevpSlave devp : slaveProperties.getDevp()) {
- SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
- Map<String, Object> map1 = new HashMap<>();
- map1.put("floor", 1);
- map1.put("modeVal", !devpThread.charge0);
- map1.put("modeDesc", !devpThread.charge0?"鍏呯數涓�":"鍏抽棴");
- res.add(map1);
- Map<String, Object> map2 = new HashMap<>();
- map2.put("floor", 2);
- map2.put("modeVal", devpThread.charge1);
- map2.put("modeDesc", devpThread.charge1?"鍏呯數涓�":"鍏抽棴");
- res.add(map2);
- }
- return R.ok().add(res);
- }
-
- @PostMapping("/io/mode/action/site")
- @ManagerAuth(memo = "鍏呯數鎺у埗")
- public R ioModeAction(@RequestParam("floor") Integer floor, @RequestParam("charge") Boolean charge){
- if (null != wrkChargeService.selectWorking(null, WrkChargeType.charge)) {
- return R.error("鐩墠瀛樺湪灏忚溅鍏呯數浠诲姟锛岃绋嶅悗鍐嶈瘯");
- }
- if (null != wrkChargeService.selectWorking(null, WrkChargeType.reset)) {
- return R.error("鐩墠瀛樺湪灏忚溅澶嶄綅浠诲姟锛岃绋嶅悗鍐嶈瘯");
- }
- if (charge) {
- return R.ok();
- }
-
- SteChargeType steCharge = SteChargeType.get(floor);
- assert steCharge != null;
- Integer steNo = basSteService.hasCarOfLocNo(steCharge.locNo);
- if (Cools.isEmpty(steNo)) {
- return R.error(steNo + "鍙峰皬杞︿笉鍦�" + floor + "鍙峰厖鐢垫々锛岃妫�鏌ュ皬杞﹀畾浣�");
- }
- SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, steNo);
- SteProtocol steProtocol = steThread.getSteProtocol();
- BasSte basSte = basSteService.selectById(steNo);
- if (steProtocol.getMode() == 0) {
- return R.error(steNo + "鍙峰皬杞︾绾匡紝鏃犳硶鎿嶄綔");
- }
- if (!steProtocol.getStatusType().equals(SteStatusType.IDLE)) {
- return R.error(steNo + "鍙峰皬杞︿笉鏄┖闂诧紝鏃犳硶鎿嶄綔");
- }
- WrkCharge wrkCharge = wrkChargeService.selectWorking(steNo, WrkChargeType.reset);
- if (wrkCharge == null) {
- // 寮�濮嬬┛姊溅澶嶄綅浠诲姟
- wrkCharge = new WrkCharge();
- wrkCharge.setSteNo(steNo);
- wrkCharge.setWrkNo(commonService.getChargeWorkNo(6));
- wrkCharge.setWrkSts(41L); // 41.灏忚溅鍑嗗澶嶄綅
- wrkCharge.setCrnNo(2); // 鍥哄畾2鍙峰爢鍨涙満
- wrkCharge.setIoPri((double) 10);
- wrkCharge.setSourceLocNo(steCharge.locNo);
- wrkCharge.setLocNo(basSte.getIdleLoc());
- wrkCharge.setMemo("reset");
- wrkCharge.setAppeTime(new Date());
- if (!wrkChargeService.insert(wrkCharge)) {
- News.error("淇濆瓨{}鍙风┛姊溅澶嶄綅浠诲姟澶辫触!!!", steNo);
- }
- }
- return R.ok(steNo + "鍙峰皬杞﹀噯澶囩寮�" + floor + "鍙峰厖鐢垫々");
- }
@PostMapping("/table/site")
@ManagerAuth(memo = "绔欑偣淇℃伅琛�")
@@ -150,7 +62,26 @@
vo.setShuttleTakeEnable(staProtocol.isShuttleTakeEnable()?"Y":"N"); // 绌挎杞﹀彲鍙栦俊鍙�
vo.setPakMk(staProtocol.isPakMk()?"Y":"N"); // 鍏ュ簱鏍囪
vo.setEmptyMk(staProtocol.isEmptyMk()?"Y":"N"); // 绌烘澘淇″彿
- vo.setStaNo(staProtocol.getStaNo()); // 鐩爣绔�
+ vo.setStaNo(staProtocol.getStaNo() == null ? 0 : staProtocol.getStaNo()); // 鐩爣绔�
+ vo.setLocType1(staProtocol.getLocType1()==null?"-":staProtocol.getLocType1().toString()); // 楂樹綆淇″彿
+
+ String outInModel = "-";
+ if (staProtocol.getOutInModel() != null) {
+ switch (staProtocol.getOutInModel().intValue()) {
+ case 0:
+ outInModel = "default";
+ break;
+ case 1:
+ outInModel = "in";
+ break;
+ case 2:
+ outInModel = "out";
+ break;
+ default:
+ outInModel = "-";
+ }
+ }
+ vo.setOutInModel(outInModel); // 鍑哄叆搴撴ā寮�
}
return R.ok().add(list);
}
@@ -165,14 +96,6 @@
for(Map.Entry<Integer, StaProtocol> entry : station.entrySet()) {
StaProtocol staProtocol = entry.getValue();
-// if (staProtocol) {
-// PlcErrorTableVo vo = new PlcErrorTableVo();
-// vo.setNo(entry.getKey()); // 搴忓彿
-//
-// vo.setPlcDesc(""); // todo:luxiaotao plc閿欒鎻忚堪
-// vo.setError(""); // todo:luxiaotao 寮傚父淇℃伅
-// list.add(vo);
-// }
}
}
@@ -185,7 +108,6 @@
}else{
return -1;
}
-
});
return R.ok().add(list);
}
--
Gitblit v1.9.1