From e9efb50ea62a9ad58e652446c6528f1b49fcc39a Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期四, 01 五月 2025 10:58:51 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 51 ++++---------------------
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 56 ++++++++++++++++++++++++++++
src/main/java/com/zy/asrs/service/OpenService.java | 8 ++++
3 files changed, 72 insertions(+), 43 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 1708c2e..b3d8e14 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -15,13 +15,9 @@
import com.zy.asrs.entity.param.*;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.NotifyUtils;
-import com.zy.asrs.utils.Utils;
import com.zy.common.service.CommonService;
import com.zy.common.utils.HttpHandler;
import com.zy.common.web.BaseController;
-import com.zy.core.cache.MessageQueue;
-import com.zy.core.enums.SlaveType;
-import com.zy.core.model.Task;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -353,51 +349,20 @@
@GetMapping("/deviceStatus")
@Transactional
public R deviceStatus() {
- List<CrnStatusParam> crnStatusParams=new ArrayList<>();
- List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<>());
- for (BasCrnp basCrnp:basCrnps){
- CrnStatusParam crnStatusParam=new CrnStatusParam();
- crnStatusParam.setCrnNo(basCrnp.getCrnNo());
- crnStatusParam.setCrnSts(basCrnp.getCrnSts());
- crnStatusParam.setErrorCode(basCrnp.getCrnErr());
- BasCrnError error=basCrnErrorService.selectOne(new EntityWrapper<BasCrnError>().eq("error_code",basCrnp.getCrnErr()));
- if(Cools.isEmpty(error)){
- crnStatusParam.setErrorMsg("");
- }else {
- crnStatusParam.setErrorMsg(error.getErrName());
- }
- crnStatusParams.add(crnStatusParam);
- }
- return R.ok(crnStatusParams);
+ List<CrnStatusParam> crnStatusParams = openService.getCrnStatus();
+ List<StationStatusParam> stationStatus = openService.getStationStatus();
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("crn", crnStatusParams);
+ map.put("station", stationStatus);
+ return R.ok().add(map);
}
//杈撻�佺珯鐐圭姸鎬佹煡璇㈡帴鍙�
@GetMapping("/stationStatus")
@Transactional
public R stationStatus() {
- List<StationStatusParam> data = new ArrayList<>();
- List<BasDevp> list = basDevpService.selectList(new EntityWrapper<BasDevp>()
- .in("dev_no", 102, 104, 106, 108, 203, 206, 209, 212));
- for (BasDevp basDevp : list) {
- String taskNo = "";
- String barcode = "";
- if (basDevp.getWrkNo() > 0) {
- TaskWrk taskWrk = taskWrkService.selectByWrkNo(basDevp.getWrkNo());
- if (taskWrk != null) {
- taskNo = taskWrk.getTaskNo();
- barcode = taskWrk.getBarcode();
- }
- }
-
- StationStatusParam param = new StationStatusParam();
- param.setStaNo(basDevp.getDevNo());
- param.setTaskNo(taskNo);
- param.setLoading(basDevp.getLoading());
- param.setBarcode(barcode);
-
- data.add(param);
- }
- return R.ok(data);
+ List<StationStatusParam> data = openService.getStationStatus();
+ return R.ok().add(data);
}
//妯℃嫙杈撻�佺嚎鍏ュ簱
diff --git a/src/main/java/com/zy/asrs/service/OpenService.java b/src/main/java/com/zy/asrs/service/OpenService.java
index fe2b427..6959568 100644
--- a/src/main/java/com/zy/asrs/service/OpenService.java
+++ b/src/main/java/com/zy/asrs/service/OpenService.java
@@ -1,8 +1,12 @@
package com.zy.asrs.service;
import com.core.common.R;
+import com.zy.asrs.entity.param.CrnStatusParam;
+import com.zy.asrs.entity.param.StationStatusParam;
import com.zy.asrs.entity.param.TaskCreateInParam;
import com.zy.asrs.entity.param.TaskCreateParam;
+
+import java.util.List;
public interface OpenService {
@@ -11,4 +15,8 @@
R taskCreateIn(TaskCreateInParam param);
+ List<StationStatusParam> getStationStatus();
+
+ List<CrnStatusParam> getCrnStatus();
+
}
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index dfd82ab..14f7552 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -6,6 +6,8 @@
import com.zy.asrs.domain.enums.TaskStatusType;
import com.zy.asrs.domain.enums.WorkNoType;
import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.param.CrnStatusParam;
+import com.zy.asrs.entity.param.StationStatusParam;
import com.zy.asrs.entity.param.TaskCreateInParam;
import com.zy.asrs.entity.param.TaskCreateParam;
import com.zy.asrs.service.*;
@@ -24,6 +26,12 @@
private CommonService commonService;
@Autowired
private LocMastService locMastService;
+ @Autowired
+ private BasDevpService basDevpService;
+ @Autowired
+ private BasCrnpService basCrnpService;
+ @Autowired
+ private BasCrnErrorService basCrnErrorService;
@Override
public R taskCreate(TaskCreateParam param) {
@@ -128,4 +136,52 @@
}
return R.ok();
}
+
+ @Override
+ public List<StationStatusParam> getStationStatus() {
+ List<StationStatusParam> data = new ArrayList<>();
+ List<BasDevp> list = basDevpService.selectList(new EntityWrapper<BasDevp>()
+ .in("dev_no", 102, 104, 106, 108, 203, 206, 209, 212));
+ for (BasDevp basDevp : list) {
+ String taskNo = "";
+ String barcode = "";
+ if (basDevp.getWrkNo() > 0) {
+ TaskWrk taskWrk = taskWrkService.selectByWrkNo(basDevp.getWrkNo());
+ if (taskWrk != null) {
+ taskNo = taskWrk.getTaskNo();
+ barcode = taskWrk.getBarcode();
+ }
+ }
+
+ StationStatusParam param = new StationStatusParam();
+ param.setStaNo(basDevp.getDevNo());
+ param.setTaskNo(taskNo);
+ param.setLoading(basDevp.getLoading());
+ param.setBarcode(barcode);
+
+ data.add(param);
+ }
+ return data;
+ }
+
+ @Override
+ public List<CrnStatusParam> getCrnStatus() {
+ List<CrnStatusParam> crnStatusParams = new ArrayList<>();
+ List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<>());
+ for (BasCrnp basCrnp:basCrnps){
+ CrnStatusParam crnStatusParam=new CrnStatusParam();
+ crnStatusParam.setCrnNo(basCrnp.getCrnNo());
+ crnStatusParam.setCrnSts(basCrnp.getCrnSts());
+ crnStatusParam.setErrorCode(basCrnp.getCrnErr());
+ BasCrnError error=basCrnErrorService.selectOne(new EntityWrapper<BasCrnError>().eq("error_code",basCrnp.getCrnErr()));
+ if(Cools.isEmpty(error)){
+ crnStatusParam.setErrorMsg("");
+ }else {
+ crnStatusParam.setErrorMsg(error.getErrName());
+ }
+ crnStatusParams.add(crnStatusParam);
+ }
+
+ return crnStatusParams;
+ }
}
--
Gitblit v1.9.1