소스 검색

【feat】 青山 openApi

523096025 2 년 전
부모
커밋
2ffcdf4e79

+ 1 - 1
huimv-eartag2-platform/huimv-eartag2-common/src/main/java/com/huimv/eartag2/common/config/InterceptorConfig.java

@@ -21,6 +21,6 @@ public class InterceptorConfig implements WebMvcConfigurer {
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
         registry.addInterceptor(jwtInterceptor()).
-                excludePathPatterns("/**/my/*","/**/pig/*","/**/eartagData/api/eartagData/*","/**/eartagData/api/qingshan/*");
+                excludePathPatterns("/**/my/*","/**/pig/*","/**/eartagData/api/eartagData/*","/**/eartagData/api/qingshan/*","**/eartagRegister/listFarmUnitEartagData");
     }
 }

+ 4 - 0
huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/service/impl/EartagData2ServiceImpl.java

@@ -171,10 +171,14 @@ public class EartagData2ServiceImpl extends ServiceImpl<EartagData2Mapper, Earta
         endMap.put("countAll",countAll);
         endMap.put("countOn",countOn);
         endMap.put("offCount",countAll -countOn);
+        endMap.put("avgTemp","0.0");
+        endMap.put("envTemp","0.0");
         endMap.put("qingShanData",new ArrayList<>());
         List<QingShanData> shanDataList = eartagEartagRegister2Mapper.qingShanData(farmCode);
         if (ObjectUtil.isNotEmpty(shanDataList)){
             endMap.put("qingShanData",shanDataList);
+            endMap.put("avgTemp",shanDataList.get(0).getEarTemp());
+            endMap.put("envTemp",shanDataList.get(0).getEarTemp());
         }
 
         return new Result(ResultCode.SUCCESS,endMap);