Merge remote-tracking branch 'origin/master'

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

@@ -2,6 +2,7 @@ package com.huimv.produce.produce.controller;
 
 
 import com.huimv.common.utils.Result;
+import com.huimv.produce.produce.entity.ProdWriteStock;
 import com.huimv.produce.produce.service.ProdWriteStockService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -27,13 +28,13 @@ public class ProdWriteStockController {
     private ProdWriteStockService prodWriteStockService;
 
     @PostMapping("/list")
-    public Result list(@RequestBody Map map) {
-        return prodWriteStockService.list(map);
+    public Result list(@RequestBody ProdWriteStock prodWriteStock) {
+        return prodWriteStockService.list(prodWriteStock);
     }
 
     @PostMapping("/add")
-    public Result add(@RequestBody Map map) {
-        return prodWriteStockService.add(map);
+    public Result add(@RequestBody ProdWriteStock prodWriteStock) {
+        return prodWriteStockService.add(prodWriteStock);
     }
 }
 

huimv-farm-produce/src/main/java/com/huimv/produce/produce/entity/ProdWriteStock.java

@@ -4,12 +4,15 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.Version;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author zn
@@ -19,9 +22,9 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = false)
 public class ProdWriteStock implements Serializable {
 
-    private static final long serialVersionUID=1L;
+    private static final long serialVersionUID = 1L;
 
-      @TableId(value = "id", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
     private Integer farmId;
@@ -38,5 +41,8 @@ public class ProdWriteStock implements Serializable {
 
     private Integer outStock;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GTM+8")
+    private Date addTime;
+
 
 }

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(Map map);
+    Result list(ProdWriteStock prodWriteStock);
 
-    Result add(Map map);
+    Result add(ProdWriteStock prodWriteStock);
 }

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

@@ -1,12 +1,19 @@
 package com.huimv.produce.produce.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huimv.common.utils.Result;
+import com.huimv.common.utils.ResultCode;
 import com.huimv.produce.produce.entity.ProdWriteStock;
 import com.huimv.produce.produce.mapper.ProdWriteStockMapper;
 import com.huimv.produce.produce.service.ProdWriteStockService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.text.SimpleDateFormat;
+import java.time.format.DateTimeFormatter;
+import java.util.Date;
 import java.util.Map;
 
 /**
@@ -20,13 +27,63 @@ import java.util.Map;
 @Service
 public class ProdWriteStockServiceImpl extends ServiceImpl<ProdWriteStockMapper, ProdWriteStock> implements ProdWriteStockService {
 
+    @Autowired
+    private static final String globalFarmCode = "14";
+    @Autowired
+    private ProdWriteStockMapper prodWriteStockMapper;
+
     @Override
-    public Result list(Map map) {
-        return null;
+    public Result list(ProdWriteStock prodWriteStock) {
+        Integer farmId = prodWriteStock.getFarmId();
+        if (farmId==null) {
+            farmId = Integer.parseInt(globalFarmCode);
+        }
+        QueryWrapper<ProdWriteStock> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_id", farmId);
+        ProdWriteStock prodWriteStock1 = prodWriteStockMapper.selectOne(queryWrapper);
+        JSONObject jsonObject = new JSONObject();
+        if (prodWriteStock1 == null) {
+            jsonObject.put("addTime", 0);
+            jsonObject.put("allStock", 0);
+            jsonObject.put("pigletStock", 0);
+            jsonObject.put("sowStock", 0);
+            jsonObject.put("fatStock", 0);
+            jsonObject.put("boarStock", 0);
+            jsonObject.put("outStock", 0);
+        } else {
+            Date date = new Date();
+            SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            jsonObject.put("addTime", format.format(prodWriteStock1.getAddTime()));
+            jsonObject.put("allStock", prodWriteStock1.getAllStock());
+            jsonObject.put("pigletStock", prodWriteStock1.getPigletStock());
+            jsonObject.put("sowStock", prodWriteStock1.getSowStock());
+            jsonObject.put("fatStock", prodWriteStock1.getFatStock());
+            jsonObject.put("boarStock", prodWriteStock1.getBoarStock());
+            jsonObject.put("outStock", prodWriteStock1.getOutStock());
+
+        }
+        return new Result(ResultCode.SUCCESS,jsonObject);
     }
 
     @Override
-    public Result add(Map map) {
-        return null;
+    public Result add(ProdWriteStock prodWriteStock) {
+        //保持只有一条最新的填报数据
+        QueryWrapper<ProdWriteStock> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_id", globalFarmCode);
+        prodWriteStockMapper.delete(queryWrapper);
+
+        ProdWriteStock prodWriteStock1 = new ProdWriteStock();
+        prodWriteStock1.setFarmId(Integer.parseInt(globalFarmCode));
+        long timeMillis = System.currentTimeMillis();
+        prodWriteStock1.setAddTime(new Date(timeMillis));
+        prodWriteStock1.setAllStock(prodWriteStock.getAllStock());
+        prodWriteStock1.setPigletStock(prodWriteStock.getPigletStock());
+        prodWriteStock1.setSowStock(prodWriteStock.getSowStock());
+        prodWriteStock1.setFatStock(prodWriteStock.getFatStock());
+        prodWriteStock1.setBoarStock(prodWriteStock.getBoarStock());
+        prodWriteStock1.setOutStock(prodWriteStock.getOutStock());
+
+        prodWriteStockMapper.insert(prodWriteStock1);
+        return new Result(ResultCode.SUCCESS,"填报成功");
     }
 }

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

@@ -9,6 +9,7 @@ import com.huimv.produce.warning.service.ISysThresholdService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
 
 /**
@@ -28,20 +29,14 @@ public class SysThresholdController {
     private ISysThresholdService thresholdService;
 
     @PostMapping("/addThreshold")
-    public Result addThreshold(@RequestBody SysThreshold threshold){
-        SysThreshold byId = thresholdService.getById(threshold.getFarmId());
-        if (ObjectUtil.isEmpty(byId)){
-            thresholdService.save(threshold);
-        }else {
-            thresholdService.updateById(threshold);
-        }
-
-        return new Result(10000,"设置成功",true);
+    public Result addThreshold(HttpServletRequest request,@RequestBody Map<String,String> paramsMap){
+        return thresholdService.addThreshold(request,paramsMap);
     }
 
-    @GetMapping("/getThreshold")
-    public Result getThreshold(@RequestParam(name = "farmId") String farmId){
-        return new Result(ResultCode.SUCCESS,thresholdService.getById(farmId));
+    @PostMapping("/getThreshold")
+    //阈值
+    public Result getThreshold(HttpServletRequest request){
+        return thresholdService.getThreshold(request);
     }
 
     @PostMapping("/listWarningInfoWeater")

huimv-farm-produce/src/main/java/com/huimv/produce/warning/entity/SysThreshold.java

@@ -45,58 +45,15 @@ public class SysThreshold extends Model {
      */
     private String minHum;
 
-    /**
-     * 累计流量
-     */
-    private String totalFlow;
-
-    /**
-     * 化学需氧量
-     */
-    @TableField("COD")
-    private String COD;
-
-    /**
-     * 氨氮
-     */
-    private String ammonia;
-
-    /**
-     * 氮
-     */
-    private String nitrogen;
-
-    /**
-     * 磷
-     */
-    private String phosphorus;
-
-
-    /**
-     * ph
-     */
-    private String ph;
-
-
-     /**
-     * 瞬时流量
-     */
-    private String flow;
-
-    /**
-     * 天气高温阈值
+    /*
+     *烘干高温报警阈值
      */
-    private String weatherMaxTem;
-
-
-    /**
-     * 天气低温阈值
+    private String dryTem;
+    //阈值
+    /*
+     *烘干持续时长报警阈值
      */
-    private String weatherMinTem;
-
-    private String benconValue;
-
-    private String benconTime;
+    private String dryMin;
 
 
 }

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.huimv.common.utils.Result;
 import com.huimv.produce.warning.entity.SysThreshold;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
 
 /**
@@ -15,6 +16,10 @@ import java.util.Map;
  * @since 2021-11-30
  */
 public interface ISysThresholdService extends IService<SysThreshold> {
-
+    //阈值
     Result listWarningInfoWeater(Map<String, String> map);
+
+    Result getThreshold(HttpServletRequest request);
+
+    Result addThreshold(HttpServletRequest request, Map<String, String> paramsMap);
 }

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

@@ -1,6 +1,7 @@
 package com.huimv.produce.warning.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huimv.common.utils.Result;
 import com.huimv.common.utils.ResultCode;
@@ -9,7 +10,8 @@ import com.huimv.produce.warning.mapper.SysThresholdMapper;
 import com.huimv.produce.warning.service.ISysThresholdService;
 import org.springframework.stereotype.Service;
 
-import java.util.HashMap;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
 
 /**
@@ -23,34 +25,79 @@ import java.util.Map;
 @Service
 public class SysThresholdServiceImpl extends ServiceImpl<SysThresholdMapper, SysThreshold> implements ISysThresholdService {
 
+    @Resource
+    private SysThresholdMapper sysThresholdMapper;
+
+
     @Override
     public Result listWarningInfoWeater(Map<String, String> map) {
         String farmId = map.get("farmId");
         String maxTem = map.get("maxTem");
         String minTem = map.get("minTem");
         SysThreshold threshold = this.getById(farmId);
-        if(ObjectUtil.isEmpty(threshold)){
-             return new Result(10001,"该牧场未设置天气阈值",false);
-        }
-        String weatherMaxTem = threshold.getWeatherMaxTem();
-        String weatherMixTem = threshold.getWeatherMinTem();
-        Map endMap =new HashMap();
-        if (Double.parseDouble(maxTem) > Double.parseDouble(weatherMaxTem)){
-            endMap.put("maxTem",true);
-            endMap.put("maxTemStr","今日最高温度为"+maxTem+"℃,高于阈值"+weatherMaxTem+"℃");
-        }else {
-            endMap.put("maxTem",false);
-            endMap.put("maxTemStr",null);
-        }
-        if (Double.parseDouble(minTem) < Double.parseDouble(weatherMixTem)){
-            endMap.put("minTem",true);
-            endMap.put("minTemStr","今日最低温度为"+minTem+"℃,低于阈值"+weatherMixTem+"℃");
-        }else {
-            endMap.put("minTem",false);
-            endMap.put("minTemStr",null);
-        }
+//        if(ObjectUtil.isEmpty(threshold)){
+//             return new Result(10001,"该牧场未设置天气阈值",false);
+//        }
+//        String weatherMaxTem = threshold.getWeatherMaxTem();
+//        String weatherMixTem = threshold.getWeatherMinTem();
+//        Map endMap =new HashMap();
+//        if (Double.parseDouble(maxTem) > Double.parseDouble(weatherMaxTem)){
+//            endMap.put("maxTem",true);
+//            endMap.put("maxTemStr","今日最高温度为"+maxTem+"℃,高于阈值"+weatherMaxTem+"℃");
+//        }else {
+//            endMap.put("maxTem",false);
+//            endMap.put("maxTemStr",null);
+//        }
+//        if (Double.parseDouble(minTem) < Double.parseDouble(weatherMixTem)){
+//            endMap.put("minTem",true);
+//            endMap.put("minTemStr","今日最低温度为"+minTem+"℃,低于阈值"+weatherMixTem+"℃");
+//        }else {
+//            endMap.put("minTem",false);
+//            endMap.put("minTemStr",null);
+//        }
 
 
-        return new Result(ResultCode.SUCCESS,endMap);
+        return new Result(ResultCode.SUCCESS,map);
+    }
+
+    @Override
+    //阈值
+    public Result getThreshold(HttpServletRequest request) {
+        String farmId = request.getHeader("farmId");
+        return new Result(ResultCode.SUCCESS,sysThresholdMapper.selectById(farmId));
+    }
+
+    @Override
+    public Result addThreshold(HttpServletRequest request, Map<String, String> paramsMap) {
+        String farmId = request.getHeader("farmId");
+
+        String maxTem = paramsMap.get("maxTem");
+
+        String minTem = paramsMap.get("minTem");
+
+        String maxHum = paramsMap.get("maxHum");
+
+        String minHum = paramsMap.get("minHum");
+
+        String dryTem = paramsMap.get("dryTem");
+
+        String dryMin = paramsMap.get("dryMin");
+
+        SysThreshold newSysThreshold = new SysThreshold();
+        newSysThreshold.setFarmId(Integer.parseInt(farmId));
+        newSysThreshold.setMaxTem(maxTem);
+        newSysThreshold.setMinTem(minTem);
+        newSysThreshold.setMaxHum(maxHum);
+        newSysThreshold.setMinHum(minHum);
+        newSysThreshold.setDryTem(dryTem);
+        newSysThreshold.setDryMin(dryMin);
+        QueryWrapper<SysThreshold> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_Id",farmId);
+        if (sysThresholdMapper.exists(queryWrapper)) {
+            sysThresholdMapper.updateById(newSysThreshold);
+        }else{
+            sysThresholdMapper.insert(newSysThreshold);
+        }
+        return Result.SUCCESS();
     }
 }