From 22a4f862b33a02ed7baccf0da690ce2c52b756fe Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期五, 02 五月 2025 16:24:53 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/SiteController.java | 226 ++++++++++++++++----------------------------------------
1 files changed, 66 insertions(+), 160 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/SiteController.java b/src/main/java/com/zy/asrs/controller/SiteController.java
index 45efdff..610f4de 100644
--- a/src/main/java/com/zy/asrs/controller/SiteController.java
+++ b/src/main/java/com/zy/asrs/controller/SiteController.java
@@ -8,10 +8,13 @@
import com.zy.asrs.domain.vo.SiteTableVo;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.service.BasDevpService;
-import com.zy.asrs.utils.CommandUtils;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
import com.zy.core.cache.SlaveConnection;
+import com.zy.core.enums.DevpType.DevpRequestType;
+import com.zy.core.enums.DevpType.DevpStateType;
+import com.zy.core.enums.DevpType.DevpTrayType;
+import com.zy.core.enums.DevpType.DevpWorkType;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.DevpSlave;
import com.zy.core.model.Task;
@@ -37,7 +40,6 @@
@Autowired
private BasDevpService basDevpService;
-
@GetMapping("/io/mode/info/site")
@ManagerAuth(memo = "鍏ュ嚭搴撴ā寮�")
public R ioMode(){
@@ -51,38 +53,6 @@
res.add(map2);
}
return R.ok().add(res);
- }
-
- @PostMapping("/table/site")
- @ManagerAuth(memo = "绔欑偣淇℃伅琛�")
- public R siteTable(){
- List<SiteTableVo> list = new ArrayList<>();
- // 鍐呭瓨鏁版嵁
- Map<Integer, StaProtocol> station = new HashMap<>();
- for (DevpSlave devp : slaveProperties.getDevp()) {
- DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
- station.putAll(devpThread.getStation());
- }
- // 鎸佷箙鏁版嵁
- List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<BasDevp>().orderBy("dev_no"));
- for (BasDevp devp : basDevps) {
- SiteTableVo vo = new SiteTableVo();
- vo.setDevNo(devp.getDevNo()); // 绔欑偣缂栧彿
- list.add(vo);
- StaProtocol staProtocol = station.get(devp.getDevNo());
- if (null == staProtocol) { continue; }
- vo.setWorkNo(staProtocol.getWorkNo()); // 宸ヤ綔鍙�
- vo.setAutoing(staProtocol.isAutoing()?"Y":"N"); // 鑷姩
- vo.setLoading(staProtocol.isLoading()?"Y":"N"); // 鏈夌墿
- vo.setInEnable(staProtocol.isInEnable()?"Y":"N"); // 鍙叆
- vo.setOutEnable(staProtocol.isOutEnable()?"Y":"N"); // 鍙嚭
- vo.setPakMk(staProtocol.isPakMk()?"Y":"N"); // 鍏ュ簱鏍囪
- vo.setEmptyMk(staProtocol.isEmptyMk()?"Y":"N"); // 绌烘澘淇″彿
- vo.setStaNo(staProtocol.getStaNo()); // 鐩爣绔�
-// vo.setLocType1(staProtocol.isHigh() != staProtocol.isLow() && staProtocol.isLow() ? "浣�" : "楂�"); //楂樹綆搴撲綅
- vo.setLocType1(devp.getDevNo()==102 ? "楂�" : "浣�");
- }
- return R.ok().add(list);
}
@GetMapping("/list/auth")
@@ -104,16 +74,47 @@
StaProtocol staProtocol = station.get(devp.getDevNo());
if (null == staProtocol) { continue; }
vo.setWorkNo(staProtocol.getWorkNo()); // 宸ヤ綔鍙�
- vo.setAutoing(staProtocol.isAutoing()?"Y":"N"); // 鑷姩
- vo.setLoading(staProtocol.isLoading()?"Y":"N"); // 鏈夌墿
- vo.setInEnable(staProtocol.isInEnable()?"Y":"N"); // 鍙叆
- vo.setOutEnable(staProtocol.isOutEnable()?"Y":"N"); // 鍙嚭
+ vo.setAutoing(staProtocol.stateType == DevpStateType.AUTO?"Y":"N"); // 鑷姩
+ vo.setLoading(staProtocol.workType == DevpWorkType.BUSY?"Y":"N"); // 鏈夌墿
+ vo.setInEnable(staProtocol.requestType == DevpRequestType.IN?"Y":"N"); // 鍙叆
+ vo.setOutEnable(staProtocol.requestType == DevpRequestType.OUT?"Y":"N"); // 鍙嚭
vo.setPakMk(staProtocol.isPakMk()?"Y":"N"); // 鍏ュ簱鏍囪
- vo.setEmptyMk(staProtocol.isEmptyMk()?"Y":"N"); // 绌烘澘淇″彿
+ vo.setEmptyMk(staProtocol.trayType == DevpTrayType.EMPTY?"Y":"N"); // 绌烘澘淇″彿
vo.setStaNo(staProtocol.getStaNo()); // 鐩爣绔�
-// vo.setLocType1(staProtocol.isHigh() != staProtocol.isLow() && staProtocol.isLow() ? "浣�" : "楂�"); //楂樹綆搴撲綅
- vo.setLocType1(devp.getDevNo()==102 ? "楂�" : "浣�");
+ vo.setLocType1(staProtocol.locType.desc);
}
+ return R.ok().add(list);
+ }
+
+ @PostMapping("/table/site")
+ @ManagerAuth(memo = "绔欑偣淇℃伅琛�")
+ public R siteTable(){
+ List<SiteTableVo> list = new ArrayList<>();
+ // 鍐呭瓨鏁版嵁
+ Map<Integer, StaProtocol> station = new HashMap<>();
+ for (DevpSlave devp : slaveProperties.getDevp()) {
+ DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
+ station.putAll(devpThread.getStation());
+ }
+ // 鎸佷箙鏁版嵁
+ List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<BasDevp>().orderBy("dev_no"));
+ for (BasDevp devp : basDevps) {
+ SiteTableVo vo = new SiteTableVo();
+ vo.setDevNo(devp.getDevNo()); // 绔欑偣缂栧彿
+
+ list.add(vo);
+ StaProtocol staProtocol = station.get(devp.getDevNo());
+ if (null == staProtocol) { continue; }
+ vo.setAutoing(staProtocol.stateType == DevpStateType.AUTO?"Y":"N"); // 鑷姩
+ vo.setLoading(staProtocol.workType == DevpWorkType.BUSY?"Y":"N"); // 鏈夌墿
+ vo.setInEnable(staProtocol.requestType == DevpRequestType.IN?"Y":"N"); // 鍙叆
+ vo.setOutEnable(staProtocol.requestType == DevpRequestType.OUT?"Y":"N"); // 鍙嚭
+ vo.setPakMk(staProtocol.isPakMk()?"Y":"N"); // 鍏ュ簱鏍囪
+ vo.setEmptyMk(staProtocol.trayType == DevpTrayType.EMPTY?"Y":"N"); // 绌烘澘淇″彿
+ vo.setStaNo(staProtocol.getStaNo()); // 鐩爣绔�
+ vo.setLocType1(staProtocol.locType.desc);
+ }
+
return R.ok().add(list);
}
@@ -163,15 +164,16 @@
StaProtocol staProtocol = entry.getValue();
vo.setDevNo(entry.getKey()); // 绔欑偣缂栧彿
vo.setWorkNo(staProtocol.getWorkNo()); // 宸ヤ綔鍙�
- vo.setAutoing(staProtocol.isAutoing()?"Y":"N"); // 鑷姩
- vo.setLoading(staProtocol.isLoading()?"Y":"N"); // 鏈夌墿
- vo.setInEnable(staProtocol.isInEnable()?"Y":"N"); // 鍙叆
- vo.setOutEnable(staProtocol.isOutEnable()?"Y":"N"); // 鍙嚭
+ vo.setAutoing(staProtocol.stateType == DevpStateType.AUTO?"Y":"N"); // 鑷姩
+ vo.setLoading(staProtocol.workType == DevpWorkType.BUSY?"Y":"N"); // 鏈夌墿
+ vo.setInEnable(staProtocol.requestType == DevpRequestType.IN?"Y":"N"); // 鍙叆
+ vo.setOutEnable(staProtocol.requestType == DevpRequestType.OUT?"Y":"N"); // 鍙嚭
+ vo.setPakMk(staProtocol.isPakMk()?"Y":"N"); // 鍏ュ簱鏍囪
+ vo.setEmptyMk(staProtocol.trayType == DevpTrayType.EMPTY?"Y":"N"); // 绌烘澘淇″彿
vo.setPakMk(staProtocol.isPakMk()?"Y":"N"); // 闇�姹�1
- vo.setEmptyMk(staProtocol.isEmptyMk()?"Y":"N"); // 绌烘澘淇″彿
+ vo.setEmptyMk(staProtocol.trayType == DevpTrayType.EMPTY?"Y":"N"); // 绌烘澘淇″彿
vo.setStaNo(staProtocol.getStaNo()); // 鐩爣绔�
- vo.setLocType1(staProtocol.isHigh() != staProtocol.isLow() && staProtocol.isLow() ? "浣�" : "楂�"); //楂樹綆搴撲綅
- vo.setCar(staProtocol.isCar() ? "鏈�": "鏃�");
+ vo.setLocType1(staProtocol.locType.desc); //楂樹綆搴撲綅
return R.ok().add(vo);
}
}
@@ -181,22 +183,15 @@
@PostMapping("/detl/update")
@ManagerAuth(memo = "淇敼绔欑偣鏁版嵁")
- public R siteDetlUpdate(@RequestParam Integer devNo,
- @RequestParam Short workNo,
+ public R siteDetlUpdate(@RequestParam Integer siteId,
+ @RequestParam Integer workNo,
@RequestParam Short staNo,
- @RequestParam(required = false) String pakMk,
- @RequestParam(required = false) Boolean inEnable,
- @RequestParam(required = false) Boolean outEnable
- ) {
- BasDevp basDevp = basDevpService.selectById(devNo);
- if (basDevp == null) {
- return R.error("绔欑偣涓嶅瓨鍦�");
- }
+ @RequestParam String pakMk){
for (DevpSlave devp : slaveProperties.getDevp()) {
DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
Map<Integer, StaProtocol> station = devpThread.getStation();
for (Map.Entry<Integer, StaProtocol> entry : station.entrySet()) {
- if (devNo.equals(entry.getKey())) {
+ if (siteId.equals(entry.getKey())) {
StaProtocol staProtocol = entry.getValue();
if (staProtocol == null) {
continue;
@@ -204,24 +199,16 @@
staProtocol = staProtocol.clone();
}
if (workNo != null) {
- staProtocol.setWorkNo(workNo);
+ staProtocol.setWorkNo(workNo.shortValue());
}
if (staNo != null) {
staProtocol.setStaNo(staNo);
}
if (pakMk != null) {
- staProtocol.setPakMk(pakMk.equals("Y"));
+// staProtocol.setPakMk(pakMk.equals("Y"));
+ devpThread.setPakMk(staProtocol.getSiteId(), pakMk.equals("Y"));
}
- if (inEnable != null) {
- staProtocol.setInEnable(inEnable);
- basDevp.setInEnable(inEnable ? "Y" : "N");
- }
- if (outEnable != null) {
- staProtocol.setOutEnable(outEnable);
- basDevp.setOutEnable(outEnable ? "Y" : "N");
- }
- basDevpService.updateById(basDevp);
- boolean result = CommandUtils.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol), false);
+ boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
if (result) {
return R.ok();
} else {
@@ -230,95 +217,7 @@
}
}
}
- return R.error("鏇存柊澶辫触");
- }
- @PostMapping("/detl/out")
- @ManagerAuth(memo = "淇敼绔欑偣鏁版嵁")
- public R siteDetlout(@RequestParam Integer devNo,
- @RequestParam Short workNo,
- @RequestParam Short staNo,
- @RequestParam(required = false) String pakMk,
- @RequestParam(required = false) Boolean inEnable,
- @RequestParam(required = false) Boolean outEnable
- ) {
- BasDevp basDevp = basDevpService.selectById(devNo);
- if (basDevp == null) {
- return R.error("绔欑偣涓嶅瓨鍦�");
- }
- for (DevpSlave devp : slaveProperties.getDevp()) {
- DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
- Map<Integer, StaProtocol> station = devpThread.getStation();
- for (Map.Entry<Integer, StaProtocol> entry : station.entrySet()) {
- if (devNo.equals(entry.getKey())) {
- StaProtocol staProtocol = entry.getValue();
- if (staProtocol == null) {
- continue;
- } else {
- staProtocol = staProtocol.clone();
- }
- if (pakMk != null) {
- staProtocol.setPakMk(pakMk.equals("Y"));
- }
- if (inEnable != null) {
- staProtocol.setInEnable(inEnable);
- basDevp.setInEnable(inEnable ? "Y" : "N");
- }
- if (outEnable != null) {
- staProtocol.setOutEnable(outEnable);
- basDevp.setOutEnable(outEnable ? "Y" : "N");
- }
- staProtocol.setWorkNo((short) 0);
- staProtocol.setStaNo((short) 0);
- basDevpService.updateById(basDevp);
- boolean result = CommandUtils.offer(SlaveType.Devp, devp.getId(), new Task(3, staProtocol), false);
- if (result) {
- return R.ok();
- } else {
- return R.error("涓嬪彂鍛戒护澶辫触");
- }
- }
- }
- }
- return R.error("鏇存柊澶辫触");
- }
- @PostMapping("/detl/in")
- @ManagerAuth(memo = "淇敼绔欑偣鏁版嵁")
- public R siteDetlint(@RequestParam Integer devNo,
- @RequestParam Short workNo,
- @RequestParam Short staNo,
- @RequestParam(required = false) String pakMk,
- @RequestParam(required = false) Boolean inEnable,
- @RequestParam(required = false) Boolean outEnable
- ) {
- BasDevp basDevp = basDevpService.selectById(devNo);
- if (basDevp == null) {
- return R.error("绔欑偣涓嶅瓨鍦�");
- }
- for (DevpSlave devp : slaveProperties.getDevp()) {
- // 閬嶅巻鍏ュ簱鍙�
- for (DevpSlave.Sta inSta : devp.getInSta()) {
- if (!devNo.equals(inSta.getBackSta()) ){
- continue;
- }
- // 鑾峰彇鍏ュ簱绔欎俊鎭�
- DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
- StaProtocol staProtocol = devpThread.getStation().get(inSta.getBackSta());
- if (staProtocol == null) {
- continue;
- } else {
- staProtocol = staProtocol.clone();
- }
- staProtocol.setWorkNo((short) 9999);
- staProtocol.setStaNo(inSta.getStaNo().shortValue());
- boolean result = CommandUtils.offer(SlaveType.Devp, devp.getId(), new Task(3, staProtocol), false);
- if (result) {
- return R.ok();
- } else {
- return R.error("涓嬪彂鍛戒护澶辫触");
- }
- }
- }
- return R.error("鏇存柊澶辫触");
+ return R.error("plc宸叉帀绾�");
}
public List<PlcErrorTableVo> staPlcErr(Map.Entry<Integer, StaProtocol> entry){
@@ -384,6 +283,13 @@
vo.setPlcDesc("椤跺崌鐢垫満鎺ヨЕ鍣ㄦ晠闅�");
vo.setError("椤跺崌鐢垫満鎺ヨЕ鍣ㄦ晠闅�");
+ /*
+ * 瀹滅瀹氬埗 150绔欑偣寮傚父淇℃伅锛氬ぇ鎵樼洏鐩殑绔欓敊璇�
+ * */
+ if (entry.getKey()==150){
+ vo.setPlcDesc("150绔欑偣澶ф墭鐩樼洰鐨勭珯閿欒");
+ vo.setError("150绔欑偣澶ф墭鐩樼洰鐨勭珯閿欒");
+ }
list.add(vo);
}
if (staProtocol.isFrontErr()){
--
Gitblit v1.9.1