Merge remote-tracking branch 'origin/dev_dingV1' into dev_dingV1

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueAuditController.java

@@ -20,6 +20,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 import java.util.List;
 
 /**
@@ -145,6 +147,14 @@ public class IssueAuditController {
         return new Result<PageData<AuditListResultDTO>>().ok(issueApplicationService.auditList(formDTO));
     }
 
+    @PostMapping("auditListExport")
+    public Result auditListExport(@RequestBody AuditListFormDTO formDTO, @LoginUser TokenDto tokenDto, HttpServletResponse response) throws IOException {
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setUserId(tokenDto.getUserId());
+        issueApplicationService.auditListExport(formDTO,response);
+        return new Result();
+    }
+
     /**
      * Desc: 补全议题审核表历史数据
      * @param

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java

@@ -19,6 +19,8 @@ import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 import java.util.List;
 
 /**
@@ -382,6 +384,15 @@ public class IssueController {
         formDTO.setUserId(tokenDto.getUserId());
         return new Result<PageData<AllIssueListResultDTO>>().ok(issueService.allIssueList(formDTO));
     }
+
+    @PostMapping("allIssueListExport")
+    public Result allIssueListExport(@RequestBody AllIssueListFormDTO formDTO, @LoginUser TokenDto tokenDto, HttpServletResponse response) throws IOException {
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setUserId(tokenDto.getUserId());
+        issueService.allIssueListExport(formDTO,response);
+        return new Result();
+    }
+
     /**
      * 发布议题
      * 事件转议题

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/AllIssueListExportExcel.java

@@ -0,0 +1,42 @@
+package com.epmet.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+/**
+ * @Author zxc
+ * @DateTime 2022/10/11 16:30
+ * @DESC
+ */
+@Data
+public class AllIssueListExportExcel {
+
+    @ExcelProperty(value = "所属网格")
+    @ColumnWidth(20)
+    private String gridName;
+
+    @ExcelProperty(value = "议题标题")
+    @ColumnWidth(20)
+    private String issueTitle;
+
+    @ExcelProperty(value = "议题建议")
+    @ColumnWidth(20)
+    private String suggestion;
+
+    @ExcelProperty(value = "议题创建时间")
+    @ColumnWidth(20)
+    private String createdTime;
+
+    @ExcelProperty(value = "支持数")
+    @ColumnWidth(20)
+    private Integer supportCount;
+
+    @ExcelProperty(value = "反对数")
+    @ColumnWidth(20)
+    private Integer oppositionCount;
+
+    @ExcelProperty(value = "议题状态")
+    @ColumnWidth(20)
+    private String issueStatusName;
+}

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/AuditListExportExcel.java

@@ -0,0 +1,34 @@
+package com.epmet.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+/**
+ * @Author zxc
+ * @DateTime 2022/10/11 16:45
+ * @DESC
+ */
+@Data
+public class AuditListExportExcel {
+
+    @ExcelProperty(value = "所属网格")
+    @ColumnWidth(20)
+    private String gridName;
+
+    @ExcelProperty(value = "议题标题")
+    @ColumnWidth(20)
+    private String issueTitle;
+
+    @ExcelProperty(value = "议题建议")
+    @ColumnWidth(20)
+    private String suggestion;
+
+    @ExcelProperty(value = "状态")
+    @ColumnWidth(20)
+    private String applyStatusName;
+
+    @ExcelProperty(value = "提交审核时间")
+    @ColumnWidth(20)
+    private String applyTime;
+}

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueApplicationService.java

@@ -34,6 +34,8 @@ import com.epmet.resi.group.dto.group.result.ApplicationDetailResultDTO;
 import com.epmet.resi.group.dto.group.result.ApplicationHistoryResultDTO;
 import com.epmet.resi.group.dto.group.result.ApplicationListResultDTO;
 
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 
@@ -154,6 +156,7 @@ public interface IssueApplicationService extends BaseService<IssueApplicationEnt
     List<String> notIssueToTopicIds(List<String> topicIdList);
 
     PageData<AuditListResultDTO> auditList(AuditListFormDTO formDTO);
+    void auditListExport(AuditListFormDTO formDTO, HttpServletResponse response) throws IOException;
 
     void initIssueApplicationHistoryData();
 }

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java

