新增图层分类的字典一些类。新增"查询图层分类列表"

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<String> coverageTypes;
+}

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;
+
+}

epmet-module/gov-org/gov-org-server/pom.xml

@@ -243,13 +243,13 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://192.168.1.140:3306/epmet_gov_org?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://118.190.150.119:43306/epmet_gov_org?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epmet_gov_org_user</spring.datasource.druid.username>
                 <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>192.168.1.140</spring.redis.host>
+                <spring.redis.host>localhost</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->

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<List<CoverageCategoryResultDTO>> categoryList(@RequestBody CoverageCategoryQueryFormDTO form) {
+        List<String> coverageTypes = form.getCoverageTypes();
+        List<CoverageCategoryResultDTO> categories = coverageService.categoryList(coverageTypes);
+        return new Result<List<CoverageCategoryResultDTO>>().ok(categories);
+    }
 
 }

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<IcCoverageCategoryDictEntity> {
+	
+}

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;
+
+}

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<CoverageCategoryResultDTO> categoryList(List<String> coverageTypeList);
+
+}

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<CoverageCategoryResultDTO> categoryList(List<String> coverageTypeList) {
+        Stream<CoverageCategoryResultDTO> stream = coverageTypeList.stream().map(categoryType -> {
+
+            LambdaQueryWrapper<IcCoverageCategoryDictEntity> query = new LambdaQueryWrapper<>();
+            query.eq(IcCoverageCategoryDictEntity::getCoverageType, categoryType);
+            query.orderByAsc(IcCoverageCategoryDictEntity::getCreatedTime);
+            List<IcCoverageCategoryDictEntity> 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<List<CoverageCategoryResultDTO>, Stream<CoverageCategoryResultDTO>>() {
+            @Override
+            public Stream<CoverageCategoryResultDTO> apply(List<CoverageCategoryResultDTO> coverageCategoryResultDTOS) {
+                return coverageCategoryResultDTOS.stream();
+            }
+        });
+
+        return stream.collect(Collectors.toList());
+    }
+}

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcCoverageCategoryDictDao.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.IcCoverageCategoryDictDao">
+
+    <resultMap type="com.epmet.entity.IcCoverageCategoryDictEntity" id="icCoverageCategoryDictMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="categoryKey" column="CATEGORY_KEY"/>
+        <result property="categoryName" column="CATEGORY_NAME"/>
+        <result property="placeType" column="PLACE_TYPE"/>
+        <result property="coverageType" column="COVERAGE_TYPE"/>
+        <result property="sort" column="SORT"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+
+
+</mapper>