大屏，指挥调度，增加旅游资源

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/CoverageEnums.java

@@ -9,6 +9,7 @@ public enum CoverageEnums {
     YJCL("yjcl", "应急处置资源", 1),
     AQSC("aqsc", "安全生产资源", 1),
     ZDDW("zddw", "重点单位", 1), //日照专用
+    LYZY("lyzy", "旅游资源", 1),
     CSGL("csgl", "城市管理资源", 1),
     GGFW("ggfw", "公共服务资源", 1),
 

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/CoveragePlaceTypeEnum.java

@@ -21,7 +21,8 @@ public enum CoveragePlaceTypeEnum {
     ZHZL_RQ("zhzl_rq", "综合治理人群"),
     NUCLEIC_POINT("nucleic_point", "核酸检测点"),
     VACCINE_POINT("vaccine_point", "疫苗接种点"),
-    KEY_UNIT("key_unit", "重点单位"); //日照专用
+    KEY_UNIT("key_unit", "重点单位"), //日照专用
+    TOURISM_RESOURCE("tourism_resource", "旅游资源"); //日照专用
 
     private final String code;
     private final String name;

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java

@@ -556,6 +556,8 @@ public class CoverageServiceImpl implements CoverageService {
             return epmetUserService.countNucleicPoint(customerId, agencyId, staffOrgIds, search);
         } else if (CoveragePlaceTypeEnum.KEY_UNIT.getCode().equals(placeType)) {
             return govOrgService.countKeyEnterprise();//重点单位数量统计 日照专用
+        } else if (CoveragePlaceTypeEnum.TOURISM_RESOURCE.getCode().equals(placeType)) {
+            return orgCoverageService.countPublicServiceEntities(customerId, staffOrgIds, search, categoryKey);
         }
 
         return 0;
@@ -754,6 +756,13 @@ public class CoverageServiceImpl implements CoverageService {
                 return enterpriseList.stream().map(enter -> new CoverageAnalisisDataListResultDTO(enter.getId(),
                         categoryKey, isPage ? categoryDict.getCategoryName() : null, placeType, enter.getUnitName(), enter.getLatitude(), enter.getLongitude())).collect(Collectors.toList());
             }
+        } else if (CoveragePlaceTypeEnum.TOURISM_RESOURCE.getCode().equals(placeType)) {
+            List<IcPublicServiceEntity> list = orgCoverageService.searchPublicServiceEntities(
+                    customerId, staffOrgIds, search, categoryKey, isPage, pageNo, pageSize);
+            return list.stream().map(
+                    dc -> new CoverageAnalisisDataListResultDTO(dc.getId(), categoryKey, categoryDict.getCategoryName(),
+                            placeType, dc.getName(), dc.getLatitude(), dc.getLongitude()))
+                    .collect(Collectors.toList());
         }
         return new ArrayList<>();
     }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcPublicServiceListFormDTO.java

@@ -3,6 +3,7 @@ package com.epmet.dto.form;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @Description 【优势资源】列表--接口入参
@@ -20,6 +21,12 @@ public class IcPublicServiceListFormDTO implements Serializable {
      * 场所分类，字典表值
      */
     private String category;
+    /**
+     * 场所分类名称：tourism_resource 旅游资源  ，public_service 公共服务
+     */
+    private String categoryType;
+
+    private List<String> categoryTypeList;
     /**
      * 页码
      */

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPublicServiceServiceImpl.java

@@ -27,7 +27,6 @@ import com.epmet.dto.result.IcCoverageCategoryDictListResultDTO;
 import com.epmet.dto.result.IcPublicServiceListResultDTO;
 import com.epmet.dto.result.UploadImgResultDTO;
 import com.epmet.entity.IcPublicServiceEntity;
-import com.epmet.entity.IcSuperiorResourceEntity;
 import com.epmet.excel.IcPublicServiceExcel;
 import com.epmet.excel.handler.IcPublicServiceExcelImportListener;
 import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
@@ -54,6 +53,7 @@ import java.io.IOException;
 import java.io.OutputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
@@ -89,12 +89,24 @@ public class IcPublicServiceServiceImpl extends BaseServiceImpl<IcPublicServiceD
         formDTO.setAgencyId(staffInfo.getAgencyId());
         //列表/导出查询
         PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage());
+        //查询分类category
+        List<IcCoverageCategoryDictListResultDTO> dictList = new ArrayList<>();
+        List<String> categoryTypeList = new ArrayList<>();
+        if (StringUtils.isNotEmpty(formDTO.getCategoryType())) {
+            dictList = coverageService.dictMap(formDTO.getCustomerId(), formDTO.getCategoryType());
+            if (dictList.size() > 0) {
+                dictList.forEach(dict -> {
+                    categoryTypeList.add(dict.getValue());
+                });
+                formDTO.setCategoryTypeList(categoryTypeList);
+            }
+        }
+
         List<IcPublicServiceListResultDTO> list = baseDao.selectPublicServiceList(formDTO);
         PageInfo<IcPublicServiceListResultDTO> pageInfo = new PageInfo<>(list);
 
         //封装类别数据
         if (!CollectionUtils.isEmpty(list)) {
-            List<IcCoverageCategoryDictListResultDTO> dictList = coverageService.dictMap(formDTO.getCustomerId(), "public_service");
             Map<String, String> dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getValue, IcCoverageCategoryDictListResultDTO::getLabel));
             for (IcPublicServiceListResultDTO v : list) {
                 if (StringUtils.isNotBlank(v.getCategory())) {

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

@@ -102,6 +102,12 @@
         <if test="category != null and category != '' ">
             AND category = #{category}
         </if>
+        <if test="null != categoryTypeList and categoryTypeList.size > 0">
+            AND category IN
+            <foreach collection="categoryTypeList" item="category" separator="," open="(" close=")">
+                #{category}
+            </foreach>
+        </if>
         ORDER BY created_time DESC
     </select>