diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcCoverageCategoryDictListResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcCoverageCategoryDictListResultDTO.java new file mode 100644 index 0000000000..bc66b1ad5d --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcCoverageCategoryDictListResultDTO.java @@ -0,0 +1,14 @@ +package com.epmet.dto.result; + +import lombok.Data; + +/** + * 五大图层-类别下拉框字典 + */ +@Data +public class IcCoverageCategoryDictListResultDTO { + + private String categoryKey; + private String categoryName; + +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CoverageController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CoverageController.java index 559e2f103a..3ddfa982e6 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CoverageController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CoverageController.java @@ -1,16 +1,17 @@ package com.epmet.controller; +import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.form.CoverageCategoryQueryFormDTO; import com.epmet.dto.result.CoverageCategoryResultDTO; +import com.epmet.dto.result.IcCoverageCategoryDictListResultDTO; import com.epmet.service.CoverageService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; +import java.util.Map; /** * 5大图层controller @@ -34,4 +35,9 @@ public class CoverageController { return new Result>().ok(categories); } + @PostMapping("dict-select-list/{placeType}") + public Result> dictMap(@LoginUser TokenDto tokenDto, @PathVariable("placeType") String placeType) { + return new Result>().ok(coverageService.dictMap(tokenDto.getCustomerId(), placeType)); + } + } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcCoverageCategoryDictDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcCoverageCategoryDictDao.java index c614258580..ae507878c5 100755 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcCoverageCategoryDictDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcCoverageCategoryDictDao.java @@ -1,8 +1,13 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.result.CoverageCategoryResultDTO; +import com.epmet.dto.result.IcCoverageCategoryDictListResultDTO; import com.epmet.entity.IcCoverageCategoryDictEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 五大图层类别字典表 @@ -12,5 +17,7 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface IcCoverageCategoryDictDao extends BaseDao { - + + List dictMap(@Param("customerId") String customerId, @Param("placeType") String placeType); + } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CoverageService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CoverageService.java index c7b6603a70..4375ebd85b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CoverageService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CoverageService.java @@ -1,6 +1,7 @@ package com.epmet.service; import com.epmet.dto.result.CoverageCategoryResultDTO; +import com.epmet.dto.result.IcCoverageCategoryDictListResultDTO; import java.util.List; @@ -13,4 +14,5 @@ public interface CoverageService { */ List categoryList(List coverageTypeList); + List dictMap(String customerId, String placeType); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CoverageServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CoverageServiceImpl.java index e6c71a0f61..648e019223 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CoverageServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CoverageServiceImpl.java @@ -3,6 +3,7 @@ package com.epmet.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.epmet.dao.IcCoverageCategoryDictDao; import com.epmet.dto.result.CoverageCategoryResultDTO; +import com.epmet.dto.result.IcCoverageCategoryDictListResultDTO; import com.epmet.entity.IcCoverageCategoryDictEntity; import com.epmet.service.CoverageService; import org.springframework.beans.factory.annotation.Autowired; @@ -49,4 +50,10 @@ public class CoverageServiceImpl implements CoverageService { return stream.collect(Collectors.toList()); } + + @Override + public List dictMap(String customerId, String placeType) { + List resultList = coverageCategoryDictDao.dictMap(customerId, placeType); + return resultList; + } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcCoverageCategoryDictDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcCoverageCategoryDictDao.xml index bdac4ea573..0bc660a561 100755 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcCoverageCategoryDictDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcCoverageCategoryDictDao.xml @@ -3,21 +3,25 @@ - - - - - - - - - - - - - - - + \ No newline at end of file