环境管理和栋舍bug修改

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

@@ -21,6 +21,7 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("/basePigpen")
+@CrossOrigin
 public class BasePigpenController {
     @Autowired
     private IBasePigpenService basePigpenService;

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

@@ -4,6 +4,7 @@ package com.huimv.admin.controller;
 import com.huimv.admin.common.utils.Result;
 import com.huimv.admin.service.IEnvDeviceService;
 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;
 
@@ -22,6 +23,7 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("/envDevice")
+@CrossOrigin
 public class EnvDeviceController {
     @Autowired
     private IEnvDeviceService envDeviceService;

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

@@ -4,6 +4,7 @@ package com.huimv.admin.controller;
 import com.huimv.admin.common.utils.Result;
 import com.huimv.admin.service.IEnvDeviceMaintainService;
 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;
 
@@ -22,6 +23,7 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("/envDeviceMaintain")
+@CrossOrigin
 public class EnvDeviceMaintainController {
     @Autowired
     private IEnvDeviceMaintainService envDeviceMaintainService;

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

@@ -10,6 +10,7 @@ import com.huimv.admin.entity.EnvWarningInfo;
 import com.huimv.admin.mapper.EnvWarningInfoMapper;
 import com.huimv.admin.service.IEnvWarningInfoService;
 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;
 
@@ -28,6 +29,7 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("/envWarningInfo")
+@CrossOrigin
 public class EnvWarningInfoController {
     @Autowired
     private IEnvWarningInfoService envWarningInfoService;

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

@@ -21,6 +21,7 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("/envWarningThreshold")
+@CrossOrigin
 public class EnvWarningThresholdController {
     @Autowired
     private IBasePigpenService basePigpenService;

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

@@ -1,10 +1,18 @@
 package com.huimv.admin.controller;
 
 
+import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.service.IProtDataService;
+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>
  *  前端控制器
@@ -15,6 +23,13 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/prot-data")
+@CrossOrigin
 public class ProtDataController {
+    @Autowired
+    private IProtDataService protDataService;
 
+    @RequestMapping("/list")
+    public Result list(HttpServletRequest httpServletRequest, @RequestBody Map<String,String> paramsMap) {
+        return protDataService.list(httpServletRequest,paramsMap);
+    }
 }

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

@@ -1,10 +1,18 @@
 package com.huimv.admin.controller;
 
 
+import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.service.IProtThresholdService;
+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>
  * 环保阈值 前端控制器
@@ -14,7 +22,19 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2023-02-14
  */
 @RestController
+@CrossOrigin
 @RequestMapping("/prot-threshold")
 public class ProtThresholdController {
+    @Autowired
+    private IProtThresholdService protThresholdService;
+
+    @RequestMapping("/list")
+    public Result list(HttpServletRequest httpServletRequest, @RequestBody Map<String,String> paramsMap) {
+        return protThresholdService.list(httpServletRequest,paramsMap);
+    }
 
+    @RequestMapping("/add")
+    public Result add(HttpServletRequest httpServletRequest, @RequestBody Map<String,String> paramsMap) {
+        return protThresholdService.add(httpServletRequest,paramsMap);
+    }
 }

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

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

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

@@ -4,6 +4,9 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 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;
@@ -36,7 +39,7 @@ public class ProtData implements Serializable {
 
     private String cod;
 
-    private String NH3N;
+    private String Nh3n;
 
     private String tp;
 
@@ -54,5 +57,7 @@ public class ProtData implements Serializable {
 
     private String other3;
 
-
+    /*创建时间*/
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "GMT+8")
+    private Date createDate;
 }

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

@@ -46,9 +46,9 @@ public class ProtThreshold implements Serializable {
      */
     private String ph2;
 
-    private String NH3N1;
+    private String Nh3n1;
 
-    private String NH3N2;
+    private String Nh3n2;
 
     private String tp1;
 

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

@@ -0,0 +1,14 @@
+package com.huimv.admin.entity.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.util.Date;
+
+public class ProDataDto {
+
+    private String value;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "GMT+8")
+    private Date time;
+
+}

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

@@ -1,7 +1,13 @@
 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.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +17,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author author
  * @since 2023-02-14
  */
+@Repository
 public interface ProtDataMapper extends BaseMapper<ProtData> {
-
+    List<ProtData> listPh(@Param(Constants.WRAPPER) QueryWrapper<ProtData> queryWrapper);
+    List<ProtData> listCod(@Param(Constants.WRAPPER) QueryWrapper<ProtData> queryWrapper);
+    List<ProtData> listNh3n(@Param(Constants.WRAPPER) QueryWrapper<ProtData> queryWrapper);
+    List<ProtData> listTp(@Param(Constants.WRAPPER) QueryWrapper<ProtData> queryWrapper);
+    List<ProtData> listTn(@Param(Constants.WRAPPER) QueryWrapper<ProtData> queryWrapper);
+    List<ProtData> listFlow(@Param(Constants.WRAPPER) QueryWrapper<ProtData> queryWrapper);
 }

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

@@ -1,8 +1,12 @@
 package com.huimv.admin.service;
 
+import com.huimv.admin.common.utils.Result;
 import com.huimv.admin.entity.EnergyWarningInfo;
 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-14
  */
 public interface IEnergyWarningInfoService extends IService<EnergyWarningInfo> {
-
+    Result list(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 }

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

@@ -25,4 +25,6 @@ public interface IEnvDeviceService extends IService<EnvDevice> {
     Result edit(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 
     Result delete(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
+
+    Result listPigpen(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 }

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

@@ -1,8 +1,12 @@
 package com.huimv.admin.service;
 
+import com.huimv.admin.common.utils.Result;
 import com.huimv.admin.entity.ProtData;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
 /**
  * <p>
  *  服务类
@@ -13,4 +17,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IProtDataService extends IService<ProtData> {
 
+    Result list(HttpServletRequest httpServletRequest, Map<String,String> paramsMap);
+/*
+    Result listType(HttpServletRequest httpServletRequest,Map<String,String> paramsMap);*/
 }

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

@@ -1,8 +1,12 @@
 package com.huimv.admin.service;
 
+import com.huimv.admin.common.utils.Result;
 import com.huimv.admin.entity.ProtThreshold;
 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-14
  */
 public interface IProtThresholdService extends IService<ProtThreshold> {
+    Result list(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 
+    Result add(HttpServletRequest httpServletRequest,Map<String,String> paramsMap);
 }

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

@@ -1,8 +1,12 @@
 package com.huimv.admin.service;
 
+import com.huimv.admin.common.utils.Result;
 import com.huimv.admin.entity.ProtWarningInfo;
 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-14
  */
 public interface IProtWarningInfoService extends IService<ProtWarningInfo> {
-
+    Result list(HttpServletRequest httpServletRequest, Map<String,String> paramsMap);
 }

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

@@ -48,9 +48,9 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenMapper, BasePig
         basePigpen.setParentId(0);
         basePigpen.setFType(1);
         basePigpen.setOther2("0");
+        int insert = basePigpenMapper.insert(basePigpen);
         Integer id = basePigpen.getId();
         String buildName = basePigpen.getBuildName();
-        int insert = basePigpenMapper.insert(basePigpen);
         Integer floorNum = basePigpenDto.getFloorNum();
         for (Integer integer = 1; integer <= floorNum; integer++) {
             BasePigpen basePigpen1 = new BasePigpen();
@@ -97,7 +97,7 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenMapper, BasePig
         QueryWrapper<BasePigpen> queryWrapper = new QueryWrapper<>();
         queryWrapper.like(StringUtils.isNotBlank(buildName),"build_name", buildName);
         queryWrapper.like(StringUtils.isNotBlank(stageCode),"stage_code", stageCode);
-        queryWrapper.eq(StringUtils.isNotBlank(farmCode),"farm_code", farmCode);
+        queryWrapper.eq(StringUtils.isNotBlank(farmCode),"farm_id", farmCode);
         //创建排序
         List<BasePigpen> basePigpens = basePigpenMapper.selectList(queryWrapper);
 

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

@@ -1,11 +1,15 @@
 package com.huimv.admin.service.impl;
 
+import com.huimv.admin.common.utils.Result;
 import com.huimv.admin.entity.EnergyWarningInfo;
 import com.huimv.admin.mapper.EnergyWarningInfoMapper;
 import com.huimv.admin.service.IEnergyWarningInfoService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
 /**
  * <p>
  *  服务实现类
@@ -17,4 +21,12 @@ import org.springframework.stereotype.Service;
 @Service
 public class EnergyWarningInfoServiceImpl extends ServiceImpl<EnergyWarningInfoMapper, EnergyWarningInfo> implements IEnergyWarningInfoService {
 
+    @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");
+
+        return null;
+    }
 }

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

@@ -42,20 +42,27 @@ public class EnvDeviceServiceImpl extends ServiceImpl<EnvDeviceMapper, EnvDevice
         QueryWrapper<EnvDevice> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("farm_id", farmId);
         Integer count = envDeviceMapper.selectCount(queryWrapper);
-        QueryWrapper<EnvDevice> queryWrapper1 = new QueryWrapper<>();
-        queryWrapper1.eq("device_status", 1);
-        Integer count1 = envDeviceMapper.selectCount(queryWrapper1);
-        Integer OffDeviceCount = count- count1;
-        //创建一个数值格式化对象
-        NumberFormat numberFormat = NumberFormat.getInstance();
-        //设置精确到小数点后两位
-        numberFormat.setMaximumFractionDigits(2);
-        String onDeviceRate = numberFormat.format((float)count1 / (float) count* 100) + "%";
         JSONObject jsonObject = new JSONObject();
-        jsonObject.put("DeviceCount", count);
-        jsonObject.put("OnDeviceCount", count1);
-        jsonObject.put("OffDeviceCount", OffDeviceCount);
-        jsonObject.put("OnDeviceRate", onDeviceRate);
+        if (count == 0) {
+            jsonObject.put("DeviceCount", 0);
+            jsonObject.put("OnDeviceCount", 0);
+            jsonObject.put("OffDeviceCount", 0);
+            jsonObject.put("OnDeviceRate", 0);
+        } else {
+            QueryWrapper<EnvDevice> queryWrapper1 = new QueryWrapper<>();
+            queryWrapper1.eq("device_status", 1);
+            Integer count1 = envDeviceMapper.selectCount(queryWrapper1);
+            Integer OffDeviceCount = count- count1;
+            //创建一个数值格式化对象
+            NumberFormat numberFormat = NumberFormat.getInstance();
+            //设置精确到小数点后两位
+            numberFormat.setMaximumFractionDigits(2);
+            String onDeviceRate = numberFormat.format((float)count1 / (float) count* 100) + "%";
+            jsonObject.put("DeviceCount", count);
+            jsonObject.put("OnDeviceCount", count1);
+            jsonObject.put("OffDeviceCount", OffDeviceCount);
+            jsonObject.put("OnDeviceRate", onDeviceRate);
+        }
         return new Result(ResultCode.SUCCESS, jsonObject);
     }
 
@@ -145,5 +152,11 @@ public class EnvDeviceServiceImpl extends ServiceImpl<EnvDeviceMapper, EnvDevice
         return new Result(ResultCode.SUCCESS,"删除成功");
     }
 
+    @Override
+    public Result listPigpen(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        return null;
+    }
+
 
 }

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

@@ -60,14 +60,14 @@ public class EnvWarningThresholdServiceImpl extends ServiceImpl<EnvWarningThresh
         String farmId = paramsMap.get("farmId");
         String maxTem = paramsMap.get("maxTem");
         String minTem = paramsMap.get("minTem");
-        String maxHum = paramsMap.get("maxHum");
-        String minHum = paramsMap.get("minHum");
+        /*String maxHum = paramsMap.get("maxHum");
+        String minHum = paramsMap.get("minHum");*/
         String maxNh3= paramsMap.get("maxNh3");
         String maxCo = paramsMap.get("maxCo");
 
         EnvWarningThreshold threshold = new EnvWarningThreshold();
-        threshold.setMaxHum(maxHum);
-        threshold.setMinHum(minHum);
+      /*  threshold.setMaxHum(maxHum);
+        threshold.setMinHum(minHum);*/
         threshold.setMaxTem(maxTem);
         threshold.setMinTem(minTem);
         threshold.setMaxNh3(maxNh3);
@@ -77,9 +77,9 @@ public class EnvWarningThresholdServiceImpl extends ServiceImpl<EnvWarningThresh
 
         if (Integer.parseInt(maxTem) < Integer.parseInt(minTem)) {
             return new Result(10001, "最高温度不能小于最低温度", false);
-        } else if (Integer.parseInt(maxHum) < Integer.parseInt(minHum)) {
+        } /*else if (Integer.parseInt(maxHum) < Integer.parseInt(minHum)) {
             return new Result(10001, "最高湿度不能小于最低湿度", false);
-        } else {
+        } */else {
             QueryWrapper<EnvWarningThreshold> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("farm_id", farmId);
             EnvWarningThreshold envWarningThreshold = envWarningThresholdMapper.selectOne(queryWrapper);

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

@@ -1,14 +1,26 @@
 package com.huimv.admin.service.impl;
 
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+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.ProtData;
 import com.huimv.admin.mapper.ProtDataMapper;
 import com.huimv.admin.service.IProtDataService;
 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>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author author
@@ -17,4 +29,228 @@ import org.springframework.stereotype.Service;
 @Service
 public class ProtDataServiceImpl extends ServiceImpl<ProtDataMapper, ProtData> implements IProtDataService {
 
+    @Autowired
+    private ProtDataMapper protDataMapper;
+
+    @Override
+    public Result list(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        String loctionType = paramsMap.get("loctionType");
+        String startTime = paramsMap.get("startTime");
+        String endTime = paramsMap.get("endTime");
+        String type = paramsMap.get("type");
+        String dataType = paramsMap.get("dataType");
+
+        if (type == null || type == "") {
+            type = "1";
+        }
+        if (dataType == null || dataType == "") {
+            dataType = "1";
+        }
+        QueryWrapper<ProtData> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_id", farmId);
+
+
+        List<ProtData> protDataList = null;
+        if ("1".equals(dataType)) {
+            if ("4".equals(type)) {
+                startTime = startTime + " 00:00:00";
+                endTime = endTime + " 23:59:59";
+                queryWrapper.between("create_date",startTime, endTime);
+                List<ProtData> protData = protDataMapper.listPh(queryWrapper);
+                protDataList=protData;
+            }
+            //本年
+            else if ("3".equals(type)) {
+                DateTime dateTime = DateUtil.beginOfYear(new Date());
+                queryWrapper.ge("create_date", dateTime);
+                List<ProtData> protData = protDataMapper.listPh(queryWrapper);
+                protDataList=protData;
+            }
+            //本月
+            else if ("2".equals(type)) {
+                Date timesMonthmorning = DataUill.getTimesMonthmorning();
+                queryWrapper.ge("create_date", timesMonthmorning);
+                List<ProtData> protData = protDataMapper.listPh(queryWrapper);
+                protDataList=protData;
+            }
+            //本周
+            else if ("1".equals(type)) {
+                DateTime dateTime = DateUtil.beginOfWeek(new Date());
+                queryWrapper.ge("create_date", dateTime);
+                List<ProtData> protData = protDataMapper.listPh(queryWrapper);
+                protDataList=protData;
+            }
+        }
+        //cod
+        else if ("2".equals(dataType)) {
+            if ("4".equals(type)) {
+                startTime = startTime + " 00:00:00";
+                endTime = endTime + " 23:59:59";
+                queryWrapper.between("create_date",startTime, endTime);
+                List<ProtData> protData = protDataMapper.listCod(queryWrapper);
+                protDataList=protData;
+            }
+            //本年
+            else if ("3".equals(type)) {
+                DateTime dateTime = DateUtil.beginOfYear(new Date());
+                queryWrapper.ge("create_date", dateTime);
+                List<ProtData> protData = protDataMapper.listCod(queryWrapper);
+                protDataList=protData;
+            }
+            //本月
+            else if ("2".equals(type)) {
+                Date timesMonthmorning = DataUill.getTimesMonthmorning();
+                queryWrapper.ge("create_date", timesMonthmorning);
+                List<ProtData> protData = protDataMapper.listCod(queryWrapper);
+                protDataList=protData;
+            }
+            //本周
+            else if ("1".equals(type)) {
+                DateTime dateTime = DateUtil.beginOfWeek(new Date());
+                queryWrapper.ge("create_date", dateTime);
+                List<ProtData> protData = protDataMapper.listCod(queryWrapper);
+                protDataList=protData;
+            }
+        }
+        //NH3N
+        else if ("3".equals(dataType)) {
+            if ("4".equals(type)) {
+                startTime = startTime + " 00:00:00";
+                endTime = endTime + " 23:59:59";
+                queryWrapper.between("create_date",startTime, endTime);
+                List<ProtData> protData = protDataMapper.listNh3n(queryWrapper);
+                protDataList=protData;
+            }
+            //本年
+            else if ("3".equals(type)) {
+                DateTime dateTime = DateUtil.beginOfYear(new Date());
+                queryWrapper.ge("create_date", dateTime);
+                List<ProtData> protData = protDataMapper.listNh3n(queryWrapper);
+                protDataList=protData;
+            }
+            //本月
+            else if ("2".equals(type)) {
+                Date timesMonthmorning = DataUill.getTimesMonthmorning();
+                queryWrapper.ge("create_date", timesMonthmorning);
+                List<ProtData> protData = protDataMapper.listNh3n(queryWrapper);
+                protDataList=protData;
+            }
+            //本周
+            else if ("1".equals(type)) {
+                DateTime dateTime = DateUtil.beginOfWeek(new Date());
+                queryWrapper.ge("create_date", dateTime);
+                List<ProtData> protData = protDataMapper.listNh3n(queryWrapper);
+                protDataList=protData;
+            }
+        }
+        //TP
+        else if ("4".equals(dataType)) {
+            if ("4".equals(type)) {
+                startTime = startTime + " 00:00:00";
+                endTime = endTime + " 23:59:59";
+                queryWrapper.between("create_date",startTime, endTime);
+                List<ProtData> protData = protDataMapper.listTp(queryWrapper);
+                protDataList=protData;
+            }
+            //本年
+            else if ("3".equals(type)) {
+                DateTime dateTime = DateUtil.beginOfYear(new Date());
+                queryWrapper.ge("create_date", dateTime);
+                List<ProtData> protData = protDataMapper.listTp(queryWrapper);
+                protDataList=protData;
+            }
+            //本月
+            else if ("2".equals(type)) {
+                Date timesMonthmorning = DataUill.getTimesMonthmorning();
+                queryWrapper.ge("create_date", timesMonthmorning);
+                List<ProtData> protData = protDataMapper.listTp(queryWrapper);
+                protDataList=protData;
+            }
+            //本周
+            else if ("1".equals(type)) {
+                DateTime dateTime = DateUtil.beginOfWeek(new Date());
+                queryWrapper.ge("create_date", dateTime);
+                List<ProtData> protData = protDataMapper.listTp(queryWrapper);
+                protDataList=protData;
+            }
+        }
+        //TN
+        else if ("5".equals(dataType)) {
+            if ("4".equals(type)) {
+                startTime = startTime + " 00:00:00";
+                endTime = endTime + " 23:59:59";
+                queryWrapper.between("create_date",startTime, endTime);
+                List<ProtData> protData = protDataMapper.listTn(queryWrapper);
+                protDataList=protData;
+            }
+            //本年
+            else if ("3".equals(type)) {
+                DateTime dateTime = DateUtil.beginOfYear(new Date());
+                queryWrapper.ge("create_date", dateTime);
+                List<ProtData> protData = protDataMapper.listTn(queryWrapper);
+                protDataList=protData;
+            }
+            //本月
+            else if ("2".equals(type)) {
+                Date timesMonthmorning = DataUill.getTimesMonthmorning();
+                queryWrapper.ge("create_date", timesMonthmorning);
+                List<ProtData> protData = protDataMapper.listTn(queryWrapper);
+                protDataList=protData;
+            }
+            //本周
+            else if ("1".equals(type)) {
+                DateTime dateTime = DateUtil.beginOfWeek(new Date());
+                queryWrapper.ge("create_date", dateTime);
+                List<ProtData> protData = protDataMapper.listTn(queryWrapper);
+                protDataList=protData;
+            }
+        }
+        //FLOW
+        else if ("6".equals(dataType)) {
+            if ("4".equals(type)) {
+                startTime = startTime + " 00:00:00";
+                endTime = endTime + " 23:59:59";
+                queryWrapper.between("create_date",startTime, endTime);
+                List<ProtData> protData = protDataMapper.listFlow(queryWrapper);
+                protDataList=protData;
+            }
+            //本年
+            else if ("3".equals(type)) {
+                DateTime dateTime = DateUtil.beginOfYear(new Date());
+                queryWrapper.ge("create_date", dateTime);
+                List<ProtData> protData = protDataMapper.listFlow(queryWrapper);
+                protDataList=protData;
+            }
+            //本月
+            else if ("2".equals(type)) {
+                Date timesMonthmorning = DataUill.getTimesMonthmorning();
+                queryWrapper.ge("create_date", timesMonthmorning);
+                List<ProtData> protData = protDataMapper.listFlow(queryWrapper);
+                protDataList=protData;
+            }
+            //本周
+            else if ("1".equals(type)) {
+                DateTime dateTime = DateUtil.beginOfWeek(new Date());
+                queryWrapper.ge("create_date", dateTime);
+                List<ProtData> protData = protDataMapper.listFlow(queryWrapper);
+                protDataList=protData;
+            }
+        }
+        return new Result(ResultCode.SUCCESS,protDataList);
+    }
+
+    /*@Override
+    public Result listType(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        String type = paramsMap.get("type");
+        QueryWrapper<ProtData> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_id", farmId);
+
+        //ph
+        if ("1".equals(type)) {
+
+        }
+        return null;
+    }*/
 }

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

@@ -1,11 +1,21 @@
 package com.huimv.admin.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSONObject;
+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.ProtThreshold;
 import com.huimv.admin.mapper.ProtThresholdMapper;
 import com.huimv.admin.service.IProtThresholdService;
 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>
  * 环保阈值 服务实现类
@@ -17,4 +27,112 @@ import org.springframework.stereotype.Service;
 @Service
 public class ProtThresholdServiceImpl extends ServiceImpl<ProtThresholdMapper, ProtThreshold> implements IProtThresholdService {
 
+    @Autowired
+    private ProtThresholdMapper protThresholdMapper;
+
+    @Override
+    public Result list(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        String protType = paramsMap.get("protType");
+        QueryWrapper<ProtThreshold> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_id", farmId);
+        List<ProtThreshold> protThresholdList = protThresholdMapper.selectList(queryWrapper);
+        JSONObject jsonObject = new JSONObject();
+        if (protThresholdList.size() == 0) {
+            jsonObject.put("COD1", 0);
+            jsonObject.put("COD2", 0);
+            jsonObject.put("PH1", 0);
+            jsonObject.put("PH2", 0);
+            jsonObject.put("NH3N1", 0);
+            jsonObject.put("NH3N2", 0);
+            jsonObject.put("TP1", 0);
+            jsonObject.put("TP2", 0);
+            jsonObject.put("TN1", 0);
+            jsonObject.put("TN2", 0);
+            jsonObject.put("FLOW1", 0);
+            jsonObject.put("FLOW2", 0);
+            jsonObject.put("userIds", 0);
+        } else {
+            QueryWrapper<ProtThreshold> queryWrapper1 = new QueryWrapper<>();
+            queryWrapper1.eq("farm_id", farmId).eq("prot_type", protType);
+            ProtThreshold protThreshold = protThresholdMapper.selectOne(queryWrapper1);
+            jsonObject.put("COD1", protThreshold.getCod1());
+            jsonObject.put("COD2", protThreshold.getCod2());
+            jsonObject.put("PH1", protThreshold.getPh1());
+            jsonObject.put("PH2", protThreshold.getPh2());
+            jsonObject.put("NH3N1", protThreshold.getNh3n1());
+            jsonObject.put("NH3N2", protThreshold.getNh3n2());
+            jsonObject.put("TP1", protThreshold.getTp1());
+            jsonObject.put("TP2", protThreshold.getTp2());
+            jsonObject.put("TN1", protThreshold.getTn1());
+            jsonObject.put("TN2", protThreshold.getTn2());
+            jsonObject.put("FLOW1", protThreshold.getFlow1());
+            jsonObject.put("FLOW2", protThreshold.getFlow2());
+            jsonObject.put("userIds", protThreshold.getUserIds());
+        }
+        return new Result(ResultCode.SUCCESS, jsonObject);
+    }
+
+    @Override
+    public Result add(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        String protType = paramsMap.get("protType");
+        String COD1 = paramsMap.get("COD1");
+        String COD2 = paramsMap.get("COD2");
+        String PH1 = paramsMap.get("PH1");
+        String PH2 = paramsMap.get("PH2");
+        String NH3N1 = paramsMap.get("NH3N1");
+        String NH3N2 = paramsMap.get("NH3N2");
+        String TP1 = paramsMap.get("TP1");
+        String TP2 = paramsMap.get("TP2");
+        String TN1 = paramsMap.get("TN1");
+        String TN2 = paramsMap.get("TN2");
+        String FLOW1 = paramsMap.get("FLOW1");
+        String FLOW2 = paramsMap.get("FLOW2");
+        String userIds = paramsMap.get("userIds");
+
+        ProtThreshold protThreshold = new ProtThreshold();
+        protThreshold.setCod1(COD1);
+        protThreshold.setCod2(COD2);
+        protThreshold.setPh1(PH1);
+        protThreshold.setPh2(PH2);
+        protThreshold.setNh3n1(NH3N1);
+        protThreshold.setNh3n2(NH3N2);
+        protThreshold.setTp1(TP1);
+        protThreshold.setTp2(TP2);
+        protThreshold.setTn1(TN1);
+        protThreshold.setTn2(TN2);
+        protThreshold.setFlow1(FLOW1);
+        protThreshold.setFlow2(FLOW2);
+        protThreshold.setUserIds(userIds);
+        protThreshold.setProtType(Integer.parseInt(protType));
+        protThreshold.setFarmId(Integer.parseInt(farmId));
+
+
+        if (Integer.parseInt(COD2) < Integer.parseInt(COD1)) {
+            return new Result(ResultCode.FAIL, "红色预警浓度不能低于橙色预警浓度");
+        } else if (Integer.parseInt(PH2) < Integer.parseInt(PH1)) {
+            return new Result(ResultCode.FAIL, "红色预警浓度不能低于橙色预警浓度");
+        } else if (Integer.parseInt(NH3N2) < Integer.parseInt(NH3N1)) {
+            return new Result(ResultCode.FAIL, "红色预警浓度不能低于橙色预警浓度");
+        } else if (Integer.parseInt(TP2) < Integer.parseInt(TP1)) {
+            return new Result(ResultCode.FAIL, "红色预警浓度不能低于橙色预警浓度");
+        } else if (Integer.parseInt(TN2) < Integer.parseInt(TN1)) {
+            return new Result(ResultCode.FAIL, "红色预警浓度不能低于橙色预警浓度");
+        } else if (Integer.parseInt(FLOW2) < Integer.parseInt(FLOW1)) {
+            return new Result(ResultCode.FAIL, "红色预警浓度不能低于橙色预警浓度");
+        } else {
+            QueryWrapper<ProtThreshold> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("farm_id", farmId).eq("prot_type",protType);
+            ProtThreshold threshold = protThresholdMapper.selectOne(queryWrapper);
+            if (ObjectUtil.isEmpty(threshold)) {
+                protThresholdMapper.insert(protThreshold);
+                return new Result(ResultCode.SUCCESS, "添加成功");
+            } else {
+                protThreshold.setId(threshold.getId());
+                protThresholdMapper.updateById(protThreshold);
+                return new Result(ResultCode.SUCCESS, "修改成功");
+            }
+        }
+    }
 }

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

@@ -1,11 +1,21 @@
 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.ProtWarningInfo;
 import com.huimv.admin.mapper.ProtWarningInfoMapper;
 import com.huimv.admin.service.IProtWarningInfoService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import io.netty.util.internal.StringUtil;
+import org.apache.tomcat.util.buf.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
 /**
  * <p>
  *  服务实现类
@@ -17,4 +27,22 @@ import org.springframework.stereotype.Service;
 @Service
 public class ProtWarningInfoServiceImpl extends ServiceImpl<ProtWarningInfoMapper, ProtWarningInfo> implements IProtWarningInfoService {
 
+    @Autowired
+    private ProtWarningInfoMapper protWarningInfoMapper;
+    @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==""||pageSize==null) {
+            pageSize = "10";
+        }
+        if (pageNo==""||pageNo==null) {
+            pageNo = "1";
+        }
+        QueryWrapper<ProtWarningInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_id", farmId);
+        Page<ProtWarningInfo> page = new Page(Integer.parseInt(pageNo), Integer.parseInt(pageSize));
+        return new Result(ResultCode.SUCCESS,protWarningInfoMapper.selectPage(page,queryWrapper));
+    }
 }

huimv-admin/src/main/resources/application-dev.yml

@@ -21,10 +21,10 @@ spring:
 #    virtual-host: /
 
   #redis
-#  redis:
-#    host: 122.112.224.199
-#    port: 6379
-#    password: hm123456
+  redis:
+    host: 122.112.224.199
+    port: 6379
+    password: hm123456
 #  Nacos 配置
 #  cloud:
 #    nacos:

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

@@ -8,7 +8,7 @@
         <result column="loction_type" property="loctionType" />
         <result column="ph" property="ph" />
         <result column="cod" property="cod" />
-        <result column="NH3-N" property="NH3-N" />
+        <result column="NH3N" property="Nh3n" />
         <result column="TP" property="tp" />
         <result column="TN" property="tn" />
         <result column="FLOW" property="flow" />
@@ -17,6 +17,30 @@
         <result column="other1" property="other1" />
         <result column="other2" property="other2" />
         <result column="other3" property="other3" />
+        <result column="create_date" property="createDate" />
     </resultMap>
-
+    <select id="listPh" resultType="com.huimv.admin.entity.ProtData">
+        select ph,create_date from prot_data
+        ${ew.customSqlSegment}
+    </select>
+    <select id="listCod" resultType="com.huimv.admin.entity.ProtData">
+        select cod,create_date from prot_data
+        ${ew.customSqlSegment}
+    </select>
+    <select id="listNh3n" resultType="com.huimv.admin.entity.ProtData">
+        select NH3N,create_date from prot_data
+        ${ew.customSqlSegment}
+    </select>
+    <select id="listTp" resultType="com.huimv.admin.entity.ProtData">
+        select TP,create_date from prot_data
+        ${ew.customSqlSegment}
+    </select>
+    <select id="listTn" resultType="com.huimv.admin.entity.ProtData">
+        select TN,create_date from prot_data
+        ${ew.customSqlSegment}
+    </select>
+    <select id="listFlow" resultType="com.huimv.admin.entity.ProtData">
+        select FLOW,create_date from prot_data
+        ${ew.customSqlSegment}
+    </select>
 </mapper>

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

@@ -10,8 +10,8 @@
         <result column="COD2" property="cod2" />
         <result column="PH1" property="ph1" />
         <result column="PH2" property="ph2" />
-        <result column="NH3-N1" property="NH3-N1" />
-        <result column="NH3-N2" property="NH3-N2" />
+        <result column="NH3N1" property="Nh3n1" />
+        <result column="NH3N2" property="Nh3n2" />
         <result column="TP1" property="tp1" />
         <result column="TP2" property="tp2" />
         <result column="TN1" property="tn1" />