环保监测

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

@@ -1,3 +1,4 @@
+/*
 package com.huimv.admin.controller;
 
 import com.alibaba.fastjson.JSON;
@@ -19,7 +20,8 @@ public class CameraHKVSSync {
     return null;
     }
 
-    /**
+    */
+/**
      * APPKEY需要到部署的平台服务器上生成。
      * <p>
      * 调用Openpai的操作码，需要去平台上生成，详见《海康威视iVMS-8700平台SDKV2.*.* HTTP-OpenAPI使用说明书.chm》中[获取AppKey和Secret]章节说明
@@ -27,10 +29,12 @@ public class CameraHKVSSync {
      * <p>
      * 《海康威视iVMS-8700平台SDKV2.*.* HTTP-OpenAPI使用说明书.chm》 该文档请找技术支持或者交付的同事提供
      * </p>
-     */
+     *//*
+
     private static final String APPKEY = "27546900";
 
-    /**
+    */
+/**
      * SECRET需要到部署的平台服务器上生成。
      * <p>
      * 调用Openpai的操作码，需要去平台上生成，详见《海康威视iVMS-8700平台SDKV2.*.* HTTP-OpenAPI使用说明书.chm》中[获取AppKey和Secret]章节说明
@@ -38,66 +42,85 @@ public class CameraHKVSSync {
      * <p>
      * 《海康威视iVMS-8700平台SDKV2.*.* HTTP-OpenAPI使用说明书.chm》 该文档请找技术支持或者交付的同事提供
      * </p>
-     */
+     *//*
+
     private static final String SECRET = "S5qgrKdBd75MONZRzGAh";
 
 
-    /**
+    */
+/**
      * http请求地址
      * <p>openapi的地址,默认情况下openapi的IP端口与基础应用的IP端口是一致的</p>
      * <p>请将地址配置正确.</p>
      * <p>默认情况下是127.0.0.1:80 ，如果地址不通请根据实际情况修改IP端口</p>
-     */
+     *//*
+
     private static final String OPENAPI_IP_PORT_HTTP = "http://61.153.248.106:80";
 //    private static final String OPENAPI_IP_PORT_HTTP = "http://172.21.90:80";
 
-    /**
+    */
+/**
      * https请求地址
      * <p>openapi的地址,默认情况下openapi的IP端口与基础应用的IP端口是一致的</p>
      * <p>请将地址配置正确.</p>
      * <p>默认情况下是127.0.0.1:443 ，如果地址不通请根据实际情况修改IP端口</p>
-     */
+     *//*
+
     private static final String OPENAPI_IP_PORT_HTTPS = "https://61.153.248.106:443";
 //    private static final String OPENAPI_IP_PORT_HTTPS = "https://172.21.90:443";
 
-    /**
+    */
+/**
      * 获取默认用户UUID的接口地址，此地址可以从《海康威视iVMS-8700平台SDKV2.*.* HTTP-OpenAPI使用说明书.chm》中具体的接口说明上获取
-     */
+     *//*
+
     private static final String ITF_ADDRESS_GET_DEFAULT_USER_UUID = "/openapi/service/base/user/getDefaultUserUuid";
 
-    /**
+    */
+/**
      * 分页获取监控点信息的接口地址，此地址可以从《海康威视iVMS-8700平台SDKV2.*.* HTTP-OpenAPI使用说明书.chm》中具体的接口说明上获取
-     */
+     *//*
+
     private static final String ITF_ADDRESS_GET_CAMERAS = "/openapi/service/vss/res/getCameras";
 
-    /**
+    */
+/**
      * <p>操作用户UUID，即用户UUID，首次使用操作用户UUID可以通过接口 [获取默认用户UUID]来获取</p>
      * <p>也可以通过接口[分页获取用户]来获取</p>
-     */
+     *//*
+
     private static final String OP_USER_UUID = "0be83d40695011e7981e0f190ed6d2e7";
 
