From 217fc3ea29c4e80e845df72c941ec9a2219af5dd Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期三, 17 九月 2025 10:21:36 +0800
Subject: [PATCH] 记录输送线异常日志
---
src/main/java/com/zy/controller/ConsoleController.java | 43 +++++++++++++++++++++++++++++--------------
1 files changed, 29 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/controller/ConsoleController.java b/src/main/java/com/zy/controller/ConsoleController.java
index 57ec3ec..ba521d3 100644
--- a/src/main/java/com/zy/controller/ConsoleController.java
+++ b/src/main/java/com/zy/controller/ConsoleController.java
@@ -8,19 +8,6 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
-import com.zy.enums.CrnStatusType;
-import com.zy.enums.SiteStatusType;
-import com.zy.entity.param.SystemSwitchParam;
-import com.zy.entity.vo.*;
-import com.zy.entity.BasCrnError;
-import com.zy.entity.BasDevp;
-import com.zy.entity.BasRgv;
-import com.zy.entity.WrkMast;
-import com.zy.mapper.BasCrnErrorMapper;
-import com.zy.mapper.LocMastMapper;
-import com.zy.service.BasDevpService;
-import com.zy.service.BasRgvService;
-import com.zy.service.WrkMastService;
import com.zy.common.CodeRes;
import com.zy.core.CrnThread;
import com.zy.core.DevpThread;
@@ -31,15 +18,32 @@
import com.zy.core.enums.SlaveType;
import com.zy.core.model.CrnSlave;
import com.zy.core.model.DevpSlave;
+import com.zy.core.model.LedSlave;
import com.zy.core.model.protocol.CrnProtocol;
import com.zy.core.model.protocol.StaProtocol;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.properties.SystemProperties;
-import com.zy.core.thread.*;
+import com.zy.core.thread.BarcodeThread;
+import com.zy.core.thread.ScaleThread;
+import com.zy.core.thread.SiemensCrnThread;
+import com.zy.entity.BasCrnError;
+import com.zy.entity.BasDevp;
+import com.zy.entity.BasRgv;
+import com.zy.entity.WrkMast;
+import com.zy.entity.param.SystemSwitchParam;
+import com.zy.entity.vo.*;
+import com.zy.enums.CrnStatusType;
+import com.zy.enums.SiteStatusType;
+import com.zy.mapper.BasCrnErrorMapper;
+import com.zy.mapper.LocMastMapper;
+import com.zy.service.BasDevpService;
+import com.zy.service.BasRgvService;
+import com.zy.service.WrkMastService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletRequest;
import java.util.*;
/**
@@ -316,4 +320,15 @@
return R.ok().add(JSON.toJSONString(jsonObjects));
}
+ @GetMapping("/getLedInfos")
+ public R getLedInfos(HttpServletRequest request) {
+ String remoteAddr = request.getRemoteAddr();
+ for (LedSlave slave : slaveProperties.getLed()) {
+ if (slave.getIp().equals(remoteAddr)) {
+ return R.ok().add(slave);
+ }
+ }
+ return R.ok();
+ }
+
}
--
Gitblit v1.9.1