【feat】 修复耳标查询bug

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

@@ -70,6 +70,8 @@ public class EartagEartagRegister2ServiceImpl extends ServiceImpl<EartagEartagRe
         }
         for (EartagEartagRegister2 record : list) {
             Float earTemp1 = record.getEarTemp1();
+            //吴老师要求，屏蔽耳标
+                maxEarTemp = Math.max(earTemp1,maxEarTemp);
 
             minEarTemp = Math.min(earTemp1,minEarTemp);
         }

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

@@ -249,14 +249,14 @@ public class SysBaseConfigServiceImpl extends ServiceImpl<SysBaseConfigMapper, S
             endMap.put("eartagMaxTem",eartagMaxTem.getConfigValue());
 
             wrapper.clear();
-            wrapper.eq("row_id",baseConfig.getRowId()).eq("config_key","eartagMinxTem");
-            SysBaseConfig eartagMinxTem = sysBaseConfigMapper.selectOne(wrapper);
-            endMap.put("eartagMinxTem",eartagMinxTem.getConfigValue());
+            wrapper.eq("row_id",baseConfig.getRowId()).eq("config_key","eartagMinTem");
+            SysBaseConfig eartagMinTem = sysBaseConfigMapper.selectOne(wrapper);
+            endMap.put("eartagMinTem",eartagMinTem.getConfigValue());
         }else {
             endMap.put("eartagOfflineTime",0);
             endMap.put("deviceOfflineTime",0);
             endMap.put("eartagMaxTem",0);
-            endMap.put("eartagMinxTem",0);
+            endMap.put("eartagMinTem",0);
         }
 
 
@@ -269,7 +269,7 @@ public class SysBaseConfigServiceImpl extends ServiceImpl<SysBaseConfigMapper, S
     public Result updateWarning(Map<String, String> paramsMap) {
         String farmId = paramsMap.get("farmId");
         String eartagMaxTem = paramsMap.get("eartagMaxTem");
-        String eartagMinxTem = paramsMap.get("eartagMinxTem");
+        String eartagMinTem = paramsMap.get("eartagMinTem");
         String eartagOfflineTime = paramsMap.get("eartagOfflineTime");
         String deviceOfflineTime = paramsMap.get("deviceOfflineTime");
 
@@ -309,18 +309,18 @@ public class SysBaseConfigServiceImpl extends ServiceImpl<SysBaseConfigMapper, S
 
 
         wrapper.clear();
-        wrapper.eq("config_key","eartagMinxTem");
+        wrapper.eq("config_key","eartagMinTem");
         wrapper.eq("row_id",rowId);
-        SysBaseConfig eartagMinxTemSys = sysBaseConfigMapper.selectOne(wrapper);
+        SysBaseConfig eartagMinTemSys = sysBaseConfigMapper.selectOne(wrapper);
 
-        if (ObjectUtil.isNotEmpty(eartagMinxTemSys)){
-            eartagMinxTemSys.setConfigValue(eartagMinxTem);
-            sysBaseConfigMapper.updateById(eartagMinxTemSys);
+        if (ObjectUtil.isNotEmpty(eartagMinTemSys)){
+            eartagMinTemSys.setConfigValue(eartagMinTem);
+            sysBaseConfigMapper.updateById(eartagMinTemSys);
         }else {
             SysBaseConfig newBaseConfig = new SysBaseConfig();
-            newBaseConfig.setConfigKey("eartagMinxTem");
+            newBaseConfig.setConfigKey("eartagMinTem");
             newBaseConfig.setConfigName("耳标温度低于温度报警");
-            newBaseConfig.setConfigValue(eartagMinxTem);
+            newBaseConfig.setConfigValue(eartagMinTem);
             newBaseConfig.setRowId(rowId);
             sysBaseConfigMapper.insert(newBaseConfig);
         }