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,"填报成功");
     }
 }