From 0360efd088ad32a7a254e0ea7d43325961ad6ea3 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期二, 10 三月 2026 15:07:31 +0800
Subject: [PATCH] 设置电视机ip
---
src/main/java/com/zy/asrs/controller/MonitorController.java | 78 ++++++++++++++++++---------------------
1 files changed, 36 insertions(+), 42 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MonitorController.java b/src/main/java/com/zy/asrs/controller/MonitorController.java
index 35e0eae..39bfd98 100644
--- a/src/main/java/com/zy/asrs/controller/MonitorController.java
+++ b/src/main/java/com/zy/asrs/controller/MonitorController.java
@@ -1,21 +1,29 @@
package com.zy.asrs.controller;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
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.entity.BasCrnError;
+import com.zy.asrs.entity.LocMast;
+import com.zy.asrs.mapper.BasCrnErrorMapper;
import com.zy.asrs.mapper.ReportQueryMapper;
+import com.zy.asrs.service.LocMastService;
+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.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -38,6 +46,10 @@
private ReportQueryMapper reportQueryMapper;
@Autowired
private SlaveProperties slaveProperties;
+ @Autowired
+ private BasCrnErrorMapper basCrnErrorMapper;
+ @Autowired
+ private LocMastService locMastService;
/**
* 鑾峰彇褰撳墠鏃堕棿
@@ -134,6 +146,7 @@
/**
* 鍏ュ簱鎶ヨ〃 -- 鎶樼嚎鍥�
*/
+// @RateLimit(2)
@GetMapping("/pakin/rep")
public R monitorPakinRep(){
// 鍏ュ簱
@@ -198,11 +211,13 @@
/**
* 搴撲綅浣跨敤鎯呭喌缁熻
*/
+// @RateLimit(60)
@GetMapping("/loc/rep")
public R monitorLocRep(){
List<Map<String, Object>> pie = new ArrayList<>();
LocChartPie locUseRate = reportQueryMapper.getLocUseRate();
+ int i = locMastService.selectCount(new EntityWrapper<LocMast>().eq("loc_sts", "D"));
if(locUseRate!=null) {
Map<String, Object> map = new HashMap<>();
map.put("name", "鍦ㄥ簱");
@@ -220,8 +235,8 @@
pie.add(map2);
Map<String, Object> map3 = new HashMap<>();
- map3.put("name", "绂佺敤");
- map3.put("value", locUseRate.getXqty());
+ map3.put("name", "绌烘澘");
+ map3.put("value", i);
pie.add(map3);
}
@@ -235,9 +250,9 @@
return R.ok(
Cools.add("pie", pie)
- .add("stockCunt", locUseRate.getFqty())
+ .add("stockCunt", locUseRate.getFqty() - i)
.add("emptyCount", locUseRate.getOqty())
- .add("noneCount", locUseRate.getXqty())
+ .add("noneCount", i)
.add("total", total)
.add("used", used)
.add("usedPr", usedPr)
@@ -280,46 +295,25 @@
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