From 968072c0fb57b0a95ce2d45daed8f3e2e735b27c Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 03 九月 2020 17:02:53 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/SiteController.java | 44 ++++++++------
src/main/java/com/zy/asrs/domain/vo/CrnMsgTableVo.java | 28 ++++-----
src/main/webapp/views/pipeline.html | 4
src/main/java/com/zy/asrs/controller/CrnController.java | 33 ++++++----
src/main/java/com/zy/asrs/domain/vo/SiteTableVo.java | 16 ++--
src/main/java/com/zy/asrs/domain/vo/CrnStateTableVo.java | 30 +++++-----
6 files changed, 84 insertions(+), 71 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/CrnController.java b/src/main/java/com/zy/asrs/controller/CrnController.java
index ecd9c15..7829f11 100644
--- a/src/main/java/com/zy/asrs/controller/CrnController.java
+++ b/src/main/java/com/zy/asrs/controller/CrnController.java
@@ -1,6 +1,7 @@
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.R;
import com.core.exception.CoolException;
@@ -10,8 +11,10 @@
import com.zy.asrs.domain.vo.CrnMsgTableVo;
import com.zy.asrs.domain.vo.CrnStateTableVo;
import com.zy.asrs.entity.BasCrnError;
+import com.zy.asrs.entity.BasCrnp;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.mapper.BasCrnErrorMapper;
+import com.zy.asrs.service.BasCrnpService;
import com.zy.asrs.service.WrkMastService;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
@@ -50,6 +53,8 @@
private WrkMastService wrkMastService;
@Autowired
private BasCrnErrorMapper basCrnErrorMapper;
+ @Autowired
+ private BasCrnpService basCrnpService;
@ManagerAuth(memo = "杩涜涓殑鍛戒护")
@@ -83,9 +88,14 @@
@ManagerAuth(memo = "鍫嗗灈鏈轰俊鎭〃")
public R crnStateTable(){
List<CrnStateTableVo> list = new ArrayList<>();
- for (CrnSlave crn : slaveProperties.getCrn()) {
+ List<BasCrnp> crnps = basCrnpService.selectList(new EntityWrapper<BasCrnp>().orderBy("crn_no"));
+ for (BasCrnp basCrnp : crnps) {
+ // 琛ㄦ牸琛�
+ CrnStateTableVo vo = new CrnStateTableVo();
+ vo.setCrnNo(basCrnp.getCrnNo()); // 鍫嗗灈鏈哄彿
+ list.add(vo);
// 鑾峰彇鍫嗗灈鏈轰俊鎭�
- CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
+ CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, basCrnp.getCrnNo());
if (crnThread == null) {
continue;
}
@@ -93,9 +103,6 @@
if (crnProtocol == null) {
continue;
}
- // 琛ㄦ牸琛�
- CrnStateTableVo vo = new CrnStateTableVo();
- vo.setCrnNo(crn.getId()); // 鍫嗗灈鏈哄彿
vo.setWorkNo(crnProtocol.getTaskNo()); // 浠诲姟鍙�
if (crnProtocol.getTaskNo()>0) {
WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
@@ -116,7 +123,6 @@
vo.setYLocation(crnProtocol.getLiftPosType().equals(CrnLiftPosType.NONE)?"鍚�":"鏄�"); // 鍗囬檷瀹氫綅
vo.setStop(crnProtocol.getCrnTemp1().stop?"鏄�":"鍚�"); // 鎬ュ仠
vo.setWarnCode(String.valueOf(crnProtocol.getAlarm())); // 寮傚父鐮�
- list.add(vo);
}
return R.ok().add(list);
}
@@ -125,9 +131,14 @@
@ManagerAuth(memo = "鍫嗗灈鏈烘暟鎹〃")
public R crnMsgTable(){
List<CrnMsgTableVo> list = new ArrayList<>();
- for (CrnSlave crn : slaveProperties.getCrn()) {
+ List<BasCrnp> crnps = basCrnpService.selectList(new EntityWrapper<BasCrnp>().orderBy("crn_no"));
+ for (BasCrnp basCrnp : crnps) {
+ // 琛ㄦ牸琛�
+ CrnMsgTableVo vo = new CrnMsgTableVo();
+ vo.setCrnNo(basCrnp.getCrnNo()); // 鍫嗗灈鏈哄彿
+ list.add(vo);
// 鑾峰彇鍫嗗灈鏈轰俊鎭�
- CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
+ CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, basCrnp.getCrnNo());
if (crnThread == null) {
continue;
}
@@ -135,9 +146,7 @@
if (crnProtocol == null) {
continue;
}
- // 琛ㄦ牸琛�
- CrnMsgTableVo vo = new CrnMsgTableVo();
- vo.setCrnNo(crn.getId()); // 鍫嗗灈鏈哄彿
+
vo.setWorkNo(crnProtocol.getTaskNo()); // 浠诲姟鍙�
BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm());
if (null != crnError) {
@@ -162,8 +171,6 @@
vo.setYdistance(crnProtocol.getYDistance()); // 鍗囬檷璺濈(Km)
vo.setXduration(crnProtocol.getXDuration()); // 璧拌鏃堕暱(H)
vo.setYduration(crnProtocol.getYDuration()); // 鍗囬檷鏃堕暱(H)
- list.add(vo);
-
}
return R.ok().add(list);
}
diff --git a/src/main/java/com/zy/asrs/controller/SiteController.java b/src/main/java/com/zy/asrs/controller/SiteController.java
index 53d8a62..30500f8 100644
--- a/src/main/java/com/zy/asrs/controller/SiteController.java
+++ b/src/main/java/com/zy/asrs/controller/SiteController.java
@@ -1,9 +1,12 @@
package com.zy.asrs.controller;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.ManagerAuth;
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.service.BasDevpService;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
import com.zy.core.cache.SlaveConnection;
@@ -17,6 +20,7 @@
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -30,31 +34,35 @@
@Autowired
private SlaveProperties slaveProperties;
+ @Autowired
+ private BasDevpService basDevpService;
@PostMapping("/table/site")
@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());
- Map<Integer, StaProtocol> station = devpThread.getStation();
- for (Map.Entry<Integer, StaProtocol> entry : station.entrySet()) {
- StaProtocol staProtocol = entry.getValue();
- SiteTableVo vo = new SiteTableVo();
-
- vo.setDevNo(entry.getKey()); // 绔欑偣缂栧彿
- 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.setPakMk(staProtocol.isPakMk()?"Y":"N"); // 鍏ュ簱鏍囪
- vo.setEmptyMk(staProtocol.isEmptyMk()?"Y":"N"); // 绌烘澘淇″彿
- vo.setStaNo(staProtocol.getStaNo()); // 鐩爣绔�
-
- list.add(vo);
- }
+ station.putAll(devpThread.getStation());
+ }
+ // 鎸佷箙鏁版嵁
+ List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<BasDevp>().orderBy("dev_no"));
+ for (BasDevp devp : basDevps) {
+ SiteTableVo vo = new SiteTableVo();
+ vo.setDevNo(devp.getDevNo()); // 绔欑偣缂栧彿
+ list.add(vo);
+ StaProtocol staProtocol = station.get(devp.getDevNo());
+ if (null == staProtocol) { continue; }
+ 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.setPakMk(staProtocol.isPakMk()?"Y":"N"); // 鍏ュ簱鏍囪
+ vo.setEmptyMk(staProtocol.isEmptyMk()?"Y":"N"); // 绌烘澘淇″彿
+ vo.setStaNo(staProtocol.getStaNo()); // 鐩爣绔�
}
return R.ok().add(list);
}
diff --git a/src/main/java/com/zy/asrs/domain/vo/CrnMsgTableVo.java b/src/main/java/com/zy/asrs/domain/vo/CrnMsgTableVo.java
index 072c46c..ef124a3 100644
--- a/src/main/java/com/zy/asrs/domain/vo/CrnMsgTableVo.java
+++ b/src/main/java/com/zy/asrs/domain/vo/CrnMsgTableVo.java
@@ -3,8 +3,6 @@
import com.zy.asrs.utils.Utils;
import lombok.Data;
-import java.text.DecimalFormat;
-
/**
* Created by vincent on 2020-06-02
*/
@@ -15,22 +13,22 @@
private Integer crnNo;
// 宸ヤ綔鍙�
- private Short workNo;
+ private Short workNo = 0;
// 鐘舵��
- private String status = "";
+ private String status = "-";
// 婧愮珯
- private String sourceStaNo = "";
+ private String sourceStaNo = "-";
// 鐩爣绔�
- private String staNo = "";
+ private String staNo = "-";
// 婧愬簱浣�
- private String sourceLocNo = "";
+ private String sourceLocNo = "-";
// 鐩爣搴撲綅
- private String locNo = "";
+ private String locNo = "-";
// 寮傚父
private String error = "";
@@ -42,25 +40,25 @@
private String command = "";
// 璧拌閫熷害锛坢/min)
- private Float xspeed;
+ private Float xspeed = 0.0F;
// 鍗囬檷閫熷害锛坢/min)
- private Float yspeed;
+ private Float yspeed = 0.0F;
// 鍙夌墮閫熷害锛坢/min)
- private Float zspeed;
+ private Float zspeed = 0.0F;
// 璧拌璺濈(Km)
- private Float xdistance;
+ private Float xdistance = 0.0F;
// 鍗囬檷璺濈(Km)
- private Float ydistance;
+ private Float ydistance = 0.0F;
// 璧拌鏃堕暱(H)
- private Float xduration;
+ private Float xduration = 0.0F;
// 鍗囬檷鏃堕暱(H)
- private Float yduration;
+ private Float yduration = 0.0F;
public void setXspeed(Float xspeed) {
this.xspeed = Utils.scale(xspeed);
diff --git a/src/main/java/com/zy/asrs/domain/vo/CrnStateTableVo.java b/src/main/java/com/zy/asrs/domain/vo/CrnStateTableVo.java
index 0c2c5d8..e1e514f 100644
--- a/src/main/java/com/zy/asrs/domain/vo/CrnStateTableVo.java
+++ b/src/main/java/com/zy/asrs/domain/vo/CrnStateTableVo.java
@@ -12,10 +12,10 @@
private Integer crnNo;
// 妯″紡
- private String statusType;
+ private String statusType = "-";
// 鏈夌墿
- private String loading;
+ private String loading = "-";
// 鍒�
private Short bay;
@@ -24,42 +24,42 @@
private Short lev;
// 璧拌鍘熺偣
- private String xOrigin;
+ private String xOrigin = "-";
// 鍗囬檷鍘熺偣
- private String yOrigin;
+ private String yOrigin = "-";
// 璧拌瀹氫綅
- private String xLocation;
+ private String xLocation = "-";
// 鍗囬檷瀹氫綅
- private String yLocation;
+ private String yLocation = "-";
// 璐у弶浣嶇疆
- private String forkOffset;
+ private String forkOffset = "-";
// 杞借揣鍙颁綅缃�
- private String liftPos;
+ private String liftPos = "-";
// 鎬ュ仠
- private String stop;
+ private String stop = "-";
// 鍒楀潗鏍�
- private String bayCoor;
+ private String bayCoor = "-";
// 灞傚潗鏍�
- private String levCoor;
+ private String levCoor = "-";
// 瀹屾垚
- private String complete;
+ private String complete = "-";
// 浠诲姟鍙�
- private Short workNo;
+ private Short workNo = 0;
// 鐘舵��
- private String status;
+ private String status = "-";
// 寮傚父鐮�
- private String warnCode;
+ private String warnCode = "-";
}
diff --git a/src/main/java/com/zy/asrs/domain/vo/SiteTableVo.java b/src/main/java/com/zy/asrs/domain/vo/SiteTableVo.java
index f2b2d02..aa3f0d3 100644
--- a/src/main/java/com/zy/asrs/domain/vo/SiteTableVo.java
+++ b/src/main/java/com/zy/asrs/domain/vo/SiteTableVo.java
@@ -12,27 +12,27 @@
private Integer devNo;
// 宸ヤ綔鍙�
- private Short workNo;
+ private Short workNo = 0;
// 鑷姩
- private String autoing;
+ private String autoing = "-";
// 鏈夌墿
- private String loading;
+ private String loading = "-";
// 鍙叆
- private String inEnable;
+ private String inEnable = "-";
// 鍙嚭
- private String outEnable;
+ private String outEnable = "-";
// 闇�姹�1
- private String pakMk;
+ private String pakMk = "-";
// 绌烘澘淇″彿
- private String emptyMk;
+ private String emptyMk = "-";
// 鐩爣绔�
- private Short staNo;
+ private Short staNo = 0;
}
diff --git a/src/main/webapp/views/pipeline.html b/src/main/webapp/views/pipeline.html
index e18384b..8c19df6 100644
--- a/src/main/webapp/views/pipeline.html
+++ b/src/main/webapp/views/pipeline.html
@@ -147,7 +147,7 @@
} else if (res.code === 403){
window.location.href = baseUrl+"/login";
} else {
- alert(res.msg);
+ console.log(res.msg);
}
}
});
@@ -182,7 +182,7 @@
} else if (res.code === 403){
window.location.href = baseUrl+"/login";
} else {
- alert(res.msg);
+ console.log(res.msg);
}
}
});
--
Gitblit v1.9.1