修改环境温度（高温低温）报警2。

huimv-eartag2-platform/huimv-eartag2-common/src/main/java/com/huimv/eartag2/common/dao/entity/EartagAbnormalAlarmEntity.java

@@ -44,4 +44,7 @@ private Integer alarmType;
 
 @Column(name = "alarm_sort")
 private Integer alarmSort;
+
+    @Column(name = "temp_value")
+    private String tempValue;
 }

huimv-eartag2-platform/huimv-eartag2-device/src/main/java/com/huimv/eartag2/device/service/impl/DeviceServiceImpl.java

@@ -422,7 +422,7 @@ public class DeviceServiceImpl implements IDeviceService {
             // 保存耳标高温报警
             EartagAbnormalAlarmEntity eartagAbnormalAlarmEntity = new EartagAbnormalAlarmEntity();
             eartagAbnormalAlarmEntity.setFarmCode(farmId);
-            eartagAbnormalAlarmEntity.setContent("高温警报：["+warningObject+"]的环境温度为" + envTemp1Bd.toString() + "°，高于等于高温阈值" + configMaxTempBd.toString() + "°");
+            eartagAbnormalAlarmEntity.setContent("高温警报：["+warningObject+"]当前环境温度为" + envTemp1Bd.toString() + "°，高于等于高温阈值" + configMaxTempBd.toString() + "°");
             //数据:2
             eartagAbnormalAlarmEntity.setAlarmType(2);
             //采集器:1
@@ -431,6 +431,7 @@ public class DeviceServiceImpl implements IDeviceService {
             eartagAbnormalAlarmEntity.setAddDate(todayDate);
             //环境高温:3
             eartagAbnormalAlarmEntity.setAlarmSort(3);
+            eartagAbnormalAlarmEntity.setTempValue(envTemp1Bd.toString());
             eartagAbnormalAlarmEntityRepo.saveAndFlush(eartagAbnormalAlarmEntity);
             // 高温次数记录
             saveEartagTempDataCount(todayDate, nowTimestamp, farmId);
@@ -443,7 +444,7 @@ public class DeviceServiceImpl implements IDeviceService {
             // 保存耳标高温报警
             EartagAbnormalAlarmEntity eartagAbnormalAlarmEntity = new EartagAbnormalAlarmEntity();
             eartagAbnormalAlarmEntity.setFarmCode(farmId);
-            eartagAbnormalAlarmEntity.setContent("低温警报：["+warningObject+"]的环境温度为" + envTemp1Bd.toString() + "°，低于等于低温阈值" + configMinTempBd.toString() + "°");
+            eartagAbnormalAlarmEntity.setContent("低温警报：["+warningObject+"]当前环境温度为" + envTemp1Bd.toString() + "°，低于等于低温阈值" + configMinTempBd.toString() + "°");
             //数据:2
             eartagAbnormalAlarmEntity.setAlarmType(2);
             //采集器:1
@@ -452,6 +453,7 @@ public class DeviceServiceImpl implements IDeviceService {
             eartagAbnormalAlarmEntity.setAddDate(todayDate);
             //环境低温:4
             eartagAbnormalAlarmEntity.setAlarmSort(4);
+            eartagAbnormalAlarmEntity.setTempValue(envTemp1Bd.toString());
             eartagAbnormalAlarmEntityRepo.saveAndFlush(eartagAbnormalAlarmEntity);
             //低温次数记录
             saveEartagTempDataCount(todayDate, nowTimestamp, farmId);

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

@@ -354,7 +354,7 @@ public class EartagServiceImpl implements IEartagService {
             // 保存耳标高温报警
             EartagAbnormalAlarmEntity eartagAbnormalAlarmEntity = new EartagAbnormalAlarmEntity();
             eartagAbnormalAlarmEntity.setFarmCode(farmCode);
-            eartagAbnormalAlarmEntity.setContent("高温警报：耳标号[" + earmark + "]的动物当前耳根温度为" + earTemp1Bd.toString() + "°，高于高温阈值" + configMaxTempBd.toString() + "°");
+            eartagAbnormalAlarmEntity.setContent("高温警报：耳标号[" + earmark + "]当前耳根温度为" + earTemp1Bd.toString() + "°，高于等于高温阈值" + configMaxTempBd.toString() + "°");
             //数据:2
             eartagAbnormalAlarmEntity.setAlarmType(2);
             //耳标:2
@@ -363,6 +363,7 @@ public class EartagServiceImpl implements IEartagService {
             eartagAbnormalAlarmEntity.setAddDate(todayDate);
             //耳标高温:1
             eartagAbnormalAlarmEntity.setAlarmSort(1);
+            eartagAbnormalAlarmEntity.setTempValue(earTemp1Bd.toString());
             eartagAbnormalAlarmEntityRepo.saveAndFlush(eartagAbnormalAlarmEntity);
             // 高温次数记录
             saveEartagTempDataCount(todayDate, nowTimestamp, farmCode);
@@ -370,7 +371,7 @@ public class EartagServiceImpl implements IEartagService {
             // 保存耳标高温报警
             EartagAbnormalAlarmEntity eartagAbnormalAlarmEntity = new EartagAbnormalAlarmEntity();
             eartagAbnormalAlarmEntity.setFarmCode(farmCode);
-            eartagAbnormalAlarmEntity.setContent("低温警报：耳标号[" + earmark + "]的动物当前耳根温度为" + earTemp1Bd.toString() + "°，低于低温阈值" + configMinTempBd.toString() + "°");
+            eartagAbnormalAlarmEntity.setContent("低温警报：耳标号[" + earmark + "]当前耳根温度为" + earTemp1Bd.toString() + "°，低于等于低温阈值" + configMinTempBd.toString() + "°");
             //数据:2
             eartagAbnormalAlarmEntity.setAlarmType(2);
             //耳标:2
@@ -379,6 +380,7 @@ public class EartagServiceImpl implements IEartagService {
             eartagAbnormalAlarmEntity.setAddDate(todayDate);
             //耳标低温:2
             eartagAbnormalAlarmEntity.setAlarmSort(2);
+            eartagAbnormalAlarmEntity.setTempValue(earTemp1Bd.toString());
             eartagAbnormalAlarmEntityRepo.saveAndFlush(eartagAbnormalAlarmEntity);
             //低温次数记录
             saveEartagTempDataCount(todayDate, nowTimestamp, farmCode);

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/pojo/EartagAbnormalAlarm.java

@@ -39,5 +39,5 @@ public class EartagAbnormalAlarm implements Serializable {
 
     private Integer alarmSort;
 
-
+    private String tempValue;
 }

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

@@ -36,6 +36,12 @@ import java.util.*;
 public class EartagAbnormalAlarmServiceImpl extends ServiceImpl<EartagAbnormalAlarmMapper, EartagAbnormalAlarm> implements EartagAbnormalAlarmService {
     @Autowired
     private EartagAbnormalAlarmMapper eartagAbnormalAlarmMapper;
+    @Autowired
+    private EartagEartagRegister2Mapper eartagEartagRegister2Mapper;
+    @Autowired
+    private BaseFarmerMapper baseFarmerMapper;
+    @Autowired
+    private BaseFarmMapper baseFarmMapper;
     @Override
     public Result getEarTemWarning(Map<String, Object> paramsMap) throws ParseException {
         DateUtil dateUtil = new DateUtil();
@@ -43,31 +49,25 @@ public class EartagAbnormalAlarmServiceImpl extends ServiceImpl<EartagAbnormalAl
         java.sql.Date todayDate = new java.sql.Date(new java.util.Date().getTime());
         QueryWrapper<EartagAbnormalAlarm> queryWrapper = new QueryWrapper();
         queryWrapper.eq("farm_code",farmCode);
-        //-测试
-//        queryWrapper.eq("add_date","2022-08-22");
-        queryWrapper.eq("add_date",todayDate);
-        queryWrapper.eq("alarm_from","2");
+        queryWrapper.eq("alarm_from","1").or().eq("alarm_from","2");
         queryWrapper.eq("alarm_type","2");
+        queryWrapper.eq("add_date",todayDate);
         queryWrapper.orderByDesc("add_time");
+
         List<EartagAbnormalAlarm> eartagAbnormalAlarmList =  eartagAbnormalAlarmMapper.selectList(queryWrapper);
         JSONArray newJa = new JSONArray();
         for(EartagAbnormalAlarm eartagAbnormalAlarm:eartagAbnormalAlarmList){
             JSONObject newJo = new JSONObject();
             newJa.add(newJo);
             newJo.put("addTime",dateUtil.formatDatetimeText(eartagAbnormalAlarm.getAddTime()));
+            newJo.put("temp",eartagAbnormalAlarm.getTempValue());
             newJo.put("content",eartagAbnormalAlarm.getContent());
         }
-        return new Result(ResultCode.SUCCESS,newJa);
+        JSONObject resultJo = new JSONObject();
+        resultJo.put("total",eartagAbnormalAlarmList.size());
+        resultJo.put("content",newJa);
+        return new Result(ResultCode.SUCCESS,resultJo);
     }
-    @Autowired
-    private EartagEartagRegister2Mapper eartagEartagRegister2Mapper;
-
-    @Autowired
-    private BaseFarmerMapper baseFarmerMapper;
-
-    @Autowired
-    private BaseFarmMapper baseFarmMapper;
-
 
     @Override
     public Result getNewPig(Map<String, String> paramsMap) {