From 802c12dcbc63ee1662c15723d27c8fc1f4fd36e6 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期六, 21 十二月 2024 08:42:56 +0800
Subject: [PATCH] #拐点算法优化
---
src/main/java/com/zy/asrs/controller/MonitorController.java | 154 +++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 147 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MonitorController.java b/src/main/java/com/zy/asrs/controller/MonitorController.java
index a3b2ccc..8751548 100644
--- a/src/main/java/com/zy/asrs/controller/MonitorController.java
+++ b/src/main/java/com/zy/asrs/controller/MonitorController.java
@@ -6,21 +6,28 @@
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.BasLiftOptMapper;
+import com.zy.asrs.mapper.BasShuttleOptMapper;
import com.zy.asrs.mapper.ReportQueryMapper;
import com.zy.common.service.CommonService;
import com.zy.core.CrnThread;
import com.zy.core.cache.SlaveConnection;
+import com.zy.core.enums.ShuttleProtocolStatusType;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.LedSlave;
+import com.zy.core.model.LiftSlave;
+import com.zy.core.model.ShuttleSlave;
import com.zy.core.model.command.LedCommand;
import com.zy.core.model.protocol.CrnProtocol;
+import com.zy.core.model.protocol.LiftProtocol;
+import com.zy.core.model.protocol.NyShuttleProtocol;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.thread.LedThread;
+import com.zy.core.thread.LiftThread;
+import com.zy.core.thread.NyShuttleThread;
+import lombok.Data;
import org.springframework.beans.factory.annotation.Autowired;
-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 org.springframework.web.bind.annotation.*;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -38,6 +45,10 @@
private ReportQueryMapper reportQueryMapper;
@Autowired
private SlaveProperties slaveProperties;
+ @Autowired
+ private BasLiftOptMapper basLiftOptMapper;
+ @Autowired
+ private BasShuttleOptMapper basShuttleOptMapper;
/**
* 鑾峰彇褰撳墠鏃堕棿
@@ -62,7 +73,17 @@
* 鑾峰彇鍏朵粬淇℃伅
*/
@GetMapping("/other")
- public R monitorOther(@RequestParam("crnId") Integer crnId, @RequestParam("ledId") Integer ledId) {
+ 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;
@@ -104,8 +125,16 @@
// 鑾峰彇杈撻�佺嚎plc绾跨▼
LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, ledId);
- String ledContent = ledThread.getWorkNos().toString();
-// ledContent = "ask鐨勬ā鍧楄惃婊″ぇ绠椾簡钀ㄦ弧澶т簡\n 鏄獦澧冨埌鍩冨強鍡插鍡瞈n 钀ㄨ揪濮嗘墦寮�钀ㄦ弧澶у嚡鎾掗害褰撳姵钀ㄦ弧澶ц�佸笀";
+ String ledContent = ledThread==null?"":ledThread.getWorkNos().toString();
+ if (!(xSpeed<127)){
+ xSpeed=0.0;
+ }
+ if (!(ySpeed<127)){
+ ySpeed=0.0;
+ }
+ if (!(zSpeed<127)){
+ zSpeed=0.0;
+ }
return R.ok(
Cools.add("xSpeed", Arith.multiplys(1, Math.abs(xSpeed), 1)) // 琛岃蛋閫熷害
@@ -276,9 +305,120 @@
return R.ok().add(errorMsg);
}
+ /**
+ * 璁惧寮傚父閫氱煡
+ */
+ @GetMapping("/device/error")
+ public R monitorDeviceError() {
+ ArrayList<HashMap<String, Object>> list = new ArrayList<>();
+ for (ShuttleSlave slave : slaveProperties.getShuttle()) {
+ NyShuttleThread shuttleThread = (NyShuttleThread) SlaveConnection.get(SlaveType.Shuttle, slave.getId());
+ NyShuttleProtocol shuttleProtocol = shuttleThread.getShuttleProtocol();
+ if (shuttleProtocol == null) {
+ continue;
+ }
+ HashMap<String, Object> map = new HashMap<>();
+ if (shuttleProtocol.getProtocolStatusType().equals(ShuttleProtocolStatusType.OFFLINE)) {
+ if (System.currentTimeMillis() - shuttleProtocol.getLastOnlineTime() > 1000 * 60 * 5) {
+ //绂荤嚎瓒呰繃浜斿垎閽�
+ //璁惧绂荤嚎涓�
+ map.put("deviceNo", shuttleProtocol.getShuttleNo());//璁惧鍙�-灏忚溅鍙�
+ map.put("errorMsg", "璁惧绂荤嚎");//寮傚父淇℃伅
+ map.put("device", "鍥涘悜杞�");//寮傚父淇℃伅
+ list.add(map);
+ }
+ }
+ if (shuttleProtocol.getErrState() == 1) {
+ //鏁呴殰涓�
+ map.put("deviceNo", shuttleProtocol.getShuttleNo());//璁惧鍙�-灏忚溅鍙�
+ map.put("errorMsg", shuttleProtocol.getErrCode$());//寮傚父淇℃伅
+ map.put("device", "鍥涘悜杞�");//寮傚父淇℃伅
+ list.add(map);
+ }
+ }
+ for (LiftSlave slave : slaveProperties.getLift()) {
+ LiftThread liftThread = (LiftThread) SlaveConnection.get(SlaveType.Lift, slave.getId());
+ LiftProtocol liftProtocol = liftThread.getLiftProtocol();
+ if (liftProtocol == null) {
+ continue;
+ }
+ if (liftProtocol.getDeviceError()) {
+ //鏁呴殰涓�
+ StringBuffer buffer = new StringBuffer();
+ if (liftProtocol.getFrontOverrun()) {
+ buffer.append("鍓嶈秴闄�");
+ }
+ if (liftProtocol.getBackOverrun()) {
+ buffer.append("鍚庤秴闄�");
+ }
+ if (liftProtocol.getLeftOverrun()) {
+ buffer.append("宸﹁秴闄�");
+ }
+ if (liftProtocol.getRightOverrun()) {
+ buffer.append("鍙宠秴闄�");
+ }
+ if (liftProtocol.getOverHeight()) {
+ buffer.append("瓒呴珮");
+ }
+ if (liftProtocol.getOverWeight()) {
+ buffer.append("瓒呴噸");
+ }
+
+ if (liftProtocol.getErrorCode() > 0) {
+ buffer.append(liftProtocol.getErrCode$());
+ }
+
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("deviceNo", liftProtocol.getLiftNo());//璁惧鍙�-鎻愬崌鏈哄彿
+ map.put("errorMsg", buffer.toString());//寮傚父淇℃伅
+ map.put("device", "鎻愬崌鏈�");//寮傚父淇℃伅
+ list.add(map);
+ }
+ }
+
+ return R.ok().add(list);
+ }
+
+ /**
+ * 鑾峰彇璁惧姣忓ぉ杩愯缁熻
+ */
+ @GetMapping("/deviceRunStatistic")
+ public R deviceRunStatistic() {
+ //鑾峰彇鎻愬崌鏈鸿繍琛屾暟鎹�
+ List<Map<String, Object>> liftList = basLiftOptMapper.selectRunStatistic();
+ //鑾峰彇灏忚溅杩愯鏁版嵁
+ List<Map<String, Object>> shuttleList = basShuttleOptMapper.selectRunStatistic();
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("lift", liftList);
+ map.put("shuttle", shuttleList);
+ return R.ok().add(map);
+ }
+
+ /**
+ * 鑾峰彇璁惧杩愯寮傚父缁熻
+ */
+ @GetMapping("/deviceRunErrorStatistic/{type}")
+ public R deviceRunErrorStatistic(@PathVariable("type") String type) {
+ int time = 1;//榛樿1澶�
+ if (type.equals("day")) {
+ time = 1;
+ } else if (type.equals("week")) {
+ time = 7;
+ } else if (type.equals("month")) {
+ time = 30;
+ }
+ //鑾峰彇鎻愬崌鏈鸿繍琛屽紓甯告暟鎹�
+ List<Map<String, Object>> liftList = basLiftOptMapper.selectRunErrorStatistic(time);
+ //鑾峰彇灏忚溅杩愯寮傚父鏁版嵁
+ List<Map<String, Object>> shuttleList = basShuttleOptMapper.selectRunErrorStatistic(time);
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("lift", liftList);
+ map.put("shuttle", shuttleList);
+ return R.ok().add(map);
+ }
--
Gitblit v1.9.1