Merge remote-tracking branch 'origin/master'

xuhy

2026-01-06 f3aa9e35dfc2852e0ae1ae807bc5cc844cd7ca74

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TLargeKeyGridUserController.java

@@ -13,6 +13,7 @@
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.WebUtils;
import com.ruoyi.system.export.LargeKeyGridPointUserImport;
import com.ruoyi.system.export.LargeKeyGridUserImport;
import com.ruoyi.system.model.TLargeKeyGridUser;
import com.ruoyi.system.model.TLargeKeyPersonnelType;
@@ -140,7 +141,7 @@
        return R.ok(largeKeyGridUserService.removeByIds(ids));
    }

    @ApiOperation(value = "重点人员-网格人员导入模板下载")
    @ApiOperation(value = "网格人员导入模板下载")
    @GetMapping("/import-template")
    public void importTemplate() {
        List<LargeKeyGridUserImport> largeLargeKeyGridUserImports = new ArrayList<>();
@@ -150,7 +151,7 @@
        HttpServletResponse response = WebUtils.response();
        ServletOutputStream outputStream = null;
        try {
            String fileName = URLEncoder.encode("重点人员-网格人员信息导入模板.xls", "utf-8");
            String fileName = URLEncoder.encode("网格人员信息导入模板.xls", "utf-8");
            response.setHeader("Content-Disposition", "attachment;filename=" + fileName);
            response.setHeader("content-Type", "application/vnd.ms-excel");
            response.setHeader("Pragma", "no-cache");
@@ -159,7 +160,35 @@
            workbook.write(outputStream);
        } catch (IOException e) {
            e.printStackTrace();
            System.out.println("重点人员-网格人员导入模板下载失败!");
            System.out.println("网格人员导入模板下载失败!");
        } finally {
            try {
                outputStream.close();
            } catch (IOException e) {
                e.printStackTrace();
            }
        }
    }
    @ApiOperation(value = "重点人员导入模板下载")
    @GetMapping("/import-point-template")
    public void importPointTemplate() {
        List<LargeKeyGridPointUserImport> largeKeyGridPointUserImports = new ArrayList<>();
        LargeKeyGridPointUserImport largeKeyGridPointUserImport = new LargeKeyGridPointUserImport();
        largeKeyGridPointUserImports.add(largeKeyGridPointUserImport);
        Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), LargeKeyGridPointUserImport.class, largeKeyGridPointUserImports);
        HttpServletResponse response = WebUtils.response();
        ServletOutputStream outputStream = null;
        try {
            String fileName = URLEncoder.encode("重点人员信息导入模板.xls", "utf-8");
            response.setHeader("Content-Disposition", "attachment;filename=" + fileName);
            response.setHeader("content-Type", "application/vnd.ms-excel");
            response.setHeader("Pragma", "no-cache");
            response.setHeader("Cache-Control", "no-cache");
            outputStream = response.getOutputStream();
            workbook.write(outputStream);
        } catch (IOException e) {
            e.printStackTrace();
            System.out.println("重点人员导入模板下载失败!");
        } finally {
            try {
                outputStream.close();
@@ -337,6 +366,11 @@
                i++;
                continue;
            }
            if (!StringUtils.hasLength(largeKeyGridUserImport.getRegisteredResidence())){
                result.append("第"+i+"行：[", "户籍地"+"]不能为空");
                i++;
                continue;
            }
            if (!StringUtils.hasLength(largeKeyGridUserImport.getBuildingInfo())){
                result.append("第"+i+"行：[", "楼栋信息"+"]不能为空");
                i++;