Ver código fonte

RFID设备警报选择控制

ty130316261 3 anos atrás
pai
commit
9783af451b

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

@@ -108,7 +108,8 @@ public class AlarmRecordServiceImpl implements IAlarmRecordService {
             }
 
             if (hardware!=null){
-                remoteNettyService.alarm(hardware);//RFID设备报警
+                R<Boolean> alarm = remoteNettyService.alarm(hardware);//RFID设备报警
+                log.info(alarm.getMsg());
             }
             sendAlarm(storageRVo);// 发送报警消息
             redisService.setCacheObject(key, electronicTag, 300L, TimeUnit.SECONDS);

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

@@ -7,6 +7,7 @@ import com.zd.chemical.domain.*;
 import com.zd.chemical.domain.vo.*;
 import com.zd.chemical.mapper.*;
 import com.zd.chemical.service.*;
+import com.zd.common.core.domain.R;
 import com.zd.common.core.domain.per.PerPrefix;
 import com.zd.common.core.exception.ServiceException;
 import com.zd.common.core.utils.DateUtils;
@@ -317,7 +318,8 @@ public class HxpStockServiceImpl implements IHxpStockService {
         }else {
             logger.error("RFID 检测到违规触发报警: " + JSONUtil.toJsonStr(hxpStock));
             //触发RFID警报
-            remoteNettyService.alarm(hardware);
+            R<Boolean> alarm = remoteNettyService.alarm(hardware);
+            logger.info(alarm.getMsg());
             // 如果非领用状态,做报警台账
             // 0.检测实验室声光报警器是否使用- 使用则直接调用触发- 否则跳过
             Map<String,Object> subInfo = hxpUserecordMapper.selectSubInfoById(hxpStock.getSubId());