【feat】 设置领养人

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/*","/*");
+                excludePathPatterns("/**/my/*","/**/pig/*");
     }
 }

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/controller/BaseFarmerController.java

@@ -1,8 +1,12 @@
 package com.huimv.eartag2.manage2.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.extension.conditions.query.QueryChainWrapper;
 import com.huimv.eartag2.common.utils.Result;
 import com.huimv.eartag2.common.utils.ResultCode;
+import com.huimv.eartag2.manage2.pojo.BaseFarmer;
 import com.huimv.eartag2.manage2.service.BaseFarmerService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -48,8 +52,10 @@ public class BaseFarmerController {
         return baseFarmerService.list(paramsMap);
     }
     @PostMapping("/listAll")
-    public Result listAll() {
-        return new Result(ResultCode.SUCCESS, baseFarmerService.list());
+    public Result listAll(@RequestBody Map<String, String> paramsMap) {
+        String farmCode = paramsMap.get("farmCode");
+
+        return new Result(ResultCode.SUCCESS, baseFarmerService.list(new QueryWrapper<BaseFarmer>().eq(StringUtils.isNotBlank(farmCode),"farm_code",farmCode)));
     }
 
 

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/controller/EartagAbnormalAlarmController.java

@@ -22,12 +22,12 @@ import java.util.Map;
  * @since 2022-08-30
  */
 @RestController
-//@RequestMapping("/eartag-abnormal-alarm")
+@RequestMapping("/pig")
 public class EartagAbnormalAlarmController {
     @Autowired
     private EartagAbnormalAlarmService eartagAbnormalAlarmService;
 
-    @PostMapping("/pig/getEarTemWarning")
+    @PostMapping("/getEarTemWarning")
     public Result getEarTemWarning(@RequestBody Map<String, Object> paramsMap) throws ParseException {
         return eartagAbnormalAlarmService.getEarTemWarning(paramsMap);
     }

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/controller/EartagRegisterController.java

@@ -34,4 +34,9 @@ public class EartagRegisterController {
         return eartagRegisterService.listFarmUnitEartagData(params);
     }
 
+    @RequestMapping("/listFarmUnitEartagDataByFarmer")
+    public Result listFarmUnitEartagDataByFarmer(@RequestBody Map<String, String> params){
+        return eartagRegisterService.listFarmUnitEartagDataByFarmer(params);
+    }
+
 }

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

@@ -17,4 +17,6 @@ import java.util.Map;
 public interface IEartagEartagRegister2Service extends IService<EartagEartagRegister2> {
 
     Result listFarmUnitEartagData(Map<String, String> params);
+
+    Result listFarmUnitEartagDataByFarmer(Map<String, String> params);
 }

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

@@ -5,13 +5,19 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huimv.eartag2.common.utils.Result;
 import com.huimv.eartag2.common.utils.ResultCode;
+import com.huimv.eartag2.manage2.mapper.BaseFarmerMapper;
+import com.huimv.eartag2.manage2.mapper.EartagDeviceRegisterMapper;
+import com.huimv.eartag2.manage2.pojo.BaseFarmer;
+import com.huimv.eartag2.manage2.pojo.EartagDeviceRegister;
 import com.huimv.eartag2.manage2.pojo.EartagEartagRegister;
 import com.huimv.eartag2.manage2.pojo.EartagEartagRegister2;
 import com.huimv.eartag2.manage2.mapper.EartagEartagRegister2Mapper;
 import com.huimv.eartag2.manage2.service.IEartagEartagRegister2Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -87,4 +93,71 @@ public class EartagEartagRegister2ServiceImpl extends ServiceImpl<EartagEartagRe
         return new Result(ResultCode.SUCCESS,map);
 
     }
+    @Autowired
+    private EartagDeviceRegisterMapper eartagDeviceRegisterMapper;
+
+    @Override
+    public Result listFarmUnitEartagDataByFarmer(Map<String, String> params) {
+        String pageSize = params.get("pageSize");
+        String pageNo = params.get("pageNo");
+        String deviceCode = params.get("deviceCode");
+        String farmId = params.get("farmId");
+        String earmark = params.get("earmark");
+        String farmerId = params.get("farmerId");
+        String liveStatus = params.get("liveStatus");
+        if (StringUtils.isBlank(pageNo)){
+            pageNo="1";
+        }
+        if (StringUtils.isBlank(pageSize)){
+            pageSize="20";
+        }
+        List<EartagDeviceRegister> eartagDeviceRegisters = eartagDeviceRegisterMapper.selectList(new QueryWrapper<EartagDeviceRegister>().eq("farmer_id", farmerId));
+        List farmerIds = new ArrayList();
+        for (EartagDeviceRegister eartagDeviceRegister : eartagDeviceRegisters) {
+            farmerIds.add(eartagDeviceRegister.getDeviceCode());
+        }
+
+
+        Float maxEarTemp = 0F;
+        Float minEarTemp = 100F;
+        QueryWrapper<EartagEartagRegister2> wrapper = new QueryWrapper<>();
+        //设备
+        wrapper.like(StringUtils.isNotBlank(deviceCode),"last_device",deviceCode);
+        wrapper.eq("farm_id",farmId);
+        wrapper.like(StringUtils.isNotBlank(earmark),"earmark",earmark);
+        wrapper.eq(StringUtils.isNotBlank(liveStatus),"live_status",liveStatus);
+        wrapper.orderByDesc("ask_time");
+        wrapper.in("last_device",farmerIds);
+
+
+        Page<EartagEartagRegister2> page = this.page(new Page<>(Long.parseLong(pageNo), Long.parseLong(pageSize)), wrapper);
+
+        Map map = new HashMap();
+        long allCount = this.count(wrapper);
+
+        //在线
+        wrapper.eq("live_status", 1);
+        long onCount = this.count(wrapper);
+        List<EartagEartagRegister2> list = this.list(wrapper);
+        if (list.size() == 0){
+            minEarTemp = 0F;
+        }
+        for (EartagEartagRegister2 record : list) {
+            Float earTemp1 = record.getEarTemp1();
+            //吴老师要求，屏蔽耳标
+            maxEarTemp = Math.max(earTemp1,maxEarTemp);
+
+            minEarTemp = Math.min(earTemp1,minEarTemp);
+        }
+
+
+        map.put("countOff",allCount-onCount);
+        map.put("countOn",onCount);
+        map.put("countAll",allCount);
+        map.put("maxEarTemp",maxEarTemp);
+        map.put("minEarTemp",minEarTemp);
+        map.put("page",page);
+
+        return new Result(ResultCode.SUCCESS,map);
+    }
 }