天然气

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

@@ -1,13 +1,21 @@
 package com.huimv.admin.controller;
 
 
+import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.service.IEnergyFeedService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author author
@@ -15,6 +23,14 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/energy-feed")
+@CrossOrigin
 public class EnergyFeedController {
 
+    @Autowired
+    private IEnergyFeedService energyFeedService;
+
+    @RequestMapping("/listPigpen")
+    public Result listPigpen(HttpServletRequest httpServletRequest, @RequestBody Map<String,String> paramsMap) {
+        return energyFeedService.listPigpen(httpServletRequest, paramsMap);
+    }
 }

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

@@ -1,13 +1,21 @@
 package com.huimv.admin.controller;
 
 
+import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.service.IEnergyGasService;
+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,18 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/energy-gas")
+@CrossOrigin
 public class EnergyGasController {
+    @Autowired
+    private IEnergyGasService energyGasService;
+
+    @RequestMapping("/listPigpen")
+    public Result listPigpen(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
+        return energyGasService.listPigpen(httpServletRequest,paramsMap);
+    }
 
+    @RequestMapping("/listData")
+    public Result listData(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
+        return energyGasService.listData(httpServletRequest,paramsMap);
+    }
 }

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

@@ -2,6 +2,8 @@ package com.huimv.admin.controller;
 
 
 import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.entity.ProtThreshold;
+import com.huimv.admin.entity.vo.ProtThresholdVo;
 import com.huimv.admin.service.IProtThresholdService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.CrossOrigin;
@@ -11,6 +13,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.LinkedList;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -34,7 +38,15 @@ public class ProtThresholdController {
     }
 
     @RequestMapping("/add")
-    public Result add(HttpServletRequest httpServletRequest, @RequestBody Map<String,String> paramsMap) {
-        return protThresholdService.add(httpServletRequest,paramsMap);
+    public Result add(HttpServletRequest httpServletRequest, @RequestBody ProtThresholdVo protThresholdVo) {
+        String farmId = protThresholdVo.getFarmId();
+        ProtThreshold protThreshold = protThresholdVo.getIn().setFarmId(Integer.parseInt(farmId));
+        ProtThreshold protThreshold1 = protThresholdVo.getDeal().setFarmId(Integer.parseInt(farmId));
+        ProtThreshold protThreshold2 = protThresholdVo.getOut().setFarmId(Integer.parseInt(farmId));
+        List<ProtThreshold> protThresholdList = new LinkedList<>();
+        protThresholdList.add(protThreshold);
+        protThresholdList.add(protThreshold1);
+        protThresholdList.add(protThreshold2);
+        return protThresholdService.add(httpServletRequest,protThresholdList);
     }
 }

