气体预警、气体检测、统计分析

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

@@ -1,13 +1,21 @@
 package com.huimv.admin.controller;
 
 
+import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.service.IGasDataService;
+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 author
@@ -15,6 +23,19 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/gas-data")
+@CrossOrigin
 public class GasDataController {
 
+    @Autowired
+    private IGasDataService gasDataService;
+
+    @RequestMapping("/list")
+    public Result list(HttpServletRequest httpServletRequest, @RequestBody Map<String,String> paramsMap) {
+        return gasDataService.list(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/controller/GasWarningInfoController.java

@@ -1,13 +1,21 @@
 package com.huimv.admin.controller;
 
 
+import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.service.IGasWarningInfoService;
+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 author
@@ -15,6 +23,14 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/gas-warning-info")
+@CrossOrigin
 public class GasWarningInfoController {
 
+    @Autowired
+    private IGasWarningInfoService gasWarningInfoService;
+
+    @RequestMapping("/list")
+    public Result list(HttpServletRequest httpServletRequest, @RequestBody Map<String,String> paramsMap) {
+        return gasWarningInfoService.list(httpServletRequest,paramsMap);
+    }
 }

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

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -66,7 +68,7 @@ public class GasData implements Serializable {
     /**
      * CH3SH
      */
-    private byte[] ch3sh;
+    private String ch3sh;
 
     /**
      * 三甲胺
@@ -83,6 +85,7 @@ public class GasData implements Serializable {
      */
     private String originalData;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private LocalDateTime createTime;
 
     private String other1;
@@ -91,5 +94,7 @@ public class GasData implements Serializable {
 
     private String other3;
 
+    private Integer farmId;
+
 
 }

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

@@ -1,8 +1,12 @@
 package com.huimv.admin.service;
 
+import com.huimv.admin.common.utils.Result;
 import com.huimv.admin.entity.GasData;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
 /**
  * <p>
  *  服务类
@@ -12,5 +16,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @since 2023-02-21
  */
 public interface IGasDataService extends IService<GasData> {
+    Result list(HttpServletRequest httpServletRequest, Map<String,String> paramsMap);
 
+    Result listArea(HttpServletRequest httpServletRequest, Map<String,String> paramsMap);
 }

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

@@ -1,8 +1,12 @@
 package com.huimv.admin.service;
 
+import com.huimv.admin.common.utils.Result;
 import com.huimv.admin.entity.GasWarningInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
 /**
  * <p>
  *  服务类
@@ -12,5 +16,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @since 2023-02-21
  */
 public interface IGasWarningInfoService extends IService<GasWarningInfo> {
-
+    Result list(HttpServletRequest httpServletRequest, Map<String,String> paramsMap);
 }

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

@@ -1,11 +1,25 @@
 package com.huimv.admin.service.impl;
 
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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.mapper.GasDataMapper;
 import com.huimv.admin.service.IGasDataService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  *  服务实现类
@@ -17,4 +31,63 @@ import org.springframework.stereotype.Service;
 @Service
 public class GasDataServiceImpl extends ServiceImpl<GasDataMapper, GasData> implements IGasDataService {
 
+    @Autowired
+    private GasDataMapper dataMapper;
+    @Override
+    public Result list(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        QueryWrapper<GasData> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_id", farmId);
+        DateTime dateTime = DateUtil.beginOfDay(new Date());
+        queryWrapper.ge("create_time", dateTime).orderByAsc("create_time");
+        List<GasData> gasData = dataMapper.selectList(queryWrapper);
+        JSONArray jsonArray = new JSONArray();
+
+        for (GasData gasDatum : gasData) {
+            JSONObject jsonObject = new JSONObject();
+            if (gasDatum.getLoctionType() == 1) {
+                jsonObject.put("pigpen", gasDatum);
+            } else if (gasDatum.getLoctionType() == 2) {
+                jsonObject.put("above", gasDatum);
+            } else if (gasDatum.getLoctionType() == 3) {
+                jsonObject.put("under", gasDatum);
+            } else if (gasDatum.getLoctionType() == 4) {
+                jsonObject.put("people", gasDatum);
+            }
+            jsonArray.add(jsonObject);
+        }
+        return new Result(ResultCode.SUCCESS, jsonArray);
+    }
+
+    @Override
+    public Result listArea(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        JSONObject jsonObject = new JSONObject();
+
+        QueryWrapper<GasData> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_id", farmId).eq("loction_type",1).orderByDesc("create_time")
+                .last(" limit 1");
+        GasData gasData = dataMapper.selectOne(queryWrapper);
+        jsonObject.put("pigpen", gasData);
+
+        QueryWrapper<GasData> queryWrapper2 = new QueryWrapper<>();
+        queryWrapper2.eq("farm_id", farmId).eq("loction_type",2).orderByDesc("create_time")
+                .last(" limit 1");
+        GasData gasData2 = dataMapper.selectOne(queryWrapper2);
+        jsonObject.put("above", gasData2);
+
+        QueryWrapper<GasData> queryWrapper3 = new QueryWrapper<>();
+        queryWrapper3.eq("farm_id", farmId).eq("loction_type",3).orderByDesc("create_time")
+                .last(" limit 1");
+        GasData gasData3 = dataMapper.selectOne(queryWrapper3);
+        jsonObject.put("under", gasData3);
+
+        QueryWrapper<GasData> queryWrapper4 = new QueryWrapper<>();
+        queryWrapper4.eq("farm_id", farmId).eq("loction_type",4).orderByDesc("create_time")
+                .last(" limit 1");
+        GasData gasData4 = dataMapper.selectOne(queryWrapper4);
+        jsonObject.put("people", gasData4);
+
+        return new Result(ResultCode.SUCCESS,jsonObject);
+    }
 }

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

@@ -1,11 +1,19 @@
 package com.huimv.admin.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.common.utils.ResultCode;
 import com.huimv.admin.entity.GasWarningInfo;
 import com.huimv.admin.mapper.GasWarningInfoMapper;
 import com.huimv.admin.service.IGasWarningInfoService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
 /**
  * <p>
  *  服务实现类
@@ -17,4 +25,22 @@ import org.springframework.stereotype.Service;
 @Service
 public class GasWarningInfoServiceImpl extends ServiceImpl<GasWarningInfoMapper, GasWarningInfo> implements IGasWarningInfoService {
 
+    @Autowired
+    private GasWarningInfoMapper gasWarningInfoMapper;
+    @Override
+    public Result list(HttpServletRequest httpServletRequest, Map<String,String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        String pageSize = paramsMap.get("pageSize");
+        String pageNo = paramsMap.get("pageNo");
+        if (pageSize == null || pageSize == "") {
+            pageSize = "10";
+        }
+        if (pageNo == null || pageNo == "") {
+            pageNo = "1";
+        }
+        QueryWrapper<GasWarningInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_id", farmId);
+        Page<GasWarningInfo> page = new Page(Integer.parseInt(pageNo), Integer.parseInt(pageSize));
+        return new Result(ResultCode.SUCCESS,gasWarningInfoMapper.selectPage(page,queryWrapper));
+    }
 }

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

@@ -20,6 +20,7 @@
         <result column="other1" property="other1" />
         <result column="other2" property="other2" />
         <result column="other3" property="other3" />
+        <result column="farm_id" property="farmId"/>
     </resultMap>
 
 </mapper>