-    /**
+    */
+/**
      * 测试方法
      * @param args
      * @throws Exception
-     */
+     *//*
+
     public static void main(String[] args) throws Exception {
 
-        /***http方式调用***/
+        */
+/***http方式调用***//*
+
         System.out.println(testGetDefaultUserUUID());
         System.out.println(testGetCameras());
 
-        /***https方式调用***/
+        */
+/***https方式调用***//*
+
 //        System.out.println(testGetDefaultUserUUID_Https());
 //        System.out.println(testGetCameras_Https());
     }
 
-    /**
+    */
+/**
      * HTTP方式
      * 获取默认用户UUID 测试
      * @return
      * @throws Exception
-     */
+     *//*
+
     private static String testGetDefaultUserUUID() throws Exception{
         String url = OPENAPI_IP_PORT_HTTP + ITF_ADDRESS_GET_DEFAULT_USER_UUID;
         Map<String, Object> map = new HashMap<String, Object>();
@@ -111,12 +134,14 @@ public class CameraHKVSSync {
         return data;
     }
 
-    /**
+    */
+/**
      * HTTP方式
      * 分页获取监控点信息 测试
      * @return
      * @throws Exception
-     */
+     *//*
+
     private static String testGetCameras() throws Exception{
         String url = OPENAPI_IP_PORT_HTTP + ITF_ADDRESS_GET_CAMERAS;
         Map<String, Object> map = new HashMap<String, Object>();
@@ -133,12 +158,14 @@ public class CameraHKVSSync {
         return data;
     }
 
-    /**
+    */
+/**
      * HTTPS方式
      * 获取默认用户UUID 测试
      * @return
      * @throws Exception
-     */
+     *//*
+
     private static String testGetDefaultUserUUID_Https() throws Exception{
         String url = OPENAPI_IP_PORT_HTTPS + ITF_ADDRESS_GET_DEFAULT_USER_UUID;
         Map<String, Object> map = new HashMap<String, Object>();
@@ -152,12 +179,14 @@ public class CameraHKVSSync {
         return data;
     }
 
-    /**
+    */
+/**
      * HTTPS方式
      * 分页获取监控点信息 测试
      * @return
      * @throws Exception
-     */
+     *//*
+
     private static String testGetCameras_Https() throws Exception{
         String url = OPENAPI_IP_PORT_HTTPS + ITF_ADDRESS_GET_CAMERAS;
         Map<String, Object> map = new HashMap<String, Object>();
@@ -175,3 +204,4 @@ public class CameraHKVSSync {
     }
 
 }
+*/

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

@@ -37,4 +37,8 @@ public class ProtDataController {
     public Result listWarning(HttpServletRequest httpServletRequest, @RequestBody Map<String,String> paramsMap) {
         return protDataService.listProt(httpServletRequest,paramsMap);
     }
+    @RequestMapping("/listType")
+    public Result listType(HttpServletRequest httpServletRequest, @RequestBody Map<String,String> paramsMap) {
+        return protDataService.listType(httpServletRequest,paramsMap);
+    }
 }

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

@@ -67,7 +67,7 @@ public class EnvData implements Serializable {
     private Date createTime;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "GMT+8")
-    private Date receiveate;
+    private Date receiveDate;
 
 
 }

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

@@ -0,0 +1,14 @@
+package com.huimv.admin.entity.dto;
+
+import com.huimv.admin.entity.ProtData;
+import com.huimv.admin.entity.vo.ProDataVo;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ProCountDto {
+    private List<ProtData> inList;
+    private List<ProtData> dealList;
+    private List<ProtData> outList;
+}

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

@@ -0,0 +1,18 @@
+package com.huimv.admin.entity.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class ProCountVo {
+    private String value;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createDate;
+
+    private String loctionType;
+
+}

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

@@ -1,14 +1,16 @@
 package com.huimv.admin.entity.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
 
 import java.util.Date;
-
+@Data
 public class ProDataVo {
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date time;
-    private Integer count;
+    private String content;
+  /*  private Integer count;
     private Integer weekCount;
-    private Integer monthCount;
+    private Integer monthCount;*/
 }

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

@@ -18,8 +18,9 @@ import java.util.Map;
 public interface IProtDataService extends IService<ProtData> {
 
     Result list(HttpServletRequest httpServletRequest, Map<String,String> paramsMap);
-/*
-    Result listType(HttpServletRequest httpServletRequest,Map<String,String> paramsMap);*/
 
     Result listProt(HttpServletRequest httpServletRequest, Map<String,String> paramsMap);
+
+    Result listType(HttpServletRequest httpServletRequest,Map<String,String> paramsMap);
+
 }

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

@@ -183,12 +183,13 @@ public class EnvDeviceServiceImpl extends ServiceImpl<EnvDeviceMapper, EnvDevice
             EnvDevice envDevice = envDeviceMapper.selectOne(queryWrapper1);//找到栋舍绑定的设备，利用单元id*/
 
             QueryWrapper<EnvData> queryWrapper2 = new QueryWrapper<>();
-            queryWrapper2.eq("unit_id",basePigpens.get(i).getId());//通过设备id来拿取数据
+            queryWrapper2.eq("unit_id",basePigpens.get(i).getId()).orderByDesc("create_time").last(" limit 1");//通过设备id来拿取数据
             EnvData envData = dataMapper.selectOne(queryWrapper2);
             JSONObject jsonObject = new JSONObject();
             jsonObject.put("temp", envData.getEnvTemp());//温度
             jsonObject.put("hum", envData.getEnvHum());//湿度
             jsonObject.put("location", basePigpens.get(i).getBuildName());
+            jsonObject.put("unit_id", envData.getUnitId());//单元id
             jsonArray.add(jsonObject);
         }
         return new Result(ResultCode.SUCCESS,jsonArray);
@@ -218,7 +219,7 @@ public class EnvDeviceServiceImpl extends ServiceImpl<EnvDeviceMapper, EnvDevice
         if ("4".equals(type)) {
             startTime = startTime + " 00:00:00";
             endTime = endTime + " 23:59:59";
-            queryWrapper.between("create_time", startTime, endTime);
+            queryWrapper.between("create_time", startTime, endTime).orderByAsc("create_time");
             List<EnvData> envData = dataMapper.selectList(queryWrapper);
             map.put("location", basePigpen.getBuildName());
             map.put("data", envData);
@@ -227,7 +228,7 @@ public class EnvDeviceServiceImpl extends ServiceImpl<EnvDeviceMapper, EnvDevice
         //本月
         else if ("3".equals(type)) {
             Date timesMonthmorning = DataUill.getTimesMonthmorning();
-            queryWrapper.ge("create_time", timesMonthmorning);
+            queryWrapper.ge("create_time", timesMonthmorning).orderByAsc("create_time");
             List<EnvData> envData = dataMapper.selectList(queryWrapper);
             map.put("location", basePigpen.getBuildName());
             map.put("data", envData);
@@ -237,7 +238,7 @@ public class EnvDeviceServiceImpl extends ServiceImpl<EnvDeviceMapper, EnvDevice
         //本周
         else if ("2".equals(type)) {
             DateTime dateTime = DateUtil.beginOfWeek(new Date());
-            queryWrapper.ge("create_time",dateTime);
+            queryWrapper.ge("create_time",dateTime).orderByAsc("create_time");
             List<EnvData> envData = dataMapper.selectList(queryWrapper);
             map.put("location", basePigpen.getBuildName());
             map.put("data", envData);
@@ -246,7 +247,7 @@ public class EnvDeviceServiceImpl extends ServiceImpl<EnvDeviceMapper, EnvDevice
         //今日
         else if ("1".equals(type)) {
             Date timesmorning = DataUill.getTimesmorning();
-            queryWrapper.ge("create_time", timesmorning);
+            queryWrapper.ge("create_time", timesmorning).orderByAsc("create_time");
             List<EnvData> envData = dataMapper.selectList(queryWrapper);
             map.put("location", basePigpen.getBuildName());
             map.put("data", envData);

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

@@ -10,6 +10,7 @@ import com.huimv.admin.common.utils.Result;
 import com.huimv.admin.common.utils.ResultCode;
 import com.huimv.admin.entity.ProtData;
 import com.huimv.admin.entity.ProtWarningInfo;
+import com.huimv.admin.entity.dto.ProCountDto;
 import com.huimv.admin.entity.vo.ProDataVo;
 import com.huimv.admin.mapper.ProtDataMapper;
 import com.huimv.admin.mapper.ProtWarningInfoMapper;
@@ -19,9 +20,7 @@ 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;
+import java.util.*;
 
 /**
  * <p>
@@ -57,36 +56,84 @@ public class ProtDataServiceImpl extends ServiceImpl<ProtDataMapper, ProtData> i
         QueryWrapper<ProtData> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("farm_id", farmId);
 
-
         List<ProtData> protDataList = null;
+        ProCountDto proCountDto = new ProCountDto();
+        //ph
         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;
+
+                queryWrapper.eq("loction_type" ,1);
+                List<ProtData> protData1 = protDataMapper.listPh(queryWrapper);
+                proCountDto.setInList(protData1);
+
+                queryWrapper.eq("loction_type" ,2);
+                List<ProtData> protData2 = protDataMapper.listPh(queryWrapper);
+                proCountDto.setDealList(protData2);
+
+                queryWrapper.eq("loction_type" ,3);
+                List<ProtData> protData3 = protDataMapper.listPh(queryWrapper);
+                proCountDto.setOutList(protData3);
+
+
+               // protDataList=endList;
             }
             //本年
             else if ("3".equals(type)) {
                 DateTime dateTime = DateUtil.beginOfYear(new Date());
                 queryWrapper.ge("create_date", dateTime);
-                List<ProtData> protData = protDataMapper.listPh(queryWrapper);
-                protDataList=protData;
+                queryWrapper.eq("loction_type" ,1);
+                List<ProtData> protData1 = protDataMapper.listPh(queryWrapper);
+                proCountDto.setInList(protData1);
+
+                queryWrapper.eq("loction_type" ,2);
+                List<ProtData> protData2 = protDataMapper.listPh(queryWrapper);
+                proCountDto.setDealList(protData2);
+
+                queryWrapper.eq("loction_type" ,3);
+                List<ProtData> protData3 = protDataMapper.listPh(queryWrapper);
+                proCountDto.setOutList(protData3);
+
+
             }
             //本月
             else if ("2".equals(type)) {
                 Date timesMonthmorning = DataUill.getTimesMonthmorning();
                 queryWrapper.ge("create_date", timesMonthmorning);
-                List<ProtData> protData = protDataMapper.listPh(queryWrapper);
-                protDataList=protData;
+                queryWrapper.eq("loction_type" ,1);
+                List<ProtData> protData1 = protDataMapper.listPh(queryWrapper);
+                proCountDto.setInList(protData1);
+
+                queryWrapper.eq("loction_type" ,2);
+                List<ProtData> protData2 = protDataMapper.listPh(queryWrapper);
+                proCountDto.setDealList(protData2);
+
+                queryWrapper.eq("loction_type" ,3);
+                List<ProtData> protData3 = protDataMapper.listPh(queryWrapper);
+                proCountDto.setOutList(protData3);
+
+
             }
             //本周
             else if ("1".equals(type)) {
                 DateTime dateTime = DateUtil.beginOfWeek(new Date());
                 queryWrapper.ge("create_date", dateTime);
-                List<ProtData> protData = protDataMapper.listPh(queryWrapper);
-                protDataList=protData;
+
+                queryWrapper.eq("loction_type" ,1);
+                List<ProtData> protData1 = protDataMapper.listPh(queryWrapper);
+                proCountDto.setInList(protData1);
+
+                queryWrapper.eq("loction_type" ,2);
+                List<ProtData> protData2 = protDataMapper.listPh(queryWrapper);
+                proCountDto.setDealList(protData2);
+
+                queryWrapper.eq("loction_type" ,3);
+                List<ProtData> protData3 = protDataMapper.listPh(queryWrapper);
+                proCountDto.setOutList(protData3);
+
+
             }
         }
         //cod
@@ -95,29 +142,73 @@ public class ProtDataServiceImpl extends ServiceImpl<ProtDataMapper, ProtData> i
                 startTime = startTime + " 00:00:00";
                 endTime = endTime + " 23:59:59";
                 queryWrapper.between("create_date",startTime, endTime);
-                List<ProtData> protData = protDataMapper.listCod(queryWrapper);
-                protDataList=protData;
+                queryWrapper.eq("loction_type" ,1);
+                List<ProtData> protData1 = protDataMapper.listPh(queryWrapper);
+                proCountDto.setInList(protData1);
+
+                queryWrapper.eq("loction_type" ,2);
+                List<ProtData> protData2 = protDataMapper.listPh(queryWrapper);
+                proCountDto.setDealList(protData2);
+
+                queryWrapper.eq("loction_type" ,3);
+                List<ProtData> protData3 = protDataMapper.listPh(queryWrapper);
+                proCountDto.setOutList(protData3);
+
+
             }
             //本年
             else if ("3".equals(type)) {
                 DateTime dateTime = DateUtil.beginOfYear(new Date());
                 queryWrapper.ge("create_date", dateTime);
-                List<ProtData> protData = protDataMapper.listCod(queryWrapper);
-                protDataList=protData;
+                queryWrapper.eq("loction_type" ,1);
+                List<ProtData> protData1 = protDataMapper.listPh(queryWrapper);
+                proCountDto.setInList(protData1);
+
+                queryWrapper.eq("loction_type" ,2);
+                List<ProtData> protData2 = protDataMapper.listPh(queryWrapper);
+                proCountDto.setDealList(protData2);
+
+                queryWrapper.eq("loction_type" ,3);
+                List<ProtData> protData3 = protDataMapper.listPh(queryWrapper);
+                proCountDto.setOutList(protData3);
+
+
             }
             //本月
             else if ("2".equals(type)) {
                 Date timesMonthmorning = DataUill.getTimesMonthmorning();
                 queryWrapper.ge("create_date", timesMonthmorning);
-                List<ProtData> protData = protDataMapper.listCod(queryWrapper);
-                protDataList=protData;
+                queryWrapper.eq("loction_type" ,1);
+                List<ProtData> protData1 = protDataMapper.listPh(queryWrapper);
+                proCountDto.setInList(protData1);
+
+                queryWrapper.eq("loction_type" ,2);
+                List<ProtData> protData2 = protDataMapper.listPh(queryWrapper);
+                proCountDto.setDealList(protData2);
+
+                queryWrapper.eq("loction_type" ,3);
+                List<ProtData> protData3 = protDataMapper.listPh(queryWrapper);
+                proCountDto.setOutList(protData3);
+
+
             }
             //本周
             else if ("1".equals(type)) {
                 DateTime dateTime = DateUtil.beginOfWeek(new Date());
                 queryWrapper.ge("create_date", dateTime);
-                List<ProtData> protData = protDataMapper.listCod(queryWrapper);
-                protDataList=protData;
+                queryWrapper.eq("loction_type" ,1);
+                List<ProtData> protData1 = protDataMapper.listPh(queryWrapper);
+                proCountDto.setInList(protData1);
+
+                queryWrapper.eq("loction_type" ,2);
+                List<ProtData> protData2 = protDataMapper.listPh(queryWrapper);
+                proCountDto.setDealList(protData2);
+
+                queryWrapper.eq("loction_type" ,3);
+                List<ProtData> protData3 = protDataMapper.listPh(queryWrapper);
+                proCountDto.setOutList(protData3);
+
+
             }
         }
         //NH3N
@@ -126,29 +217,73 @@ public class ProtDataServiceImpl extends ServiceImpl<ProtDataMapper, ProtData> i
                 startTime = startTime + " 00:00:00";
                 endTime = endTime + " 23:59:59";
                 queryWrapper.between("create_date",startTime, endTime);
-                List<ProtData> protData = protDataMapper.listNh3n(queryWrapper);
-                protDataList=protData;
+                queryWrapper.eq("loction_type" ,1);
+                List<ProtData> protData1 = protDataMapper.listPh(queryWrapper);
+                proCountDto.setInList(protData1);
+
+                queryWrapper.eq("loction_type" ,2);
+                List<ProtData> protData2 = protDataMapper.listPh(queryWrapper);
+                proCountDto.setDealList(protData2);
+
+                queryWrapper.eq("loction_type" ,3);
+                List<ProtData> protData3 = protDataMapper.listPh(queryWrapper);
+                proCountDto.setOutList(protData3);
+
+
             }
             //本年
             else if ("3".equals(type)) {
                 DateTime dateTime = DateUtil.beginOfYear(new Date());
                 queryWrapper.ge("create_date", dateTime);
-                List<ProtData> protData = protDataMapper.listNh3n(queryWrapper);
-                protDataList=protData;
+                queryWrapper.eq("loction_type" ,1);
+                List<ProtData> protData1 = protDataMapper.listPh(queryWrapper);
+                proCountDto.setInList(protData1);
+
+                queryWrapper.eq("loction_type" ,2);
+                List<ProtData> protData2 = protDataMapper.listPh(queryWrapper);
+                proCountDto.setDealList(protData2);
+
+                queryWrapper.eq("loction_type" ,3);
+                List<ProtData> protData3 = protDataMapper.listPh(queryWrapper);
+                proCountDto.setOutList(protData3);
+
+
             }
             //本月
             else if ("2".equals(type)) {
                 Date timesMonthmorning = DataUill.getTimesMonthmorning();
                 queryWrapper.ge("create_date", timesMonthmorning);
-                List<ProtData> protData = protDataMapper.listNh3n(queryWrapper);
-                protDataList=protData;
+                queryWrapper.eq("loction_type" ,1);
+                List<ProtData> protData1 = protDataMapper.listPh(queryWrapper);
+                proCountDto.setInList(protData1);
+
+                queryWrapper.eq("loction_type" ,2);
+                List<ProtData> protData2 = protDataMapper.listPh(queryWrapper);
+                proCountDto.setDealList(protData2);
+
+                queryWrapper.eq("loction_type" ,3);
+                List<ProtData> protData3 = protDataMapper.listPh(queryWrapper);
+                proCountDto.setOutList(protData3);
+
+
             }
             //本周
             else if ("1".equals(type)) {
                 DateTime dateTime = DateUtil.beginOfWeek(new Date());
                 queryWrapper.ge("create_date", dateTime);
-                List<ProtData> protData = protDataMapper.listNh3n(queryWrapper);
-                protDataList=protData;
+                queryWrapper.eq("loction_type" ,1);
+                List<ProtData> protData1 = protDataMapper.listPh(queryWrapper);
+                proCountDto.setInList(protData1);
+
+                queryWrapper.eq("loction_type" ,2);
+                List<ProtData> protData2 = protDataMapper.listPh(queryWrapper);
+                proCountDto.setDealList(protData2);
+
+                queryWrapper.eq("loction_type" ,3);
+                List<ProtData> protData3 = protDataMapper.listPh(queryWrapper);
+                proCountDto.setOutList(protData3);
+
+
             }
         }
         //TP
@@ -157,29 +292,73 @@ public class ProtDataServiceImpl extends ServiceImpl<ProtDataMapper, ProtData> i
                 startTime = startTime + " 00:00:00";
                 endTime = endTime + " 23:59:59";
                 queryWrapper.between("create_date",startTime, endTime);
-                List<ProtData> protData = protDataMapper.listTp(queryWrapper);
-                protDataList=protData;
+                queryWrapper.eq("loction_type" ,1);
+                List<ProtData> protData1 = protDataMapper.listPh(queryWrapper);
+                proCountDto.setInList(protData1);
+
+                queryWrapper.eq("loction_type" ,2);
+                List<ProtData> protData2 = protDataMapper.listPh(queryWrapper);
+                proCountDto.setDealList(protData2);
+
+                queryWrapper.eq("loction_type" ,3);
+                List<ProtData> protData3 = protDataMapper.listPh(queryWrapper);
+                proCountDto.setOutList(protData3);
+
+
             }
             //本年
             else if ("3".equals(type)) {
                 DateTime dateTime = DateUtil.beginOfYear(new Date());
                 queryWrapper.ge("create_date", dateTime);
-                List<ProtData> protData = protDataMapper.listTp(queryWrapper);
-                protDataList=protData;
+                queryWrapper.eq("loction_type" ,1);
+                List<ProtData> protData1 = protDataMapper.listPh(queryWrapper);
+                proCountDto.setInList(protData1);
+
+                queryWrapper.eq("loction_type" ,2);
+                List<ProtData> protData2 = protDataMapper.listPh(queryWrapper);
+                proCountDto.setDealList(protData2);
+
+                queryWrapper.eq("loction_type" ,3);
+                List<ProtData> protData3 = protDataMapper.listPh(queryWrapper);
+                proCountDto.setOutList(protData3);
+
+
             }
             //本月
             else if ("2".equals(type)) {
                 Date timesMonthmorning = DataUill.getTimesMonthmorning();
                 queryWrapper.ge("create_date", timesMonthmorning);
-                List<ProtData> protData = protDataMapper.listTp(queryWrapper);
-                protDataList=protData;
+                queryWrapper.eq("loction_type" ,1);
+                List<ProtData> protData1 = protDataMapper.listPh(queryWrapper);
+                proCountDto.setInList(protData1);
+
+                queryWrapper.eq("loction_type" ,2);
+                List<ProtData> protData2 = protDataMapper.listPh(queryWrapper);
+                proCountDto.setDealList(protData2);
+
+                queryWrapper.eq("loction_type" ,3);
+                List<ProtData> protData3 = protDataMapper.listPh(queryWrapper);
+                proCountDto.setOutList(protData3);
+
+
             }
             //本周
             else if ("1".equals(type)) {
                 DateTime dateTime = DateUtil.beginOfWeek(new Date());
                 queryWrapper.ge("create_date", dateTime);
-                List<ProtData> protData = protDataMapper.listTp(queryWrapper);
-                protDataList=protData;
+                queryWrapper.eq("loction_type" ,1);
+                List<ProtData> protData1 = protDataMapper.listPh(queryWrapper);
+                proCountDto.setInList(protData1);
+
+                queryWrapper.eq("loction_type" ,2);
+                List<ProtData> protData2 = protDataMapper.listPh(queryWrapper);
+                proCountDto.setDealList(protData2);
+
+                queryWrapper.eq("loction_type" ,3);
+                List<ProtData> protData3 = protDataMapper.listPh(queryWrapper);
+                proCountDto.setOutList(protData3);
+
+
             }
         }
         //TN
@@ -188,29 +367,73 @@ public class ProtDataServiceImpl extends ServiceImpl<ProtDataMapper, ProtData> i
                 startTime = startTime + " 00:00:00";
                 endTime = endTime + " 23:59:59";
                 queryWrapper.between("create_date",startTime, endTime);
-                List<ProtData> protData = protDataMapper.listTn(queryWrapper);
-                protDataList=protData;
+                queryWrapper.eq("loction_type" ,1);
+                List<ProtData> protData1 = protDataMapper.listPh(queryWrapper);
+                proCountDto.setInList(protData1);
+
+                queryWrapper.eq("loction_type" ,2);
+                List<ProtData> protData2 = protDataMapper.listPh(queryWrapper);
+                proCountDto.setDealList(protData2);
+
+                queryWrapper.eq("loction_type" ,3);
+                List<ProtData> protData3 = protDataMapper.listPh(queryWrapper);
+                proCountDto.setOutList(protData3);
+
+
             }
             //本年
             else if ("3".equals(type)) {
                 DateTime dateTime = DateUtil.beginOfYear(new Date());
                 queryWrapper.ge("create_date", dateTime);
-                List<ProtData> protData = protDataMapper.listTn(queryWrapper);
-                protDataList=protData;
+                queryWrapper.eq("loction_type" ,1);
+                List<ProtData> protData1 = protDataMapper.listPh(queryWrapper);
+                proCountDto.setInList(protData1);
+
+                queryWrapper.eq("loction_type" ,2);
+                List<ProtData> protData2 = protDataMapper.listPh(queryWrapper);
+                proCountDto.setDealList(protData2);
+
+                queryWrapper.eq("loction_type" ,3);
+                List<ProtData> protData3 = protDataMapper.listPh(queryWrapper);
+                proCountDto.setOutList(protData3);
+
+
             }
             //本月
             else if ("2".equals(type)) {
                 Date timesMonthmorning = DataUill.getTimesMonthmorning();
                 queryWrapper.ge("create_date", timesMonthmorning);
-                List<ProtData> protData = protDataMapper.listTn(queryWrapper);
-                protDataList=protData;
+                queryWrapper.eq("loction_type" ,1);
+                List<ProtData> protData1 = protDataMapper.listPh(queryWrapper);
+                proCountDto.setInList(protData1);
+
+                queryWrapper.eq("loction_type" ,2);
+                List<ProtData> protData2 = protDataMapper.listPh(queryWrapper);
+                proCountDto.setDealList(protData2);
+
+                queryWrapper.eq("loction_type" ,3);
+                List<ProtData> protData3 = protDataMapper.listPh(queryWrapper);
+                proCountDto.setOutList(protData3);
+
+
             }
             //本周
             else if ("1".equals(type)) {
                 DateTime dateTime = DateUtil.beginOfWeek(new Date());
                 queryWrapper.ge("create_date", dateTime);
-                List<ProtData> protData = protDataMapper.listTn(queryWrapper);
-                protDataList=protData;
+                queryWrapper.eq("loction_type" ,1);
+                List<ProtData> protData1 = protDataMapper.listPh(queryWrapper);
+                proCountDto.setInList(protData1);
+
+                queryWrapper.eq("loction_type" ,2);
+                List<ProtData> protData2 = protDataMapper.listPh(queryWrapper);
+                proCountDto.setDealList(protData2);
+
+                queryWrapper.eq("loction_type" ,3);
+                List<ProtData> protData3 = protDataMapper.listPh(queryWrapper);
+                proCountDto.setOutList(protData3);
+
+
             }
         }
         //FLOW
@@ -219,42 +442,85 @@ public class ProtDataServiceImpl extends ServiceImpl<ProtDataMapper, ProtData> i
                 startTime = startTime + " 00:00:00";
                 endTime = endTime + " 23:59:59";
                 queryWrapper.between("create_date",startTime, endTime);
-                List<ProtData> protData = protDataMapper.listFlow(queryWrapper);
-                protDataList=protData;
+                queryWrapper.eq("loction_type" ,1);
+                List<ProtData> protData1 = protDataMapper.listPh(queryWrapper);
+                proCountDto.setInList(protData1);
+
+                queryWrapper.eq("loction_type" ,2);
+                List<ProtData> protData2 = protDataMapper.listPh(queryWrapper);
+                proCountDto.setDealList(protData2);
+
+                queryWrapper.eq("loction_type" ,3);
+                List<ProtData> protData3 = protDataMapper.listPh(queryWrapper);
+                proCountDto.setOutList(protData3);
+
+
             }
             //本年
             else if ("3".equals(type)) {
                 DateTime dateTime = DateUtil.beginOfYear(new Date());
                 queryWrapper.ge("create_date", dateTime);
-                List<ProtData> protData = protDataMapper.listFlow(queryWrapper);
-                protDataList=protData;
+                queryWrapper.eq("loction_type" ,1);
+                List<ProtData> protData1 = protDataMapper.listPh(queryWrapper);
+                proCountDto.setInList(protData1);
+
+                queryWrapper.eq("loction_type" ,2);
+                List<ProtData> protData2 = protDataMapper.listPh(queryWrapper);
+                proCountDto.setDealList(protData2);
+
+                queryWrapper.eq("loction_type" ,3);
+                List<ProtData> protData3 = protDataMapper.listPh(queryWrapper);
+                proCountDto.setOutList(protData3);
+
+
             }
             //本月
             else if ("2".equals(type)) {
                 Date timesMonthmorning = DataUill.getTimesMonthmorning();
                 queryWrapper.ge("create_date", timesMonthmorning);
-                List<ProtData> protData = protDataMapper.listFlow(queryWrapper);
-                protDataList=protData;
+                queryWrapper.eq("loction_type" ,1);
+                List<ProtData> protData1 = protDataMapper.listPh(queryWrapper);
+                proCountDto.setInList(protData1);
+
+                queryWrapper.eq("loction_type" ,2);
+                List<ProtData> protData2 = protDataMapper.listPh(queryWrapper);
+                proCountDto.setDealList(protData2);
+
+                queryWrapper.eq("loction_type" ,3);
+                List<ProtData> protData3 = protDataMapper.listPh(queryWrapper);
+                proCountDto.setOutList(protData3);
+
+
             }
             //本周
             else if ("1".equals(type)) {
                 DateTime dateTime = DateUtil.beginOfWeek(new Date());
                 queryWrapper.ge("create_date", dateTime);
-                List<ProtData> protData = protDataMapper.listFlow(queryWrapper);
-                protDataList=protData;
+                queryWrapper.eq("loction_type" ,1);
+                List<ProtData> protData1 = protDataMapper.listPh(queryWrapper);
+                proCountDto.setInList(protData1);
+
+                queryWrapper.eq("loction_type" ,2);
+                List<ProtData> protData2 = protDataMapper.listPh(queryWrapper);
+                proCountDto.setDealList(protData2);
+
+                queryWrapper.eq("loction_type" ,3);
+                List<ProtData> protData3 = protDataMapper.listPh(queryWrapper);
+                proCountDto.setOutList(protData3);
+
+
             }
         }
-        return new Result(ResultCode.SUCCESS,protDataList);
+        return new Result(ResultCode.SUCCESS, proCountDto);
     }
 
     @Override
     public Result listProt(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
-        ProDataVo proDataVo = new ProDataVo();
+
         String farmId = paramsMap.get("farmId");
         QueryWrapper<ProtWarningInfo> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("farm_id", farmId);
         List<ProtWarningInfo> protWarningInfos = protWarningInfoMapper.selectList(queryWrapper);
-        JSONArray jsonArray = new JSONArray();
         //今日
         Date timesmorning = DataUill.getTimesmorning();
         Integer dayCount = 0;
@@ -264,10 +530,11 @@ public class ProtDataServiceImpl extends ServiceImpl<ProtDataMapper, ProtData> i
         //本月
         Date timesMonthmorning = DataUill.getTimesMonthmorning();
         Integer monthCount = 0;
+        List<ProDataVo> voList = new LinkedList<>();
         for (int i = 0; i < protWarningInfos.size(); i++) {
-            JSONObject jsonObject = new JSONObject();
-            jsonObject.put("content",protWarningInfos.get(i).getWarningContent());
-            jsonObject.put("time",protWarningInfos.get(i).getDate());
+            ProDataVo proDataVo = new ProDataVo();
+            proDataVo.setContent(protWarningInfos.get(i).getWarningContent());
+            proDataVo.setTime(protWarningInfos.get(i).getDate());
             if (protWarningInfos.get(i).getDate().after(timesmorning)) {
                 dayCount++;
             }
@@ -277,29 +544,40 @@ public class ProtDataServiceImpl extends ServiceImpl<ProtDataMapper, ProtData> i
             if (protWarningInfos.get(i).getDate().after(timesMonthmorning)) {
                 monthCount++;
             }
-            jsonArray.add(jsonObject);
+            voList.add(proDataVo);
         }
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("dayCount", dayCount);
         jsonObject.put("weekCount", weekCount);
         jsonObject.put("monthCount", monthCount);
         jsonObject.put("count", protWarningInfos.size());
-        jsonArray.add(jsonObject);
+        jsonObject.put("data", voList);
 
-        return new Result(ResultCode.SUCCESS,proDataVo);
+
+        return new Result(ResultCode.SUCCESS,jsonObject);
     }
 
-    /*@Override
+    @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);
+        ProCountDto proCountDto = new ProCountDto();
+
+        queryWrapper.eq("farm_id", farmId).eq("loction_type", 1);
+        List<ProtData> protDataList = protDataMapper.selectList(queryWrapper);
+        proCountDto.setInList(protDataList);
+
+        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", 3);
+        List<ProtData> protDataList3 = protDataMapper.selectList(queryWrapper);
+        proCountDto.setOutList(protDataList3);
+
+        return new Result(ResultCode.SUCCESS,proCountDto);
+    }
 
-        //ph
-        if ("1".equals(type)) {
 
-        }
-        return null;
-    }*/
 }

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

@@ -1,6 +1,7 @@
 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;
@@ -37,8 +38,8 @@ public class ProtThresholdServiceImpl extends ServiceImpl<ProtThresholdMapper, P
         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 jsonObject = new JSONObject();
             jsonObject.put("COD1", 0);
             jsonObject.put("COD2", 0);
             jsonObject.put("PH1", 0);
@@ -52,25 +53,16 @@ public class ProtThresholdServiceImpl extends ServiceImpl<ProtThresholdMapper, P
             jsonObject.put("FLOW1", 0);
             jsonObject.put("FLOW2", 0);
             jsonObject.put("userIds", 0);
+            return new Result(ResultCode.SUCCESS, jsonObject);
         } 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());
+            JSONObject jsonObject = new JSONObject();
+            for (int i = 0; i < protThresholdList.size(); i++) {
+                ProtThreshold protThreshold = protThresholdList.get(i);
+                jsonObject.put(String.valueOf(i+1), protThreshold);
+            }
+            return new Result(ResultCode.SUCCESS,jsonObject);
         }
-        return new Result(ResultCode.SUCCESS, jsonObject);
+
     }
 
     @Override

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

@@ -15,6 +15,7 @@
         <result column="other2" property="other2" />
         <result column="other3" property="other3" />
         <result column="create_time" property="createTime"/>
+        <result column="receive_date" property="receiveDate"/>
     </resultMap>
 
 </mapper>

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

@@ -19,28 +19,28 @@
         <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
+    <select id="listPh" resultType="com.huimv.admin.entity.vo.ProCountVo">
+        select ph 'value',create_date,loction_type from prot_data
         ${ew.customSqlSegment}
     </select>
-    <select id="listCod" resultType="com.huimv.admin.entity.ProtData">
-        select cod,create_date from prot_data
+    <select id="listCod" resultType="com.huimv.admin.entity.vo.ProCountVo">
+        select cod 'value',create_date,loction_type from prot_data
         ${ew.customSqlSegment}
     </select>
-    <select id="listNh3n" resultType="com.huimv.admin.entity.ProtData">
-        select NH3N,create_date from prot_data
+    <select id="listNh3n" resultType="com.huimv.admin.entity.vo.ProCountVo">
+        select NH3N 'value',create_date,loction_type from prot_data
         ${ew.customSqlSegment}
     </select>
-    <select id="listTp" resultType="com.huimv.admin.entity.ProtData">
-        select TP,create_date from prot_data
+    <select id="listTp" resultType="com.huimv.admin.entity.vo.ProCountVo">
+        select TP 'value',create_date,loction_type from prot_data
         ${ew.customSqlSegment}
     </select>
-    <select id="listTn" resultType="com.huimv.admin.entity.ProtData">
-        select TN,create_date from prot_data
+    <select id="listTn" resultType="com.huimv.admin.entity.vo.ProCountVo">
+        select TN 'value',create_date,loction_type from prot_data
         ${ew.customSqlSegment}
     </select>
-    <select id="listFlow" resultType="com.huimv.admin.entity.ProtData">
-        select FLOW,create_date from prot_data
+    <select id="listFlow" resultType="com.huimv.admin.entity.vo.ProCountVo">
+        select FLOW 'value',create_date,loction_type from prot_data
         ${ew.customSqlSegment}
     </select>
 </mapper>