From 3c5935f579c0d51e64721101e81886ff957be229 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 02 八月 2023 09:14:25 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/SiteController.java | 62 ++++++++++++-------------------
1 files changed, 24 insertions(+), 38 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/SiteController.java b/src/main/java/com/zy/asrs/controller/SiteController.java
index 6aa23f0..b6ae251 100644
--- a/src/main/java/com/zy/asrs/controller/SiteController.java
+++ b/src/main/java/com/zy/asrs/controller/SiteController.java
@@ -1,33 +1,39 @@
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.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.SteTaskModeType;
+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.command.SteCommand;
import com.zy.core.model.protocol.StaProtocol;
+import com.zy.core.model.protocol.SteProtocol;
import com.zy.core.properties.SlaveProperties;
-import com.zy.core.DevpThread;
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.*;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* 杈撻�佽澶囨帴鍙�
@@ -42,6 +48,12 @@
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 = "鍏呯數妯″紡")
@@ -51,44 +63,16 @@
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?"鍏呯數涓�":"鍏抽棴");
+ 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);
- Map<String, Object> map3 = new HashMap<>();
- map3.put("floor", 3);
- map3.put("modeVal", devpThread.charge2);
- map3.put("modeDesc", devpThread.charge2?"鍏呯數涓�":"鍏抽棴");
- res.add(map3);
}
return R.ok().add(res);
- }
-
- @PostMapping("/io/mode/action/site")
- @ManagerAuth(memo = "鍏呯數鎺у埗")
- public R ioModeAction(@RequestParam("floor") Integer floor, @RequestParam("charge") Boolean charge){
- for (DevpSlave devp : slaveProperties.getDevp()) {
- // 杈撻�佺嚎鍏呯數鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
- SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
- boolean res = devpThread.charge(floor - 1, charge);
- if (!charge && res) {
- // 绌挎杞﹀厖鐢靛懡浠や笅鍙戝尯 --------------------------------------------------------------------------
- int steNo = floor;
- SteCommand steCommand = new SteCommand();
- steCommand.setSteNo(steNo); // 绌挎杞︾紪鍙�
- steCommand.setTaskNo(9999); // 宸ヤ綔鍙�
- steCommand.setTaskMode(SteTaskModeType.CLOSE_CHARGE);
- if (!MessageQueue.offer(SlaveType.Ste, steNo, new Task(2, steCommand))) {
- log.error("绌挎杞﹀懡浠や笅鍙戝け璐ワ紝绌挎杞﹀彿={}锛屼换鍔℃暟鎹�={}", steNo, JSON.toJSON(steCommand));
- }
- }
- return res?R.ok():R.error();
- }
- return R.ok();
}
@PostMapping("/table/site")
@@ -114,6 +98,8 @@
vo.setLoading(staProtocol.isLoading()?"Y":"N"); // 鏈夌墿
vo.setInEnable(staProtocol.isInEnable()?"Y":"N"); // 鍙叆
vo.setOutEnable(staProtocol.isOutEnable()?"Y":"N"); // 鍙嚭
+ vo.setLiftArrival(staProtocol.isLiftArrival()?"Y":"N"); // 鎻愬崌鏈哄埌浣嶄俊鍙�
+ vo.setShuttleTakeEnable(staProtocol.isShuttleTakeEnable()?"Y":"N"); // 绌挎杞﹀彲鍙栦俊鍙�
vo.setPakMk(staProtocol.isPakMk()?"Y":"N"); // 鍏ュ簱鏍囪
vo.setEmptyMk(staProtocol.isEmptyMk()?"Y":"N"); // 绌烘澘淇″彿
vo.setStaNo(staProtocol.getStaNo()); // 鐩爣绔�
--
Gitblit v1.9.1