From e79d8c8f9679839bf983341fe2cf3212e1bb3001 Mon Sep 17 00:00:00 2001
From: wangwh <2397901735@qq.com>
Date: Mon, 28 Oct 2024 14:44:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/gzdyh_test' into gzdyh_test
---
dyh-service/dyh-sys/src/main/java/cn/huge/module/kind/controller/web/SyRegionWebController.java | 36 ++++++++++++++++++++++++++++++++++++
1 files changed, 36 insertions(+), 0 deletions(-)
diff --git a/dyh-service/dyh-sys/src/main/java/cn/huge/module/kind/controller/web/SyRegionWebController.java b/dyh-service/dyh-sys/src/main/java/cn/huge/module/kind/controller/web/SyRegionWebController.java
index 820372a..c1cf796 100644
--- a/dyh-service/dyh-sys/src/main/java/cn/huge/module/kind/controller/web/SyRegionWebController.java
+++ b/dyh-service/dyh-sys/src/main/java/cn/huge/module/kind/controller/web/SyRegionWebController.java
@@ -3,11 +3,13 @@
import cn.huge.base.common.utils.ObjectUtils;
import cn.huge.base.common.utils.ReturnFailUtils;
import cn.huge.base.common.utils.ReturnSucUtils;
+import cn.huge.base.config.CurrentUser;
import cn.huge.module.kind.domain.dto.RegionSelectJSDTO;
import cn.huge.module.kind.domain.dto.RegionSelectSaveDTO;
import cn.huge.module.kind.domain.po.SyRegion;
import cn.huge.module.kind.service.SyRegionService;
import cn.huge.module.sys.dto.QueAddrBaseDTO;
+import cn.huge.module.sys.dto.QueAreaDTO;
import cn.huge.module.utils.BaiduMapAddrDTO;
import cn.huge.module.utils.BaiduMapUtils;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -21,6 +23,7 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@@ -207,4 +210,37 @@
}
}
+
+ /**
+ * 根据父类ID获取列表
+ * @url {ctx}/api/web/syRegion/listByParentId
+ * @return
+ */
+ @GetMapping("/listByParentId")
+ public Object listByParentId(@RequestParam(value = "parentId") String parentId) {
+ try {
+ List<QueAreaDTO> list = service.listByParentId(parentId);
+ return ReturnSucUtils.getRepInfo(list);
+ } catch (Exception e) {
+ return ReturnFailUtils.getRepInfo();
+ }
+ }
+
+ /**
+ * 根据用户ID获取对应权限区域树
+ * @url {ctx}/api/web/syRegion/treeByUserId
+ * @return
+ *
+ */
+ @GetMapping("/treeByUserId")
+ public Object treeByUserId(@CurrentUser String userId) {
+ try {
+// String userId = "2105120906491001";
+ return ReturnSucUtils.getRepInfo(service.treeByUserId(userId));
+ } catch (Exception e) {
+ log.error("Controller接口[SyRegionWebController.treeByUserId]请求异常："+e, e);
+ return ReturnFailUtils.getRepInfo();
+ }
+ }
+
}
--
Gitblit v1.8.0