diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java index fabd06a..a7b7a80 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java @@ -113,7 +113,12 @@ //设置默认密码 user.setPassword(Const.DEFAULT_PWD); user.setStatus(SysUserConst.STATUS_OK); - user.setAccount(entity.getTel()); + //手机号为空则设置密码 + if (ToolUtil.isEmpty(entity.getTel())) { + user.setAccount(entity.getIdCard()); + } else { + user.setAccount(entity.getTel()); + } return user; } @@ -321,8 +326,12 @@ for (String id : ids) { Staff staff = this.selectById(id); staff.setDelFlag(staff.getId()); - //冻结该账户 - iCommonPermissionService.updateUserStatus(staff.getTel(), SysUserConst.STATUS_FREEZED); + if (ToolUtil.isNotEmpty(staff.getTel())) { + iCommonPermissionService.updateUserStatus(staff.getTel(), SysUserConst.STATUS_FREEZED); + } + if (ToolUtil.isNotEmpty(staff.getIdCard())) { + iCommonPermissionService.updateUserStatus(staff.getIdCard(), SysUserConst.STATUS_FREEZED); + } this.updateById(staff); } } diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java index fabd06a..a7b7a80 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java @@ -113,7 +113,12 @@ //设置默认密码 user.setPassword(Const.DEFAULT_PWD); user.setStatus(SysUserConst.STATUS_OK); - user.setAccount(entity.getTel()); + //手机号为空则设置密码 + if (ToolUtil.isEmpty(entity.getTel())) { + user.setAccount(entity.getIdCard()); + } else { + user.setAccount(entity.getTel()); + } return user; } @@ -321,8 +326,12 @@ for (String id : ids) { Staff staff = this.selectById(id); staff.setDelFlag(staff.getId()); - //冻结该账户 - iCommonPermissionService.updateUserStatus(staff.getTel(), SysUserConst.STATUS_FREEZED); + if (ToolUtil.isNotEmpty(staff.getTel())) { + iCommonPermissionService.updateUserStatus(staff.getTel(), SysUserConst.STATUS_FREEZED); + } + if (ToolUtil.isNotEmpty(staff.getIdCard())) { + iCommonPermissionService.updateUserStatus(staff.getIdCard(), SysUserConst.STATUS_FREEZED); + } this.updateById(staff); } } diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java index 6e7fbe6..a298c1d 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java @@ -52,10 +52,12 @@ query.or(); query.like("CODE", keywords); } - if (StringUtils.isNotBlank(owner)){ - query.eq("OWNER", owner);} - if (StringUtils.isNotBlank(position)){ - query.like("POSITION", position);} + if (StringUtils.isNotBlank(owner)) { + query.eq("OWNER", owner); + } + if (StringUtils.isNotBlank(position)) { + query.like("POSITION", position); + } List toiletList = this.selectList(query); @@ -70,10 +72,12 @@ EntityWrapper query = new EntityWrapper<>(); query.eq("DEL_FLAG", 0); - if (StringUtils.isNotBlank(position)){ - query.like("POSITION", position);} - if (StringUtils.isNotBlank(owner)){ - query.eq("OWNER", owner);} + if (StringUtils.isNotBlank(position)) { + query.like("POSITION", position); + } + if (StringUtils.isNotBlank(owner)) { + query.eq("OWNER", owner); + } if (StringUtils.isNotBlank(keywords)) { query.like("NAME", keywords); query.or(); @@ -83,27 +87,27 @@ if (maps == null) { maps = new ArrayList<>(); } - maps.stream().forEach(map -> { - if (ToolUtil.isNotEmpty(map.get("ts"))) { - map.put("ts",dft.format(map.get("ts"))); - map.put("createTime",dft.format(map.get("createTime"))); - } - }); - String sheetTitle = "公厕"; - String[] title = new String[]{"名称", "编号", "地址", "经度", "纬度", "建设时间", "责任人", "责任人电话", - "建设单位", "占地面积", "备注"}; - String[] properties = new String[]{"name", "code", "position", "lng", "lat", "ts", "responsiblePerson", - "responsiblePersonTel", "owner", "area", "notes"}; + maps.stream().forEach(map -> { + if (ToolUtil.isNotEmpty(map.get("ts"))) { + map.put("ts", dft.format(map.get("ts"))); + map.put("createTime", dft.format(map.get("createTime"))); + } + }); + String sheetTitle = "公厕"; + String[] title = new String[]{"名称", "编号", "地址", "经度", "纬度", "建设时间", "责任人", "责任人电话", + "建设单位", "占地面积", "备注"}; + String[] properties = new String[]{"name", "code", "position", "lng", "lat", "ts", "responsiblePerson", + "responsiblePersonTel", "owner", "area", "notes"}; - ExcelUtil excelUtil = new ExcelUtil(); - excelUtil.setData(maps); - excelUtil.setHeardKey(properties); - excelUtil.setFontSize(14); - excelUtil.setSheetName(sheetTitle); - excelUtil.setTitle(sheetTitle); - excelUtil.setHeardList(title); + ExcelUtil excelUtil = new ExcelUtil(); + excelUtil.setData(maps); + excelUtil.setHeardKey(properties); + excelUtil.setFontSize(14); + excelUtil.setSheetName(sheetTitle); + excelUtil.setTitle(sheetTitle); + excelUtil.setHeardList(title); - excelUtil.exportExport(request, response); + excelUtil.exportExport(request, response); } static SimpleDateFormat dft = new SimpleDateFormat("yyyy-MM-dd"); @@ -119,6 +123,10 @@ List depts = deptService.getDeptByTips(null); for (Map map : list) { Toilet toilet = new Toilet(); + if (ToolUtil.isEmpty(map.get(0))) { + //判断公厕编码不能为空 + continue; + } toilet.setCode(map.get(0).equals("") ? "" : map.get(0)); toilet.setName(map.get(1).equals("") ? "" : map.get(1)); toilet.setArea(map.get(2).equals("") ? null : new BigDecimal(map.get(2))); diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java index fabd06a..a7b7a80 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java @@ -113,7 +113,12 @@ //设置默认密码 user.setPassword(Const.DEFAULT_PWD); user.setStatus(SysUserConst.STATUS_OK); - user.setAccount(entity.getTel()); + //手机号为空则设置密码 + if (ToolUtil.isEmpty(entity.getTel())) { + user.setAccount(entity.getIdCard()); + } else { + user.setAccount(entity.getTel()); + } return user; } @@ -321,8 +326,12 @@ for (String id : ids) { Staff staff = this.selectById(id); staff.setDelFlag(staff.getId()); - //冻结该账户 - iCommonPermissionService.updateUserStatus(staff.getTel(), SysUserConst.STATUS_FREEZED); + if (ToolUtil.isNotEmpty(staff.getTel())) { + iCommonPermissionService.updateUserStatus(staff.getTel(), SysUserConst.STATUS_FREEZED); + } + if (ToolUtil.isNotEmpty(staff.getIdCard())) { + iCommonPermissionService.updateUserStatus(staff.getIdCard(), SysUserConst.STATUS_FREEZED); + } this.updateById(staff); } } diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java index 6e7fbe6..a298c1d 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java @@ -52,10 +52,12 @@ query.or(); query.like("CODE", keywords); } - if (StringUtils.isNotBlank(owner)){ - query.eq("OWNER", owner);} - if (StringUtils.isNotBlank(position)){ - query.like("POSITION", position);} + if (StringUtils.isNotBlank(owner)) { + query.eq("OWNER", owner); + } + if (StringUtils.isNotBlank(position)) { + query.like("POSITION", position); + } List toiletList = this.selectList(query); @@ -70,10 +72,12 @@ EntityWrapper query = new EntityWrapper<>(); query.eq("DEL_FLAG", 0); - if (StringUtils.isNotBlank(position)){ - query.like("POSITION", position);} - if (StringUtils.isNotBlank(owner)){ - query.eq("OWNER", owner);} + if (StringUtils.isNotBlank(position)) { + query.like("POSITION", position); + } + if (StringUtils.isNotBlank(owner)) { + query.eq("OWNER", owner); + } if (StringUtils.isNotBlank(keywords)) { query.like("NAME", keywords); query.or(); @@ -83,27 +87,27 @@ if (maps == null) { maps = new ArrayList<>(); } - maps.stream().forEach(map -> { - if (ToolUtil.isNotEmpty(map.get("ts"))) { - map.put("ts",dft.format(map.get("ts"))); - map.put("createTime",dft.format(map.get("createTime"))); - } - }); - String sheetTitle = "公厕"; - String[] title = new String[]{"名称", "编号", "地址", "经度", "纬度", "建设时间", "责任人", "责任人电话", - "建设单位", "占地面积", "备注"}; - String[] properties = new String[]{"name", "code", "position", "lng", "lat", "ts", "responsiblePerson", - "responsiblePersonTel", "owner", "area", "notes"}; + maps.stream().forEach(map -> { + if (ToolUtil.isNotEmpty(map.get("ts"))) { + map.put("ts", dft.format(map.get("ts"))); + map.put("createTime", dft.format(map.get("createTime"))); + } + }); + String sheetTitle = "公厕"; + String[] title = new String[]{"名称", "编号", "地址", "经度", "纬度", "建设时间", "责任人", "责任人电话", + "建设单位", "占地面积", "备注"}; + String[] properties = new String[]{"name", "code", "position", "lng", "lat", "ts", "responsiblePerson", + "responsiblePersonTel", "owner", "area", "notes"}; - ExcelUtil excelUtil = new ExcelUtil(); - excelUtil.setData(maps); - excelUtil.setHeardKey(properties); - excelUtil.setFontSize(14); - excelUtil.setSheetName(sheetTitle); - excelUtil.setTitle(sheetTitle); - excelUtil.setHeardList(title); + ExcelUtil excelUtil = new ExcelUtil(); + excelUtil.setData(maps); + excelUtil.setHeardKey(properties); + excelUtil.setFontSize(14); + excelUtil.setSheetName(sheetTitle); + excelUtil.setTitle(sheetTitle); + excelUtil.setHeardList(title); - excelUtil.exportExport(request, response); + excelUtil.exportExport(request, response); } static SimpleDateFormat dft = new SimpleDateFormat("yyyy-MM-dd"); @@ -119,6 +123,10 @@ List depts = deptService.getDeptByTips(null); for (Map map : list) { Toilet toilet = new Toilet(); + if (ToolUtil.isEmpty(map.get(0))) { + //判断公厕编码不能为空 + continue; + } toilet.setCode(map.get(0).equals("") ? "" : map.get(0)); toilet.setName(map.get(1).equals("") ? "" : map.get(1)); toilet.setArea(map.get(2).equals("") ? null : new BigDecimal(map.get(2))); diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/TransferstationServiceImpl.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/TransferstationServiceImpl.java index d2bed16..fdc5bd4 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/TransferstationServiceImpl.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/TransferstationServiceImpl.java @@ -112,8 +112,11 @@ List> list = ExcelTool.readExcel(file); for (Map map : list) { - Transferstation transferstation = new Transferstation(); + if (ToolUtil.isEmpty(map.get(0))) { + //判断编码不能为空 + continue; + } transferstation.setCode(map.get(0).equals("") ? "" : map.get(0)); transferstation.setName(map.get(1).equals("") ? "" : map.get(1)); transferstation.setArea(map.get(2).equals("") ? null : new BigDecimal(map.get(2))); diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java index fabd06a..a7b7a80 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java @@ -113,7 +113,12 @@ //设置默认密码 user.setPassword(Const.DEFAULT_PWD); user.setStatus(SysUserConst.STATUS_OK); - user.setAccount(entity.getTel()); + //手机号为空则设置密码 + if (ToolUtil.isEmpty(entity.getTel())) { + user.setAccount(entity.getIdCard()); + } else { + user.setAccount(entity.getTel()); + } return user; } @@ -321,8 +326,12 @@ for (String id : ids) { Staff staff = this.selectById(id); staff.setDelFlag(staff.getId()); - //冻结该账户 - iCommonPermissionService.updateUserStatus(staff.getTel(), SysUserConst.STATUS_FREEZED); + if (ToolUtil.isNotEmpty(staff.getTel())) { + iCommonPermissionService.updateUserStatus(staff.getTel(), SysUserConst.STATUS_FREEZED); + } + if (ToolUtil.isNotEmpty(staff.getIdCard())) { + iCommonPermissionService.updateUserStatus(staff.getIdCard(), SysUserConst.STATUS_FREEZED); + } this.updateById(staff); } } diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java index 6e7fbe6..a298c1d 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java @@ -52,10 +52,12 @@ query.or(); query.like("CODE", keywords); } - if (StringUtils.isNotBlank(owner)){ - query.eq("OWNER", owner);} - if (StringUtils.isNotBlank(position)){ - query.like("POSITION", position);} + if (StringUtils.isNotBlank(owner)) { + query.eq("OWNER", owner); + } + if (StringUtils.isNotBlank(position)) { + query.like("POSITION", position); + } List toiletList = this.selectList(query); @@ -70,10 +72,12 @@ EntityWrapper query = new EntityWrapper<>(); query.eq("DEL_FLAG", 0); - if (StringUtils.isNotBlank(position)){ - query.like("POSITION", position);} - if (StringUtils.isNotBlank(owner)){ - query.eq("OWNER", owner);} + if (StringUtils.isNotBlank(position)) { + query.like("POSITION", position); + } + if (StringUtils.isNotBlank(owner)) { + query.eq("OWNER", owner); + } if (StringUtils.isNotBlank(keywords)) { query.like("NAME", keywords); query.or(); @@ -83,27 +87,27 @@ if (maps == null) { maps = new ArrayList<>(); } - maps.stream().forEach(map -> { - if (ToolUtil.isNotEmpty(map.get("ts"))) { - map.put("ts",dft.format(map.get("ts"))); - map.put("createTime",dft.format(map.get("createTime"))); - } - }); - String sheetTitle = "公厕"; - String[] title = new String[]{"名称", "编号", "地址", "经度", "纬度", "建设时间", "责任人", "责任人电话", - "建设单位", "占地面积", "备注"}; - String[] properties = new String[]{"name", "code", "position", "lng", "lat", "ts", "responsiblePerson", - "responsiblePersonTel", "owner", "area", "notes"}; + maps.stream().forEach(map -> { + if (ToolUtil.isNotEmpty(map.get("ts"))) { + map.put("ts", dft.format(map.get("ts"))); + map.put("createTime", dft.format(map.get("createTime"))); + } + }); + String sheetTitle = "公厕"; + String[] title = new String[]{"名称", "编号", "地址", "经度", "纬度", "建设时间", "责任人", "责任人电话", + "建设单位", "占地面积", "备注"}; + String[] properties = new String[]{"name", "code", "position", "lng", "lat", "ts", "responsiblePerson", + "responsiblePersonTel", "owner", "area", "notes"}; - ExcelUtil excelUtil = new ExcelUtil(); - excelUtil.setData(maps); - excelUtil.setHeardKey(properties); - excelUtil.setFontSize(14); - excelUtil.setSheetName(sheetTitle); - excelUtil.setTitle(sheetTitle); - excelUtil.setHeardList(title); + ExcelUtil excelUtil = new ExcelUtil(); + excelUtil.setData(maps); + excelUtil.setHeardKey(properties); + excelUtil.setFontSize(14); + excelUtil.setSheetName(sheetTitle); + excelUtil.setTitle(sheetTitle); + excelUtil.setHeardList(title); - excelUtil.exportExport(request, response); + excelUtil.exportExport(request, response); } static SimpleDateFormat dft = new SimpleDateFormat("yyyy-MM-dd"); @@ -119,6 +123,10 @@ List depts = deptService.getDeptByTips(null); for (Map map : list) { Toilet toilet = new Toilet(); + if (ToolUtil.isEmpty(map.get(0))) { + //判断公厕编码不能为空 + continue; + } toilet.setCode(map.get(0).equals("") ? "" : map.get(0)); toilet.setName(map.get(1).equals("") ? "" : map.get(1)); toilet.setArea(map.get(2).equals("") ? null : new BigDecimal(map.get(2))); diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/TransferstationServiceImpl.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/TransferstationServiceImpl.java index d2bed16..fdc5bd4 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/TransferstationServiceImpl.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/TransferstationServiceImpl.java @@ -112,8 +112,11 @@ List> list = ExcelTool.readExcel(file); for (Map map : list) { - Transferstation transferstation = new Transferstation(); + if (ToolUtil.isEmpty(map.get(0))) { + //判断编码不能为空 + continue; + } transferstation.setCode(map.get(0).equals("") ? "" : map.get(0)); transferstation.setName(map.get(1).equals("") ? "" : map.get(1)); transferstation.setArea(map.get(2).equals("") ? null : new BigDecimal(map.get(2))); diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/WasteBinServiceImpl.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/WasteBinServiceImpl.java index 23b609f..868eae0 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/WasteBinServiceImpl.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/WasteBinServiceImpl.java @@ -126,6 +126,10 @@ //wastebinType for (Map map : list) { WasteBin wasteBin = new WasteBin(); + if (ToolUtil.isEmpty(map.get(0))) { + //判断编码不能为空 + continue; + } wasteBin.setCode(map.get(0).equals("") ? "" : map.get(0)); wasteBin.setName(map.get(1).equals("") ? "" : map.get(1)); wasteBin.setType(map.get(2).equals("") ? "" : convertDictValue(map.get(2), wastebinTypes, true)); diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java index fabd06a..a7b7a80 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java @@ -113,7 +113,12 @@ //设置默认密码 user.setPassword(Const.DEFAULT_PWD); user.setStatus(SysUserConst.STATUS_OK); - user.setAccount(entity.getTel()); + //手机号为空则设置密码 + if (ToolUtil.isEmpty(entity.getTel())) { + user.setAccount(entity.getIdCard()); + } else { + user.setAccount(entity.getTel()); + } return user; } @@ -321,8 +326,12 @@ for (String id : ids) { Staff staff = this.selectById(id); staff.setDelFlag(staff.getId()); - //冻结该账户 - iCommonPermissionService.updateUserStatus(staff.getTel(), SysUserConst.STATUS_FREEZED); + if (ToolUtil.isNotEmpty(staff.getTel())) { + iCommonPermissionService.updateUserStatus(staff.getTel(), SysUserConst.STATUS_FREEZED); + } + if (ToolUtil.isNotEmpty(staff.getIdCard())) { + iCommonPermissionService.updateUserStatus(staff.getIdCard(), SysUserConst.STATUS_FREEZED); + } this.updateById(staff); } } diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java index 6e7fbe6..a298c1d 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java @@ -52,10 +52,12 @@ query.or(); query.like("CODE", keywords); } - if (StringUtils.isNotBlank(owner)){ - query.eq("OWNER", owner);} - if (StringUtils.isNotBlank(position)){ - query.like("POSITION", position);} + if (StringUtils.isNotBlank(owner)) { + query.eq("OWNER", owner); + } + if (StringUtils.isNotBlank(position)) { + query.like("POSITION", position); + } List toiletList = this.selectList(query); @@ -70,10 +72,12 @@ EntityWrapper query = new EntityWrapper<>(); query.eq("DEL_FLAG", 0); - if (StringUtils.isNotBlank(position)){ - query.like("POSITION", position);} - if (StringUtils.isNotBlank(owner)){ - query.eq("OWNER", owner);} + if (StringUtils.isNotBlank(position)) { + query.like("POSITION", position); + } + if (StringUtils.isNotBlank(owner)) { + query.eq("OWNER", owner); + } if (StringUtils.isNotBlank(keywords)) { query.like("NAME", keywords); query.or(); @@ -83,27 +87,27 @@ if (maps == null) { maps = new ArrayList<>(); } - maps.stream().forEach(map -> { - if (ToolUtil.isNotEmpty(map.get("ts"))) { - map.put("ts",dft.format(map.get("ts"))); - map.put("createTime",dft.format(map.get("createTime"))); - } - }); - String sheetTitle = "公厕"; - String[] title = new String[]{"名称", "编号", "地址", "经度", "纬度", "建设时间", "责任人", "责任人电话", - "建设单位", "占地面积", "备注"}; - String[] properties = new String[]{"name", "code", "position", "lng", "lat", "ts", "responsiblePerson", - "responsiblePersonTel", "owner", "area", "notes"}; + maps.stream().forEach(map -> { + if (ToolUtil.isNotEmpty(map.get("ts"))) { + map.put("ts", dft.format(map.get("ts"))); + map.put("createTime", dft.format(map.get("createTime"))); + } + }); + String sheetTitle = "公厕"; + String[] title = new String[]{"名称", "编号", "地址", "经度", "纬度", "建设时间", "责任人", "责任人电话", + "建设单位", "占地面积", "备注"}; + String[] properties = new String[]{"name", "code", "position", "lng", "lat", "ts", "responsiblePerson", + "responsiblePersonTel", "owner", "area", "notes"}; - ExcelUtil excelUtil = new ExcelUtil(); - excelUtil.setData(maps); - excelUtil.setHeardKey(properties); - excelUtil.setFontSize(14); - excelUtil.setSheetName(sheetTitle); - excelUtil.setTitle(sheetTitle); - excelUtil.setHeardList(title); + ExcelUtil excelUtil = new ExcelUtil(); + excelUtil.setData(maps); + excelUtil.setHeardKey(properties); + excelUtil.setFontSize(14); + excelUtil.setSheetName(sheetTitle); + excelUtil.setTitle(sheetTitle); + excelUtil.setHeardList(title); - excelUtil.exportExport(request, response); + excelUtil.exportExport(request, response); } static SimpleDateFormat dft = new SimpleDateFormat("yyyy-MM-dd"); @@ -119,6 +123,10 @@ List depts = deptService.getDeptByTips(null); for (Map map : list) { Toilet toilet = new Toilet(); + if (ToolUtil.isEmpty(map.get(0))) { + //判断公厕编码不能为空 + continue; + } toilet.setCode(map.get(0).equals("") ? "" : map.get(0)); toilet.setName(map.get(1).equals("") ? "" : map.get(1)); toilet.setArea(map.get(2).equals("") ? null : new BigDecimal(map.get(2))); diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/TransferstationServiceImpl.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/TransferstationServiceImpl.java index d2bed16..fdc5bd4 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/TransferstationServiceImpl.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/TransferstationServiceImpl.java @@ -112,8 +112,11 @@ List> list = ExcelTool.readExcel(file); for (Map map : list) { - Transferstation transferstation = new Transferstation(); + if (ToolUtil.isEmpty(map.get(0))) { + //判断编码不能为空 + continue; + } transferstation.setCode(map.get(0).equals("") ? "" : map.get(0)); transferstation.setName(map.get(1).equals("") ? "" : map.get(1)); transferstation.setArea(map.get(2).equals("") ? null : new BigDecimal(map.get(2))); diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/WasteBinServiceImpl.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/WasteBinServiceImpl.java index 23b609f..868eae0 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/WasteBinServiceImpl.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/WasteBinServiceImpl.java @@ -126,6 +126,10 @@ //wastebinType for (Map map : list) { WasteBin wasteBin = new WasteBin(); + if (ToolUtil.isEmpty(map.get(0))) { + //判断编码不能为空 + continue; + } wasteBin.setCode(map.get(0).equals("") ? "" : map.get(0)); wasteBin.setName(map.get(1).equals("") ? "" : map.get(1)); wasteBin.setType(map.get(2).equals("") ? "" : convertDictValue(map.get(2), wastebinTypes, true)); diff --git a/casic-web/src/main/resources/config/application.yml b/casic-web/src/main/resources/config/application.yml index 1eb5923..a46282c 100644 --- a/casic-web/src/main/resources/config/application.yml +++ b/casic-web/src/main/resources/config/application.yml @@ -41,7 +41,7 @@ attend: log: roleTips: 凯盛普通人员 - interval: 3600 + interval: 3600 #秒 config: export-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\export\ config-path: E:\Develop\IdeaProject\smartcity\casic-smartcity-dcms\casic-web\src\main\resources\config\