耳标平台

huimv-eartag2-eartag/src/main/java/com/huimv/eartag2/eartag/listener/EartagListener.java

@@ -291,7 +291,7 @@ public class EartagListener {
 //    @RabbitListener(queues = Const.QUEUE_ABNORMAL)
     @RabbitListener(queues = "#{'direct.abnormalCountAndAlarm.queue' + ${rabbitmq.queues}}")
     @RabbitHandler
-    public void abnormalCountAndAlarm(JSONObject dataJo) throws ParseException {
+    public  void abnormalCountAndAlarm(JSONObject dataJo) throws ParseException {
         log.info("异常统计和异常报警------>"+dataJo);
         eartagService.abnormalCountAndAlarm(dataJo);
 

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

@@ -425,7 +425,7 @@ public class EartagServiceImpl implements IEartagService {
 
         String hashKey = BizConst.HASH_EARTEMP_TH_PREFIX + farmCode;
         Object maxTem = redisTemplate.opsForHash().get(hashKey, "eartagMaxTem");
-        Object minTem = redisTemplate.opsForHash().get(hashKey, "eartagMaxTem");
+        Object minTem = redisTemplate.opsForHash().get(hashKey, "eartagMinTem");
         
         if (ObjectUtil.isEmpty(maxTem) || ObjectUtil.isEmpty(minTem)){
             SysBaseConfig baseConfig = sysBaseConfigMapper.selectOne(new QueryWrapper<SysBaseConfig>().lambda()

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

@@ -99,8 +99,8 @@ public class EartagServiceImpl implements IEartagService {
                 newEartagAbnormalAlarmEntity.setAddTime(now);
                 newEartagAbnormalAlarmEntity.setAddDate(now);
                 newEartagAbnormalAlarmEntity.setAlarmSort(6);
-                newEartagAbnormalAlarmEntity.setAlarmType(1);
-                newEartagAbnormalAlarmEntity.setAlarmFrom(2);
+                newEartagAbnormalAlarmEntity.setAlarmType(2);
+                newEartagAbnormalAlarmEntity.setAlarmFrom(1);
                 newEartagAbnormalAlarmEntity.setContent(alarmContent);
 
                 eartagDeviceRegister.setActiveStatus(0);
@@ -132,6 +132,7 @@ public class EartagServiceImpl implements IEartagService {
                 eartarFarmAllStatus.setDeviceRate(calculatePercentage(onDevice,allDevice));
                 eartarFarmAllStatus.setDeviceCancel(0);
                 eartarFarmAllStatus.setEartagTotal(allEartag.intValue());
+                eartarFarmAllStatus.setFarmId(farmCode);
                 eartarFarmAllStatus.setEartagOnline(onEartag.intValue());
                 eartarFarmAllStatus.setEartagRate(calculatePercentage(onDevice,allDevice));
                 eartarFarmAllStatus.setUpdateTime(now);