From 016e53e660f790418bcc420ff4829d08fc290af3 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期六, 03 十二月 2022 16:15:09 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/SiteController.java | 86 ++++++++++++++++++++--------
src/main/java/com/zy/core/enums/SteChargeType.java | 13 ++++
src/main/webapp/views/pipeline.html | 43 +++++++-------
3 files changed, 96 insertions(+), 46 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/SiteController.java b/src/main/java/com/zy/asrs/controller/SiteController.java
index 6aa23f0..78e8d0f 100644
--- a/src/main/java/com/zy/asrs/controller/SiteController.java
+++ b/src/main/java/com/zy/asrs/controller/SiteController.java
@@ -1,33 +1,38 @@
package com.zy.asrs.controller;
-import com.alibaba.fastjson.JSON;
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.vo.PlcErrorTableVo;
import com.zy.asrs.domain.vo.SiteTableVo;
import com.zy.asrs.entity.BasDevp;
+import com.zy.asrs.entity.BasSte;
+import com.zy.asrs.entity.WrkCharge;
import com.zy.asrs.service.BasDevpService;
+import com.zy.asrs.service.BasSteService;
+import com.zy.asrs.service.WrkChargeService;
+import com.zy.common.model.enums.WrkChargeType;
+import com.zy.common.service.CommonService;
+import com.zy.core.DevpThread;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.SlaveType;
-import com.zy.core.enums.SteTaskModeType;
+import com.zy.core.enums.SteChargeType;
+import com.zy.core.enums.SteStatusType;
import com.zy.core.model.DevpSlave;
import com.zy.core.model.Task;
-import com.zy.core.model.command.SteCommand;
import com.zy.core.model.protocol.StaProtocol;
+import com.zy.core.model.protocol.SteProtocol;
import com.zy.core.properties.SlaveProperties;
-import com.zy.core.DevpThread;
import com.zy.core.thread.SiemensDevpThread;
+import com.zy.core.thread.SteThread;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* 杈撻�佽澶囨帴鍙�
@@ -42,6 +47,12 @@
private SlaveProperties slaveProperties;
@Autowired
private BasDevpService basDevpService;
+ @Autowired
+ private WrkChargeService wrkChargeService;
+ @Autowired
+ private BasSteService basSteService;
+ @Autowired
+ private CommonService commonService;
@GetMapping("/io/mode/info/site")
@ManagerAuth(memo = "鍏呯數妯″紡")
@@ -71,24 +82,49 @@
@PostMapping("/io/mode/action/site")
@ManagerAuth(memo = "鍏呯數鎺у埗")
public R ioModeAction(@RequestParam("floor") Integer floor, @RequestParam("charge") Boolean charge){
- for (DevpSlave devp : slaveProperties.getDevp()) {
- // 杈撻�佺嚎鍏呯數鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
- SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
- boolean res = devpThread.charge(floor - 1, charge);
- if (!charge && res) {
- // 绌挎杞﹀厖鐢靛懡浠や笅鍙戝尯 --------------------------------------------------------------------------
- int steNo = floor;
- SteCommand steCommand = new SteCommand();
- steCommand.setSteNo(steNo); // 绌挎杞︾紪鍙�
- steCommand.setTaskNo(9999); // 宸ヤ綔鍙�
- steCommand.setTaskMode(SteTaskModeType.CLOSE_CHARGE);
- if (!MessageQueue.offer(SlaveType.Ste, steNo, new Task(2, steCommand))) {
- log.error("绌挎杞﹀懡浠や笅鍙戝け璐ワ紝绌挎杞﹀彿={}锛屼换鍔℃暟鎹�={}", steNo, JSON.toJSON(steCommand));
- }
- }
- return res?R.ok():R.error();
+ if (null != wrkChargeService.selectWorking(null, WrkChargeType.charge)) {
+ return R.error("鐩墠瀛樺湪灏忚溅鍏呯數浠诲姟锛岃绋嶅悗鍐嶈瘯");
}
- return R.ok();
+ if (null != wrkChargeService.selectWorking(null, WrkChargeType.reset)) {
+ return R.error("鐩墠瀛樺湪灏忚溅澶嶄綅浠诲姟锛岃绋嶅悗鍐嶈瘯");
+ }
+ if (charge) {
+ return R.ok();
+ }
+
+ SteChargeType steCharge = SteChargeType.get(floor);
+ assert steCharge != null;
+ Integer steNo = basSteService.hasCarOfLocNo(steCharge.locNo);
+ if (Cools.isEmpty(steNo)) {
+ return R.error(steNo + "鍙峰皬杞︿笉鍦�" + floor + "鍙峰厖鐢垫々锛岃妫�鏌ュ皬杞﹀畾浣�");
+ }
+ SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, steNo);
+ SteProtocol steProtocol = steThread.getSteProtocol();
+ BasSte basSte = basSteService.selectById(steNo);
+ if (steProtocol.getMode() == 0) {
+ return R.error(steNo + "鍙峰皬杞︾绾匡紝鏃犳硶鎿嶄綔");
+ }
+ if (!steProtocol.getStatusType().equals(SteStatusType.IDLE)) {
+ return R.error(steNo + "鍙峰皬杞︿笉鏄┖闂诧紝鏃犳硶鎿嶄綔");
+ }
+ WrkCharge wrkCharge = wrkChargeService.selectWorking(steNo, WrkChargeType.reset);
+ if (wrkCharge == null) {
+ // 寮�濮嬬┛姊溅澶嶄綅浠诲姟
+ wrkCharge = new WrkCharge();
+ wrkCharge.setSteNo(steNo);
+ wrkCharge.setWrkNo(commonService.getChargeWorkNo(6));
+ wrkCharge.setWrkSts(41L); // 41.灏忚溅鍑嗗澶嶄綅
+ wrkCharge.setCrnNo(2); // 鍥哄畾2鍙峰爢鍨涙満
+ wrkCharge.setIoPri((double) 10);
+ wrkCharge.setSourceLocNo(steCharge.locNo);
+ wrkCharge.setLocNo(basSte.getIdleLoc());
+ wrkCharge.setMemo("reset");
+ wrkCharge.setAppeTime(new Date());
+ if (!wrkChargeService.insert(wrkCharge)) {
+ log.error("淇濆瓨{}鍙风┛姊溅澶嶄綅浠诲姟澶辫触!!!", steNo);
+ }
+ }
+ return R.ok(steNo + "鍙峰皬杞﹀噯澶囩寮�" + floor + "鍙峰厖鐢垫々");
}
@PostMapping("/table/site")
diff --git a/src/main/java/com/zy/core/enums/SteChargeType.java b/src/main/java/com/zy/core/enums/SteChargeType.java
index 06ff2a0..e486852 100644
--- a/src/main/java/com/zy/core/enums/SteChargeType.java
+++ b/src/main/java/com/zy/core/enums/SteChargeType.java
@@ -31,4 +31,17 @@
return null;
}
+ public static SteChargeType get(int ssbm) {
+ if (Cools.isEmpty(ssbm)) {
+ return null;
+ }
+ SteChargeType[] values = SteChargeType.values();
+ for (SteChargeType value : values) {
+ if (value.ssbm == ssbm) {
+ return value;
+ }
+ }
+ return null;
+ }
+
}
diff --git a/src/main/webapp/views/pipeline.html b/src/main/webapp/views/pipeline.html
index 6415b2f..b4fe318 100644
--- a/src/main/webapp/views/pipeline.html
+++ b/src/main/webapp/views/pipeline.html
@@ -214,28 +214,29 @@
if (ioModeData != null && ioModeData.length > 1) {
ioModeData.forEach(function(e) {
if (e.floor === Number(floor)) {
- console.log()
- layer.confirm('纭畾鍒囨崲鍏呯數鐘舵�佸悧锛�',function () {
- $.ajax({
- url: baseUrl+ "/site/io/mode/action/site",
- headers: {'token': localStorage.getItem('token')},
- data: {
- floor: e.floor,
- charge: !e.modeVal
- },
- 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);
+ if (e.modeVal) {
+ layer.confirm('纭畾鏂紑鍏呯數骞跺浣嶅悧锛�',function () {
+ $.ajax({
+ url: baseUrl+ "/site/io/mode/action/site",
+ headers: {'token': localStorage.getItem('token')},
+ data: {
+ floor: e.floor,
+ charge: !e.modeVal
+ },
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200){
+ layer.msg(res.msg, {icon: 1})
+ } else if (res.code === 403){
+ window.location.href = baseUrl+"/login";
+ } else {
+ layer.msg(res.msg, {icon: 2})
+ }
}
- }
- });
- layer.closeAll();
- })
+ });
+ layer.closeAll();
+ })
+ }
}
});
}
--
Gitblit v1.9.1