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

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

@@ -0,0 +1,60 @@
+package com.huimv.admin.controller;
+
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.common.utils.ResultCode;
+import com.huimv.admin.entity.DisplayType;
+import com.huimv.admin.entity.ProdAnalysis;
+import com.huimv.admin.mapper.DisplayTypeMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author newspaper
+ * @since 2023-11-20
+ */
+@CrossOrigin
+@RestController
+@RequestMapping("/display-type")
+public class DisplayTypeController {
+    @Autowired
+    private DisplayTypeMapper displayTypeMapper;
+
+    @RequestMapping("/get")
+    public Result get(HttpServletRequest httpServletRequest, @RequestBody Map<String,String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        String eventType = paramsMap.get("eventType");
+        QueryWrapper<DisplayType> queryWrapper = new QueryWrapper();
+        queryWrapper.eq("farm_id",farmId).eq("event_type",eventType);
+        DisplayType displayType = displayTypeMapper.selectOne(queryWrapper);
+        if (ObjectUtil.isEmpty(displayType)){
+            displayType = new DisplayType();
+            displayType.setFarmId(Integer.valueOf(farmId));
+            displayType.setEventType(Integer.valueOf(eventType));
+            displayType.setDisplayType(0);
+            displayTypeMapper.insert(displayType);
+        }
+        return new Result(ResultCode.SUCCESS,displayType);
+    }
+
+
+    @RequestMapping("/edit")
+    public Result edit(HttpServletRequest httpServletRequest, @RequestBody DisplayType displayType) {
+        displayTypeMapper.updateById(displayType);
+        return Result.SUCCESS();
+    }
+
+}

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

@@ -2,6 +2,8 @@ package com.huimv.admin.controller;
 
 
 import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.entity.GasData;
+import com.huimv.admin.mapper.GasDataMapper;
 import com.huimv.admin.service.IGasDataService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.CrossOrigin;
