From be322af3013501b822e4dab60ca348cc3db8bcbc Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期日, 21 十二月 2025 18:51:52 +0800
Subject: [PATCH] 济南二机床wcs功能调试完善

---
 src/main/java/com/zy/controller/MonitorController.java |   60 +++++++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 41 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/zy/controller/MonitorController.java b/src/main/java/com/zy/controller/MonitorController.java
index 652a07d..532e1ae 100644
--- a/src/main/java/com/zy/controller/MonitorController.java
+++ b/src/main/java/com/zy/controller/MonitorController.java
@@ -1,8 +1,10 @@
 package com.zy.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.entity.LocDetl;
 import com.zy.entity.dto.AxisBean;
 import com.zy.entity.dto.WorkChartAxis;
 import com.zy.entity.vo.LocChartPie;
@@ -16,6 +18,7 @@
 import com.zy.core.model.protocol.CrnProtocol;
 import com.zy.core.properties.SlaveProperties;
 import com.zy.core.thread.LedThread;
+import com.zy.service.LocDetlService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -38,6 +41,16 @@
     private ReportQueryMapper reportQueryMapper;
     @Autowired
     private SlaveProperties slaveProperties;
+    @Autowired
+    private LocDetlService locDetlService;
+
+    @GetMapping(value = "/locDetl/pda/statisticalModel")
+    public R statisticalModel() {
+        EntityWrapper<LocDetl> locDetlEntityWrapper = new EntityWrapper<>();
+        locDetlEntityWrapper.setSqlSelect("model,COUNT(*) as modelCount").groupBy("model");
+       List<Map<String, Object>>  selectMap = locDetlService.selectMaps(locDetlEntityWrapper);
+        return R.ok(selectMap);
+    }
 
     /**
      * 鑾峰彇褰撳墠鏃堕棿
@@ -62,13 +75,16 @@
      * 鑾峰彇鍏朵粬淇℃伅
      */
     @GetMapping("/other")
-    public R monitorOther(@RequestParam("crnId") Integer crnId, @RequestParam("ledId") Integer sta) {
+    public R monitorOther(@RequestParam("crnId") Integer crnId, @RequestParam("ledId") String ledIdString) {
         Integer ledId = 0;
-        for (LedSlave led : slaveProperties.getLed()) {
-            for (Integer staNo : led.getStaArr()) {
-                if (staNo.equals(sta)) {
-                    ledId = led.getId();
-                    break;
+        String[] ledIds = ledIdString.split(",");
+        for (String id : ledIds) {
+            for (LedSlave led : slaveProperties.getLed()) {
+                for (Integer staNo : led.getStaArr()) {
+                    if (staNo.equals(Integer.parseInt(id))) {
+                        ledId = led.getId();
+                        break;
+                    }
                 }
             }
         }
@@ -248,15 +264,18 @@
      * 鑾峰彇鍏朵粬淇℃伅
      */
     @GetMapping("/led")
-    public R monitorLed(@RequestParam("ledId") Integer ledId) {
+    public R monitorLed(@RequestParam("ledId") String ledIdString) {
+        String[] ledIds = ledIdString.split(",");
         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();
+        for(String ledId: ledIds) {
+            for (LedSlave slave : slaveProperties.getLed()) {
+                if (slave.getStaArr().contains(Integer.parseInt(ledId))) {
+                    LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, slave.getId());
+                    if (null != ledThread) {
+                        ledContent = ledThread.getStringBuffer().toString();
+                        commandList = ledThread.getCommandList();
+                    }
                 }
             }
         }
@@ -267,13 +286,16 @@
      * 寮傚父閫氱煡
      */
     @GetMapping("/led/error")
-    public R monitorLedError(@RequestParam("ledId") Integer ledId) {
+    public R monitorLedError(@RequestParam("ledId") String ledIdString) {
         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();
+        String[] ledIds = ledIdString.split(",");
+        for(String ledId: ledIds) {
+            for (LedSlave slave : slaveProperties.getLed()) {
+                if (slave.getStaArr().contains(Integer.parseInt(ledId))) {
+                    LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, slave.getId());
+                    if (null != ledThread) {
+                        errorMsg = ledThread.getErrorMsg().toString();
+                    }
                 }
             }
         }

--
Gitblit v1.9.1