From d6403f0f39fb5dc6e440503b649be8a527d3d32c Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 05 五月 2025 17:32:05 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/controller/DevopsController.java | 57 +++++++++++++++++++++++-----
src/main/webapp/static/js/console.map.js | 2
src/main/java/com/zy/asrs/domain/devops/ErrorType.java | 4 ++
src/main/webapp/static/js/common.js | 2
pom.xml | 2
src/main/webapp/views/devops.html | 6 +-
src/main/resources/application.yml | 3 -
7 files changed, 58 insertions(+), 18 deletions(-)
diff --git a/pom.xml b/pom.xml
index 7d9876d..c427b83 100644
--- a/pom.xml
+++ b/pom.xml
@@ -185,7 +185,7 @@
</dependencies>
<build>
- <finalName>lfdwcsMem</finalName>
+ <finalName>wcs</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
diff --git a/src/main/java/com/zy/asrs/controller/DevopsController.java b/src/main/java/com/zy/asrs/controller/DevopsController.java
index 8da1cf5..2470daf 100644
--- a/src/main/java/com/zy/asrs/controller/DevopsController.java
+++ b/src/main/java/com/zy/asrs/controller/DevopsController.java
@@ -1,12 +1,16 @@
package com.zy.asrs.controller;
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.devops.DevopsMessage;
import com.zy.asrs.domain.devops.ErrorType;
+import com.zy.asrs.domain.vo.SiteTableVo;
+import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.mapper.WrkMastMapper;
+import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.WrkMastService;
import com.zy.core.CrnThread;
import com.zy.core.DevpThread;
@@ -16,15 +20,19 @@
import com.zy.core.enums.CrnStatusType;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.CrnSlave;
+import com.zy.core.model.DevpSlave;
import com.zy.core.model.protocol.CrnProtocol;
import com.zy.core.model.protocol.StaProtocol;
import com.zy.core.properties.SlaveProperties;
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.RestController;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
@RestController
@RequestMapping("/devops")
@@ -39,21 +47,26 @@
@Autowired
private WrkMastMapper wrkMastMapper;
+ @Autowired
+ private BasDevpService basDevpService;
+
@RequestMapping("/wrkMast/list")
public R list() {
List<DevopsMessage> devopsMessages = new ArrayList<>();
DevopsMessage devopsMessage;
for (CrnSlave crnSlave : slaveProperties.getCrn()) {
List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("crn_no", crnSlave.getId()).in("io_type", 101, 103, 107).orderBy("wrk_sts", false));
+ //鍏堟煡璇㈠爢鍨涙満鏄惁鍦ㄥ伐浣�
WrkMast working = wrkMastMapper.selectWorking(crnSlave.getId());
for (WrkMast wrkMast : wrkMasts) {
devopsMessage = new DevopsMessage();
devopsMessage.setWrkNo(wrkMast.getWrkNo());
if (working != null) {
+ //鍦ㄥ伐浣滐紝鍒欏垽鏂槸鍚︽湭褰撳墠杩欐潯
if (working.getWrkNo().equals(wrkMast.getWrkNo())) {
devopsMessage.setError("璇ュ伐浣滄。姝ｅ湪鍑哄簱锛岃绋嶅悗");
} else {
- devopsMessage.setError(working.getWrkNo() + "鍙峰伐浣滄。姝ｅ湪鍑哄簱");
+ devopsMessage.setError(working.getWrkNo() + "鍙峰伐浣滄。姝ｅ湪鍑哄簱锛岃绋嶅悗");
}
continue;
}
@@ -74,8 +87,7 @@
devopsMessage.setMethod(devopsMessage.getMethod() + ";" + type.getMethod());
} else {
devopsMessage.setError(type.getDesc());
- devopsMessage
- .setMethod(type.getMethod());
+ devopsMessage.setMethod(type.getMethod());
}
}
devopsMessages.add(devopsMessage);
@@ -116,16 +128,16 @@
CrnProtocol crnProtocol = crnThread.getCrnProtocol();
if (crnProtocol.getStatusType() == CrnStatusType.IDLE) {
-
+ types.add(ErrorType.CRN_NO_IDLE);
}
if (crnProtocol.getTaskNo() == 0) {
-
+ types.add(ErrorType.WORKING);
}
if (crnProtocol.getModeType() == CrnModeType.AUTO) {
-
+ types.add(ErrorType.CRN_FEIZIDONG);
}
if (crnProtocol.getLoaded() == 0) {
-
+ types.add(ErrorType.LOAD);
}
if (crnProtocol.statusType == CrnStatusType.FETCHING) {
types.add(ErrorType.WORKING);
@@ -142,11 +154,36 @@
if (crnProtocol.modeType == CrnModeType.AUTO) {
types.add(ErrorType.FEIZIDONG);
}
-// if (crnProtocol.getTaskNo().equals(wrkMast.getWrkNo().shortValue())) {
-// types.add(ErrorType.CRNGONGZUOHAO);
-// }
+
return types;
}
+
+ @PostMapping("/site/list")
+ @ManagerAuth(memo = "绔欑偣淇℃伅琛�")
+ public R siteTable(){
+ List<SiteTableVo> list = new ArrayList<>();
+ // 鍐呭瓨鏁版嵁
+ Map<Integer, StaProtocol> station = new HashMap<>();
+ for (DevpSlave devp : slaveProperties.getDevp()) {
+ DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
+ station.putAll(devpThread.getStation());
+ }
+ // 鎸佷箙鏁版嵁
+ List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<BasDevp>().orderBy("dev_no"));
+ for (BasDevp devp : basDevps) {
+ StaProtocol staProtocol = station.get(devp.getDevNo());
+ if (null == staProtocol) { continue; }
+ SiteTableVo vo = new SiteTableVo();
+ vo.setDevNo(devp.getDevNo()); // 绔欑偣缂栧彿
+ vo.setWorkNo(staProtocol.getWorkNo()); // 宸ヤ綔鍙�
+ vo.setAutoing(staProtocol.isAutoing()?"Y":"N"); // 鑷姩
+ vo.setLoading(staProtocol.isLoading()?"Y":"N"); // 鏈夌墿
+ vo.setInEnable(staProtocol.isInEnable()?"Y":"N"); // 鍙叆
+ vo.setOutEnable(staProtocol.isOutEnable()?"Y":"N"); // 鍙嚭
+ list.add(vo);
+ }
+ return R.ok().add(list);
+ }
}
diff --git a/src/main/java/com/zy/asrs/domain/devops/ErrorType.java b/src/main/java/com/zy/asrs/domain/devops/ErrorType.java
index fef3fc6..004bf90 100644
--- a/src/main/java/com/zy/asrs/domain/devops/ErrorType.java
+++ b/src/main/java/com/zy/asrs/domain/devops/ErrorType.java
@@ -15,6 +15,10 @@
WORKING(11001, "鍫嗗灈鏈哄湪宸ヤ綔涓�", "1"),
HOME(11002, "璐у弶涓嶅湪鍘熶綅", "1"),
CRNGONGZUOHAO(11003, "鍫嗗灈鏈哄湪宸ヤ綔涓�", "1"),
+ LOAD(11004, "鍫嗗灈鏈虹殑杞界墿鍙版湁鐗�", "1"),
+ CRN_FEIZIDONG(11004, "鍫嗗灈鏈洪潪鑷姩", "1"),
+ CRN_NO_IDLE(11004, "鍫嗗灈鏈洪潪绌洪棽", "1"),
+
;
private Integer code;
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 99628ad..1c74300 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,8 +8,7 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-# url: jdbc:sqlserver://127.0.0.1:1433;databasename=lfdasrsMem
- url: jdbc:sqlserver://192.168.0.17:1433;databasename=lfdasrsMem
+ url: jdbc:sqlserver://127.0.0.1:1433;databasename=devopsasrs
username: sa
password: sa@123
mvc:
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 99f1fa8..2a45d7e 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -1,4 +1,4 @@
-var baseUrl = "/lfdwcsMem";
+var baseUrl = "/wcs";
// 璧嬪��
function setVal(el, val) {
diff --git a/src/main/webapp/static/js/console.map.js b/src/main/webapp/static/js/console.map.js
index 9e49c46..ceec0fa 100644
--- a/src/main/webapp/static/js/console.map.js
+++ b/src/main/webapp/static/js/console.map.js
@@ -1,5 +1,5 @@
mapInfo = {
- "mapName": "LFDWCSMEM",
+ "mapName": "WCS",
"rackCount": 18,
"crnCount": 7,
"stbCount": 77,
diff --git a/src/main/webapp/views/devops.html b/src/main/webapp/views/devops.html
index 7aa8ca5..c28428d 100644
--- a/src/main/webapp/views/devops.html
+++ b/src/main/webapp/views/devops.html
@@ -249,9 +249,9 @@
var table = res.data;
for (var i = 1; i <= table.length; i++) {
var tr = tableEl.find("tr").eq(i);
- tr.children("td").eq(0).html(table[i - 1].no);
- tr.children("td").eq(1).html(table[i - 1].plcDesc);
- tr.children("td").eq(2).html(table[i - 1].error);
+ tr.children("td").eq(0).html(table[i - 1].wrkNo);
+ tr.children("td").eq(1).html(table[i - 1].error);
+ tr.children("td").eq(2).html(table[i - 1].method);
}
} else if (res.code === 403) {
window.location.href = baseUrl + "/login";
--
Gitblit v1.9.1