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

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

@@ -1,11 +1,17 @@
 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.entity.GasData;
+import com.huimv.admin.entity.ProdAnalysis;
+import com.huimv.admin.entity.dto.Gas;
+import com.huimv.admin.entity.dto.GasDataDTO;
 import com.huimv.admin.mapper.GasDataMapper;
 import com.huimv.admin.service.IGasDataService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -13,6 +19,8 @@ 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.List;
 import java.util.Map;
 
 /**
@@ -40,12 +48,49 @@ public class GasDataController {
     }
 
     @RequestMapping("/add")
-    public Result add(HttpServletRequest httpServletRequest, @RequestBody GasData gasData) {
-        gasData.setDisplayType(1);
-        gasDataMapper.insert(gasData);
+    @Transactional
+    public Result add(HttpServletRequest httpServletRequest, @RequestBody GasDataDTO gasDataDTO) {
+        String farmId = gasDataDTO.getFarmId();
+        List<Gas> list = gasDataDTO.getList();
+        gasDataService.remove(new QueryWrapper<GasData>().eq("display_type",1).eq("farm_id",farmId));
+        for (Gas gas : list) {
+            List<GasData> gasData = new ArrayList<>();
+            GasData above = gas.getAbove();
+            GasData people = gas.getPeople();
+            GasData pigpen = gas.getPigpen();
+            GasData under = gas.getUnder();
+
+            above.setCreateTime(gas.getCreateTime());
+            above.setDisplayType(1);
+            above.setLoctionType(2);
+            above.setFarmId(Integer.valueOf(farmId));
+            people.setCreateTime(gas.getCreateTime());
+            people.setDisplayType(1);
+            people.setLoctionType(4);
+            people.setFarmId(Integer.valueOf(farmId));
+            pigpen.setCreateTime(gas.getCreateTime());
+            pigpen.setDisplayType(1);
+            pigpen.setLoctionType(1);
+            pigpen.setFarmId(Integer.valueOf(farmId));
+            under.setCreateTime(gas.getCreateTime());
+            under.setDisplayType(1);
+            under.setFarmId(Integer.valueOf(farmId));
+            under.setLoctionType(3);
+
+            gasData.add(above);
+            gasData.add(people);
+            gasData.add(pigpen);
+            gasData.add(under);
+            gasDataService.saveBatch(gasData);
+        }
         return Result.SUCCESS();
     }
 
+    @RequestMapping("/listGas")
+    public Result listGas(HttpServletRequest httpServletRequest, @RequestBody Map<String,String> paramsMap) {
+        return gasDataService.listGas(httpServletRequest,paramsMap);
+    }
+
     @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/entity/dto/Gas.java

@@ -0,0 +1,18 @@
+package com.huimv.admin.entity.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.huimv.admin.entity.GasData;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class Gas {
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date createTime;
+    private GasData above;
+    private GasData under;
+    private GasData people;
+    private GasData pigpen;
+
+}

huimv-admin/src/main/java/com/huimv/admin/entity/dto/GasDataDTO.java

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

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

@@ -3,6 +3,9 @@ package com.huimv.admin.mapper;
 import com.huimv.admin.entity.GasData;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * <p>
  *  Mapper 接口
@@ -13,4 +16,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface GasDataMapper extends BaseMapper<GasData> {
 
+    List<Date> selectTime(String farmId);
 }

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

@@ -19,4 +19,6 @@ public interface IGasDataService extends IService<GasData> {
     Result list(HttpServletRequest httpServletRequest, Map<String,String> paramsMap);
 
     Result listArea(HttpServletRequest httpServletRequest, Map<String,String> paramsMap);
+
+    Result listGas(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 }

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

@@ -11,6 +11,7 @@ import com.huimv.admin.common.utils.DataUill;
 import com.huimv.admin.common.utils.Result;
 import com.huimv.admin.common.utils.ResultCode;
 import com.huimv.admin.entity.GasData;
+import com.huimv.admin.entity.dto.Gas;
 import com.huimv.admin.entity.vo.GasDataVo;
 import com.huimv.admin.mapper.GasDataMapper;
 import com.huimv.admin.service.IGasDataService;
@@ -19,10 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.Date;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * <p>
@@ -174,4 +172,21 @@ public class GasDataServiceImpl extends ServiceImpl<GasDataMapper, GasData> impl
 
         return new Result(ResultCode.SUCCESS, jsonObject);
     }
+
+    @Override
+    public Result listGas(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        List<Date> dateList = dataMapper.selectTime(farmId);
+        List<Gas> gasList = new ArrayList<>();
+        for (Date date : dateList) {
+            Gas gas = new Gas();
+            gas.setCreateTime(date);
+            gas.setAbove(dataMapper.selectOne(new QueryWrapper<GasData>().eq("loction_type",2).eq("farm_id",farmId).eq("create_time",date).eq("display_type",1)));
+            gas.setPeople(dataMapper.selectOne(new QueryWrapper<GasData>().eq("loction_type",4).eq("farm_id",farmId).eq("create_time",date).eq("display_type",1)));
+            gas.setPigpen(dataMapper.selectOne(new QueryWrapper<GasData>().eq("loction_type",1).eq("farm_id",farmId).eq("create_time",date).eq("display_type",1)));
+            gas.setUnder(dataMapper.selectOne(new QueryWrapper<GasData>().eq("loction_type",3).eq("farm_id",farmId).eq("create_time",date).eq("display_type",1)));
+            gasList.add(gas);
+        }
+        return new Result(ResultCode.SUCCESS,gasList);
+    }
 }

huimv-admin/src/main/resources/com/huimv/admin/mapper/GasDataMapper.xml

@@ -23,4 +23,8 @@
         <result column="farm_id" property="farmId"/>
     </resultMap>
 
+    <select id="selectTime" resultType="date">
+        SELECT DISTINCT create_time FROM `gas_data` WHERE farm_id=#{farmId} AND display_type = 1 ORDER BY create_time ASC
+    </select>
+
 </mapper>