修改

xuhy

2026-03-27 0923c2a6f1a7b4d28e39f566f9ff27557e2bf250

 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;
@@ -108,7 +109,11 @@
    @ApiOperation(value = "修改重点人员-网格人员")
    @PostMapping(value = "/update")
    public R<Boolean> update(@Validated @RequestBody TLargeKeyGridUser dto) {
        return R.ok(largeKeyGridUserService.updateById(dto));
        largeKeyGridUserService.updateById(dto);
        if(!StringUtils.hasLength(dto.getTypeId())){
            largeKeyGridUserService.update(Wrappers.lambdaUpdate(TLargeKeyGridUser.class).set(TLargeKeyGridUser::getTypeId, null).eq(TLargeKeyGridUser::getId, dto.getId()));
        }
        return R.ok();
    }

    /**
@@ -140,7 +145,7 @@
        return R.ok(largeKeyGridUserService.removeByIds(ids));
    }

    @ApiOperation(value = "重点人员-网格人员导入模板下载")
    @ApiOperation(value = "网格人员导入模板下载")
    @GetMapping("/import-template")
    public void importTemplate() {
        List<LargeKeyGridUserImport> largeLargeKeyGridUserImports = new ArrayList<>();
@@ -150,7 +155,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 +164,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();
@@ -250,7 +283,7 @@
                i++;
                continue;
            }
            if (!largeKeyGridUserImport.getContactNumber().matches("^$|^1[3-9]\\d{9}$")){
            if (largeKeyGridUserImport.getContactNumber().length() != 11){
                result.append("第"+i+"行：[", "联系电话"+"]格式不正确");
                i++;
                continue;
@@ -327,31 +360,36 @@
        JSONObject result = new JSONObject();
        int i = 1;
        for (LargeKeyGridUserImport largeKeyGridUserImport : largeKeyGridUserImports) {
            if (!StringUtils.hasLength(largeKeyGridUserImport.getGridInfo())){
                result.append("第"+i+"行：[", "网格"+"]不能为空");
                i++;
                continue;
            }
            if (!StringUtils.hasLength(largeKeyGridUserImport.getCommunityName())){
                result.append("第"+i+"行：[", "小区名称"+"]不能为空");
                i++;
                continue;
            }
            if (!StringUtils.hasLength(largeKeyGridUserImport.getBuildingInfo())){
                result.append("第"+i+"行：[", "楼栋信息"+"]不能为空");
                i++;
                continue;
            }
            if (!StringUtils.hasLength(largeKeyGridUserImport.getUnitNumber())){
                result.append("第"+i+"行：[", "单元号"+"]不能为空");
                i++;
                continue;
            }
            if (!StringUtils.hasLength(largeKeyGridUserImport.getHouseNumber())){
                result.append("第"+i+"行：[", "门牌号"+"]不能为空");
                i++;
                continue;
            }
//            if (!StringUtils.hasLength(largeKeyGridUserImport.getGridInfo())){
//                result.append("第"+i+"行：[", "网格"+"]不能为空");
//                i++;
//                continue;
//            }
//            if (!StringUtils.hasLength(largeKeyGridUserImport.getCommunityName())){
//                result.append("第"+i+"行：[", "小区名称"+"]不能为空");
//                i++;
//                continue;
//            }
//            if (!StringUtils.hasLength(largeKeyGridUserImport.getRegisteredResidence())){
//                result.append("第"+i+"行：[", "户籍地"+"]不能为空");
//                i++;
//                continue;
//            }
//            if (!StringUtils.hasLength(largeKeyGridUserImport.getBuildingInfo())){
//                result.append("第"+i+"行：[", "楼栋信息"+"]不能为空");
//                i++;
//                continue;
//            }
//            if (!StringUtils.hasLength(largeKeyGridUserImport.getUnitNumber())){
//                result.append("第"+i+"行：[", "单元号"+"]不能为空");
//                i++;
//                continue;
//            }
//            if (!StringUtils.hasLength(largeKeyGridUserImport.getHouseNumber())){
//                result.append("第"+i+"行：[", "门牌号"+"]不能为空");
//                i++;
//                continue;
//            }
            if (!StringUtils.hasLength(largeKeyGridUserImport.getUserName())){
                result.append("第"+i+"行：[", "姓名"+"]不能为空");
                i++;
@@ -377,7 +415,7 @@
                i++;
                continue;
            }
            if (!largeKeyGridUserImport.getContactNumber().matches("^$|^1[3-9]\\d{9}$")){
            if (largeKeyGridUserImport.getContactNumber().length() != 11){
                result.append("第"+i+"行：[", "联系电话"+"]格式不正确");
                i++;
                continue;
@@ -402,21 +440,23 @@
                TLargeKeyPersonnelType largeKeyPersonnelType = largeKeyPersonnelTypeService.getOne(Wrappers.lambdaQuery(TLargeKeyPersonnelType.class)
                        .eq(TLargeKeyPersonnelType::getTypeName, largeKeyGridUserImport.getTypeName())
                        .last("LIMIT 1"));
                if(Objects.isNull(largeKeyPersonnelType)){
                    result.append("第"+i+"行：[", "类型名称"+"]不存在");
                    i++;
                    continue;
//                if(Objects.isNull(largeKeyPersonnelType)){
//                    result.append("第"+i+"行：[", "类型名称"+"]不存在");
//                    i++;
//                    continue;
//                }
                if(Objects.nonNull(largeKeyPersonnelType)){
                    largeKeyGridUser.setTypeId(largeKeyPersonnelType.getId());
                }
                largeKeyGridUser.setTypeId(largeKeyPersonnelType.getId());
            }
            largeKeyGridUser.setUserType(2);
            largeKeyGridUsers.add(largeKeyGridUser);
            i++;
        }
        largeKeyGridUserService.saveBatch(largeKeyGridUsers);
        if(!result.isEmpty()){
            return R.fail(result.toString());
        }
        largeKeyGridUserService.saveBatch(largeKeyGridUsers);
        return R.ok();
    }