From 0e0643aed8857e9b845ee5dcc56cdec652bc89f2 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 28 Aug 2023 15:59:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa
---
screen-manage/src/main/java/com/moral/api/controller/GovMonitorPoionController.java | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/controller/GovMonitorPoionController.java b/screen-manage/src/main/java/com/moral/api/controller/GovMonitorPoionController.java
index 0757047..7999b4e 100644
--- a/screen-manage/src/main/java/com/moral/api/controller/GovMonitorPoionController.java
+++ b/screen-manage/src/main/java/com/moral/api/controller/GovMonitorPoionController.java
@@ -3,7 +3,9 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.moral.api.entity.GovMonitorPoint;
+import com.moral.api.entity.Organization;
import com.moral.api.mapper.GovMonitorPointMapper;
+import com.moral.api.mapper.OrganizationMapper;
import com.moral.api.service.GovMonitorPointService;
import com.moral.constant.Constants;
import com.moral.constant.ResponseCodeEnum;
@@ -40,6 +42,9 @@
@Resource
private GovMonitorPointMapper govMonitorPointMapper;
+
+ @Resource
+ private OrganizationMapper organizationMapper;
@RequestMapping(value = "getGovMonitorPointByCondition", method = RequestMethod.GET)
@ResponseBody
@@ -119,4 +124,20 @@
List<Map<String, Object>> response = govMonitorPointService.selectGovMonitorPoints(regionCode);
return ResultMessage.ok(response);
}
+
+ @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);
+ }
}
--
Gitblit v1.8.0