wwh 1 年間 前
コミット
2e2988ac12
18 ファイル変更696 行追加0 行削除
  1. 61 0
      huimv-admin/src/main/java/com/huimv/admin/controller/WriteEnvDataController.java
  2. 54 0
      huimv-admin/src/main/java/com/huimv/admin/controller/WriteProtDataController.java
  3. 50 0
      huimv-admin/src/main/java/com/huimv/admin/entity/WriteEnvData.java
  4. 57 0
      huimv-admin/src/main/java/com/huimv/admin/entity/WriteProtData.java
  5. 14 0
      huimv-admin/src/main/java/com/huimv/admin/entity/vo/WriteEnvDataAddVo.java
  6. 39 0
      huimv-admin/src/main/java/com/huimv/admin/entity/vo/WriteEnvDataVo.java
  7. 49 0
      huimv-admin/src/main/java/com/huimv/admin/entity/vo/WriteEnvDataVo2.java
  8. 22 0
      huimv-admin/src/main/java/com/huimv/admin/entity/vo/WriteProtDataVo.java
  9. 12 0
      huimv-admin/src/main/java/com/huimv/admin/entity/vo/WriteProtDataVo2.java
  10. 19 0
      huimv-admin/src/main/java/com/huimv/admin/entity/vo/WriteProtVo2.java
  11. 25 0
      huimv-admin/src/main/java/com/huimv/admin/mapper/WriteEnvDataMapper.java
  12. 25 0
      huimv-admin/src/main/java/com/huimv/admin/mapper/WriteProtDataMapper.java
  13. 26 0
      huimv-admin/src/main/java/com/huimv/admin/service/IWriteEnvDataService.java
  14. 23 0
      huimv-admin/src/main/java/com/huimv/admin/service/IWriteProtDataService.java
  15. 85 0
      huimv-admin/src/main/java/com/huimv/admin/service/impl/WriteEnvDataServiceImpl.java
  16. 91 0
      huimv-admin/src/main/java/com/huimv/admin/service/impl/WriteProtDataServiceImpl.java
  17. 17 0
      huimv-admin/src/main/resources/com/huimv/admin/mapper/WriteEnvDataMapper.xml
  18. 27 0
      huimv-admin/src/main/resources/com/huimv/admin/mapper/WriteProtDataMapper.xml

+ 61 - 0
huimv-admin/src/main/java/com/huimv/admin/controller/WriteEnvDataController.java

@@ -0,0 +1,61 @@
+package com.huimv.admin.controller;
+
+
+import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.entity.WriteEnvData;
+import com.huimv.admin.entity.vo.WriteEnvDataAddVo;
+import com.huimv.admin.service.IWriteEnvDataService;
+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
+ * @since 2023-11-17
+ */
+@RestController
+@RequestMapping("/write-env-data")
+@CrossOrigin
+public class WriteEnvDataController {
+    @Autowired
+    private IWriteEnvDataService writeEnvDataService;
+
+    @RequestMapping("/envList")
+    public Result addWriteData(HttpServletRequest httpServletRequest, @RequestBody WriteEnvDataAddVo writeEnvDataAddVo) {
+        return writeEnvDataService.add(httpServletRequest,writeEnvDataAddVo);
+    }
+
+    @RequestMapping("/addWriteData")
+    public Result envList(HttpServletRequest httpServletRequest, @RequestBody  WriteEnvData writeEnvData) {
+        writeEnvDataService.save(writeEnvData);
+        return new Result(10000, "添加成功!", true);
+    }
+    @RequestMapping("/editData")
+    public Result editData(@RequestBody WriteEnvData writeEnvData) {
+        writeEnvDataService.updateById(writeEnvData);
+        return new Result(10000, "修改成功!", true);
+    }
+    @RequestMapping("/listData")
+    public Result listData(HttpServletRequest httpServletRequest,@RequestBody  Map<String, String> paramsMap) {
+        return writeEnvDataService.listData(httpServletRequest, paramsMap);
+    }
+    @RequestMapping("/removeWriteData")
+    public Result removeWriteData(@RequestBody  Map<String, String> paramsMap) {
+        String ids = paramsMap.get("ids");
+        String[] split = ids.split(",");
+        for (String s : split) {
+            writeEnvDataService.removeById(s);
+        }
+        return new Result(10000, "删除成功!", true);
+    }
+}

