Merge branch 'master' of http://192.168.1.43:3000/git/sass-lab-distributed-java

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

@@ -100,17 +100,16 @@ public class AlarmRecordServiceImpl implements IAlarmRecordService {
         String electronicTag = alarmRecord.getElectronicTag();
         QpBottleStorageRVo storageRVo = storageService.getByElectronicTag(electronicTag);
         if (storageRVo != null) {
+            if (hardware!=null){
+                R<Boolean> alarm = remoteNettyService.alarm(hardware);//RFID设备报警
+                log.info("==================>{},{}",alarm.getCode(),alarm.getMsg());
+            }
             Long id = storageRVo.getId();
             String key = FRID_CODE + electronicTag + id;
             String frid = redisService.getCacheObject(key);
             if (frid != null) {
                 return 1;
             }
-
-            if (hardware!=null){
-                R<Boolean> alarm = remoteNettyService.alarm(hardware);//RFID设备报警
-                log.info(alarm.getMsg());
-            }
             sendAlarm(storageRVo);// 发送报警消息
             redisService.setCacheObject(key, electronicTag, 300L, TimeUnit.SECONDS);
             alarmRecord.setAlarmTime(Calendar.getInstance().getTime())

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

@@ -320,8 +320,8 @@ public class HxpStockServiceImpl implements IHxpStockService {
             //触发RFID警报
             RemoteLabHardware hardware = tag.getRemoteLabHardware();
             if (hardware!=null){
-                R<Boolean> alarm = remoteNettyService.alarm(hardware);
-                logger.info(alarm.getMsg());
+                R<Boolean> alarm = remoteNettyService.alarm(hardware);//RFID设备报警
+                logger.info("==================>{},{}",alarm.getCode(),alarm.getMsg());
             }
             // 如果非领用状态，做报警台账
             // 0.检测实验室声光报警器是否使用- 使用则直接调用触发- 否则跳过

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

@@ -134,6 +134,7 @@ public class DeJuRFIDService implements IService {
         String ipAddress = hardware.getIpAddress();
         if (clientMap.containsKey(ipAddress)){
             GClient client = clientMap.get(ipAddress);
+            log.info("报警状态：==============》{}",isAlarm.get());
             if (!isAlarm.get()) {
                 scheduledExecutorService.execute(() -> {
                     isAlarm.set(true);
@@ -163,6 +164,7 @@ public class DeJuRFIDService implements IService {
         client.sendSynMsg(msgAppSetGpo);
         String status = state == 1 ? "start" : "stop";
         if (0 == msgAppSetGpo.getRtCode()) {
+            log.info("============》灯带{}成功.",status);
             if (state == 1) {
                 stopGpo(client, delayTime);
             } else {

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

@@ -29,6 +29,6 @@ public class FridServiceImpl implements IFridService {
 
     @Override
     public void alarm(RemoteLabHardware hardware) {
-        rfidService(hardware.getManufacturerType()).disconnect(hardware);
+        rfidService(hardware.getManufacturerType()).alarm(hardware);
     }
 }