From 13f3721a678782cfa042acca5208644e8f32dcfb Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 14 四月 2025 16:55:26 +0800
Subject: [PATCH] 界面翻译为俄语
---
src/main/java/com/zy/asrs/controller/MonitorController.java | 70 ++++++++++++++++++++++++++++++----
1 files changed, 61 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MonitorController.java b/src/main/java/com/zy/asrs/controller/MonitorController.java
index 27c8c85..da8ac02 100644
--- a/src/main/java/com/zy/asrs/controller/MonitorController.java
+++ b/src/main/java/com/zy/asrs/controller/MonitorController.java
@@ -7,11 +7,15 @@
import com.zy.asrs.domain.dto.WorkChartAxis;
import com.zy.asrs.domain.vo.LocChartPie;
import com.zy.asrs.mapper.ReportQueryMapper;
+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.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 +37,8 @@
@Autowired
private ReportQueryMapper reportQueryMapper;
+ @Autowired
+ private SlaveProperties slaveProperties;
/**
* 鑾峰彇褰撳墠鏃堕棿
@@ -57,7 +63,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;
@@ -98,8 +114,8 @@
}
// 鑾峰彇杈撻�佺嚎plc绾跨▼
- LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, crnId);
- String ledContent = ledThread.getStringBuffer().toString();
+ LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, ledId);
+ String ledContent = Cools.isEmpty(ledThread) ? "" : ledThread.getWorkNos().toString();
// ledContent = "ask鐨勬ā鍧楄惃婊″ぇ绠椾簡钀ㄦ弧澶т簡\n 鏄獦澧冨埌鍩冨強鍡插鍡瞈n 钀ㄨ揪濮嗘墦寮�钀ㄦ弧澶у嚡鎾掗害褰撳姵钀ㄦ弧澶ц�佸笀";
return R.ok(
@@ -119,6 +135,7 @@
/**
* 鍏ュ簱鎶ヨ〃 -- 鎶樼嚎鍥�
*/
+ @RateLimit(2)
@GetMapping("/pakin/rep")
public R monitorPakinRep(){
// 鍏ュ簱
@@ -165,12 +182,12 @@
}
}
AxisBean inqty = new AxisBean();
- inqty.setName("鍏ュ簱鏁伴噺");
+ inqty.setName("袣芯谢懈褔械褋褌胁芯 锌芯褋褌褍锌邪褞褖懈褏 褌芯胁邪褉芯胁");
Integer[] array1 = new Integer[data1.size()];
inqty.setData(data1.toArray(array1));
list.add(inqty);
AxisBean outqty = new AxisBean();
- outqty.setName("鍑哄簱鏁伴噺");
+ outqty.setName("袣芯谢懈褔械褋褌胁芯 懈褋褏芯写褟褖懈褏 褌芯胁邪褉芯胁");
Integer[] array2 = new Integer[data2.size()];
outqty.setData(data2.toArray(array2));
list.add(outqty);
@@ -183,6 +200,7 @@
/**
* 搴撲綅浣跨敤鎯呭喌缁熻
*/
+ @RateLimit(2)
@GetMapping("/loc/rep")
public R monitorLocRep(){
List<Map<String, Object>> pie = new ArrayList<>();
@@ -190,22 +208,22 @@
LocChartPie locUseRate = reportQueryMapper.getLocUseRate();
if(locUseRate!=null) {
Map<String, Object> map = new HashMap<>();
- map.put("name", "鍦ㄥ簱");
+ map.put("name", "袧邪 褋泻谢邪写械");
map.put("value", locUseRate.getFqty());
pie.add(map);
Map<String, Object> map1 = new HashMap<>();
- map1.put("name", "绌�");
+ map1.put("name", "袩褍褋褌褘械 屑械褋褌邪");
map1.put("value", locUseRate.getOqty());
pie.add(map1);
Map<String, Object> map2 = new HashMap<>();
- map2.put("name", "浣跨敤");
+ map2.put("name", "袠褋锌芯谢褜蟹芯胁邪褌褜");
map2.put("value", locUseRate.getUqty());
pie.add(map2);
Map<String, Object> map3 = new HashMap<>();
- map3.put("name", "绂佺敤");
+ map3.put("name", "袟邪斜谢芯泻懈褉芯胁邪薪芯");
map3.put("value", locUseRate.getXqty());
pie.add(map3);
}
@@ -229,7 +247,41 @@
);
}
+ /**
+ * 鑾峰彇鍏朵粬淇℃伅
+ */
+ @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);
+ }
--
Gitblit v1.9.1