耳标平台

huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/service/impl/EartagServiceImpl.java

@@ -85,6 +85,10 @@ public class EartagServiceImpl implements IEartagService {
                 newEartagAbnormalAlarmEntity.setAlarmFrom(2);
                 newEartagAbnormalAlarmEntity.setContent(alarmContent);
                 eartagAbnormalAlarmEntityRepo.saveAndFlush(newEartagAbnormalAlarmEntity);
+
+                eartagEartagRegister2.setActiveStatus(0);
+                eartagEartagRegister2.setLiveStatus(0);
+                eartagEartagRegister2Mapper.updateById(eartagEartagRegister2);
             }
             for (EartagDeviceRegister eartagDeviceRegister : eartagDeviceRegisters) {
                 //生成报警，并且设置为离线状态
@@ -98,6 +102,10 @@ public class EartagServiceImpl implements IEartagService {
                 newEartagAbnormalAlarmEntity.setAlarmType(1);
                 newEartagAbnormalAlarmEntity.setAlarmFrom(2);
                 newEartagAbnormalAlarmEntity.setContent(alarmContent);
+
+                eartagDeviceRegister.setActiveStatus(0);
+                eartagDeviceRegister.setDeviceStatus(0);
+                eartagDeviceRegisterMapper.updateById(eartagDeviceRegister);
                 eartagAbnormalAlarmEntityRepo.saveAndFlush(newEartagAbnormalAlarmEntity);
             }
 

huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/service/impl/SysBaseConfigServiceImpl.java

@@ -1,5 +1,6 @@
 package com.huimv.eartag2.manage2.service.impl;
 
+import cn.hutool.core.date.DateTime;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -406,7 +407,6 @@ public class SysBaseConfigServiceImpl extends ServiceImpl<SysBaseConfigMapper, S
     }
 
 
-
     private SysBaseConfigVo convertSysBaseConfigVo(List<SysBaseConfig> list){
         Map<String, String> map = list.stream().collect(Collectors.toMap(SysBaseConfig::getConfigKey, SysBaseConfig::getConfigValue,(item1,item2) ->item1));
         SysBaseConfigVo sysBaseConfigVo = new SysBaseConfigVo();