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");

huimv-farm-produce/src/main/java/com/huimv/produce/produce/controller/ProdWriteStockController.java

@@ -28,8 +28,8 @@ public class ProdWriteStockController {
     private ProdWriteStockService prodWriteStockService;
 
     @PostMapping("/list")
-    public Result list(@RequestBody ProdWriteStock prodWriteStock) {
-        return prodWriteStockService.list(prodWriteStock);
+    public Result list(@RequestBody Map<String,String> paramsMap) {
+        return prodWriteStockService.list(paramsMap);
     }
 
     @PostMapping("/add")

huimv-farm-produce/src/main/java/com/huimv/produce/produce/service/ProdWriteStockService.java

@@ -16,7 +16,7 @@ import java.util.Map;
  */
 public interface ProdWriteStockService extends IService<ProdWriteStock> {
 
-    Result list(ProdWriteStock prodWriteStock);
+    Result list(Map<String,String> paramsMap);
 
     Result add(ProdWriteStock prodWriteStock);
 }

huimv-farm-produce/src/main/java/com/huimv/produce/produce/service/impl/ProdWriteStockServiceImpl.java

@@ -28,15 +28,15 @@ import java.util.Map;
 public class ProdWriteStockServiceImpl extends ServiceImpl<ProdWriteStockMapper, ProdWriteStock> implements ProdWriteStockService {
 
     @Autowired
-    private static final String globalFarmCode = "14";
+    private static final String globalFarmCode = "331023001";
     @Autowired
     private ProdWriteStockMapper prodWriteStockMapper;
 
     @Override
-    public Result list(ProdWriteStock prodWriteStock) {
-        Integer farmId = prodWriteStock.getFarmId();
+    public Result list(Map<String,String> paramsMap) {
+        String farmId = paramsMap.get("farm_id");
         if (farmId==null) {
-            farmId = Integer.parseInt(globalFarmCode);
+            farmId = globalFarmCode;
         }
         QueryWrapper<ProdWriteStock> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("farm_id", farmId);

huimv-farm-produce/src/main/java/com/huimv/produce/warning/controller/SysThresholdController.java

@@ -2,6 +2,7 @@ package com.huimv.produce.warning.controller;
 
 
 import cn.hutool.core.util.ObjectUtil;
+import com.huimv.common.token.TokenSign;
 import com.huimv.common.utils.Result;
 import com.huimv.common.utils.ResultCode;
 import com.huimv.produce.warning.entity.SysThreshold;
@@ -35,8 +36,9 @@ public class SysThresholdController {
 
     @PostMapping("/getThreshold")
     //阈值
-    public Result getThreshold(HttpServletRequest request){
-        return thresholdService.getThreshold(request);
+    public Result getThreshold(@RequestBody  Map<String,String> paramsMap, HttpServletRequest request){
+
+        return thresholdService.getThreshold(request,paramsMap);
     }
 
     @PostMapping("/listWarningInfoWeater")

huimv-farm-produce/src/main/java/com/huimv/produce/warning/service/ISysThresholdService.java

@@ -19,7 +19,7 @@ public interface ISysThresholdService extends IService<SysThreshold> {
     //阈值
     Result listWarningInfoWeater(Map<String, String> map);
 
-    Result getThreshold(HttpServletRequest request);
+    Result getThreshold(HttpServletRequest request,Map<String, String> paramsMap);
 
     Result addThreshold(HttpServletRequest request, Map<String, String> paramsMap);
 }

huimv-farm-produce/src/main/java/com/huimv/produce/warning/service/impl/SysThresholdServiceImpl.java

@@ -62,14 +62,26 @@ public class SysThresholdServiceImpl extends ServiceImpl<SysThresholdMapper, Sys
 
     @Override
     //阈值
-    public Result getThreshold(HttpServletRequest request) {
-        String farmId = request.getHeader("farmId");
-        return new Result(ResultCode.SUCCESS,sysThresholdMapper.selectById(farmId));
+    public Result getThreshold(HttpServletRequest request,Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        SysThreshold sysThreshold = sysThresholdMapper.selectById(farmId);
+        if (ObjectUtil.isEmpty(sysThreshold) ){
+            sysThreshold = new SysThreshold();
+            sysThreshold.setFarmId(Integer.parseInt(farmId));
+            sysThreshold.setDryMin("0");
+            sysThreshold.setDryTem("0");
+            sysThreshold.setMaxHum("0");
+            sysThreshold.setMaxTem("0");
+            sysThreshold.setMinHum("0");
+            sysThreshold.setMinTem("0");
+            sysThresholdMapper.insert(sysThreshold);
+        }
+        return new Result(ResultCode.SUCCESS,sysThreshold);
     }
 
     @Override
     public Result addThreshold(HttpServletRequest request, Map<String, String> paramsMap) {
-        String farmId = request.getHeader("farmId");
+        String farmId = paramsMap.get("farmId");
 
         String maxTem = paramsMap.get("maxTem");