+ 54 - 0
huimv-admin/src/main/java/com/huimv/admin/controller/WriteProtDataController.java

@@ -0,0 +1,54 @@
+package com.huimv.admin.controller;
+
+
+import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.entity.WriteProtData;
+import com.huimv.admin.entity.vo.WriteProtDataVo;
+import com.huimv.admin.entity.vo.WriteProtDataVo2;
+import com.huimv.admin.service.IWriteProtDataService;
+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
+ * @since 2023-11-17
+ */
+@RestController
+@RequestMapping("/write-prot-data")
+@CrossOrigin
+public class WriteProtDataController {
+
+    @Autowired
+    private IWriteProtDataService protDataService;
+
+    @RequestMapping("/addProtData")
+    public Result addProt(HttpServletRequest httpServletRequest, @RequestBody WriteProtData writeProtData) {
+        return protDataService.add(httpServletRequest, writeProtData);
+    }
+
+    @RequestMapping("/addList")
+    public Result addList(HttpServletRequest httpServletRequest, @RequestBody WriteProtDataVo2 writeProtDataVo2) {
+        return protDataService.addList(httpServletRequest, writeProtDataVo2);
+    }
+
+    @RequestMapping("/removeProtData")
+    public Result removeProtData(@RequestBody Map<String, String> paramsMap) {
+        String ids = paramsMap.get("ids");
+        String[] split = ids.split(",");
+        for (String s : split) {
+            protDataService.removeById(s);
+        }
+        return new Result(10000, "删除成功!", true);
+    }
+}

+ 50 - 0
huimv-admin/src/main/java/com/huimv/admin/entity/WriteEnvData.java

@@ -0,0 +1,50 @@
+package com.huimv.admin.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.time.LocalDateTime;
+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;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 环境监测温湿度填报
+ * </p>
+ *
+ * @author author
+ * @since 2023-11-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("write_env_data")
+public class WriteEnvData implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private String temp;
+
+    private String hum;
+
+    private Integer farmId;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createTime;
+
+    private Integer unitId;
+
+    private String aq;
+
+    private String unitName;
+
+
+}

+ 57 - 0
huimv-admin/src/main/java/com/huimv/admin/entity/WriteProtData.java

@@ -0,0 +1,57 @@
+package com.huimv.admin.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.time.LocalDateTime;
+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;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 环保排水监测填报
+ * </p>
+ *
+ * @author author
+ * @since 2023-11-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("write_prot_data")
+public class WriteProtData implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private String ph;
+
+    private String cod;
+
+    private String tn;
+
+    private String tp;
+
+    private String Nh3n;
+
+    private String flow;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createDate;
+
+    private Integer farmId;
+
+    /**
+     * 监测类型 1为进污口 2为处理口 3为排污口
+     */
+    private String type;
+
+
+}

+ 14 - 0
huimv-admin/src/main/java/com/huimv/admin/entity/vo/WriteEnvDataAddVo.java

@@ -0,0 +1,14 @@
+package com.huimv.admin.entity.vo;
+
+import com.huimv.admin.entity.WriteEnvData;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class WriteEnvDataAddVo {
+    private Integer farmId;
+    private String unitName;
+    private String unitId;
+    private List<WriteEnvDataVo2> list;
+}

+ 39 - 0
huimv-admin/src/main/java/com/huimv/admin/entity/vo/WriteEnvDataVo.java

@@ -0,0 +1,39 @@
+package com.huimv.admin.entity.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 环境监测温湿度填报
+ * </p>
+ *
+ * @author author
+ * @since 2023-11-17
+ */
+@Data
+public class WriteEnvDataVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private String envTemp;
+
+    private String envHum;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createTime;
+
+
+
+}

