From fcb71b8fc63f74cd00d3faa76c73f4c5566ee352 Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期三, 07 五月 2025 23:23:09 +0800
Subject: [PATCH] 解决提升机在本层，而没有锁提升机的问题
---
src/main/java/com/zy/asrs/controller/TVController.java | 60 +++++++++++++++++++++++++++---------------------------------
1 files changed, 27 insertions(+), 33 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/TVController.java b/src/main/java/com/zy/asrs/controller/TVController.java
index 1b8e616..87e341d 100644
--- a/src/main/java/com/zy/asrs/controller/TVController.java
+++ b/src/main/java/com/zy/asrs/controller/TVController.java
@@ -1,37 +1,25 @@
package com.zy.asrs.controller;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-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.dto.LocChartPie;
-import com.zy.asrs.entity.BasDevp;
-import com.zy.asrs.entity.BasShuttle;
+import com.zy.asrs.domain.dto.WorkChartAxis;
import com.zy.asrs.entity.BasShuttleErr;
-import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.mapper.ReportQueryMapper;
import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.BasShuttleErrService;
import com.zy.asrs.service.BasShuttleService;
import com.zy.asrs.service.WrkMastService;
-import com.zy.common.model.MatDto;
-import com.zy.common.model.SearchLocParam;
import com.zy.common.service.CommonService;
-import com.zy.common.utils.HttpHandler;
import com.zy.common.utils.RedisUtil;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.LedSlave;
import com.zy.core.model.ShuttleSlave;
-import com.zy.core.model.command.LedCommand;
import com.zy.core.model.protocol.ShuttleProtocol;
import com.zy.core.properties.SlaveProperties;
-import com.zy.core.thread.LedThread;
import com.zy.core.thread.ShuttleThread;
import com.zy.core.thread.impl.NormalLedThread;
import lombok.extern.slf4j.Slf4j;
@@ -42,7 +30,6 @@
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
-import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -231,30 +218,37 @@
*/
@GetMapping("/led")
public R monitorLed(@RequestParam("ledId") Integer ledId) {
- int dev_no = 1012;
+ int dev_no1 = 1011;
+ int dev_no2 = 1012;
+ int dev_no3 = 1015;
if (ledId == 1) {
- dev_no = 1012;
+ dev_no1 = 1011;
+ dev_no2 = 1012;
} else if (ledId == 2) {
- dev_no = 1014;
+ dev_no1 = 1013;
+ dev_no2 = 1014;
+ dev_no3 = 1015;
} else if (ledId == 3) {
- dev_no = 1021;
+ dev_no1 = 1021;
+ dev_no2 = 1022;
+ dev_no3 = 1023;
} else if (ledId == 4) {
- dev_no = 1024;
+ dev_no1 = 1024;
+ dev_no2 = 1025;
+ dev_no3 = 1026;
}
- BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", dev_no));
- if (Cools.isEmpty(basDevp)) {
- return R.ok();
- }
- if (Cools.isEmpty(basDevp.getWrkNo1())) {
- return R.ok();
- }
- if (basDevp.getWrkNo() == null || basDevp.getWrkNo() == 0) {
- return R.ok();
- }
- Object o = redisUtil.get("LED_" + dev_no);
- if (o != null) {
- log.info("鐢佃鏈烘樉绀猴細{}",JSONObject.toJSONString(o));
- return R.ok().add(o);
+ Object o1 = redisUtil.get("LED_" + dev_no1);
+ Object o2 = redisUtil.get("LED_" + dev_no2);
+ Object o3 = redisUtil.get("LED_" + dev_no3);
+ if (o1 != null) {
+ //log.info("鐢佃鏈烘樉绀�1锛歿}", JSONObject.toJSONString(o1));
+ return R.ok().add(o1);
+ } else if (o2 != null) {
+ //log.info("鐢佃鏈烘樉绀�2锛歿}", JSONObject.toJSONString(o2));
+ return R.ok().add(o2);
+ } else if (o3 != null) {
+ //log.info("鐢佃鏈烘樉绀�3锛歿}", JSONObject.toJSONString(o3));
+ return R.ok().add(o3);
}
return R.ok();
--
Gitblit v1.9.1