From 5b25d65a9e86fd45861f89104e6996dc2c387e1b Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 06 五月 2025 16:07:46 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/controller/DevopsController.java | 74 +++++++++++++++---------
src/main/webapp/views/index.html | 2
src/main/java/com/zy/asrs/domain/devops/ErrorType.java | 22 +++---
src/main/webapp/views/devops.html | 69 ++---------------------
4 files changed, 63 insertions(+), 104 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/DevopsController.java b/src/main/java/com/zy/asrs/controller/DevopsController.java
index 2470daf..863c2d2 100644
--- a/src/main/java/com/zy/asrs/controller/DevopsController.java
+++ b/src/main/java/com/zy/asrs/controller/DevopsController.java
@@ -55,7 +55,7 @@
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));
+ List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("crn_no", crnSlave.getId()).orderBy("wrk_sts", false));
//鍏堟煡璇㈠爢鍨涙満鏄惁鍦ㄥ伐浣�
WrkMast working = wrkMastMapper.selectWorking(crnSlave.getId());
for (WrkMast wrkMast : wrkMasts) {
@@ -70,7 +70,9 @@
}
continue;
}
- List<ErrorType> staError = isStaError(wrkMast);
+ DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, 1);
+ StaProtocol staProtocol = devpThread.getStation().get(wrkMast.getStaNo());
+ List<ErrorType> staError = isStaError(staProtocol, wrkMast);
for (ErrorType type : staError) {
if (!Cools.isEmpty(devopsMessage.getError())) {
devopsMessage.setError(devopsMessage.getError() + ";" + type.getDesc());
@@ -80,7 +82,9 @@
devopsMessage.setMethod(type.getMethod());
}
}
- List<ErrorType> crnError = isCrnError(wrkMast);
+ CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, wrkMast.getCrnNo());
+ CrnProtocol crnProtocol = crnThread.getCrnProtocol();
+ List<ErrorType> crnError = isCrnError(crnProtocol, wrkMast);
for (ErrorType type : crnError) {
if (!Cools.isEmpty(devopsMessage.getError())) {
devopsMessage.setError(devopsMessage.getError() + ";" + type.getDesc());
@@ -96,73 +100,80 @@
return R.ok(devopsMessages);
}
- private List<ErrorType> isStaError(WrkMast staNo) {
+ private List<ErrorType> isStaError(StaProtocol staProtocol, WrkMast wrkMast) {
List<ErrorType> types = new ArrayList<>();
- DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, 1);
- StaProtocol staProtocol = devpThread.getStation().get(staNo);
if (staProtocol == null) {
types.add(ErrorType.ERROR);
return types;
} else {
staProtocol = staProtocol.clone();
}
+ // 鑷姩
if (staProtocol.isAutoing()) {
types.add(ErrorType.FEIZIDONG);
}
- if (staProtocol.isLoading()) {
- types.add(ErrorType.YOUWU);
- }
- if (staProtocol.getWorkNo() == 0) {
- types.add(ErrorType.GONGZUOHAO);
- }
- if (staProtocol.getStaNo() == null) {
- types.add(ErrorType.STANO);
+ if (wrkMast.getIoType() > 100) {
+ // 鍑哄簱鏍￠獙
+ // 鏈夌墿
+ if (staProtocol.isLoading()) {
+ types.add(ErrorType.YOUWU);
+ } // 宸ヤ綔鍙锋槸鍚︿负0
+ if (staProtocol.getWorkNo() == 0) {
+ types.add(ErrorType.GONGZUOHAO);
+ }
+ // 鐩爣绔欑偣
+ if (staProtocol.getStaNo() == null) {
+ types.add(ErrorType.STANO);
+ }
+ } else {
+ // 鍏ュ簱鏍￠獙
+
}
return types;
}
- private List<ErrorType> isCrnError(WrkMast wrkMast) {
+ private List<ErrorType> isCrnError(CrnProtocol crnProtocol, WrkMast wrkMast) {
List<ErrorType> types = new ArrayList<>();
- CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, wrkMast.getCrnNo());
- CrnProtocol crnProtocol = crnThread.getCrnProtocol();
-
+ // 鍫嗗灈鏈烘槸鍚︾┖闂�
if (crnProtocol.getStatusType() == CrnStatusType.IDLE) {
types.add(ErrorType.CRN_NO_IDLE);
}
+ //浠诲姟鍙锋槸鍚︿负0
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);
}
+ // 鏀捐揣涓�
if (crnProtocol.statusType == CrnStatusType.PUTTING) {
types.add(ErrorType.WORKING);
}
+ // 鍫嗗灈鏈虹瓑寰呯‘璁ょ姸鎬�
if (crnProtocol.statusType == CrnStatusType.WAITING) {
types.add(ErrorType.WORKING);
}
+ // 璐у弶鏄惁浼氬洖涓�
if (crnProtocol.forkPosType == CrnForkPosType.HOME) {
types.add(ErrorType.HOME);
}
- if (crnProtocol.modeType == CrnModeType.AUTO) {
- types.add(ErrorType.FEIZIDONG);
- }
-
return types;
}
-
@PostMapping("/site/list")
@ManagerAuth(memo = "绔欑偣淇℃伅琛�")
- public R siteTable(){
+ public R siteTable() {
List<SiteTableVo> list = new ArrayList<>();
// 鍐呭瓨鏁版嵁
Map<Integer, StaProtocol> station = new HashMap<>();
@@ -174,14 +185,19 @@
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; }
+ 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"); // 鍙嚭
+ vo.setAutoing(staProtocol.isAutoing() ? "Y" : "N"); // 鑷姩
+ vo.setLoading(staProtocol.isLoading() ? "Y" : "N"); // 鏈夌墿
+ vo.setInEnable(staProtocol.isInEnable() ? "Y" : "N"); // 鍙叆
+ vo.setOutEnable(staProtocol.isOutEnable() ? "Y" : "N"); // 鍙嚭
+ vo.setPakMk(staProtocol.isPakMk()?"Y":"N"); // 鍏ュ簱鏍囪
+ vo.setStaNo(staProtocol.getStaNo()); // 鐩爣绔�
+ vo.setEmptyMk(staProtocol.isEmptyMk()?"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 004bf90..80a4e21 100644
--- a/src/main/java/com/zy/asrs/domain/devops/ErrorType.java
+++ b/src/main/java/com/zy/asrs/domain/devops/ErrorType.java
@@ -5,19 +5,19 @@
*/
public enum ErrorType {
ERROR(10000, "绔欑偣瀵硅薄涓虹┖","鑱旂郴鎶�鏈汉鍛�"),
- WUWU(10001, "鏃犵墿", "1"),
- YOUWU(10002, "鏈夌墿", "1"),
- STANO(10003, "鐩爣绔欑偣瀛樺湪绔欑偣鍙�", "1"),
- FEIZIDONG(10004, "鐩爣绔欑偣闈炶嚜鍔�", "1"),
- GONGZUOHAO(10005, "鐩爣绔欑偣瀛樺湪宸ヤ綔鍙�", "1"),
+ WUWU(10001, "绔欑偣鏃犵墿", "璇锋鏌ユ墭鐩樻槸鍚﹁蛋鍒颁綅"),
+ YOUWU(10002, "绔欑偣鏈夌墿", "璇锋鏌ュ厜鐢垫槸鍚﹁惤鐏�"),
+ STANO(10003, "鐩爣绔欑偣瀛樺湪绔欑偣鍙�", "缂哄皯鐩爣绔欑偣"),
+ FEIZIDONG(10004, "鐩爣绔欑偣闈炶嚜鍔�", "绔欑偣闈炶嚜鍔ㄧ姸鎬侊紝璇峰垏鎹�"),
+ GONGZUOHAO(10005, "鐩爣绔欑偣瀛樺湪宸ヤ綔鍙�", "鐩爣绔欑偣瀛樺湪宸ヤ綔鍙凤紝璇锋鏌�"),
- WORKING(11001, "鍫嗗灈鏈哄湪宸ヤ綔涓�", "1"),
- HOME(11002, "璐у弶涓嶅湪鍘熶綅", "1"),
- CRNGONGZUOHAO(11003, "鍫嗗灈鏈哄湪宸ヤ綔涓�", "1"),
- LOAD(11004, "鍫嗗灈鏈虹殑杞界墿鍙版湁鐗�", "1"),
- CRN_FEIZIDONG(11004, "鍫嗗灈鏈洪潪鑷姩", "1"),
- CRN_NO_IDLE(11004, "鍫嗗灈鏈洪潪绌洪棽", "1"),
+ WORKING(11001, "鍫嗗灈鏈哄伐浣滀腑", "鍫嗗灈鏈哄伐浣滀腑"),
+ HOME(11002, "璐у弶涓嶅湪鍘熶綅", "璇峰皢璐у弶鍥炰腑"),
+ CRNGONGZUOHAO(11003, "鍫嗗灈鏈哄瓨鍦ㄥ伐浣滃彿", "鍫嗗灈鏈哄瓨鍦ㄥ伐浣滃彿锛岃妫�鏌ヨ浠诲姟鏄惁宸茬粡瀹屾垚"),
+ LOAD(11004, "鍫嗗灈鏈虹殑杞界墿鍙版湁鐗�", "鍫嗗灈鏈虹殑杞界墿鍙版湁鐗╋紝璇锋鏌ュ厜鐢�"),
+ CRN_FEIZIDONG(11004, "鍫嗗灈鏈洪潪鑷姩", "璇峰皢鍫嗗灈鏈哄垏鑷姩"),
+ CRN_NO_IDLE(11004, "鍫嗗灈鏈洪潪绌洪棽", "璇峰皢鍫嗗灈鏈哄垏鑷姩"),
;
diff --git a/src/main/webapp/views/devops.html b/src/main/webapp/views/devops.html
index c28428d..4f35f2d 100644
--- a/src/main/webapp/views/devops.html
+++ b/src/main/webapp/views/devops.html
@@ -92,8 +92,8 @@
<th>鍙叆</th>
<th>鍙嚭</th>
<th>鍏ュ簱鏍囪</th>
- <th>绌烘澘淇″彿</th>
<th>鐩爣绔�</th>
+ <th>淇℃伅</th>
<th>楂樹綆搴撲綅</th>
</tr>
</thead>
@@ -156,7 +156,6 @@
var siteTableFullRows = 0;
var outputDom = document.getElementById("output");
$(document).ready(function () {
- getIoModeInfo();
initPlcErrorTable();
getPlcError();
initSiteTable();
@@ -166,7 +165,6 @@
setInterval(function () {
getPlcError();
starGetSite();
- getIoModeInfo();
}, 1000);
setInterval(function () {
getSiteOutput();
@@ -180,68 +178,13 @@
}
}
- var ioModeData;
-
- function getIoModeInfo() {
- $.ajax({
- url: baseUrl + "/site/io/mode/info/site",
- headers: {'token': localStorage.getItem('token')},
- method: 'GET',
- success: function (res) {
- if (res.code === 200) {
- ioModeData = res.data;
- ioModeData.forEach(function (e) {
- $("#io-mode-" + e.floor).html(e.modeDesc);
- })
- } else if (res.code === 403) {
- window.location.href = baseUrl + "/login";
- } else {
- console.log(res.msg);
- }
- }
- });
- }
-
- /**
- * 寮哄埗鍒囨崲鍏ュ嚭搴撴ā寮�
- */
- function ioModeSwitch(el) {
- var floor = el.split("-")[2];
- if (ioModeData != null && ioModeData.length > 1) {
- ioModeData.forEach(function (e) {
- if (e.floor === Number(floor)) {
- if (e.modeVal === 3 || e.modeVal === 4) {
- layer.confirm('纭畾鍒囨崲涓哄叆搴撴ā寮忓悧锛�', function () {
- $.ajax({
- url: baseUrl + "/site/io/mode/action/site",
- headers: {'token': localStorage.getItem('token')},
- data: {floor: e.floor},
- method: 'POST',
- success: function (res) {
- if (res.code === 200) {
- layer.msg("鏆傛椂涓嶈兘鍒囨崲锛�", {icon: 1})
- } else if (res.code === 403) {
- window.location.href = baseUrl + "/login";
- } else {
- console.log(res.msg);
- }
- }
- });
- layer.closeAll();
- })
- }
- }
- });
- }
-
- }
// plc寮傚父淇℃伅琛ㄨ幏鍙�
function getPlcError() {
var tableEl = $('#plc-error-table');
tableEl.children("tr").children("td").html("");
$.ajax({
- url: baseUrl + "/site/table/plc/errors",
+ url: baseUrl + "/devops/wrkMast/list",
headers: {'token': localStorage.getItem('token')},
method: 'POST',
success: function (res) {
@@ -266,7 +209,7 @@
function getSite() {
var tableEl = $('#site-table');
$.ajax({
- url: baseUrl + "/site/table/site",
+ url: baseUrl + "/devops/site/list",
headers: {'token': localStorage.getItem('token')},
method: 'POST',
success: function (res) {
@@ -285,8 +228,8 @@
setVal(tr.children("td").eq(4), table[i - 1].inEnable);
setVal(tr.children("td").eq(5), table[i - 1].outEnable);
setVal(tr.children("td").eq(6), table[i - 1].pakMk);
- setVal(tr.children("td").eq(7), table[i - 1].emptyMk);
- setVal(tr.children("td").eq(8), table[i - 1].staNo);
+ setVal(tr.children("td").eq(7), table[i - 1].staNo);
+ setVal(tr.children("td").eq(8), table[i - 1].emptyMk);
setVal(tr.children("td").eq(9), table[i - 1].locType1);
}
} else if (res.code === 403) {
@@ -416,7 +359,7 @@
});
$(document).on('click ', '#save', function () {
- http.post(baseUrl + "/site//detl/update", {
+ http.post(baseUrl + "/site/detl/update", {
siteId: $('#siteId').val(),
workNo: $('#workNo').val(),
staNo: $('#staNo').val(),
diff --git a/src/main/webapp/views/index.html b/src/main/webapp/views/index.html
index 0caa66c..1e7d256 100644
--- a/src/main/webapp/views/index.html
+++ b/src/main/webapp/views/index.html
@@ -24,7 +24,7 @@
<li><a id="console" onclick="nav(this.id)" class="nav-select" href="#">涓绘帶鍥�</a></li>
<li><a id="pipeline" onclick="nav(this.id)" class="nav-unselect" href="#">杈撻�佽澶�</a></li>
<li><a id="crn" onclick="nav(this.id)" class="nav-unselect" href="#">鍫嗗灈鏈�</a></li>
- <li><a id="devops" onclick="nav(this.id)" class="nav-unselect" href="#">杩愮淮骞冲彴</a></li>
+ <li><a id="devops" onclick="nav(this.id)" class="nav-unselect" href="#">鐩戞帶</a></li>
</ul>
</div>
</div>
--
Gitblit v1.9.1