+ 49 - 0
huimv-admin/src/main/java/com/huimv/admin/entity/vo/WriteEnvDataVo2.java

@@ -0,0 +1,49 @@
+package com.huimv.admin.entity.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 环境监测温湿度填报
+ * </p>
+ *
+ * @author author
+ * @since 2023-11-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("write_env_data")
+public class WriteEnvDataVo2 implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private String envTemp;
+
+    private String envHum;
+
+    private Integer farmId;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createTime;
+
+    private Integer unitId;
+
+    private String aq;
+
+    private String unitName;
+
+
+}

+ 22 - 0
huimv-admin/src/main/java/com/huimv/admin/entity/vo/WriteProtDataVo.java

@@ -0,0 +1,22 @@
+package com.huimv.admin.entity.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class WriteProtDataVo {
+    private String ph;
+    private String cod;
+    private String tn;
+    private String tp;
+    private String nh3n;
+    private String flow;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createDate;
+
+    private String loctionType;
+
+}

+ 12 - 0
huimv-admin/src/main/java/com/huimv/admin/entity/vo/WriteProtDataVo2.java

@@ -0,0 +1,12 @@
+package com.huimv.admin.entity.vo;
+
+import com.huimv.admin.entity.WriteProtData;
+import lombok.Data;
+
+@Data
+public class WriteProtDataVo2 {
+    private String farmId;
+    private WriteProtData deal;
+    private WriteProtData in;
+    private WriteProtData out;
+}

+ 19 - 0
huimv-admin/src/main/java/com/huimv/admin/entity/vo/WriteProtVo2.java

@@ -0,0 +1,19 @@
+package com.huimv.admin.entity.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class WriteProtVo2 {
+    private String ph;
+    private String cod;
+    private String tp;
+    private String tn;
+    private String flow;
+    private String nh3n;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createDate;
+    private String type;
+}

+ 25 - 0
huimv-admin/src/main/java/com/huimv/admin/mapper/WriteEnvDataMapper.java

@@ -0,0 +1,25 @@
+package com.huimv.admin.mapper;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.huimv.admin.entity.EnvData;
+import com.huimv.admin.entity.WriteEnvData;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.admin.entity.vo.WriteEnvDataVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 环境监测温湿度填报 Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2023-11-17
+ */
+public interface WriteEnvDataMapper extends BaseMapper<WriteEnvData> {
+    List<WriteEnvDataVo> listDay(@Param(Constants.WRAPPER) QueryWrapper<WriteEnvData> queryWrapper);
+
+    List<WriteEnvDataVo> listNow(@Param(Constants.WRAPPER) QueryWrapper<WriteEnvData> queryWrapper);
+}

+ 25 - 0
huimv-admin/src/main/java/com/huimv/admin/mapper/WriteProtDataMapper.java

@@ -0,0 +1,25 @@
+package com.huimv.admin.mapper;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.huimv.admin.entity.ProtData;
+import com.huimv.admin.entity.WriteProtData;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.admin.entity.vo.ProCountVo;
+import com.huimv.admin.entity.vo.WriteProtDataVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 环保排水监测填报 Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2023-11-17
+ */
+public interface WriteProtDataMapper extends BaseMapper<WriteProtData> {
+    List<WriteProtDataVo> listWrite(@Param(Constants.WRAPPER) QueryWrapper<WriteProtData> queryWrapper);
+    List<WriteProtDataVo> listWriteYear(@Param(Constants.WRAPPER) QueryWrapper<WriteProtData> queryWrapper);
+}

+ 26 - 0
huimv-admin/src/main/java/com/huimv/admin/service/IWriteEnvDataService.java

