智能环控

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

@@ -1,13 +1,20 @@
 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.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
@@ -16,5 +23,32 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("/envDevice")
 public class EnvDeviceController {
+    @Autowired
+    private IEnvDeviceService envDeviceService;
+
+    @RequestMapping("/DeviceCount")
+    public Result getDevice(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
+        return envDeviceService.count(httpServletRequest,paramsMap);
+    }
+
+    @RequestMapping("/DeviceList")
+    public Result getDeviceList(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
+        return envDeviceService.list(httpServletRequest,paramsMap);
+    }
+
+    @RequestMapping("/DeviceAdd")
+    public Result getDeviceAdd(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
+        return envDeviceService.add(httpServletRequest,paramsMap);
+    }
+
+    @RequestMapping("/DeviceEdit")
+    public Result getDeviceEdit(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
+        return envDeviceService.edit(httpServletRequest,paramsMap);
+    }
+
+    @RequestMapping("/DeviceDelete")
+    public Result getDeviceDelete(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
+        return envDeviceService.delete(httpServletRequest,paramsMap);
+    }
 
 }

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

@@ -1,10 +1,17 @@
 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.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>
  * 设备维修记录 前端控制器
@@ -16,5 +23,11 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("/envDeviceMaintain")
 public class EnvDeviceMaintainController {
+    @Autowired
+    private IEnvDeviceMaintainService envDeviceMaintainService;
 
+    @RequestMapping("/list")
+    public Result list(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
+        return envDeviceMaintainService.list(httpServletRequest,paramsMap);
+    }
 }

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

@@ -1,13 +1,26 @@
 package com.huimv.admin.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+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.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.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
@@ -16,5 +29,11 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("/envWarningInfo")
 public class EnvWarningInfoController {
+    @Autowired
+    private IEnvWarningInfoService envWarningInfoService;
 
+    @RequestMapping("/WarningInfoList")
+    public Result list(HttpServletRequest httpServletRequest, @RequestBody Map<String,String> paramsMap) {
+        return envWarningInfoService.list(httpServletRequest,paramsMap);
+    }
 }

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

@@ -1,10 +1,14 @@
 package com.huimv.admin.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.service.IBasePigpenService;
+import com.huimv.admin.service.IEnvWarningThresholdService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
 
 /**
@@ -18,6 +22,38 @@ import java.util.Map;
 @RestController
 @RequestMapping("/envWarningThreshold")
 public class EnvWarningThresholdController {
+    @Autowired
+    private IBasePigpenService basePigpenService;
+    @Autowired
+    private IEnvWarningThresholdService thresholdService;
+
+
+ /*   @RequestMapping(value = "/list",method = RequestMethod.POST)
+    public Result list(@RequestBody Map<String, Object> paramsMap) {
+        System.out.println("paramsMap>>"+paramsMap.toString());
+        String farmCode = "";
+        if (paramsMap.get("farmId") != null) {
+            farmCode = paramsMap.get("farmId")+"";
+        }
+        String stageCode = "";
+        if (paramsMap.get("stageCode") != null) {
+            stageCode = paramsMap.get("stageCode")+"";
+        }
+        String pigpenName = "";
+        if (paramsMap.get("pigpenName") != null) {
+            pigpenName = paramsMap.get("pigpenName")+"";
+        }
+        return basePigpenService.list(farmCode,pigpenName,stageCode);
+    }
+*/
 
+    @PostMapping("/list")
+    public Result ThresholdList(HttpServletRequest httpServletRequest, @RequestBody()Map<String,String> paramsMap) {
+        return thresholdService.list(httpServletRequest,paramsMap);
+    }
 
+    @PostMapping("/add")
+    public Result ThresholdAdd(HttpServletRequest httpServletRequest, @RequestBody()Map<String,String> paramsMap) {
+        return thresholdService.add(httpServletRequest,paramsMap);
+    }
 }

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

