From fd8d6d3add9aaf75e58f088f6f01cfc4ccae75ff Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Fri, 17 Jun 2022 09:36:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=9B=BE=E5=B1=82=E5=88=86?= =?UTF-8?q?=E7=B1=BB=E7=9A=84=E5=AD=97=E5=85=B8=E4=B8=80=E4=BA=9B=E7=B1=BB?= =?UTF-8?q?=E3=80=82=E6=96=B0=E5=A2=9E"=E6=9F=A5=E8=AF=A2=E5=9B=BE?= =?UTF-8?q?=E5=B1=82=E5=88=86=E7=B1=BB=E5=88=97=E8=A1=A8"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/CoverageCategoryQueryFormDTO.java | 13 ++++ .../dto/result/CoverageCategoryResultDTO.java | 14 +++++ epmet-module/gov-org/gov-org-server/pom.xml | 4 +- .../epmet/controller/CoverageController.java | 24 +++++++- .../epmet/dao/IcCoverageCategoryDictDao.java | 16 +++++ .../entity/IcCoverageCategoryDictEntity.java | 59 +++++++++++++++++++ .../com/epmet/service/CoverageService.java | 16 +++++ .../service/impl/CoverageServiceImpl.java | 52 ++++++++++++++++ .../mapper/IcCoverageCategoryDictDao.xml | 23 ++++++++ 9 files changed, 218 insertions(+), 3 deletions(-) create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CoverageCategoryQueryFormDTO.java create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CoverageCategoryResultDTO.java create mode 100755 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcCoverageCategoryDictDao.java create mode 100755 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcCoverageCategoryDictEntity.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CoverageService.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CoverageServiceImpl.java create mode 100755 epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcCoverageCategoryDictDao.xml diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CoverageCategoryQueryFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CoverageCategoryQueryFormDTO.java new file mode 100644 index 0000000000..3495e9cdad --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CoverageCategoryQueryFormDTO.java @@ -0,0 +1,13 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import java.util.List; + +/** + * 图层-类别查询form + */ +@Data +public class CoverageCategoryQueryFormDTO { + private List coverageTypes; +} diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CoverageCategoryResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CoverageCategoryResultDTO.java new file mode 100644 index 0000000000..06066201cd --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CoverageCategoryResultDTO.java @@ -0,0 +1,14 @@ +package com.epmet.dto.result; + +import lombok.Data; + +/** + * 五大图层-类别 结果类 + */ +@Data +public class CoverageCategoryResultDTO { + + private String categoryKey; + private String categoryName; + +} diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index b4a6ef92e1..5efca9400d 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -243,13 +243,13 @@ - + epmet_gov_org_user EpmEt-db-UsEr 0 - 192.168.1.140 + localhost 6379 123456 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 3eea45977f..559e2f103a 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,8 +1,17 @@ package com.epmet.controller; +import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.form.CoverageCategoryQueryFormDTO; +import com.epmet.dto.result.CoverageCategoryResultDTO; +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 java.util.List; + /** * 5大图层controller */ @@ -10,6 +19,19 @@ import org.springframework.web.bind.annotation.RestController; @RequestMapping("coverage") public class CoverageController { - //public Result + @Autowired + private CoverageService coverageService; + + /** + * 类别列表 + * @param form + * @return + */ + @PostMapping("categoryList") + public Result> categoryList(@RequestBody CoverageCategoryQueryFormDTO form) { + List coverageTypes = form.getCoverageTypes(); + List categories = coverageService.categoryList(coverageTypes); + return new Result>().ok(categories); + } } \ 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 new file mode 100755 index 0000000000..c614258580 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcCoverageCategoryDictDao.java @@ -0,0 +1,16 @@ +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.IcCoverageCategoryDictEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 五大图层类别字典表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-16 + */ +@Mapper +public interface IcCoverageCategoryDictDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcCoverageCategoryDictEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcCoverageCategoryDictEntity.java new file mode 100755 index 0000000000..c690e4a48a --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcCoverageCategoryDictEntity.java @@ -0,0 +1,59 @@ +package com.epmet.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 五大图层类别字典表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-16 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("ic_coverage_category_dict") +public class IcCoverageCategoryDictEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * default；或者customerId + */ + private String customerId; + + /** + * 类别key + */ + private String categoryKey; + + /** + * 名称 + */ + private String categoryName; + + /** + * 所属场所类型； +社区自组织：community_org; +优势资源:superior_resource; +城市管理：city_management； +重点危化企业：dangerous_chemicals； +公共服务：public_service + */ + private String placeType; + + /** + * 所属五大图层：zhzl：综合治理图层；yjcl：应急处置图层；aqsc：安全生产图层；csgl：城市管理图层；ggfw：公共服务图层 + */ + private String coverageType; + + /** + * 排序 + */ + private Integer sort; + +} 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 new file mode 100644 index 0000000000..c7b6603a70 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CoverageService.java @@ -0,0 +1,16 @@ +package com.epmet.service; + +import com.epmet.dto.result.CoverageCategoryResultDTO; + +import java.util.List; + +public interface CoverageService { + + /** + * 根据图层列表，查询图层下的类别列表 + * @param coverageList 图层列表 + * @return 类别列表 + */ + List categoryList(List coverageTypeList); + +} 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 new file mode 100644 index 0000000000..e6c71a0f61 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CoverageServiceImpl.java @@ -0,0 +1,52 @@ +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.entity.IcCoverageCategoryDictEntity; +import com.epmet.service.CoverageService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.function.Function; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +@Service +public class CoverageServiceImpl implements CoverageService { + + @Autowired + private IcCoverageCategoryDictDao coverageCategoryDictDao; + + /** + * 根据图层列表，查询图层下的类别列表 + * @param coverageTypeList 图层列表 + * @return 类别列表 + */ + @Override + public List categoryList(List coverageTypeList) { + Stream stream = coverageTypeList.stream().map(categoryType -> { + + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + query.eq(IcCoverageCategoryDictEntity::getCoverageType, categoryType); + query.orderByAsc(IcCoverageCategoryDictEntity::getCreatedTime); + List categoriesEntity = coverageCategoryDictDao.selectList(query); + + return categoriesEntity.stream().map(e -> { + CoverageCategoryResultDTO dto = new CoverageCategoryResultDTO(); + dto.setCategoryKey(e.getCategoryKey()); + dto.setCategoryName(e.getCategoryName()); + return dto; + }).collect(Collectors.toList()); + + }).flatMap(new Function, Stream>() { + @Override + public Stream apply(List coverageCategoryResultDTOS) { + return coverageCategoryResultDTOS.stream(); + } + }); + + return stream.collect(Collectors.toList()); + } +} 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 new file mode 100755 index 0000000000..bdac4ea573 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcCoverageCategoryDictDao.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file