@@ -0,0 +1,26 @@
+package com.huimv.admin.service;
+
+import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.entity.WriteEnvData;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.admin.entity.vo.WriteEnvDataAddVo;
+import com.huimv.admin.entity.vo.WriteEnvDataVo;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
+/**
+ * <p>
+ * 环境监测温湿度填报 服务类
+ * </p>
+ *
+ * @author author
+ * @since 2023-11-17
+ */
+public interface IWriteEnvDataService extends IService<WriteEnvData> {
+    Result add(HttpServletRequest httpServletRequest, WriteEnvDataAddVo writeEnvDataAddVo);
+
+    Result listData(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
+    //提供一个设备列表,方便添加环保监测的数据
+    Result envList(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
+}

+ 23 - 0
huimv-admin/src/main/java/com/huimv/admin/service/IWriteProtDataService.java

@@ -0,0 +1,23 @@
+package com.huimv.admin.service;
+
+import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.entity.WriteEnvData;
+import com.huimv.admin.entity.WriteProtData;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.admin.entity.vo.WriteProtDataVo2;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * <p>
+ * 环保排水监测填报 服务类
+ * </p>
+ *
+ * @author author
+ * @since 2023-11-17
+ */
+public interface IWriteProtDataService extends IService<WriteProtData> {
+    Result add(HttpServletRequest httpServletRequest, WriteProtData writeProtData);
+
+    Result addList(HttpServletRequest httpServletRequest, WriteProtDataVo2 writeProtDataVo2);
+}

+ 85 - 0
huimv-admin/src/main/java/com/huimv/admin/service/impl/WriteEnvDataServiceImpl.java

@@ -0,0 +1,85 @@
+package com.huimv.admin.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huimv.admin.common.token.TokenSign;
+import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.common.utils.ResultCode;
+import com.huimv.admin.entity.EnvDevice;
+import com.huimv.admin.entity.WriteEnvData;
+import com.huimv.admin.entity.vo.WriteEnvDataAddVo;
+import com.huimv.admin.entity.vo.WriteEnvDataVo2;
+import com.huimv.admin.mapper.EnvDeviceMapper;
+import com.huimv.admin.mapper.WriteEnvDataMapper;
+import com.huimv.admin.service.IWriteEnvDataService;
+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.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 环境监测温湿度填报 服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2023-11-17
+ */
+@Service
+public class WriteEnvDataServiceImpl extends ServiceImpl<WriteEnvDataMapper, WriteEnvData> implements IWriteEnvDataService {
+
+    @Autowired
+    private WriteEnvDataMapper writeEnvDataMapper;
+
+    @Autowired
+    private EnvDeviceMapper deviceMapper;
+    @Override
+    public Result add(HttpServletRequest httpServletRequest,  WriteEnvDataAddVo writeEnvDataAddVo) {
+        List<WriteEnvDataVo2> addVoList = writeEnvDataAddVo.getList();
+        for (WriteEnvDataVo2 writeEnvDataVo2 : addVoList) {
+            QueryWrapper<WriteEnvData> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("create_time", writeEnvDataVo2.getCreateTime())
+                    .eq("unit_id", writeEnvDataAddVo.getUnitId())
+                    .eq("farm_id", writeEnvDataAddVo.getFarmId());
+            WriteEnvData envData = writeEnvDataMapper.selectOne(queryWrapper);
+            WriteEnvData writeEnvData = new WriteEnvData();
+            if (ObjectUtil.isEmpty(envData)) {
+                writeEnvData.setUnitId(Integer.parseInt(writeEnvDataAddVo.getUnitId()));
+                writeEnvData.setUnitName(writeEnvDataAddVo.getUnitName());
+                writeEnvData.setFarmId(writeEnvDataAddVo.getFarmId());
+                writeEnvData.setTemp(writeEnvDataVo2.getEnvTemp());
+                writeEnvData.setHum(writeEnvDataVo2.getEnvHum());
+                writeEnvData.setCreateTime(writeEnvDataVo2.getCreateTime());
+                writeEnvDataMapper.insert(writeEnvData);
+            } else {
+                writeEnvData.setTemp(writeEnvDataVo2.getEnvTemp());
+                writeEnvData.setHum(writeEnvDataVo2.getEnvHum());
+                writeEnvDataMapper.updateById(writeEnvData);
+            }
+
+        }
+        return new Result(ResultCode.SUCCESS);
+    }
+
+    @Override
+    public Result listData(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        String unitId = paramsMap.get("unitId");
+        QueryWrapper<WriteEnvData> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_id", farmId).eq("unit_id", unitId).orderByDesc("create_time");
+        List<WriteEnvData> writeEnvData = writeEnvDataMapper.selectList(queryWrapper);
+        return new Result(ResultCode.SUCCESS, writeEnvData);
+    }
+
+    @Override
+    public Result envList(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        QueryWrapper<EnvDevice> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_id", farmId);
+        return new Result(ResultCode.SUCCESS, deviceMapper.selectList(queryWrapper));
+    }
+}

+ 91 - 0
huimv-admin/src/main/java/com/huimv/admin/service/impl/WriteProtDataServiceImpl.java

@@ -0,0 +1,91 @@
+package com.huimv.admin.service.impl;
+
+import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.common.utils.ResultCode;
+import com.huimv.admin.entity.WriteProtData;
+import com.huimv.admin.entity.vo.WriteProtDataVo2;
+import com.huimv.admin.entity.vo.WriteProtVo2;
+import com.huimv.admin.mapper.WriteProtDataMapper;
+import com.huimv.admin.service.IWriteProtDataService;
+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;
+
+/**
+ * <p>
+ * 环保排水监测填报 服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2023-11-17
+ */
+@Service
+public class WriteProtDataServiceImpl extends ServiceImpl<WriteProtDataMapper, WriteProtData> implements IWriteProtDataService {
+
+    @Autowired
+    private WriteProtDataMapper protDataMapper;
+
+    @Override
+    public Result add(HttpServletRequest httpServletRequest, WriteProtData writeProtData) {
+        return new Result(ResultCode.SUCCESS, protDataMapper.insert(writeProtData));
+    }
+
+    @Override
+    public Result addList(HttpServletRequest httpServletRequest, WriteProtDataVo2 writeProtDataVo2) {
+        String farmId = writeProtDataVo2.getFarmId();
+        WriteProtData protData = writeProtDataVo2.getDeal();
+        protData.setFarmId(Integer.parseInt(farmId));
+        protData.setCreateDate(new Date());
+        protDataMapper.insert(protData);
+        WriteProtData protData1 = writeProtDataVo2.getIn();
+        protData1.setFarmId(Integer.parseInt(farmId));
+        protData1.setCreateDate(new Date());
+        protDataMapper.insert(protData1);
+        WriteProtData protData2 = writeProtDataVo2.getOut();
+        protData2.setFarmId(Integer.parseInt(farmId));
+        protData2.setCreateDate(new Date());
+        protDataMapper.insert(protData2);
+
+//        WriteProtVo2 deal = writeProtDataVo2.getDeal();
+//        WriteProtData writeProtData = new WriteProtData();
+//        writeProtData.setCod(deal.getCod());
+//        writeProtData.setFarmId(Integer.parseInt(farmId));
+//        writeProtData.setFlow(deal.getFlow());
+//        writeProtData.setNh3n(deal.getNh3n());
+//        writeProtData.setPh(deal.getPh());
+//        writeProtData.setTn(deal.getTn());
+//        writeProtData.setTp(deal.getTp());
+//        writeProtData.setType(deal.getType());
+//        writeProtData.setCreateDate(new Date());
+//        WriteProtVo2 in = writeProtDataVo2.getIn();
+//        WriteProtData writeProtData1 = new WriteProtData();
+//        writeProtData1.setCod(in.getCod());
+//        writeProtData1.setFarmId(Integer.parseInt(farmId));
+//        writeProtData1.setFlow(in.getFlow());
+//        writeProtData1.setNh3n(in.getNh3n());
+//        writeProtData1.setPh(in.getPh());
+//        writeProtData1.setTn(in.getTn());
+//        writeProtData1.setTp(in.getTp());
+//        writeProtData1.setType(in.getType());
+//        writeProtData1.setCreateDate(new Date());
+//        WriteProtVo2 out = writeProtDataVo2.getOut();
+//        WriteProtData writeProtData2 = new WriteProtData();
+//        writeProtData2.setCod(out.getCod());
+//        writeProtData2.setFarmId(Integer.parseInt(farmId));
+//        writeProtData2.setFlow(out.getFlow());
+//        writeProtData2.setNh3n(out.getNh3n());
+//        writeProtData2.setPh(out.getPh());
+//        writeProtData2.setTn(out.getTn());
+//        writeProtData2.setTp(out.getTp());
+//        writeProtData2.setType(out.getType());
+//        writeProtData2.setCreateDate(new Date());
+//        protDataMapper.insert(writeProtData);
+//        protDataMapper.insert(writeProtData1);
+//        protDataMapper.insert(writeProtData2);
+        return new Result(ResultCode.SUCCESS);
+    }
+
+}

+ 17 - 0
huimv-admin/src/main/resources/com/huimv/admin/mapper/WriteEnvDataMapper.xml

@@ -0,0 +1,17 @@
+<?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.WriteEnvDataMapper">
+
+    <select id="listDay" resultType="com.huimv.admin.entity.vo.WriteEnvDataVo">
+    SELECT Convert((IFNULL(AVG(temp),'0')),DECIMAL(10,2)) 'envTemp',Convert((IFNULL(AVG(hum),'0')),DECIMAL(10,2)) 'envHum',create_time FROM write_env_data
+    ${ew.customSqlSegment}
+    group BY DATE_FORMAT(create_time,'%Y-%m-%d')
+    ORDER BY create_time ASC
+    </select>
+
+    <select id="listNow" resultType="com.huimv.admin.entity.vo.WriteEnvDataVo">
+    SELECT Convert((IFNULL(temp,'0')),DECIMAL(10,2)) 'envTemp',Convert((IFNULL(hum,'0')),DECIMAL(10,2)) 'envHum',create_time FROM write_env_data
+    ${ew.customSqlSegment}
+    ORDER BY create_time ASC
+    </select>
+</mapper>

+ 27 - 0
huimv-admin/src/main/resources/com/huimv/admin/mapper/WriteProtDataMapper.xml

@@ -0,0 +1,27 @@
+<?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.WriteProtDataMapper">
+
+    <select id="listWrite" resultType="com.huimv.admin.entity.vo.WriteProtDataVo">
+        select Convert((IFNULL(AVG(FLOW),'0')),DECIMAL(10,2)) 'flow',
+        Convert((IFNULL(AVG(NH3N),'0')),DECIMAL(10,2)) 'nhn3',
+        Convert((IFNULL(AVG(TP),'0')),DECIMAL(10,2)) 'tp',
+        Convert((IFNULL(AVG(TN),'0')),DECIMAL(10,2)) 'tn',
+        Convert((IFNULL(AVG(cod),'0')),DECIMAL(10,2)) 'cod',
+        Convert((IFNULL(AVG(ph),'0')),DECIMAL(10,2)) 'ph',create_date,loction_type from write_prot_data
+        ${ew.customSqlSegment}
+        group BY DATE_FORMAT(create_date,'%Y-%m-%d')
+        ORDER BY create_date ASC
+    </select>
+    <select id="listWriteYear" resultType="com.huimv.admin.entity.vo.WriteProtDataVo">
+        select Convert((IFNULL(AVG(FLOW),'0')),DECIMAL(10,2)) 'flow',
+        Convert((IFNULL(AVG(NH3N),'0')),DECIMAL(10,2)) 'nhn3',
+        Convert((IFNULL(AVG(TP),'0')),DECIMAL(10,2)) 'tp',
+        Convert((IFNULL(AVG(TN),'0')),DECIMAL(10,2)) 'tn',
+        Convert((IFNULL(AVG(cod),'0')),DECIMAL(10,2)) 'cod',
+        Convert((IFNULL(AVG(ph),'0')),DECIMAL(10,2)) 'ph',create_date,loction_type from write_prot_data
+        ${ew.customSqlSegment}
+        group BY DATE_FORMAT(create_date,'%Y-%m')
+        ORDER BY create_date ASC
+    </select>
+</mapper>