@@ -45,7 +45,7 @@ public class EnvDevice implements Serializable {
     /**
      * 房屋id
      */
-    private Integer buildId;
+    private String unitName;
 
     /**
      * 单元id
@@ -57,6 +57,8 @@ public class EnvDevice implements Serializable {
      */
     private String deviceBrand;
 
+    private String remark;
+
     /**
      * 0不在线  1在线
      */

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

@@ -41,7 +41,7 @@ public class EnvDeviceMaintain implements Serializable {
     /**
      * 备注
      */
-    private Integer remark;
+    private String remark;
 
     private Integer farmId;
 

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

@@ -44,9 +44,9 @@ public class EnvWarningInfo implements Serializable {
     private String buildLocation;
 
     /**
-     * 房屋id
+     * 单元名称
      */
-    private Integer buildId;
+    private String unitName;
 
     /**
      * 单元id

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

@@ -36,7 +36,7 @@ public class ProtData implements Serializable {
 
     private String cod;
 
-    private String NH3;
+    private String NH3N;
 
     private String tp;
 

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

@@ -0,0 +1,15 @@
+package com.huimv.admin.entity.dto;
+
+import lombok.Data;
+
+@Data
+public class DeviceDto {
+
+    /*设备总数*/
+    private Integer deviceCount;
+
+    /*在线设备*/
+    private Integer onDeviceCount;
+
+
+}

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

@@ -0,0 +1,5 @@
+package com.huimv.admin.entity.dto;
+
+public class EnvDeviceDto {
+
+}

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

@@ -1,7 +1,13 @@
 package com.huimv.admin.mapper;
 
+import com.huimv.admin.common.utils.Result;
 import com.huimv.admin.entity.EnvDevice;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.admin.entity.dto.DeviceDto;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +17,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author author
  * @since 2023-02-13
  */
+@Repository
 public interface EnvDeviceMapper extends BaseMapper<EnvDevice> {
-
+    DeviceDto getCount(@Param("farmId") String farmId);
 }

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

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

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

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

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

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

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

@@ -1,8 +1,12 @@
 package com.huimv.admin.service;
 
+import com.huimv.admin.common.utils.Result;
 import com.huimv.admin.entity.EnvWarningThreshold;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
 /**
  * <p>
  *  服务类
@@ -13,4 +17,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IEnvWarningThresholdService extends IService<EnvWarningThreshold> {
 
+    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/impl/EnvDeviceMaintainServiceImpl.java

@@ -1,11 +1,18 @@
 package com.huimv.admin.service.impl;
 
+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.EnvDeviceMaintain;
 import com.huimv.admin.mapper.EnvDeviceMaintainMapper;
 import com.huimv.admin.service.IEnvDeviceMaintainService;
 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 +24,16 @@ import org.springframework.stereotype.Service;
 @Service
 public class EnvDeviceMaintainServiceImpl extends ServiceImpl<EnvDeviceMaintainMapper, EnvDeviceMaintain> implements IEnvDeviceMaintainService {
 
+    @Autowired
+    private EnvDeviceMaintainMapper envDeviceMaintainMapper;
+
+    @Override
+    public Result list(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        String deviceId = paramsMap.get("deviceId");
+        QueryWrapper<EnvDeviceMaintain> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("device_id", deviceId).eq("farm_id", farmId);
+        return new Result(ResultCode.SUCCESS,envDeviceMaintainMapper.selectOne(queryWrapper));
+    }
+
 }

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

@@ -1,14 +1,28 @@
 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.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.EnvDevice;
+import com.huimv.admin.entity.dto.DeviceDto;
+import com.huimv.admin.mapper.EnvDeviceMaintainMapper;
 import com.huimv.admin.mapper.EnvDeviceMapper;
 import com.huimv.admin.service.IEnvDeviceService;
 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.text.NumberFormat;
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author author
@@ -17,4 +31,119 @@ import org.springframework.stereotype.Service;
 @Service
 public class EnvDeviceServiceImpl extends ServiceImpl<EnvDeviceMapper, EnvDevice> implements IEnvDeviceService {
 
+    @Autowired
+    private EnvDeviceMapper envDeviceMapper;
+    @Autowired
+    private EnvDeviceMaintainMapper envDeviceMaintainMapper;
+
+    @Override
+    public Result count(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        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);
+        return new Result(ResultCode.SUCCESS, jsonObject);
+    }
+
+    @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<EnvDevice> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_id", farmId);
+        Page<EnvDevice> page = new Page(Integer.parseInt(pageNo),Integer.parseInt(pageSize));
+        return new Result(ResultCode.SUCCESS,envDeviceMapper.selectPage(page, queryWrapper));
+    }
+
+    @Override
+    public Result add(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        String DeviceName = paramsMap.get("DeviceName");
+        String BuildLocation = paramsMap.get("BuildLocation");
+        String DeviceBrand = paramsMap.get("DeviceBrand");
+        String remark = paramsMap.get("remark");
+        if (remark == null || remark == "") {
+            remark = null;
+        }
+
+        EnvDevice envDevice = new EnvDevice();
+        envDevice.setFarmId(Integer.parseInt(farmId));
+        envDevice.setDeviceName(DeviceName);
+        envDevice.setBuildLocation(BuildLocation);
+        envDevice.setDeviceBrand(DeviceBrand);
+        envDevice.setRemark(remark);
+        QueryWrapper<EnvDevice> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("device_name", DeviceName).eq("farm_id",farmId);
+        EnvDevice device = envDeviceMapper.selectOne(queryWrapper);
+        if (ObjectUtil.isEmpty(device)) {
+            envDeviceMapper.insert(envDevice);
+        } else {
+            return new Result(ResultCode.FAIL, "设备名称已存在");
+        }
+        return new Result(ResultCode.SUCCESS,"添加成功");
+    }
+
+    @Override
+    public Result edit(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        String id = paramsMap.get("id");
+        String DeviceName = paramsMap.get("DeviceName");
+        String BuildLocation = paramsMap.get("BuildLocation");
+        String DeviceBrand = paramsMap.get("DeviceBrand");
+        String remark = paramsMap.get("remark");
+        if (remark == null || remark == "") {
+            remark = null;
+        }
+
+        QueryWrapper<EnvDevice> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("id", id);
+        EnvDevice envDevice = envDeviceMapper.selectOne(queryWrapper);
+        envDevice.setFarmId(Integer.parseInt(farmId));
+        envDevice.setDeviceName(DeviceName);
+        envDevice.setDeviceBrand(DeviceBrand);
+        envDevice.setBuildLocation(BuildLocation);
+        envDevice.setRemark(remark);
+
+        QueryWrapper<EnvDevice> queryWrapper1 = new QueryWrapper<>();
+        queryWrapper1.eq("device_name", DeviceName);
+        if (ObjectUtil.isEmpty(envDeviceMapper.selectOne(queryWrapper1))) {
+            envDeviceMapper.updateById(envDevice);
+        } else {
+            return new Result(ResultCode.FAIL, "设备名称已存在");
+        }
+        return new Result(ResultCode.SUCCESS);
+    }
+
+    @Override
+    public Result delete(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        String id = paramsMap.get("id");
+        QueryWrapper<EnvDevice> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("id", id).eq("farm_id", farmId);
+        envDeviceMapper.delete(queryWrapper);
+        return new Result(ResultCode.SUCCESS,"删除成功");
+    }
+
+
 }

huimv-admin/src/main/java/com/huimv/admin/service/impl/EnvWarningInfoServiceImpl.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.EnvWarningInfo;
 import com.huimv.admin.mapper.EnvWarningInfoMapper;
 import com.huimv.admin.service.IEnvWarningInfoService;
 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,24 @@ import org.springframework.stereotype.Service;
 @Service
 public class EnvWarningInfoServiceImpl extends ServiceImpl<EnvWarningInfoMapper, EnvWarningInfo> implements IEnvWarningInfoService {
 
+    @Autowired
+    private EnvWarningInfoMapper envWarningInfoMapper;
+    @Override
+    public Result list(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String pageSize = paramsMap.get("pageSize");
+        String pageNo = paramsMap.get("pageNo");
+        String farmId =paramsMap.get("farmId");
+        String userIds = paramsMap.get("userIds");
+        if (pageSize==null||pageSize=="") {
+            pageSize = "10";
+        }
+        if (pageNo==null||pageNo=="") {
+            pageNo = "1";
+        }
+        QueryWrapper<EnvWarningInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_id", farmId).eq("user_ids",userIds);
+        Page<EnvWarningInfo> page = new Page<>(Integer.parseInt(pageNo),Integer.parseInt(pageSize));
+        Page<EnvWarningInfo> warningInfoPage = envWarningInfoMapper.selectPage(page, queryWrapper);
+        return new Result(ResultCode.SUCCESS,warningInfoPage);
+    }
 }

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

@@ -1,11 +1,20 @@
 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.EnvWarningThreshold;
 import com.huimv.admin.mapper.EnvWarningThresholdMapper;
 import com.huimv.admin.service.IEnvWarningThresholdService;
 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 +26,71 @@ import org.springframework.stereotype.Service;
 @Service
 public class EnvWarningThresholdServiceImpl extends ServiceImpl<EnvWarningThresholdMapper, EnvWarningThreshold> implements IEnvWarningThresholdService {
 
+    @Autowired
+    EnvWarningThresholdMapper envWarningThresholdMapper;
+    @Override
+    public Result list(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        QueryWrapper<EnvWarningThreshold> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_id", farmId);
+        EnvWarningThreshold envWarningThreshold = envWarningThresholdMapper.selectOne(queryWrapper);
+        JSONObject jsonObject = new JSONObject();
+        if (ObjectUtil.isEmpty(envWarningThreshold)) {
+            jsonObject.put("maxTem", 0);
+            jsonObject.put("minTem", 0);
+            jsonObject.put("maxHum", 0);
+            jsonObject.put("minHum", 0);
+            jsonObject.put("maxNh3", 0);
+            jsonObject.put("maxCo", 0);
+            jsonObject.put("userIds", 0);
+        } else {
+            jsonObject.put("maxTem", envWarningThreshold.getMaxTem());
+            jsonObject.put("minTem", envWarningThreshold.getMinTem());
+            jsonObject.put("maxHum", envWarningThreshold.getMaxHum());
+            jsonObject.put("minHum", envWarningThreshold.getMinHum());
+            jsonObject.put("maxNh3", envWarningThreshold.getMaxNh3());
+            jsonObject.put("maxCo", envWarningThreshold.getMaxCo());
+            jsonObject.put("userIds", envWarningThreshold.getUserIds());
+        }
+        return new Result(ResultCode.SUCCESS,jsonObject);
+    }
+
+    @Override
+    public Result add(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        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 maxNh3= paramsMap.get("maxNh3");
+        String maxCo = paramsMap.get("maxCo");
+
+        EnvWarningThreshold threshold = new EnvWarningThreshold();
+        threshold.setMaxHum(maxHum);
+        threshold.setMinHum(minHum);
+        threshold.setMaxTem(maxTem);
+        threshold.setMinTem(minTem);
+        threshold.setMaxNh3(maxNh3);
+        threshold.setMaxCo(maxCo);
+        threshold.setUserIds(paramsMap.get("userIds"));
+        threshold.setFarmId(Integer.parseInt(farmId));
+
+        if (Integer.parseInt(maxTem) < Integer.parseInt(minTem)) {
+            return new Result(10001, "最高温度不能小于最低温度", false);
+        } else if (Integer.parseInt(maxHum) < Integer.parseInt(minHum)) {
+            return new Result(10001, "最高湿度不能小于最低湿度", false);
+        } else {
+            QueryWrapper<EnvWarningThreshold> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("farm_id", farmId);
+            EnvWarningThreshold envWarningThreshold = envWarningThresholdMapper.selectOne(queryWrapper);
+            if (ObjectUtil.isEmpty(envWarningThreshold)) {
+                envWarningThresholdMapper.insert(threshold);
+            } else {
+                threshold.setId(envWarningThreshold.getId());
+                envWarningThresholdMapper.updateById(threshold);
+            }
+
+        }
+        return Result.SUCCESS();
+    }
 }

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

@@ -8,7 +8,7 @@
         <result column="device_code" property="deviceCode" />
         <result column="device_name" property="deviceName" />
         <result column="build_location" property="buildLocation" />
-        <result column="build_id" property="buildId" />
+        <result column="unit_name" property="unitName" />
         <result column="unit_id" property="unitId" />
         <result column="device_brand" property="deviceBrand" />
         <result column="device_status" property="deviceStatus" />
@@ -16,6 +16,12 @@
         <result column="ohter1" property="ohter1" />
         <result column="ohter2" property="ohter2" />
         <result column="ohter3" property="ohter3" />
+        <result column="remark" property="remark" />
     </resultMap>
 
+    <select id="getCount" resultType="com.huimv.admin.entity.dto.DeviceDto">
+        select count(id) 'deviceCount',count(device_status) 'onDeviceCount'
+         from env_device
+         where device_status=1 and farm_id=#{farmId}
+    </select>
 </mapper>