netty服务改名rfid

zd-api/zd-algorithm-api/src/main/java/com/zd/algorithm/api/netty/feign/RemoteNettyService.java

@@ -1,6 +1,6 @@
-package com.zd.algorithm.api.netty.feign;
+package com.zd.algorithm.api.rfid.feign;
 
-import com.zd.algorithm.api.netty.feign.fallback.RemoteNettyFallbackFactory;
+import com.zd.algorithm.api.rfid.feign.fallback.RemoteRfidFallbackFactory;
 import com.zd.model.constant.ApplicationConstants;
 import com.zd.model.domain.R;
 import com.zd.model.entity.RemoteLabHardware;
@@ -12,8 +12,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 /**
  * @author Administrator
  */
-@FeignClient(contextId = "remoteNettyService", value = ApplicationConstants.ALGORITHM_SERVICE, fallbackFactory = RemoteNettyFallbackFactory.class)
-public interface RemoteNettyService {
+@FeignClient(contextId = "remoteRfidService", value = ApplicationConstants.ALGORITHM_SERVICE, fallbackFactory = RemoteRfidFallbackFactory.class)
+public interface RemoteRfidService {
     /**
      * 断开设备连接
      * @param hardware 设备对象

zd-api/zd-algorithm-api/src/main/java/com/zd/algorithm/api/netty/feign/fallback/RemoteNettyFallbackFactory.java

@@ -1,6 +1,6 @@
-package com.zd.algorithm.api.netty.feign.fallback;
+package com.zd.algorithm.api.rfid.feign.fallback;
 
-import com.zd.algorithm.api.netty.feign.RemoteNettyService;
+import com.zd.algorithm.api.rfid.feign.RemoteRfidService;
 import com.zd.model.domain.R;
 import com.zd.model.entity.RemoteLabHardware;
 import org.slf4j.Logger;
@@ -9,14 +9,14 @@ import org.springframework.cloud.openfeign.FallbackFactory;
 import org.springframework.stereotype.Component;
 
 @Component
-public class RemoteNettyFallbackFactory implements FallbackFactory<RemoteNettyService> {
+public class RemoteRfidFallbackFactory implements FallbackFactory<RemoteRfidService> {
 
-    private static final Logger log = LoggerFactory.getLogger(RemoteNettyFallbackFactory.class);
+    private static final Logger log = LoggerFactory.getLogger(RemoteRfidFallbackFactory.class);
 
     @Override
-    public RemoteNettyService create(Throwable throwable) {
-        log.error("netty服务调用失败:{}", throwable.getMessage());
-        return new RemoteNettyService() {
+    public RemoteRfidService create(Throwable throwable) {
+        log.error("Rfid门禁服务调用失败:{}", throwable.getMessage());
+        return new RemoteRfidService() {
             @Override
             public R<Boolean> disconnect(RemoteLabHardware hardware) {
                 return  R.fail("停止扫描失败:" + throwable.getMessage());

zd-api/zd-algorithm-api/src/main/resources/META-INF/spring.factories

@@ -3,7 +3,7 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
   com.zd.algorithm.api.camera.feign.fallback.RemoteCameraFallBackFactory,\
   com.zd.algorithm.api.face.feign.fallback.RemoteFaceFallbackFactory,\
   com.zd.algorithm.api.forward.feign.fallback.RemoteForwardFallbackFactory,\
-  com.zd.algorithm.api.netty.feign.fallback.RemoteNettyFallbackFactory,\
+  com.zd.algorithm.api.rfid.feign.fallback.RemoteRfidFallbackFactory,\
   com.zd.algorithm.api.smartlock.feign.fallback.RemoteSmartlockFallbackFactory,\
   com.zd.algorithm.api.speaker.feign.fallback.RemoteSpeakFallbackFactory
 

zd-model/src/main/java/com/zd/model/entity/InventoryTag.java

@@ -17,9 +17,12 @@ public class InventoryTag {
      */
     private String epc;
     /**
-     * 设备索引，从0开始
+     * 天线设备索引，从0开始
      */
     private int antId;
+    /**
+     * 信号强度
+     */
     private int rssi;
     /**
      * 相位值
@@ -29,11 +32,12 @@ public class InventoryTag {
      * 频点
      */
     private String freq;
-
     /**
      * 设备码
      */
     private String serialNumber;
-
+    /**
+     * 硬件信息
+     */
     private RemoteLabHardware remoteLabHardware;
 }

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/service/impl/AlarmRecordServiceImpl.java

@@ -13,7 +13,7 @@ import com.zd.algorithm.api.alarm.entity.AlarmEntrty;
 import com.zd.algorithm.api.alarm.entity.Routes;
 import com.zd.algorithm.api.alarm.entity.SendTypes;
 import com.zd.algorithm.api.alarm.feign.RemoteAlarmService;
-import com.zd.algorithm.api.netty.feign.RemoteNettyService;
+import com.zd.algorithm.api.rfid.feign.RemoteRfidService;
 import com.zd.base.api.feign.RemoteMessageService;
 import com.zd.common.core.redis.RedisService;
 import com.zd.common.core.utils.StringUtils;
@@ -64,7 +64,7 @@ public class AlarmRecordServiceImpl implements IAlarmRecordService {
     @Resource
     private RemoteMessageService messageService;
     @Resource
-    private RemoteNettyService remoteNettyService;
+    private RemoteRfidService remoteRfidService;
 
     private static final String RFID_CODE = "RFID:";
 
@@ -103,7 +103,7 @@ public class AlarmRecordServiceImpl implements IAlarmRecordService {
         if (storageRVo != null) {
             if (hardware!=null){
                 //RFID设备报警
-                R<Boolean> alarm = remoteNettyService.alarm(hardware);
+                R<Boolean> alarm = remoteRfidService.alarm(hardware);
                 log.info("==================>{},{}",alarm.getCode(),alarm.getMsg());
             }
             Long id = storageRVo.getId();

zd-modules/zd-algorithm/src/main/java/com/zd/alg/netty/base/RfidConsumer.java

@@ -1,8 +1,8 @@
-package com.zd.alg.netty.base;
+package com.zd.alg.rfid.base;
 
 import com.payne.reader.base.Consumer;
 import com.payne.reader.bean.receive.InventoryTag;
-import com.zd.alg.netty.service.ISendService;
+import com.zd.alg.rfid.service.ISendService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeansException;

zd-modules/zd-algorithm/src/main/java/com/zd/alg/netty/constant/RfidConstants.java

@@ -1,4 +1,4 @@
-package com.zd.alg.netty.constant;
+package com.zd.alg.rfid.constant;
 
 import java.util.ArrayList;
 import java.util.HashMap;

zd-modules/zd-algorithm/src/main/java/com/zd/alg/netty/controller/RfidDeviceController.java

@@ -1,7 +1,7 @@
-package com.zd.alg.netty.controller;
+package com.zd.alg.rfid.controller;
 
-import com.zd.alg.netty.constant.RfidConstants;
-import com.zd.alg.netty.service.IRfidService;
+import com.zd.alg.rfid.constant.RfidConstants;
+import com.zd.alg.rfid.service.IRfidService;
 import com.zd.model.domain.R;
 import com.zd.model.entity.RemoteLabHardware;
 import io.swagger.annotations.Api;

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

@@ -1,9 +1,9 @@
-package com.zd.alg.netty.enums;
+package com.zd.alg.rfid.enums;
 
-import com.zd.alg.netty.sdk.DeJuRFIDClientImpl;
-import com.zd.alg.netty.service.IService;
-import com.zd.alg.netty.sdk.DeJuRFIDServerImpl;
-import com.zd.alg.netty.sdk.WuYuanRFIDServiceImpl;
+import com.zd.alg.rfid.sdk.DeJuRFIDClientImpl;
+import com.zd.alg.rfid.service.IService;
+import com.zd.alg.rfid.sdk.DeJuRFIDServerImpl;
+import com.zd.alg.rfid.sdk.WuYuanRFIDServiceImpl;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 

zd-modules/zd-algorithm/src/main/java/com/zd/alg/netty/handler/SocketHandler.java

@@ -1,4 +1,4 @@
-package com.zd.alg.netty.handler;
+package com.zd.alg.rfid.handler;
 
 import com.alibaba.nacos.shaded.io.grpc.netty.shaded.io.netty.channel.Channel;
 import com.alibaba.nacos.shaded.io.grpc.netty.shaded.io.netty.channel.ChannelHandlerContext;

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

@@ -1,6 +1,6 @@
-package com.zd.alg.netty.init;
+package com.zd.alg.rfid.init;
 
-import com.zd.alg.netty.service.IRfidService;
+import com.zd.alg.rfid.service.IRfidService;
 import com.zd.laboratory.api.feign.RemoteLaboratoryService;
 import com.zd.model.constant.HttpStatus;
 import com.zd.model.domain.R;
@@ -21,7 +21,7 @@ import java.util.List;
  **/
 @Component
 @Slf4j
-public class NettyStartListener implements ApplicationRunner {
+public class RfidStartListener implements ApplicationRunner {
     @Resource
     private IRfidService rfidService;
     @Resource
@@ -39,7 +39,7 @@ public class NettyStartListener implements ApplicationRunner {
                     log.error("com.zd.system.api.laboratory.RemoteLaboratoryService:远程接口调用异常");
                     //防止laboratory模块未启动完成，故每30秒执行一次程序，直到接口可以正常访问
                     this.wait(30 * 1000L);
-                    NettyStartListener.this.run(args);
+                    RfidStartListener.this.run(args);
                 } catch (InterruptedException e) {
                     Thread.currentThread().interrupt();
                 }

zd-modules/zd-algorithm/src/main/java/com/zd/alg/netty/init/SocketInitializer.java

@@ -1,4 +1,4 @@
-package com.zd.alg.netty.init;
+package com.zd.alg.rfid.init;
 
 import com.alibaba.nacos.shaded.io.grpc.netty.shaded.io.netty.channel.ChannelInitializer;
 import com.alibaba.nacos.shaded.io.grpc.netty.shaded.io.netty.channel.ChannelPipeline;
@@ -6,7 +6,7 @@ import com.alibaba.nacos.shaded.io.grpc.netty.shaded.io.netty.channel.socket.Soc
 import com.alibaba.nacos.shaded.io.grpc.netty.shaded.io.netty.handler.codec.FixedLengthFrameDecoder;
 import com.alibaba.nacos.shaded.io.grpc.netty.shaded.io.netty.handler.codec.bytes.ByteArrayDecoder;
 import com.alibaba.nacos.shaded.io.grpc.netty.shaded.io.netty.handler.codec.bytes.ByteArrayEncoder;
-import com.zd.alg.netty.handler.SocketHandler;
+import com.zd.alg.rfid.handler.SocketHandler;
 import org.springframework.stereotype.Component;
 
 /**

zd-modules/zd-algorithm/src/main/java/com/zd/alg/netty/init/SocketServer.java

@@ -1,4 +1,4 @@
-package com.zd.alg.netty.init;
+package com.zd.alg.rfid.init;
 
 import com.alibaba.nacos.shaded.io.grpc.netty.shaded.io.netty.bootstrap.ServerBootstrap;
 import com.alibaba.nacos.shaded.io.grpc.netty.shaded.io.netty.channel.nio.NioEventLoopGroup;
@@ -30,12 +30,12 @@ public class SocketServer {
     /**
      * netty服务监听端口
      */
-    @Value("${netty.port:6453}")
+    @Value("${rfid.port:6453}")
     private int port;
     /**
      * 主线程组数量
      */
-    @Value("${netty.bossThread:1}")
+    @Value("${rfid.bossThread:1}")
     private int bossThread;
 
     /**

zd-modules/zd-algorithm/src/main/java/com/zd/alg/netty/sdk/DeJuRFIDClientImpl.java

@@ -1,11 +1,11 @@
-package com.zd.alg.netty.sdk;
+package com.zd.alg.rfid.sdk;
 
 import com.gg.reader.api.dal.GClient;
 import com.gg.reader.api.dal.GServer;
 import com.gg.reader.api.protocol.gx.MsgBaseInventoryEpc;
 import com.gg.reader.api.protocol.gx.MsgBaseSetBaseband;
 import com.gg.reader.api.protocol.gx.MsgBaseSetPower;
-import com.zd.alg.netty.service.IService;
+import com.zd.alg.rfid.service.IService;
 import com.zd.common.core.exception.ServiceException;
 import com.zd.common.core.utils.SpringUtils;
 import com.zd.laboratory.api.feign.RemoteLaboratoryService;

zd-modules/zd-algorithm/src/main/java/com/zd/alg/netty/sdk/DeJuRFIDServerImpl.java

@@ -1,9 +1,9 @@
-package com.zd.alg.netty.sdk;
+package com.zd.alg.rfid.sdk;
 
 import com.gg.reader.api.dal.GClient;
 import com.gg.reader.api.protocol.gx.*;
-import com.zd.alg.netty.service.ISendService;
-import com.zd.alg.netty.service.IService;
+import com.zd.alg.rfid.service.ISendService;
+import com.zd.alg.rfid.service.IService;
 import com.zd.common.core.exception.ServiceException;
 import com.zd.common.core.utils.SpringUtils;
 import com.zd.laboratory.api.feign.RemoteLaboratoryService;
@@ -271,7 +271,7 @@ public class DeJuRFIDServerImpl implements IService {
                 log.info("报警状态：==============》{},设备IP：{}", alarm, ipAddress);
                 if (!alarm) {
                     alarmMap.putIfAbsent(ipAddress,true);
-                    return changeGpo(ipAddress, 1, client, 10);
+                    return changeGpo(ipAddress, 1, client, 1);
                 }
             }
         }

zd-modules/zd-algorithm/src/main/java/com/zd/alg/netty/sdk/WuYuanRFIDServiceImpl.java

@@ -1,4 +1,4 @@
-package com.zd.alg.netty.sdk;
+package com.zd.alg.rfid.sdk;
 
 import com.payne.connect.net.NetworkHandle;
 import com.payne.reader.Reader;
@@ -10,9 +10,9 @@ import com.payne.reader.bean.receive.Failure;
 import com.payne.reader.bean.receive.Success;
 import com.payne.reader.bean.send.*;
 import com.payne.reader.process.ReaderImpl;
-import com.zd.alg.netty.base.RfidConsumer;
-import com.zd.alg.netty.service.ISendService;
-import com.zd.alg.netty.service.IService;
+import com.zd.alg.rfid.base.RfidConsumer;
+import com.zd.alg.rfid.service.ISendService;
+import com.zd.alg.rfid.service.IService;
 import com.zd.common.core.exception.ServiceException;
 import com.zd.laboratory.api.feign.RemoteLaboratoryService;
 import com.zd.model.entity.RemoteLabHardware;

zd-modules/zd-algorithm/src/main/java/com/zd/alg/netty/service/IRfidService.java

@@ -1,4 +1,4 @@
-package com.zd.alg.netty.service;
+package com.zd.alg.rfid.service;
 
 
 import com.zd.model.entity.RemoteLabHardware;

zd-modules/zd-algorithm/src/main/java/com/zd/alg/netty/service/ISendService.java

@@ -1,4 +1,4 @@
-package com.zd.alg.netty.service;
+package com.zd.alg.rfid.service;
 
 
 import com.zd.model.entity.InventoryTag;

zd-modules/zd-algorithm/src/main/java/com/zd/alg/netty/service/IService.java

@@ -1,4 +1,4 @@
-package com.zd.alg.netty.service;
+package com.zd.alg.rfid.service;
 
 
 import com.zd.model.entity.RemoteLabHardware;

zd-modules/zd-algorithm/src/main/java/com/zd/alg/netty/service/impl/RfidServiceImpl.java

@@ -1,8 +1,8 @@
-package com.zd.alg.netty.service.impl;
+package com.zd.alg.rfid.service.impl;
 
-import com.zd.alg.netty.enums.ManufacturerTypeEnum;
-import com.zd.alg.netty.service.IRfidService;
-import com.zd.alg.netty.service.IService;
+import com.zd.alg.rfid.enums.ManufacturerTypeEnum;
+import com.zd.alg.rfid.service.IRfidService;
+import com.zd.alg.rfid.service.IService;
 import com.zd.common.core.utils.SpringUtils;
 import com.zd.model.entity.RemoteLabHardware;
 import lombok.extern.slf4j.Slf4j;

zd-modules/zd-algorithm/src/main/java/com/zd/alg/netty/service/impl/SendServiceImpl.java

@@ -1,7 +1,7 @@
-package com.zd.alg.netty.service.impl;
+package com.zd.alg.rfid.service.impl;
 
 import com.zd.airbottle.api.feign.RemoteAirBottleService;
-import com.zd.alg.netty.service.ISendService;
+import com.zd.alg.rfid.service.ISendService;
 import com.zd.bottle.feign.service.RemoteBottleService;
 import com.zd.chemical.api.fegin.RemoteStockService;
 import com.zd.model.constant.HttpStatus;
@@ -15,7 +15,7 @@ import org.springframework.util.StringUtils;
 
 import javax.annotation.Resource;
 
-import static com.zd.alg.netty.constant.RfidConstants.*;
+import static com.zd.alg.rfid.constant.RfidConstants.*;
 
 /**
  * @author Administrator

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/service/impl/AlarmRecordServiceImpl.java

@@ -9,7 +9,7 @@ import com.zd.algorithm.api.alarm.entity.Routes;
 import com.zd.algorithm.api.alarm.entity.SendTypes;
 import com.zd.algorithm.api.alarm.feign.RemoteAlarmService;
 import com.zd.algorithm.api.forward.feign.RemoteForwardService;
-import com.zd.algorithm.api.netty.feign.RemoteNettyService;
+import com.zd.algorithm.api.rfid.feign.RemoteRfidService;
 import com.zd.bottle.domain.AlarmRecord;
 import com.zd.bottle.domain.BottleStorage;
 import com.zd.bottle.domain.RfidTag;
@@ -66,7 +66,7 @@ public class AlarmRecordServiceImpl extends ServiceImpl<AlarmRecordMapper, Alarm
 
     private static final String RFID_CODE = "RFID:";
     @Resource
-    private RemoteNettyService remoteNettyService;
+    private RemoteRfidService remoteRfidService;
     @Resource
     private RedisService redisService;
     @Resource
@@ -180,7 +180,7 @@ public class AlarmRecordServiceImpl extends ServiceImpl<AlarmRecordMapper, Alarm
     private R<SysFile> getFileR(InventoryTag tag, RemoteLabHardware hardware) {
         //触发RFID警报
         if (hardware != null) {
-            R<Boolean> alarm = remoteNettyService.alarm(hardware);//RFID设备报警
+            R<Boolean> alarm = remoteRfidService.alarm(hardware);//RFID设备报警
             log.info(MSG_MATCH, alarm.getCode(), alarm.getMsg());
         } else {
             log.info("==================> rfid 参数有误！" + tag);

zd-modules/zd-chemical/src/main/java/com/zd/chemical/service/impl/HxpStockServiceImpl.java

@@ -6,7 +6,7 @@ import com.zd.algorithm.api.alarm.entity.AlarmEntrty;
 import com.zd.algorithm.api.alarm.entity.Routes;
 import com.zd.algorithm.api.alarm.feign.RemoteAlarmService;
 import com.zd.algorithm.api.forward.feign.RemoteForwardService;
-import com.zd.algorithm.api.netty.feign.RemoteNettyService;
+import com.zd.algorithm.api.rfid.feign.RemoteRfidService;
 import com.zd.chemical.controller.HxpAIOController;
 import com.zd.chemical.domain.*;
 import com.zd.chemical.domain.vo.*;
@@ -104,7 +104,7 @@ public class HxpStockServiceImpl implements IHxpStockService {
     @Autowired
     private HxpCabinetlockLogMapper hxpCabinetlockLogMapper;
     @Resource
-    private RemoteNettyService remoteNettyService;
+    private RemoteRfidService remoteRfidService;
     @Resource
     private SmsSydUtil smsSydUtil;
 
@@ -356,7 +356,7 @@ public class HxpStockServiceImpl implements IHxpStockService {
             RemoteLabHardware hardware = tag.getRemoteLabHardware();
             boolean isAlarm = false;
             if (hardware!=null){
-                R<Boolean> alarm = remoteNettyService.alarm(hardware);//RFID设备报警
+                R<Boolean> alarm = remoteRfidService.alarm(hardware);//RFID设备报警
                 logger.info("==================>{},{}",alarm.getCode(),alarm.getMsg());
                 //isAlarm = true;
             }else {

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabHardwareController.java

@@ -1,7 +1,7 @@
 package com.zd.laboratory.controller;
 
 
-import com.zd.algorithm.api.netty.feign.RemoteNettyService;
+import com.zd.algorithm.api.rfid.feign.RemoteRfidService;
 import com.zd.common.core.annotation.Log;
 import com.zd.common.core.annotation.PreAuthorize;
 import com.zd.common.core.exception.ServiceException;
@@ -73,7 +73,7 @@ public class LabHardwareController extends BaseController {
     @Autowired
     RedisService redisService;
     @Resource
-    private RemoteNettyService nettyService;
+    private RemoteRfidService rfidService;
 
     /**
      * 查询硬件统计
@@ -393,7 +393,7 @@ public class LabHardwareController extends BaseController {
         HardwareOperate operate = labHardwareVO.getOperate();
         if (operate==null || operate.getCode()==4){
             subjectManagerService.control(id, Symbol.command.open);
-            R<Boolean> result = nettyService.startMonitorChannels(remoteLabHardware);
+            R<Boolean> result = rfidService.startMonitorChannels(remoteLabHardware);
             if (result.getCode()== HttpStatus.SUCCESS){
                 operate=HardwareOperate.OPEN;
             }else {
@@ -401,7 +401,7 @@ public class LabHardwareController extends BaseController {
             }
         }else {
             subjectManagerService.control(id, Symbol.command.close);
-            R<Boolean> result = nettyService.disconnect(remoteLabHardware);
+            R<Boolean> result = rfidService.disconnect(remoteLabHardware);
             if (result.getCode()== HttpStatus.SUCCESS){
                 operate=HardwareOperate.CLOSE;
             }else {
@@ -416,10 +416,10 @@ public class LabHardwareController extends BaseController {
     }
 
     /**
-     * netty服务查询识别器列表
+     * Rfid门禁服务查询识别器列表
      */
     @GetMapping("/list/start")
-    @ApiOperation(value = "netty服务查询识别器列表")
+    @ApiOperation(value = "Rfid门禁服务查询识别器列表")
     public R<List<RemoteLabHardware>> listStart(){
         LabHardware hardware = new LabHardware();
         hardware.setOperate(HardwareOperate.OPEN);