From 9aefce26355af7cd43bc958c045b196b355693b8 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 10 五月 2024 19:49:46 +0800
Subject: [PATCH] #一楼rgv
---
src/main/java/com/zy/asrs/controller/ConsoleController.java | 44 ++++++++++++++++++++++++++++----------------
1 files changed, 28 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index 6379d35..3fe1169 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -1,16 +1,20 @@
package com.zy.asrs.controller;
import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
import com.core.annotations.ManagerAuth;
import com.core.common.Arith;
import com.core.common.Cools;
+import com.core.common.DateUtils;
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.BasCrnError;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.mapper.BasCrnErrorMapper;
import com.zy.asrs.mapper.LocMastMapper;
import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.WrkMastService;
@@ -31,12 +35,10 @@
import com.zy.core.thread.BarcodeThread;
import com.zy.core.thread.MelsecCrnThread;
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.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import java.util.*;
@@ -57,6 +59,8 @@
private BasDevpService basDevpService;
@Autowired
private LocMastMapper locMastMapper;
+ @Autowired
+ private BasCrnErrorMapper basCrnErrorMapper;
@PostMapping("/system/running/status")
@ManagerAuth(memo = "绯荤粺杩愯鐘舵��")
@@ -133,7 +137,7 @@
/**
* 鍫嗗灈鏈虹姸鎬佸垽鏂�
*/
- if (crn.getId() == 1 && crnProtocol.getAlarm() > 0) {
+ if (crnProtocol.getAlarm() > 0) {
vo.setCrnStatus(CrnStatusType.MACHINE_ERROR);
} else {
if (crnProtocol.getTaskNo()>0) {
@@ -245,10 +249,17 @@
CrnDetailVo vo = new CrnDetailVo();
for (CrnSlave crnSlave : slaveProperties.getCrn()) {
if (crnSlave.getId().equals(crnNo)) {
- MelsecCrnThread crnThread = (MelsecCrnThread) SlaveConnection.get(SlaveType.Crn, crnSlave.getId());
+ SiemensCrnThread crnThread = (SiemensCrnThread) SlaveConnection.get(SlaveType.Crn, crnSlave.getId());
CrnProtocol crnProtocol = crnThread.getCrnProtocol();
vo.setCrnNo(crnNo);
vo.setWorkNo(crnProtocol.getTaskNo());
+ vo.setCrnStatus(crnProtocol.getStatusType().desc);
+
+ if (crnProtocol.getAlarm() > 0) {
+ BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm());
+ vo.setError(crnError == null ? "鏈煡寮傚父" : crnError.getErrName());
+ }
+
if (crnProtocol.getTaskNo() > 0) {
WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
if (wrkMast != null) {
@@ -282,17 +293,18 @@
return R.ok();
}
- @PostMapping("/barcode/output/site")
+ @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)));
+ ArrayList<JSONObject> jsonObjects = new ArrayList<>(OutputQueue.BARCODE);
+ jsonObjects.sort(new Comparator<JSONObject>() {
+ @Override
+ public int compare(JSONObject o1, JSONObject o2) {
+ Date o1Time = DateUtils.convert(o1.getString("time"), DateUtils.yyyyMMddHHmmss_F);
+ Date o2Time = DateUtils.convert(o2.getString("time"), DateUtils.yyyyMMddHHmmss_F);
+ return (int) (o2Time.getTime() - o1Time.getTime());
+ }
+ });
+ return R.ok().add(JSON.toJSONString(jsonObjects));
}
}
--
Gitblit v1.9.1