Merge remote-tracking branch 'origin/master'

huimv-eartag2-admin/src/main/java/com/huimv/eartag2/admin/controller/BasePigpenController.java

@@ -155,13 +155,13 @@ public class BasePigpenController {
     }
 
     @PostMapping("/listBuildings")
-    public Result listBuildings (HttpServletRequest request){
-        return basePigpenService.listBuildings(request);
+    public Result listBuildings (@RequestBody Map<String, String> paramsMap){
+        return basePigpenService.listBuildings(paramsMap);
     }
 
     @PostMapping("/listUnitByBuilding")
-    public Result listUnitByBuilding(HttpServletRequest request,@RequestBody Map<String,String> paramsMap){
-        return basePigpenService.listUnitByBuilding(request,paramsMap);
+    public Result listUnitByBuilding(@RequestBody Map<String,String> paramsMap){
+        return basePigpenService.listUnitByBuilding(paramsMap);
     }
 
 }

huimv-eartag2-admin/src/main/java/com/huimv/eartag2/admin/service/BasePigpenService.java

@@ -29,7 +29,7 @@ public interface BasePigpenService extends IService<BasePigpen> {
 
     Result list(String farmCode, String pigpenName, String stageCode);
 
-    Result listBuildings(HttpServletRequest request);
+    Result listBuildings(Map<String, String> paramsMap);
 
-    Result listUnitByBuilding(HttpServletRequest request, Map<String, String> paramsMap);
+    Result listUnitByBuilding(Map<String, String> paramsMap);
 }

huimv-eartag2-admin/src/main/java/com/huimv/eartag2/admin/service/impl/BasePigpenServiceImpl.java

@@ -155,14 +155,14 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenMapper, BasePig
     }
 
     @Override
-    public Result listBuildings(HttpServletRequest request) {
-        String farmId = request.getHeader("farmId");
+    public Result listBuildings(Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
         return new Result(ResultCode.SUCCESS,basePigpenMapper.listBuildings(farmId));
     }
 
     @Override
-    public Result listUnitByBuilding(HttpServletRequest request, Map<String, String> paramsMap) {
-        String farmId = request.getHeader("farmId");
+    public Result listUnitByBuilding( Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
         String buildingId = paramsMap.get("buildingId");
         return new Result(ResultCode.SUCCESS,basePigpenMapper.listUnitByBuilding(farmId,buildingId));
     }

huimv-farm-environ/src/main/java/com/huimv/environ/eco/controller/EcoDeviceFlowController.java

@@ -30,8 +30,8 @@ public class EcoDeviceFlowController {
     private EcoDeviceFlowService ecoDeviceFlowService;
 
     @PostMapping("/getLastFlow")
-    public Result getLastFlow(HttpServletRequest request){
-        return ecoDeviceFlowService.getLastFlow(request);
+    public Result getLastFlow(@RequestBody Map<String, String> paramsMap){
+        return ecoDeviceFlowService.getLastFlow(paramsMap);
     }
 
 

huimv-farm-environ/src/main/java/com/huimv/environ/eco/service/EcoDeviceFlowService.java

@@ -20,7 +20,7 @@ import java.util.Map;
  */
 public interface EcoDeviceFlowService extends IService<EcoDeviceFlow> {
 
-    Result getLastFlow(HttpServletRequest request);
+    Result getLastFlow(Map<String, String> paramsMap);
 
     void save(JSONObject dataJo, Date todayTime) throws ParseException;
 

huimv-farm-environ/src/main/java/com/huimv/environ/eco/service/impl/EcoDeviceFlowServiceImpl.java

@@ -39,8 +39,8 @@ public class EcoDeviceFlowServiceImpl extends ServiceImpl<EcoDeviceFlowMapper, E
     private EcoDeviceFlowMapper ecoDeviceFlowMapper;
 
     @Override
-    public Result getLastFlow(HttpServletRequest request) {
-        String farmId = request.getHeader("farmId");
+    public Result getLastFlow(Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
         return new Result(ResultCode.SUCCESS,ecoDeviceFlowMapper.getLastFlow(farmId));
     }
 
@@ -81,7 +81,7 @@ public class EcoDeviceFlowServiceImpl extends ServiceImpl<EcoDeviceFlowMapper, E
 
     @Override
     public Result listByRoom(HttpServletRequest request, Map<String, String> paramsMap) throws ParseException {
-        String farmId = request.getHeader("farmId");
+        String farmId = paramsMap.get("farmId");
         String unitId = paramsMap.get("unitId");
         String startDate = paramsMap.get("startDate");
         String endDate = paramsMap.get("endDate");