bug修复

zd-modules/zd-netty/src/main/java/com/zd/netty/enums/ManufacturerTypeEnum.java

@@ -1,8 +1,8 @@
 package com.zd.netty.enums;
 
-import com.zd.netty.sdk.DeJuRFIDListenerService;
-import com.zd.netty.sdk.DeJuRFIDService;
-import com.zd.netty.sdk.WuYuanRFIDService;
+import com.zd.netty.sdk.DeJuRFIDListenerServiceImpl;
+import com.zd.netty.sdk.DeJuRFIDServiceImpl;
+import com.zd.netty.sdk.WuYuanRFIDServiceImpl;
 import com.zd.netty.service.IService;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -18,9 +18,9 @@ public enum ManufacturerTypeEnum {
     /**
      * 枚举常量
      */
-    WU_WEI(1,"无源", WuYuanRFIDService.class),
-    DE_JU(2,"惠州德聚服务端", DeJuRFIDService.class),
-    DE_JU2(3,"惠州德聚客户端", DeJuRFIDListenerService.class);
+    WU_WEI(1,"无源", WuYuanRFIDServiceImpl.class),
+    DE_JU(2,"惠州德聚服务端", DeJuRFIDServiceImpl.class),
+    DE_JU2(3,"惠州德聚客户端", DeJuRFIDListenerServiceImpl.class);
 
     /**
      * 字典码

zd-modules/zd-netty/src/main/java/com/zd/netty/init/NettyStartListener.java

@@ -56,7 +56,6 @@ public class NettyStartListener implements ApplicationRunner {
                     try {
                         unitVos.stream()
                                 .filter(u -> StringUtils.hasLength(u.getIpAddress()))
-                                .filter(u -> u.getOperate() == HardwareOperate.OPEN)
                                 .forEach(u -> fridService.start(u));
                     } catch (Exception e) {
                         e.fillInStackTrace();

zd-modules/zd-netty/src/main/java/com/zd/netty/sdk/DeJuRFIDListenerService.java

@@ -24,13 +24,13 @@ import java.util.concurrent.ConcurrentHashMap;
  */
 @Slf4j
 @Service
-public class DeJuRFIDListenerService implements IService {
+public class DeJuRFIDListenerServiceImpl implements IService {
 
     private final Map<String, GServer> serverMap = new ConcurrentHashMap<>();
     @Resource
     private RemoteLaboratoryService remoteLaboratoryService;
     @Resource
-    private DeJuRFIDService deJuRFIDService;
+    private DeJuRFIDServiceImpl deJuRFIDService;
 
     @Override
     public void start(RemoteLabHardware hardware) {
@@ -46,7 +46,7 @@ public class DeJuRFIDListenerService implements IService {
             server = new GServer();
             serverMap.put(ipAddress, server);
         }
-        if (server.open(DeJuRFIDService.PORT)) {
+        if (server.open(DeJuRFIDServiceImpl.PORT)) {
             subscribeServerHandler(server, hardware);
             log.info("开始监听");
         } else {
@@ -60,7 +60,7 @@ public class DeJuRFIDListenerService implements IService {
         String ipAddress = hardware.getIpAddress();
         if (serverMap.containsKey(ipAddress)) {
             GServer server = serverMap.get(ipAddress);
-            DeJuRFIDService.close(hardware);
+            DeJuRFIDServiceImpl.close(hardware);
             server.close();
             log.info(ipAddress + "---监听结束");
         }
@@ -83,22 +83,22 @@ public class DeJuRFIDListenerService implements IService {
             client.setSendHeartBeat(true);//开启心跳检测Tcp连接状态
             client.setPrint(true);
             subscribeTcpHandler(client, hardware);//订阅Tcp断连上报
-            MsgBaseSetBaseband msgBaseSetBaseband = DeJuRFIDService.setSession(hardware, client);
+            MsgBaseSetBaseband msgBaseSetBaseband = DeJuRFIDServiceImpl.setSession(hardware, client);
             if (0 != msgBaseSetBaseband.getRtCode()) {
                 log.error("Session configuration error.");
                disconnect(hardware);
             }
-            MsgBaseSetPower msgBaseSetPower = DeJuRFIDService.setPower(hardware, client);
+            MsgBaseSetPower msgBaseSetPower = DeJuRFIDServiceImpl.setPower(hardware, client);
             if (0 != msgBaseSetPower.getRtCode()) {
                 log.error("Power configuration error.");
                 disconnect(hardware);
             }
-            MsgBaseInventoryEpc msgBaseInventoryEpc = DeJuRFIDService.setInventory(hardware, client);
+            MsgBaseInventoryEpc msgBaseInventoryEpc = DeJuRFIDServiceImpl.setInventory(hardware, client);
             if (0 != msgBaseInventoryEpc.getRtCode()) {
                 log.error("Inventory epc error.");
                 disconnect(hardware);
             }
-            DeJuRFIDService.subscribeHandler(client, hardware);
+            DeJuRFIDServiceImpl.subscribeHandler(client, hardware);
             remoteLaboratoryService.update(HardwareOperate.OPEN, hardware.getIpAddress());
             log.info(client.getName() + "---监听成功");
         };

zd-modules/zd-netty/src/main/java/com/zd/netty/sdk/DeJuRFIDService.java

@@ -19,9 +19,12 @@ import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+/**
+ * @author Administrator
+ */
 @Slf4j
 @Service
-public class DeJuRFIDService implements IService {
+public class DeJuRFIDServiceImpl implements IService {
 
     private static final ISendService sendService = SpringUtils.getBean("sendService");
 
@@ -101,6 +104,11 @@ public class DeJuRFIDService implements IService {
         msgBaseInventoryEpc.setInventoryMode(EnumG.InventoryMode_Inventory);
 
         client.sendSynMsg(msgBaseInventoryEpc);
+        if (0 != msgBaseInventoryEpc.getRtCode()) {
+            log.info("Inventory epc error.");
+        } else {
+            log.info("Inventory epc success.");
+        }
         return msgBaseInventoryEpc;
     }
 

zd-modules/zd-netty/src/main/java/com/zd/netty/sdk/WuYuanRFIDService.java

@@ -27,7 +27,7 @@ import java.util.concurrent.ConcurrentHashMap;
 
 @Slf4j
 @Service
-public class WuYuanRFIDService implements IService {
+public class WuYuanRFIDServiceImpl implements IService {
 
     private final Map<String, Reader> readerMap = new ConcurrentHashMap<>();
     private final Map<String, NetworkHandle> handleMap = new ConcurrentHashMap<>();