From ed8c7a5effd0d423ce1118b680ecdca6fe732609 Mon Sep 17 00:00:00 2001 From: 13693261870 <252740454@qq.com> Date: 星期三, 02 七月 2025 16:43:13 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.11.205:9000/r/P2022036_Service --- src/main/java/com/lf/server/controller/data/DomainController.java | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/lf/server/controller/data/DomainController.java b/src/main/java/com/lf/server/controller/data/DomainController.java index c71837e..78b337e 100644 --- a/src/main/java/com/lf/server/controller/data/DomainController.java +++ b/src/main/java/com/lf/server/controller/data/DomainController.java @@ -8,6 +8,7 @@ import com.lf.server.entity.sys.UserEntity; import com.lf.server.helper.StringHelper; import com.lf.server.service.all.BaseQueryService; +import com.lf.server.service.data.DictService; import com.lf.server.service.data.DomainService; import com.lf.server.service.sys.TokenService; import io.swagger.annotations.Api; @@ -36,6 +37,9 @@ @Autowired BaseQueryService baseQueryService; + + @Autowired + DictService dictService; @SysLog() @ApiOperation(value = "鏌ヨ璁板綍鏁�") @@ -123,10 +127,14 @@ @SysLog() @ApiOperation(value = "鏌ヨ鍊煎煙琛ㄩ泦鍚�") + @ApiImplicitParams({ + @ApiImplicitParam(name = "name", value = "鍚嶇О", dataType = "String", paramType = "query", example = "b_"), + @ApiImplicitParam(name = "hasGeom", value = "鍚湁Geom瀛楁", dataType = "Boolean", paramType = "query", example = "false") + }) @GetMapping(value = "/selectDomainTabs") - public ResponseMsg<List<TabEntity>> selectDomainTabs() { + public ResponseMsg<List<TabEntity>> selectDomainTabs(String name, Boolean hasGeom) { try { - List<TabEntity> list = domainService.selectDomainTabs(); + List<TabEntity> list = dictService.selectDictTab(name, null == hasGeom || !hasGeom ? "gid" : "geom"); return success(list); } catch (Exception ex) { -- Gitblit v1.9.3