diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/BizTypeEnum.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/BizTypeEnum.java index 517330e427..22b6305c64 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/BizTypeEnum.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/BizTypeEnum.java @@ -20,6 +20,7 @@ public enum BizTypeEnum { PROJECT("project", "项目"), ARTICLE("article", "文章（党建声音）"), SPECIAL_CROWD("special_crowd", "社会维稳(特殊人群)"), + HELP_CROWD("help_crowd", "重点帮扶人群"), ; public static BizTypeEnum getEnum(String code) { diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/ListByCategory.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/ListByCategory.java new file mode 100644 index 0000000000..7b82561df8 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/ListByCategory.java @@ -0,0 +1,53 @@ +package com.epmet.dto.result.lingshan; + +import lombok.Data; + +@Data +public class ListByCategory { + + /** + * 资源名称 + */ + private String title; + + /** + * 类别名称 + */ + private String type; + + private String longitude; + private String latitude; + + private String addr; + + /** + * 负责人 + */ + private String attn; + + /** + * 负责人电话 + */ + private String phone; + + /** + * 片区民警姓名 + */ + private String police; + + /** + * 片区民警电话 + */ + private String policePhone; + + /** + * 网格员姓名 + */ + private String gridUser; + + /** + * 网格员电话 + */ + private String gridUserPhone; + +} diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/StatsByCategoryRstDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/StatsByCategoryRstDTO.java new file mode 100644 index 0000000000..b9efc77863 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/StatsByCategoryRstDTO.java @@ -0,0 +1,25 @@ +package com.epmet.dto.result.lingshan; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class StatsByCategoryRstDTO { + + /** + * 分类 + */ + private String category; + /** + * 名称 + */ + private String name; + /** + * 总量 + */ + private Integer total; + +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPublicServiceController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPublicServiceController.java index f9b47cdb41..1d531eb45a 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPublicServiceController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPublicServiceController.java @@ -30,6 +30,7 @@ import com.epmet.dto.form.IcPublicServiceListFormDTO; import com.epmet.dto.form.IcSuperiorResourceAddEditFormDTO; import com.epmet.dto.result.IcPublicServiceListResultDTO; import com.epmet.dto.result.ImportTaskCommonResultDTO; +import com.epmet.dto.result.lingshan.StatsByCategoryRstDTO; import com.epmet.excel.IcPublicServiceExcel; import com.epmet.service.IcPublicServiceService; import com.epmet.utils.ImportTaskUtils; @@ -226,5 +227,23 @@ public class IcPublicServiceController implements ResultDataResolver { return new Result(); } + /** + * @Description: 分类统计 + * @param orgType: + * @param orgId: + * @Return com.epmet.commons.tools.utils.Result> + * @Author: wangxianzhang + * @Date: 2023/5/30 9:20 AM + */ + @GetMapping("lingshan/screen/statsByCategory") + public Result> lingshanScreenStatsByCategory(@RequestParam("orgType") String orgType, + @RequestParam("orgId") String orgId) { + + List l = icPublicServiceService.lingshanScreenStatsByCategory(orgType, orgId); + return new Result>().ok(l); + } + + // @GetMapping("lingshan/screen/listByCategory") + // public Result<> } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPublicServiceDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPublicServiceDao.java index d7ac4b6ef1..4dd504a807 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPublicServiceDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPublicServiceDao.java @@ -3,6 +3,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.form.IcPublicServiceListFormDTO; import com.epmet.dto.result.IcPublicServiceListResultDTO; +import com.epmet.dto.result.lingshan.StatsByCategoryRstDTO; import com.epmet.entity.IcPublicServiceEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -25,4 +26,14 @@ public interface IcPublicServiceDao extends BaseDao { void importInsert(@Param("entityList") List entityList); void delByAgencyAndName(IcPublicServiceEntity entity); + + /** + * @Description: 灵山大屏：各类别服务的数量统计 + * @param orgIdPath: + * @param customerId: + * @Return java.util.List + * @Author: wangxianzhang + * @Date: 2023/5/30 9:44 AM + */ + List lingshanScreenStatsByCategory(@Param("orgIdPath") String orgIdPath, @Param("customerId") String customerId); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPublicServiceEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPublicServiceEntity.java index 30b8513f4b..8241752b39 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPublicServiceEntity.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPublicServiceEntity.java @@ -83,4 +83,10 @@ public class IcPublicServiceEntity extends BaseEpmetEntity { */ private String mobile; + /** + * 用于聚合统计 + * + */ + private transient int total; + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPublicServiceService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPublicServiceService.java index 889917b05e..85cbc0c535 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPublicServiceService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPublicServiceService.java @@ -6,9 +6,11 @@ import com.epmet.dto.IcPublicServiceDTO; import com.epmet.dto.form.IcPublicServiceAddEditFormDTO; import com.epmet.dto.form.IcPublicServiceListFormDTO; import com.epmet.dto.result.IcPublicServiceListResultDTO; +import com.epmet.dto.result.lingshan.StatsByCategoryRstDTO; import com.epmet.entity.IcPublicServiceEntity; import java.nio.file.Path; +import java.util.List; /** * 公共服务图层 @@ -70,4 +72,6 @@ public interface IcPublicServiceService extends BaseService lingshanScreenStatsByCategory(String orgType, String orgId); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPublicServiceServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPublicServiceServiceImpl.java index 6fd19e5839..38a2913c19 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPublicServiceServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPublicServiceServiceImpl.java @@ -12,11 +12,11 @@ import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.ExceptionUtils; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.redis.common.CustomerOrgRedis; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; -import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.utils.EpmetRequestHolder; -import com.epmet.commons.tools.utils.FileUtils; -import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache; +import com.epmet.commons.tools.utils.*; +import com.epmet.constant.OrgInfoConstant; import com.epmet.constants.ImportTaskConstants; import com.epmet.dao.IcPublicServiceDao; import com.epmet.dto.IcPublicServiceDTO; @@ -26,12 +26,15 @@ import com.epmet.dto.form.ImportTaskCommonFormDTO; import com.epmet.dto.result.IcCoverageCategoryDictListResultDTO; import com.epmet.dto.result.IcPublicServiceListResultDTO; import com.epmet.dto.result.UploadImgResultDTO; +import com.epmet.dto.result.lingshan.StatsByCategoryRstDTO; 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.EpmetAdminOpenFeignClient; import com.epmet.feign.EpmetCommonServiceOpenFeignClient; import com.epmet.feign.OssFeignClient; +import com.epmet.remote.EpmetUserRemoteService; import com.epmet.service.CoverageService; import com.epmet.service.IcPublicServiceService; import com.epmet.utils.ImportTaskUtils; @@ -54,6 +57,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; @@ -77,6 +81,12 @@ public class IcPublicServiceServiceImpl extends BaseServiceImpl lingshanScreenStatsByCategory(String orgType, String orgId) { + // 先拿pids + String orgIdPath; + if (StringUtils.isAnyBlank(orgType, orgId)) { + orgIdPath = userRemoteService.getLoginUserDetails().getOrgIdPath(); + } else { + if (OrgInfoConstant.AGENCY.equals(orgType)) { + AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(orgId); + orgIdPath = PidUtils.convertPid2OrgIdPath(agencyInfo.getId(), agencyInfo.getPids()); + } else { + return new ArrayList<>(); + } + } + + // 查询 + return baseDao.lingshanScreenStatsByCategory(orgIdPath, EpmetRequestHolder.getLoginUserCustomerId()); + } } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPublicServiceDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPublicServiceDao.xml index ef81d4c77a..7cb1c8cae6 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPublicServiceDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPublicServiceDao.xml @@ -105,6 +105,20 @@ ORDER BY created_time DESC + + + UPDATE ic_public_service SET del_flag = '1', diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/converter/LingShanSpecialCrowdYesOrNoConverter.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/converter/LingShanSpecialCrowdYesOrNoConverter.java index 1f9281d224..86f6c403bd 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/converter/LingShanSpecialCrowdYesOrNoConverter.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/converter/LingShanSpecialCrowdYesOrNoConverter.java @@ -47,13 +47,14 @@ public class LingShanSpecialCrowdYesOrNoConverter implements Converter public WriteCellData convertToExcelData(WriteConverterContext context) throws Exception { String fieldName = context.getContentProperty().getField().getName(); Integer value = context.getValue(); - if (group1.contains(fieldName)) { - return convertYesOrNoFlag(value); - } else if (group2.contains(fieldName)) { + + // 这个组里的，要转化为有无 + if (group2.contains(fieldName)) { return convertHaveOrNotFlag(value); } - return Converter.super.convertToExcelData(context); + // 其他的都转化为是否 + return convertYesOrNoFlag(value); } WriteCellData convertHaveOrNotFlag(Integer value) { diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingShanHelpCrowdBaseExcelData.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingShanHelpCrowdBaseExcelData.java index 617e7cd879..96a912d998 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingShanHelpCrowdBaseExcelData.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingShanHelpCrowdBaseExcelData.java @@ -27,7 +27,7 @@ public class LingShanHelpCrowdBaseExcelData { /** * 错误信息 */ - @ExcelProperty(value = "错误信息") + @ExcelProperty(value = "说明") private String errorInfo; /** diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/AbstractLingShanHelpCrowdExcelImportListener.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/AbstractLingShanHelpCrowdExcelImportListener.java index 0ea1f100f3..547d12001b 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/AbstractLingShanHelpCrowdExcelImportListener.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/AbstractLingShanHelpCrowdExcelImportListener.java @@ -292,7 +292,9 @@ public abstract class AbstractLingShanHelpCrowdExcelImportListener errorDatas = listener.getErrorDatas(); + List errorDatas = listener.getErrorDatas(); if (CollectionUtils.isNotEmpty(errorDatas)) { // 有错误数据需要提示 String resultDescFilePath = uploadResultDescFilePath(errorDatas, listener.getTemplateFileName()); @@ -301,9 +301,9 @@ public class LingShanHelpCrowdServiceImpl implements LingShanHelpCrowdService, R ImportTaskConstants.PROCESS_STATUS_FINISHED_SUCCESS, null, "成功", listener.getSuccessedItemsQty(), listener.getFailedItemsQty()); } } catch (Exception e) { - log.error("【灵山街道-导入重点帮扶人群】失败，错误信息:" + ExceptionUtils.getErrorStackTrace(e)); + log.error("【灵山街道-导入重点帮扶人群】异步任务过程中失败，错误信息:" + ExceptionUtils.getErrorStackTrace(e)); ImportTaskUtils.finishImportTask(taskId, - ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL, null, "未知错误"); + ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL, null, "未知错误，异步任务过程中失败", 0, 0); } finally { FileUtils.deleteFileIfExists(fileSavePath); } diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/lingshan/help_crowd_export_canji.xlsx b/epmet-user/epmet-user-server/src/main/resources/excel/lingshan/help_crowd_export_canji.xlsx new file mode 100644 index 0000000000..f492338dd2 Binary files /dev/null and b/epmet-user/epmet-user-server/src/main/resources/excel/lingshan/help_crowd_export_canji.xlsx differ diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/lingshan/help_crowd_export_dabing.xlsx b/epmet-user/epmet-user-server/src/main/resources/excel/lingshan/help_crowd_export_dabing.xlsx new file mode 100644 index 0000000000..15dc41f88d Binary files /dev/null and b/epmet-user/epmet-user-server/src/main/resources/excel/lingshan/help_crowd_export_dabing.xlsx differ diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/lingshan/help_crowd_export_dibao.xlsx b/epmet-user/epmet-user-server/src/main/resources/excel/lingshan/help_crowd_export_dibao.xlsx new file mode 100644 index 0000000000..dac7195b6a Binary files /dev/null and b/epmet-user/epmet-user-server/src/main/resources/excel/lingshan/help_crowd_export_dibao.xlsx differ diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/lingshan/help_crowd_export_duju.xlsx b/epmet-user/epmet-user-server/src/main/resources/excel/lingshan/help_crowd_export_duju.xlsx new file mode 100644 index 0000000000..e038a97576 Binary files /dev/null and b/epmet-user/epmet-user-server/src/main/resources/excel/lingshan/help_crowd_export_duju.xlsx differ diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/lingshan/help_crowd_export_gaoling.xlsx b/epmet-user/epmet-user-server/src/main/resources/excel/lingshan/help_crowd_export_gaoling.xlsx new file mode 100644 index 0000000000..914f0b8603 Binary files /dev/null and b/epmet-user/epmet-user-server/src/main/resources/excel/lingshan/help_crowd_export_gaoling.xlsx differ diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/lingshan/help_crowd_export_kongchao.xlsx b/epmet-user/epmet-user-server/src/main/resources/excel/lingshan/help_crowd_export_kongchao.xlsx new file mode 100644 index 0000000000..a2b8f0bf1b Binary files /dev/null and b/epmet-user/epmet-user-server/src/main/resources/excel/lingshan/help_crowd_export_kongchao.xlsx differ diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/lingshan/help_crowd_export_liushou.xlsx b/epmet-user/epmet-user-server/src/main/resources/excel/lingshan/help_crowd_export_liushou.xlsx new file mode 100644 index 0000000000..5a28da8135 Binary files /dev/null and b/epmet-user/epmet-user-server/src/main/resources/excel/lingshan/help_crowd_export_liushou.xlsx differ diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/lingshan/help_crowd_export_tekun.xlsx b/epmet-user/epmet-user-server/src/main/resources/excel/lingshan/help_crowd_export_tekun.xlsx new file mode 100644 index 0000000000..0f80abd7ce Binary files /dev/null and b/epmet-user/epmet-user-server/src/main/resources/excel/lingshan/help_crowd_export_tekun.xlsx differ