From 2ad979f912a1883c7a46048fa371d213f8406ba9 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 08 Nov 2021 11:26:22 +0800
Subject: [PATCH] update

---
 screen-api/src/main/java/com/moral/api/controller/GovMonitorPointController.java |   71 +++++++++++++++++++++++++++++++----
 1 files changed, 63 insertions(+), 8 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/controller/GovMonitorPointController.java b/screen-api/src/main/java/com/moral/api/controller/GovMonitorPointController.java
index 565a897..1f83302 100644
--- a/screen-api/src/main/java/com/moral/api/controller/GovMonitorPointController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/GovMonitorPointController.java
@@ -1,18 +1,22 @@
 package com.moral.api.controller;
 
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.moral.api.entity.GovMonitorPoint;
+import com.moral.api.entity.Organization;
+import com.moral.api.mapper.OrganizationMapper;
 import com.moral.api.service.GovMonitorPointService;
 import com.moral.constant.ResponseCodeEnum;
 import com.moral.constant.ResultMessage;
+import com.moral.util.WebUtils;
 import io.swagger.annotations.Api;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @ClassName
@@ -31,19 +35,70 @@
     @Autowired
     GovMonitorPointService govMonitorPointService;
 
+    @Resource
+    private OrganizationMapper organizationMapper;
+
 
     /**
-     * @Description: ���������������������
-     * @Param: [regionCode]
+     * @Description: ���������������������������������������
+     * @Param: [regionCode,sensorCode]
      * @return: com.moral.constant.ResultMessage
      * @Author: ���������
      * @Date: 2021/9/9
      */
     @GetMapping("queryStateControlStation")
-    public ResultMessage queryStateControlStation(Integer regionCode) {
+    public ResultMessage queryStateControlStation(Integer regionCode,String sensorCode) {
 
-        List<GovMonitorPoint> govMonitorPoints = govMonitorPointService.queryGovMonitorPointAndDataByRegionCode(regionCode);
+        List<GovMonitorPoint> govMonitorPoints = govMonitorPointService.queryGovMonitorPointAndDataByRegionCode(regionCode,sensorCode);
 
         return new ResultMessage(ResponseCodeEnum.SUCCESS.getCode(), ResponseCodeEnum.SUCCESS.getMsg(), govMonitorPoints);
     }
+
+    /**
+      *@Description: ������������id������������������
+      *@Param: [request]
+      *@return: com.moral.constant.ResultMessage 
+      *@Author: lizijie
+      *@Date: 2021/9/26 9:42
+     **/
+    @RequestMapping(value = "getGovMonitorPointsByOrgId", method = RequestMethod.GET)
+    @ResponseBody
+    public ResultMessage getGovMonitorPointsByOrgId(HttpServletRequest request){
+        Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+        Object orgid = parameters.get("organization_id");
+        if (ObjectUtils.isEmpty(orgid)){
+            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+        }
+        Organization organization = organizationMapper.selectById(Integer.parseInt(orgid.toString()));
+        if (ObjectUtils.isEmpty(organization)){
+            return ResultMessage.fail(ResponseCodeEnum.ORGANIZATION_NOT_EXIST.getCode(), ResponseCodeEnum.ORGANIZATION_NOT_EXIST.getMsg());
+        }
+        List<GovMonitorPoint> govMonitorPoints = govMonitorPointService.selectGovMonitorPointsByOrgid(parameters);
+        return  ResultMessage.ok(govMonitorPoints);
+    }
+
+    /**
+      *@Description: ������guid���������id������������������������������������������
+      *@Param: [request]
+      *@return: com.moral.constant.ResultMessage 
+      *@Author: lizijie
+      *@Date: 2021/9/26 10:06
+     **/
+    @RequestMapping(value = "queryGovMonitorPointHourlyDataByGuidsAndOrgid", method = RequestMethod.GET)
+    @ResponseBody
+    public ResultMessage queryGovMonitorPointHourlyDataByGuidsAndOrgid(HttpServletRequest request){
+        Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+        Object orgid = parameters.get("organization_id");
+        Object guids = parameters.get("guids");
+        Object date = parameters.get("date");
+        if (ObjectUtils.isEmpty(orgid) || ObjectUtils.isEmpty(guids) || ObjectUtils.isEmpty(date)){
+            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+        }
+        Organization organization = organizationMapper.selectById(Integer.parseInt(orgid.toString()));
+        if (ObjectUtils.isEmpty(organization)){
+            return ResultMessage.fail(ResponseCodeEnum.ORGANIZATION_NOT_EXIST.getCode(), ResponseCodeEnum.ORGANIZATION_NOT_EXIST.getMsg());
+        }
+        Map<String,Object> resultMap = govMonitorPointService.queryGovMonitorPointHoutlyDatyByGuidsAndOrgid(parameters);
+        return  ResultMessage.ok(resultMap);
+    }
 }

--
Gitblit v1.8.0