From a1e94379b115721b2e604070dc48063b8016f72f Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期二, 21 十月 2025 19:32:59 +0800
Subject: [PATCH] 侧面输送线出库码盘信息对接
---
src/main/java/com/zy/asrs/controller/ConsoleController.java | 193 +++++++++++++++++++++++++++++++++--------------
1 files changed, 134 insertions(+), 59 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index 4b6a012..b1a0503 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -13,14 +13,14 @@
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.BasCrnError;
-import com.zy.asrs.entity.BasDevp;
-import com.zy.asrs.entity.ChartBean;
-import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.entity.*;
import com.zy.asrs.mapper.BasCrnErrorMapper;
import com.zy.asrs.mapper.LocMastMapper;
import com.zy.asrs.mapper.ReportQueryMapper;
+import com.zy.asrs.mapper.TaskWrkMapper;
+import com.zy.asrs.service.BasCrnpService;
import com.zy.asrs.service.BasDevpService;
+import com.zy.asrs.service.DeviceErrorService;
import com.zy.asrs.service.WrkMastService;
import com.zy.common.CodeRes;
import com.zy.core.CrnThread;
@@ -43,6 +43,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -67,29 +68,36 @@
private BasCrnErrorMapper basCrnErrorMapper;
@Autowired
private ReportQueryMapper reportQueryMapper;
+ @Autowired
+ private DeviceErrorService deviceErrorService;
+ @Autowired
+ private BasCrnpService basCrnpService;
+
+ @Resource
+ private TaskWrkMapper taskWrkMapper;
@PostMapping("/system/running/status")
@ManagerAuth(memo = "绯荤粺杩愯鐘舵��")
- public R systemRunningStatus(){
+ public R systemRunningStatus() {
return R.ok().add(Cools.add("status", SystemProperties.WCS_RUNNING_STATUS.get()));
}
@PostMapping("/system/switch")
@ManagerAuth(memo = "绯荤粺杩愯寮�鍏虫搷浣�")
public R systemSwitch(SystemSwitchParam param) throws InterruptedException {
- if (Cools.isEmpty(param.getOperatorType())){
+ if (Cools.isEmpty(param.getOperatorType())) {
return R.error();
}
if (param.getOperatorType() == 0) {
- if (Cools.isEmpty(param.getPassword())){
+ if (Cools.isEmpty(param.getPassword())) {
return R.error("璇疯緭鍏ュ彛浠�");
}
- if (!param.getPassword().equals(SystemProperties.WCS_PASSWORD)){
+ if (!param.getPassword().equals(SystemProperties.WCS_PASSWORD)) {
return R.error("鍙ｄ护閿欒");
}
}
Thread.sleep(200L);
- SystemProperties.WCS_RUNNING_STATUS.set(param.getOperatorType()==1?Boolean.TRUE:Boolean.FALSE);
+ SystemProperties.WCS_RUNNING_STATUS.set(param.getOperatorType() == 1 ? Boolean.TRUE : Boolean.FALSE);
return R.ok().add(Cools.add("status", SystemProperties.WCS_RUNNING_STATUS.get()));
}
@@ -99,7 +107,7 @@
@PostMapping("/latest/data/site")
@ManagerAuth(memo = "绔欑偣瀹炴椂鏁版嵁")
- public R siteLatestData(){
+ public R siteLatestData() {
List<SiteLatestDataVo> vos = new ArrayList<>();
Map<Integer, StaProtocol> stations = new HashMap<>();
for (DevpSlave devp : slaveProperties.getDevp()) {
@@ -113,7 +121,8 @@
StaProtocol staProtocol = entry.getValue();
vo.setSiteId(String.valueOf(entry.getKey())); // 绔欑偣缂栧彿
vo.setWorkNo(staProtocol.getWorkNo()); // 宸ヤ綔鍙�
- vo.setSiteStatus(SiteStatusType.process(staProtocol)); // 鐘舵��
+ String faultDescription = staProtocol.getFaultDescription();
+ vo.setSiteStatus(Cools.isEmpty(faultDescription) ? SiteStatusType.process(staProtocol) : SiteStatusType.SITE_ERROR); // 鐘舵��
vo.setNearbySta(staProtocol.getNearbySta()); //RGV浣嶇疆
vos.add(vo);
}
@@ -122,7 +131,7 @@
@PostMapping("/latest/data/crn")
@ManagerAuth(memo = "鍫嗗灈鏈哄疄鏃舵暟鎹�")
- public R crnLatestData(){
+ public R crnLatestData() {
List<CrnLatestDataVo> vos = new ArrayList<>();
for (CrnSlave crn : slaveProperties.getCrn()) {
// 鑾峰彇鍫嗗灈鏈轰俊鎭�
@@ -140,22 +149,23 @@
// Short totalBay = locMastMapper.selectTotalBay();
vo.setOffset((double) new Random().nextInt(560)); // 鍫嗗灈鏈哄亸绉婚噺
- vo.setBay((short) (crnProtocol.getBay() - crn.getOffset())); // 褰撳墠鍒�
+ vo.setBay(crnProtocol.getBay()); // 褰撳墠鍒�
/**
* 鍫嗗灈鏈虹姸鎬佸垽鏂�
*/
if (crnProtocol.getAlarm1() > 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()));
+ if (crnProtocol.getTaskNo() > 0) {
+// WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
+ TaskWrk taskWrk = taskWrkMapper.selectByWrkNo(Integer.valueOf(crnProtocol.getTaskNo()));
+ if (taskWrk != null) {
+ vo.setCrnStatus(CrnStatusType.process(taskWrk.getIoType()));
} else {
- vo.setCrnStatus(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.MACHINE_AUTO: CrnStatusType.MACHINE_UN_AUTO);
+ 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);
+ vo.setCrnStatus(crnProtocol.modeType.equals(CrnModeType.AUTO) ? CrnStatusType.MACHINE_AUTO : CrnStatusType.MACHINE_UN_AUTO);
}
}
vos.add(vo);
@@ -166,7 +176,7 @@
@PostMapping("/latest/data/barcode")
@ManagerAuth(memo = "鏉＄爜鎵弿浠疄鏃舵暟鎹�")
- public R barcodeLatestData(){
+ public R barcodeLatestData() {
List<BarcodeDataVo> list = new ArrayList<>();
for (Slave barcode : slaveProperties.getBarcode()) {
BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, barcode.getId());
@@ -183,7 +193,7 @@
@PostMapping("/latest/data/scale")
@ManagerAuth(memo = "纾呯Г瀹炴椂鏁版嵁")
- public R scaleLatestData(){
+ public R scaleLatestData() {
List<ScaleDataVo> list = new ArrayList<>();
for (Slave scale : slaveProperties.getScale()) {
ScaleThread scaleThread = (ScaleThread) SlaveConnection.get(SlaveType.Scale, scale.getId());
@@ -198,14 +208,68 @@
return R.ok().add(list);
}
+ /**
+ * 鑾峰彇璁惧璇︽儏
+ */
+ @GetMapping("/deviceInfo")
+ @ManagerAuth
+ public R getDeviceInfo() {
+ ArrayList<HashMap<String, Object>> list = 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;
+ }
+
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("device", "鍫嗗灈鏈�");
+ map.put("deviceId", crn.getId());
+ map.put("battery", "");
+ map.put("error", crnProtocol.getFault());
+ map.put("status", crnProtocol.getStatusType().desc);
+ list.add(map);
+ }
+
+ for (DevpSlave devp : slaveProperties.getDevp()) {
+ DeviceError deviceError = deviceErrorService.selectByDeviceAndDeviceId("devp", devp.getId());
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("device", "杈撻�佺嚎");
+ map.put("deviceId", devp.getId());
+ map.put("battery", "");
+ map.put("error", deviceError != null);
+ map.put("status", deviceError == null ? "" : deviceError.getMsg());
+ list.add(map);
+ }
+
+ for (Slave scale : slaveProperties.getScale()) {
+ DeviceError deviceError = deviceErrorService.selectByDeviceAndDeviceId("scale", scale.getId());
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("device", "纾呯Г");
+ map.put("deviceId", scale.getId());
+ map.put("battery", "");
+ map.put("error", deviceError != null);
+ map.put("status", deviceError == null ? "" : deviceError.getMsg());
+ list.add(map);
+ }
+
+ HashMap<String, Object> hashMap = new HashMap<>();
+ hashMap.put("records", list);
+ return R.ok().add(hashMap);
+ }
+
/****************************************************************/
/************************** 璇︽儏鎿嶄綔 ******************************/
/****************************************************************/
@PostMapping("/site/detail")
@ManagerAuth(memo = "杈撻�佽澶囨暟鎹鎯�")
- public R siteDetail(@RequestParam Integer siteId){
- if (Cools.isEmpty(siteId)){
+ public R siteDetail(@RequestParam Integer siteId) {
+ if (Cools.isEmpty(siteId)) {
return R.parse(CodeRes.EMPTY);
}
SiteDetailVo vo = new SiteDetailVo();
@@ -222,22 +286,25 @@
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$());
+// WrkMast wrkMast = wrkMastService.selectById(staProtocol.getWorkNo());
+ TaskWrk taskWrk = taskWrkMapper.selectByWrkNo(Integer.valueOf(staProtocol.getWorkNo()));
+
+ if (taskWrk != null) {
+ vo.setWrkSts(taskWrk.getWrkSts$()); // 宸ヤ綔鐘舵��
+ vo.setIoType(taskWrk.getIoType$()); // 鍏ュ嚭搴撶被鍨�
+ vo.setSourceStaNo(taskWrk.getStartPoint());
+ vo.setStaNo(taskWrk.getTargetPoint());
+ vo.setSourceLocNo(taskWrk.getStartPoint());
+ vo.setLocNo(taskWrk.getTargetPoint());
}
}
- vo.setAutoing(staProtocol.isAutoing()?"Y":"N"); // 鑷姩
- vo.setLoading(staProtocol.isLoading()?"Y":"N"); // 鏈夌墿
+ vo.setAutoing(staProtocol.isAutoing() ? "Y" : "N"); // 鑷姩
+ vo.setLoading(staProtocol.isLoading() ? "Y" : "N"); // 鏈夌墿
vo.setCanining(basDevp.getCanining()); // 鑳藉叆
vo.setCanouting(basDevp.getCanouting()); // 鑳藉嚭
+ vo.setError(staProtocol.getFaultDescription());
return R.ok().add(vo);
}
@@ -249,13 +316,18 @@
@PostMapping("/crn/detail")
@ManagerAuth(memo = "鍫嗗灈鏈鸿澶囨暟鎹鎯�")
- public R crnDetail(@RequestParam Integer crnNo){
- if (Cools.isEmpty(crnNo)){
+ 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)) {
+ BasCrnp basCrnp = basCrnpService.selectById(crnNo);
+ if (basCrnp == null) {
+ return R.error("鏁版嵁搴撶淮鎶ゅ紓甯�");
+ }
+
SiemensCrnThread crnThread = (SiemensCrnThread) SlaveConnection.get(SlaveType.Crn, crnSlave.getId());
CrnProtocol crnProtocol = crnThread.getCrnProtocol();
vo.setCrnNo(crnNo);
@@ -268,18 +340,21 @@
}
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$());
+ TaskWrk taskWrk = taskWrkMapper.selectByWrkNo(Integer.valueOf(crnProtocol.getTaskNo()));
+// WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
+ if (taskWrk != null) {
+ vo.setSourceStaNo(taskWrk.getStartPoint());
+ vo.setStaNo(taskWrk.getTargetPoint());
+ vo.setWrkSts(taskWrk.getWrkSts$()); // 宸ヤ綔鐘舵��
+ vo.setIoType(taskWrk.getIoType$()); // 鍏ュ嚭搴撶被鍨�
+ vo.setSourceLocNo(taskWrk.getStartPoint());
+ vo.setLocNo(taskWrk.getTargetPoint());
vo.setCrnStatus(crnProtocol.getStatusType().desc);
vo.setError(""); // todo
}
}
+ vo.setInEnable(basCrnp.getInEnable());//鍙叆
+ vo.setOutEnable(basCrnp.getOutEnable());//鍙嚭
return R.ok().add(vo);
}
}
@@ -289,19 +364,19 @@
@Deprecated
@PostMapping("/site/update")
@ManagerAuth(memo = "杈撻�佽澶囨暟鎹慨鏀�")
- public R updateSite(){
+ public R updateSite() {
return R.ok();
}
@Deprecated
@PostMapping("/crn/update")
@ManagerAuth(memo = "鍫嗗灈鏈烘暟鎹慨鏀�")
- public R updateCrn(){
+ public R updateCrn() {
return R.ok();
}
@GetMapping("/barcode/output/site")
- public R crnOutput(){
+ public R crnOutput() {
ArrayList<JSONObject> jsonObjects = new ArrayList<>(OutputQueue.SCALE);
jsonObjects.sort(new Comparator<JSONObject>() {
@Override
@@ -315,12 +390,12 @@
}
@PostMapping("loc/pie/charts")
- public R dsa(){
- Map<String,Object> map=new HashMap<String, Object>();
- List<ChartBean> list = new ArrayList<ChartBean>();
+ public R dsa() {
+ Map<String, Object> map = new HashMap<String, Object>();
+ List<ChartBean> list = new ArrayList<ChartBean>();
LocChartPie locUseRate = reportQueryMapper.getLocUseRate();
- if(locUseRate!=null) {
+ if (locUseRate != null) {
ChartBean fqty = new ChartBean();
fqty.setName("鍦ㄥ簱搴撲綅");
fqty.setY(locUseRate.getFqty());
@@ -341,37 +416,37 @@
xqty.setY(locUseRate.getXqty());
list.add(xqty);
}
- map.put("rows",list);
+ map.put("rows", list);
return R.ok(map);
}
@PostMapping("locIo/line/charts")
- public R locIoLineCharts(){
- Map<String,Object> map=new HashMap<String, Object>();
+ public R locIoLineCharts() {
+ Map<String, Object> map = new HashMap<String, Object>();
List<AxisBean> list = new ArrayList<AxisBean>();
List<WorkChartAxis> listChart = reportQueryMapper.getChartAxis();
- if(listChart!=null) {
+ if (listChart != null) {
ArrayList<Integer> data1 = new ArrayList<Integer>();
ArrayList<Integer> data2 = new ArrayList<Integer>();
SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd");
Calendar calendar = Calendar.getInstance();
calendar.add(Calendar.DATE, -12);
- for(int i=0;i<12;i++) {
+ for (int i = 0; i < 12; i++) {
boolean flag = true;
calendar.add(Calendar.DATE, 1);
String str = sf.format(calendar.getTime());
- for(WorkChartAxis workChart : listChart) {
- if(str.equals(workChart.getYmd())) {
+ for (WorkChartAxis workChart : listChart) {
+ if (str.equals(workChart.getYmd())) {
data1.add(workChart.getInqty());
data2.add(workChart.getOutqty());
flag = false;
break;
}
}
- if(flag) {
+ if (flag) {
data1.add(0);
data2.add(0);
}
@@ -387,7 +462,7 @@
outqty.setData(data2.toArray(array2));
list.add(outqty);
}
- map.put("rows",list);
+ map.put("rows", list);
return R.ok(map);
}
--
Gitblit v1.9.1