From ab08f2e28057e226ba42b3268ed36ac489cef34e Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期二, 24 三月 2026 00:59:59 +0800
Subject: [PATCH] 大屏接口
---
src/main/java/com/zy/asrs/controller/MonitorController.java | 274 ++++++++++++++++++++++++------------------------------
1 files changed, 122 insertions(+), 152 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MonitorController.java b/src/main/java/com/zy/asrs/controller/MonitorController.java
index 2d839dd..fd1e43a 100644
--- a/src/main/java/com/zy/asrs/controller/MonitorController.java
+++ b/src/main/java/com/zy/asrs/controller/MonitorController.java
@@ -3,20 +3,34 @@
import com.core.common.Arith;
import com.core.common.Cools;
import com.core.common.R;
-import com.zy.asrs.domain.dto.AxisBean;
-import com.zy.asrs.domain.dto.WorkChartAxis;
-import com.zy.asrs.domain.vo.LocChartPie;
-import com.zy.asrs.mapper.ReportQueryMapper;
+import com.zy.asrs.entity.BasCrnError;
+import com.zy.asrs.mapper.BasCrnErrorMapper;
+import com.zy.asrs.service.MonitorReportService;
+import com.zy.common.model.annotations.RateLimit;
import com.zy.common.service.CommonService;
import com.zy.core.CrnThread;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.SlaveType;
+import com.zy.core.model.CrnSlave;
+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 com.zy.core.thread.SiemensCrnThread;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
-import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
/**
* Created by vincent on 2020/11/16
@@ -28,7 +42,11 @@
private static final String[] WEEK = {"鏄熸湡鏃�","鏄熸湡涓�","鏄熸湡浜�","鏄熸湡涓�","鏄熸湡鍥�","鏄熸湡浜�","鏄熸湡鍏�"};
@Autowired
- private ReportQueryMapper reportQueryMapper;
+ private MonitorReportService monitorReportService;
+ @Autowired
+ private SlaveProperties slaveProperties;
+ @Autowired
+ private BasCrnErrorMapper basCrnErrorMapper;
/**
* 鑾峰彇褰撳墠鏃堕棿
@@ -53,7 +71,17 @@
* 鑾峰彇鍏朵粬淇℃伅
*/
@GetMapping("/other")
- public R monitorOther(@RequestParam("crnId") Integer crnId) {
+ public R monitorOther(@RequestParam("crnId") Integer crnId, @RequestParam("ledId") Integer sta) {
+ Integer ledId = 0;
+ for (LedSlave led : slaveProperties.getLed()) {
+ for (Integer staNo : led.getStaArr()) {
+ if (staNo.equals(sta)) {
+ ledId = led.getId();
+ break;
+ }
+ }
+ }
+
Double xSpeed = 0.0D;
Double ySpeed = 0.0D;
Double zSpeed = 0.0D;
@@ -76,10 +104,10 @@
forkPos = 1;
break;
case 1:
- forkPos = 0;
+ forkPos = 2;
break;
case 2:
- forkPos = 2;
+ forkPos = 0;
break;
default:
forkPos = 1;
@@ -93,178 +121,120 @@
}
}
-// int totalWrk = reportQueryMapper.getTotalWrkByCrnId(crnId);
-// int totalLoc = reportQueryMapper.getTotalLocByCrnId();
+ // 鑾峰彇杈撻�佺嚎plc绾跨▼
+ LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, ledId);
+ String ledContent = Cools.isEmpty(ledThread) ? "" : ledThread.getWorkNos().toString();
+// ledContent = "ask鐨勬ā鍧楄惃婊″ぇ绠椾簡钀ㄦ弧澶т簡\n 鏄獦澧冨埌鍩冨強鍡插鍡瞈n 钀ㄨ揪濮嗘墦寮�钀ㄦ弧澶у嚡鎾掗害褰撳姵钀ㄦ弧澶ц�佸笀";
return R.ok(
- Cools.add("xSpeed", xSpeed) // 琛岃蛋閫熷害
- .add("ySpeed", ySpeed) // 鍗囬檷閫熷害
- .add("zSpeed", zSpeed) // 鍙夌墮閫熷害
+ 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("totalLoc", totalLoc) // 鎬诲簱浣嶆暟
-// .add("totalWrk", totalWrk) // 鎬讳换鍔℃暟
- .add("xDistance", xDistance) // 绱璧拌璺濈km
- .add("yDistance", yDistance) // 绱鍗囬檷璺濈km
- .add("xDuration", xDuration) // 绱璧拌鏃堕暱h
- .add("yDuration", yDuration) // 绱鍗囬檷鏃堕暱h
+ .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) // 鏄剧ず鍐呭
);
}
/**
* 鍏ュ簱鎶ヨ〃 -- 鎶樼嚎鍥�
*/
+// @RateLimit(2)
@GetMapping("/pakin/rep")
public R monitorPakinRep(){
- // 鍏ュ簱
- List<Map<String, Object>> pakinRep = reportQueryMapper.queryPakinRep();
- for (Map<String, Object> map : pakinRep) {
- if (map.get("node")!=null) {
- map.put("node", String.valueOf(map.get("node")).substring(5, 10));
- }
- }
- // 鍑哄簱
- List<Map<String, Object>> pakoutRep = reportQueryMapper.queryPakinRep();
- return R.ok(pakinRep);
+ return R.ok(monitorReportService.getPakinRepData());
}
@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);
+ return R.ok(monitorReportService.getLocIoLineChartsData());
}
/**
* 搴撲綅浣跨敤鎯呭喌缁熻
*/
+// 棰勭暀闄愭祦閰嶇疆锛�60锛�
@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)
- );
+ return R.ok(monitorReportService.getLocRepData());
}
+ /**
+ * 搴撲綅鐑姏鍥炬帓鍙峰垪琛�
+ */
+ @GetMapping("/loc/map/rows")
+ public R monitorLocMapRows() {
+ return R.ok(monitorReportService.getLocMapRows());
+ }
+ /**
+ * 搴撲綅鐑姏鍥惧崟鎺掓暟鎹�
+ */
+ @GetMapping("/loc/map")
+ public R monitorLocMap(@RequestParam(defaultValue = "1") Integer row) {
+ return R.ok(monitorReportService.getLocMapData(row));
+ }
+ /**
+ * 鑾峰彇鍏朵粬淇℃伅
+ */
+ @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("/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("/crn/error")
+ public R crnError() {
+ ArrayList<HashMap<String, Object>> list = new ArrayList<>();
+ for (CrnSlave slave : slaveProperties.getCrn()) {
+ SiemensCrnThread crnThread = (SiemensCrnThread) SlaveConnection.get(SlaveType.Crn, slave.getId());
+ CrnProtocol crnProtocol = crnThread.getCrnProtocol();
+ if (crnProtocol.getAlarm() > 0) {
+ BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm());
+ String errorName = crnError == null ? String.valueOf(crnProtocol.getAlarm()) : crnError.getErrName();
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ HashMap<String, Object> data = new HashMap<>();
+ data.put("crnNo", slave.getId());
+ data.put("errorName", errorName);
+ list.add(data);
+ }
+ }
+ return R.ok().add(list);
+ }
/**
* 鑷姩琛ラ浂
--
Gitblit v1.9.1