From 13c23fce14ab2967c159707144f9826d2e61a512 Mon Sep 17 00:00:00 2001 From: WendyYang Date: Tue, 23 Apr 2024 17:30:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A8=A1=E7=89=88=E4=B8=8B?= =?UTF-8?q?=E8=BD=BD=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kq-vas-api/pom.xml | 12 +- .../kqapi/admin/controller/MatterController.java | 18 +++ .../kqapi/admin/manage/AdminMatterManage.java | 116 +++++++++++++++ .../admin/model/dto/GovServiceMatterImportDTO.java | 48 +++++++ .../kqapi/admin/model/vo/WebMatterDetailVO.java | 25 ++++ .../zzsfw/controller/KqZzsfwMenuController.java | 12 +- .../kqapi/zzsfw/manage/MatterManage.java | 158 +++++++++++++++++---- .../ningdatech/kqapi/zzsfw/model/vo/MattersVO.java | 49 ------- .../ningdatech/kqapi/zzsfw/model/vo/TreeVO.java | 5 + .../ningdatech/kqapi/zzsfw/model/vo/WindowVO.java | 3 +- .../template/政策服务事项配置模板.xlsx | Bin 0 -> 9775 bytes pom.xml | 4 +- 12 files changed, 362 insertions(+), 88 deletions(-) create mode 100644 kq-vas-api/src/main/java/com/ningdatech/kqapi/admin/model/dto/GovServiceMatterImportDTO.java create mode 100644 kq-vas-api/src/main/java/com/ningdatech/kqapi/admin/model/vo/WebMatterDetailVO.java delete mode 100644 kq-vas-api/src/main/java/com/ningdatech/kqapi/zzsfw/model/vo/MattersVO.java create mode 100644 kq-vas-api/src/main/resources/template/政策服务事项配置模板.xlsx diff --git a/kq-vas-api/pom.xml b/kq-vas-api/pom.xml index f47a8c7..ac9145a 100644 --- a/kq-vas-api/pom.xml +++ b/kq-vas-api/pom.xml @@ -27,6 +27,10 @@ org.projectlombok lombok + + com.alibaba + easyexcel-core + com.baomidou @@ -85,14 +89,6 @@ org.apache.httpcomponents httpclient - - org.apache.poi - poi - - - org.apache.poi - poi-ooxml - com.aliyun.oss diff --git a/kq-vas-api/src/main/java/com/ningdatech/kqapi/admin/controller/MatterController.java b/kq-vas-api/src/main/java/com/ningdatech/kqapi/admin/controller/MatterController.java index 1872f26..495d727 100644 --- a/kq-vas-api/src/main/java/com/ningdatech/kqapi/admin/controller/MatterController.java +++ b/kq-vas-api/src/main/java/com/ningdatech/kqapi/admin/controller/MatterController.java @@ -11,6 +11,10 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; /** *

@@ -56,4 +60,18 @@ public class MatterController { matterManage.saveOrUpdate(req); } + @PostMapping("/importGovServiceMatter") + @WebLog("导入政务服务事项") + @ApiOperation("导入政务服务事项") + public void importGovServiceMatter(@RequestParam("file") MultipartFile file) { + matterManage.govServiceMatterImport(file); + } + + @GetMapping("/downloadGovServiceMatterTemplate") + @WebLog("下载政策服务事项配置模板") + @ApiOperation("下载政策服务事项配置模板") + public void downloadGovServiceMatterTemplate(HttpServletResponse response) { + matterManage.downloadGovServiceMatterTemplate(response); + } + } diff --git a/kq-vas-api/src/main/java/com/ningdatech/kqapi/admin/manage/AdminMatterManage.java b/kq-vas-api/src/main/java/com/ningdatech/kqapi/admin/manage/AdminMatterManage.java index 8bae300..3181002 100644 --- a/kq-vas-api/src/main/java/com/ningdatech/kqapi/admin/manage/AdminMatterManage.java +++ b/kq-vas-api/src/main/java/com/ningdatech/kqapi/admin/manage/AdminMatterManage.java @@ -1,21 +1,53 @@ package com.ningdatech.kqapi.admin.manage; +import cn.hutool.core.io.resource.ClassPathResource; +import cn.hutool.core.io.resource.ResourceUtil; import cn.hutool.core.util.StrUtil; +import cn.hutool.http.ContentType; +import cn.hutool.poi.excel.ExcelUtil; +import com.alibaba.excel.EasyExcel; +import com.alibaba.excel.ExcelReader; +import com.alibaba.excel.context.AnalysisContext; +import com.alibaba.excel.event.AnalysisEventListener; +import com.alibaba.excel.support.ExcelTypeEnum; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Assert; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ningdatech.basic.model.IdVo; import com.ningdatech.basic.model.PageVo; import com.ningdatech.basic.util.CollUtils; +import com.ningdatech.basic.util.ValidUtil; +import com.ningdatech.basic.util.ValidatorUtil; +import com.ningdatech.kqapi.admin.mapper.ZoneMapper; +import com.ningdatech.kqapi.admin.model.dto.GovServiceMatterImportDTO; +import com.ningdatech.kqapi.admin.model.entity.Window; +import com.ningdatech.kqapi.admin.model.entity.Zone; import com.ningdatech.kqapi.admin.model.req.MatterListReq; import com.ningdatech.kqapi.admin.model.vo.MatterDetailDTO; import com.ningdatech.kqapi.admin.model.vo.MatterListVO; +import com.ningdatech.kqapi.admin.service.IWindowService; +import com.ningdatech.kqapi.common.exception.BizException; +import com.ningdatech.kqapi.zzsfw.enumeration.ItemTypeEnum; import com.ningdatech.kqapi.zzsfw.model.entity.KqZzsfwMenu; import com.ningdatech.kqapi.zzsfw.service.IKqZzsfwMenuService; import lombok.RequiredArgsConstructor; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; +import org.springframework.web.multipart.MultipartFile; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletResponse; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.net.URLEncoder; +import java.util.ArrayList; import java.util.List; +import java.util.Map; /** *

@@ -29,7 +61,10 @@ import java.util.List; @RequiredArgsConstructor public class AdminMatterManage { + private static final Logger log = LoggerFactory.getLogger(AdminMatterManage.class); private final IKqZzsfwMenuService zzsfwMenuService; + private final ZoneMapper zoneMapper; + private final IWindowService windowService; public PageVo pageMatter(MatterListReq req) { Wrapper query = Wrappers.lambdaQuery(KqZzsfwMenu.class) @@ -121,4 +156,85 @@ public class AdminMatterManage { zzsfwMenuService.saveOrUpdate(matter); } + public void govServiceMatterImport(MultipartFile file) { + try (InputStream is = file.getInputStream()) { + List imports = EasyExcel.read(is, + new AnalysisEventListener() { + @Override + public void invoke(GovServiceMatterImportDTO data, AnalysisContext context) { + String errMsg = ValidUtil.validFast(data); + if (errMsg != null) { + throw BizException.wrap(errMsg); + } + } + + @Override + public void doAfterAllAnalysed(AnalysisContext context) { + // do nothing + } + }) + .headRowNumber(1) + .head(GovServiceMatterImportDTO.class) + .excelType(ExcelTypeEnum.XLSX) + .ignoreEmptyRow(true) + .autoCloseStream(true) + .doReadAllSync(); + Map> mattersByZone = CollUtils.group(imports, GovServiceMatterImportDTO::getZoneName); + Wrapper zoneQuery = Wrappers.lambdaQuery(Zone.class) + .in(Zone::getZoneName, mattersByZone.keySet()); + List zones = zoneMapper.selectList(zoneQuery); + if (zones.size() != mattersByZone.size()) { + throw BizException.wrap("导入失败：服务专区不存在"); + } + Map zoneMap = CollUtils.listToMap(zones, Zone::getZoneName); + List newMatters = new ArrayList<>(); + mattersByZone.forEach((zoneName, matters) -> { + Zone zone = zoneMap.get(zoneName); + Assert.notNull(zone, "服务专区不存在"); + Map> mattersByWin = CollUtils.group(matters, GovServiceMatterImportDTO::getWindowName); + Wrapper windowQuery = Wrappers.lambdaQuery(Window.class) + .eq(Window::getZoneId, zone.getId()) + .in(Window::getWindowName, mattersByWin.keySet()); + List windows = windowService.list(windowQuery); + if (windows.size() != mattersByWin.size()) { + throw BizException.wrap("导入失败：服务窗口不存在"); + } + Map windowMap = CollUtils.listToMap(windows, Window::getWindowName); + for (GovServiceMatterImportDTO matter : matters) { + Window window = windowMap.get(matter.getWindowName()); + Assert.notNull(window, "服务窗口不存在"); + KqZzsfwMenu menu = new KqZzsfwMenu(); + menu.setWindowId(window.getId()); + menu.setZoneId(zone.getId()); + menu.setItemName(matter.getMatterName()); + menu.setWebapplyurl(matter.getWebApplyUrl()); + menu.setWindow(window.getWindowName()); + menu.setZoneName(zone.getZoneName()); + menu.setDepartment(matter.getDepartment()); + menu.setSort(99); + menu.setType(ItemTypeEnum.GOV.getCode()); + newMatters.add(menu); + } + }); + zzsfwMenuService.saveBatch(newMatters); + } catch (IOException e) { + log.error("导入失败：", e); + throw BizException.wrap("政务服务事项导入失败"); + } + } + + public void downloadGovServiceMatterTemplate(HttpServletResponse response) { + final ClassPathResource resource = new ClassPathResource("/template/政策服务事项配置模板.xlsx"); + try (ServletOutputStream os = response.getOutputStream()) { + response.setContentType(ExcelUtil.XLSX_CONTENT_TYPE); + String fileName = URLEncoder.encode(resource.getFile().getName(), "UTF-8"); + response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName); + os.write(resource.readBytes()); + os.flush(); + } catch (IOException e) { + log.error("下载失败：", e); + throw BizException.wrap("政策服务事项配置模板下载失败"); + } + } + } diff --git a/kq-vas-api/src/main/java/com/ningdatech/kqapi/admin/model/dto/GovServiceMatterImportDTO.java b/kq-vas-api/src/main/java/com/ningdatech/kqapi/admin/model/dto/GovServiceMatterImportDTO.java new file mode 100644 index 0000000..07dc419 --- /dev/null +++ b/kq-vas-api/src/main/java/com/ningdatech/kqapi/admin/model/dto/GovServiceMatterImportDTO.java @@ -0,0 +1,48 @@ +package com.ningdatech.kqapi.admin.model.dto; + +import com.alibaba.excel.annotation.ExcelIgnore; +import com.alibaba.excel.annotation.ExcelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + *

+ * GovServiceMatterImportDTO + *

+ * + * @author WendyYang + * @since 15:27 2024/4/23 + */ +@Data +public class GovServiceMatterImportDTO { + + @ExcelProperty(value = "序号") + @ExcelIgnore + private Integer rowNo; + + @ExcelProperty(value = "服务专区") + @NotBlank(message = "服务专区不能为空") + private String zoneName; + + @ExcelProperty(value = "服务窗口") + @NotBlank(message = "服务窗口不能为空") + private String windowName; + + @ExcelProperty(value = "服务事项名称") + @NotBlank(message = "服务事项名称不能为空") + private String matterName; + + @ExcelProperty(value = "办理渠道") + @NotBlank(message = "办理渠道不能为空") + private String handleChannel; + + @ExcelProperty(value = "政务服务链接") + @NotBlank(message = "政务服务链接不能为空") + private String webApplyUrl; + + @ExcelProperty(value = "牵头部门") + @NotBlank(message = "牵头部门不能为空") + private String department; + +} diff --git a/kq-vas-api/src/main/java/com/ningdatech/kqapi/admin/model/vo/WebMatterDetailVO.java b/kq-vas-api/src/main/java/com/ningdatech/kqapi/admin/model/vo/WebMatterDetailVO.java new file mode 100644 index 0000000..2df41af --- /dev/null +++ b/kq-vas-api/src/main/java/com/ningdatech/kqapi/admin/model/vo/WebMatterDetailVO.java @@ -0,0 +1,25 @@ +package com.ningdatech.kqapi.admin.model.vo; + +import com.ningdatech.file.entity.vo.result.FileResultVO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.List; + +/** + *

+ * WebMatterDetailVO + *

+ * + * @author WendyYang + * @since 14:42 2024/4/23 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class WebMatterDetailVO extends MatterDetailDTO { + + @ApiModelProperty("宣传材料访文件信息") + private List publicityMaterialsFiles; + +} diff --git a/kq-vas-api/src/main/java/com/ningdatech/kqapi/zzsfw/controller/KqZzsfwMenuController.java b/kq-vas-api/src/main/java/com/ningdatech/kqapi/zzsfw/controller/KqZzsfwMenuController.java index 99fa367..084beb3 100644 --- a/kq-vas-api/src/main/java/com/ningdatech/kqapi/zzsfw/controller/KqZzsfwMenuController.java +++ b/kq-vas-api/src/main/java/com/ningdatech/kqapi/zzsfw/controller/KqZzsfwMenuController.java @@ -1,10 +1,10 @@ package com.ningdatech.kqapi.zzsfw.controller; +import com.ningdatech.kqapi.admin.model.vo.WebMatterDetailVO; import com.ningdatech.kqapi.common.exception.BizException; import com.ningdatech.kqapi.zzsfw.model.dto.KqZzsfwMattersDeduplicateDTO; import com.ningdatech.kqapi.zzsfw.model.dto.KqZzsfwMenuDTO; import com.ningdatech.kqapi.zzsfw.model.vo.MatterTopVO; -import com.ningdatech.kqapi.zzsfw.model.vo.MattersVO; import com.ningdatech.kqapi.zzsfw.model.vo.TreeVO; import com.ningdatech.kqapi.zzsfw.manage.MatterManage; import lombok.RequiredArgsConstructor; @@ -55,7 +55,7 @@ public class KqZzsfwMenuController { } @GetMapping("/matter-list") - public List matterList(@RequestParam(required = false) String windowName, + public List matterList(@RequestParam(required = false) String windowName, @RequestParam(required = false) String zoneName, @RequestParam(required = false) String department, @RequestParam(required = false) Integer type) { @@ -63,7 +63,7 @@ public class KqZzsfwMenuController { } @GetMapping("/matter/{id}") - public MattersVO matter(@PathVariable Long id) { + public WebMatterDetailVO matter(@PathVariable Long id) { return matterManage.matter(id); } @@ -114,5 +114,11 @@ public class KqZzsfwMenuController { public String update4_10() { return matterManage.update4_10(); } + + @PostMapping("/initOldData") + public void initOldData(){ + matterManage.initOldData(); + } + } diff --git a/kq-vas-api/src/main/java/com/ningdatech/kqapi/zzsfw/manage/MatterManage.java b/kq-vas-api/src/main/java/com/ningdatech/kqapi/zzsfw/manage/MatterManage.java index 5758003..ecc6ff4 100644 --- a/kq-vas-api/src/main/java/com/ningdatech/kqapi/zzsfw/manage/MatterManage.java +++ b/kq-vas-api/src/main/java/com/ningdatech/kqapi/zzsfw/manage/MatterManage.java @@ -4,10 +4,18 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.StrUtil; +import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.ningdatech.basic.util.CollUtils; +import com.ningdatech.file.entity.File; +import com.ningdatech.file.entity.vo.result.AttachFileVo; +import com.ningdatech.file.entity.vo.result.FileResultVO; +import com.ningdatech.file.service.FileService; +import com.ningdatech.kqapi.admin.manage.AdminMatterManage; import com.ningdatech.kqapi.admin.model.entity.Window; import com.ningdatech.kqapi.admin.model.entity.Zone; +import com.ningdatech.kqapi.admin.model.vo.MatterDetailDTO; +import com.ningdatech.kqapi.admin.model.vo.WebMatterDetailVO; import com.ningdatech.kqapi.admin.service.IWindowService; import com.ningdatech.kqapi.admin.service.IZoneService; import com.ningdatech.kqapi.zzsfw.constants.ZzsfwMenuConstant; @@ -17,7 +25,6 @@ import com.ningdatech.kqapi.zzsfw.model.dto.KqZzsfwMenuDTO; import com.ningdatech.kqapi.zzsfw.model.entity.KqZzsfwMattersDeduplicate; import com.ningdatech.kqapi.zzsfw.model.entity.KqZzsfwMenu; import com.ningdatech.kqapi.zzsfw.model.vo.MatterTopVO; -import com.ningdatech.kqapi.zzsfw.model.vo.MattersVO; import com.ningdatech.kqapi.zzsfw.model.vo.TreeVO; import com.ningdatech.kqapi.zzsfw.service.IKqZzsfwMatterDeduplicateService; import com.ningdatech.kqapi.zzsfw.service.IKqZzsfwMenuService; @@ -31,6 +38,7 @@ import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; import java.io.IOException; @@ -39,10 +47,13 @@ import java.sql.Connection; import java.sql.DriverManager; import java.sql.Statement; import java.text.DecimalFormat; +import java.time.Duration; import java.time.LocalDateTime; import java.util.*; import java.util.stream.Collectors; +import static com.ningdatech.kqapi.zzsfw.enumeration.ItemTypeEnum.GOV; + /** * @Classname MatterManage * @Description @@ -66,6 +77,8 @@ public class MatterManage { private final IKqZzsfwMenuService menuService; private final IZoneService zoneService; private final IWindowService windowService; + private final FileService fileService; + private final AdminMatterManage adminMatterManage; private final IKqZzsfwMatterDeduplicateService matterDeduplicateService; @@ -78,17 +91,16 @@ public class MatterManage { //如果是政府类型的 就隐藏 没有链接的 List finalMatters = matters.stream().filter(m -> Objects.nonNull(m.getType()) && - (!m.getType().equals(ItemTypeEnum.GOV.getCode()) || Objects.nonNull(m.getWebapplyurl()))) + (!m.getType().equals(GOV.getCode()) || Objects.nonNull(m.getWebapplyurl()))) .collect(Collectors.toList()); Set zoneSet = new HashSet<>(); - List res = finalMatters.stream().filter(m -> zoneSet.add(m.getZoneName())).map(m -> { + return finalMatters.stream().filter(m -> zoneSet.add(m.getZoneName())).map(m -> { TreeVO zone = new TreeVO(); zone.setName(m.getZoneName()); zone.setChilren(generateWindows(m, finalMatters)); zone.setType(ZzsfwMenuConstant.MENU_TYPE_ZONE); return zone; }).collect(Collectors.toList()); - return res; } /** @@ -98,8 +110,29 @@ public class MatterManage { */ public List getZones() { List zones = zoneService.list(); + if (zones.isEmpty()) { + return Collections.emptyList(); + } + Map fileIdMap = new HashMap<>(); + zones.forEach(zone -> { + if (StrUtil.isNotBlank(zone.getZoneIcon())) { + List files = JSONUtil.toList(zone.getZoneIcon(), AttachFileVo.class); + if (files != null && !files.isEmpty()) { + fileIdMap.put(files.get(0).getFileId(), zone.getId()); + } + } + }); + Map iconUrlMap = new HashMap<>(); + if (!fileIdMap.isEmpty()) { + for (File file : fileService.listByIds(fileIdMap.keySet())) { + String fileUrl = fileService.findUrlByFile(file, Duration.ofDays(30)); + iconUrlMap.put(fileIdMap.get(file.getId()), fileUrl); + } + } + return CollUtils.convert(zones, w -> TreeVO.builder() .name(w.getZoneName()) + .zoneIcon(iconUrlMap.get(w.getId())) .type(ZzsfwMenuConstant.MENU_TYPE_ZONE) .build()); } @@ -113,7 +146,7 @@ public class MatterManage { //如果是政府类型的 就隐藏 没有链接的 List finalMatters = matters.stream().filter(m -> Objects.nonNull(m.getType()) && - (!m.getType().equals(ItemTypeEnum.GOV.getCode()) || Objects.nonNull(m.getWebapplyurl()))) + (!m.getType().equals(GOV.getCode()) || Objects.nonNull(m.getWebapplyurl()))) .collect(Collectors.toList()); Set zoneSet = new HashSet<>(); return finalMatters.stream().filter(m -> zoneSet.add(m.getZoneName())).map(m -> { @@ -144,7 +177,7 @@ public class MatterManage { //如果是政府类型的 就隐藏 没有链接的 List finalMatters = matters.stream().filter(m -> Objects.nonNull(m.getType()) && - (!m.getType().equals(ItemTypeEnum.GOV.getCode()) || Objects.nonNull(m.getWebapplyurl()))) + (!m.getType().equals(GOV.getCode()) || Objects.nonNull(m.getWebapplyurl()))) .collect(Collectors.toList()); Set windowSet = new HashSet<>(); @@ -169,7 +202,7 @@ public class MatterManage { } Set departMentSet = new HashSet<>(); return matters.stream() - .filter(m -> m.getType() != null && (!ItemTypeEnum.GOV.eq(m.getType()) || m.getWebapplyurl() != null)) + .filter(m -> m.getType() != null && (!GOV.eq(m.getType()) || m.getWebapplyurl() != null)) .filter(m -> departMentSet.add(m.getDepartment())) .map(m -> { TreeVO department = new TreeVO(); @@ -179,7 +212,7 @@ public class MatterManage { }).collect(Collectors.toList()); } - public List matterList(String zoneName, String windowName, String department, Integer type) { + public List matterList(String zoneName, String windowName, String department, Integer type) { List matters = menuService.list(Wrappers.lambdaQuery(KqZzsfwMenu.class) .eq(StringUtils.isNotBlank(windowName), KqZzsfwMenu::getWindow, windowName) .eq(StringUtils.isNotBlank(zoneName), KqZzsfwMenu::getZoneName, zoneName) @@ -192,24 +225,59 @@ public class MatterManage { //如果是政府类型的 就隐藏 没有链接的 return matters.stream().filter(m -> Objects.nonNull(m.getType()) - && (!ItemTypeEnum.GOV.eq(m.getType()) || Objects.nonNull(m.getWebapplyurl()))) + && (!GOV.eq(m.getType()) || Objects.nonNull(m.getWebapplyurl()))) .map(m -> { - MattersVO mattersVO = BeanUtil.copyProperties(m, MattersVO.class); - mattersVO.setMatterName(m.getItemName()); - mattersVO.setId(m.getId()); - return mattersVO; + WebMatterDetailVO build = new WebMatterDetailVO(); + build.setId(m.getId()); + build.setMatterName(m.getItemName()); + build.setMatterType(m.getType()); + build.setWindowName(m.getWindow()); + build.setWindowId(m.getWindowId()); + build.setZoneId(m.getZoneId()); + build.setZoneName(m.getZoneName()); + build.setDepartment(m.getDepartment()); + build.setWebApplyUrl(m.getWebapplyurl()); + build.setPublicityMaterials(m.getPublicityMaterials()); + // 处理宣传材料 + buildPublicityMaterials(build); + return build; }).collect(Collectors.toList()); } - public MattersVO matter(Long id) { - KqZzsfwMenu matter = menuService.getById(id); - if (Objects.isNull(matter)) { + public WebMatterDetailVO matter(Long id) { + MatterDetailDTO detail = adminMatterManage.detail(id); + if (detail == null) { return null; } - MattersVO mattersVO = BeanUtil.copyProperties(matter, MattersVO.class); - mattersVO.setMatterName(matter.getItemName()); - mattersVO.setId(matter.getId()); - return mattersVO; + WebMatterDetailVO matter = BeanUtil.copyProperties(detail, WebMatterDetailVO.class); + buildPublicityMaterials(matter); + return matter; + } + + private void buildPublicityMaterials(WebMatterDetailVO detail) { + if (ItemTypeEnum.SPECIAL.eq(detail.getMatterType())) { + String materials = detail.getPublicityMaterials(); + if (StrUtil.isNotBlank(materials)) { + List attachFiles = JSONUtil.toList(materials, AttachFileVo.class); + Map filesMap = CollUtils.listToMap(attachFiles, AttachFileVo::getFileId); + List files = fileService.listByIds(filesMap.keySet()); + List materialsFiles = new ArrayList<>(); + for (File file : files) { + String fileUrl = fileService.findUrlByFile(file); + FileResultVO build = FileResultVO.builder() + .id(file.getId()) + .url(fileUrl) + .contentType(file.getContentType()) + .fileType(file.getFileType()) + .originalFileName(file.getOriginalFileName()) + .size(file.getSize()) + .suffix(file.getSuffix()) + .build(); + materialsFiles.add(build); + } + detail.setPublicityMaterialsFiles(materialsFiles); + } + } } private List generateWindows(KqZzsfwMenu menu, List matters) { @@ -227,8 +295,11 @@ public class MatterManage { private List generateDepartment(KqZzsfwMenu menu, List matters) { Set departmentSet = new HashSet<>(); - return matters.stream().filter(m -> StringUtils.isNotBlank(m.getWindow()) && m.getWindow().equals(menu.getWindow()) && - m.getZoneName().equals(menu.getZoneName()) && departmentSet.add(m.getDepartment())) + return matters.stream() + .filter(m -> StringUtils.isNotBlank(m.getWindow()) + && m.getWindow().equals(menu.getWindow()) + && m.getZoneName().equals(menu.getZoneName()) + && departmentSet.add(m.getDepartment())) .map(m -> { TreeVO department = new TreeVO(); department.setName(m.getDepartment()); @@ -240,8 +311,12 @@ public class MatterManage { private List generateItemType(KqZzsfwMenu menu, List matters) { Set typeSet = new HashSet<>(); - return matters.stream().filter(m -> StringUtils.isNotBlank(m.getWindow()) && m.getWindow().equals(menu.getWindow()) && - m.getZoneName().equals(menu.getZoneName()) && Objects.nonNull(m.getType()) && typeSet.add(m.getType())) + return matters.stream() + .filter(m -> StringUtils.isNotBlank(m.getWindow()) + && m.getWindow().equals(menu.getWindow()) + && m.getZoneName().equals(menu.getZoneName()) + && Objects.nonNull(m.getType()) + && typeSet.add(m.getType())) .map(m -> { TreeVO menuType = new TreeVO(); ItemTypeEnum itemTypeEnum = ItemTypeEnum.match(m.getType()); @@ -259,7 +334,7 @@ public class MatterManage { private List generateMatters(KqZzsfwMenu menu, List matters) { return matters.stream().filter(m -> Objects.nonNull(m.getType()) && m.getType().equals(menu.getType()) && - (!m.getType().equals(ItemTypeEnum.GOV.getCode()) || Objects.nonNull(m.getHasUrl()) && m.getHasUrl() == 1) && + (!m.getType().equals(GOV.getCode()) || Objects.nonNull(m.getHasUrl()) && m.getHasUrl() == 1) && StringUtils.isNotBlank(m.getDepartment()) && m.getDepartment().equals(menu.getDepartment()) && m.getWindow().equals(menu.getWindow()) && m.getZoneName().equals(menu.getZoneName())) @@ -425,4 +500,37 @@ public class MatterManage { } return "success!"; } + + @Transactional(rollbackFor = Exception.class) + public void initOldData() { + List matters = menuService.list(); + if (CollUtil.isEmpty(matters)) { + return; + } + //如果是政府类型的 就隐藏 没有链接的 + List tmpMatters = matters.stream() + .filter(m -> Objects.nonNull(m.getType()) + && (!GOV.eq(m.getType()) || m.getWebapplyurl() != null)) + .filter(w -> w.getWindowId() == null && w.getZoneId() == null) + .collect(Collectors.toList()); + CollUtils.group(tmpMatters, KqZzsfwMenu::getZoneName) + .forEach((zone, mattersByZone) -> { + Zone entity = new Zone(); + entity.setZoneName(zone); + zoneService.save(entity); + CollUtils.group(mattersByZone, KqZzsfwMenu::getWindow) + .forEach((window, mattersByWindow) -> { + Window win = new Window(); + win.setWindowName(window); + win.setZoneName(zone); + win.setZoneId(entity.getId()); + windowService.save(win); + for (KqZzsfwMenu menu : mattersByWindow) { + menu.setZoneId(win.getZoneId()); + menu.setWindowId(win.getId()); + } + menuService.updateBatchById(mattersByWindow); + }); + }); + } } diff --git a/kq-vas-api/src/main/java/com/ningdatech/kqapi/zzsfw/model/vo/MattersVO.java b/kq-vas-api/src/main/java/com/ningdatech/kqapi/zzsfw/model/vo/MattersVO.java deleted file mode 100644 index 24b4d13..0000000 --- a/kq-vas-api/src/main/java/com/ningdatech/kqapi/zzsfw/model/vo/MattersVO.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.ningdatech.kqapi.zzsfw.model.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 事项 - *

- * - * @author ZPF - * @since 2023-10-25 - */ -@Data -@ApiModel(value = "MattersVO", description = "事项") -public class MattersVO implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty("id主键") - private Long id; - - @ApiModelProperty("id") - private String rowguid; - - @ApiModelProperty("事项名称") - private String matterName; - - @ApiModelProperty("事项链接") - private String webapplyurl; - - @ApiModelProperty("排序编号") - private Integer sort; - - @ApiModelProperty("类型 1.政府服务 2.增值服务 3.特殊") - private Integer type; - - @ApiModelProperty("服务内容") - private String serviceContent; - - @ApiModelProperty("服务流程") - private String serviceProcess; - - @ApiModelProperty("咨询电话") - private String telephone; -} diff --git a/kq-vas-api/src/main/java/com/ningdatech/kqapi/zzsfw/model/vo/TreeVO.java b/kq-vas-api/src/main/java/com/ningdatech/kqapi/zzsfw/model/vo/TreeVO.java index 94f2d14..8953692 100644 --- a/kq-vas-api/src/main/java/com/ningdatech/kqapi/zzsfw/model/vo/TreeVO.java +++ b/kq-vas-api/src/main/java/com/ningdatech/kqapi/zzsfw/model/vo/TreeVO.java @@ -30,6 +30,8 @@ public class TreeVO { @ApiModelProperty("类型") private String type; + private String zoneIcon; + @ApiModelProperty("链接") private String url; @@ -45,6 +47,9 @@ public class TreeVO { @ApiModelProperty("服务内容") private String serviceContent; + @ApiModelProperty("办理渠道") + private Integer handleChannel; + @ApiModelProperty("服务流程") private String serviceProcess; diff --git a/kq-vas-api/src/main/java/com/ningdatech/kqapi/zzsfw/model/vo/WindowVO.java b/kq-vas-api/src/main/java/com/ningdatech/kqapi/zzsfw/model/vo/WindowVO.java index f982b95..d9d892b 100644 --- a/kq-vas-api/src/main/java/com/ningdatech/kqapi/zzsfw/model/vo/WindowVO.java +++ b/kq-vas-api/src/main/java/com/ningdatech/kqapi/zzsfw/model/vo/WindowVO.java @@ -1,5 +1,6 @@ package com.ningdatech.kqapi.zzsfw.model.vo; +import com.ningdatech.kqapi.admin.model.vo.WebMatterDetailVO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -25,5 +26,5 @@ public class WindowVO implements Serializable { private String windowName; @ApiModelProperty("事项") - private List matters; + private List matters; } diff --git a/kq-vas-api/src/main/resources/template/政策服务事项配置模板.xlsx b/kq-vas-api/src/main/resources/template/政策服务事项配置模板.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..db33d10b5df2ad35758a5749e558184182b7b42f GIT binary patch literal 9775 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 - + com.alibaba fastjson