@@ -15,6 +15,8 @@ import com.epmet.resi.group.dto.group.result.GroupVotingListResultDTO;
 import com.epmet.resi.group.dto.topic.form.TopicInfoFormDTO;
 import com.github.pagehelper.Page;
 
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -408,6 +410,7 @@ public interface IssueService extends BaseService<IssueEntity> {
      * @date 2022/10/9 16:58
      */
     PageData<AllIssueListResultDTO> allIssueList(AllIssueListFormDTO formDTO);
+    void allIssueListExport(AllIssueListFormDTO formDTO, HttpServletResponse response) throws IOException;
 
     /**
      * 发布议题

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueApplicationServiceImpl.java

@@ -17,18 +17,27 @@
 
 package com.epmet.service.impl;
 
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.write.metadata.WriteSheet;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
 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.redis.common.bean.GridInfoCache;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.DateUtils;
+import com.epmet.commons.tools.utils.ExcelUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter;
 import com.epmet.dao.IssueApplicationDao;
 import com.epmet.dto.IssueApplicationDTO;
 import com.epmet.dto.form.AuditListFormDTO;
@@ -39,6 +48,8 @@ import com.epmet.dto.result.AuditListResultDTO;
 import com.epmet.dto.result.IssueApplicationResDTO;
 import com.epmet.dto.result.UserPubAuditingIssueResDTO;
 import com.epmet.entity.IssueApplicationEntity;
+import com.epmet.excel.AllIssueListExportExcel;
+import com.epmet.excel.AuditListExportExcel;
 import com.epmet.resi.group.dto.group.form.ApplicationDetailFormDTO;
 import com.epmet.resi.group.dto.group.form.ApplicationHistoryFormDTO;
 import com.epmet.resi.group.dto.group.form.ApplicationListFormDTO;
@@ -55,10 +66,10 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
+import javax.servlet.http.HttpServletResponse;
-import java.util.Arrays;
+import java.io.IOException;
-import java.util.List;
+import java.io.PrintWriter;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 话题转议题申请表
@@ -232,6 +243,39 @@ public class IssueApplicationServiceImpl extends BaseServiceImpl<IssueApplicatio
         return result;
     }
 
+    @Override
+    public void auditListExport(AuditListFormDTO formDTO, HttpServletResponse response) throws IOException {
+        ExcelWriter excelWriter = null;
+        formDTO.setPageNo(NumConstant.ONE);
+        formDTO.setPageSize(NumConstant.TEN_THOUSAND);
+        try {
+            String fileName = "议题审核列表" + DateUtils.format(new Date()) + ".xlsx";
+            excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response), AuditListExportExcel.class).build();
+            WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").registerWriteHandler(new FreezeAndFilter()).build();
+            List<AuditListExportExcel> list = null;
+            do {
+                PageData<AuditListResultDTO> data = auditList(formDTO);
+                list = ConvertUtils.sourceToTarget(data.getList(), AuditListExportExcel.class);
+                formDTO.setPageNo(formDTO.getPageNo() + NumConstant.ONE);
+                excelWriter.write(list, writeSheet);
+            } while (CollectionUtils.isNotEmpty(list) && list.size() == formDTO.getPageSize());
+        } catch (EpmetException e) {
+            response.reset();
+            response.setCharacterEncoding("UTF-8");
+            response.setHeader("content-type", "application/json; charset=UTF-8");
+            PrintWriter printWriter = response.getWriter();
+            Result<Object> result = new Result<>().error(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),e.getMsg());
+            printWriter.write(JSON.toJSONString(result));
+            printWriter.close();
+        } catch (Exception e) {
+            log.error("export exception", e);
+        } finally {
+            if (excelWriter != null) {
+                excelWriter.finish();
+            }
+        }
+    }
+
     @Override
     public void initIssueApplicationHistoryData() {
         Integer no = NumConstant.ONE;

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java

@@ -1,4 +1,7 @@
 package com.epmet.service.impl;
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.write.metadata.WriteSheet;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.nacos.client.utils.StringUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -28,9 +31,8 @@ import com.epmet.commons.tools.scan.param.TextScanParamDTO;
 import com.epmet.commons.tools.scan.param.TextTaskDTO;
 import com.epmet.commons.tools.scan.result.SyncScanResult;
 import com.epmet.commons.tools.security.dto.TokenDto;
-import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.*;
-import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter;
-import com.epmet.commons.tools.utils.ScanContentUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.constant.IssueConstant;
 import com.epmet.constant.ReadFlagConstant;
@@ -46,6 +48,7 @@ import com.epmet.dto.form.IssueShiftedFromTopicFormDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.entity.*;
+import com.epmet.excel.AllIssueListExportExcel;
 import com.epmet.feign.*;
 import com.epmet.redis.GovIssueRedis;
 import com.epmet.redis.IssueVoteDetailRedis;
@@ -76,6 +79,9 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.PrintWriter;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
@@ -2071,6 +2077,39 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
         return result;
     }
 
+    @Override
+    public void allIssueListExport(AllIssueListFormDTO formDTO, HttpServletResponse response) throws IOException {
+        ExcelWriter excelWriter = null;
+        formDTO.setPageNo(NumConstant.ONE);
+        formDTO.setPageSize(NumConstant.TEN_THOUSAND);
+        try {
+            String fileName = "议题管理" + DateUtils.format(new Date()) + ".xlsx";
+            excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response), AllIssueListExportExcel.class).build();
+            WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").registerWriteHandler(new FreezeAndFilter()).build();
+            List<AllIssueListExportExcel> list = null;
+            do {
+                PageData<AllIssueListResultDTO> data = allIssueList(formDTO);
+                list = ConvertUtils.sourceToTarget(data.getList(), AllIssueListExportExcel.class);
+                formDTO.setPageNo(formDTO.getPageNo() + NumConstant.ONE);
+                excelWriter.write(list, writeSheet);
+            } while (CollectionUtils.isNotEmpty(list) && list.size() == formDTO.getPageSize());
+        } catch (EpmetException e) {
+            response.reset();
+            response.setCharacterEncoding("UTF-8");
+            response.setHeader("content-type", "application/json; charset=UTF-8");
+            PrintWriter printWriter = response.getWriter();
+            Result<Object> result = new Result<>().error(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),e.getMsg());
+            printWriter.write(JSON.toJSONString(result));
+            printWriter.close();
+        } catch (Exception e) {
+            logger.error("export exception", e);
+        } finally {
+            if (excelWriter != null) {
+                excelWriter.finish();
+            }
+        }
+    }
+
     /**
      * 发布议题
      * 事件转议题