From ec962e2bc42942186a944aa97dbb2c7babadfdd7 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期四, 01 十二月 2022 13:43:39 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/ConsoleController.java | 2
src/main/webapp/views/console.html | 38 ++--
src/main/java/com/zy/asrs/controller/MonitorController.java | 350 +++++++++++++++++++++++++++----------------------
3 files changed, 212 insertions(+), 178 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index ac4c5b5..2e31d9a 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -143,7 +143,7 @@
// Short totalBay = locMastMapper.selectTotalBay();
vo.setOffset((double) new Random().nextInt(560)); // 鍫嗗灈鏈哄亸绉婚噺
- vo.setBay((short) (crnProtocol.getBay() - crn.getOffset())); // 褰撳墠鍒�
+ vo.setBay((short) (crnProtocol.getBay())); // 褰撳墠鍒�
/**
* 鍫嗗灈鏈虹姸鎬佸垽鏂�
*/
diff --git a/src/main/java/com/zy/asrs/controller/MonitorController.java b/src/main/java/com/zy/asrs/controller/MonitorController.java
index 8977b4f..b5e0466 100644
--- a/src/main/java/com/zy/asrs/controller/MonitorController.java
+++ b/src/main/java/com/zy/asrs/controller/MonitorController.java
@@ -11,7 +11,10 @@
import com.zy.core.CrnThread;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.SlaveType;
+import com.zy.core.model.LedSlave;
+import com.zy.core.model.command.LedCommand;
import com.zy.core.model.protocol.CrnProtocol;
+import com.zy.core.properties.SlaveProperties;
import com.zy.core.thread.LedThread;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -33,6 +36,8 @@
@Autowired
private ReportQueryMapper reportQueryMapper;
+ @Autowired
+ private SlaveProperties slaveProperties;
/**
* 鑾峰彇褰撳墠鏃堕棿
@@ -53,68 +58,6 @@
);
}
- /**
- * 鑾峰彇鍏朵粬淇℃伅
- */
- @GetMapping("/other")
- public R monitorOther(@RequestParam("crnId") Integer crnId, @RequestParam("ledId") Integer ledId) {
- Double xSpeed = 0.0D;
- Double ySpeed = 0.0D;
- Double zSpeed = 0.0D;
- Short forkPos = 1;
- Double xDistance = 0.0D;
- Double yDistance = 0.0D;
- Double xDuration = 0.0D;
- Double yDuration = 0.0D;
-
- if (null != crnId) {
- CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crnId);
- if (crnThread != null) {
- CrnProtocol crnProtocol = crnThread.getCrnProtocol();
- if (crnProtocol != null) {
- xSpeed = Double.valueOf(crnProtocol.getXSpeed());
- ySpeed = Double.valueOf(crnProtocol.getYSpeed());
- zSpeed = Double.valueOf(crnProtocol.getZSpeed());
- switch (crnProtocol.getForkPos()) {
- case 0:
- forkPos = 1;
- break;
- case 1:
- forkPos = 2;
- break;
- case 2:
- forkPos = 0;
- break;
- default:
- forkPos = 1;
- break;
- }
- xDistance = Double.valueOf(crnProtocol.getXDistance());
- yDistance = Double.valueOf(crnProtocol.getYDistance());
- xDuration = Double.valueOf(crnProtocol.getXDuration());
- yDuration = Double.valueOf(crnProtocol.getYDuration());
- }
- }
- }
-
- // 鑾峰彇杈撻�佺嚎plc绾跨▼
- LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, ledId);
- String ledContent = ledThread.getWorkNos().toString();
-// ledContent = "ask鐨勬ā鍧楄惃婊″ぇ绠椾簡钀ㄦ弧澶т簡\n 鏄獦澧冨埌鍩冨強鍡插鍡瞈n 钀ㄨ揪濮嗘墦寮�钀ㄦ弧澶у嚡鎾掗害褰撳姵钀ㄦ弧澶ц�佸笀";
-
- return R.ok(
- Cools.add("xSpeed", Arith.multiplys(1, Math.abs(xSpeed), 1)) // 琛岃蛋閫熷害
- .add("ySpeed", Arith.multiplys(1, Math.abs(ySpeed), 1)) // 鍗囬檷閫熷害
- .add("zSpeed", Arith.multiplys(1, Math.abs(zSpeed), 1)) // 鍙夌墮閫熷害
- .add("forkPos", forkPos) // 鍙夌墮閫熷害
- .add("xDistance", Arith.multiplys(1, Math.abs(xDistance), 1)) // 绱璧拌璺濈km
- .add("yDistance", Arith.multiplys(1, Math.abs(yDistance), 1)) // 绱鍗囬檷璺濈km
- .add("xDuration", Arith.multiplys(1, Math.abs(xDuration), 1)) // 绱璧拌鏃堕暱h
- .add("yDuration", Arith.multiplys(1, Math.abs(yDuration), 1)) // 绱鍗囬檷鏃堕暱h
- .add("isShow", !Cools.isEmpty(ledContent)) // 鏄惁鏄剧ず鍐呭
- .add("content", ledContent) // 鏄剧ず鍐呭
- );
- }
/**
* 鍏ュ簱鎶ヨ〃 -- 鎶樼嚎鍥�
@@ -133,101 +76,6 @@
return R.ok(pakinRep);
}
- @GetMapping("/line/charts")
- public R locIoLineCharts(){
- Map<String,Object> map=new HashMap<String, Object>();
- List<AxisBean> list = new ArrayList<AxisBean>();
-
- List<WorkChartAxis> listChart = reportQueryMapper.getChartAxis();
-
- if(listChart!=null) {
- ArrayList<Integer> data1 = new ArrayList<Integer>();
- ArrayList<Integer> data2 = new ArrayList<Integer>();
-
- SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd");
- Calendar calendar = Calendar.getInstance();
- calendar.add(Calendar.DATE, -12);
- for(int i=0;i<12;i++) {
- boolean flag = true;
- calendar.add(Calendar.DATE, 1);
- String str = sf.format(calendar.getTime());
- for(WorkChartAxis workChart : listChart) {
- if(str.equals(workChart.getYmd())) {
- data1.add(workChart.getInqty());
- data2.add(workChart.getOutqty());
- flag = false;
- break;
- }
- }
- if(flag) {
- data1.add(0);
- data2.add(0);
- }
- }
- AxisBean inqty = new AxisBean();
- inqty.setName("鍏ュ簱鏁伴噺");
- Integer[] array1 = new Integer[data1.size()];
- inqty.setData(data1.toArray(array1));
- list.add(inqty);
- AxisBean outqty = new AxisBean();
- outqty.setName("鍑哄簱鏁伴噺");
- Integer[] array2 = new Integer[data2.size()];
- outqty.setData(data2.toArray(array2));
- list.add(outqty);
- }
- map.put("rows",list);
- return R.ok(map);
- }
-
-
- /**
- * 搴撲綅浣跨敤鎯呭喌缁熻
- */
- @GetMapping("/loc/rep")
- public R monitorLocRep(){
- List<Map<String, Object>> pie = new ArrayList<>();
-
- LocChartPie locUseRate = reportQueryMapper.getLocUseRate();
- if(locUseRate!=null) {
- Map<String, Object> map = new HashMap<>();
- map.put("name", "鍦ㄥ簱");
- map.put("value", locUseRate.getFqty());
- pie.add(map);
-
- Map<String, Object> map1 = new HashMap<>();
- map1.put("name", "绌�");
- map1.put("value", locUseRate.getOqty());
- pie.add(map1);
-
- Map<String, Object> map2 = new HashMap<>();
- map2.put("name", "浣跨敤");
- map2.put("value", locUseRate.getUqty());
- pie.add(map2);
-
- Map<String, Object> map3 = new HashMap<>();
- map3.put("name", "绂佺敤");
- map3.put("value", locUseRate.getXqty());
- pie.add(map3);
- }
-
- // 鎬诲簱浣嶆暟
- Integer total = (int) Arith.add(0, locUseRate.getFqty(), locUseRate.getOqty(), locUseRate.getUqty(), locUseRate.getXqty());
- // 浣跨敤涓�
- Integer used = locUseRate.getFqty() + locUseRate.getUqty();
- // 搴撲綅浣跨敤鐜�
- double usedDivides = Arith.divides(3, used, total);
- double usedPr = Arith.multiplys(1, usedDivides, 100);
-
- return R.ok(
- Cools.add("pie", pie)
- .add("stockCunt", locUseRate.getFqty())
- .add("emptyCount", locUseRate.getOqty())
- .add("noneCount", locUseRate.getXqty())
- .add("total", total)
- .add("used", used)
- .add("usedPr", usedPr)
- );
- }
@@ -345,6 +193,194 @@
}
+ /***** 鐢佃APP鐩稿叧鎺ュ彛 ******/
+ @GetMapping("/led/error")
+ public R monitorLedError(@RequestParam("ledId") Integer ledId) {
+ String errorMsg = "";
+ for (LedSlave slave : slaveProperties.getLed()) {
+ if (slave.getStaArr().contains(ledId)) {
+ LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, slave.getId());
+ if (null != ledThread) {
+ errorMsg = ledThread.getErrorMsg().toString();
+ }
+ }
+ }
+ return R.ok().add(errorMsg);
+ }
+ @GetMapping("/line/charts")
+ public R locIoLineCharts(){
+ Map<String,Object> map=new HashMap<String, Object>();
+ List<AxisBean> list = new ArrayList<AxisBean>();
+
+ List<WorkChartAxis> listChart = reportQueryMapper.getChartAxis();
+
+ if(listChart!=null) {
+ ArrayList<Integer> data1 = new ArrayList<Integer>();
+ ArrayList<Integer> data2 = new ArrayList<Integer>();
+
+ SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd");
+ Calendar calendar = Calendar.getInstance();
+ calendar.add(Calendar.DATE, -12);
+ for(int i=0;i<12;i++) {
+ boolean flag = true;
+ calendar.add(Calendar.DATE, 1);
+ String str = sf.format(calendar.getTime());
+ for(WorkChartAxis workChart : listChart) {
+ if(str.equals(workChart.getYmd())) {
+ data1.add(workChart.getInqty());
+ data2.add(workChart.getOutqty());
+ flag = false;
+ break;
+ }
+ }
+ if(flag) {
+ data1.add(0);
+ data2.add(0);
+ }
+ }
+ AxisBean inqty = new AxisBean();
+ inqty.setName("鍏ュ簱鏁伴噺");
+ Integer[] array1 = new Integer[data1.size()];
+ inqty.setData(data1.toArray(array1));
+ list.add(inqty);
+ AxisBean outqty = new AxisBean();
+ outqty.setName("鍑哄簱鏁伴噺");
+ Integer[] array2 = new Integer[data2.size()];
+ outqty.setData(data2.toArray(array2));
+ list.add(outqty);
+ }
+ map.put("rows",list);
+ return R.ok(map);
+ }
+ /**
+ * 搴撲綅浣跨敤鎯呭喌缁熻
+ */
+ @GetMapping("/loc/rep")
+ public R monitorLocRep(){
+ List<Map<String, Object>> pie = new ArrayList<>();
+
+ LocChartPie locUseRate = reportQueryMapper.getLocUseRate();
+ if(locUseRate!=null) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("name", "鍦ㄥ簱");
+ map.put("value", locUseRate.getFqty());
+ pie.add(map);
+
+ Map<String, Object> map1 = new HashMap<>();
+ map1.put("name", "绌�");
+ map1.put("value", locUseRate.getOqty());
+ pie.add(map1);
+
+ Map<String, Object> map2 = new HashMap<>();
+ map2.put("name", "浣跨敤");
+ map2.put("value", locUseRate.getUqty());
+ pie.add(map2);
+
+ Map<String, Object> map3 = new HashMap<>();
+ map3.put("name", "绂佺敤");
+ map3.put("value", locUseRate.getXqty());
+ pie.add(map3);
+ }
+
+ // 鎬诲簱浣嶆暟
+ Integer total = (int) Arith.add(0, locUseRate.getFqty(), locUseRate.getOqty(), locUseRate.getUqty(), locUseRate.getXqty());
+ // 浣跨敤涓�
+ Integer used = locUseRate.getFqty() + locUseRate.getUqty();
+ // 搴撲綅浣跨敤鐜�
+ double usedDivides = Arith.divides(3, used, total);
+ double usedPr = Arith.multiplys(1, usedDivides, 100);
+
+ return R.ok(
+ Cools.add("pie", pie)
+ .add("stockCunt", locUseRate.getFqty())
+ .add("emptyCount", locUseRate.getOqty())
+ .add("noneCount", locUseRate.getXqty())
+ .add("total", total)
+ .add("used", used)
+ .add("usedPr", usedPr)
+ );
+ }
+
+ /**
+ * 鑾峰彇鍏朵粬淇℃伅
+ */
+ @GetMapping("/led")
+ public R monitorLed(@RequestParam("ledId") Integer ledId) {
+ String ledContent = "";
+ List<LedCommand> commandList = null;
+ for (LedSlave slave : slaveProperties.getLed()) {
+ if (slave.getStaArr().contains(ledId)) {
+ LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, slave.getId());
+ if (null != ledThread) {
+ ledContent = ledThread.getStringBuffer().toString();
+ commandList = ledThread.getCommandList();
+ }
+ }
+ }
+ return R.ok().add(commandList);
+ }
+ /**
+ * 鑾峰彇鍏朵粬淇℃伅
+ */
+ @GetMapping("/other")
+ public R monitorOther(@RequestParam("crnId") Integer crnId, @RequestParam("ledId") Integer ledId) {
+ Double xSpeed = 0.0D;
+ Double ySpeed = 0.0D;
+ Double zSpeed = 0.0D;
+ Short forkPos = 1;
+ Double xDistance = 0.0D;
+ Double yDistance = 0.0D;
+ Double xDuration = 0.0D;
+ Double yDuration = 0.0D;
+
+ if (null != crnId) {
+ CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crnId);
+ if (crnThread != null) {
+ CrnProtocol crnProtocol = crnThread.getCrnProtocol();
+ if (crnProtocol != null) {
+ xSpeed = Double.valueOf(crnProtocol.getXSpeed());
+ ySpeed = Double.valueOf(crnProtocol.getYSpeed());
+ zSpeed = Double.valueOf(crnProtocol.getZSpeed());
+ switch (crnProtocol.getForkPos()) {
+ case 0:
+ forkPos = 1;
+ break;
+ case 1:
+ forkPos = 2;
+ break;
+ case 2:
+ forkPos = 0;
+ break;
+ default:
+ forkPos = 1;
+ break;
+ }
+ xDistance = Double.valueOf(crnProtocol.getXDistance());
+ yDistance = Double.valueOf(crnProtocol.getYDistance());
+ xDuration = Double.valueOf(crnProtocol.getXDuration());
+ yDuration = Double.valueOf(crnProtocol.getYDuration());
+ }
+ }
+ }
+
+ // 鑾峰彇杈撻�佺嚎plc绾跨▼
+ LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, ledId);
+ String ledContent = ledThread.getStringBuffer().toString();
+// ledContent = "ask鐨勬ā鍧楄惃婊″ぇ绠椾簡钀ㄦ弧澶т簡\n 鏄獦澧冨埌鍩冨強鍡插鍡瞈n 钀ㄨ揪濮嗘墦寮�钀ㄦ弧澶у嚡鎾掗害褰撳姵钀ㄦ弧澶ц�佸笀";
+
+ return R.ok(
+ Cools.add("xSpeed", Arith.multiplys(1, Math.abs(xSpeed), 1)) // 琛岃蛋閫熷害
+ .add("ySpeed", Arith.multiplys(1, Math.abs(ySpeed), 1)) // 鍗囬檷閫熷害
+ .add("zSpeed", Arith.multiplys(1, Math.abs(zSpeed), 1)) // 鍙夌墮閫熷害
+ .add("forkPos", forkPos) // 鍙夌墮閫熷害
+ .add("xDistance", Arith.multiplys(1, Math.abs(xDistance), 1)) // 绱璧拌璺濈km
+ .add("yDistance", Arith.multiplys(1, Math.abs(yDistance), 1)) // 绱鍗囬檷璺濈km
+ .add("xDuration", Arith.multiplys(1, Math.abs(xDuration), 1)) // 绱璧拌鏃堕暱h
+ .add("yDuration", Arith.multiplys(1, Math.abs(yDuration), 1)) // 绱鍗囬檷鏃堕暱h
+ .add("isShow", !Cools.isEmpty(ledContent)) // 鏄惁鏄剧ず鍐呭
+ .add("content", ledContent) // 鏄剧ず鍐呭
+ );
+ }
}
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index 1e78cad..412c5da 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -556,12 +556,10 @@
headers: {'token': localStorage.getItem('token')},
method: 'POST',
success: function (res) {
- console.log(res);
if (res.code === 200) {
var sites = res.data;
for (var i = 0; i < sites.length; i++) {
var siteEl = $("#site-" + sites[i].siteId);
- console.log(sites[i].siteId)
siteEl.attr("class", "site " + sites[i].siteStatus);
// siteEl.attr("class", "site site-auto-run-id");
if (sites[i].workNo != null && sites[i].workNo > 0) {
@@ -571,7 +569,6 @@
}
if (sites[i].siteId === '16' || sites[i].siteId === '016') {
-
carAnimate(Number(sites[i].siteId), Number(sites[i].nearbySta));
}
}
@@ -595,6 +592,7 @@
if (res.code === 200) {
var crns = res.data;
for (var i = 0; i < crns.length; i++) {
+
var crnEl = $("#crn-" + crns[i].crnId);
crnEl.attr("class", "machine " + crns[i].crnStatus);
var unit = 0;//($('.item').eq(0).width() + 13) / 2;
@@ -606,13 +604,13 @@
// crns[i].bay = 15;
var offSet = 0;
- unit = 60;
+ unit = 31;
offSet = 325;
-
-
if(crns[i].bay === 1){
+
crnEl.animate({left: offSet + 'px'}, 1000);
} else {
+
crnEl.animate({left: (offSet - unit + (crns[i].bay * unit)) + 'px'}, 1000);
}
@@ -706,34 +704,34 @@
if (id === 16 || id === '16' || id === '016') {
switch (target) {
case 1:
- targetTop += 827;
+ targetTop += 619;
break;
case 2:
- targetTop += 765;
+ targetTop += 571;
break;
case 3:
- targetTop += 651;
- break;
- case 4:
- targetTop += 589;
- break;
- case 5:
targetTop += 505;
break;
+ case 4:
+ targetTop += 457;
+ break;
+ case 5:
+ targetTop += 391;
+ break;
case 6:
- targetTop += 443;
+ targetTop += 344;
break;
case 7:
- targetTop += 362;
+ targetTop += 278;
break;
case 8:
- targetTop += 297;
+ targetTop += 228;
break;
case 9:
- targetTop += 243;
+ targetTop += 183;
break;
- case 10:
- targetTop += 129;
+ case 15:
+ targetTop += 95;
break;
default:
return;
--
Gitblit v1.9.1