RFID设备警报选择控制

zd-api/zd-api-system/src/main/java/com/zd/system/api/airbottle/RemoteAirBottleService.java

@@ -16,6 +16,6 @@ public interface RemoteAirBottleService {
      * 识别器新增报警记录
      */
     @PostMapping("alarm/record/remote/add")
-    R<Boolean> remoteAdd(@RequestBody InventoryTag tag, RemoteLabHardware hardware);
+    R<Boolean> remoteAdd(@RequestBody InventoryTag tag);
 
 }

zd-api/zd-api-system/src/main/java/com/zd/system/api/domain/InventoryTag.java

@@ -1,5 +1,9 @@
 package com.zd.system.api.domain;
 
+import com.zd.system.api.laboratory.domain.RemoteLabHardware;
+import lombok.Data;
+
+@Data
 public class InventoryTag {
 
     private String pc;
@@ -21,63 +25,5 @@ public class InventoryTag {
      */
     private String freq;
 
-    public String getPc() {
-        return pc;
-    }
-
-    public void setPc(String pc) {
-        this.pc = pc;
-    }
-
-    public String getEpc() {
-        return epc;
-    }
-
-    public void setEpc(String epc) {
-        this.epc = epc;
-    }
-
-    public int getAntId() {
-        return antId;
-    }
-
-    public void setAntId(int antId) {
-        this.antId = antId;
-    }
-
-    public int getRssi() {
-        return rssi;
-    }
-
-    public void setRssi(int rssi) {
-        this.rssi = rssi;
-    }
-
-    public int getPhase() {
-        return phase;
-    }
-
-    public void setPhase(int phase) {
-        this.phase = phase;
-    }
-
-    public String getFreq() {
-        return freq;
-    }
-
-    public void setFreq(String freq) {
-        this.freq = freq;
-    }
-
-    @Override
-    public String toString() {
-        return "InventoryTag{" +
-                "pc='" + pc + '\'' +
-                ", epc='" + epc + '\'' +
-                ", antId=" + antId +
-                ", rssi=" + rssi +
-                ", phase=" + phase +
-                ", freq='" + freq + '\'' +
-                '}';
-    }
+    private RemoteLabHardware remoteLabHardware;
 }

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/controller/AlarmRecordController.java

@@ -96,8 +96,8 @@ public class AlarmRecordController extends BaseController<AlarmRecord> {
     @ApiOperation(value = "识别器新增报警记录")
     @Log(title = "识别器新增报警记录", businessType = BusinessType.INSERT)
     @PostMapping("remote/add")
-    public R<Boolean> remoteAdd(@RequestBody InventoryTag tag, RemoteLabHardware hardware) {
-        alarmRecordService.remoteAdd(tag,hardware);
+    public R<Boolean> remoteAdd(@RequestBody InventoryTag tag) {
+        alarmRecordService.remoteAdd(tag);
         return R.ok();
     }
 }

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/service/IAlarmRecordService.java

@@ -48,9 +48,8 @@ public interface IAlarmRecordService {
      * 远程调用信息报警记录
      *
      * @param tag 标签值
-     * @param hardware RFID 设备数据
      */
-    void remoteAdd(InventoryTag tag, RemoteLabHardware hardware);
+    void remoteAdd(InventoryTag tag);
 
     List<BottleStorageInfoVo> setMasterIds(AlarmRecord alarmRecord);
 }

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

@@ -107,7 +107,9 @@ public class AlarmRecordServiceImpl implements IAlarmRecordService {
                 return 1;
             }
 
-            remoteNettyService.alarm(hardware);//RFID设备报警
+            if (hardware!=null){
+                remoteNettyService.alarm(hardware);//RFID设备报警
+            }
             sendAlarm(storageRVo);// 发送报警消息
             redisService.setCacheObject(key, electronicTag, 300L, TimeUnit.SECONDS);
             alarmRecord.setAlarmTime(Calendar.getInstance().getTime())
@@ -229,8 +231,8 @@ public class AlarmRecordServiceImpl implements IAlarmRecordService {
 
     @Override
     @Transactional
-    public void remoteAdd(InventoryTag tag, RemoteLabHardware hardware) {
-        insertAlarmRecord(new AlarmRecord().setElectronicTag(tag.getEpc()),hardware);
+    public void remoteAdd(InventoryTag tag) {
+        insertAlarmRecord(new AlarmRecord().setElectronicTag(tag.getEpc()),tag.getRemoteLabHardware());
     }
 
     @Override

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

@@ -23,7 +23,7 @@ public class FridConsumer implements Consumer<InventoryTag> {
             tag.setEpc(tag.getEpc().replace(" ", ""));
             com.zd.system.api.domain.InventoryTag  inventoryTag = new com.zd.system.api.domain.InventoryTag ();
             BeanUtils.copyProperties(tag,inventoryTag);
-            sendService.send(inventoryTag, null);
+            sendService.send(inventoryTag);
         } catch (BeansException e) {
             throw new ServiceException(e.getMessage());
         }

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

@@ -201,7 +201,8 @@ public class DeJuRFIDService implements IService {
                 log.info("===========》{}", logBaseEpcInfo.getbEpc());
                 InventoryTag tag = new InventoryTag();
                 BeanUtils.copyProperties(logBaseEpcInfo, tag);
-                sendService.send(tag,hardware);
+                tag.setRemoteLabHardware(hardware);
+                sendService.send(tag);
             }
         };
         client.onTagEpcOver = (s, logBaseEpcOver) -> log.info("HandlerTagEpcOver");

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

@@ -8,9 +8,8 @@ public interface ISendService {
     /**
      * 发送读取到的编码
      * @param tag frid数据
-     * @param hardware 设备数据
      */
-    void send(InventoryTag tag, RemoteLabHardware hardware);
+    void send(InventoryTag tag);
 
     /**
      * 发送异常信息

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

@@ -21,15 +21,15 @@ public class SendServiceImpl implements ISendService {
 
 
     @Override
-    public void send(InventoryTag tag, RemoteLabHardware hardware) {
+    public void send(InventoryTag tag) {
         log.info("==============================================reader1 inventory tag :" + tag.toString());
         try {
-            bottleService.remoteAdd(tag,hardware);
+            bottleService.remoteAdd(tag);
         } catch (Exception e) {
             log.info("气瓶服务异常："+e.getMessage());
         }
         try {
-            remoteStockService.RFIDCheck(tag.getEpc(),hardware);
+            remoteStockService.RFIDCheck(tag.getEpc(),tag.getRemoteLabHardware());
         } catch (Exception e) {
             log.info("化学品服务异常："+e.getMessage());
         }