From 3adff2c549121bc166f49aa8de681265cd87b2d9 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期四, 19 六月 2025 09:49:09 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index bcee72f..52da4d3 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -14,6 +14,7 @@
import com.zy.asrs.service.*;
import com.zy.asrs.utils.Utils;
import com.zy.common.web.BaseController;
+import com.zy.core.model.DevpSlave;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -221,6 +222,7 @@
HashMap<String,Object> map=new HashMap<>();
List<CrnStatusParam> crnStatusParams=new ArrayList<>();
List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<>());
+ List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<>());
for (BasCrnp basCrnp:basCrnps){
CrnStatusParam crnStatusParam=new CrnStatusParam();
crnStatusParam.setCrnNo(basCrnp.getCrnNo());
@@ -234,7 +236,19 @@
}
crnStatusParams.add(crnStatusParam);
}
-
+ for (BasDevp basDevp : basDevps) {
+ CrnStatusParam crnStatusParam=new CrnStatusParam();
+ crnStatusParam.setDevpNo(basDevp.getDevNo());
+ crnStatusParam.setOutEnable(basDevp.getOutEnable());
+ crnStatusParam.setInEnable(basDevp.getInEnable());
+ crnStatusParam.setLoading(basDevp.getLoading());
+ if(!Cools.isEmpty(basDevp.getAutoing())&&basDevp.getAutoing().equals("Y")){
+ crnStatusParam.setCrnSts(3);
+ }else{
+ crnStatusParam.setCrnSts(2);
+ }
+ crnStatusParams.add(crnStatusParam);
+ }
map.put("ReturnStatus",0);
map.put("ErrorMessage","");
map.put("data",crnStatusParams);
--
Gitblit v1.9.1