@@ -29,11 +31,21 @@ public class GasDataController {
     @Autowired
     private IGasDataService gasDataService;
 
+    @Autowired
+    private GasDataMapper gasDataMapper;
+
     @RequestMapping("/list")
     public Result list(HttpServletRequest httpServletRequest, @RequestBody Map<String,String> paramsMap) {
         return gasDataService.list(httpServletRequest,paramsMap);
     }
 
+    @RequestMapping("/add")
+    public Result add(HttpServletRequest httpServletRequest, @RequestBody GasData gasData) {
+        gasData.setDisplayType(1);
+        gasDataMapper.insert(gasData);
+        return Result.SUCCESS();
+    }
+
     @RequestMapping("/listArea")
     public Result listArea(HttpServletRequest httpServletRequest, @RequestBody Map<String,String> paramsMap) {
         return gasDataService.listArea(httpServletRequest,paramsMap);

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

@@ -1,8 +1,11 @@
 package com.huimv.admin.controller;
 
 
+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.mapper.ProdSaleMapper;
 import com.huimv.admin.service.IProdSaleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.CrossOrigin;
@@ -31,17 +34,24 @@ public class ProdSaleController {
     @Autowired
     private IProdSaleService prodSaleService;
 
+    @Autowired
+    private ProdSaleMapper prodSaleMapper;
+
     @RequestMapping("/list")
     public Result list(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
         return prodSaleService.list(httpServletRequest,paramsMap);
     }
 
     @RequestMapping("/add")
-    public Result list(HttpServletRequest httpServletRequest, @RequestBody ProdSale prodSale) {
-        return prodSaleService.add(httpServletRequest,prodSale);
+    public Result add(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        String list = paramsMap.get("list");
+        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();
     }
 
-
     @RequestMapping("/listScreen")
     public Result listScreen(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
         return prodSaleService.listScreen(httpServletRequest,paramsMap);

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

@@ -1,7 +1,12 @@
 package com.huimv.admin.controller;
 
 
+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.mapper.ProdStockMapper;
 import com.huimv.admin.service.IProdStockService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.CrossOrigin;
@@ -11,6 +16,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -29,6 +35,9 @@ public class ProdStockController {
     @Autowired
     private IProdStockService prodStockService;
 
+    @Autowired
+    private ProdStockMapper prodStockMapper;
+
     @RequestMapping("/list")
     public Result list(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
         return prodStockService.list(httpServletRequest,paramsMap);
@@ -38,4 +47,26 @@ public class ProdStockController {
     public Result listStockScreen(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
         return prodStockService.listStockScreen(httpServletRequest,paramsMap);
     }
+
+    @RequestMapping("/add")
+    public Result add(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        String list = paramsMap.get("list");
+        prodStockService.remove(new QueryWrapper<ProdStock>().eq("display_type",1).eq("farm_id",farmId));
+        List<ProdStock> prodSales = JSONArray.parseArray(list, ProdStock.class);
+        prodStockService.saveBatch(prodSales);
+        return Result.SUCCESS();
+    }
+
+    @RequestMapping("/update")
+    public Result update(@RequestBody ProdStock prodStock) {
+        prodStockMapper.updateById(prodStock);
+        return Result.SUCCESS();
+    }
+
+    @RequestMapping("/delete")
+    public Result delete(@RequestBody ProdStock prodStock) {
+        prodStockMapper.deleteById(prodStock);
+        return Result.SUCCESS();
+    }
 }

huimv-admin/src/main/java/com/huimv/admin/entity/DisplayType.java

@@ -0,0 +1,41 @@
+package com.huimv.admin.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author newspaper
+ * @since 2023-11-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("display_type")
+public class DisplayType implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @TableField("farm_id")
+    private Integer farmId;
+
+    @TableField("event_type")
+    private Integer eventType;
+
+    @TableField("display_type")
+    private Integer displayType;
+
+
+}

huimv-admin/src/main/java/com/huimv/admin/entity/GasData.java

@@ -89,7 +89,7 @@ public class GasData implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date createTime;
 
-    private String other1;
+    private Integer displayType;
 
     private String other2;
 

huimv-admin/src/main/java/com/huimv/admin/entity/ProdAnalysis.java

@@ -71,7 +71,7 @@ public class ProdAnalysis implements Serializable {
     private String vaccineCost;
     private String otherCost;
 
-    private String othre1;
+    private Integer displayType;
 
     private String othre2;
 

huimv-admin/src/main/java/com/huimv/admin/entity/ProdSale.java

@@ -45,7 +45,7 @@ public class ProdSale implements Serializable {
 
     private Integer farmId;
 
-    private String other1;
+    private Integer displayType;
 
     private String other2;
 

huimv-admin/src/main/java/com/huimv/admin/entity/ProdStock.java

@@ -99,7 +99,10 @@ public class ProdStock implements Serializable {
 
     private Integer farmId;
 
-    private String other1;
+    /**
+     * 0:接收 1:手填
+     */
+    private Integer displayType;
 
     private String other2;
 

huimv-admin/src/main/java/com/huimv/admin/mapper/DisplayTypeMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.admin.mapper;
+
+import com.huimv.admin.entity.DisplayType;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author newspaper
+ * @since 2023-11-20
+ */
+public interface DisplayTypeMapper extends BaseMapper<DisplayType> {
+
+}

huimv-admin/src/main/java/com/huimv/admin/service/IDisplayTypeService.java

@@ -0,0 +1,16 @@
+package com.huimv.admin.service;
+
+import com.huimv.admin.entity.DisplayType;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author newspaper
+ * @since 2023-11-20
+ */
+public interface IDisplayTypeService extends IService<DisplayType> {
+
+}

huimv-admin/src/main/java/com/huimv/admin/service/IProdSaleService.java

@@ -18,7 +18,7 @@ import java.util.Map;
 public interface IProdSaleService extends IService<ProdSale> {
     Result list(HttpServletRequest httpServletRequest, Map<String,String> paramsMap);
 
-    Result add(HttpServletRequest httpServletRequest,ProdSale prodSale);
+    Result add(HttpServletRequest httpServletRequest,Map<String, String> paramsMap);
 
     Result listScreen(HttpServletRequest httpServletRequest, Map<String,String> paramsMap);
 }

huimv-admin/src/main/java/com/huimv/admin/service/IProdStockService.java

@@ -23,4 +23,6 @@ public interface IProdStockService extends IService<ProdStock> {
     Result list(HttpServletRequest httpServletRequest, Map<String,String> paramsMap);
 
     Result listStockScreen(HttpServletRequest httpServletRequest,Map<String,String> paramaMap);
+
+    Result add(HttpServletRequest httpServletRequest, ProdStock prodStock);
 }

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

@@ -0,0 +1,20 @@
+package com.huimv.admin.service.impl;
+
+import com.huimv.admin.entity.DisplayType;
+import com.huimv.admin.mapper.DisplayTypeMapper;
+import com.huimv.admin.service.IDisplayTypeService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author newspaper
+ * @since 2023-11-20
+ */
+@Service
+public class DisplayTypeServiceImpl extends ServiceImpl<DisplayTypeMapper, DisplayType> implements IDisplayTypeService {
+
+}

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

@@ -6,6 +6,7 @@ import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.huimv.admin.common.utils.DataUill;
 import com.huimv.admin.common.utils.Result;
 import com.huimv.admin.common.utils.ResultCode;
@@ -41,8 +42,12 @@ public class GasDataServiceImpl extends ServiceImpl<GasDataMapper, GasData> impl
     public Result list(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
         String farmId = paramsMap.get("farmId");
         String date = paramsMap.get("time");
-
+        String displayType = paramsMap.get("displayType");
+        if (StringUtils.isBlank(displayType)){
+            displayType = "0";
+        }
         QueryWrapper<GasData> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("display_type",Integer.parseInt(displayType));
         queryWrapper.eq("farm_id", farmId);
         if (farmId.equals("22")) {
             if (date == null || date == "") {
@@ -113,9 +118,14 @@ public class GasDataServiceImpl extends ServiceImpl<GasDataMapper, GasData> impl
     @Override
     public Result listArea(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
         String farmId = paramsMap.get("farmId");
+        String displayType = paramsMap.get("displayType");
         JSONObject jsonObject = new JSONObject();
 
+        if (StringUtils.isBlank(displayType)){
+            displayType = "0";
+        }
         QueryWrapper<GasData> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("display_type",Integer.parseInt(displayType));
         queryWrapper.eq("farm_id", farmId).eq("loction_type", 1).orderByDesc("create_time")
                 .last(" limit 1");
         GasData gasData = dataMapper.selectOne(queryWrapper);
@@ -127,6 +137,7 @@ public class GasDataServiceImpl extends ServiceImpl<GasDataMapper, GasData> impl
 
 
         QueryWrapper<GasData> queryWrapper2 = new QueryWrapper<>();
+        queryWrapper2.eq("display_type",Integer.parseInt(displayType));
         queryWrapper2.eq("farm_id", farmId).eq("loction_type", 2).orderByDesc("create_time")
                 .last(" limit 1");
         GasData gasData2 = dataMapper.selectOne(queryWrapper2);
@@ -138,6 +149,7 @@ public class GasDataServiceImpl extends ServiceImpl<GasDataMapper, GasData> impl
 
 
         QueryWrapper<GasData> queryWrapper3 = new QueryWrapper<>();
+        queryWrapper3.eq("display_type",Integer.parseInt(displayType));
         queryWrapper3.eq("farm_id", farmId).eq("loction_type", 3).orderByDesc("create_time")
                 .last(" limit 1");
         GasData gasData3 = dataMapper.selectOne(queryWrapper3);
@@ -149,6 +161,7 @@ public class GasDataServiceImpl extends ServiceImpl<GasDataMapper, GasData> impl
 
 
         QueryWrapper<GasData> queryWrapper4 = new QueryWrapper<>();
+        queryWrapper4.eq("display_type",Integer.parseInt(displayType));
         queryWrapper4.eq("farm_id", farmId).eq("loction_type", 4).orderByDesc("create_time")
                 .last(" limit 1");
         GasData gasData4 = dataMapper.selectOne(queryWrapper4);

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

@@ -34,12 +34,17 @@ public class ProdAnalysisServiceImpl extends ServiceImpl<ProdAnalysisMapper, Pro
     @Override
     public Result list(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
         String farmId = paramsMap.get("farmId");
+        String displayType = paramsMap.get("displayType");
+        if (StringUtils.isBlank(displayType)){
+            displayType = "0";
+        }
         ProAnalysisVo proAnalysisVo = new ProAnalysisVo();
         Integer count=null;
         Integer count1=null;
         Integer count2=null;
 
         QueryWrapper<ProdAnalysis> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("display_type",Integer.parseInt(displayType));
         queryWrapper.eq("farm_id", farmId).eq("type", 1).orderByDesc("creat_time")
                 .last(" limit 1");
         ProdAnalysis prodAnalysis = prodAnalysisMapper.selectOne(queryWrapper);
@@ -62,6 +67,7 @@ public class ProdAnalysisServiceImpl extends ServiceImpl<ProdAnalysisMapper, Pro
         }
 
         QueryWrapper<ProdAnalysis> queryWrapper1 = new QueryWrapper<>();
+        queryWrapper1.eq("display_type",Integer.parseInt(displayType));
         queryWrapper1.eq("farm_id", farmId).eq("type", 2).orderByDesc("creat_time")
                 .last(" limit 1");
         ProdAnalysis prodAnalysis1 = prodAnalysisMapper.selectOne(queryWrapper1);
@@ -89,6 +95,7 @@ public class ProdAnalysisServiceImpl extends ServiceImpl<ProdAnalysisMapper, Pro
 
 
         QueryWrapper<ProdAnalysis> queryWrapper2 = new QueryWrapper<>();
+        queryWrapper2.eq("display_type",Integer.parseInt(displayType));
         queryWrapper2.eq("farm_id", farmId).eq("type", 3).orderByDesc("creat_time")
                 .last(" limit 1");
         ProdAnalysis prodAnalysis2 = prodAnalysisMapper.selectOne(queryWrapper2);
@@ -117,7 +124,7 @@ public class ProdAnalysisServiceImpl extends ServiceImpl<ProdAnalysisMapper, Pro
 
     @Override
     public Result edit(HttpServletRequest httpServletRequest, ProdAnalysis prodAnalysis) {
-
+        prodAnalysis.setDisplayType(1);
         QueryWrapper<ProdAnalysis> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("id", prodAnalysis.getId());
         ProdAnalysis prodAnalysis1 = prodAnalysisMapper.selectOne(queryWrapper);

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

@@ -1,6 +1,7 @@
 package com.huimv.admin.service.impl;
 
 import cn.hutool.core.date.DateUtil;
+import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.huimv.admin.common.utils.DataUill;
@@ -40,9 +41,14 @@ public class ProdSaleServiceImpl extends ServiceImpl<ProdSaleMapper, ProdSale> i
     @Override
     public Result list(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
         String farmId = paramsMap.get("farmId");
+        String displayType = paramsMap.get("displayType");
         String startTime = paramsMap.get("startTime");
         String endTime = paramsMap.get("endTime");
 
+        if (StringUtils.isBlank(displayType)){
+            displayType = "0";
+        }
+
         Integer moneyCount = 0;
         Integer quantityCount = 0;
         Integer moneyCount1 = 0;
@@ -51,6 +57,7 @@ public class ProdSaleServiceImpl extends ServiceImpl<ProdSaleMapper, ProdSale> i
 
         ProdSaleVo prodSaleVo = new ProdSaleVo();
         QueryWrapper<ProdSale> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("display_type",Integer.parseInt(displayType));
         queryWrapper.eq("farm_id", farmId);
         if (StringUtils.isBlank(startTime) || StringUtils.isBlank(endTime)) {
             Calendar calendar = Calendar.getInstance();
@@ -81,6 +88,7 @@ public class ProdSaleServiceImpl extends ServiceImpl<ProdSaleMapper, ProdSale> i
         //本月
         Date timesMonthmorning = DataUill.getTimesMonthmorning();
         QueryWrapper<ProdSale> saleQueryWrapper = new QueryWrapper<>();
+        saleQueryWrapper.eq("display_type",Integer.parseInt(displayType));
         saleQueryWrapper.ge("creat_time", timesMonthmorning).eq("farm_id", farmId);
         List<ProdSale> prodSales = saleMapper.selectList(saleQueryWrapper);
         for (ProdSale prodSale : prodSales) {
@@ -108,6 +116,7 @@ public class ProdSaleServiceImpl extends ServiceImpl<ProdSaleMapper, ProdSale> i
         cal_2.set(Calendar.SECOND, 59);
         String lastDay = format.format(cal_2.getTime());
         QueryWrapper<ProdSale> queryWrapper1 = new QueryWrapper<>();
+        queryWrapper1.eq("display_type",Integer.parseInt(displayType));
         queryWrapper1.between("creat_time", firstDay, lastDay);
         List<ProdSale> prodSales1 = saleMapper.selectList(queryWrapper1);
         for (ProdSale prodSale : prodSales1) {
@@ -128,8 +137,9 @@ public class ProdSaleServiceImpl extends ServiceImpl<ProdSaleMapper, ProdSale> i
     }
 
     @Override
-    public Result add(HttpServletRequest httpServletRequest, ProdSale prodSale) {
-        saleMapper.insert(prodSale);
+    public Result add(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+
+
         return new Result(ResultCode.SUCCESS,"添加成功");
     }
 
@@ -137,7 +147,12 @@ public class ProdSaleServiceImpl extends ServiceImpl<ProdSaleMapper, ProdSale> i
     public Result listScreen(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
         String farmId = paramsMap.get("farmId");
         String type = paramsMap.get("type");
+        String displayType = paramsMap.get("displayType");
+        if (StringUtils.isBlank(displayType)){
+            displayType = "0";
+        }
         QueryWrapper<ProdSale> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("display_type",Integer.parseInt(displayType));
         queryWrapper.eq("farm_id", farmId);
         if (type == null || type == "") {
             type = "1";

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

@@ -6,6 +6,7 @@ import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.huimv.admin.common.utils.DataUill;
 import com.huimv.admin.common.utils.Result;
 import com.huimv.admin.common.utils.ResultCode;
@@ -53,10 +54,15 @@ public class ProdStockServiceImpl extends ServiceImpl<ProdStockMapper, ProdStock
     @Override
     public Result list(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
         String farmId = paramsMap.get("farmId");
+        String displayType = paramsMap.get("displayType");
+        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));
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); //格式化时间
         //获取前12个月的第一天
         queryWrapper.ge("creat_time", DateUtil.offsetMonth(new Date(),-12));
@@ -65,6 +71,7 @@ public class ProdStockServiceImpl extends ServiceImpl<ProdStockMapper, ProdStock
 
         QueryWrapper<ProdStock> queryWrapper1 = new QueryWrapper<>();
         queryWrapper1.eq("farm_id", farmId).orderByDesc("creat_time").last(" limit 1");
+        queryWrapper1.eq("display_type",Integer.parseInt(displayType));
         ProdStock prodStock = prodStockMapper.selectOne(queryWrapper1);
         ProdStockVo prodStockVo = new ProdStockVo();
         prodStockVo.setCount(0);
@@ -112,8 +119,13 @@ public class ProdStockServiceImpl extends ServiceImpl<ProdStockMapper, ProdStock
     @Override
     public Result listStockScreen(HttpServletRequest httpServletRequest, Map<String, String> paramaMap) {
         String farmId = paramaMap.get("farmId");
+        String displayType = paramaMap.get("displayType");
+        if (StringUtils.isBlank(displayType)){
+            displayType = "0";
+        }
         QueryWrapper<ProdStock> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("farm_id", farmId);
+        queryWrapper.eq("display_type",Integer.parseInt(displayType));
         queryWrapper.orderByDesc("creat_time").last(" limit 1");
         ProdStock prodStock = prodStockMapper.selectOne(queryWrapper);
         JSONObject jsonObject = new JSONObject();
@@ -136,6 +148,7 @@ public class ProdStockServiceImpl extends ServiceImpl<ProdStockMapper, ProdStock
         }
         Date timesMonthmorning = DataUill.getTimesMonthmorning();
         QueryWrapper<ProdSale> queryWrapper2 = new QueryWrapper<>();
+        queryWrapper2.eq("display_type",Integer.parseInt(displayType));
         queryWrapper2.eq("farm_id", farmId).ge("creat_time", timesMonthmorning);
         Integer count = 0;
         List<ProdSale> prodSales = saleMapper.selectList(queryWrapper2);
@@ -150,6 +163,7 @@ public class ProdStockServiceImpl extends ServiceImpl<ProdStockMapper, ProdStock
         DateTime dateTime = DateUtil.beginOfYear(new Date());
         QueryWrapper<ProdSale> queryWrapper3 = new QueryWrapper<>();
         queryWrapper3.eq("farm_id", farmId).ge("creat_time",dateTime);
+        queryWrapper3.eq("display_type",Integer.parseInt(displayType));
         Integer yearCount = 0;
         List<ProdSale> yearProdSales = saleMapper.selectList(queryWrapper3);
         if (yearProdSales.size() == 0) {
@@ -164,4 +178,10 @@ public class ProdStockServiceImpl extends ServiceImpl<ProdStockMapper, ProdStock
         jsonObject.put("yearCount", yearCount);
         return new Result(ResultCode.SUCCESS,jsonObject);
     }
+
+    @Override
+    public Result add(HttpServletRequest httpServletRequest, ProdStock prodStock) {
+        prodStockMapper.insert(prodStock);
+        return Result.SUCCESS();
+    }
 }

huimv-admin/src/main/java/com/huimv/admin/timer/ShenChanTimer.java

@@ -85,6 +85,7 @@ public class ShenChanTimer {
                         prodStock.setZcl(Integer.parseInt(stock.get(15).toString()));
                         prodStock.setCreatTime(new Date());
                         prodStock.setFarmId(21);
+                        prodStock.setDisplayType(0);
                         prodStockService.updateById(prodStock);
                     }else {
                         prodStock = new ProdStock();
@@ -101,6 +102,7 @@ public class ShenChanTimer {
                         prodStock.setKhzcl(212);
                         prodStock.setSpzcl(1020);
                         prodStock.setCreatTime(new Date());
+                        prodStock.setDisplayType(0);
                         prodStock.setFarmId(21);
                         prodStockService.save(prodStock);
                     }
@@ -157,6 +159,7 @@ public class ShenChanTimer {
                         prodStock.setZcl(66381);
                         prodStock.setCreatTime(new Date());
                         prodStock.setFarmId(23);
+                        prodStock.setDisplayType(0);
                         prodStockService.updateById(prodStock);
                         System.out.println("浦江--》");
                     }else {
@@ -178,6 +181,7 @@ public class ShenChanTimer {
                         prodStock.setKhzcl(212);
                         prodStock.setSpzcl(1020);
                         prodStock.setCreatTime(new Date());
+                        prodStock.setDisplayType(0);
                         prodStock.setFarmId(23);
                         prodStockService.save(prodStock);
                         System.out.println("浦江--》");
@@ -197,6 +201,7 @@ public class ShenChanTimer {
                         prodStock.setZcl(66381);
                         prodStock.setCreatTime(new Date());
                         prodStock.setFarmId(26);
+                        prodStock.setDisplayType(0);
                         prodStockService.updateById(prodStock);
                         System.out.println("横路--》");
                     }else {
@@ -219,6 +224,7 @@ public class ShenChanTimer {
                         prodStock.setSpzcl(1020);
                         prodStock.setCreatTime(new Date());
                         prodStock.setFarmId(26);
+                        prodStock.setDisplayType(0);
                         prodStockService.save(prodStock);
                         System.out.println("横路--》");
                     }
@@ -235,6 +241,7 @@ public class ShenChanTimer {
 //                        prodStock.setZcl(Integer.parseInt(stock.get(15).toString()));
                         prodStock.setZcl(66381);
                         prodStock.setCreatTime(new Date());
+                        prodStock.setDisplayType(0);
                         prodStock.setFarmId(27);
                         prodStockService.updateById(prodStock);
                         System.out.println("天台--》");
@@ -258,6 +265,7 @@ public class ShenChanTimer {
                         prodStock.setSpzcl(1020);
                         prodStock.setCreatTime(new Date());
                         prodStock.setFarmId(27);
+                        prodStock.setDisplayType(0);
                         prodStockService.save(prodStock);
                         System.out.println("天台--》");
                     }

huimv-admin/src/main/resources/mapper/DisplayTypeMapper.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huimv.admin.mapper.DisplayTypeMapper">
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, farm_id, event_type, display_type
+    </sql>
+
+</mapper>