现场测试硬件修改

ruoyi-admin/src/main/java/com/ruoyi/init/StartService.java

@@ -32,8 +32,8 @@ public class StartService implements CommandLineRunner {
     private AutoTranSitTask autoTranSitTask;
     @Autowired
     private AutoRfidReaderTask autoRfidReaderTask;
-    @Autowired
-    private AutoButtonBoxTask autoButtonBoxTask;
+//    @Autowired
+//    private AutoButtonBoxTask autoButtonBoxTask;
     @Autowired
     private IBaseLocationInfoService baseLocationInfoService;
 
@@ -83,9 +83,9 @@ public class StartService implements CommandLineRunner {
      * 1.人工卸完货之后按下冲边按钮，触发冲边搬运任务
      * 2.人工卸完货之后按下硫化按钮，触发硫化搬运任务
      */
-    public void autoButtonBoxTask() {
-        autoButtonBoxTask.run();
-    }
+//    public void autoButtonBoxTask() {
+//        autoButtonBoxTask.run();
+//    }
 
     /**
      * 空托盘入库测试

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warewms/test/AutoDoorTestController.java

@@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.RestController;
 public class AutoDoorTestController {
 
 
-    @Autowired
+    @Autowired(required = false)
     private AutoDoorClient autoDoorClient;
 
     /**

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warewms/test/ButtonBoxTestController.java

@@ -4,6 +4,7 @@ import com.ruoyi.hard.modbus.tcp.ButtonBoxClient;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -18,7 +19,7 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/api/btnBox")
 public class ButtonBoxTestController {
 
-    @Autowired
+    @Autowired(required = false)
     private ButtonBoxClient buttonBoxClient;
 
     /**

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warewms/test/RfidReaderTestController.java

@@ -21,7 +21,7 @@ import java.util.List;
 public class RfidReaderTestController {
 
 
-    @Autowired
+    @Autowired(required = false)
     private RFIDReaderClient rfidReaderClient;
 
     /**

warewms-ams/src/main/java/com/ruoyi/ams/agv/ndc/thread/AutoButtonBoxTask.java

@@ -18,7 +18,7 @@ import java.util.List;
 @Service
 public class AutoButtonBoxTask {
 
-    @Autowired
+    @Autowired(required = false)
     private ButtonBoxClient buttonBoxClient;
     @Autowired
     private IBusinessService businessService;

warewms-hard/src/main/java/com/ruoyi/hard/modbus/tcp/AutoDoorClient.java

@@ -5,6 +5,7 @@ import com.jwk.spring.boot.modbus4j.ModbusMasterUtil;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.serotonin.modbus4j.msg.ReadResponse;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
 
 import static com.ruoyi.hard.modbus.tcp.AutoDoorClient.AUTOMATIC_DOOR_CODE.*;
@@ -24,12 +25,14 @@ public class AutoDoorClient {
      * 自动门（靠马路）
      */
     @Autowired(required = false)
+    @Qualifier("modbusTcpMasterTemplateFirst")
     private ModbusTcpMasterTemplate modbusTcpMasterTemplateFirst;
 
     /**
      * 自动门
      */
     @Autowired(required = false)
+    @Qualifier("modbusTcpMasterTemplateSecond")
     private ModbusTcpMasterTemplate modbusTcpMasterTemplateSecond;
 
     /**

warewms-hard/src/main/java/com/ruoyi/hard/modbus/tcp/ButtonBoxClient.java

@@ -4,6 +4,7 @@ import com.jwk.spring.boot.autoconfigure.ModbusTcpMasterTemplate;
 import com.jwk.spring.boot.modbus4j.ModbusMasterUtil;
 import com.serotonin.modbus4j.msg.ReadResponse;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
 
 import static com.ruoyi.hard.modbus.tcp.ButtonBoxClient.BUTTON_BOX_CODE.*;
@@ -23,6 +24,7 @@ public class ButtonBoxClient {
      * 按钮盒
      */
     @Autowired(required = false)
+    @Qualifier("modbusTcpMasterTemplateThird")
     private ModbusTcpMasterTemplate modbusTcpMasterTemplateThird;
 
     /**

warewms-hard/src/main/java/com/ruoyi/hard/rfid/RFIDReaderClient.java

@@ -5,6 +5,7 @@ import com.jwk.spring.boot.rfid.RfidReaderUtil;
 import com.mot.rfid.api3.TagData;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
 
 import java.util.Arrays;
@@ -26,8 +27,10 @@ public class RFIDReaderClient {
 
 
     @Autowired(required = false)
+    @Qualifier("rfidReaderTemplateFirst")
     private RfidReaderTemplate rfidReaderTemplateFirst;
     @Autowired(required = false)
+    @Qualifier("rfidReaderTemplateSecond")
     private RfidReaderTemplate rfidReaderTemplateSecond;