huimv-admin/src/main/java/com/huimv/admin/entity/EnergyFeed.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;
@@ -54,6 +57,8 @@ public class EnergyFeed implements Serializable {
     private String other2;
 
     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/EnergyGas.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;
@@ -55,5 +58,9 @@ public class EnergyGas 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

@@ -69,7 +69,7 @@ public class ProtThreshold implements Serializable {
 
     private Integer farmId;
 
-    private String other1;
+    private String dataType;
 
     private String other2;
 

huimv-admin/src/main/java/com/huimv/admin/entity/vo/EnergyDataVo.java

@@ -0,0 +1,14 @@
+package com.huimv.admin.entity.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class EnergyDataVo {
+    private String gasValue;
+
+    @JsonFormat(pattern = "yyyy-MM", timezone = "GMT+8")
+    private Date createDate;
+}

huimv-admin/src/main/java/com/huimv/admin/entity/vo/ProtThresholdVo.java

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

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

@@ -1,7 +1,15 @@
 package com.huimv.admin.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.huimv.admin.common.utils.Result;
 import com.huimv.admin.entity.EnergyGas;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.admin.entity.vo.EnergyDataVo;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +19,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author author
  * @since 2023-02-14
  */
+@Repository
 public interface EnergyGasMapper extends BaseMapper<EnergyGas> {
 
+    List<EnergyDataVo> listYear(@Param(Constants.WRAPPER) QueryWrapper<EnergyGas> queryWrapper);
 }

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

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

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

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

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

@@ -5,6 +5,7 @@ import com.huimv.admin.entity.ProtThreshold;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -18,5 +19,5 @@ import java.util.Map;
 public interface IProtThresholdService extends IService<ProtThreshold> {
     Result list(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 
-    Result add(HttpServletRequest httpServletRequest,Map<String,String> paramsMap);
+    Result add(HttpServletRequest httpServletRequest,List<ProtThreshold> protThresholds);
 }

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

@@ -1,11 +1,25 @@
 package com.huimv.admin.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSONArray;
+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.BasePigpen;
 import com.huimv.admin.entity.EnergyFeed;
+import com.huimv.admin.entity.EnergyGas;
+import com.huimv.admin.mapper.BasePigpenMapper;
 import com.huimv.admin.mapper.EnergyFeedMapper;
 import com.huimv.admin.service.IEnergyFeedService;
 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 +31,67 @@ import org.springframework.stereotype.Service;
 @Service
 public class EnergyFeedServiceImpl extends ServiceImpl<EnergyFeedMapper, EnergyFeed> implements IEnergyFeedService {
 
+    @Autowired
+    private EnergyFeedMapper energyFeedMapper;
+    @Autowired
+    private BasePigpenMapper basePigpenMapper;
+    @Override
+    public Result listPigpen(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        String id = paramsMap.get("id");
+
+        JSONArray jsonArray = new JSONArray();
+        if (id == null || id == "") {
+            QueryWrapper<BasePigpen> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("farm_id", farmId).eq("parent_id", 0);
+            List<BasePigpen> basePigpens = basePigpenMapper.selectList(queryWrapper);
+            for (int i = 0; i < basePigpens.size(); i++) {
+
+
+                QueryWrapper<BasePigpen> basePigpenQueryWrapper = new QueryWrapper<>();
+                basePigpenQueryWrapper.eq("parent_id", basePigpens.get(i).getId()).eq("farm_id", farmId);
+                List<BasePigpen> basePigpens1 = basePigpenMapper.selectList(basePigpenQueryWrapper);
+                for (BasePigpen basePigpen : basePigpens1) {
+                    JSONObject jsonObject = new JSONObject();
+                    QueryWrapper<EnergyFeed> queryWrapper1 = new QueryWrapper<>();
+                    queryWrapper1.eq("unit_id", basePigpen.getId()).eq("farm_id", farmId)
+                            .orderByDesc("create_date").last(" limit 1");
+                    EnergyFeed energyFeed = energyFeedMapper.selectOne(queryWrapper1);
+                    if (ObjectUtil.isEmpty(energyFeed)) {
+                        jsonObject.put("buildName", basePigpen.getBuildName());
+                        jsonObject.put("value", 0);
+                        jsonObject.put("id", basePigpen.getId());
+                    } else {
+                        jsonObject.put("buildName", basePigpen.getBuildName());
+                        jsonObject.put("value", energyFeed.getFeedValue());
+                        jsonObject.put("id", basePigpen.getId());
+                    }
+                    jsonArray.add(jsonObject);
+                }
+            }
+        } else {
+            QueryWrapper<BasePigpen> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("farm_id", farmId).eq("parent_id", id);
+            List<BasePigpen> basePigpens = basePigpenMapper.selectList(queryWrapper);
+            for (BasePigpen basePigpen : basePigpens) {
+                JSONObject jsonObject = new JSONObject();
+                QueryWrapper<EnergyFeed> queryWrapper1 = new QueryWrapper<>();
+                queryWrapper1.eq("unit_id", basePigpen.getId()).eq("farm_id", farmId)
+                        .orderByDesc("create_date").last(" limit 1");
+                EnergyFeed energyFeed = energyFeedMapper.selectOne(queryWrapper1);
+                if (ObjectUtil.isEmpty(energyFeed)) {
+                    jsonObject.put("buildName", basePigpen.getBuildName());
+                    jsonObject.put("value", 0);
+                    jsonObject.put("id", basePigpen.getId());
+                } else {
+                    jsonObject.put("buildName", basePigpen.getBuildName());
+                    jsonObject.put("value", energyFeed.getFeedValue());
+                    jsonObject.put("id", basePigpen.getId());
+                }
+
+                jsonArray.add(jsonObject);
+            }
+        }
+        return new Result(ResultCode.SUCCESS,jsonArray);
+    }
 }

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

@@ -1,11 +1,32 @@
 package com.huimv.admin.service.impl;
 
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huimv.admin.common.utils.DataUill;
+import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.common.utils.ResultCode;
+import com.huimv.admin.entity.BasePigpen;
 import com.huimv.admin.entity.EnergyGas;
+import com.huimv.admin.entity.vo.EnergyDataVo;
+import com.huimv.admin.mapper.BasePigpenMapper;
 import com.huimv.admin.mapper.EnergyGasMapper;
 import com.huimv.admin.service.IEnergyGasService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mysql.cj.util.StringUtils;
+import org.apache.commons.lang.time.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  *  服务实现类
@@ -17,4 +38,116 @@ import org.springframework.stereotype.Service;
 @Service
 public class EnergyGasServiceImpl extends ServiceImpl<EnergyGasMapper, EnergyGas> implements IEnergyGasService {
 
+    @Autowired
+    private EnergyGasMapper energyGasMapper;
+    @Autowired
+    private BasePigpenMapper basePigpenMapper;
+
+    @Override
+    public Result listPigpen(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        String id = paramsMap.get("id");
+
+        JSONArray jsonArray = new JSONArray();
+        if (id == null || id == "") {
+            QueryWrapper<BasePigpen> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("farm_id", farmId).eq("parent_id", 0);
+            List<BasePigpen> basePigpens = basePigpenMapper.selectList(queryWrapper);
+            for (int i = 0; i < basePigpens.size(); i++) {
+
+
+                QueryWrapper<BasePigpen> basePigpenQueryWrapper = new QueryWrapper<>();
+                basePigpenQueryWrapper.eq("parent_id", basePigpens.get(i).getId()).eq("farm_id", farmId);
+                List<BasePigpen> basePigpens1 = basePigpenMapper.selectList(basePigpenQueryWrapper);
+                for (BasePigpen basePigpen : basePigpens1) {
+                    JSONObject jsonObject = new JSONObject();
+                    QueryWrapper<EnergyGas> queryWrapper1 = new QueryWrapper<>();
+                    queryWrapper1.eq("unit_id", basePigpen.getId()).eq("farm_id", farmId)
+                            .orderByDesc("create_date").last(" limit 1");
+                    EnergyGas energyGas = energyGasMapper.selectOne(queryWrapper1);
+                    if (ObjectUtil.isEmpty(energyGas)) {
+                        jsonObject.put("buildName", basePigpen.getBuildName());
+                        jsonObject.put("value", 0);
+                        jsonObject.put("id", basePigpen.getId());
+                    } else {
+                        jsonObject.put("buildName", basePigpen.getBuildName());
+                        jsonObject.put("value", energyGas.getGasValue());
+                        jsonObject.put("id", basePigpen.getId());
+                    }
+                    jsonArray.add(jsonObject);
+                }
+            }
+        } else {
+            QueryWrapper<BasePigpen> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("farm_id", farmId).eq("parent_id", id);
+            List<BasePigpen> basePigpens = basePigpenMapper.selectList(queryWrapper);
+            for (BasePigpen basePigpen : basePigpens) {
+                JSONObject jsonObject = new JSONObject();
+                QueryWrapper<EnergyGas> queryWrapper1 = new QueryWrapper<>();
+                queryWrapper1.eq("unit_id", basePigpen.getId()).eq("farm_id", farmId)
+                        .orderByDesc("create_date").last(" limit 1");
+                EnergyGas energyGas = energyGasMapper.selectOne(queryWrapper1);
+                if (ObjectUtil.isEmpty(energyGas)) {
+                    jsonObject.put("buildName", basePigpen.getBuildName());
+                    jsonObject.put("value", 0);
+                    jsonObject.put("id", basePigpen.getId());
+                } else {
+                    jsonObject.put("buildName", basePigpen.getBuildName());
+                    jsonObject.put("value", energyGas.getGasValue());
+                    jsonObject.put("id", basePigpen.getId());
+                }
+
+                jsonArray.add(jsonObject);
+            }
+        }
+
+        return new Result(ResultCode.SUCCESS,jsonArray);
+    }
+
+    @Override
+    public Result listData(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        String type = paramsMap.get("type");
+        String id = paramsMap.get("id");//楼层id
+        String startTime = paramsMap.get("startTime");
+        String endTime = paramsMap.get("endTime");
+
+        List<EnergyGas> energyGasList=null;
+        //默认显示本年
+        if (type == null || type == "") {
+            type = "3";
+        }
+        QueryWrapper<EnergyGas> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_id", farmId).eq("unit_id",id);
+        //自定义查询
+        if ("4".equals(type)) {
+            startTime = startTime + " 00:00:00";
+            endTime = endTime + " 23:59:59";
+            queryWrapper.between("create_date", startTime, endTime).orderByAsc("create_date");
+            List<EnergyGas> energyGases = energyGasMapper.selectList(queryWrapper);
+            energyGasList = energyGases;
+        }
+        //全年
+        else if ("3".equals(type)) {
+            DateTime dateTime = DateUtil.beginOfYear(new Date());
+            queryWrapper.ge("create_date",dateTime);
+            List<EnergyDataVo> energyDataVos = energyGasMapper.listYear(queryWrapper);
+            return new Result(ResultCode.SUCCESS, energyDataVos);
+        }
+        //本月
+        else if ("2".equals(type)) {
+            Date timesMonthmorning = DataUill.getTimesMonthmorning();
+            queryWrapper.ge("create_date", timesMonthmorning).orderByAsc("create_date");
+            List<EnergyGas> energyGases = energyGasMapper.selectList(queryWrapper);
+            energyGasList = energyGases;
+        }
+        //本周
+        else if ("1".equals(type)) {
+            DateTime dateTime = DateUtil.beginOfWeek(new Date());
+            queryWrapper.ge("create_date", dateTime).orderByAsc("create_date");
+            List<EnergyGas> energyGases = energyGasMapper.selectList(queryWrapper);
+            energyGasList = energyGases;
+        }
+        return new Result(ResultCode.SUCCESS,energyGasList);
+    }
 }

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

@@ -35,7 +35,7 @@ public class EnergyWarningInfoServiceImpl extends ServiceImpl<EnergyWarningInfoM
         String farmId = paramsMap.get("farmId");
         String pageSize = paramsMap.get("pageSize");
         String pageNo = paramsMap.get("pageNo");
-        String userIds = paramsMap.get("userIds");
+       // String userIds = paramsMap.get("userIds");
 
         if (pageSize == null || pageSize == "") {
             pageSize = "10";
@@ -45,7 +45,7 @@ public class EnergyWarningInfoServiceImpl extends ServiceImpl<EnergyWarningInfoM
         }
 
         QueryWrapper<EnergyWarningInfo> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("farm_id", farmId).eq("user_ids",userIds);
+        queryWrapper.eq("farm_id", farmId);
         Page<EnergyWarningInfo> page = new Page<>(Integer.parseInt(pageNo), Integer.parseInt(pageSize));
         Page<EnergyWarningInfo> energyWarningInfoPage = energyWarningInfoMapper.selectPage(page, queryWrapper);
         return new Result(ResultCode.SUCCESS, energyWarningInfoPage);

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

@@ -82,8 +82,10 @@ public class ProtDataServiceImpl extends ServiceImpl<ProtDataMapper, ProtData> i
             }
             //本年
             else if ("3".equals(type)) {
-                DateTime dateTime = DateUtil.beginOfYear(new Date());
-                queryWrapper.ge("create_date", dateTime);
+                Calendar dateTime = Calendar.getInstance();
+                int i = dateTime.get(Calendar.YEAR);
+                // DateTime dateTime = DateUtil.beginOfYear(new Date());
+                queryWrapper.ge("create_date",i );
                 queryWrapper.eq("loction_type" ,1);
                 List<ProtData> protData1 = protDataMapper.listPh(queryWrapper);
                 proCountDto.setInList(protData1);
@@ -158,8 +160,10 @@ public class ProtDataServiceImpl extends ServiceImpl<ProtDataMapper, ProtData> i
             }
             //本年
             else if ("3".equals(type)) {
-                DateTime dateTime = DateUtil.beginOfYear(new Date());
-                queryWrapper.ge("create_date", dateTime);
+                Calendar dateTime = Calendar.getInstance();
+
+                // DateTime dateTime = DateUtil.beginOfYear(new Date());
+                queryWrapper.ge("create_date", dateTime.get(Calendar.YEAR));
                 queryWrapper.eq("loction_type" ,1);
                 List<ProtData> protData1 = protDataMapper.listPh(queryWrapper);
                 proCountDto.setInList(protData1);
@@ -233,8 +237,10 @@ public class ProtDataServiceImpl extends ServiceImpl<ProtDataMapper, ProtData> i
             }
             //本年
             else if ("3".equals(type)) {
-                DateTime dateTime = DateUtil.beginOfYear(new Date());
-                queryWrapper.ge("create_date", dateTime);
+                Calendar dateTime = Calendar.getInstance();
+
+                // DateTime dateTime = DateUtil.beginOfYear(new Date());
+                queryWrapper.ge("create_date", dateTime.get(Calendar.YEAR));
                 queryWrapper.eq("loction_type" ,1);
                 List<ProtData> protData1 = protDataMapper.listPh(queryWrapper);
                 proCountDto.setInList(protData1);
@@ -308,8 +314,10 @@ public class ProtDataServiceImpl extends ServiceImpl<ProtDataMapper, ProtData> i
             }
             //本年
             else if ("3".equals(type)) {
-                DateTime dateTime = DateUtil.beginOfYear(new Date());
-                queryWrapper.ge("create_date", dateTime);
+                Calendar dateTime = Calendar.getInstance();
+
+                // DateTime dateTime = DateUtil.beginOfYear(new Date());
+                queryWrapper.ge("create_date", dateTime.get(Calendar.YEAR));
                 queryWrapper.eq("loction_type" ,1);
                 List<ProtData> protData1 = protDataMapper.listPh(queryWrapper);
                 proCountDto.setInList(protData1);
@@ -383,8 +391,10 @@ public class ProtDataServiceImpl extends ServiceImpl<ProtDataMapper, ProtData> i
             }
             //本年
             else if ("3".equals(type)) {
-                DateTime dateTime = DateUtil.beginOfYear(new Date());
-                queryWrapper.ge("create_date", dateTime);
+                Calendar dateTime = Calendar.getInstance();
+
+                // DateTime dateTime = DateUtil.beginOfYear(new Date());
+                queryWrapper.ge("create_date", dateTime.get(Calendar.YEAR));
                 queryWrapper.eq("loction_type" ,1);
                 List<ProtData> protData1 = protDataMapper.listPh(queryWrapper);
                 proCountDto.setInList(protData1);
@@ -458,8 +468,10 @@ public class ProtDataServiceImpl extends ServiceImpl<ProtDataMapper, ProtData> i
             }
             //本年
             else if ("3".equals(type)) {
-                DateTime dateTime = DateUtil.beginOfYear(new Date());
-                queryWrapper.ge("create_date", dateTime);
+                Calendar dateTime = Calendar.getInstance();
+
+                // DateTime dateTime = DateUtil.beginOfYear(new Date());
+                queryWrapper.ge("create_date", dateTime.get(Calendar.YEAR));
                 queryWrapper.eq("loction_type" ,1);
                 List<ProtData> protData1 = protDataMapper.listPh(queryWrapper);
                 proCountDto.setInList(protData1);
@@ -519,7 +531,7 @@ public class ProtDataServiceImpl extends ServiceImpl<ProtDataMapper, ProtData> i
 
         String farmId = paramsMap.get("farmId");
         QueryWrapper<ProtWarningInfo> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("farm_id", farmId);
+        queryWrapper.eq("farm_id", farmId).orderByDesc("date").last(" limit 10");
         List<ProtWarningInfo> protWarningInfos = protWarningInfoMapper.selectList(queryWrapper);
         //今日
         Date timesmorning = DataUill.getTimesmorning();
@@ -561,22 +573,24 @@ public class ProtDataServiceImpl extends ServiceImpl<ProtDataMapper, ProtData> i
     public Result listType(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
         String farmId = paramsMap.get("farmId");
         QueryWrapper<ProtData> queryWrapper = new QueryWrapper<>();
-        ProCountDto proCountDto = new ProCountDto();
-
-        queryWrapper.eq("farm_id", farmId).eq("loction_type", 1);
-        List<ProtData> protDataList = protDataMapper.selectList(queryWrapper);
-        proCountDto.setInList(protDataList);
+       // ProCountDto proCountDto = new ProCountDto();
+        JSONObject jsonObject = new JSONObject();
 
-        queryWrapper.eq("farm_id", farmId).eq("loction_type", 2);
-        List<ProtData> protDataList2 = protDataMapper.selectList(queryWrapper);
-        proCountDto.setDealList(protDataList2);
+        queryWrapper.eq("farm_id", farmId).eq("loction_type", 1).orderByDesc("create_date").last(" limit 1");
+        ProtData protData = protDataMapper.selectOne(queryWrapper);
+        jsonObject.put("in", protData);
 
+        QueryWrapper<ProtData> queryWrapper1 = new QueryWrapper<>();
+        queryWrapper1.eq("farm_id", farmId).eq("loction_type", 2).orderByDesc("create_date").last(" limit 1");
+        ProtData protData1 = protDataMapper.selectOne(queryWrapper1);
+        jsonObject.put("deal", protData1);
 
-        queryWrapper.eq("farm_id", farmId).eq("loction_type", 3);
-        List<ProtData> protDataList3 = protDataMapper.selectList(queryWrapper);
-        proCountDto.setOutList(protDataList3);
+        QueryWrapper<ProtData> queryWrapper2 = new QueryWrapper<>();
+        queryWrapper2.eq("farm_id", farmId).eq("loction_type", 3).orderByDesc("create_date").last(" limit 1");
+        ProtData protData2 = protDataMapper.selectOne(queryWrapper2);
+        jsonObject.put("out", protData2);
 
-        return new Result(ResultCode.SUCCESS,proCountDto);
+        return new Result(ResultCode.SUCCESS,jsonObject);
     }
 
 

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

@@ -53,78 +53,74 @@ public class ProtThresholdServiceImpl extends ServiceImpl<ProtThresholdMapper, P
             jsonObject.put("FLOW1", 0);
             jsonObject.put("FLOW2", 0);
             jsonObject.put("userIds", 0);
+            jsonObject.put("dataType", 0);
             return new Result(ResultCode.SUCCESS, jsonObject);
         } else {
             JSONObject jsonObject = new JSONObject();
             for (int i = 0; i < protThresholdList.size(); i++) {
-                ProtThreshold protThreshold = protThresholdList.get(i);
-                jsonObject.put(String.valueOf(i+1), protThreshold);
+                if (protThresholdList.get(i).getProtType()==1) {
+                    jsonObject.put("in", protThresholdList.get(i));
+                } else if (protThresholdList.get(i).getProtType()==2) {
+                    jsonObject.put("deal", protThresholdList.get(i));
+                } else if (protThresholdList.get(i).getProtType()==3) {
+                    jsonObject.put("out", protThresholdList.get(i));
+                }
             }
+            jsonObject.put("userIds", protThresholdList.get(1).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");
+    public Result add(HttpServletRequest httpServletRequest, List<ProtThreshold> protThresholds) {
+        for (ProtThreshold protThreshold : protThresholds) {
+            if (ObjectUtil.isNotEmpty(protThreshold)) {
+                ProtThreshold protThreshold1 = new ProtThreshold();
+                protThreshold1.setProtType(protThreshold.getProtType());
+                protThreshold1.setFarmId(protThreshold.getFarmId());
+                protThreshold1.setCod1(protThreshold.getCod1());
+                protThreshold1.setCod2(protThreshold.getCod2());
+                protThreshold1.setPh1(protThreshold.getPh1());
+                protThreshold1.setPh2(protThreshold.getPh2());
+                protThreshold1.setNh3n1(protThreshold.getNh3n1());
+                protThreshold1.setNh3n2(protThreshold.getNh3n2());
+                protThreshold1.setTp1(protThreshold.getTp1());
+                protThreshold1.setTp2(protThreshold.getTp2());
+                protThreshold1.setTn1(protThreshold.getTn1());
+                protThreshold1.setTn2(protThreshold.getTn2());
+                protThreshold1.setFlow1(protThreshold.getFlow1());
+                protThreshold1.setFlow2(protThreshold.getFlow2());
+                protThreshold1.setUserIds(protThreshold.getUserIds());
+                protThreshold1.setDataType(protThreshold.getDataType());
 
-        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(protThreshold.getCod2()) < Integer.parseInt(protThreshold.getCod1())) {
+                    return new Result(ResultCode.FAIL, "红色预警浓度不能低于橙色预警浓度");
+                } else if (Integer.parseInt(protThreshold.getPh2()) < Integer.parseInt(protThreshold.getPh1())) {
+                    return new Result(ResultCode.FAIL, "红色预警浓度不能低于橙色预警浓度");
+                } else if (Integer.parseInt(protThreshold.getNh3n2()) < Integer.parseInt(protThreshold.getNh3n1())) {
+                    return new Result(ResultCode.FAIL, "红色预警浓度不能低于橙色预警浓度");
+                } else if (Integer.parseInt(protThreshold.getTp2()) < Integer.parseInt(protThreshold.getTp1())) {
+                    return new Result(ResultCode.FAIL, "红色预警浓度不能低于橙色预警浓度");
+                } else if (Integer.parseInt(protThreshold.getTn2()) < Integer.parseInt(protThreshold.getTn1())) {
+                    return new Result(ResultCode.FAIL, "红色预警浓度不能低于橙色预警浓度");
+                } else if (Integer.parseInt(protThreshold.getFlow2()) < Integer.parseInt(protThreshold.getFlow1())) {
+                    return new Result(ResultCode.FAIL, "红色预警浓度不能低于橙色预警浓度");
+                } else {
+                    QueryWrapper<ProtThreshold> queryWrapper = new QueryWrapper<>();
+                    queryWrapper.eq("farm_id", protThreshold.getFarmId()).eq("prot_type",protThreshold.getProtType());
+                    ProtThreshold threshold = protThresholdMapper.selectOne(queryWrapper);
+                    if (ObjectUtil.isEmpty(threshold)) {
+                        protThresholdMapper.insert(protThreshold1);
+                    } else {
+                        protThreshold1.setId(protThreshold.getId());
+                        protThresholdMapper.updateById(protThreshold1);
+                    }
+                }
 
-        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, "修改成功");
             }
         }
+            return new Result(ResultCode.SUCCESS, "修改成功");
     }
 }

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

@@ -13,6 +13,7 @@
         <result column="other1" property="other1" />
         <result column="other2" property="other2" />
         <result column="other3" property="other3" />
+        <result column="create_date" property="createDate"/>
     </resultMap>
 
 </mapper>

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

@@ -13,6 +13,12 @@
         <result column="other1" property="other1" />
         <result column="other2" property="other2" />
         <result column="other3" property="other3" />
+        <result column="create_date" property="createDate" />
     </resultMap>
-
+    <select id="listYear" resultType="com.huimv.admin.entity.vo.EnergyDataVo">
+        SELECT sum(gas_value) 'gasValue',create_date 'createDate' FROM `energy_gas`
+         ${ew.customSqlSegment}
+        GROUP BY DATE_FORMAT(create_date,'%Y-%m')
+        ORDER BY create_date ASC
+    </select>
 </mapper>

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

@@ -20,7 +20,7 @@
         <result column="FLOW2" property="flow2" />
         <result column="user_ids" property="userIds" />
         <result column="farm_id" property="farmId" />
-        <result column="other1" property="other1" />
+        <result column="date_type" property="dataType" />
         <result column="other2" property="other2" />
         <result column="other3" property="other3" />
     </resultMap>