切换数据源生产的存栏、销售、成本，气体检测

huimv-admin/src/main/java/com/huimv/admin/controller/DisplayTypeController.java

@@ -53,7 +53,9 @@ public class DisplayTypeController {
 
     @RequestMapping("/edit")
     public Result edit(HttpServletRequest httpServletRequest, @RequestBody DisplayType displayType) {
-        displayTypeMapper.updateById(displayType);
+        displayTypeMapper.update(displayType,new QueryWrapper<DisplayType>()
+                .eq("farm_id",displayType.getFarmId())
+                .eq("event_type",displayType.getEventType()));
         return Result.SUCCESS();
     }
 

huimv-admin/src/main/java/com/huimv/admin/controller/ProdAnalysisController.java

@@ -1,8 +1,11 @@
 package com.huimv.admin.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huimv.admin.common.utils.Result;
 import com.huimv.admin.entity.ProdAnalysis;
+import com.huimv.admin.entity.ProdSale;
+import com.huimv.admin.entity.vo.ProdAnalysisVo;
 import com.huimv.admin.service.IProdAnalysisService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.CrossOrigin;
@@ -12,6 +15,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -39,4 +45,25 @@ public class ProdAnalysisController {
     public Result edit(HttpServletRequest httpServletRequest, @RequestBody ProdAnalysis prodAnalysis) {
         return prodAnalysisService.edit(httpServletRequest,prodAnalysis);
     }
+
+    @RequestMapping("/add")
+    public Result add(HttpServletRequest httpServletRequest, @RequestBody ProdAnalysisVo prodAnalysis) {
+        String farmId = prodAnalysis.getFarmId();
+        ProdAnalysis feed = prodAnalysis.getFeed();
+        feed.setCreatTime(new Date());
+        feed.setFarmId(Integer.valueOf(farmId));
+        ProdAnalysis drug = prodAnalysis.getDrug();
+        drug.setFarmId(Integer.valueOf(farmId));
+        drug.setCreatTime(new Date());
+        ProdAnalysis share = prodAnalysis.getShare();
+        share.setFarmId(Integer.valueOf(farmId));
+        share.setCreatTime(new Date());
+        List<ProdAnalysis> prodAnalyses = new ArrayList<>();
+        prodAnalyses.add(feed);
+        prodAnalyses.add(drug);
+        prodAnalyses.add(share);
+        prodAnalysisService.remove(new QueryWrapper<ProdAnalysis>().eq("display_type",1).eq("farm_id",farmId));
+        prodAnalysisService.saveBatch(prodAnalyses);
+        return Result.SUCCESS();
+    }
 }

huimv-admin/src/main/java/com/huimv/admin/controller/ProdSaleController.java

@@ -5,6 +5,9 @@ import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huimv.admin.common.utils.Result;
 import com.huimv.admin.entity.ProdSale;
+import com.huimv.admin.entity.ProdStock;
+import com.huimv.admin.entity.vo.ProdSaleVo;
+import com.huimv.admin.entity.vo.ProdSaleVo2;
 import com.huimv.admin.mapper.ProdSaleMapper;
 import com.huimv.admin.service.IProdSaleService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,11 +46,13 @@ public class ProdSaleController {
     }
 
     @RequestMapping("/add")
-    public Result add(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
-        String farmId = paramsMap.get("farmId");
-        String list = paramsMap.get("list");
+    public Result add(HttpServletRequest httpServletRequest, @RequestBody ProdSaleVo2 prodSaleVo) {
+        String farmId = prodSaleVo.getFarmId();
+        List<ProdSale> prodSales = prodSaleVo.getList();
+        for (ProdSale prodSale : prodSales) {
+            prodSale.setFarmId(Integer.valueOf(farmId));
+        }
         prodSaleService.remove(new QueryWrapper<ProdSale>().eq("display_type",1).eq("farm_id",farmId));
-        List<ProdSale> prodSales = JSONArray.parseArray(list, ProdSale.class);
         prodSaleService.saveBatch(prodSales);
         return Result.SUCCESS();
     }

huimv-admin/src/main/java/com/huimv/admin/controller/ProdStockController.java

@@ -1,11 +1,15 @@
 package com.huimv.admin.controller;
 
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huimv.admin.common.utils.Result;
 import com.huimv.admin.entity.ProdSale;
 import com.huimv.admin.entity.ProdStock;
+import com.huimv.admin.entity.vo.ProdStockVo;
+import com.huimv.admin.entity.vo.ProdStockVo2;
 import com.huimv.admin.mapper.ProdStockMapper;
 import com.huimv.admin.service.IProdStockService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,6 +20,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -49,12 +57,21 @@ public class ProdStockController {
     }
 
     @RequestMapping("/add")
-    public Result add(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
-        String farmId = paramsMap.get("farmId");
-        String list = paramsMap.get("list");
+    public Result add(HttpServletRequest httpServletRequest, @RequestBody ProdStockVo2 prodStockVo2) throws ParseException {
+        String farmId = prodStockVo2.getFarmId();
+        List<ProdStock> prodStocks = prodStockVo2.getList();
+        for (ProdStock prodStock : prodStocks) {
+            prodStock.setZcl(prodStock.getMzcl()
+                    +prodStock.getGzcl()
+                    +prodStock.getBrzcl()
+                    +prodStock.getByzcl()
+                    +prodStock.getYfzcl()
+                    +prodStock.getHbzcl()
+            );
+            prodStock.setFarmId(Integer.valueOf(farmId));
+        }
         prodStockService.remove(new QueryWrapper<ProdStock>().eq("display_type",1).eq("farm_id",farmId));
-        List<ProdStock> prodSales = JSONArray.parseArray(list, ProdStock.class);
-        prodStockService.saveBatch(prodSales);
+        prodStockService.saveBatch(prodStocks);
         return Result.SUCCESS();
     }
 

huimv-admin/src/main/java/com/huimv/admin/entity/vo/ProdAnalysisVo.java

@@ -0,0 +1,14 @@
+package com.huimv.admin.entity.vo;
+
+import com.huimv.admin.entity.ProdAnalysis;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ProdAnalysisVo {
+    private String farmId;
+    private ProdAnalysis feed;
+    private ProdAnalysis share;
+    private ProdAnalysis drug;
+}

huimv-admin/src/main/java/com/huimv/admin/entity/vo/ProdSaleVo2.java

@@ -0,0 +1,12 @@
+package com.huimv.admin.entity.vo;
+
+import com.huimv.admin.entity.ProdSale;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ProdSaleVo2 {
+    private String farmId;
+    private List<ProdSale> list;
+}

huimv-admin/src/main/java/com/huimv/admin/entity/vo/ProdStockVo.java

@@ -23,4 +23,5 @@ public class ProdStockVo {
     private List<ProdStock> prodStocks;
     private ProdStock prodStock;
 
+
 }

huimv-admin/src/main/java/com/huimv/admin/entity/vo/ProdStockVo2.java

@@ -0,0 +1,16 @@
+package com.huimv.admin.entity.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.huimv.admin.entity.ProdStock;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class ProdStockVo2 {
+    private String farmId;
+    private List<ProdStock> list;
+}

huimv-admin/src/main/java/com/huimv/admin/service/impl/ProdStockServiceImpl.java

@@ -58,8 +58,6 @@ public class ProdStockServiceImpl extends ServiceImpl<ProdStockMapper, ProdStock
         if (StringUtils.isBlank(displayType)){
             displayType = "0";
         }
-        System.out.println(farmId);
-
         QueryWrapper<ProdStock> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("farm_id", farmId);
         queryWrapper.eq("display_type",Integer.parseInt(displayType));
@@ -73,6 +71,25 @@ public class ProdStockServiceImpl extends ServiceImpl<ProdStockMapper, ProdStock
         queryWrapper1.eq("farm_id", farmId).orderByDesc("creat_time").last(" limit 1");
         queryWrapper1.eq("display_type",Integer.parseInt(displayType));
         ProdStock prodStock = prodStockMapper.selectOne(queryWrapper1);
+        if (ObjectUtil.isEmpty(prodStock)){
+            prodStock = new ProdStock();
+            prodStock.setFarmId(Integer.valueOf(farmId));
+            prodStock.setDisplayType(Integer.valueOf(displayType));
+            prodStock.setZcl(0);
+            prodStock.setYfzcl(0);
+            prodStock.setByzcl(0);
+            prodStock.setZzcl(0);
+            prodStock.setBrmzcl(0);
+            prodStock.setBrzcl(0);
+            prodStock.setCreatTime(new Date());
+            prodStock.setGzcl(0);
+            prodStock.setHbzcl(0);
+            prodStock.setKhzcl(0);
+            prodStock.setMzcl(0);
+            prodStock.setRszcl(0);
+            prodStock.setSpzcl(0);
+            prodStockMapper.insert(prodStock);
+        }
         ProdStockVo prodStockVo = new ProdStockVo();
         prodStockVo.setCount(0);
         prodStockVo.setProdStock(prodStock);