修改所有frid为rfid

zd-api/zd-laboratory-api/src/main/java/com/zd/laboratory/api/feign/fallback/RemoteLaboratoryFallbackFactory.java

@@ -408,7 +408,7 @@ public class RemoteLaboratoryFallbackFactory implements FallbackFactory<RemoteLa
 
             @Override
             public R<List<RemoteLabHardware>> listStart() {
-                return R.fail("查询FRID设备失败：" + cause.getMessage());
+                return R.fail("查询RFID设备失败：" + cause.getMessage());
             }
 
             @Override
@@ -418,7 +418,7 @@ public class RemoteLaboratoryFallbackFactory implements FallbackFactory<RemoteLa
 
             @Override
             public R<Integer> update(@RequestParam("operate") HardwareOperate operate, String ipAddress) {
-                return R.fail("FRID设备状态修改失败：" + cause.getMessage());
+                return R.fail("RFID设备状态修改失败：" + cause.getMessage());
             }
 
         };

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

@@ -66,7 +66,7 @@ public class AlarmRecordServiceImpl implements IAlarmRecordService {
     @Resource
     private RemoteNettyService remoteNettyService;
 
-    private static final String FRID_CODE = "FRID:";
+    private static final String RFID_CODE = "RFID:";
 
     /**
      * 查询报警记录列表
@@ -107,9 +107,9 @@ public class AlarmRecordServiceImpl implements IAlarmRecordService {
                 log.info("==================>{},{}",alarm.getCode(),alarm.getMsg());
             }
             Long id = storageRVo.getId();
-            String key = FRID_CODE + electronicTag + id;
-            String frid = redisService.getCacheObject(key);
-            if (frid != null) {
+            String key = RFID_CODE + electronicTag + id;
+            String rfid = redisService.getCacheObject(key);
+            if (rfid != null) {
                 return 1;
             }
             // 发送报警消息

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

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Component;
  */
 @Slf4j
 @Component
-public class FridConsumer implements Consumer<InventoryTag> {
+public class RfidConsumer implements Consumer<InventoryTag> {
 
     @Autowired
     private ISendService sendService;

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

@@ -1,7 +1,7 @@
 package com.zd.alg.netty.controller;
 
 import com.zd.alg.netty.constant.RfidConstants;
-import com.zd.alg.netty.service.IFridService;
+import com.zd.alg.netty.service.IRfidService;
 import com.zd.model.domain.R;
 import com.zd.model.entity.RemoteLabHardware;
 import io.swagger.annotations.Api;
@@ -18,19 +18,19 @@ import java.util.Map;
 @Api(tags = {"RFID设备控制器"})
 @RestController
 @RequestMapping("/rfid")
-public class FridDeviceController {
+public class RfidDeviceController {
 
     @Resource
-    private IFridService service;
+    private IRfidService service;
 
     /**
-     * 启动FRID扫描监控
+     * 启动RFID扫描监控
      *         Session.S0 高频循环返回在辐射区域的数据，距离越近频次越高
      *         Session.S1 次高频循环返回在辐射区域数据，距离越近频次越高
      *         Session.S2 在辐射范围内重复出现或停止不动的有且仅返回一次数据，当设备离开辐射区域后重置缓存记录，根据厂商提供的文档和本人结合业务应用实际测试，推荐使用此session
      *         Session.S3 这个暂时没搞懂，选择此session的时候在没有标签在辐射区域会报错，不知道是因为识别设备不够四个还是其他问题，待确定
      */
-    @ApiOperation("信道启动FRID扫描监控")
+    @ApiOperation("信道启动RFID扫描监控")
     @PostMapping("/startMonitorChannels")
     public R<Boolean> startMonitorChannels(@RequestBody RemoteLabHardware hardware) {
         service.start(hardware);

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

@@ -1,6 +1,6 @@
 package com.zd.alg.netty.init;
 
-import com.zd.alg.netty.service.IFridService;
+import com.zd.alg.netty.service.IRfidService;
 import com.zd.laboratory.api.feign.RemoteLaboratoryService;
 import com.zd.model.constant.HttpStatus;
 import com.zd.model.domain.R;
@@ -23,7 +23,7 @@ import java.util.List;
 @Slf4j
 public class NettyStartListener implements ApplicationRunner {
     @Resource
-    private IFridService fridService;
+    private IRfidService rfidService;
     @Resource
     private RemoteLaboratoryService laboratoryService;
     @Resource
@@ -49,7 +49,7 @@ public class NettyStartListener implements ApplicationRunner {
                 try {
                     unitVos.stream()
                             .filter(u -> StringUtils.hasLength(u.getIpAddress()))
-                            .forEach(u -> fridService.start(u));
+                            .forEach(u -> rfidService.start(u));
                 } catch (Exception e) {
                     e.fillInStackTrace();
                 }

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

@@ -10,7 +10,7 @@ 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.FridConsumer;
+import com.zd.alg.netty.base.RfidConsumer;
 import com.zd.alg.netty.service.ISendService;
 import com.zd.alg.netty.service.IService;
 import com.zd.common.core.exception.ServiceException;
@@ -34,7 +34,7 @@ public class WuYuanRFIDServiceImpl implements IService {
     private static final String MSG = "请先连接设备";
     private static final String SCANNER_MSG = "服务已断开，请检查连接状态正常后重启程序：";
     @Resource
-    private FridConsumer fridConsumer;
+    private RfidConsumer rfidConsumer;
     @Resource
     private ISendService sendService;
     @Resource
@@ -91,7 +91,7 @@ public class WuYuanRFIDServiceImpl implements IService {
         Byte index = sessionIndex;
         InventoryConfig config = new InventoryConfig.Builder()
                 .setInventory(inventory)
-                .setOnInventoryTagSuccess(fridConsumer)
+                .setOnInventoryTagSuccess(rfidConsumer)
                 //读取失败
                 .setOnFailure(failure -> errorMsg(failure, index, SCANNER_MSG, hardware))
                 .build();

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

@@ -6,7 +6,7 @@ import com.zd.model.entity.RemoteLabHardware;
 /**
  * @author Administrator
  */
-public interface IFridService {
+public interface IRfidService {
     /**
      * 启动RFID扫描器
      * @param hardware 设备数据

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

@@ -11,7 +11,7 @@ public interface ISendService {
     /**
      * 发送读取到的编码
      *
-     * @param tag    frid数据
+     * @param tag    rfid数据
      * @return boolean
      */
     boolean send(InventoryTag tag);

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

@@ -1,7 +1,7 @@
 package com.zd.alg.netty.service.impl;
 
 import com.zd.alg.netty.enums.ManufacturerTypeEnum;
-import com.zd.alg.netty.service.IFridService;
+import com.zd.alg.netty.service.IRfidService;
 import com.zd.alg.netty.service.IService;
 import com.zd.common.core.utils.SpringUtils;
 import com.zd.model.entity.RemoteLabHardware;
@@ -20,7 +20,7 @@ import static com.zd.model.constant.BaseConstants.MAP_INIT_SIZE;
  */
 @Service
 @Slf4j
-public class FridServiceImpl implements IFridService {
+public class RfidServiceImpl implements IRfidService {
 
     private final ThreadPoolTaskExecutor taskExecutor = SpringUtils.getBean("taskExecutor");
 

zd-modules/zd-base/src/main/java/com/zd/base/message/base/FridConsumer.java

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Component;
 
 @Slf4j
 @Component
-public class FridConsumer implements Consumer<InventoryTag> {
+public class RfidConsumer implements Consumer<InventoryTag> {
 
     @Autowired
     private ISendService sendService;

zd-modules/zd-base/src/main/java/com/zd/base/message/service/ISendService.java

@@ -7,7 +7,7 @@ public interface ISendService {
 
     /**
      * 发送读取到的编码
-     * @param tag frid数据
+     * @param tag rfid数据
      */
     void send(InventoryTag tag);
     /**

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

@@ -64,7 +64,7 @@ public class AlarmRecordServiceImpl extends ServiceImpl<AlarmRecordMapper, Alarm
     @Resource
     private BottleStorageService storageService;
 
-    private static final String FRID_CODE = "FRID:";
+    private static final String RFID_CODE = "RFID:";
     @Resource
     private RemoteNettyService remoteNettyService;
     @Resource
@@ -147,9 +147,9 @@ public class AlarmRecordServiceImpl extends ServiceImpl<AlarmRecordMapper, Alarm
             if (applies.isEmpty()) {
                 Long id = bottleStorage.getId();
                 R<SysFile> fileR = getFileR(tag, hardware);
-                String key = FRID_CODE + electronicTag + id;
-                String frid = redisService.getCacheObject(key);
-                if (frid != null) {
+                String key = RFID_CODE + electronicTag + id;
+                String rfid = redisService.getCacheObject(key);
+                if (rfid != null) {
                     return true;
                 }
                 // 发送报警消息