From 0b0d96ad79042e25c9c56a4d9fe0f6a87b7bc13e Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 11 Apr 2022 16:44:47 +0800 Subject: [PATCH 001/127] =?UTF-8?q?=E5=B1=85=E6=B0=91=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E5=AF=B9=E7=84=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ic_resi_info_cid_for_easy_excel.xlsx | Bin 25245 -> 25318 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_info_cid_for_easy_excel.xlsx b/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_info_cid_for_easy_excel.xlsx index 5d92c7beb50ca7c80a9c831333c9637806a825c3..708221ffea64374b65e979e94d1fe6965cf20175 100644 GIT binary patch delta 7528 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 Date: Mon, 11 Apr 2022 16:49:57 +0800 Subject: [PATCH 002/127] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/controller/IcResiUserController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java index 1f0a127b5f..367a6f895e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java @@ -397,7 +397,7 @@ public class IcResiUserController implements ResultDataResolver { } /** - * desc:根据客户id 下载模版文件 如果不存在则返回null + * desc:根据客户id 先从oss下载模版,如果有没有则使用系统默认模板 如果不存在则返回null * * @param customerId * @return From ea836b57bf5fc295c84d4df373e0dd52a7d82eff Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 12 Apr 2022 11:11:25 +0800 Subject: [PATCH 003/127] sql --- .../main/resources/db/migration/V0.0.13__add_column_remark.sql | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.13__add_column_remark.sql diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.13__add_column_remark.sql b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.13__add_column_remark.sql new file mode 100644 index 0000000000..e69de29bb2 From 540692c2c84beb3c7d56b46749349fb187027adb Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Tue, 12 Apr 2022 12:50:17 +0800 Subject: [PATCH 004/127] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E5=B1=85?= =?UTF-8?q?=E6=B0=91=E4=BF=A1=E6=81=AF=E5=AF=BC=E5=85=A5=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD=20=E4=BF=AE=E6=94=B9=EF=BC=9A=E5=B1=85?= =?UTF-8?q?=E6=B0=91=E4=BF=A1=E6=81=AF=E5=AF=BC=E5=85=A5=EF=BC=8C=E5=A6=82?= =?UTF-8?q?=E6=9E=9C=E6=9C=AA=E5=85=A8=E6=88=90=E5=8A=9F=EF=BC=8C=E9=82=A3?= =?UTF-8?q?=E4=B9=88=E4=BF=9D=E7=95=99=E4=B8=B4=E6=97=B6=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E7=9A=84=E9=82=A3=E4=B8=AAexcel=E6=96=87=E4=BB=B6=EF=BC=8C?= =?UTF-8?q?=E4=BE=9B=E6=8E=92=E6=9F=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/IcResiUserController.java | 53 +++++++++--------- .../service/IcResiUserImportService.java | 2 +- .../impl/IcResiUserImportServiceImpl.java | 9 ++- ..._excel.xls => ic_resi_import_template.xls} | Bin 4 files changed, 35 insertions(+), 29 deletions(-) rename epmet-user/epmet-user-server/src/main/resources/excel/{ic_resi_info_import_cid_for_easy_excel.xls => ic_resi_import_template.xls} (100%) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java index 0bfc2fa442..f054e77608 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java @@ -72,6 +72,7 @@ import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; +import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.File; @@ -135,7 +136,7 @@ public class IcResiUserController implements ResultDataResolver { * 模板枚举 */ public enum IcUserTemplateEnums { - IC_RESI_IMPORT_TEMPLATE("excel/ic_resi_info_import_cid_for_easy_excel.xls", "居民信息导入模板.xls"), + IC_RESI_IMPORT_TEMPLATE("excel/ic_resi_import_template.xls", "居民信息导入模板.xls"), IC_RESI_EXPORT_TEMPLATE("excel/ic_resi_info_cid_for_easy_excel.xlsx", "居民信息导出模板.xlsx"); private String pathInApp; @@ -157,18 +158,13 @@ public class IcResiUserController implements ResultDataResolver { { // 初始化上传目录 - String home = System.getProperty("user.home"); - Path importDir = Paths.get(home, "epmet_files", "ic_user_import"); - if (Files.notExists(importDir)) { - try { - Files.createDirectories(importDir); - } catch (IOException e) { - log.error("创建数字赋能平台上传目录失败"); - } + try { + IC_RESI_UPLOAD_DIR = com.epmet.commons.tools.utils.FileUtils.getAndCreateDirUnderEpmetFilesDir("ic_user_import"); + } catch (IOException e) { + log.error("初始化居民信息上传目录失败:{}", ExceptionUtils.getErrorStackTrace(e)); } - IC_RESI_UPLOAD_DIR = importDir; - Path exportDir = Paths.get(home, "epmet_files", "ic_user_export"); + Path exportDir = Paths.get(System.getProperty("user.home"), "epmet_files", "ic_user_export"); if (Files.notExists(exportDir)) { try { Files.createDirectories(exportDir); @@ -469,10 +465,10 @@ public class IcResiUserController implements ResultDataResolver { // 三.异步执行导入 executorService.execute(() -> { - + boolean isAllSuccess = false; try { List formItemList = icResiUserService.listFormItems(customerId,IcFormCodeEnum.RESI_BASE_INFO.getCode()); - icResiUserImportService.importIcResiInfoFromExcel(importTaskId, formItemList, importTempFileSavePath.toString(), response, IC_RESI_UPLOAD_DIR); + isAllSuccess = icResiUserImportService.importIcResiInfoFromExcel(importTaskId, formItemList, importTempFileSavePath.toString(), response, IC_RESI_UPLOAD_DIR); } catch (Throwable e) { String errorMsg = ExceptionUtils.getThrowableErrorStackTrace(e); log.error("【导入居民信息失败】导入失败：{}", errorMsg); @@ -488,8 +484,13 @@ public class IcResiUserController implements ResultDataResolver { icResiUserImportService.finishImportTask(importTaskId, operatorId, ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL, resultDesc, null); } finally { try { + // 都导入成功了没问题，才删除 if (importTempFileSavePath != null){ - Files.delete(importTempFileSavePath); + if (isAllSuccess) { + Files.delete(importTempFileSavePath); + } else { + log.error("【导入居民信息】未完全成功，上传文件：{}", importTempFileSavePath); + } } } catch (IOException e) { log.error("【导入居民信息失败】清理上传的文件失败：{}", ExceptionUtils.getErrorStackTrace(e)); @@ -585,28 +586,30 @@ public class IcResiUserController implements ResultDataResolver { /** * 下载ic居民信息导入excel模板 - * @param loginUserInfo * @return */ @PostMapping("import/download-template") - public ResponseEntity downloadIcResiDownloadTemplate(@LoginUser TokenDto loginUserInfo) { - String customerId = loginUserInfo.getCustomerId(); - + public void downloadIcResiDownloadTemplate(HttpServletResponse response) { + InputStream is = null; + ServletOutputStream os = null; try { - File icResiImportTemplateFile = getIcResiTemplateFile(customerId, IcUserTemplateEnums.IC_RESI_IMPORT_TEMPLATE); + os = response.getOutputStream(); + + is = this.getClass().getClassLoader().getResourceAsStream(IcUserTemplateEnums.IC_RESI_IMPORT_TEMPLATE.getPathInApp()); - HttpHeaders headers = new HttpHeaders(); - headers.add("Access-Control-Expose-Headers", "Content-Disposition"); - headers.add("content-Type", "application/vnd.ms-excel"); - headers.add("Content-Disposition", "attachment;fileName=" + URLEncoder.encode(IcUserTemplateEnums.IC_RESI_IMPORT_TEMPLATE.getTemplateName(), "UTF-8")); + response.setHeader("Access-Control-Expose-Headers", "Content-Disposition"); + response.setHeader("content-Type", "application/vnd.ms-excel"); + response.setHeader("Content-Disposition", "attachment;fileName=" + URLEncoder.encode(IcUserTemplateEnums.IC_RESI_IMPORT_TEMPLATE.getTemplateName(), "UTF-8")); - return new ResponseEntity<>(FileUtil.readBytes(icResiImportTemplateFile), headers, HttpStatus.OK); + IOUtils.copy(is, os); } catch (Exception e) { String errorStackTrace = ExceptionUtils.getErrorStackTrace(e); - log.error("下载IC居民信息导入模板失败:{}", errorStackTrace); throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "下载IC居民信息导入模板失败"); + } finally { + org.apache.poi.util.IOUtils.closeQuietly(is); + org.apache.poi.util.IOUtils.closeQuietly(os); } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserImportService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserImportService.java index 05fb431c32..f3451f3e13 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserImportService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserImportService.java @@ -13,7 +13,7 @@ import java.util.List; */ public interface IcResiUserImportService { - void importIcResiInfoFromExcel(String importTaskId, List formItemList, String excelPathName, HttpServletResponse response, Path importTempPath); + boolean importIcResiInfoFromExcel(String importTaskId, List formItemList, String excelPathName, HttpServletResponse response, Path importTempPath); /** * 创建导入任务 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java index 44a6ee7a63..f17c6ad2d4 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java @@ -13,7 +13,6 @@ import com.epmet.bean.ResiImportChangedData; import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.constant.StrConstant; -import com.epmet.commons.tools.constant.ThreadLocalConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.dto.result.OptionResultDTO; import com.epmet.commons.tools.exception.EpmetErrorCode; @@ -24,7 +23,6 @@ import com.epmet.commons.tools.feign.ResultDataResolver; import com.epmet.commons.tools.redis.RedisKeys; import com.epmet.commons.tools.redis.RedisUtils; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; -import com.epmet.commons.tools.security.user.LoginUserUtil; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.EpmetRequestHolder; import com.epmet.commons.tools.utils.Result; @@ -211,9 +209,11 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res * @param formItemList item列表 * @param excelPathName excel缓存路径 * @param response 响应对象 + * @return */ @Override - public void importIcResiInfoFromExcel(String importTaskId, List formItemList, String excelPathName, HttpServletResponse response, Path importTempPath) { + public boolean importIcResiInfoFromExcel(String importTaskId, List formItemList, String excelPathName, HttpServletResponse response, Path importTempPath) { + boolean isAllSuccess = false; String app = EpmetRequestHolder.getHeader(AppClientConstant.APP); String client = EpmetRequestHolder.getHeader(AppClientConstant.CLIENT); @@ -276,6 +276,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res } finishImportTask(importTaskId, loginUserId, ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL,null, resultDescFilePath); } else { + isAllSuccess = true; finishImportTask(importTaskId, loginUserId, ImportTaskConstants.PROCESS_STATUS_FINISHED_SUCCESS,null, null); } @@ -298,6 +299,8 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res resiCategoryColumnNameAndLabel.remove(); itemIdAndOptionsCache.invalidateAll(); } + + return isAllSuccess; } /** diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_info_import_cid_for_easy_excel.xls b/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template.xls similarity index 100% rename from epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_info_import_cid_for_easy_excel.xls rename to epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template.xls From 8b73e7d5fa231df5a9de4ace4ef42f54108283a6 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 12 Apr 2022 13:35:08 +0800 Subject: [PATCH 005/127] =?UTF-8?q?28=E3=80=81=E4=BA=BA=E5=91=98=E7=B1=BB?= =?UTF-8?q?=E5=88=AB=E5=88=86=E6=9E=90=E4=B8=AD=E7=B1=BB=E5=88=AB=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=8F=8F=E8=BF=B0=E6=9B=B4=E6=94=B9=E4=B8=BA=E2=80=9C?= =?UTF-8?q?=E7=B1=BB=E5=88=AB=E5=8F=98=E6=9B=B4=EF=BC=9A=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=20=E2=80=9D=20=20=20=EF=BC=8C=20=20=E7=B1=BB=E5=88=AB=E5=87=8F?= =?UTF-8?q?=E5=B0=91=E6=8F=8F=E8=BF=B0=E6=9B=B4=E6=94=B9=E4=B8=BA=E2=80=9C?= =?UTF-8?q?=E7=B1=BB=E5=88=AB=E5=8F=98=E6=9B=B4=EF=BC=9A=E5=87=8F=E5=B0=91?= =?UTF-8?q?=20=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/IcUserChangeRecordServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeRecordServiceImpl.java index caca478526..bc88226da3 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeRecordServiceImpl.java @@ -136,9 +136,9 @@ public class IcUserChangeRecordServiceImpl extends BaseServiceImpl Date: Tue, 12 Apr 2022 13:39:03 +0800 Subject: [PATCH 006/127] =?UTF-8?q?21=E3=80=81=E4=BB=8E=E8=A1=8C=E7=A8=8B?= =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E4=B8=AD=E6=B7=BB=E5=8A=A0=E5=88=B0=E6=A0=B8?= =?UTF-8?q?=E9=85=B8=E6=A3=80=E6=B5=8B=E5=85=B3=E6=B3=A8=E5=90=8D=E5=8D=95?= =?UTF-8?q?=E7=9A=84=E4=BA=BA=E5=91=98=EF=BC=8C=E5=85=B3=E6=B3=A8=E5=8E=9F?= =?UTF-8?q?=E5=9B=A0=E9=BB=98=E8=AE=A4=E5=A1=AB=E5=86=99=E4=B8=BA=E2=80=9C?= =?UTF-8?q?=E6=9C=89=E9=87=8D=E7=82=B9=E5=8C=BA=E5=9F=9F=E8=A1=8C=E7=A8=8B?= =?UTF-8?q?=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/IcTripReportRecordServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java index 3766ee7baa..af4c3c0357 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java @@ -220,6 +220,7 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl Date: Tue, 12 Apr 2022 13:45:37 +0800 Subject: [PATCH 007/127] =?UTF-8?q?19=E3=80=81=E6=96=B0=E5=A2=9E=E8=A1=8C?= =?UTF-8?q?=E7=A8=8B=E8=AE=B0=E5=BD=95=E6=97=B6=EF=BC=8C=E7=8E=B0=E5=B1=85?= =?UTF-8?q?=E5=9C=B0=E9=BB=98=E8=AE=A4=E9=80=89=E4=B8=AD=E5=BD=93=E5=89=8D?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E4=BA=BA=E5=91=98=E6=89=80=E5=9C=A8=E7=BB=84?= =?UTF-8?q?=E7=BB=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/result/StaffBasicInfoResultDTO.java | 2 +- .../com/epmet/service/impl/CustomerStaffServiceImpl.java | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/StaffBasicInfoResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/StaffBasicInfoResultDTO.java index 52c432f810..c062414971 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/StaffBasicInfoResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/StaffBasicInfoResultDTO.java @@ -92,5 +92,5 @@ public class StaffBasicInfoResultDTO implements Serializable { */ private String latitude; - + private String areaCode; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java index 30203ef9bc..b534d917cb 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java @@ -25,12 +25,15 @@ 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.constant.ServiceConstant; +import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.ExceptionUtils; import com.epmet.commons.tools.exception.RenException; 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.AgencyInfoCache; import com.epmet.commons.tools.security.password.PasswordUtils; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.CpUserDetailRedis; @@ -741,6 +744,8 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl Date: Tue, 12 Apr 2022 13:49:10 +0800 Subject: [PATCH 008/127] =?UTF-8?q?=E6=96=B0=E5=A2=9Eremark?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/IcCommunitySelfOrganizationDTO.java | 5 +++++ .../AddCommunitySelfOrganizationFormDTO.java | 5 +++++ .../EditCommunitySelfOrganizationFormDTO.java | 5 +++++ .../CommunitySelfOrganizationListDTO.java | 5 +++++ .../IcCommunitySelfOrganizationEntity.java | 5 +++++ .../ExportCommunitySelfOrganizationExcel.java | 3 +++ .../ImportCommunitySelfOrganization.java | 3 +++ .../migration/V0.0.13__add_column_remark.sql | 1 + .../mapper/IcCommunitySelfOrganizationDao.xml | 1 + .../templates/self_org_import_template.xlsx | Bin 8897 -> 8929 bytes 10 files changed, 33 insertions(+) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcCommunitySelfOrganizationDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcCommunitySelfOrganizationDTO.java index 6be34cb9b8..52338da6e9 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcCommunitySelfOrganizationDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcCommunitySelfOrganizationDTO.java @@ -133,4 +133,9 @@ public class IcCommunitySelfOrganizationDTO implements Serializable { */ private Date updatedTime; + /** + * 备注 + */ + private String remark; + } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/AddCommunitySelfOrganizationFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/AddCommunitySelfOrganizationFormDTO.java index 302f3d08a4..2a693143d3 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/AddCommunitySelfOrganizationFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/AddCommunitySelfOrganizationFormDTO.java @@ -56,6 +56,11 @@ public class AddCommunitySelfOrganizationFormDTO implements Serializable { */ private String organizationCreatedTime; + /** + * 备注 + */ + private String remark; + /** * 经度 */ diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/EditCommunitySelfOrganizationFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/EditCommunitySelfOrganizationFormDTO.java index cade96113f..68d0176e35 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/EditCommunitySelfOrganizationFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/EditCommunitySelfOrganizationFormDTO.java @@ -68,6 +68,11 @@ public class EditCommunitySelfOrganizationFormDTO implements Serializable { */ private String latitude; + /** + * 备注 + */ + private String remark; + /** * 社区自组织ID */ diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/CommunitySelfOrganizationListDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/CommunitySelfOrganizationListDTO.java index 522da610d1..841313378e 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/CommunitySelfOrganizationListDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/CommunitySelfOrganizationListDTO.java @@ -53,6 +53,11 @@ public class CommunitySelfOrganizationListDTO implements Serializable { */ private String organizationCreatedTime; + /** + * 备注 + */ + private String remark; + /** * 经度 */ diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcCommunitySelfOrganizationEntity.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcCommunitySelfOrganizationEntity.java index b66e6a0773..fa00ec37e8 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcCommunitySelfOrganizationEntity.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcCommunitySelfOrganizationEntity.java @@ -106,4 +106,9 @@ public class IcCommunitySelfOrganizationEntity extends BaseEpmetEntity { */ private String latitude; + /** + * 备注 + */ + private String remark; + } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/ExportCommunitySelfOrganizationExcel.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/ExportCommunitySelfOrganizationExcel.java index 1822610552..fdf33d7b48 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/ExportCommunitySelfOrganizationExcel.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/ExportCommunitySelfOrganizationExcel.java @@ -31,6 +31,9 @@ public class ExportCommunitySelfOrganizationExcel { @Excel(name = "创建时间", width = 20, needMerge = true) private String organizationCreatedTime; + @Excel(name = "备注", width = 60, needMerge = true) + private String remark; + @ExcelCollection(name = "组织成员") private List organizationPersonnel; diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/ImportCommunitySelfOrganization.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/ImportCommunitySelfOrganization.java index a6c6102431..25a8f27af9 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/ImportCommunitySelfOrganization.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/ImportCommunitySelfOrganization.java @@ -40,6 +40,9 @@ public class ImportCommunitySelfOrganization extends ExcelVerifyInfo { @Excel(name = "创建时间", needMerge = true) private String organizationCreatedTime; + @Excel(name = "备注", needMerge = true) + private String remark; + @ExcelCollection(name = "组织成员") private List persons; diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.13__add_column_remark.sql b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.13__add_column_remark.sql index e69de29bb2..9a747fa8a4 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.13__add_column_remark.sql +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.13__add_column_remark.sql @@ -0,0 +1 @@ +alter table ic_community_self_organization add COLUMN REMARK VARCHAR(500) comment '备注' AFTER ORGANIZATION_CREATED_TIME; \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcCommunitySelfOrganizationDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcCommunitySelfOrganizationDao.xml index d2575e0af0..e2d2d0ea17 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcCommunitySelfOrganizationDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcCommunitySelfOrganizationDao.xml @@ -14,6 +14,7 @@ LONGITUDE = #{longitude}, LATITUDE = #{latitude}, ORGANIZATION_CREATED_TIME = #{organizationCreatedTime}, + REMARK = #{remark}, UPDATED_TIME = NOW(), UPDATED_BY = #{updatedBy} WHERE DEL_FLAG = 0 diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/templates/self_org_import_template.xlsx b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/templates/self_org_import_template.xlsx index aa0edb41674bd700b187f4f2920101612458ff9f..0893eff4043bcfe48484b01b71c8565b4ac31a24 100644 GIT binary patch delta 4909 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 Date: Tue, 12 Apr 2022 14:16:22 +0800 Subject: [PATCH 009/127] =?UTF-8?q?24=E3=80=81=E5=B0=8F=E5=8C=BA=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=96=B0=E5=A2=9E=E6=88=BF=E5=B1=8B=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E5=87=BA=E7=A7=9F=E6=9B=B4=E6=94=B9=E4=B8=BA=E6=88=BF=E5=B1=8B?= =?UTF-8?q?=E7=8A=B6=E6=80=81=EF=BC=9A=E5=87=BA=E7=A7=9F=E3=80=81=E9=97=B2?= =?UTF-8?q?=E7=BD=AE=E3=80=81=E8=87=AA=E4=BD=8F=EF=BC=9B=E5=8E=86=E5=8F=B2?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=B8=AD=E6=98=AF--=E5=87=BA=E7=A7=9F?= =?UTF-8?q?=EF=BC=8C=E5=90=A6--=E8=87=AA=E4=BD=8F=EF=BC=8C=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E9=80=89=E4=B8=AD=E8=87=AA=E4=BD=8F=EF=BC=9B=E6=88=BF?= =?UTF-8?q?=E5=B1=8B=E6=9F=A5=E8=AF=A2=E5=A2=9E=E5=8A=A0=E6=88=BF=E5=B1=8B?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E7=9A=84=E6=9F=A5=E8=AF=A2=EF=BC=8C=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=AF=B9=E5=BA=94=E6=88=BF=E5=B1=8B=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/form/IcHouseFormDTO.java | 4 ++-- .../com/epmet/dto/form/ListIcNeighborHoodFormDTO.java | 4 ++++ .../src/main/java/com/epmet/enums/HouseRentFlagEnums.java | 8 ++++++-- .../main/java/com/epmet/controller/HouseController.java | 7 +++---- .../src/main/java/com/epmet/dao/IcHouseDao.java | 3 ++- .../src/main/java/com/epmet/service/HouseService.java | 3 ++- .../java/com/epmet/service/impl/HouseServiceImpl.java | 5 +++-- .../src/main/resources/mapper/IcHouseDao.xml | 7 +++++-- 8 files changed, 27 insertions(+), 14 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseFormDTO.java index fb679755d7..5fe1c6c4db 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseFormDTO.java @@ -79,9 +79,9 @@ public class IcHouseFormDTO implements Serializable { private String purpose; /** - * 1出租；0未出租 + * 1：出租 0：自住 2：闲置 */ - @NotNull(message = "是否出租不能为空", groups = {AddShowGroup.class, UpdateShowGroup.class}) + @NotNull(message = "房屋状态不能为空", groups = {AddShowGroup.class, UpdateShowGroup.class}) private Integer rentFlag; /** diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/ListIcNeighborHoodFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/ListIcNeighborHoodFormDTO.java index 402c86c868..613ee6f3d2 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/ListIcNeighborHoodFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/ListIcNeighborHoodFormDTO.java @@ -62,6 +62,10 @@ public class ListIcNeighborHoodFormDTO implements Serializable{ * 房主电话 */ private String ownerPhone; + /** + * 房屋状态 【1：出租 0：自住 2：闲置】 + */ + private String rentFlag; /** * 数据类型【小区：neighbourHood，楼栋：building，房屋：house】 */ diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/enums/HouseRentFlagEnums.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/enums/HouseRentFlagEnums.java index 618be0ea9a..27cd699bf3 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/enums/HouseRentFlagEnums.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/enums/HouseRentFlagEnums.java @@ -3,8 +3,12 @@ package com.epmet.enums; import org.springframework.util.StringUtils; public enum HouseRentFlagEnums { - YES(1,"是"), - NO(0,"否"); + //原有的房屋出租状态是否改为房屋状态【1：出租 0：自住 2：闲置】 + /*YES(1,"是"), + NO(0,"否");*/ + HOUSE_ZZ(0,"自住"), + HOUSE_CZ(1,"出租"), + HOUSE_XZ(2,"闲置"); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java index 09f29f5330..369fa24d40 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java @@ -92,9 +92,8 @@ public class HouseController implements ResultDataResolver { String queryScene = "house_manage"; IcNeighborHoodResultDTO icNeighborHoodResultDTO = houseService.listNeighborhood(null, formDTO.getBuildingId(), formDTO.getOwnerName(), - formDTO.getOwnerPhone(), null, - null, queryScene, - formDTO.getPageNo(), formDTO.getPageSize()); + formDTO.getOwnerPhone(), null, null, queryScene, + formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getRentFlag()); return new Result().ok(icNeighborHoodResultDTO); } @@ -142,7 +141,7 @@ public class HouseController implements ResultDataResolver { null); IcNeighborHoodResultDTO icNeighborHoodResultDTO = houseService.listNeighborhood(loginUserDetail.getAgencyId(),null, null, null, - neighborhoodName, buildingName, scene, formDTO.getPageNo(), formDTO.getPageSize()); + neighborhoodName, buildingName, scene, formDTO.getPageNo(), formDTO.getPageSize(), null); return new Result().ok(icNeighborHoodResultDTO); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java index c5a392e6ca..ed7ba8a969 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java @@ -38,7 +38,8 @@ public interface IcHouseDao extends BaseDao { @Param("ownerPhone") String ownerPhone, @Param("neighborHoodName") String neighborHoodName, @Param("buildingName") String buildingName, - @Param("queryScene") String queryScene); + @Param("queryScene") String queryScene, + @Param("rentFlag") String rentFlag); List searchAllHouse(@Param("house") IcHouseEntity house); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java index a651ed1615..71c435bdf8 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java @@ -62,7 +62,8 @@ public interface HouseService { String buildingName, String queryScene, Integer pageNo, - Integer pageSize); + Integer pageSize, + String rentFlag); void exportBuildinginfo(ListIcNeighborHoodFormDTO formDTO, HttpServletResponse response) throws Exception; diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java index 03458a90fd..04890b50a1 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java @@ -256,7 +256,8 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { String buildingName, String queryScene, Integer pageNo, - Integer pageSize) { + Integer pageSize, + String rentFlag) { IcNeighborHoodResultDTO result = new IcNeighborHoodResultDTO(); //如果类型是house 查房屋 //IPage> resultMap = searchHouse(buildingId, ownerName, ownerPhone, neighborHoodName, buildingName, pageNo, pageSize); @@ -280,7 +281,7 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { IPage page = new Page(pageNo,pageSize); - IPage> mapIPage = icHouseDao.searchHouseByPage(page, pids, buildingId, ownerName, ownerPhone, neighborHoodName, buildingName, queryScene); + IPage> mapIPage = icHouseDao.searchHouseByPage(page, pids, buildingId, ownerName, ownerPhone, neighborHoodName, buildingName, queryScene, rentFlag); List> records = mapIPage.getRecords(); records.forEach(item->{ item.put("houseType", HouseTypeEnums.getTypeValue(item.get("houseTypeKey"))); diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml index 0db3dfa93e..fc49465d73 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml @@ -154,7 +154,7 @@ b.BUILDING_NAME as buildingName, d.UNIT_NUM as unitNum, a.DOOR_NAME as doorName, - if(a.RENT_FLAG=1,'是','否') as rentFlag, + if(a.RENT_FLAG=0,'自住',if(a.RENT_FLAG=1,'出租','闲置')) as rentFlag, a.OWNER_NAME as ownerName, /*a.RENT_FLAG as rentFlag, a.PURPOSE as purpose,*/ @@ -197,6 +197,9 @@ AND b.BUILDING_NAME like CONCAT('%',#{buildingName},'%') + + AND a.rent_flag = #{rentFlag} + /*排序规则：如果是社区查询则根据小区、楼栋、单元、房屋名字分别升序排序*/ @@ -220,7 +223,7 @@ a.DOOR_NAME as doorName, a.HOUSE_TYPE as houseType, a.PURPOSE as purpose, - if(a.RENT_FLAG=1,'是','否') as rentFlag, + if(a.RENT_FLAG=0,'自住',if(a.RENT_FLAG=1,'出租','闲置')) as rentFlag, a.OWNER_NAME as ownerName, a.OWNER_PHONE as ownerPhone, a.OWNER_ID_CARD as ownerIdCard, From b805ecd365bb6935ad04b10e4b53da0e20566e10 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 12 Apr 2022 14:26:34 +0800 Subject: [PATCH 010/127] =?UTF-8?q?29=E3=80=81=E5=88=9D=E5=BF=83=E4=BA=92?= =?UTF-8?q?=E5=8A=A9=E4=B8=AD=E5=85=AC=E7=9B=8A=E8=BE=BE=E4=BA=BA=E3=80=81?= =?UTF-8?q?=E5=85=9A=E5=91=98=E5=85=88=E9=94=8B=E6=8E=92=E8=A1=8C=EF=BC=8C?= =?UTF-8?q?0=E5=88=86=E4=BA=BA=E5=91=98=E4=B8=8D=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E5=9C=A8=E6=A6=9C=E5=8D=95=E4=B8=8A=EF=BC=8C=E6=A6=9C=E5=8D=95?= =?UTF-8?q?=E4=B8=8A=E6=88=90=E5=91=98=E7=82=B9=E5=87=BB=E5=A7=93=E5=90=8D?= =?UTF-8?q?=E5=8F=AF=E6=9F=A5=E7=9C=8B=E6=9B=B4=E5=A4=9A=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml index 2851c5a835..add7341a75 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml @@ -163,6 +163,7 @@ WHERE u.del_flag = '0' AND PARTY_FLAG = 0 + AND u.point_total > 0 AND u.all_parent_ids LIKE CONCAT('%',#{orgId},'%') @@ -207,6 +208,7 @@ WHERE u.del_flag = '0' AND party_flag = '1' + and u.point_total > 0 AND u.all_parent_ids LIKE CONCAT('%',#{orgId},'%') From 9806a961b5b60542e84f1f8ed6c80d0b8b0a63b3 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 12 Apr 2022 14:47:12 +0800 Subject: [PATCH 011/127] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CommunitySelfOrganizationListDTO.java | 1 + .../mapper/IcCommunitySelfOrganizationDao.xml | 3 +- .../dto/form/ListIcNeighborHoodFormDTO.java | 5 +++ .../com/epmet/controller/HouseController.java | 7 ++-- .../main/java/com/epmet/dao/IcHouseDao.java | 4 ++- .../java/com/epmet/service/HouseService.java | 2 ++ .../epmet/service/impl/HouseServiceImpl.java | 36 +++++++++++-------- .../src/main/resources/mapper/IcHouseDao.xml | 20 ++++++++--- 8 files changed, 54 insertions(+), 24 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/CommunitySelfOrganizationListDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/CommunitySelfOrganizationListDTO.java index 841313378e..b7a7627030 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/CommunitySelfOrganizationListDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/CommunitySelfOrganizationListDTO.java @@ -92,6 +92,7 @@ public class CommunitySelfOrganizationListDTO implements Serializable { this.longitude = ""; this.latitude = ""; this.orgId = ""; + this.remark = ""; this.score = NumConstant.ZERO; this.organizationPersonnel = new ArrayList<>(); } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcCommunitySelfOrganizationDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcCommunitySelfOrganizationDao.xml index e2d2d0ea17..2099c1cce3 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcCommunitySelfOrganizationDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcCommunitySelfOrganizationDao.xml @@ -53,7 +53,8 @@ so.SERVICE_ITEM AS serviceItem, so.LONGITUDE AS longitude, so.LATITUDE AS latitude, - so.ID as orgId + so.ID as orgId, + so.remark FROM ic_community_self_organization so WHERE so.DEL_FLAG = 0 AND so.ORG_ID = #{agencyId} diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/ListIcNeighborHoodFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/ListIcNeighborHoodFormDTO.java index 613ee6f3d2..6f25dce319 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/ListIcNeighborHoodFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/ListIcNeighborHoodFormDTO.java @@ -85,5 +85,10 @@ public class ListIcNeighborHoodFormDTO implements Serializable{ */ private String keyword; + /** + * 1：出租 0：自住 2：闲置 + */ + private String rentFlag; + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java index 369fa24d40..d001801185 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java @@ -92,8 +92,9 @@ public class HouseController implements ResultDataResolver { String queryScene = "house_manage"; IcNeighborHoodResultDTO icNeighborHoodResultDTO = houseService.listNeighborhood(null, formDTO.getBuildingId(), formDTO.getOwnerName(), - formDTO.getOwnerPhone(), null, null, queryScene, - formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getRentFlag()); + formDTO.getOwnerPhone(), null, + null, queryScene, + formDTO.getPageNo(), formDTO.getPageSize(),formDTO.getId(),formDTO.getLevel(),formDTO.getRentFlag()); return new Result().ok(icNeighborHoodResultDTO); } @@ -141,7 +142,7 @@ public class HouseController implements ResultDataResolver { null); IcNeighborHoodResultDTO icNeighborHoodResultDTO = houseService.listNeighborhood(loginUserDetail.getAgencyId(),null, null, null, - neighborhoodName, buildingName, scene, formDTO.getPageNo(), formDTO.getPageSize(), null); + neighborhoodName, buildingName, scene, formDTO.getPageNo(), formDTO.getPageSize(),null,null,null); return new Result().ok(icNeighborHoodResultDTO); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java index ed7ba8a969..7738139521 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java @@ -39,7 +39,9 @@ public interface IcHouseDao extends BaseDao { @Param("neighborHoodName") String neighborHoodName, @Param("buildingName") String buildingName, @Param("queryScene") String queryScene, - @Param("rentFlag") String rentFlag); + @Param("id")String id, + @Param("level")String level, + @Param("rentFlag")String rentFlag); List searchAllHouse(@Param("house") IcHouseEntity house); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java index 71c435bdf8..59e7e3c973 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java @@ -63,6 +63,8 @@ public interface HouseService { String queryScene, Integer pageNo, Integer pageSize, + String id, + String level, String rentFlag); void exportBuildinginfo(ListIcNeighborHoodFormDTO formDTO, HttpServletResponse response) throws Exception; diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java index 04890b50a1..cbf82419a4 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java @@ -257,7 +257,7 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { String queryScene, Integer pageNo, Integer pageSize, - String rentFlag) { + String id,String level, String rentFlag) { IcNeighborHoodResultDTO result = new IcNeighborHoodResultDTO(); //如果类型是house 查房屋 //IPage> resultMap = searchHouse(buildingId, ownerName, ownerPhone, neighborHoodName, buildingName, pageNo, pageSize); @@ -265,23 +265,15 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { // 查询pids String pids = null; if (StringUtils.isNotBlank(ancestorAgencyId)) { - CustomerAgencyDTO agency = agencyservice.getAgencyById(ancestorAgencyId); - - if (agency == null) { - throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "【社区查询-查询房屋列表】查询当前staff所属组织信息失败"); - } - - - if (NumConstant.ZERO_STR.equals(agency.getPid())) { - pids = ancestorAgencyId; - } else { - pids = agency.getPids().concat(StrConstant.COLON).concat(ancestorAgencyId); - } + pids = getPids(ancestorAgencyId); + } + if (StringUtils.isNotBlank(level) && level.equals("agency")){ + pids = getPids(ancestorAgencyId); } IPage page = new Page(pageNo,pageSize); - IPage> mapIPage = icHouseDao.searchHouseByPage(page, pids, buildingId, ownerName, ownerPhone, neighborHoodName, buildingName, queryScene, rentFlag); + IPage> mapIPage = icHouseDao.searchHouseByPage(page, pids, buildingId, ownerName, ownerPhone, neighborHoodName, buildingName, queryScene,id,level,rentFlag); List> records = mapIPage.getRecords(); records.forEach(item->{ item.put("houseType", HouseTypeEnums.getTypeValue(item.get("houseTypeKey"))); @@ -292,6 +284,22 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { result.setList(records); return result; } + public String getPids(String agencyId){ + String pids = null; + CustomerAgencyDTO agency = agencyservice.getAgencyById(agencyId); + + if (agency == null) { + throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "【社区查询-查询房屋列表】查询当前staff所属组织信息失败"); + } + + + if (NumConstant.ZERO_STR.equals(agency.getPid())) { + pids = agencyId; + } else { + pids = agency.getPids().concat(StrConstant.COLON).concat(agencyId); + } + return pids; + } @Override public void exportBuildinginfo(ListIcNeighborHoodFormDTO formDTO, HttpServletResponse response) throws Exception { diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml index fc49465d73..9150a4f6fc 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml @@ -175,16 +175,26 @@ LEFT JOIN ic_neighbor_hood c on a.NEIGHBOR_HOOD_ID = c.ID and c.DEL_FLAG = '0' LEFT JOIN ic_building_unit d on a.BUILDING_UNIT_ID = d.ID and d.DEL_FLAG = '0' - a.del_flag = '0' + a.del_flag = '0' - and case c.AGENCY_PIDS - when '' then CONCAT(c.AGENCY_ID) like CONCAT(#{pids}, '%') - else CONCAT(c.AGENCY_PIDS, ':', c.AGENCY_ID) like CONCAT(#{pids}, '%') - end + and case c.AGENCY_PIDS when '' then CONCAT(c.AGENCY_ID) like CONCAT(#{pids}, '%') + else CONCAT(c.AGENCY_PIDS, ':', c.AGENCY_ID) like CONCAT(#{pids}, '%') end AND a.BUILDING_ID = #{buildingId} + + AND c.GRID_ID = #{id} + + + AND c.id = #{id} + + + AND b.id = #{id} + + + AND a.RENT_FLAG = #{rentFlag} + AND a.OWNER_NAME like concat('%',#{ownerName},'%') From 006d263997d2bf202509fd2d60cf8ea63fd12fe4 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 12 Apr 2022 14:55:21 +0800 Subject: [PATCH 012/127] areaCodePath --- .../redis/common/bean/AgencyInfoCache.java | 6 ++ .../entity/govorg/CustomerAgencyEntity.java | 7 ++ .../govorg/impl/GovOrgServiceImpl.java | 76 ++++++++++--------- .../dto/result/StaffBasicInfoResultDTO.java | 5 +- .../impl/CustomerStaffServiceImpl.java | 2 +- 5 files changed, 58 insertions(+), 38 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/AgencyInfoCache.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/AgencyInfoCache.java index 684440db65..1a842d3987 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/AgencyInfoCache.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/AgencyInfoCache.java @@ -4,6 +4,7 @@ import lombok.Data; import java.io.Serializable; import java.util.Date; +import java.util.List; /** * @Author zxc @@ -59,6 +60,11 @@ public class AgencyInfoCache implements Serializable { */ private String areaCode; + /** + * 地区编码全路径：例如：37,3702,370203,370203005,370203005015 + */ + private List areaCodePath; + /** * 删除标识 */ diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/CustomerAgencyEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/CustomerAgencyEntity.java index 171e01198f..28bf2d90a8 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/CustomerAgencyEntity.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/CustomerAgencyEntity.java @@ -22,6 +22,8 @@ import com.epmet.commons.mybatis.entity.BaseEpmetEntity; import lombok.Data; import lombok.EqualsAndHashCode; +import java.util.List; + /** * 机关单位信息表 * @@ -74,6 +76,11 @@ public class CustomerAgencyEntity extends BaseEpmetEntity { */ private String areaCode; + /** + * 地区编码全路径：例如：37,3702,370203,370203005,370203005015 + */ + private List areaCodePath; + /** * 总人数 */ diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java index 4d1b356fd3..dd8f54cab7 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java @@ -6,6 +6,7 @@ import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; import com.alibaba.fastjson.JSON; import com.dingtalk.api.request.OapiRobotSendRequest; import com.epmet.commons.dynamic.datasource.annotation.DataSource; +import com.epmet.commons.tools.constant.Constant; import com.epmet.commons.tools.constant.DingDingRobotConstant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; @@ -250,41 +251,6 @@ public class GovOrgServiceImpl implements GovOrgService { return result; } - public static void main(String[] args) { - List allList = new ArrayList<>(); - NextAreaCodeResultDTO m1 = new NextAreaCodeResultDTO(); - m1.setAreaCode("1"); - m1.setAreaName("a"); - allList.add(m1); - - NextAreaCodeResultDTO m2 = new NextAreaCodeResultDTO(); - m2.setAreaCode("2"); - m2.setAreaName("b"); - allList.add(m2); - - - NextAreaCodeResultDTO m3 = new NextAreaCodeResultDTO(); - m3.setAreaCode("3"); - m3.setAreaName("c"); - allList.add(m3); - - List stringList = new ArrayList<>(); - stringList.add("1"); - stringList.add("2"); - - Iterator iterator = allList.iterator(); - while (iterator.hasNext()) { - NextAreaCodeResultDTO next = iterator.next(); - for (String usedAreaCode : stringList) { - if (next.getAreaCode().equals(usedAreaCode)) { - iterator.remove(); - } - } - - } - System.out.println(JSON.toJSONString(allList, true)); - } - /** * @param staffId * @Author sun @@ -643,7 +609,45 @@ public class GovOrgServiceImpl implements GovOrgService { */ @Override public CustomerAgencyEntity getAgencyInfo(String agencyId) { - return customerAgencyDao.selectById(agencyId); + CustomerAgencyEntity customerAgencyEntity=customerAgencyDao.selectById(agencyId); + //设置行政地区编码全路径 + if (StringUtils.isNotBlank(customerAgencyEntity.getAreaCode()) && StringUtils.isNotBlank(customerAgencyEntity.getParentAreaCode())) { + customerAgencyEntity.setAreaCodePath(queryAreaCodePath(customerAgencyEntity)); + } + + return customerAgencyEntity; + } + + private List queryAreaCodePath(CustomerAgencyEntity customerAgencyEntity) { + List areaCodePath = new ArrayList<>(); + switch (customerAgencyEntity.getLevel()) { + case Constant.COMMUNITY: + areaCodePath.add(customerAgencyEntity.getAreaCode().substring(NumConstant.ZERO, NumConstant.TWO)); + areaCodePath.add(customerAgencyEntity.getAreaCode().substring(NumConstant.ZERO, NumConstant.FOUR)); + areaCodePath.add(customerAgencyEntity.getAreaCode().substring(NumConstant.ZERO, NumConstant.SIX)); + areaCodePath.add(customerAgencyEntity.getParentAreaCode()); + areaCodePath.add(customerAgencyEntity.getAreaCode()); + break; + case Constant.STREET: + areaCodePath.add(customerAgencyEntity.getAreaCode().substring(NumConstant.ZERO, NumConstant.TWO)); + areaCodePath.add(customerAgencyEntity.getAreaCode().substring(NumConstant.ZERO, NumConstant.FOUR)); + areaCodePath.add(customerAgencyEntity.getParentAreaCode()); + areaCodePath.add(customerAgencyEntity.getAreaCode()); + break; + case Constant.DISTRICT: + areaCodePath.add(customerAgencyEntity.getAreaCode().substring(NumConstant.ZERO, NumConstant.TWO)); + areaCodePath.add(customerAgencyEntity.getParentAreaCode()); + areaCodePath.add(customerAgencyEntity.getAreaCode()); + break; + case Constant.CITY: + areaCodePath.add(customerAgencyEntity.getParentAreaCode()); + areaCodePath.add(customerAgencyEntity.getAreaCode()); + break; + case Constant.PROVINCE: + areaCodePath.add(customerAgencyEntity.getAreaCode()); + break; + } + return areaCodePath; } /** diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/StaffBasicInfoResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/StaffBasicInfoResultDTO.java index c062414971..33416972ae 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/StaffBasicInfoResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/StaffBasicInfoResultDTO.java @@ -92,5 +92,8 @@ public class StaffBasicInfoResultDTO implements Serializable { */ private String latitude; - private String areaCode; + /** + * 地区编码全路径：例如：37,3702,370203,370203005,370203005015 + */ + private List areaCodePath; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java index b534d917cb..2991b7e39c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java @@ -745,7 +745,7 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl()); } //获取工作人员所属客户名 CustomerDTO dto = new CustomerDTO(); From 784881e7fce4328074c6512b1b614df56e684bca Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 12 Apr 2022 15:01:13 +0800 Subject: [PATCH 013/127] =?UTF-8?q?=E8=81=94=E5=BB=BA=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BD=91=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/IcPartyActivityDTO.java | 3 +- .../epmet/dto/form/PartyActivityFormDTO.java | 1 + .../dto/form/work/PublishActInfoFormDTO.java | 2 +- .../epmet/dto/form/work/RePublishFormDTO.java | 2 ++ .../work/CanceledActDetailResultDTO.java | 2 ++ .../work/FinishedActDetailResultDTO.java | 3 ++ .../work/InProgressActDetailResultDTO.java | 3 ++ .../result/work/ReEditActInfoResultDTO.java | 3 ++ .../epmet/entity/IcPartyActivityEntity.java | 2 +- .../impl/IcPartyActivityServiceImpl.java | 28 +++++++++++++++ .../service/impl/WorkActServiceImpl.java | 34 +++++++++++++++++++ .../resources/mapper/IcPartyActivityDao.xml | 3 ++ 12 files changed, 83 insertions(+), 3 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyActivityDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyActivityDTO.java index bcb04fb6ef..23451a79d7 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyActivityDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyActivityDTO.java @@ -57,7 +57,8 @@ public class IcPartyActivityDTO implements Serializable { */ @JsonIgnore private String agencyId; - + private String gridId; + private String gridName; /** * 组织的所有上级 */ diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyActivityFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyActivityFormDTO.java index 1f108568e1..0481b07fc4 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyActivityFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyActivityFormDTO.java @@ -19,6 +19,7 @@ public class PartyActivityFormDTO implements Serializable { private static final long serialVersionUID = -2510068555703677L; @NotBlank(message = "组织Id不能为空" ) private String agencyId; + private String gridId; private String unitId; private String title; @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/PublishActInfoFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/PublishActInfoFormDTO.java index 099fa38e60..57e0358505 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/PublishActInfoFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/PublishActInfoFormDTO.java @@ -36,7 +36,7 @@ public class PublishActInfoFormDTO implements Serializable { * 活动草稿id,如果是编辑之前的活动草稿，此列是有值的 */ private String actDraftId; - + private String gridId; /** * 客户id */ diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/RePublishFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/RePublishFormDTO.java index 587a60a0ff..7dfc46329f 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/RePublishFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/RePublishFormDTO.java @@ -36,6 +36,8 @@ public class RePublishFormDTO implements Serializable { */ private String actDraftId; + private String gridId; + /** * 活动id */ diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/CanceledActDetailResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/CanceledActDetailResultDTO.java index 764d3ffabf..61f6eae029 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/CanceledActDetailResultDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/CanceledActDetailResultDTO.java @@ -153,6 +153,8 @@ public class CanceledActDetailResultDTO implements Serializable { */ private String actType; + private String gridId; + private String gridName; /** * 联建单位 */ diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/FinishedActDetailResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/FinishedActDetailResultDTO.java index 5bf9c4bfb1..26aa13d4a1 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/FinishedActDetailResultDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/FinishedActDetailResultDTO.java @@ -142,6 +142,9 @@ public class FinishedActDetailResultDTO implements Serializable { */ private String actType; + private String gridId; + private String gridName; + /** * 联建单位 */ diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/InProgressActDetailResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/InProgressActDetailResultDTO.java index 03fdbf576b..f220f19a96 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/InProgressActDetailResultDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/InProgressActDetailResultDTO.java @@ -137,6 +137,9 @@ public class InProgressActDetailResultDTO implements Serializable { */ private String actType; + private String gridId; + private String gridName; + /** * 联建单位 */ diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/ReEditActInfoResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/ReEditActInfoResultDTO.java index 367ab0ec1d..e4db367ee0 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/ReEditActInfoResultDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/ReEditActInfoResultDTO.java @@ -154,6 +154,9 @@ public class ReEditActInfoResultDTO implements Serializable { */ private String actType; + private String gridId; + private String gridName; + /** * 联建单位 */ diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcPartyActivityEntity.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcPartyActivityEntity.java index 4919fdd133..da03e372e7 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcPartyActivityEntity.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcPartyActivityEntity.java @@ -47,7 +47,7 @@ public class IcPartyActivityEntity extends BaseEpmetEntity { * 组织ID */ private String agencyId; - + private String gridId; /** * 组织的所有上级 */ diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java index b72739dbbc..ce0b172893 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java @@ -28,7 +28,9 @@ import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.exception.ExceptionUtils; import com.epmet.commons.tools.exception.RenException; 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.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.DateUtils; @@ -123,6 +125,12 @@ public class IcPartyActivityServiceImpl extends BaseServiceImpl unitIds = Arrays.asList(dto.getUnitId().split(StrConstant.COMMA)); List unitNames = unitIds.stream().map(option::get).collect(Collectors.toList()); dto.setUnitName(StringUtils.join(unitNames, StrConstant.COMMA)); + if (StringUtils.isNotEmpty(dto.getGridId())) { + GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(dto.getGridId()); + if (null != gridInfo) { + dto.setGridName(gridInfo.getGridName()); + } + } }); } @@ -150,6 +158,12 @@ public class IcPartyActivityServiceImpl extends BaseServiceImpl unitIds = Arrays.asList(dto.getUnitId().split(StrConstant.COMMA)); List unitNames = unitIds.stream().map(option::get).collect(Collectors.toList()); dto.setUnitName(StringUtils.join(unitNames, StrConstant.COMMA)); + if (StringUtils.isNotEmpty(dto.getGridId())) { + GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(dto.getGridId()); + if (null != gridInfo) { + dto.setGridName(gridInfo.getGridName()); + } + } }); } @@ -171,6 +185,12 @@ public class IcPartyActivityServiceImpl extends BaseServiceImpl serviceNames = services.stream().map(categoryMap::get).collect(Collectors.toList()); dto.setServiceMatterList(services); dto.setServiceMatterNameList(serviceNames); + if (StringUtils.isNotEmpty(dto.getGridId())) { + GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(dto.getGridId()); + if (null != gridInfo) { + dto.setGridName(gridInfo.getGridName()); + } + } //获取单位 //获取组织下联建单位 @@ -547,6 +567,14 @@ public class IcPartyActivityServiceImpl extends BaseServiceImpl services = Arrays.asList(dto.getServiceMatter().split(StrConstant.COMMA)); List serviceNames = services.stream().map(categoryMap::get).collect(Collectors.toList()); dto.setServiceMatterName(StringUtils.join(serviceNames, StrConstant.SEMICOLON)); + + if (StringUtils.isNotEmpty(dto.getGridId())) { + GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(dto.getGridId()); + if (null != gridInfo) { + dto.setGridName(gridInfo.getGridName()); + } + } + }); } PageInfo pageInfo = new PageInfo<>(dtoList); diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java index 7ab8dc2e52..e12a501ae1 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java @@ -9,6 +9,8 @@ import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.form.mq.eventmsg.BasePointEventMsg; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.RenException; +import com.epmet.commons.tools.redis.common.CustomerOrgRedis; +import com.epmet.commons.tools.redis.common.bean.GridInfoCache; import com.epmet.commons.tools.scan.param.ImgScanParamDTO; import com.epmet.commons.tools.scan.param.ImgTaskDTO; import com.epmet.commons.tools.scan.param.TextScanParamDTO; @@ -832,6 +834,14 @@ public class WorkActServiceImpl implements WorkActService { List unitNames = unitIds.stream().map(option::get).collect(Collectors.toList()); canceledActDetailResultDTO.setUnitIdList(unitIds); canceledActDetailResultDTO.setUnitNameList(unitNames); + + if (StringUtils.isNotEmpty(dto.getGridId())) { + canceledActDetailResultDTO.setGridId(dto.getGridId()); + GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(dto.getGridId()); + if (null != gridInfo) { + canceledActDetailResultDTO.setGridName(gridInfo.getGridName()); + } + } } } } @@ -897,6 +907,14 @@ public class WorkActServiceImpl implements WorkActService { List unitNames = unitIds.stream().map(option::get).collect(Collectors.toList()); resultDTO.setUnitIdList(unitIds); resultDTO.setUnitNameList(unitNames); + + if (StringUtils.isNotEmpty(dto.getGridId())) { + resultDTO.setGridId(dto.getGridId()); + GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(dto.getGridId()); + if (null != gridInfo) { + resultDTO.setGridName(gridInfo.getGridName()); + } + } } } } @@ -986,6 +1004,14 @@ public class WorkActServiceImpl implements WorkActService { List unitNames = unitIds.stream().map(option::get).collect(Collectors.toList()); resultDTO.setUnitIdList(unitIds); resultDTO.setUnitNameList(unitNames); + + if (StringUtils.isNotEmpty(dto.getGridId())) { + resultDTO.setGridId(dto.getGridId()); + GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(dto.getGridId()); + if (null != gridInfo) { + resultDTO.setGridName(gridInfo.getGridName()); + } + } } } } @@ -1390,6 +1416,14 @@ public class WorkActServiceImpl implements WorkActService { List unitNames = unitIds.stream().map(option::get).collect(Collectors.toList()); resultDTO.setUnitIdList(unitIds); resultDTO.setUnitNameList(unitNames); + + if (StringUtils.isNotEmpty(dto.getGridId())) { + resultDTO.setGridId(dto.getGridId()); + GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(dto.getGridId()); + if (null != gridInfo) { + resultDTO.setGridName(gridInfo.getGridName()); + } + } } } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml index 429461fbfb..ceaae8342e 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml @@ -95,6 +95,9 @@ WHERE a.DEL_FLAG = '0' AND a.AGENCY_ID = #{agencyId} + + AND a.GRID_ID = #{gridId} + AND TITLE LIKE concat('%', #{title}, '%') From 7919e756ffc06ce305e106f3a3ef91836899562d Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 12 Apr 2022 15:02:07 +0800 Subject: [PATCH 014/127] ... --- .../java/com/epmet/dto/form/ListIcNeighborHoodFormDTO.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/ListIcNeighborHoodFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/ListIcNeighborHoodFormDTO.java index 6f25dce319..613ee6f3d2 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/ListIcNeighborHoodFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/ListIcNeighborHoodFormDTO.java @@ -85,10 +85,5 @@ public class ListIcNeighborHoodFormDTO implements Serializable{ */ private String keyword; - /** - * 1：出租 0：自住 2：闲置 - */ - private String rentFlag; - } From b6097c76c4143ae1b56f10faf67b9098f6eb7799 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 12 Apr 2022 15:04:19 +0800 Subject: [PATCH 015/127] =?UTF-8?q?35=E3=80=81=E8=81=94=E5=BB=BA=E5=8D=95?= =?UTF-8?q?=E4=BD=8D=E7=9A=84=E5=88=86=E7=B1=BB=E5=8F=98=E6=9B=B4=E4=B8=BA?= =?UTF-8?q?=EF=BC=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V0.0.12__up_sys_dict_data.sql | 17 +++++++++++++++++ .../commons/tools/enums/PartyUnitTypeEnum.java | 15 ++++++++++----- 2 files changed, 27 insertions(+), 5 deletions(-) create mode 100644 epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.12__up_sys_dict_data.sql diff --git a/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.12__up_sys_dict_data.sql b/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.12__up_sys_dict_data.sql new file mode 100644 index 0000000000..7d93d8bc97 --- /dev/null +++ b/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.12__up_sys_dict_data.sql @@ -0,0 +1,17 @@ + + +UPDATE `epmet_admin`.`sys_dict_data` SET `id` = '1000000000000000220', `dict_label` = '区域化党建单位--楼宇党建' +WHERE (`id` = '1000000000000000200'); +UPDATE `epmet_admin`.`sys_dict_data` SET `id` = '1000000000000000221', `dict_label` = '区域化党建单位--两新组织' +WHERE (`id` = '1000000000000000201'); +UPDATE `epmet_admin`.`sys_dict_data` SET `id` = '1000000000000000222', `dict_label` = '区域化党建单位--区域单位党建' +WHERE (`id` = '1000000000000000202'); +UPDATE `epmet_admin`.`sys_dict_data` SET `id` = '1000000000000000223', `dict_label` = '区域化党建单位--机关直属部门' +WHERE (`id` = '1000000000000000203'); +UPDATE `epmet_admin`.`sys_dict_data` SET `id` = '1000000000000000224', `dict_label` = '区域化党建单位--其他' +WHERE (`id` = '1000000000000000204'); + +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1000000000000000225', '1000000000000000007', '社会组织--社会团体', '5', '0', '', '5', '0', '0', '', '2022-04-12 14:39:18', '', '2022-04-12 14:39:18'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1000000000000000226', '1000000000000000007', '社会组织--民办非企业单位', '6', '0', '', '6', '0', '0', '', '2022-04-12 14:39:18', '', '2022-04-12 14:39:18'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1000000000000000227', '1000000000000000007', '社会组织--基金会', '7', '0', '', '7', '0', '0', '', '2022-04-12 14:39:18', '', '2022-04-12 14:39:18'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1000000000000000228', '1000000000000000007', '社会组织--其他', '8', '0', '', '8', '0', '0', '', '2022-04-12 14:39:18', '', '2022-04-12 14:39:18'); diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/PartyUnitTypeEnum.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/PartyUnitTypeEnum.java index 6d7aee6009..27807a6d9a 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/PartyUnitTypeEnum.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/PartyUnitTypeEnum.java @@ -7,11 +7,16 @@ import com.epmet.commons.tools.exception.EpmetErrorCode; */ public enum PartyUnitTypeEnum { //房屋类型，1楼房，2平房，3别墅 - LOUYU("0", "楼宇党建"), - ZUZHI("1", "两新组织"), - DANWEI("2", "区域单位党建"), - JIGUAN("3", "机关直属部门"), - QITA("4", "其他"); + LOUYU("0", "区域化党建单位--楼宇党建"), + ZUZHI("1", "区域化党建单位--两新组织"), + DANWEI("2", "区域化党建单位--区域单位党建"), + JIGUAN("3", "区域化党建单位--机关直属部门"), + QITA("4", "区域化党建单位--其他"), + SHZZ_SHTT("5", "社会组织--社会团体"), + SHZZ_MBFQYDW("6", "社会组织--民办非企业单位"), + SHZZ_JJH("7", "社会组织--基金会"), + SHZZ_QT("8", "社会组织--其他"); + private String code; private String name; From b16c915c3c005fdaff5e1ee2296b4a67c81dd3cb Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 12 Apr 2022 15:11:50 +0800 Subject: [PATCH 016/127] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/db/migration/V0.0.15__alter_ic_house.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.15__alter_ic_house.sql diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.15__alter_ic_house.sql b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.15__alter_ic_house.sql new file mode 100644 index 0000000000..d624bf775a --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.15__alter_ic_house.sql @@ -0,0 +1,2 @@ +ALTER TABLE `ic_house` +MODIFY COLUMN `RENT_FLAG` tinyint(1) NOT NULL COMMENT '1：出租 0：自住 2：闲置' AFTER `PURPOSE`; From ce53355d75dbccad26956f098e3092f55ea81b33 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 12 Apr 2022 15:16:04 +0800 Subject: [PATCH 017/127] areaCodePath --- .../com/epmet/dataaggre/dao/govorg/CustomerAgencyDao.java | 2 ++ .../dataaggre/service/govorg/impl/GovOrgServiceImpl.java | 2 +- .../main/resources/mapper/govorg/CustomerAgencyDao.xml | 8 ++++++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerAgencyDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerAgencyDao.java index c9ebd4bf8d..8b64711e1f 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerAgencyDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerAgencyDao.java @@ -105,4 +105,6 @@ public interface CustomerAgencyDao extends BaseDao { * @author sun */ LinkedList subAgencyListAndGridSumNum(@Param("agencyId") String agencyId); + + CustomerAgencyEntity selectByAgencyId(@Param("agencyId")String agencyId); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java index dd8f54cab7..0b6944ce68 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java @@ -609,7 +609,7 @@ public class GovOrgServiceImpl implements GovOrgService { */ @Override public CustomerAgencyEntity getAgencyInfo(String agencyId) { - CustomerAgencyEntity customerAgencyEntity=customerAgencyDao.selectById(agencyId); + CustomerAgencyEntity customerAgencyEntity=customerAgencyDao.selectByAgencyId(agencyId); //设置行政地区编码全路径 if (StringUtils.isNotBlank(customerAgencyEntity.getAreaCode()) && StringUtils.isNotBlank(customerAgencyEntity.getParentAreaCode())) { customerAgencyEntity.setAreaCodePath(queryAreaCodePath(customerAgencyEntity)); diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml index e5594fdb5e..9e654e9bec 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml @@ -299,4 +299,12 @@ ORDER BY created_time ASC + From 57616b0ab1efc9bf21ef47bf08552118c96abf62 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 12 Apr 2022 15:23:36 +0800 Subject: [PATCH 018/127] =?UTF-8?q?=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/CustomerStaffServiceImpl.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java index 2991b7e39c..21a84aa6ad 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java @@ -25,15 +25,12 @@ 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.constant.ServiceConstant; -import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.ExceptionUtils; import com.epmet.commons.tools.exception.RenException; 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.AgencyInfoCache; import com.epmet.commons.tools.security.password.PasswordUtils; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.CpUserDetailRedis; @@ -744,8 +741,8 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl()); + // AgencyInfoCache agency=CustomerOrgRedis.getAgencyInfo(staffInfo.getAgencyId()); + // resultDTO.setAreaCodePath(null != agency && !CollectionUtils.isEmpty(agency.getAreaCodePath()) ? agency.getAreaCodePath() : new ArrayList<>()); } //获取工作人员所属客户名 CustomerDTO dto = new CustomerDTO(); From 10570eaae57fe8aec5449c056d0600c473736466 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 12 Apr 2022 15:41:31 +0800 Subject: [PATCH 019/127] =?UTF-8?q?=E6=96=B0=E5=BC=80=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/controller/BuildingController.java | 12 ++++ .../com/epmet/service/BuildingService.java | 1 + .../service/impl/BuildingServiceImpl.java | 65 +++++++++++++++++++ .../src/main/resources/mapper/IcHouseDao.xml | 5 +- 4 files changed, 82 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/BuildingController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/BuildingController.java index fca09fe069..6ca644bd31 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/BuildingController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/BuildingController.java @@ -118,6 +118,18 @@ public class BuildingController { List buildingTreeLevelDTOS =buildingService.treeList(tokenDTO.getCustomerId(), tokenDTO.getUserId()); return new Result().ok(buildingTreeLevelDTOS); } + + /** + * Desc: 根据前端方便，新开接口，只返回树的ID + * @param tokenDTO + * @author zxc + * @date 2022/4/12 15:20 + */ + @PostMapping("tree-ids") + public Result treeIds(@LoginUser TokenDto tokenDTO){ + List ids =buildingService.treeIds(tokenDTO.getCustomerId(), tokenDTO.getUserId()); + return new Result().ok(ids); + } /** * 导出模板 * @param response diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/BuildingService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/BuildingService.java index 81a9f10390..d5d1dd7903 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/BuildingService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/BuildingService.java @@ -57,6 +57,7 @@ public interface BuildingService { void addBuilding(String customerId, IcBulidingFormDTO formDTO); List treeList(String customerId, String staffId); + List treeIds(String customerId, String staffId); List importExcel(String customerId, List list, String staffId, List numList); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java index 04670fde28..d178eb7540 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java @@ -261,6 +261,71 @@ public class BuildingServiceImpl implements BuildingService { } + @Override + public List treeIds(String customerId, String staffId) { + List result = new ArrayList<>(); + CustomerStaffInfoCacheResult agency = CustomerStaffRedis.getStaffInfo(customerId, staffId); + if(null == agency || StringUtils.isBlank(agency.getAgencyId())){ + log.error("com.epmet.service.impl.BuildingServiceImpl.treeIds，没有找到工作人员所属的机关信息，用户Id：{}",staffId); + return new ArrayList<>(); + } + //1.获取所在组织及下级组织 + CustomerAgencyEntity customerAgency = customerAgencyDao.selectById(agency.getAgencyId()); + List customerAgencyList = icBuildingDao.selectAgencyChildrenList(agency.getAgencyId()); + customerAgencyList.add(customerAgency); + if(CollectionUtils.isEmpty(customerAgencyList)){ + return new ArrayList<>(); + } + result.addAll(customerAgencyList.stream().map(m -> m.getId()).collect(Collectors.toList())); + List agencyList = customerAgencyList.stream().map(item -> { + BuildingTreeLevelDTO buildingTreeLevelDTO = new BuildingTreeLevelDTO(); + buildingTreeLevelDTO.setId(item.getId()); + buildingTreeLevelDTO.setPId(item.getPid()); + buildingTreeLevelDTO.setLabel(item.getOrganizationName()); + buildingTreeLevelDTO.setLevel(item.getLevel()); + buildingTreeLevelDTO.setLongitude(item.getLongitude()); + buildingTreeLevelDTO.setLatitude(item.getLatitude()); + buildingTreeLevelDTO.setChildren(new ArrayList<>()); + //当前组织有几个下级组织 + buildingTreeLevelDTO.setShowNum(StrConstant.EPMETY_STR); + return buildingTreeLevelDTO; + }).collect(Collectors.toList()); + //2.获取组织所在网格 + List agencyIdList = customerAgencyList.stream().map(BaseEpmetEntity::getId).collect(Collectors.toList()); + List customerGridList = customerGridDao.selectList(new QueryWrapper().lambda().in(CustomerGridEntity::getPid, agencyIdList)); + if(CollectionUtils.isEmpty(customerGridList)){ + return result; + } + result.addAll(customerGridList.stream().map(m -> m.getId()).collect(Collectors.toList())); + List gridList = customerGridList.stream().map(item -> { + BuildingTreeLevelDTO buildingTreeLevelDTO = new BuildingTreeLevelDTO(); + buildingTreeLevelDTO.setId(item.getId()); + buildingTreeLevelDTO.setLabel(item.getGridName()); + buildingTreeLevelDTO.setLevel("grid"); + buildingTreeLevelDTO.setPId(item.getPid()); + buildingTreeLevelDTO.setLongitude(item.getLongitude()); + buildingTreeLevelDTO.setLatitude(item.getLatitude()); + buildingTreeLevelDTO.setChildren(new ArrayList<>()); + //当前网格下有几个小区 + buildingTreeLevelDTO.setShowNum(StrConstant.EPMETY_STR); + return buildingTreeLevelDTO; + }).collect(Collectors.toList()); + + + //3.获取网格下的所有小区 + List gridIdList = customerGridList.stream().map(BaseEpmetEntity::getId).collect(Collectors.toList()); + LambdaQueryWrapper queryWrapper = new QueryWrapper().lambda() + .in(IcNeighborHoodEntity::getGridId, gridIdList) + .orderByAsc(IcNeighborHoodEntity::getCreatedTime); + List icNeighborHoodList = icNeighborHoodDao.selectList(queryWrapper); + if(CollectionUtils.isEmpty(icNeighborHoodList)){ + agencyList.addAll(gridList); + return result; + } + result.addAll(icNeighborHoodList.stream().map(m -> m.getId()).collect(Collectors.toList())); + return result; + } + @Override @Transactional(rollbackFor = Exception.class) public List importExcel(String customerId, List list, String staffId, List numList) { diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml index 9150a4f6fc..d472f38195 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml @@ -154,7 +154,10 @@ b.BUILDING_NAME as buildingName, d.UNIT_NUM as unitNum, a.DOOR_NAME as doorName, - if(a.RENT_FLAG=0,'自住',if(a.RENT_FLAG=1,'出租','闲置')) as rentFlag, + (case when a.RENT_FLAG = '0' then '自住' + when a.RENT_FLAG = '1' then '出租' + when a.RENT_FLAG = '2' then '闲置' + else '' end) as rentFlag, a.OWNER_NAME as ownerName, /*a.RENT_FLAG as rentFlag, a.PURPOSE as purpose,*/ From 13976e464042336e9e111836cd265f4932103788 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 12 Apr 2022 15:43:06 +0800 Subject: [PATCH 020/127] =?UTF-8?q?=E8=81=94=E5=BB=BA=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BD=91=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/LatestActInfoDTO.java | 2 +- .../com/epmet/dto/form/work/DraftActInfoFormDTO.java | 2 +- .../epmet/dto/result/work/ActPreviewResultDTO.java | 3 +++ .../dto/result/work/LatestDraftActInfoResultDTO.java | 1 + .../epmet/service/impl/WorkActDraftServiceImpl.java | 11 ++++++++++- 5 files changed, 16 insertions(+), 3 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/LatestActInfoDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/LatestActInfoDTO.java index e73c466837..d4cc64d386 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/LatestActInfoDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/LatestActInfoDTO.java @@ -43,7 +43,7 @@ public class LatestActInfoDTO implements Serializable { * 客户id */ private String customerId; - + private String gridId; /** * 活动标题 */ diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/DraftActInfoFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/DraftActInfoFormDTO.java index a88d1d393f..08c6c8def7 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/DraftActInfoFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/DraftActInfoFormDTO.java @@ -28,7 +28,7 @@ public class DraftActInfoFormDTO implements Serializable { * 活动草稿id,如果是编辑之前的活动草稿，此列是有值的 */ private String actDraftId; - + private String gridId; /** * 如果是重新发布活动，此列是有值的 diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/ActPreviewResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/ActPreviewResultDTO.java index caeed480d5..b1856da3b3 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/ActPreviewResultDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/ActPreviewResultDTO.java @@ -101,6 +101,9 @@ public class ActPreviewResultDTO implements Serializable { */ private String actType; + private String gridId; + private String gridName; + /** * 联建单位 */ diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/LatestDraftActInfoResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/LatestDraftActInfoResultDTO.java index 70b4c5754f..e5699f1140 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/LatestDraftActInfoResultDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/LatestDraftActInfoResultDTO.java @@ -21,6 +21,7 @@ public class LatestDraftActInfoResultDTO implements Serializable { * 活动草稿id */ private String actDraftId; + private String gridId; /** * 客户id */ diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActDraftServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActDraftServiceImpl.java index 1273ffa577..a5fb199d5a 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActDraftServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActDraftServiceImpl.java @@ -2,6 +2,8 @@ package com.epmet.service.impl; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; +import com.epmet.commons.tools.redis.common.CustomerOrgRedis; +import com.epmet.commons.tools.redis.common.bean.GridInfoCache; import com.epmet.commons.tools.security.user.LoginUserUtil; import com.epmet.commons.tools.utils.DateUtils; import com.epmet.constant.ActConstant; @@ -201,6 +203,13 @@ public class WorkActDraftServiceImpl implements WorkActDraftService { List unitNames = unitIds.stream().map(option::get).collect(Collectors.toList()); actPreviewResultDTO.setUnitIdList(unitIds); actPreviewResultDTO.setUnitNameList(unitNames); + + if (StringUtils.isNotEmpty(actPreviewResultDTO.getGridId())) { + GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(actPreviewResultDTO.getGridId()); + if (null != gridInfo) { + actPreviewResultDTO.setGridName(gridInfo.getGridName()); + } + } } } return actPreviewResultDTO; @@ -337,7 +346,7 @@ public class WorkActDraftServiceImpl implements WorkActDraftService { latestActInfoDTO.setActType(formDTO.getActType()); latestActInfoDTO.setTarget(formDTO.getTarget()); - + latestActInfoDTO.setGridId(formDTO.getGridId()); return latestActInfoDTO; } From 83226ebd048f9eb8cd0e604ad3dd3215b632ad88 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Tue, 12 Apr 2022 15:46:31 +0800 Subject: [PATCH 021/127] =?UTF-8?q?=E5=B1=85=E6=B0=91=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=EF=BC=9Aidcard=E4=B8=BA=E7=A9=BA=EF=BC=8C=E5=AF=BC=E8=87=B4sel?= =?UTF-8?q?ectOne=20return=20many?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/IcResiUserImportServiceImpl.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java index f17c6ad2d4..722fb93cd2 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java @@ -539,10 +539,18 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res private void specifiedCheck(LinkedHashMap columnAndValues) { String idCard = columnAndValues.get("ID_CARD"); String mobile = columnAndValues.get("MOBILE"); + String name = columnAndValues.get("NAME"); List errors = new ArrayList<>(); - if (StringUtils.isNotBlank(idCard) && idCard.length() > 18) { + if (StringUtils.isBlank(idCard)) { + log.debug("【居民信息导入】specifiedCheck身份证号为空的：{},{}", mobile, name); + + String errorMsg = "身份证号不能为空"; + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg); + } + + if (idCard.length() > 18) { // 身份证号超长了哦，不可以的 errors.add("身份证号过长"); } @@ -573,9 +581,6 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res LinkedHashMap columnAndValues = new LinkedHashMap<>(); - String loginUserApp = EpmetRequestHolder.getHeader(AppClientConstant.APP); - String loginUserClient = EpmetRequestHolder.getHeader(AppClientConstant.CLIENT); - String loginUserId = EpmetRequestHolder.getHeader(AppClientConstant.USER_ID.toLowerCase()); String loginUserCustomerId = EpmetRequestHolder.getHeader(AppClientConstant.CUSTOMER_ID.toLowerCase()); // 遍历每一行，将行内容转化为 From bf9993c5ead4bf7412c5b6945d53849092ea3603 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 12 Apr 2022 15:54:56 +0800 Subject: [PATCH 022/127] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E8=87=AA=E7=BB=84?= =?UTF-8?q?=E7=BB=87=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/form/CommunitySelfOrganizationListFormDTO.java | 2 ++ .../main/resources/mapper/IcCommunitySelfOrganizationDao.xml | 3 +++ 2 files changed, 5 insertions(+) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/CommunitySelfOrganizationListFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/CommunitySelfOrganizationListFormDTO.java index c70e2a7055..5d634afaa3 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/CommunitySelfOrganizationListFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/CommunitySelfOrganizationListFormDTO.java @@ -46,4 +46,6 @@ public class CommunitySelfOrganizationListFormDTO implements Serializable { private String customerId; private String agencyId; private Integer ranking; + + private String remark; } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcCommunitySelfOrganizationDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcCommunitySelfOrganizationDao.xml index 2099c1cce3..0903571a1a 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcCommunitySelfOrganizationDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcCommunitySelfOrganizationDao.xml @@ -62,6 +62,9 @@ AND so.ORGANIZATION_NAME LIKE CONCAT('%',#{organizationName},'%') + + AND so.REMARK LIKE CONCAT('%',#{remark},'%') + AND so.ORGANIZATION_CREATED_TIME = ]]> #{startTime} From 6fad1db6817a4bf4d392f34b3da279b78d88f5e3 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 12 Apr 2022 15:56:13 +0800 Subject: [PATCH 023/127] s --- .../com/epmet/service/impl/CustomerStaffServiceImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java index 21a84aa6ad..72b43b0506 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java @@ -30,7 +30,9 @@ import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.ExceptionUtils; import com.epmet.commons.tools.exception.RenException; 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.AgencyInfoCache; import com.epmet.commons.tools.security.password.PasswordUtils; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.CpUserDetailRedis; @@ -741,8 +743,8 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl()); + AgencyInfoCache agency= CustomerOrgRedis.getAgencyInfo(staffInfo.getAgencyId()); + resultDTO.setAreaCodePath(null != agency && !CollectionUtils.isEmpty(agency.getAreaCodePath()) ? agency.getAreaCodePath() : new ArrayList<>()); } //获取工作人员所属客户名 CustomerDTO dto = new CustomerDTO(); From d517dec18cc0919da596f34e7cfef7e933551075 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 12 Apr 2022 16:09:13 +0800 Subject: [PATCH 024/127] =?UTF-8?q?tree-ids=CB=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/BuildingServiceImpl.java | 26 ------------------- 1 file changed, 26 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java index d178eb7540..4649e18546 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java @@ -297,32 +297,6 @@ public class BuildingServiceImpl implements BuildingService { return result; } result.addAll(customerGridList.stream().map(m -> m.getId()).collect(Collectors.toList())); - List gridList = customerGridList.stream().map(item -> { - BuildingTreeLevelDTO buildingTreeLevelDTO = new BuildingTreeLevelDTO(); - buildingTreeLevelDTO.setId(item.getId()); - buildingTreeLevelDTO.setLabel(item.getGridName()); - buildingTreeLevelDTO.setLevel("grid"); - buildingTreeLevelDTO.setPId(item.getPid()); - buildingTreeLevelDTO.setLongitude(item.getLongitude()); - buildingTreeLevelDTO.setLatitude(item.getLatitude()); - buildingTreeLevelDTO.setChildren(new ArrayList<>()); - //当前网格下有几个小区 - buildingTreeLevelDTO.setShowNum(StrConstant.EPMETY_STR); - return buildingTreeLevelDTO; - }).collect(Collectors.toList()); - - - //3.获取网格下的所有小区 - List gridIdList = customerGridList.stream().map(BaseEpmetEntity::getId).collect(Collectors.toList()); - LambdaQueryWrapper queryWrapper = new QueryWrapper().lambda() - .in(IcNeighborHoodEntity::getGridId, gridIdList) - .orderByAsc(IcNeighborHoodEntity::getCreatedTime); - List icNeighborHoodList = icNeighborHoodDao.selectList(queryWrapper); - if(CollectionUtils.isEmpty(icNeighborHoodList)){ - agencyList.addAll(gridList); - return result; - } - result.addAll(icNeighborHoodList.stream().map(m -> m.getId()).collect(Collectors.toList())); return result; } From cb4c343f1c7351b45df1bca21d7f435fee09a276 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 12 Apr 2022 16:30:20 +0800 Subject: [PATCH 025/127] =?UTF-8?q?=E5=85=B3=E6=B3=A8=E5=8E=9F=E5=9B=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/attention_vaccination_template.xlsx | Bin 8716 -> 8732 bytes .../mapper/IcEpidemicSpecialAttentionDao.xml | 1 + 2 files changed, 1 insertion(+) diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/attention_vaccination_template.xlsx b/epmet-user/epmet-user-server/src/main/resources/excel/attention_vaccination_template.xlsx index 9209a1be459ccec4e0620899bf4032486b1df416..8999a528399b358ceb21053dd6dd22b85aa70df7 100644 GIT binary patch delta 4522 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 Date: Tue, 12 Apr 2022 16:37:18 +0800 Subject: [PATCH 026/127] =?UTF-8?q?=E9=87=87=E9=9B=86=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=88=B7=E7=B1=8D=E6=89=80=E5=9C=A8=E5=9C=B0=EF=BC=8C=E5=AD=A6?= =?UTF-8?q?=E6=A0=A1=E5=8D=95=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/form/IcResiCollectMemFormDTO.java | 10 ++++++++++ .../dto/result/CollectListMemberExcelResultDTO.java | 11 +++++++++++ .../com/epmet/dto/result/CollectListResultDTO.java | 9 +++++++++ .../java/com/epmet/entity/IcResiMemberEntity.java | 9 +++++++++ .../resources/db/migration/V0.0.40__member_huji.sql | 2 ++ .../src/main/resources/mapper/IcResiCollectDao.xml | 4 +++- .../src/main/resources/mapper/IcResiMemberDao.xml | 4 +++- 7 files changed, 47 insertions(+), 2 deletions(-) create mode 100644 epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.40__member_huji.sql diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiCollectMemFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiCollectMemFormDTO.java index 95ae25cd79..12aff48466 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiCollectMemFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiCollectMemFormDTO.java @@ -44,6 +44,16 @@ public class IcResiCollectMemFormDTO implements Serializable { // @NotNull(message = "疫苗接种情况不能为空", groups = {IcResiCollectFormDTO.InternalShowGroup.class, IcResiCollectFormDTO.ExternalShowGroup.class}) private Integer ymjz; + /** + * 户籍所在地 + */ + private String domicilePlace; + + /** + * 学校或公司 + */ + private String workPlace; + /** * 社区居民信息登记-查询返参用 */ diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListMemberExcelResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListMemberExcelResultDTO.java index 854d1b3c93..34efe5d146 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListMemberExcelResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListMemberExcelResultDTO.java @@ -45,4 +45,15 @@ public class CollectListMemberExcelResultDTO implements Serializable { @Excel(name = "疫苗接种情况",replace = { "全程接种_1", "未全程接种_2", "未接种_0" }, width = 30) private String ymjz; + /** + * 户籍所在地 + */ + @Excel(name = "户籍所在地", width = 60) + private String domicilePlace; + + /** + * 学校或公司 + */ + @Excel(name = "单位或学校", width = 60) + private String workPlace; } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListResultDTO.java index 1d61469165..2b95eb5e04 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListResultDTO.java @@ -69,6 +69,15 @@ public class CollectListResultDTO implements Serializable { */ private Integer ymjz; + /** + * 户籍所在地 + */ + private String domicilePlace; + + /** + * 学校或公司 + */ + private String workPlace; } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiMemberEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiMemberEntity.java index 399ce07822..b93190e5c5 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiMemberEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiMemberEntity.java @@ -53,4 +53,13 @@ public class IcResiMemberEntity extends BaseEpmetEntity { */ private Integer ymjz; + /** + * 户籍所在地 + */ + private String domicilePlace; + + /** + * 学校或公司 + */ + private String workPlace; } diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.40__member_huji.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.40__member_huji.sql new file mode 100644 index 0000000000..03a2a4bc23 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.40__member_huji.sql @@ -0,0 +1,2 @@ +alter table ic_resi_member add COLUMN DOMICILE_PLACE VARCHAR(128) comment '户籍所在地' AFTER YMJZ; +alter table ic_resi_member add COLUMN WORK_PLACE VARCHAR(128) comment '单位或学校' AFTER DOMICILE_PLACE; diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml index 777622c9f5..28e1e8370a 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml @@ -47,7 +47,9 @@ m.ID_NUM AS memberIdNum, m.MOBILE AS memberMobile, m.HE_SUAN_COUNT AS heSuanCount, - m.YMJZ AS ymjz + m.YMJZ AS ymjz, + m.DOMICILE_PLACE as domicilePlace, + m.WORK_PLACE as workPlace from ic_resi_member m where m.DEL_FLAG = 0 and m.IC_RESI_COLLECT_ID = #{id} diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiMemberDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiMemberDao.xml index b76345774c..b9bc9300dd 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiMemberDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiMemberDao.xml @@ -12,7 +12,9 @@ m.ID_NUM, m.MOBILE, m.HE_SUAN_COUNT, - m.YMJZ + m.YMJZ, + m.DOMICILE_PLACE, + m.WORK_PLACE FROM ic_resi_member m WHERE From 7bd0987bb513f87e0445f0a521306817e46b4cf9 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 12 Apr 2022 16:46:54 +0800 Subject: [PATCH 027/127] =?UTF-8?q?=E8=81=94=E5=BB=BA=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BD=91=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcPartyActivityDao.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml index ceaae8342e..3d41252510 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml @@ -102,6 +102,7 @@ AND TITLE LIKE concat('%', #{title}, '%') AND ACTIVITY_TIME BETWEEN #{startTime} AND #{endTime} + ORDER BY ACTIVITY_TIME DESC From 82fd9ef3ca54cb4d7bd5a2cb52b7559dbcc26833 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 12 Apr 2022 16:59:16 +0800 Subject: [PATCH 028/127] =?UTF-8?q?=E8=81=94=E5=BB=BA=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BD=91=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcPartyActivityDao.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml index 3d41252510..9bd0824165 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml @@ -49,6 +49,7 @@ + + + diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index 7e376b57ec..af9a7c97c3 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -1298,6 +1298,16 @@ public class IcResiUserServiceImpl extends BaseServiceImpl idCards = list.stream().map(m -> m.getIdCard()).distinct().collect(Collectors.toList()); + if (CollectionUtils.isNotEmpty(idCards)){ + Result> housesNameByIdCards = govOrgOpenFeignClient.getHousesNameByIdCards(idCards); + if (!housesNameByIdCards.success()){ + throw new EpmetException("查询居民所属房屋失败..."); + } + if (CollectionUtils.isNotEmpty(housesNameByIdCards.getData())){ + list.forEach(l -> housesNameByIdCards.getData().stream().filter( h -> h.getIdCard().equals(l.getIdCard())).forEach(h -> l.setHouseName(h.getHouseName()))); + } + } PageInfo pageInfo = new PageInfo<>(list); return new PageData<>(list, pageInfo.getTotal()); } From 80ea24f36d3f5e3ba90c7be0edbb55dc99310692 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 12 Apr 2022 17:02:53 +0800 Subject: [PATCH 030/127] =?UTF-8?q?=E8=81=94=E5=BB=BA=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BD=91=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/db/migration/V0.0.14__activity_add_grid.sql | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.14__activity_add_grid.sql diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.14__activity_add_grid.sql b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.14__activity_add_grid.sql new file mode 100644 index 0000000000..c542430b98 --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.14__activity_add_grid.sql @@ -0,0 +1,4 @@ +ALTER TABLE `epmet_heart`.`ic_party_activity` + ADD COLUMN `GRID_ID` varchar(64) NULL COMMENT '网格ID' AFTER `AGENCY_ID`; +ALTER TABLE `epmet_heart`.`latest_act_info` + ADD COLUMN `GRID_ID` varchar(64) NULL COMMENT '网格ID' AFTER `CUSTOMER_ID`; \ No newline at end of file From ea5cbbb6b22d593e517d1aed350ba6c8b0911e92 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 12 Apr 2022 17:15:02 +0800 Subject: [PATCH 031/127] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E8=BA=AB=E4=BB=BD?= =?UTF-8?q?=E8=AF=81=E5=8F=B7=E6=9F=A5=E6=88=BF=E5=B1=8B=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java index f25f4a14d7..df37d39bf3 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java @@ -102,6 +102,6 @@ public interface IcHouseDao extends BaseDao { * @author zxc * @date 2022/4/12 16:42 */ - List getHousesNameByIdCards(List idCards); + List getHousesNameByIdCards(@Param("idCards"k) List idCards); } \ No newline at end of file From ed31ffa9c0845444d7a180b1802edc23a7467029 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 12 Apr 2022 17:15:44 +0800 Subject: [PATCH 032/127] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E8=BA=AB=E4=BB=BD?= =?UTF-8?q?=E8=AF=81=E5=8F=B7=E6=9F=A5=E6=88=BF=E5=B1=8B=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java index df37d39bf3..686f2f01b8 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java @@ -102,6 +102,6 @@ public interface IcHouseDao extends BaseDao { * @author zxc * @date 2022/4/12 16:42 */ - List getHousesNameByIdCards(@Param("idCards"k) List idCards); + List getHousesNameByIdCards(@Param("idCards") List idCards); } \ No newline at end of file From def998c5aef7df3f79fd56c751b7c47f331f7e0f Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 12 Apr 2022 17:21:26 +0800 Subject: [PATCH 033/127] dto --- .../dataaggre/dto/govorg/CustomerAgencyDTO.java | 6 ++++++ .../dataaggre/controller/GovOrgController.java | 8 ++++---- .../dataaggre/dao/govorg/CustomerAgencyDao.java | 1 - .../entity/govorg/CustomerAgencyEntity.java | 7 ------- .../dataaggre/service/govorg/GovOrgService.java | 3 +-- .../service/govorg/impl/GovOrgServiceImpl.java | 15 ++++++++------- .../service/impl/AggreGridServiceImpl.java | 5 ++--- .../resources/mapper/govorg/CustomerAgencyDao.xml | 8 -------- 8 files changed, 21 insertions(+), 32 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/CustomerAgencyDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/CustomerAgencyDTO.java index 70c25c839c..1880541692 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/CustomerAgencyDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/CustomerAgencyDTO.java @@ -21,6 +21,7 @@ import lombok.Data; import java.io.Serializable; import java.util.Date; +import java.util.List; /** @@ -172,4 +173,9 @@ public class CustomerAgencyDTO implements Serializable { * 联系电话 */ private String mobile; + + /** + * 地区编码全路径：例如：37,3702,370203,370203005,370203005015 + */ + private List areaCodePath; } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java index 717e2370b9..1e560103fa 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java @@ -21,10 +21,10 @@ import com.epmet.commons.tools.utils.DateUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dataaggre.beans.GridMemberDataAnalysisExcelExportBean; +import com.epmet.dataaggre.dto.govorg.CustomerAgencyDTO; import com.epmet.dataaggre.dto.govorg.CustomerGridDTO; import com.epmet.dataaggre.dto.govorg.form.*; import com.epmet.dataaggre.dto.govorg.result.*; -import com.epmet.dataaggre.entity.govorg.CustomerAgencyEntity; import com.epmet.dataaggre.enums.GridMemberDataAnalysisEnums; import com.epmet.dataaggre.service.AggreGridService; import com.epmet.dataaggre.service.govorg.GovOrgService; @@ -242,8 +242,8 @@ public class GovOrgController { * @date 2021/11/5 2:54 下午 */ @PostMapping("agency") - public Result getAgencyInfo(@RequestParam("agencyId")String agencyId){ - return new Result().ok(govOrgService.getAgencyInfo(agencyId)); + public Result getAgencyInfo(@RequestParam("agencyId")String agencyId){ + return new Result().ok(govOrgService.getAgencyInfo(agencyId)); } /** @@ -305,7 +305,7 @@ public class GovOrgController { CustomerGridDTO gridInfo = govOrgService.getGridInfo(orgId); Optional.ofNullable(gridInfo).ifPresent((g) -> orgName.set(g.getGridName())); } else if ("agency".equals(orgType)) { - CustomerAgencyEntity agencyInfo = govOrgService.getAgencyInfo(orgId); + CustomerAgencyDTO agencyInfo = govOrgService.getAgencyInfo(orgId); Optional.ofNullable(agencyInfo).ifPresent((a) -> orgName.set(a.getOrganizationName())); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerAgencyDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerAgencyDao.java index 8b64711e1f..076b7af7bd 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerAgencyDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerAgencyDao.java @@ -106,5 +106,4 @@ public interface CustomerAgencyDao extends BaseDao { */ LinkedList subAgencyListAndGridSumNum(@Param("agencyId") String agencyId); - CustomerAgencyEntity selectByAgencyId(@Param("agencyId")String agencyId); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/CustomerAgencyEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/CustomerAgencyEntity.java index 28bf2d90a8..171e01198f 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/CustomerAgencyEntity.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/CustomerAgencyEntity.java @@ -22,8 +22,6 @@ import com.epmet.commons.mybatis.entity.BaseEpmetEntity; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.List; - /** * 机关单位信息表 * @@ -76,11 +74,6 @@ public class CustomerAgencyEntity extends BaseEpmetEntity { */ private String areaCode; - /** - * 地区编码全路径：例如：37,3702,370203,370203005,370203005015 - */ - private List areaCodePath; - /** * 总人数 */ diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java index 53c1f3200c..6b5d2d0ed4 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java @@ -8,7 +8,6 @@ import com.epmet.dataaggre.dto.govorg.CustomerGridDTO; import com.epmet.dataaggre.dto.govorg.form.*; import com.epmet.dataaggre.dto.govorg.result.*; import com.epmet.dataaggre.dto.resigroup.result.OrgInfoCommonDTO; -import com.epmet.dataaggre.entity.govorg.CustomerAgencyEntity; import javax.servlet.http.HttpServletResponse; import java.util.List; @@ -162,7 +161,7 @@ public interface GovOrgService { * @author zxc * @date 2021/11/5 2:54 下午 */ - CustomerAgencyEntity getAgencyInfo(String agencyId); + CustomerAgencyDTO getAgencyInfo(String agencyId); /** * @Description 查询网格信息 diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java index 0b6944ce68..992ac08201 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java @@ -24,6 +24,7 @@ import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache; import com.epmet.commons.tools.redis.common.bean.BuildingInfoCache; import com.epmet.commons.tools.redis.common.bean.GridInfoCache; import com.epmet.commons.tools.security.dto.TokenDto; +import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.HttpClientManager; import com.epmet.commons.tools.utils.Result; import com.epmet.dataaggre.constant.DataSourceConstant; @@ -608,17 +609,17 @@ public class GovOrgServiceImpl implements GovOrgService { * @date 2021/11/5 2:54 下午 */ @Override - public CustomerAgencyEntity getAgencyInfo(String agencyId) { - CustomerAgencyEntity customerAgencyEntity=customerAgencyDao.selectByAgencyId(agencyId); + public CustomerAgencyDTO getAgencyInfo(String agencyId) { + CustomerAgencyEntity customerAgencyEntity=customerAgencyDao.selectById(agencyId); + CustomerAgencyDTO res= ConvertUtils.sourceToTarget(customerAgencyEntity,CustomerAgencyDTO.class); //设置行政地区编码全路径 - if (StringUtils.isNotBlank(customerAgencyEntity.getAreaCode()) && StringUtils.isNotBlank(customerAgencyEntity.getParentAreaCode())) { - customerAgencyEntity.setAreaCodePath(queryAreaCodePath(customerAgencyEntity)); + if (StringUtils.isNotBlank(res.getAreaCode()) && StringUtils.isNotBlank(res.getParentAreaCode())) { + res.setAreaCodePath(queryAreaCodePath(res)); } - - return customerAgencyEntity; + return res; } - private List queryAreaCodePath(CustomerAgencyEntity customerAgencyEntity) { + private List queryAreaCodePath(CustomerAgencyDTO customerAgencyEntity) { List areaCodePath = new ArrayList<>(); switch (customerAgencyEntity.getLevel()) { case Constant.COMMUNITY: diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/AggreGridServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/AggreGridServiceImpl.java index 972d686151..d9804c5b1c 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/AggreGridServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/AggreGridServiceImpl.java @@ -8,10 +8,10 @@ import com.epmet.commons.tools.redis.common.CustomerOrgRedis; import com.epmet.commons.tools.redis.common.bean.GridInfoCache; import com.epmet.commons.tools.utils.DateUtils; import com.epmet.dataaggre.dto.epmetuser.result.StaffPatrolRecordDailyResultDTO; +import com.epmet.dataaggre.dto.govorg.CustomerAgencyDTO; import com.epmet.dataaggre.dto.govorg.CustomerGridDTO; import com.epmet.dataaggre.dto.govorg.result.GridMemberDataAnalysisResultDTO; import com.epmet.dataaggre.entity.epmetuser.CustomerStaffEntity; -import com.epmet.dataaggre.entity.govorg.CustomerAgencyEntity; import com.epmet.dataaggre.service.AggreGridService; import com.epmet.dataaggre.service.datastats.DataStatsService; import com.epmet.dataaggre.service.epmetuser.EpmetUserService; @@ -22,7 +22,6 @@ import com.google.common.collect.Lists; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import sun.rmi.runtime.Log; import java.util.*; @@ -173,7 +172,7 @@ public class AggreGridServiceImpl implements AggreGridService { * @return */ private String getPidsByAgencyId(String agencyId) { - CustomerAgencyEntity agencyInfo = govOrgService.getAgencyInfo(agencyId); + CustomerAgencyDTO agencyInfo = govOrgService.getAgencyInfo(agencyId); if (agencyInfo == null) { String errorMsg = "【网格员数据统计查询pcwork】查询组织信息返回为null"; diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml index 9e654e9bec..e5594fdb5e 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml @@ -299,12 +299,4 @@ ORDER BY created_time ASC - From 2894a5dfd79d325e61091c72718f1e49454fefa6 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 12 Apr 2022 17:33:57 +0800 Subject: [PATCH 034/127] =?UTF-8?q?sql=E7=B1=BB=E5=9E=8B=E8=BD=AC=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-org-server/src/main/resources/mapper/IcHouseDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml index d067b0801b..19e99c1eff 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml @@ -170,7 +170,7 @@ a.BUILDING_UNIT_ID as unitNumKey, a.HOUSE_TYPE as houseTypeKey, a.PURPOSE as purposeKey, - a.RENT_FLAG as rentFlagKey, + CAST(a.RENT_FLAG AS CHAR) as rentFlagKey, c.AGENCY_ID as agencyId, c.GRID_ID as gridId from ic_house a From 5e0ae7d48361fbf3063f4898e8a21d4f4fdb9843 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 12 Apr 2022 18:30:45 +0800 Subject: [PATCH 035/127] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=91=98=E5=B7=A1?= =?UTF-8?q?=E6=9F=A5=E5=9C=A8=E7=BA=BF=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/commons/tools/redis/RedisKeys.java | 14 ++++ .../java/com/epmet/OpenDataApplication.java | 3 +- .../opendata/dao/GriderOnlineNumDao.java | 33 +++++++++ .../entity/GriderOnlineNumEntity.java | 61 ++++++++++++++++ .../service/GriderOnlineNumService.java | 38 ++++++++++ .../impl/GriderOnlineNumServiceImpl.java | 69 ++++++++++++++++++ .../task/ExtractBizDataToOpenData.java | 71 +++++++++++++++++++ .../V0.0.1__add_grider_online_num.sql | 13 ++++ .../resources/mapper/GriderOnlineNumDao.xml | 6 ++ 9 files changed, 307 insertions(+), 1 deletion(-) create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/GriderOnlineNumDao.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/GriderOnlineNumEntity.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/GriderOnlineNumService.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GriderOnlineNumServiceImpl.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/task/ExtractBizDataToOpenData.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/resources/db/migration/V0.0.1__add_grider_online_num.sql create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/GriderOnlineNumDao.xml diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java index 04db67cfed..05e5c200a4 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java @@ -10,6 +10,8 @@ package com.epmet.commons.tools.redis; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; +import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.utils.DateUtils; import org.apache.commons.lang3.StringUtils; @@ -763,4 +765,16 @@ public class RedisKeys { public static String getNextAreaCodeKey(String areaCode) { return rootPrefix.concat("areaCode:parentCode:").concat(areaCode); } + + /** + * desc:获取分布式锁key + * @param methodName + * @return + */ + public static String getLockByMethodName(String methodName) { + if (StringUtils.isBlank(methodName)){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"参数错误"); + } + return rootPrefix.concat("lock:").concat(methodName); + } } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/OpenDataApplication.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/OpenDataApplication.java index 532877cf4b..c786abb9ba 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/OpenDataApplication.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/OpenDataApplication.java @@ -5,7 +5,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.web.servlet.ServletComponentScan; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; import org.springframework.cloud.openfeign.EnableFeignClients; -import org.springframework.context.annotation.ComponentScan; +import org.springframework.scheduling.annotation.EnableScheduling; /** * @Description OpenData服务启动类 @@ -14,6 +14,7 @@ import org.springframework.context.annotation.ComponentScan; * @author wxz * @date 2021.10.13 15:16:05 */ +@EnableScheduling @SpringBootApplication @EnableDiscoveryClient @EnableFeignClients diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/GriderOnlineNumDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/GriderOnlineNumDao.java new file mode 100644 index 0000000000..9f4080c054 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/GriderOnlineNumDao.java @@ -0,0 +1,33 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.opendata.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.opendata.entity.GriderOnlineNumEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 在线网格员人数 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2021-10-14 + */ +@Mapper +public interface GriderOnlineNumDao extends BaseDao { + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/GriderOnlineNumEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/GriderOnlineNumEntity.java new file mode 100644 index 0000000000..ca707865cf --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/GriderOnlineNumEntity.java @@ -0,0 +1,61 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.opendata.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 用户巡查主记录 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2021-10-14 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("grider_online_num") +public class GriderOnlineNumEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户Id + */ + private String customerId; + + private String qxGridId; + + /** + * 推送时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date pushTime; + + /** + * 在线数 + */ + private Integer onlineNum; + + + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/GriderOnlineNumService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/GriderOnlineNumService.java new file mode 100644 index 0000000000..55112c1d8d --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/GriderOnlineNumService.java @@ -0,0 +1,38 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.opendata.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.opendata.entity.GriderOnlineNumEntity; + +/** + * 用户巡查主记录 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2021-10-14 + */ +public interface GriderOnlineNumService extends BaseService { + + /** + * desc:插入巡查中的网格员数据 + * @return boolean + */ + Boolean insertData(String agencyId); + + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GriderOnlineNumServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GriderOnlineNumServiceImpl.java new file mode 100644 index 0000000000..b024c1436e --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GriderOnlineNumServiceImpl.java @@ -0,0 +1,69 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.opendata.service.impl; + +import com.alibaba.fastjson.JSON; +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.constant.StrConstant; +import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.form.PatrolCountFormDTO; +import com.epmet.dto.result.PatrolCountResultDTO; +import com.epmet.feign.EpmetUserOpenFeignClient; +import com.epmet.opendata.dao.GriderOnlineNumDao; +import com.epmet.opendata.entity.GriderOnlineNumEntity; +import com.epmet.opendata.service.GriderOnlineNumService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Date; + + +/** + * 用户巡查主记录 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2021-10-14 + */ +@Slf4j +@Service +public class GriderOnlineNumServiceImpl extends BaseServiceImpl implements GriderOnlineNumService { +@Autowired +private EpmetUserOpenFeignClient epmetUserOpenFeignClient; + @Override + public Boolean insertData(String agencyId) { + PatrolCountFormDTO param = new PatrolCountFormDTO(); + param.setAgencyId(agencyId); + Result patrolCountResult = epmetUserOpenFeignClient.patrolCount(param); + + log.debug("insertData patrolCountResult return:{}", JSON.toJSONString(patrolCountResult)); + if (patrolCountResult == null || !patrolCountResult.success()) { + log.warn("insertData patrolCount fail,return null"); + return false; + } + PatrolCountResultDTO data = patrolCountResult.getData(); + int count = data.getPatrollingCount() == null ? NumConstant.ZERO : data.getPatrollingCount(); + GriderOnlineNumEntity entity = new GriderOnlineNumEntity(); + entity.setCustomerId(StrConstant.PY_CUSTOMER); + entity.setPushTime(new Date()); + entity.setOnlineNum(count); + baseDao.insert(entity); + return true; + } +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/task/ExtractBizDataToOpenData.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/task/ExtractBizDataToOpenData.java new file mode 100644 index 0000000000..ebcd5aa27d --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/task/ExtractBizDataToOpenData.java @@ -0,0 +1,71 @@ +package com.epmet.opendata.task; + +import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.constant.StrConstant; +import com.epmet.commons.tools.distributedlock.DistributedLock; +import com.epmet.commons.tools.redis.RedisKeys; +import com.epmet.commons.tools.utils.DateUtils; +import com.epmet.opendata.service.GriderOnlineNumService; +import lombok.extern.slf4j.Slf4j; +import org.redisson.api.RLock; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +import java.util.Date; + +/** + * desc: + * + * @author: LiuJanJun + * @date: 2022/4/12 4:21 下午 + * @version: 1.0 + */ +@Slf4j +@Component +public class ExtractBizDataToOpenData { + + @Autowired + private DistributedLock distributedLock; + + @Autowired + private GriderOnlineNumService griderOnlineNumService; + + @Scheduled(cron = "0 30 */2 * * *") + //@Scheduled(cron = "0/15 * * * * *") + public void extractGridMemberPatrollingCount() { + String currentTime = DateUtils.format(new Date(), DateUtils.DATE_TIME_PATTERN); + log.info("extractGridMemberPatrollingCount start,date:{}", currentTime); + RLock rLock = null; + try { + rLock = distributedLock.tryLock(RedisKeys.getLockByMethodName("extractGridMemberPatrollingCount")); + if (rLock == null || !rLock.isLocked()) { + log.warn("tryLock method extractGridMemberPatrollingCount fail"); + return; + } + boolean patrolCountResult; + int retryTime = NumConstant.THREE; + do { + //StrConstant.PY_ROOT_AGENCY + patrolCountResult = griderOnlineNumService.insertData(StrConstant.PY_ROOT_AGENCY); + if (!patrolCountResult) { + break; + } + //如果 重试次数为1了 就让歇个 5分钟 + if (retryTime == 1) { + Thread.sleep(NumConstant.FIVE * NumConstant.SIXTY * NumConstant.ONE_THOUSAND); + } + } while (retryTime-- > 0); + if (!patrolCountResult) { + log.error("插入网格员在线人数失败,请检查原因,时间:{}", currentTime); + } + + } catch (Exception e) { + log.warn("tryLock method extractGridMemberPatrollingCount fail"); + } finally { + distributedLock.unLock(rLock); + } + log.info("extractGridMemberPatrollingCount end"); + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/db/migration/V0.0.1__add_grider_online_num.sql b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/db/migration/V0.0.1__add_grider_online_num.sql new file mode 100644 index 0000000000..d4fd9ca93f --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/db/migration/V0.0.1__add_grider_online_num.sql @@ -0,0 +1,13 @@ +CREATE TABLE `grider_online_num` ( + `ID` varchar(64) NOT NULL COMMENT '主键', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id', + `ONLINE_NUM` int(11) NOT NULL COMMENT '在线人数', + `PUSH_TIME` datetime NOT NULL COMMENT '推送时间', + `DEL_FLAG` bigint(1) NOT NULL DEFAULT '0' COMMENT '删除标识 0.未删除 1.已删除', + `REVISION` int(11) NOT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(64) NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(64) NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='网格员在线人数'; diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/GriderOnlineNumDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/GriderOnlineNumDao.xml new file mode 100644 index 0000000000..27c636d525 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/GriderOnlineNumDao.xml @@ -0,0 +1,6 @@ + + + + + + From 63d28a28601323b63897317bc276eb25e6bc76f4 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 13 Apr 2022 09:28:57 +0800 Subject: [PATCH 036/127] =?UTF-8?q?=E5=BD=A2=E6=88=90=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=E7=8E=B0=E5=B1=85=E5=9C=B0=E8=A1=8C=E6=94=BF=E5=9C=B0=E5=8C=BA?= =?UTF-8?q?=E7=BC=96=E7=A0=81=E6=9F=A5=E8=AF=A2=EF=BC=8C=E4=B8=8D=E9=99=90?= =?UTF-8?q?=E5=88=B6=20=E8=87=AA=E5=AE=9A=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/AreaCodeDao.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/AreaCodeDao.xml b/epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/AreaCodeDao.xml index eca90f2415..324edf5f0f 100644 --- a/epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/AreaCodeDao.xml +++ b/epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/AreaCodeDao.xml @@ -84,7 +84,6 @@ area_code_child ac WHERE ac.DEL_FLAG = '0' - AND ac.USER_DEFINED = '0' AND ac.p_code=#{pCode} @@ -101,7 +100,6 @@ area_code_child ac WHERE ac.DEL_FLAG = '0' - AND ac.USER_DEFINED = '0' AND ac.p_code=#{pCode} From aabbf44618d269ae9aaf2b26c1b34af0b4a169a4 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 13 Apr 2022 09:44:07 +0800 Subject: [PATCH 037/127] =?UTF-8?q?1=E3=80=81=E9=9C=80=E6=B1=82=E6=8C=87?= =?UTF-8?q?=E6=B4=BE=E6=97=B6=E6=8C=87=E6=B4=BE=E7=BB=99=E8=81=94=E5=BB=BA?= =?UTF-8?q?=E5=8D=95=E4=BD=8D=EF=BC=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/db/migration/V0.0.13__up_sys_dict_data.sql | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.13__up_sys_dict_data.sql diff --git a/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.13__up_sys_dict_data.sql b/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.13__up_sys_dict_data.sql new file mode 100644 index 0000000000..8cf8a7e21a --- /dev/null +++ b/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.13__up_sys_dict_data.sql @@ -0,0 +1,6 @@ +update sys_dict_data set dict_label='联建单位' +where dict_value='party_unit' +and DEL_FLAG='0' +and dict_type_id=( + select st.id from sys_dict_type st where st.dict_type='user_demand_service_type' and st.DEL_FLAG='0' +); \ No newline at end of file From 270f49dc8514e8d6b72e2140d515e91a9d80224d Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 13 Apr 2022 10:08:05 +0800 Subject: [PATCH 038/127] =?UTF-8?q?22=E3=80=81=E7=96=AB=E8=8B=97=E6=8E=A5?= =?UTF-8?q?=E7=A7=8D=E5=85=B3=E6=B3=A8=E5=90=8D=E5=8D=95=E3=80=81=E6=A0=B8?= =?UTF-8?q?=E9=85=B8=E6=A3=80=E6=B5=8B=E5=85=B3=E6=B3=A8=E5=90=8D=E5=8D=95?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=E6=89=80=E5=B1=9E=E6=88=BF?= =?UTF-8?q?=E5=B1=8B=E4=B8=80=E5=88=97=EF=BC=8C=E6=A0=B9=E6=8D=AE=E8=BA=AB?= =?UTF-8?q?=E4=BB=BD=E8=AF=81=E5=8F=B7=E6=98=BE=E7=A4=BA=E8=AF=A5=E8=BA=AB?= =?UTF-8?q?=E4=BB=BD=E8=AF=81=E5=8F=B7=E6=89=80=E5=B1=9E=E6=88=BF=E5=B1=8B?= =?UTF-8?q?=EF=BC=8C=E6=B2=A1=E6=9C=89=E7=9A=84=E4=B8=8D=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=EF=BC=9B=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E6=89=80=E5=B1=9E=E6=88=BF=E5=B1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/VaccinationListFormDTO.java | 20 +++++++++ .../dto/result/VaccinationListResultDTO.java | 45 +++++++++++++++++++ .../epmet/excel/VaccinationExportExcel.java | 3 ++ ...IcEpidemicSpecialAttentionServiceImpl.java | 23 ++++++++++ .../mapper/IcEpidemicSpecialAttentionDao.xml | 38 +++++++++++++++- 5 files changed, 127 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VaccinationListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VaccinationListFormDTO.java index fc69f5da84..23da9d859b 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VaccinationListFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VaccinationListFormDTO.java @@ -54,6 +54,26 @@ public class VaccinationListFormDTO extends PageFormDTO implements Serializable * 备注，核酸检测关注名单，此字段可填可不填 */ private String remark; + /** + * 所属小区ID + */ + private String villageId; + + /** + * 所属楼宇Id + */ + private String buildId; + + /** + * 单元id + */ + private String unitId; + + /** + * 所属家庭Id + */ + private String homeId; + private String userId; diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VaccinationListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VaccinationListResultDTO.java index a0b10a13d3..a2012686fe 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VaccinationListResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VaccinationListResultDTO.java @@ -55,6 +55,51 @@ public class VaccinationListResultDTO implements Serializable { */ private String lastInformTime; + /** + * 所属小区ID + */ + private String villageId; + + /** + * 所属小区名称 + */ + private String villageName; + + /** + * 所属楼宇Id + */ + private String buildId; + + /** + * 所属楼宇名称 + */ + private String buildName; + + /** + * 单元id + */ + private String unitId; + + /** + * 单元名称 + */ + private String unitName; + + /** + * 所属家庭Id + */ + private String homeId; + + /** + * 所属家庭名称 + */ + private String homeName; + + /** + * 小区名+楼栋名+单元名+房屋名 + */ + private String allName; + public VaccinationListResultDTO() { this.vaccinationCount = NumConstant.ZERO; this.name = ""; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/VaccinationExportExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/VaccinationExportExcel.java index 65534756cd..8fe217466f 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/VaccinationExportExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/VaccinationExportExcel.java @@ -32,4 +32,7 @@ public class VaccinationExportExcel { @Excel(name = "最近一次通知时间",width = 20) private String lastInformTime; + @Excel(name = "所属房屋",width = 40) + private String allName; + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java index f27bc46842..94ed60ce9f 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java @@ -23,6 +23,7 @@ import com.epmet.constants.ImportTaskConstants; import com.epmet.dao.IcEpidemicSpecialAttentionDao; import com.epmet.dto.IcEpidemicSpecialAttentionDTO; import com.epmet.dto.form.*; +import com.epmet.dto.result.HouseInfoDTO; import com.epmet.dto.result.UploadImgResultDTO; import com.epmet.dto.result.VaccinationListResultDTO; import com.epmet.entity.IcEpidemicSpecialAttentionEntity; @@ -30,6 +31,7 @@ import com.epmet.enums.ChannelEnum; import com.epmet.excel.ImportEpidemicSpecialAttention; import com.epmet.excel.error.EpidemicSpecialAttentionErrorModel; import com.epmet.feign.EpmetCommonServiceOpenFeignClient; +import com.epmet.feign.GovOrgOpenFeignClient; import com.epmet.feign.OssFeignClient; import com.epmet.service.IcEpidemicSpecialAttentionService; import com.epmet.service.IcNoticeService; @@ -53,6 +55,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.util.*; +import java.util.function.Function; import java.util.stream.Collectors; /** @@ -71,6 +74,8 @@ public class IcEpidemicSpecialAttentionServiceImpl extends BaseServiceImpl page(Map params) { @@ -160,10 +165,28 @@ public class IcEpidemicSpecialAttentionServiceImpl extends BaseServiceImpl houseInfoMap = new HashMap<>(); + //查询房屋信息 + if (result.getList().size() > NumConstant.ZERO) { + Set houseIds = result.getList().stream().filter(l -> StringUtils.isNotBlank(l.getHomeId())).map(m -> m.getHomeId()).collect(Collectors.toSet()); + Result> houseInfoRes = govOrgOpenFeignClient.queryListHouseInfo(houseIds, formDTO.getCustomerId()); + List houseInfoDTOList = houseInfoRes.success() && !CollectionUtils.isEmpty(houseInfoRes.getData()) ? houseInfoRes.getData() : new ArrayList<>(); + houseInfoMap = houseInfoDTOList.stream().collect(Collectors.toMap(HouseInfoDTO::getHomeId, Function.identity())); + } + int i = (formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize(); for (VaccinationListResultDTO v : result.getList()) { i += 1; v.setSort(i); + if (null != houseInfoMap && houseInfoMap.containsKey(v.getHomeId())) { + v.setVillageName(houseInfoMap.get(v.getHomeId()).getNeighborHoodName()); + v.setBuildName(houseInfoMap.get(v.getHomeId()).getBuildingName()); + v.setUnitName(houseInfoMap.get(v.getHomeId()).getUnitName()); + v.setHomeName(houseInfoMap.get(v.getHomeId()).getDoorName()); + v.setAllName(houseInfoMap.get(v.getHomeId()).getAllName()); + } } return result; } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml index 0340d288bd..2b063d7094 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml @@ -26,13 +26,18 @@ a.ID_CARD, a.reason, a.REMARK, + b.VILLAGE_ID, + b.BUILD_ID, + b.UNIT_ID, + b.HOME_ID, IFNULL((SELECT DATE_FORMAT(CREATED_TIME,'%Y-%m-%d %H:%i:%s') FROM ic_notice WHERE DEL_FLAG = '0' AND ORIGIN = #{attentionType} AND ID_CARD = a.ID_CARD ORDER BY CREATED_TIME DESC LIMIT 1),'') AS lastInformTime, IFNULL(v.vaccinationCount,0) AS vaccinationCount FROM ic_epidemic_special_attention a + LEFT JOIN ic_resi_user b ON a.id_card = b.id_card LEFT JOIN (SELECT id_card ,count(1) AS vaccinationCount FROM ic_vaccine WHERE DEL_FLAG = 0 GROUP BY ID_CARD) v ON (v.ID_CARD = a.ID_CARD) WHERE a.DEL_FLAG = 0 AND a.ORG_ID = #{orgId} - AND ATTENTION_TYPE = #{attentionType} + AND a.ATTENTION_TYPE = #{attentionType} AND a.`NAME` LIKE CONCAT('%',#{name},'%') @@ -42,6 +47,18 @@ AND a.ID_CARD LIKE CONCAT('%',#{idCard},'%') + + AND b.village_id = #{villageId} + + + AND b.build_id = #{buildId} + + + AND b.unit_id = #{unitId} + + + AND b.home_id = #{homeId} + HAVING vaccinationCount = #{vaccinationCount} @@ -56,11 +73,16 @@ a.ID_CARD, a.REMARK, a.REASON, + b.VILLAGE_ID, + b.BUILD_ID, + b.UNIT_ID, + b.HOME_ID, IFNULL((SELECT DATE_FORMAT(CREATED_TIME,'%Y-%m-%d %H:%i:%s') FROM ic_notice WHERE DEL_FLAG = '0' AND ORIGIN = #{attentionType} AND ID_CARD = a.ID_CARD ORDER BY CREATED_TIME DESC LIMIT 1),'') AS lastInformTime FROM ic_epidemic_special_attention a + LEFT JOIN ic_resi_user b ON a.id_card = b.id_card WHERE a.DEL_FLAG = 0 AND a.ORG_ID = #{orgId} - AND ATTENTION_TYPE = #{attentionType} + AND a.ATTENTION_TYPE = #{attentionType} AND a.`NAME` LIKE CONCAT('%',#{name},'%') @@ -76,6 +98,18 @@ AND a.REMARK LIKE CONCAT('%',#{remark},'%') + + AND b.village_id = #{villageId} + + + AND b.build_id = #{buildId} + + + AND b.unit_id = #{unitId} + + + AND b.home_id = #{homeId} + ORDER BY a.CREATED_TIME DESC From 45477714089131a74b132ce9fcc2569cd803448b Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 13 Apr 2022 10:24:31 +0800 Subject: [PATCH 039/127] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E6=8E=92=E5=BA=8F?= =?UTF-8?q?=E8=A7=84=E5=88=99=EF=BC=9A=E6=A0=B9=E6=8D=AE=E5=B0=8F=E5=8C=BA?= =?UTF-8?q?=E3=80=81=E6=A5=BC=E6=A0=8B=E3=80=81=E5=8D=95=E5=85=83=E3=80=81?= =?UTF-8?q?=E9=97=A8=E7=89=8C=E5=8F=B7(=E5=88=86=E5=88=AB=E6=8C=89?= =?UTF-8?q?=E7=85=A7=E6=95=B0=E5=AD=97=E5=92=8C=E4=B8=AD=E6=96=87)?= =?UTF-8?q?=E5=88=86=E5=88=AB=E5=8D=87=E5=BA=8F=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/controller/HouseController.java | 9 +- .../main/java/com/epmet/dao/IcHouseDao.java | 11 +- .../java/com/epmet/service/HouseService.java | 3 +- .../epmet/service/impl/HouseServiceImpl.java | 9 +- .../src/main/resources/mapper/IcHouseDao.xml | 152 +----------------- 5 files changed, 15 insertions(+), 169 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java index d001801185..316ab3e12f 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java @@ -89,11 +89,9 @@ public class HouseController implements ResultDataResolver { //效验数据 ValidatorUtils.validateEntity(formDTO); - String queryScene = "house_manage"; - IcNeighborHoodResultDTO icNeighborHoodResultDTO = houseService.listNeighborhood(null, formDTO.getBuildingId(), formDTO.getOwnerName(), formDTO.getOwnerPhone(), null, - null, queryScene, + null, formDTO.getPageNo(), formDTO.getPageSize(),formDTO.getId(),formDTO.getLevel(),formDTO.getRentFlag()); return new Result().ok(icNeighborHoodResultDTO); @@ -129,9 +127,6 @@ public class HouseController implements ResultDataResolver { buildingName = null; } - // 使用场景:社区查询 - String scene = "community_search"; - LoginUserDetailsFormDTO form = new LoginUserDetailsFormDTO(); form.setUserId(loginUser.getUserId()); form.setClient(loginUser.getClient()); @@ -142,7 +137,7 @@ public class HouseController implements ResultDataResolver { null); IcNeighborHoodResultDTO icNeighborHoodResultDTO = houseService.listNeighborhood(loginUserDetail.getAgencyId(),null, null, null, - neighborhoodName, buildingName, scene, formDTO.getPageNo(), formDTO.getPageSize(),null,null,null); + neighborhoodName, buildingName, formDTO.getPageNo(), formDTO.getPageSize(),null,null,null); return new Result().ok(icNeighborHoodResultDTO); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java index 686f2f01b8..6841d60ce3 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java @@ -24,14 +24,6 @@ import java.util.Set; @Mapper public interface IcHouseDao extends BaseDao { -// IPage> searchHouseByPage(IPage page, -// @Param(Constants.WRAPPER) QueryWrapper neighborHoodEntityQueryWrapper, -// @Param("ew1") QueryWrapper buildingEntityQueryWrapper, -// @Param("ew2") QueryWrapper houseEntityQueryWrapper); -// IPage> searchHouseByPage(IPage page, -// @Param("neighbor") IcNeighborHoodEntity neighbor, -// @Param("building") IcBuildingEntity building, -// @Param("house") IcHouseEntity house); IPage> searchHouseByPage(IPage page, @Param("pids") String pids, @Param("buildingId") String buildingId, @@ -39,7 +31,6 @@ public interface IcHouseDao extends BaseDao { @Param("ownerPhone") String ownerPhone, @Param("neighborHoodName") String neighborHoodName, @Param("buildingName") String buildingName, - @Param("queryScene") String queryScene, @Param("id")String id, @Param("level")String level, @Param("rentFlag")String rentFlag); @@ -104,4 +95,4 @@ public interface IcHouseDao extends BaseDao { */ List getHousesNameByIdCards(@Param("idCards") List idCards); -} \ No newline at end of file +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java index 59e7e3c973..04413fb902 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java @@ -60,7 +60,6 @@ public interface HouseService { String ownerPhone, String neighborHoodName, String buildingName, - String queryScene, Integer pageNo, Integer pageSize, String id, @@ -82,4 +81,4 @@ public interface HouseService { void allDelete(NeighborHoodManageDelFormDTO formDTO); HouseInfoDTO getHouseInfoDTO(String customerId,String houseId); -} \ No newline at end of file +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java index cbf82419a4..6d92f82fab 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; +import com.epmet.commons.tools.enums.OrgTypeEnum; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.RenException; @@ -254,26 +255,22 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { String ownerPhone, String neighborHoodName, String buildingName, - String queryScene, Integer pageNo, Integer pageSize, String id,String level, String rentFlag) { IcNeighborHoodResultDTO result = new IcNeighborHoodResultDTO(); - //如果类型是house 查房屋 - //IPage> resultMap = searchHouse(buildingId, ownerName, ownerPhone, neighborHoodName, buildingName, pageNo, pageSize); - // 查询pids String pids = null; if (StringUtils.isNotBlank(ancestorAgencyId)) { pids = getPids(ancestorAgencyId); } - if (StringUtils.isNotBlank(level) && level.equals("agency")){ + if (StringUtils.isNotBlank(level) && OrgTypeEnum.AGENCY.getCode().equals(level)){ pids = getPids(ancestorAgencyId); } IPage page = new Page(pageNo,pageSize); - IPage> mapIPage = icHouseDao.searchHouseByPage(page, pids, buildingId, ownerName, ownerPhone, neighborHoodName, buildingName, queryScene,id,level,rentFlag); + IPage> mapIPage = icHouseDao.searchHouseByPage(page, pids, buildingId, ownerName, ownerPhone, neighborHoodName, buildingName,id,level,rentFlag); List> records = mapIPage.getRecords(); records.forEach(item->{ item.put("houseType", HouseTypeEnums.getTypeValue(item.get("houseTypeKey"))); diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml index 19e99c1eff..b2b6b99b29 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml @@ -70,83 +70,6 @@ ) - - - From 6afd52ccdc22c49b703c34617a965d5e4adb6534 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 13 Apr 2022 11:15:08 +0800 Subject: [PATCH 043/127] searchbycategory --- .../main/java/com/epmet/controller/IcResiUserController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java index 791072218d..86a403a58f 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java @@ -543,7 +543,7 @@ public class IcResiUserController implements ResultDataResolver { * @param tokenDto * @return 根据分类搜索 */ - @PostMapping("search") + @PostMapping("searchbycategory") public Result> search(@RequestBody SearchByNameFormDTO formDTO, @LoginUser TokenDto tokenDto) { formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setUserId(tokenDto.getUserId()); From bd48565237dc33b73a3a95098659c930c09d9baf Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 13 Apr 2022 11:23:35 +0800 Subject: [PATCH 044/127] searchbycategory --- .../src/main/resources/mapper/IcResiUserDao.xml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml index 55eccd5e1d..7ccfbbeb99 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml @@ -196,7 +196,12 @@ `NAME`, VILLAGE_ID AS neighborHoodId, BUILD_ID, - GRID_ID + GRID_ID, + MOBILE, + GENDER, + ID_CARD, + BIRTHDAY, + REMARKS FROM ic_resi_user WHERE DEL_FLAG = '0' AND (AGENCY_ID = #{agencyId} OR PIDS LIKE CONCAT('%',#{agencyId},'%')) From 62dfc30b50134942e9432ce6e712dec56691d6cb Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 13 Apr 2022 12:28:51 +0800 Subject: [PATCH 045/127] =?UTF-8?q?=E6=80=A7=E5=88=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcResiUserDao.xml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml index 7ccfbbeb99..6ca3dbebf1 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml @@ -198,10 +198,14 @@ BUILD_ID, GRID_ID, MOBILE, - GENDER, + ( case when GENDER='1'then '男' + when GENDER='2' then '女' + else '未知' + end + ) as GENDER, ID_CARD, - BIRTHDAY, - REMARKS + IFNULL(BIRTHDAY,'') AS BIRTHDAY, + IFNULL(REMARKS,'') AS REMARKS FROM ic_resi_user WHERE DEL_FLAG = '0' AND (AGENCY_ID = #{agencyId} OR PIDS LIKE CONCAT('%',#{agencyId},'%')) From 3c8be09c74459afe49a2ce7b1b1b3d0d1814638a Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Wed, 13 Apr 2022 13:43:21 +0800 Subject: [PATCH 046/127] =?UTF-8?q?=E5=85=9A=E5=91=98=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/PartyMemberListFormDTO.java | 5 +- .../controller/IcResiUserController.java | 111 ++++++++++++++++++ .../excel/PartyMemberAgeExportExcel.java | 21 ++++ .../PartyMemberEducationExportExcel.java | 21 ++++ .../service/impl/IcResiUserServiceImpl.java | 27 ++++- .../main/resources/mapper/IcResiUserDao.xml | 2 + 6 files changed, 178 insertions(+), 9 deletions(-) create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/excel/PartyMemberAgeExportExcel.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/excel/PartyMemberEducationExportExcel.java diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PartyMemberListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PartyMemberListFormDTO.java index a6ffad6477..39ce7f3a9d 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PartyMemberListFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PartyMemberListFormDTO.java @@ -1,5 +1,6 @@ package com.epmet.dto.form; +import com.epmet.commons.tools.dto.form.PageFormDTO; import lombok.Data; import javax.validation.constraints.NotBlank; @@ -11,7 +12,7 @@ import java.io.Serializable; * @Date 2021/12/10 15:49 */ @Data -public class PartyMemberListFormDTO implements Serializable { +public class PartyMemberListFormDTO extends PageFormDTO implements Serializable { private static final long serialVersionUID = -6085134769034337175L; @NotBlank(message = "组织类型不能为空") @@ -19,6 +20,4 @@ public class PartyMemberListFormDTO implements Serializable { @NotBlank(message = "组织ID不能为空") private String orgId; private String code; - private Integer pageNo = 1; - private Integer pageSize = 20; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java index 86a403a58f..4d2444d767 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java @@ -43,6 +43,7 @@ import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.security.user.LoginUserUtil; import com.epmet.commons.tools.utils.*; +import com.epmet.commons.tools.utils.poi.excel.FreezeAndFilter; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.constant.SystemMessageType; import com.epmet.constants.ImportTaskConstants; @@ -50,6 +51,8 @@ import com.epmet.dto.IcResiUserDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.*; import com.epmet.enums.IcResiUserTableEnum; +import com.epmet.excel.PartyMemberAgeExportExcel; +import com.epmet.excel.PartyMemberEducationExportExcel; import com.epmet.excel.support.ExportResiUserItemDTO; import com.epmet.feign.EpmetMessageOpenFeignClient; import com.epmet.feign.OperCustomizeOpenFeignClient; @@ -59,6 +62,7 @@ import com.epmet.service.IcResiUserService; import feign.RequestInterceptor; import jodd.io.FileUtil; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.io.FileUtils; import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.IOUtils; @@ -84,6 +88,7 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.util.*; import java.util.concurrent.ExecutorService; +import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; @@ -653,6 +658,56 @@ public class IcResiUserController implements ResultDataResolver { return new Result>().ok(icResiUserService.getPartyMemberAgeList(formDTO)); } + @NoRepeatSubmit + @PostMapping("partymemberagelist/export") + public void partyMemberAgeListExport(@LoginUser TokenDto tokenDto, @RequestBody PartyMemberListFormDTO formDTO, HttpServletResponse response) { + ExcelWriter excelWriter = null; + formDTO.setPageSize(NumConstant.TEN_THOUSAND); + formDTO.setIsPage(false); + List exportList = new ArrayList<>(); + try { + String fileName = ""; + switch (formDTO.getCode()) { + case NumConstant.ZERO_STR: + fileName = "50岁以下党员信息.xlsx"; + break; + case NumConstant.ONE_STR: + fileName = "50-59岁党员信息.xlsx"; + break; + case NumConstant.TWO_STR: + fileName = "60-69岁党员信息.xlsx"; + break; + case NumConstant.THREE_STR: + fileName = "70-79岁党员信息.xlsx"; + break; + case NumConstant.FOUR_STR: + fileName = "80岁以上党员信息.xlsx"; + break; + default: + fileName = "党员年龄信息.xlsx"; + break; + } + excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response), PartyMemberAgeExportExcel.class).build(); + WriteSheet writeSheet = EasyExcel.writerSheet("党员列表").registerWriteHandler(new FreezeAndFilter()).build(); + List list = icResiUserService.getPartyMemberAgeList(formDTO).getList(); + AtomicInteger i = new AtomicInteger(1); + if (CollectionUtils.isNotEmpty(list)) { + exportList = list.stream().map(item -> { + PartyMemberAgeExportExcel excel = ConvertUtils.sourceToTarget(item, PartyMemberAgeExportExcel.class); + excel.setIndex(i.getAndIncrement()); + return excel; + }).collect(Collectors.toList()); + } + excelWriter.write(exportList, writeSheet); + } catch (Exception e) { + log.error("export exception", e); + } finally { + if (excelWriter != null) { + excelWriter.finish(); + } + } + } + /** * 党员学历统计 * @Param formDTO @@ -679,6 +734,62 @@ public class IcResiUserController implements ResultDataResolver { return new Result>().ok(icResiUserService.getPartyMemberEducationList(formDTO)); } + @NoRepeatSubmit + @PostMapping("partymembereducationlist/export") + public void partyMemberEducationListExport(@LoginUser TokenDto tokenDto, @RequestBody PartyMemberListFormDTO formDTO, HttpServletResponse response) { + ExcelWriter excelWriter = null; + formDTO.setPageSize(NumConstant.TEN_THOUSAND); + formDTO.setIsPage(false); + List exportList = new ArrayList<>(); + try { + String fileName = ""; + switch (formDTO.getCode()) { + case NumConstant.ZERO_STR: + fileName = "小学及文盲党员信息.xlsx"; + break; + case NumConstant.ONE_STR: + fileName = "初中学历党员信息.xlsx"; + break; + case NumConstant.TWO_STR: + fileName = "高中学历党员信息.xlsx"; + break; + case NumConstant.THREE_STR: + fileName = "大专学历党员信息.xlsx"; + break; + case NumConstant.FOUR_STR: + fileName = "本科学历党员信息.xlsx"; + break; + case NumConstant.FIVE_STR: + fileName = "硕士学历党员信息.xlsx"; + break; + case NumConstant.SIX_STR: + fileName = "博士学历党员信息.xlsx"; + break; + default: + fileName = "党员学历信息.xlsx"; + break; + } + excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response), PartyMemberEducationExportExcel.class).build(); + WriteSheet writeSheet = EasyExcel.writerSheet("党员列表").registerWriteHandler(new FreezeAndFilter()).build(); + List list = icResiUserService.getPartyMemberEducationList(formDTO).getList(); + AtomicInteger i = new AtomicInteger(1); + if (CollectionUtils.isNotEmpty(list)) { + exportList = list.stream().map(item -> { + PartyMemberEducationExportExcel excel = ConvertUtils.sourceToTarget(item, PartyMemberEducationExportExcel.class); + excel.setIndex(i.getAndIncrement()); + return excel; + }).collect(Collectors.toList()); + } + excelWriter.write(exportList, writeSheet); + } catch (Exception e) { + log.error("export exception", e); + } finally { + if (excelWriter != null) { + excelWriter.finish(); + } + } + } + /** * 根据居民id查询居民信息简介 * @param resiUserId diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/PartyMemberAgeExportExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/PartyMemberAgeExportExcel.java new file mode 100644 index 0000000000..c8a6e6f8d0 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/PartyMemberAgeExportExcel.java @@ -0,0 +1,21 @@ +package com.epmet.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +/** + * @Description + * @Author zhaoqifeng + * @Date 2022/4/13 10:46 + */ +@Data +public class PartyMemberAgeExportExcel { + @Excel(name = "序号", width = 10) + private Integer index; + @Excel(name = "姓名", width = 20) + private String name; + @Excel(name = "年龄", width = 10) + private String age; + @Excel(name = "手机号码", width = 30) + private String mobile; +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/PartyMemberEducationExportExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/PartyMemberEducationExportExcel.java new file mode 100644 index 0000000000..1ec5f8033d --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/PartyMemberEducationExportExcel.java @@ -0,0 +1,21 @@ +package com.epmet.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +/** + * @Description + * @Author zhaoqifeng + * @Date 2022/4/13 10:46 + */ +@Data +public class PartyMemberEducationExportExcel { + @Excel(name = "序号", width = 10) + private Integer index; + @Excel(name = "姓名", width = 20) + private String name; + @Excel(name = "学历", width = 10) + private String education; + @Excel(name = "手机号码", width = 30) + private String mobile; +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index 28b46cbc9d..50f46409a4 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -1483,10 +1483,14 @@ public class IcResiUserServiceImpl extends BaseServiceImpl getPartyMemberAgeList(PartyMemberListFormDTO formDTO) { - PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()); + if (formDTO.getIsPage()) { + PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()); + List list = baseDao.getPartyMemberAgeList(formDTO.getOrgType(), formDTO.getOrgId(), formDTO.getCode()); + PageInfo pageInfo = new PageInfo<>(list); + return new PageData<>(list, pageInfo.getTotal()); + } List list = baseDao.getPartyMemberAgeList(formDTO.getOrgType(), formDTO.getOrgId(), formDTO.getCode()); - PageInfo pageInfo = new PageInfo<>(list); - return new PageData<>(list, pageInfo.getTotal()); + return new PageData<>(list, null == list?NumConstant.ZERO:list.size()); } /** @@ -1542,15 +1546,26 @@ public class IcResiUserServiceImpl extends BaseServiceImpl getPartyMemberEducationList(PartyMemberListFormDTO formDTO) { - PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()); + if (formDTO.getIsPage()) { + PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()); + List list = baseDao.getPartyMemberEducationList(formDTO.getOrgType(), formDTO.getOrgId(), formDTO.getCode()); + Result> mapResult = epmetAdminOpenFeignClient.dictMap(DictTypeEnum.EDUCATION.getCode()); + PageInfo pageInfo = new PageInfo<>(list); + if (CollectionUtils.isNotEmpty(list)) { + list.forEach(item -> { + item.setEducation(null == mapResult.getData().get(item.getEducation()) ? "" : mapResult.getData().get(item.getEducation())); + }); + } + return new PageData<>(list, pageInfo.getTotal()); + } List list = baseDao.getPartyMemberEducationList(formDTO.getOrgType(), formDTO.getOrgId(), formDTO.getCode()); Result> mapResult = epmetAdminOpenFeignClient.dictMap(DictTypeEnum.EDUCATION.getCode()); - PageInfo pageInfo = new PageInfo<>(list); if (CollectionUtils.isNotEmpty(list)) { list.forEach(item -> { item.setEducation(null == mapResult.getData().get(item.getEducation()) ? "" : mapResult.getData().get(item.getEducation())); }); } - return new PageData<>(list, pageInfo.getTotal()); + return new PageData<>(list, null == list?NumConstant.ZERO:list.size()); + } } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml index 6ca3dbebf1..a70ffddac0 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml @@ -468,6 +468,7 @@ WHERE ageGroup = #{code} + ORDER BY CONVERT(NAME USING GBK) ASC --> - select a.BUILDING_NAME as buildingName, b.NEIGHBOR_HOOD_NAME as neighborHoodName, @@ -86,30 +86,25 @@ LEFT JOIN ic_neighbor_hood b on a.NEIGHBOR_HOOD_ID = b.ID and b.DEL_FLAG='0' left join customer_agency c on b.AGENCY_ID = c.ID and c.DEL_FLAG='0' - left join customer_grid d on b.GRID_ID = d.ID and d.DEL_FLAG='0' - - AND a.NEIGHBOR_HOOD_ID = #{building.neighborHoodId} + + AND a.NEIGHBOR_HOOD_ID = #{neighborHoodId} - - + AND a.ID in (select distinct BUILDING_ID from ic_house e - - AND e.OWNER_NAME = #{house.ownerName} + + AND e.OWNER_NAME = #{ownerName} - - AND e.OWNER_PHONE = #{house.ownerPhone} + + AND e.OWNER_PHONE = #{ownerPhone} and e.DEL_FLAG='0' ) - - - AND a.DEL_FLAG = #{building.delFlag} - + AND a.DEL_FLAG = '0' order by a.CREATED_TIME, a.BUILDING_NAME diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml index b2b6b99b29..b1d5a5161a 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml @@ -70,7 +70,7 @@ ) - select a.HOUSE_NAME as houseName, c.NEIGHBOR_HOOD_NAME as neighborHoodName, @@ -138,7 +138,7 @@ and a.del_flag = '0' - /*排序规则：根据小区、楼栋、单元、门牌号(分别按照数字和中文)分别升序排序*/ + #排序规则：根据小区、楼栋、单元、门牌号(分别按照数字和中文)分别升序排序 ORDER BY CONVERT(c.NEIGHBOR_HOOD_NAME using gbk), CONVERT(b.BUILDING_NAME USING gbk), CONVERT(d.UNIT_NAME USING gbk), @@ -176,6 +176,11 @@ AND a.DEL_FLAG = #{house.delFlag} + ORDER BY CONVERT(c.NEIGHBOR_HOOD_NAME using gbk), + CONVERT(b.BUILDING_NAME USING gbk), + CONVERT(d.UNIT_NAME USING gbk), + CAST(a.DOOR_NAME AS SIGNED), + CONVERT(a.DOOR_NAME using gbk) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml index acc02135cf..e36c72ca8f 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml @@ -57,54 +57,48 @@ --> - select - a.id as neighborHoodId, - a.NEIGHBOR_HOOD_NAME as neighborHoodName, - b.ORGANIZATION_NAME as agencyName, - c.GRID_NAME as gridName, - a.ADDRESS as address, - a.REMARK as remark, - b.ID as agencyId, - c.ID as gridId, - d.PROPERTY_ID as propertyId , - a.LOCATION as location, - a.LONGITUDE as longitude, - a.LATITUDE as latitude + a.id as neighborHoodId, + a.NEIGHBOR_HOOD_NAME as neighborHoodName, + b.ORGANIZATION_NAME as agencyName, + c.GRID_NAME as gridName, + a.ADDRESS as address, + a.REMARK as remark, + b.ID as agencyId, + c.ID as gridId, + d.PROPERTY_ID as propertyId , + a.LOCATION as location, + a.LONGITUDE as longitude, + a.LATITUDE as latitude from ic_neighbor_hood a - left join customer_agency b on a.AGENCY_ID = b.ID and b.DEL_FLAG='0' - left join customer_grid c on a.GRID_ID = c.ID and c.DEL_FLAG='0' - left join ic_neighbor_hood_property d on a.ID = d.NEIGHBOR_HOOD_ID and d.DEL_FLAG='0' - - AND a.GRID_ID = #{neighbor.gridId} + + AND a.GRID_ID = #{gridId} - - AND (a.AGENCY_ID = #{neighbor.agencyId} or CONCAT(':',a.AGENCY_PIDS, ':') like CONCAT('%:',#{neighbor.agencyId},':%')) + + AND (a.AGENCY_ID = #{agencyId} or CONCAT(':',a.AGENCY_PIDS, ':') like CONCAT('%:',#{agencyId},':%')) - + AND a.ID in (select NEIGHBOR_HOOD_ID from ic_house e - - AND e.OWNER_NAME like concat('%',#{house.ownerName},'%') + + AND e.OWNER_NAME like concat('%',#{ownerName},'%') - - AND e.OWNER_PHONE like concat('%',#{house.ownerPhone},'%') + + AND e.OWNER_PHONE like concat('%',#{ownerPhone},'%') and e.DEL_FLAG='0' ) + AND a.DEL_FLAG = '0' - - - AND a.DEL_FLAG = #{neighbor.delFlag} - ORDER BY a.CREATED_TIME From 628bcae96cec914a88617a83af93cb986c98de79 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Wed, 13 Apr 2022 14:57:38 +0800 Subject: [PATCH 052/127] =?UTF-8?q?=E8=81=94=E5=BB=BA=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BD=91=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/entity/LatestActInfoEntity.java | 2 +- .../service/impl/WorkActDraftServiceImpl.java | 46 ++++++++++--------- 2 files changed, 26 insertions(+), 22 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/LatestActInfoEntity.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/LatestActInfoEntity.java index 491ed210f8..011a57519f 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/LatestActInfoEntity.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/LatestActInfoEntity.java @@ -43,7 +43,7 @@ public class LatestActInfoEntity extends BaseEpmetEntity { * 客户id */ private String customerId; - + private String gridId; /** * 活动标题 */ diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActDraftServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActDraftServiceImpl.java index a5fb199d5a..99fda3fbcf 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActDraftServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActDraftServiceImpl.java @@ -18,6 +18,7 @@ import com.epmet.dto.result.work.*; import com.epmet.entity.LatestActServiceRelationEntity; import com.epmet.entity.LatestActUnitRelationEntity; import com.epmet.service.*; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -133,29 +134,32 @@ public class WorkActDraftServiceImpl implements WorkActDraftService { //保存活动与服务关系 latestActServiceRelationService.deleteByAct(actDraftId); - AtomicInteger i = new AtomicInteger(NumConstant.ONE); - List serviceList = formDTO.getServiceMatterList().stream().map(service -> { - LatestActServiceRelationEntity entity = new LatestActServiceRelationEntity(); - entity.setCustomerId(formDTO.getCustomerId()); - entity.setActId(actDraftId); - entity.setServiceMatter(service); - entity.setSort(i.getAndIncrement()); - return entity; - }).collect(Collectors.toList()); - latestActServiceRelationService.insertBatch(serviceList); - + if (CollectionUtils.isNotEmpty(formDTO.getServiceMatterList())) { + AtomicInteger i = new AtomicInteger(NumConstant.ONE); + List serviceList = formDTO.getServiceMatterList().stream().map(service -> { + LatestActServiceRelationEntity entity = new LatestActServiceRelationEntity(); + entity.setCustomerId(formDTO.getCustomerId()); + entity.setActId(actDraftId); + entity.setServiceMatter(service); + entity.setSort(i.getAndIncrement()); + return entity; + }).collect(Collectors.toList()); + latestActServiceRelationService.insertBatch(serviceList); + } //保存活动与单位关系 latestActUnitRelationService.deleteByAct(actDraftId); - AtomicInteger j = new AtomicInteger(NumConstant.ONE); - List unitList = formDTO.getUnitIdList().stream().map(unitId -> { - LatestActUnitRelationEntity entity = new LatestActUnitRelationEntity(); - entity.setCustomerId(formDTO.getCustomerId()); - entity.setActId(actDraftId); - entity.setUnitId(unitId); - entity.setSort(j.getAndIncrement()); - return entity; - }).collect(Collectors.toList()); - latestActUnitRelationService.insertBatch(unitList); + if (CollectionUtils.isNotEmpty(formDTO.getServiceMatterList())) { + AtomicInteger j = new AtomicInteger(NumConstant.ONE); + List unitList = formDTO.getUnitIdList().stream().map(unitId -> { + LatestActUnitRelationEntity entity = new LatestActUnitRelationEntity(); + entity.setCustomerId(formDTO.getCustomerId()); + entity.setActId(actDraftId); + entity.setUnitId(unitId); + entity.setSort(j.getAndIncrement()); + return entity; + }).collect(Collectors.toList()); + latestActUnitRelationService.insertBatch(unitList); + } return resultDTO; } From 26a007cce48ecda032dde993556e40a26dd9a254 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 13 Apr 2022 14:58:02 +0800 Subject: [PATCH 053/127] =?UTF-8?q?=E5=B0=8F=E5=8C=BA=E6=88=BF=E5=B1=8B?= =?UTF-8?q?=E6=A5=BC=E5=AE=87=E6=9F=A5=E8=AF=A2=E5=88=97=E8=A1=A8=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=94=E5=9B=9E=E5=AF=B9=E8=B1=A1=E4=B8=BA?= =?UTF-8?q?=E5=AE=9E=E4=BD=93=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/result/IcHouseListResultDTO.java | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseListResultDTO.java diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseListResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseListResultDTO.java new file mode 100644 index 0000000000..20a500cc85 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseListResultDTO.java @@ -0,0 +1,38 @@ + +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * desc:房屋列表结果类 + * @author liujianjun + */ +@Data +public class IcHouseListResultDTO implements Serializable { + + + private static final long serialVersionUID = 4963952996288796744L; + + private String houseId; + private String ownerPhone; + private String purpose; + private String doorName; + private String houseType; + private String unitNum; + private String agencyId; + private String buildingId; + private String houseName; + private String buildingName; + private String rentFlag; + private String ownerName; + private String neighborHoodId; + private String purposeKey; + private String neighborHoodName; + private String unitNumKey; + private String ownerIdCard; + private String gridId; + private String houseTypeKey; + private Boolean rentFlagKey; +} From 3e6740a0b9d7afd59803176204cda36a40651f83 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 13 Apr 2022 15:07:34 +0800 Subject: [PATCH 054/127] =?UTF-8?q?=E5=B0=8F=E5=8C=BA=E6=88=BF=E5=B1=8B?= =?UTF-8?q?=E6=A5=BC=E5=AE=87=E6=9F=A5=E8=AF=A2=E5=88=97=E8=A1=A8=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=94=E5=9B=9E=E5=AF=B9=E8=B1=A1=E4=B8=BA?= =?UTF-8?q?=E5=AE=9E=E4=BD=93=E7=B1=BB3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/controller/NeighborHoodController.java | 3 ++- .../main/java/com/epmet/service/NeighborHoodService.java | 5 +++-- .../com/epmet/service/impl/NeighborHoodServiceImpl.java | 7 ++++--- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/NeighborHoodController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/NeighborHoodController.java index 5c813ea6a8..f7c669b5d9 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/NeighborHoodController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/NeighborHoodController.java @@ -31,6 +31,7 @@ import com.epmet.dao.IcBuildingDao; import com.epmet.dto.form.IcHouseListFormDTO; import com.epmet.dto.form.IcNeighborHoodAddFormDTO; import com.epmet.dto.form.IcNeighborHoodListFormDTO; +import com.epmet.dto.result.IcNeighborHoodResultDTO; import com.epmet.entity.IcBuildingEntity; import com.epmet.excel.IcNeighborHoodExcel; import com.epmet.service.BuildingService; @@ -77,7 +78,7 @@ public class NeighborHoodController { @PostMapping("neighborhoodlist") - public Result neighborhoodlist(@RequestBody IcNeighborHoodListFormDTO formDTO){ + public Result neighborhoodlist(@RequestBody IcNeighborHoodListFormDTO formDTO){ //效验数据 ValidatorUtils.validateEntity(formDTO); return new Result().ok(neighborHoodService.listNeighborhood(formDTO)); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/NeighborHoodService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/NeighborHoodService.java index 7f6b814440..78b55aea8b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/NeighborHoodService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/NeighborHoodService.java @@ -18,9 +18,10 @@ package com.epmet.service; import com.epmet.commons.tools.page.PageData; -import com.epmet.dto.form.IcNeighborHoodAddFormDTO; import com.epmet.dto.form.IcHouseListFormDTO; +import com.epmet.dto.form.IcNeighborHoodAddFormDTO; import com.epmet.dto.form.IcNeighborHoodListFormDTO; +import com.epmet.dto.result.IcNeighborHoodResultDTO; import com.epmet.excel.IcNeighborHoodExcel; import javax.servlet.http.HttpServletResponse; @@ -36,7 +37,7 @@ public interface NeighborHoodService{ void addNeighborhood(String customerId, IcNeighborHoodAddFormDTO formDTO); - PageData listNeighborhood(IcNeighborHoodListFormDTO formDTO); + PageData listNeighborhood(IcNeighborHoodListFormDTO formDTO); void updateNeighborhood(String customerId, IcNeighborHoodAddFormDTO formDTO); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java index f79f02204c..5cdde1e697 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java @@ -15,9 +15,10 @@ import com.epmet.dao.*; import com.epmet.dto.CustomerAgencyDTO; import com.epmet.dto.IcNeighborHoodDTO; import com.epmet.dto.IcNeighborHoodPropertyDTO; -import com.epmet.dto.form.IcNeighborHoodAddFormDTO; import com.epmet.dto.form.IcHouseListFormDTO; +import com.epmet.dto.form.IcNeighborHoodAddFormDTO; import com.epmet.dto.form.IcNeighborHoodListFormDTO; +import com.epmet.dto.result.IcNeighborHoodResultDTO; import com.epmet.entity.*; import com.epmet.excel.IcNeighborHoodExcel; import com.epmet.feign.GovOrgOpenFeignClient; @@ -109,7 +110,7 @@ public class NeighborHoodServiceImpl implements NeighborHoodService { * @return */ @Override - public PageData listNeighborhood(IcNeighborHoodListFormDTO formDTO) { + public PageData listNeighborhood(IcNeighborHoodListFormDTO formDTO) { if(NeighborhoodConstant.GRID.equals(formDTO.getLevel())){ //根据网格过滤 formDTO.setGridId(formDTO.getId()); @@ -117,7 +118,7 @@ public class NeighborHoodServiceImpl implements NeighborHoodService { //根据组织过滤 formDTO.setAgencyId(formDTO.getId()); } - PageInfo pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()).doSelectPageInfo(() -> icNeighborHoodDao.searchNeighborhoodByPage(formDTO)); + PageInfo pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()).doSelectPageInfo(() -> icNeighborHoodDao.searchNeighborhoodByPage(formDTO)); return new PageData<>(pageInfo.getList(),pageInfo.getTotal()); } From 5b6a844405a8df3748039ca2279369bc19a345de Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 13 Apr 2022 15:14:50 +0800 Subject: [PATCH 055/127] =?UTF-8?q?=E5=B0=8F=E5=8C=BA=E6=88=BF=E5=B1=8B?= =?UTF-8?q?=E6=A5=BC=E5=AE=87=E6=9F=A5=E8=AF=A2=E5=88=97=E8=A1=A8=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=94=E5=9B=9E=E5=AF=B9=E8=B1=A1=E4=B8=BA?= =?UTF-8?q?=E5=AE=9E=E4=BD=93=E7=B1=BB4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dao/IcNeighborHoodDao.java | 6 ++---- .../src/main/resources/mapper/IcNeighborHoodDao.xml | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java index 8189d0638b..d2adb6c87f 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java @@ -18,8 +18,8 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.dto.form.IcHouseListFormDTO; import com.epmet.dto.form.IcNeighborHoodListFormDTO; +import com.epmet.dto.result.IcNeighborHoodResultDTO; import com.epmet.entity.IcHouseEntity; import com.epmet.entity.IcNeighborHoodEntity; import com.epmet.excel.IcNeighborHoodExcel; @@ -37,10 +37,8 @@ import java.util.List; @Mapper public interface IcNeighborHoodDao extends BaseDao { -// IPage> searchNeighborhoodByPage(IPage page,@Param(Constants.WRAPPER) QueryWrapper neighborHoodEntityQueryWrapper); - List searchNeighborhoodByPage(IcNeighborHoodListFormDTO formDTO); + List searchNeighborhoodByPage(IcNeighborHoodListFormDTO formDTO); -// List searchAllNeighborhood(@Param(Constants.WRAPPER) QueryWrapper neighborHoodEntityQueryWrapper); List searchAllNeighborhood(@Param("neighbor") IcNeighborHoodEntity neighbor, @Param("house")IcHouseEntity house); List selectListByName(@Param("customerId") String customerId, diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml index e36c72ca8f..911fae23fd 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml @@ -57,7 +57,7 @@ --> - select a.id as neighborHoodId, a.NEIGHBOR_HOOD_NAME as neighborHoodName, From bf7f830bbc3b0a3a3c8067d635ca551a101cfa39 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Wed, 13 Apr 2022 15:29:49 +0800 Subject: [PATCH 056/127] =?UTF-8?q?=E8=81=94=E5=BB=BA=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BD=91=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/LatestActInfoDao.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/LatestActInfoDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/LatestActInfoDao.xml index 1bcd53d153..7146af82b8 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/LatestActInfoDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/LatestActInfoDao.xml @@ -102,6 +102,7 @@ - - --> select - a.HOUSE_NAME as houseName, + concat(b.BUILDING_NAME,'-',d.UNIT_NUM,'-',a.DOOR_NAME) as houseName, c.NEIGHBOR_HOOD_NAME as neighborHoodName, b.BUILDING_NAME as buildingName, CONCAT(d.UNIT_NUM,'单元') as unitNum, From 50fe78f58b360130bd174b7e88fd11e992f4b344 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 18 Apr 2022 10:52:18 +0800 Subject: [PATCH 095/127] =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=9B=BE=E8=B0=B1?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=B7=BB=E5=8A=A0status=3D0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcResiUserDao.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml index a70ffddac0..df62d9b6dc 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml @@ -215,6 +215,7 @@ and ${columnName}='1' + AND `STATUS`='0' ORDER BY `NAME` From c85ca814451ae021b25101ca038192f93fe239b0 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 18 Apr 2022 13:23:46 +0800 Subject: [PATCH 096/127] .. --- .../main/resources/mapper/IcEpidemicSpecialAttentionDao.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml index 2b063d7094..4df3c80001 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml @@ -33,7 +33,7 @@ IFNULL((SELECT DATE_FORMAT(CREATED_TIME,'%Y-%m-%d %H:%i:%s') FROM ic_notice WHERE DEL_FLAG = '0' AND ORIGIN = #{attentionType} AND ID_CARD = a.ID_CARD ORDER BY CREATED_TIME DESC LIMIT 1),'') AS lastInformTime, IFNULL(v.vaccinationCount,0) AS vaccinationCount FROM ic_epidemic_special_attention a - LEFT JOIN ic_resi_user b ON a.id_card = b.id_card + LEFT JOIN ic_resi_user b ON a.id_card = b.id_card AND b.del_flag = '0' LEFT JOIN (SELECT id_card ,count(1) AS vaccinationCount FROM ic_vaccine WHERE DEL_FLAG = 0 GROUP BY ID_CARD) v ON (v.ID_CARD = a.ID_CARD) WHERE a.DEL_FLAG = 0 AND a.ORG_ID = #{orgId} @@ -79,7 +79,7 @@ b.HOME_ID, IFNULL((SELECT DATE_FORMAT(CREATED_TIME,'%Y-%m-%d %H:%i:%s') FROM ic_notice WHERE DEL_FLAG = '0' AND ORIGIN = #{attentionType} AND ID_CARD = a.ID_CARD ORDER BY CREATED_TIME DESC LIMIT 1),'') AS lastInformTime FROM ic_epidemic_special_attention a - LEFT JOIN ic_resi_user b ON a.id_card = b.id_card + LEFT JOIN ic_resi_user b ON a.id_card = b.id_card AND b.del_flag = '0' WHERE a.DEL_FLAG = 0 AND a.ORG_ID = #{orgId} AND a.ATTENTION_TYPE = #{attentionType} From f71ea002bbf879bf471a7548987f780a63973ee2 Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 18 Apr 2022 16:38:44 +0800 Subject: [PATCH 097/127] =?UTF-8?q?=E6=A5=BC=E6=A0=8B=E6=88=BF=E5=B1=8B?= =?UTF-8?q?=E5=B0=8F=E5=8C=BA=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/BuildingServiceImpl.java | 5 +++-- .../java/com/epmet/service/impl/IcBuildingServiceImpl.java | 4 ++-- .../java/com/epmet/service/impl/IcHouseServiceImpl.java | 6 +++--- .../com/epmet/service/impl/IcNeighborHoodServiceImpl.java | 2 +- .../src/main/resources/mapper/IcBuildingDao.xml | 4 +++- .../gov-org-server/src/main/resources/mapper/IcHouseDao.xml | 3 ++- 6 files changed, 14 insertions(+), 10 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java index 58666a8d9d..c9b8c75976 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java @@ -180,7 +180,7 @@ public class BuildingServiceImpl implements BuildingService { List gridIdList = customerGridList.stream().map(BaseEpmetEntity::getId).collect(Collectors.toList()); LambdaQueryWrapper queryWrapper = new QueryWrapper().lambda() .in(IcNeighborHoodEntity::getGridId, gridIdList) - .orderByAsc(IcNeighborHoodEntity::getCreatedTime); + .last("ORDER BY CAST(NEIGHBOR_HOOD_NAME AS SIGNED), CONVERT(NEIGHBOR_HOOD_NAME using gbk)"); List icNeighborHoodList = icNeighborHoodDao.selectList(queryWrapper); if(CollectionUtils.isEmpty(icNeighborHoodList)){ agencyList.addAll(gridList); @@ -204,7 +204,8 @@ public class BuildingServiceImpl implements BuildingService { List neighborHoodIdList = icNeighborHoodList.stream().map(BaseEpmetEntity::getId).collect(Collectors.toList()); LambdaQueryWrapper buildingQueryWrapper = new QueryWrapper().lambda() .in(IcBuildingEntity::getNeighborHoodId, neighborHoodIdList) - .orderByAsc(IcBuildingEntity::getCreatedTime,IcBuildingEntity::getBuildingName); + .last("ORDER BY CAST(BUILDING_NAME AS SIGNED), CONVERT(BUILDING_NAME using gbk)"); + //.orderByAsc(IcBuildingEntity::getCreatedTime,IcBuildingEntity::getBuildingName); List icBuildingList = icBuildingDao.selectList(buildingQueryWrapper); if(CollectionUtils.isEmpty(neighborHoodIdList)){ diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java index 122e9755a0..122a6fbd66 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java @@ -120,7 +120,7 @@ public class IcBuildingServiceImpl extends BaseServiceImpl wrapper = new LambdaQueryWrapper<>(); wrapper.eq(IcBuildingEntity::getNeighborHoodId, neighborHoodId); - wrapper.last("ORDER BY CONVERT ( BUILDING_NAME USING gbk ) ASC"); + wrapper.last("ORDER BY CAST(BUILDING_NAME AS SIGNED),CONVERT ( BUILDING_NAME USING gbk ) ASC"); List list = baseDao.selectList(wrapper); if(CollectionUtils.isEmpty(list)) { return Collections.emptyList(); @@ -153,4 +153,4 @@ public class IcBuildingServiceImpl extends BaseServiceImpl wrapper = new LambdaQueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(formDTO.getBuildingId()), IcHouseEntity::getBuildingId, formDTO.getBuildingId()); wrapper.eq(StringUtils.isNotBlank(formDTO.getUnitId()), IcHouseEntity::getBuildingUnitId, formDTO.getUnitId()); - wrapper.last("ORDER BY CONVERT ( HOUSE_NAME USING gbk ) ASC"); + wrapper.last("ORDER BY CAST(DOOR_NAME AS SIGNED), CONVERT (DOOR_NAME USING gbk )"); List list = baseDao.selectList(wrapper); if(CollectionUtils.isEmpty(list)) { return Collections.emptyList(); @@ -160,7 +160,7 @@ public class IcHouseServiceImpl extends BaseServiceImpl wrapper = new LambdaQueryWrapper<>(); wrapper.eq(IcHouseEntity::getBuildingId, formDTO.getBuildingId()); - wrapper.last("ORDER BY CONVERT ( HOUSE_NAME USING gbk ) ASC"); + wrapper.last("ORDER BY ORDER BY CAST(DOOR_NAME AS SIGNED), CONVERT (DOOR_NAME USING gbk ), CONVERT ( HOUSE_NAME USING gbk ) ASC"); List list = baseDao.selectList(wrapper); if(CollectionUtils.isEmpty(list)) { return Collections.emptyList(); @@ -246,4 +246,4 @@ public class IcHouseServiceImpl extends BaseServiceImpl wrapper = new LambdaQueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(agencyId),IcNeighborHoodEntity::getAgencyId, agencyId); wrapper.eq(StringUtils.isNotBlank(gridId), IcNeighborHoodEntity::getGridId, gridId); - wrapper.last("ORDER BY CONVERT ( NEIGHBOR_HOOD_NAME USING gbk ) ASC"); + wrapper.last("ORDER BY CAST(NEIGHBOR_HOOD_NAME AS SIGNED), CONVERT(NEIGHBOR_HOOD_NAME using gbk)"); List list = baseDao.selectList(wrapper); if(CollectionUtils.isEmpty(list)) { return Collections.emptyList(); diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml index d4561898a7..0c0c38aa37 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml @@ -106,7 +106,9 @@ AND a.DEL_FLAG = '0' - order by a.CREATED_TIME, a.BUILDING_NAME + order by + CAST(a.BUILDING_NAME AS SIGNED), + CONVERT(a.BUILDING_NAME using gbk) - SELECT ID, PID, From 6a9c60d8efb3ca92b2f57c777e05fc0d39bdecdc Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 19 Apr 2022 09:33:10 +0800 Subject: [PATCH 100/127] =?UTF-8?q?=E9=94=99=E8=AF=AF=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E8=A1=8C=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/model/BuildingErrorInfoModel.java | 3 +++ .../src/main/java/com/epmet/model/BuildingInfoModel.java | 4 ++++ .../src/main/java/com/epmet/model/HouseErrorInfoModel.java | 2 +- .../main/java/com/epmet/model/ImportBuildingInfoListener.java | 2 ++ .../main/java/com/epmet/model/ImportHouseInfoListener.java | 1 + .../java/com/epmet/model/ImportNeighborHoodInfoListener.java | 2 ++ .../main/java/com/epmet/model/NeighborHoodErrorInfoModel.java | 3 +++ .../src/main/java/com/epmet/model/NeighborHoodInfoModel.java | 4 ++++ 8 files changed, 20 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/BuildingErrorInfoModel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/BuildingErrorInfoModel.java index 7477c1a109..f2746aa90b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/BuildingErrorInfoModel.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/BuildingErrorInfoModel.java @@ -12,6 +12,9 @@ import lombok.Data; @Data public class BuildingErrorInfoModel { + @Excel(name = "行号", width = 20) + private Integer num; + @Excel(name = "小区名称" , width = 20) private String neighborHoodName; diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/BuildingInfoModel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/BuildingInfoModel.java index e76c391324..dac7c09015 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/BuildingInfoModel.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/BuildingInfoModel.java @@ -1,5 +1,6 @@ package com.epmet.model; +import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; import lombok.Data; @@ -35,4 +36,7 @@ public class BuildingInfoModel { @ExcelProperty(value = "户数") private Integer totalHouseNum; + @ExcelIgnore + private Integer num; + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/HouseErrorInfoModel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/HouseErrorInfoModel.java index 4531b2c03f..c49ea51719 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/HouseErrorInfoModel.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/HouseErrorInfoModel.java @@ -13,7 +13,7 @@ import org.hibernate.validator.constraints.Length; @Data public class HouseErrorInfoModel { - @Excel(name = "行号(不计算表头)", width = 20) + @Excel(name = "行号", width = 20) private Integer num; @Excel(name = "所属小区", width = 20) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java index 47681e15d1..cc0bc625ca 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java @@ -86,6 +86,7 @@ public class ImportBuildingInfoListener extends AnalysisEventListener Date: Tue, 19 Apr 2022 09:56:29 +0800 Subject: [PATCH 101/127] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/IcResiUserServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index 50f46409a4..cf96262820 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -173,7 +173,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl NumConstant.ZERO ) { - throw new RenException(String.format("新增居民信息,必要字段值为空,%s值为空", str)); + String errorMsg = String.format("新增居民信息,必要字段值为空,%s值为空", str); + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg); } } else { throw new RenException(String.format("新增居民信息-根据客户Id查询必填信息失败，customerId->%s", tokenDto.getCustomerId())); From 7755de11f6771b4a9e803ff3754a15092f53e3b5 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 19 Apr 2022 10:52:44 +0800 Subject: [PATCH 102/127] =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/controller/BuildingController.java | 56 +---- .../com/epmet/controller/HouseController.java | 6 +- .../controller/NeighborHoodController.java | 115 +-------- .../com/epmet/service/BuildingService.java | 3 - .../epmet/service/NeighborHoodService.java | 4 - .../service/impl/BuildingServiceImpl.java | 237 +++++------------- .../service/impl/NeighborHoodServiceImpl.java | 152 +---------- 7 files changed, 91 insertions(+), 482 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/BuildingController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/BuildingController.java index 39245ab7db..80bf38f375 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/BuildingController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/BuildingController.java @@ -18,12 +18,10 @@ package com.epmet.controller; import cn.afterturn.easypoi.excel.entity.TemplateExportParams; -import cn.afterturn.easypoi.excel.entity.result.ExcelImportResult; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.aop.NoRepeatSubmit; -import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.page.PageData; @@ -34,9 +32,11 @@ import com.epmet.constants.ImportTaskConstants; import com.epmet.dao.IcBuildingUnitDao; import com.epmet.dto.BuildingTreeLevelDTO; import com.epmet.dto.form.*; -import com.epmet.dto.result.*; +import com.epmet.dto.result.BuildingResultDTO; +import com.epmet.dto.result.BuildingResultPagedDTO; +import com.epmet.dto.result.IcBuildingListResultDTO; +import com.epmet.dto.result.ImportTaskCommonResultDTO; import com.epmet.entity.IcBuildingUnitEntity; -import com.epmet.excel.IcBuildingExcel; import com.epmet.feign.EpmetCommonServiceOpenFeignClient; import com.epmet.service.BuildingService; import com.epmet.util.ExcelPoiUtils; @@ -49,8 +49,9 @@ import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.InputStream; -import java.util.*; -import java.util.stream.Collectors; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; /** @@ -134,10 +135,7 @@ public class BuildingController { @PostMapping("exporttemplate") public void exportTemplate( HttpServletResponse response) throws Exception { TemplateExportParams templatePath = new TemplateExportParams("excel/building_template.xlsx"); - Map map = new HashMap<>(); - map.put("maplist",new ArrayList()); - ExcelPoiUtils.exportExcel(templatePath ,map,"楼栋信息录入表",response); - + ExcelPoiUtils.exportExcel(templatePath ,new HashMap<>(),"楼栋信息录入表",response); } /** * 导出 @@ -149,7 +147,6 @@ public class BuildingController { public void exportbuildinginfo(@RequestBody IcHouseListFormDTO formDTO, HttpServletResponse response) throws Exception { ValidatorUtils.validateEntity(formDTO); buildingService.exportBuildinginfo(formDTO,response); - } /** @@ -166,43 +163,6 @@ public class BuildingController { } - - /** - * 导入数据 - * @param file - * @return - * @throws IOException - */ - @PostMapping("import") - public Result importExcel(@LoginUser TokenDto tokenDTO, @RequestParam("file") MultipartFile file) throws IOException { - String customerId = tokenDTO.getCustomerId(); -// String customerId = "123123"; - - ExcelImportResult importResult = ExcelPoiUtils.importExcelMore(file, 0, 1, IcBuildingExcel.class); - - List failList = importResult.getFailList(); - - //存放错误数据行号 - List numList = new ArrayList<>(); - if(!CollectionUtils.isEmpty(failList)){ - for ( IcBuildingExcel entity : failList) { - log.error("第{}行,{}",entity.getRowNum(),entity.getErrorMsg());//打印失败的行 和失败的信息 - numList.add(entity.getRowNum()); - } - //return new Result().error(8001,failList.get(0).getErrorMsg()); - } - List result =importResult.getList(); - List resultList = buildingService.importExcel(customerId,result,tokenDTO.getUserId(),numList); - String str = String.format("共%s条，成功导入%s条。",numList.size()+result.size(),numList.size()+result.size()-resultList.size()); - if(resultList.size()> NumConstant.ZERO){ - Collections.sort(resultList); - String subList = resultList.stream().map(String::valueOf).collect(Collectors.joining("、")); - log.warn(str + "第" + subList + "行未成功！"); - return new Result().error(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), str+"第"+subList+"行未成功！"); - } - return new Result().ok(str); - } - /** * @Description 楼宇导入 * @param tokenDTO diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java index a4d675a279..5ef535aa11 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java @@ -47,9 +47,7 @@ import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; import java.io.InputStream; -import java.util.ArrayList; -import java.util.List; -import java.util.Set; +import java.util.*; /** @@ -167,7 +165,7 @@ public class HouseController implements ResultDataResolver { @PostMapping("exporttemplate") public void exportTemplate(HttpServletResponse response) throws Exception { TemplateExportParams templatePath = new TemplateExportParams("excel/house_template.xlsx"); - ExcelPoiUtils.exportExcel(templatePath, null, "房屋信息录入表", response); + ExcelPoiUtils.exportExcel(templatePath, new HashMap<>(), "房屋信息录入表", response); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/NeighborHoodController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/NeighborHoodController.java index 19a83bf0cf..743254c2d4 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/NeighborHoodController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/NeighborHoodController.java @@ -18,12 +18,9 @@ package com.epmet.controller; import cn.afterturn.easypoi.excel.entity.TemplateExportParams; -import cn.afterturn.easypoi.excel.entity.result.ExcelImportResult; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.aop.NoRepeatSubmit; -import com.epmet.commons.tools.constant.NumConstant; -import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; @@ -33,23 +30,20 @@ import com.epmet.dto.form.IcNeighborHoodAddFormDTO; import com.epmet.dto.form.IcNeighborHoodListFormDTO; import com.epmet.dto.result.IcNeighborHoodResultDTO; import com.epmet.entity.IcBuildingEntity; -import com.epmet.excel.IcNeighborHoodExcel; -import com.epmet.service.BuildingService; -import com.epmet.service.HouseService; -import com.epmet.service.IcNeighborHoodService; import com.epmet.service.NeighborHoodService; import com.epmet.util.ExcelPoiUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.util.*; -import java.util.stream.Collectors; +import java.util.HashMap; +import java.util.List; /** @@ -63,20 +57,12 @@ import java.util.stream.Collectors; @RequestMapping("neighborhood") public class NeighborHoodController { - @Autowired - private IcNeighborHoodService icNeighborHoodService; @Autowired private NeighborHoodService neighborHoodService; - @Autowired - private BuildingService buildingService; - @Autowired - private HouseService houseService; @Resource private IcBuildingDao icBuildingDao; - - @PostMapping("neighborhoodlist") public Result neighborhoodlist(@RequestBody IcNeighborHoodListFormDTO formDTO){ //效验数据 @@ -140,94 +126,7 @@ public class NeighborHoodController { */ @PostMapping("exporttemplate") public void exportTemplate( HttpServletResponse response) throws Exception { -// ValidatorUtils.validateEntity(ListIcNeighborHoodFormDTO.class); TemplateExportParams templatePath = new TemplateExportParams("excel/neighbor_template.xlsx"); - Map map = new HashMap<>(); - map.put("maplist",new ArrayList()); - ExcelPoiUtils.exportExcel(templatePath ,map,"小区信息录入表",response); - - } - - /** - * 导出模板 - - * @param response - * @throws Exception - */ - /*@GetMapping("export") - public void export( HttpServletResponse response) throws Exception { - ValidatorUtils.validateEntity(ListIcNeighborHoodFormDTO.class); - TemplateExportParams templatePath = new TemplateExportParams("excel/neighbor_template.xlsx"); - Map map = new HashMap<>(); - map.put("maplist",new ArrayList()); - ExcelPoiUtils.exportExcel(templatePath ,map,"小区信息录入表",response); - - }*/ - /** - * 导出 - * @param response - * @throws Exception - */ - /* @RequestMapping("exportinfo") - public void exportinfo(HttpServletResponse response) throws Exception { - ListIcNeighborHoodFormDTO formDTO = new ListIcNeighborHoodFormDTO(); - ValidatorUtils.validateEntity(ListIcNeighborHoodFormDTO.class); - neighborHoodService.exportNeighborhoodinfo(formDTO,response); - - }*/ - - -// /** -// * 导入 -// * @param params -// * @param response -// * @throws Exception -// */ -// @PostMapping("importneighborhoodinfo") -// public void importneighborhoodinfo(@RequestParam Map params, HttpServletResponse response) throws Exception { -// List list = icNeighborHoodService.list(params); -// ExcelUtils.exportExcelToTarget(response, "小区信息录入表", list, IcNeighborHoodExcel.class); -//// ExcelUtils.expor -// } - - /** - * 导入数据 - * @param file - * @return - * @throws IOException - */ - @PostMapping("import") - public Result importExcel(@LoginUser TokenDto tokenDTO, @RequestParam("file") MultipartFile file) throws IOException { - - String customerId = tokenDTO.getCustomerId(); -// String customerId = "123123"; - ExcelImportResult importResult = ExcelPoiUtils.importExcelMore(file, 0, 1, IcNeighborHoodExcel.class); -// List result = ExcelPoiUtils.importExcel(file, 0, 1, IcNeighborHoodExcel.class); - List failList = importResult.getFailList(); - - //存放错误数据行号 - List numList = new ArrayList<>(); - if(!CollectionUtils.isEmpty(failList)){ - for ( IcNeighborHoodExcel entity : failList) { - log.warn("第{}行,{}",entity.getRowNum(),entity.getErrorMsg());//打印失败的行 和失败的信息 - numList.add(entity.getRowNum()); - } - //return new Result().error(8001,failList.get(0).getErrorMsg()); - } - List result =importResult.getList(); -// log.info(JSON.toJSONString(result)); - List resultList = neighborHoodService.importExcel(customerId,result,tokenDTO.getUserId(),numList); - String str = String.format("共%s条，成功导入%s条。",numList.size()+result.size(),numList.size()+result.size()-resultList.size()); - if (resultList.size() > NumConstant.ZERO) { - Collections.sort(resultList); - String subList = resultList.stream().map(String::valueOf).collect(Collectors.joining("、")); - log.warn(str + "第" + subList + "行未成功！"); - return new Result().error(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), str + "第" + subList + "行未成功！"); - } - return new Result().ok(str); + ExcelPoiUtils.exportExcel(templatePath ,new HashMap<>(),"小区信息录入表",response); } - - - - } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/BuildingService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/BuildingService.java index 1188cbf306..441995271b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/BuildingService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/BuildingService.java @@ -28,7 +28,6 @@ import com.epmet.dto.result.BuildingResultDTO; import com.epmet.dto.result.BuildingResultPagedDTO; import com.epmet.dto.result.IcBuildingListResultDTO; import com.epmet.dto.result.ImportTaskCommonResultDTO; -import com.epmet.excel.IcBuildingExcel; import javax.servlet.http.HttpServletResponse; import java.io.IOException; @@ -61,8 +60,6 @@ public interface BuildingService { List treeList(String customerId, String staffId); List treeIds(String customerId, String staffId); - List importExcel(String customerId, List list, String staffId, List numList); - PageData listBuilding(IcBuildingListFormDTO formDTO); void exportBuildinginfo(IcHouseListFormDTO formDTO, HttpServletResponse response) throws Exception ; diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/NeighborHoodService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/NeighborHoodService.java index 78b55aea8b..24427a6657 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/NeighborHoodService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/NeighborHoodService.java @@ -22,10 +22,8 @@ import com.epmet.dto.form.IcHouseListFormDTO; import com.epmet.dto.form.IcNeighborHoodAddFormDTO; import com.epmet.dto.form.IcNeighborHoodListFormDTO; import com.epmet.dto.result.IcNeighborHoodResultDTO; -import com.epmet.excel.IcNeighborHoodExcel; import javax.servlet.http.HttpServletResponse; -import java.util.List; /** * 小区表 @@ -53,6 +51,4 @@ public interface NeighborHoodService{ * @param response */ void exportNeighborhoodinfo(IcHouseListFormDTO formDTO, HttpServletResponse response) throws Exception ; - - List importExcel(String customerId, List list, String staffId, List numList); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java index 58666a8d9d..20e1d2d4ef 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java @@ -93,11 +93,11 @@ public class BuildingServiceImpl implements BuildingService { @Transactional(rollbackFor = Exception.class) public void addBuilding(String customerId, IcBulidingAddFormDTO formDTO) { //同一小区下不能存在楼栋名字一样的 - Integer count = icBuildingDao.checkBuildName(formDTO.getNeighborHoodId(),formDTO.getBuildingName(),null); + Integer count = icBuildingDao.checkBuildName(formDTO.getNeighborHoodId(), formDTO.getBuildingName(), null); if (null != count && count > 0) { - throw new RenException(EpmetErrorCode.BUILDING_NAME_EXITED.getCode(),EpmetErrorCode.BUILDING_NAME_EXITED.getMsg()); + throw new RenException(EpmetErrorCode.BUILDING_NAME_EXITED.getCode(), EpmetErrorCode.BUILDING_NAME_EXITED.getMsg()); } - IcBuildingDTO icBuildingDTO= ConvertUtils.sourceToTarget(formDTO, IcBuildingDTO.class); + IcBuildingDTO icBuildingDTO = ConvertUtils.sourceToTarget(formDTO, IcBuildingDTO.class); icBuildingDTO.setCustomerId(customerId); IcBuildingEntity entity = ConvertUtils.sourceToTarget(icBuildingDTO, IcBuildingEntity.class); icBuildingDao.insert(entity); @@ -105,12 +105,12 @@ public class BuildingServiceImpl implements BuildingService { //设置楼宇单元 Integer totalUnitNum = formDTO.getTotalUnitNum(); List unitList = new ArrayList<>(); - for(int i =0 ;i treeList(String customerId, String staffId) { CustomerStaffInfoCacheResult agency = CustomerStaffRedis.getStaffInfo(customerId, staffId); - if(null == agency || StringUtils.isBlank(agency.getAgencyId())){ - log.error("com.epmet.service.impl.BuildingServiceImpl.treeList，没有找到工作人员所属的机关信息，用户Id：{}",staffId); + if (null == agency || StringUtils.isBlank(agency.getAgencyId())) { + log.error("com.epmet.service.impl.BuildingServiceImpl.treeList，没有找到工作人员所属的机关信息，用户Id：{}", staffId); return new ArrayList<>(); } @@ -132,7 +132,7 @@ public class BuildingServiceImpl implements BuildingService { List customerAgencyList = icBuildingDao.selectAgencyChildrenList(agency.getAgencyId()); customerAgencyList.add(customerAgency); - if(CollectionUtils.isEmpty(customerAgencyList)){ + if (CollectionUtils.isEmpty(customerAgencyList)) { return new ArrayList<>(); } @@ -151,14 +151,13 @@ public class BuildingServiceImpl implements BuildingService { }).collect(Collectors.toList()); - //2.获取组织所在网格 List agencyIdList = customerAgencyList.stream().map(BaseEpmetEntity::getId).collect(Collectors.toList()); // agencyIdList.add(customerAgency.getId()); List customerGridList = customerGridDao.selectList(new QueryWrapper().lambda().in(CustomerGridEntity::getPid, agencyIdList)); - if(CollectionUtils.isEmpty(customerGridList)){ - return covertToTree(customerAgency,agencyList); + if (CollectionUtils.isEmpty(customerGridList)) { + return covertToTree(customerAgency, agencyList); } List gridList = customerGridList.stream().map(item -> { @@ -182,9 +181,9 @@ public class BuildingServiceImpl implements BuildingService { .in(IcNeighborHoodEntity::getGridId, gridIdList) .orderByAsc(IcNeighborHoodEntity::getCreatedTime); List icNeighborHoodList = icNeighborHoodDao.selectList(queryWrapper); - if(CollectionUtils.isEmpty(icNeighborHoodList)){ + if (CollectionUtils.isEmpty(icNeighborHoodList)) { agencyList.addAll(gridList); - return covertToTree(customerAgency,agencyList); + return covertToTree(customerAgency, agencyList); } List neighbourHoodList = icNeighborHoodList.stream().map(item -> { BuildingTreeLevelDTO buildingTreeLevelDTO = new BuildingTreeLevelDTO(); @@ -204,13 +203,13 @@ public class BuildingServiceImpl implements BuildingService { List neighborHoodIdList = icNeighborHoodList.stream().map(BaseEpmetEntity::getId).collect(Collectors.toList()); LambdaQueryWrapper buildingQueryWrapper = new QueryWrapper().lambda() .in(IcBuildingEntity::getNeighborHoodId, neighborHoodIdList) - .orderByAsc(IcBuildingEntity::getCreatedTime,IcBuildingEntity::getBuildingName); + .orderByAsc(IcBuildingEntity::getCreatedTime, IcBuildingEntity::getBuildingName); List icBuildingList = icBuildingDao.selectList(buildingQueryWrapper); - if(CollectionUtils.isEmpty(neighborHoodIdList)){ + if (CollectionUtils.isEmpty(neighborHoodIdList)) { agencyList.addAll(gridList); agencyList.addAll(neighbourHoodList); - return covertToTree(customerAgency,agencyList); + return covertToTree(customerAgency, agencyList); } //获取楼里已经有多少个房屋 LambdaQueryWrapper icHouseEntityWrapper = new QueryWrapper().lambda() @@ -244,10 +243,10 @@ public class BuildingServiceImpl implements BuildingService { // .in(IcHouseEntity::getBuildingId, item.getId()); // int count= icHouseDao.selectCount(icHouseEntityWrapper); int count = buildingHouseCountMap.getOrDefault(item.getId(), NumConstant.ZERO_L).intValue(); - if(NumConstant.ZERO==total){ - buildingTreeLevelDTO.setShowNum(String.format("%s/%s",count,count)); - }else{ - buildingTreeLevelDTO.setShowNum(String.format("%s/%s",count,total)); + if (NumConstant.ZERO == total) { + buildingTreeLevelDTO.setShowNum(String.format("%s/%s", count, count)); + } else { + buildingTreeLevelDTO.setShowNum(String.format("%s/%s", count, total)); } return buildingTreeLevelDTO; }).collect(Collectors.toList()); @@ -255,7 +254,7 @@ public class BuildingServiceImpl implements BuildingService { agencyList.addAll(gridList); agencyList.addAll(neighbourHoodList); agencyList.addAll(buildingList); - return covertToTree(customerAgency,agencyList); + return covertToTree(customerAgency, agencyList); } @@ -263,15 +262,15 @@ public class BuildingServiceImpl implements BuildingService { public List treeIds(String customerId, String staffId) { List result = new ArrayList<>(); CustomerStaffInfoCacheResult agency = CustomerStaffRedis.getStaffInfo(customerId, staffId); - if(null == agency || StringUtils.isBlank(agency.getAgencyId())){ - log.error("com.epmet.service.impl.BuildingServiceImpl.treeIds，没有找到工作人员所属的机关信息，用户Id：{}",staffId); + if (null == agency || StringUtils.isBlank(agency.getAgencyId())) { + log.error("com.epmet.service.impl.BuildingServiceImpl.treeIds，没有找到工作人员所属的机关信息，用户Id：{}", staffId); return new ArrayList<>(); } //1.获取所在组织及下级组织 CustomerAgencyEntity customerAgency = customerAgencyDao.selectById(agency.getAgencyId()); List customerAgencyList = icBuildingDao.selectAgencyChildrenList(agency.getAgencyId()); customerAgencyList.add(customerAgency); - if(CollectionUtils.isEmpty(customerAgencyList)){ + if (CollectionUtils.isEmpty(customerAgencyList)) { return new ArrayList<>(); } result.addAll(customerAgencyList.stream().map(m -> m.getId()).collect(Collectors.toList())); @@ -291,128 +290,41 @@ public class BuildingServiceImpl implements BuildingService { //2.获取组织所在网格 List agencyIdList = customerAgencyList.stream().map(BaseEpmetEntity::getId).collect(Collectors.toList()); List customerGridList = customerGridDao.selectList(new QueryWrapper().lambda().in(CustomerGridEntity::getPid, agencyIdList)); - if(CollectionUtils.isEmpty(customerGridList)){ + if (CollectionUtils.isEmpty(customerGridList)) { return result; } result.addAll(customerGridList.stream().map(m -> m.getId()).collect(Collectors.toList())); return result; } - @Override - @Transactional(rollbackFor = Exception.class) - public List importExcel(String customerId, List list, String staffId, List numList) { - //2021.11.9 需求变更 当前工作人员只能导致自己所属组织下数据，网格名对应不上的数据舍弃【注：需求就这样】 sun - CustomerStaffInfoCacheResult staffInfoCache = CustomerStaffRedis.getStaffInfo(customerId, staffId); - //组织名称不一样的数据舍弃 - Iterator iterator = list.iterator(); - while (iterator.hasNext()) { - IcBuildingExcel obj = iterator.next(); - if (!obj.getAgencyName().trim().equals(staffInfoCache.getAgencyName())) { - numList.add(obj.getRowNum()); - iterator.remove(); - } - } - //用于存储匹配不上的数据给前端的提示 如南宁社区不存在 - //StringBuffer str = new StringBuffer(""); - //end sun - //导入 - if(CollectionUtils.isEmpty(list)){ - return numList; - } - //查询所有组织和网格根据名字 - - - - //获取所有小区 list 根据组织和网格 - Set neighborNameList = list.stream().map(item -> item.getNeighborHoodName()).collect(Collectors.toSet()); - Set agencyNameList = list.stream().map(item -> item.getAgencyName()).collect(Collectors.toSet()); - Set gridNameList = list.stream().map(item -> item.getGridName()).collect(Collectors.toSet()); - List neighborHoodList = icNeighborHoodDao.selectListByName(customerId, new ArrayList(neighborNameList),new ArrayList(agencyNameList),new ArrayList(gridNameList)); -// List neighborHoodList = icNeighborHoodDao.selectList(new QueryWrapper().lambda().in(IcNeighborHoodEntity::getNeighborHoodName, neighborNameList)); - Map neighborHoodMap = neighborHoodList.stream().collect(Collectors.toMap(IcNeighborHoodEntity::getNeighborHoodName, Function.identity(),(key1, key2)->key1)); - - - //2.获取小区数据 - //封装数据 - List buildingEntityList = new ArrayList<>(); - List icBuildingUnitEntityList = new ArrayList<>(); - Iterator iterator1 = list.iterator(); - while (iterator1.hasNext()) { - IcBuildingExcel icBuildingExcel = iterator1.next(); - IcBuildingEntity entity = new IcBuildingEntity(); - String uuid = UUID.randomUUID().toString().replace("-", ""); - entity.setId(uuid); - entity.setCustomerId(customerId); - entity.setNeighborHoodId(Optional.ofNullable(neighborHoodMap.get(icBuildingExcel.getNeighborHoodName())).map(u->u.getId()).orElse(""));//neighborHoodMap.get(icBuildingExcel.getNeighborHoodName()).getId() - if ("".equals(entity.getNeighborHoodId())) { - //str.append("".equals(str) ? icBuildingExcel.getNeighborHoodName() : str.append("、").append(icBuildingExcel.getNeighborHoodName())); - numList.add(icBuildingExcel.getRowNum()); - iterator1.remove(); - continue; - } - entity.setBuildingName(icBuildingExcel.getBuildingName()); - entity.setType(BuildingTypeEnums.getKeyByValue(icBuildingExcel.getType())); - entity.setSort(0); - entity.setTotalUnitNum(icBuildingExcel.getTotalUnitNum()); - entity.setTotalFloorNum(icBuildingExcel.getTotalFloorNum()); - entity.setTotalHouseNum(icBuildingExcel.getTotalHouseNum()); - buildingEntityList.add(entity); - - Integer totalUnitNum = icBuildingExcel.getTotalUnitNum(); - //设置楼宇单元 - List unitList = new ArrayList<>(); - for(int i =0 ;i 0) { - //throw new RenException(EpmetErrorCode.BUILDING_NAME_EXITED.getCode(),EpmetErrorCode.BUILDING_NAME_EXITED.getMsg()); - log.error(EpmetErrorCode.BUILDING_NAME_EXITED.getMsg()); - numList.add(icBuildingExcel.getRowNum()); - iterator1.remove(); - continue; - } - icBuildingUnitEntityList.addAll(unitList); - } - //3.保存 - //4.新增单元 - icBuildingService.insertBatch(buildingEntityList); - icBuildingUnitService.insertBatch(icBuildingUnitEntityList); - return numList; - } - @Override public PageData listBuilding(IcBuildingListFormDTO formDTO) { PageInfo pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()).doSelectPageInfo(() -> icBuildingDao.searchBuildingByPage(formDTO)); List records = pageInfo.getList(); - records.forEach(item-> item.setBuildingType( BuildingTypeEnums.getTypeValue(item.getBuildingTypeKey()))); - return new PageData<>(pageInfo.getList(),pageInfo.getTotal()); + records.forEach(item -> item.setBuildingType(BuildingTypeEnums.getTypeValue(item.getBuildingTypeKey()))); + return new PageData<>(pageInfo.getList(), pageInfo.getTotal()); } @Override - public void exportBuildinginfo(IcHouseListFormDTO formDTO, HttpServletResponse response) throws Exception { + public void exportBuildinginfo(IcHouseListFormDTO formDTO, HttpServletResponse response) throws Exception { //如果类型是building 查楼栋 //导出楼栋 List icBuildingExcels = searchAllBuilding(formDTO); TemplateExportParams templatePath = new TemplateExportParams("excel/building_export.xlsx"); - Map map = new HashMap<>(); - map.put("maplist",icBuildingExcels); - ExcelPoiUtils.exportExcel(templatePath ,map,"楼栋信息录入表",response); - return ; + Map map = new HashMap<>(); + map.put("maplist", icBuildingExcels); + ExcelPoiUtils.exportExcel(templatePath, map, "楼栋信息录入表", response); + return; } + @Override public List buildingListByIds(List buildingIdList) { return icBuildingDao.buildingListByIds(buildingIdList); } + @Override - public BuildingResultPagedDTO buildinglistbyidsPage(List buildingIdList,Integer pageNo, Integer pageSize) { - IPage page = new Page(pageNo,pageSize); + public BuildingResultPagedDTO buildinglistbyidsPage(List buildingIdList, Integer pageNo, Integer pageSize) { + IPage page = new Page(pageNo, pageSize); IPage buildingResultDTOIPage = icBuildingDao.buildingListByIds(page, buildingIdList); BuildingResultPagedDTO result = new BuildingResultPagedDTO(); result.setTotal(Long.valueOf(buildingResultDTOIPage.getTotal()).intValue()); @@ -422,29 +334,29 @@ public class BuildingServiceImpl implements BuildingService { } /** + * @param formDTO + * @param inputStream * @Description 楼宇导入 - * 根据左侧树选中的层级，可导入对应数据： + * 根据左侧树选中的层级，可导入对应数据： * 1. 选中社区可导入该社区下所有小区信息、楼宇信息、房屋信息（没有匹配的小区、楼宇均新增，网格没有对应的不新增）； * 2. 选中网格可导入该网格下所有小区信息、楼宇信息、房屋信息（没有匹配的小区、楼宇均新增）； * 3. 选中小区可导入该小区下所有楼宇信息、房屋信息（没有匹配的楼宇均新增）； * 4. 选中楼宇可导入该楼宇下所有房屋信息。 - * @param formDTO - * @param inputStream * @author zxc * @date 2022/2/13 10:15 上午 */ @Override - public Result buildingImportExcel(ImportInfoFormDTO formDTO, InputStream inputStream,Result importTask) { + public Result buildingImportExcel(ImportInfoFormDTO formDTO, InputStream inputStream, Result importTask) { executorService.submit(() -> { ExcelReader excelReader = null; try { excelReader = EasyExcel.read(inputStream).build(); // 这里为了简单 所以注册了 同样的head 和Listener 自己使用功能必须不同的Listener ReadSheet readSheet = EasyExcel.readSheet(0).head(BuildingInfoModel.class) - .registerReadListener(new ImportBuildingInfoListener(formDTO,icHouseRedis,icBuildingDao,neighborHoodService,epmetCommonServiceOpenFeignClient,importTask.getData().getTaskId())) + .registerReadListener(new ImportBuildingInfoListener(formDTO, icHouseRedis, icBuildingDao, neighborHoodService, epmetCommonServiceOpenFeignClient, importTask.getData().getTaskId())) .build(); excelReader.read(readSheet); - } catch (Exception e){ + } catch (Exception e) { ImportTaskCommonFormDTO input = new ImportTaskCommonFormDTO(); input.setOperatorId(formDTO.getUserId()); input.setTaskId(importTask.getData().getTaskId()); @@ -460,32 +372,18 @@ public class BuildingServiceImpl implements BuildingService { } private List searchAllBuilding(IcHouseListFormDTO formDTO) { - -// QueryWrapper neighborHoodEntityQueryWrapper = new QueryWrapper<>(); -// neighborHoodEntityQueryWrapper.lambda() -// .eq(!StringUtils.isEmpty(formDTO.getAgencyId()),IcNeighborHoodEntity::getAgencyId,formDTO.getAgencyId()) -// .eq(!StringUtils.isEmpty(formDTO.getGridId()),IcNeighborHoodEntity::getId,formDTO.getGridId()) -// .eq(!StringUtils.isEmpty(formDTO.getNeighborHoodId()),IcNeighborHoodEntity::getId,formDTO.getNeighborHoodId()) -// .like(!StringUtils.isEmpty(formDTO.getNeighborHoodName()),IcNeighborHoodEntity::getNeighborHoodName,formDTO.getNeighborHoodName()); -// IcNeighborHoodEntity neighbor = ConvertUtils.sourceToTarget(formDTO, IcNeighborHoodEntity.class); - -// QueryWrapper buildingEntityQueryWrapper = new QueryWrapper<>(); -// buildingEntityQueryWrapper.lambda() -// .eq(!StringUtils.isEmpty(formDTO.getBuildingId()),IcBuildingEntity::getId,formDTO.getBuildingId()) -// .like(!StringUtils.isEmpty(formDTO.getBuildingName()),IcBuildingEntity::getBuildingName,formDTO.getBuildingName()); -// buildingEntityQueryWrapper.eq("a.DEL_FLAG","0"); IcBuildingEntity building = ConvertUtils.sourceToTarget(formDTO, IcBuildingEntity.class); building.setDelFlag("0"); IcHouseEntity house = ConvertUtils.sourceToTarget(formDTO, IcHouseEntity.class); List icBuildingExcels = icBuildingDao.searchAllBuilding(building, house); - icBuildingExcels.forEach(item->{ + icBuildingExcels.forEach(item -> { item.setType(BuildingTypeEnums.getTypeValue(item.getType())); }); return icBuildingExcels; } - private List covertToTree(CustomerAgencyEntity customerAgency,List agencyList) { + private List covertToTree(CustomerAgencyEntity customerAgency, List agencyList) { BuildingTreeLevelDTO buildingTreeLevelDTO = new BuildingTreeLevelDTO(); buildingTreeLevelDTO.setId(customerAgency.getId()); buildingTreeLevelDTO.setLabel(customerAgency.getOrganizationName()); @@ -493,7 +391,7 @@ public class BuildingServiceImpl implements BuildingService { buildingTreeLevelDTO.setLongitude(customerAgency.getLongitude()); buildingTreeLevelDTO.setLatitude(customerAgency.getLatitude()); buildingTreeLevelDTO.setChildren(new ArrayList<>()); - recursionCovertToTree(buildingTreeLevelDTO,agencyList); + recursionCovertToTree(buildingTreeLevelDTO, agencyList); List result = new ArrayList<>(); result.add(buildingTreeLevelDTO); return result; @@ -503,20 +401,20 @@ public class BuildingServiceImpl implements BuildingService { //获取子节点 List subList = customerAgencyList.stream().filter(item -> item.getPId().equals(parent.getId())).collect(Collectors.toList()); - for(BuildingTreeLevelDTO agencyEntity :subList){ - recursionCovertToTree(agencyEntity,customerAgencyList); + for (BuildingTreeLevelDTO agencyEntity : subList) { + recursionCovertToTree(agencyEntity, customerAgencyList); } parent.setChildren(subList); - if(!"building".equals(parent.getLevel())){ + if (!"building".equals(parent.getLevel())) { parent.setShowNum(CollectionUtils.isEmpty(subList) ? NumConstant.ZERO_STR : String.valueOf(subList.size())); } - parent.setShowName(String.format("%s(%s)",parent.getLabel(),parent.getShowNum())); + parent.setShowName(String.format("%s(%s)", parent.getLabel(), parent.getShowNum())); } - /** * 更新 + * * @param customerId * @param formDTO */ @@ -524,37 +422,33 @@ public class BuildingServiceImpl implements BuildingService { @Transactional(rollbackFor = Exception.class) public void updateBuilding(String customerId, IcBulidingAddFormDTO formDTO) { //同一小区下不能存在楼栋名字一样的 - Integer count = icBuildingDao.checkBuildName(formDTO.getNeighborHoodId(),formDTO.getBuildingName(),formDTO.getBuildingId()); + Integer count = icBuildingDao.checkBuildName(formDTO.getNeighborHoodId(), formDTO.getBuildingName(), formDTO.getBuildingId()); if (null != count && count > 0) { - throw new RenException(EpmetErrorCode.BUILDING_NAME_EXITED.getCode(),EpmetErrorCode.BUILDING_NAME_EXITED.getMsg()); + throw new RenException(EpmetErrorCode.BUILDING_NAME_EXITED.getCode(), EpmetErrorCode.BUILDING_NAME_EXITED.getMsg()); } - IcBuildingDTO icBuilding= icBuildingService.get(formDTO.getBuildingId()); + IcBuildingDTO icBuilding = icBuildingService.get(formDTO.getBuildingId()); - if(!icBuilding.getNeighborHoodId().equals(formDTO.getNeighborHoodId())){ + if (!icBuilding.getNeighborHoodId().equals(formDTO.getNeighborHoodId())) { //更新对应房屋小区id List icHouseEntities = icHouseDao.selectList(new QueryWrapper().lambda().eq(IcHouseEntity::getBuildingId, formDTO.getBuildingId())); - if(!CollectionUtils.isEmpty(icHouseEntities)){ + if (!CollectionUtils.isEmpty(icHouseEntities)) { // - throw new RenException(EpmetErrorCode.ORG_EDIT_FAILED.getCode(),"楼栋单元下存在房屋，无法更新"); -// icHouseEntities.forEach(item->{ -// item.setNeighborHoodId(formDTO.getNeighborHoodId()); -// }); -// icHouseService.updateBatchById(icHouseEntities); + throw new RenException(EpmetErrorCode.ORG_EDIT_FAILED.getCode(), "楼栋单元下存在房屋，无法更新"); } } - IcBuildingDTO icBuildingDTO= ConvertUtils.sourceToTarget(formDTO, IcBuildingDTO.class); + IcBuildingDTO icBuildingDTO = ConvertUtils.sourceToTarget(formDTO, IcBuildingDTO.class); icBuildingDTO.setId(formDTO.getBuildingId()); icBuildingDTO.setCustomerId(customerId); icBuildingService.update(icBuildingDTO); //更新楼宇单元 //如果楼宇单元大于之前的楼宇单元，新增单元 - Integer nowUnit= formDTO.getTotalUnitNum(); + Integer nowUnit = formDTO.getTotalUnitNum(); Integer unit = icBuilding.getTotalUnitNum(); - if(nowUnit units = icBuildingUnitService.getUnitOptions(icBuilding.getId()); Map unitMap = units.stream().collect(Collectors.toMap(OptionResultDTO::getCode, OptionResultDTO::getLabel)); @@ -587,6 +481,7 @@ public class BuildingServiceImpl implements BuildingService { /** * 删除 + * * @param buildingId */ @Override @@ -594,13 +489,13 @@ public class BuildingServiceImpl implements BuildingService { public void delBuilding(String buildingId) { //如果存在房屋，无法删除 List icHouseEntities = icHouseDao.selectList(new QueryWrapper().lambda().eq(IcHouseEntity::getBuildingId, buildingId)); - if(!CollectionUtils.isEmpty(icHouseEntities)){ - throw new RenException(EpmetErrorCode.ORG_DEL_FAILED.getCode(),"楼栋单元下存在房屋，无法删除"); + if (!CollectionUtils.isEmpty(icHouseEntities)) { + throw new RenException(EpmetErrorCode.ORG_DEL_FAILED.getCode(), "楼栋单元下存在房屋，无法删除"); } //删除楼宇 icBuildingService.deleteById(buildingId); //删除楼宇单元 - icBuildingUnitDao.delete(new QueryWrapper().lambda().eq(IcBuildingUnitEntity::getBuildingId,buildingId)); + icBuildingUnitDao.delete(new QueryWrapper().lambda().eq(IcBuildingUnitEntity::getBuildingId, buildingId)); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java index 5cdde1e697..ebc6b80744 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java @@ -2,12 +2,10 @@ package com.epmet.service.impl; import cn.afterturn.easypoi.excel.entity.TemplateExportParams; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.enums.OrgTypeEnum; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; -import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.constant.NeighborhoodConstant; @@ -19,7 +17,9 @@ import com.epmet.dto.form.IcHouseListFormDTO; import com.epmet.dto.form.IcNeighborHoodAddFormDTO; import com.epmet.dto.form.IcNeighborHoodListFormDTO; import com.epmet.dto.result.IcNeighborHoodResultDTO; -import com.epmet.entity.*; +import com.epmet.entity.IcHouseEntity; +import com.epmet.entity.IcNeighborHoodEntity; +import com.epmet.entity.IcNeighborHoodPropertyEntity; import com.epmet.excel.IcNeighborHoodExcel; import com.epmet.feign.GovOrgOpenFeignClient; import com.epmet.service.IcNeighborHoodPropertyService; @@ -32,15 +32,14 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; -import java.util.*; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.function.Function; -import java.util.stream.Collectors; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; @Slf4j @Service @@ -48,29 +47,15 @@ public class NeighborHoodServiceImpl implements NeighborHoodService { @Autowired private GovOrgOpenFeignClient govOrgOpenFeignClient; - - @Autowired private IcNeighborHoodService icNeighborHoodService; - @Autowired private IcNeighborHoodPropertyService icNeighborHoodPropertyService; - @Resource private IcNeighborHoodPropertyDao icNeighborHoodPropertyDao; - @Resource private IcNeighborHoodDao icNeighborHoodDao; - @Resource - private IcBuildingDao icBuildingDao; - @Resource - private IcHouseDao icHouseDao; - @Resource - private CustomerAgencyDao customerAgencyDao; - @Resource - private CustomerGridDao customerGridDao; - @Resource - private IcPropertyManagementDao icPropertyManagementDao; + @Override @Transactional(rollbackFor = Exception.class) @@ -168,8 +153,6 @@ public class NeighborHoodServiceImpl implements NeighborHoodService { //更新 icNeighborHoodPropertyService.updateById(icNeighborHoodProperty); } - - } } @@ -199,7 +182,6 @@ public class NeighborHoodServiceImpl implements NeighborHoodService { public void exportNeighborhoodinfo(IcHouseListFormDTO formDTO, HttpServletResponse response) throws Exception { //导出小区 List icNeighborHoodExcels = searchAllNeighborhood(formDTO); -// ExcelUtils.exportExcelToTarget(response, "小区信息录入表", icNeighborHoodExcels, IcNeighborHoodExcel.class); TemplateExportParams templatePath = new TemplateExportParams("excel/neighbor_export.xlsx"); Map map = new HashMap<>(); @@ -207,119 +189,7 @@ public class NeighborHoodServiceImpl implements NeighborHoodService { ExcelPoiUtils.exportExcel(templatePath ,map,"小区信息录入表",response); } - @Override - @Transactional(rollbackFor = Exception.class) - public List importExcel(String customerId,List list,String staffId, List numList) { - //2021.11.9 需求变更 当前工作人员只能导致自己所属组织下数据，网格名对应不上的数据舍弃【注：需求就这样】 sun - CustomerStaffInfoCacheResult staffInfoCache = CustomerStaffRedis.getStaffInfo(customerId, staffId); - //查询当前组织下网格列表 - List customerGridList = customerGridDao.selectByPid(staffInfoCache.getAgencyId()); - //组织名称不一样的数据舍弃 - Iterator iterator = list.iterator(); - while (iterator.hasNext()) { - IcNeighborHoodExcel obj = iterator.next(); - if (!obj.getAgencyName().trim().equals(staffInfoCache.getAgencyName())) { - numList.add(obj.getRowNum()); - iterator.remove(); - continue; - } - //当前组织下网格名不存在的也不允许导入 - AtomicBoolean br = new AtomicBoolean(true); - customerGridList.forEach(g->{ - if(obj.getGridName().trim().equals(g.getGridName())){ - br.set(false); - } - }); - if(br.get()){ - numList.add(obj.getRowNum()); - iterator.remove(); - } - - } - //end sun - - //导入 - if(CollectionUtils.isEmpty(list)){ - return numList; - } - //获取所有组织 list - List agencyNameList = list.stream().map(item -> item.getAgencyName()).collect(Collectors.toList()); - agencyNameList = agencyNameList.stream().distinct().collect(Collectors.toList()); - //获取所有网格 list - //List gridNameList = list.stream().map(item->item.getGridName()).collect(Collectors.toList()); - //获取所有物业 list - List propertyNameList = list.stream().map(item->item.getPropertyName()).collect(Collectors.toList()); - propertyNameList = propertyNameList.stream().distinct().collect(Collectors.toList()); - //查询对应的id - List customerAgencyList = customerAgencyDao.selectList(new QueryWrapper().lambda().in(CustomerAgencyEntity::getOrganizationName, agencyNameList)); - //List customerGridList = customerGridDao.selectList(new QueryWrapper().lambda().in(CustomerGridEntity::getGridName, gridNameList)); - List icPropertyManagementList = icPropertyManagementDao.selectList(new QueryWrapper().lambda().in(IcPropertyManagementEntity::getName, propertyNameList)); - - Map agencyMap = customerAgencyList.stream().collect(Collectors.toMap(CustomerAgencyEntity::getOrganizationName, Function.identity(),(key1, key2)->key1)); - Map gridMap = customerGridList.stream().collect(Collectors.toMap(CustomerGridEntity::getGridName,Function.identity(),(key1,key2)->key1)); - Map propertyMap = icPropertyManagementList.stream().collect(Collectors.toMap(IcPropertyManagementEntity::getName,Function.identity(),(key1,key2)->key1)); - - //封装数据 - List neighborHoodEntityList = new ArrayList<>(); - List icNeighborHoodPropertyEntityList = new ArrayList<>(); - Iterator iterator1 = list.iterator(); - while (iterator1.hasNext()) { - IcNeighborHoodExcel icNeighborHoodExcel = iterator1.next(); - //同一客户下，小区名称唯一 - Integer count = icNeighborHoodDao.checkNameUq(customerId,icNeighborHoodExcel.getNeighborHoodName(),null); - if (null != count && count > 0) { - //throw new RenException(EpmetErrorCode.NEIGHBOOR_NAME_EXITED.getCode(), icNeighborHoodExcel.getNeighborHoodName()+EpmetErrorCode.NEIGHBOOR_NAME_EXITED.getMsg()); - log.error(icNeighborHoodExcel.getNeighborHoodName()+EpmetErrorCode.NEIGHBOOR_NAME_EXITED.getMsg()); - numList.add(icNeighborHoodExcel.getRowNum()); - iterator1.remove(); - continue; - } - - IcNeighborHoodEntity entity = new IcNeighborHoodEntity(); - String uuid =UUID.randomUUID().toString().replace("-", ""); - entity.setId(uuid); - entity.setCustomerId(customerId); - entity.setNeighborHoodName(icNeighborHoodExcel.getNeighborHoodName()); - - entity.setAgencyId(Optional.ofNullable(agencyMap.get(icNeighborHoodExcel.getAgencyName().trim())).map(u->u.getId()).orElse("")); // agencyMap.get(icNeighborHoodExcel.getAgencyName()).getId()); - entity.setParentAgencyId(Optional.ofNullable(agencyMap.get(icNeighborHoodExcel.getAgencyName().trim())).map(u->u.getPid()).orElse(""));//agencyMap.get(icNeighborHoodExcel.getAgencyName()).getPid() - entity.setAgencyPids(Optional.ofNullable(agencyMap.get(icNeighborHoodExcel.getAgencyName().trim())).map(u->u.getPids()).orElse(""));//agencyMap.get(icNeighborHoodExcel.getAgencyName()).getPids() - entity.setGridId(Optional.ofNullable(gridMap.get(icNeighborHoodExcel.getGridName().trim())).map(u->u.getId()).orElse(""));//gridMap.get(icNeighborHoodExcel.getGridName()).getId() - //网格名对应不上的数据舍弃 - if ("".equals(entity.getGridId())) { - numList.add(icNeighborHoodExcel.getRowNum()); - iterator1.remove(); - continue; - } - entity.setAddress(icNeighborHoodExcel.getAddress()); - entity.setRemark(icNeighborHoodExcel.getRemark()); - neighborHoodEntityList.add(entity); - - IcNeighborHoodPropertyEntity entity1 = new IcNeighborHoodPropertyEntity(); - - entity1.setPropertyId(Optional.ofNullable(propertyMap.get(icNeighborHoodExcel.getPropertyName())).map(u->u.getId()).orElse("")); - entity1.setNeighborHoodId(uuid); - icNeighborHoodPropertyEntityList.add(entity1); - } - -// icNeighborHoodDao. - //保存 - icNeighborHoodService.insertBatch(neighborHoodEntityList); - icNeighborHoodPropertyService.insertBatch(icNeighborHoodPropertyEntityList); - - return numList; - } - - - private List searchAllNeighborhood(IcHouseListFormDTO formDTO) { -// QueryWrapper neighborHoodEntityQueryWrapper = new QueryWrapper<>(); -// neighborHoodEntityQueryWrapper.lambda() -// .eq(!StringUtils.isEmpty(formDTO.getAgencyId()),IcNeighborHoodEntity::getAgencyId,formDTO.getAgencyId()) -// .eq(!StringUtils.isEmpty(formDTO.getGridId()),IcNeighborHoodEntity::getId,formDTO.getGridId()) -// .eq(!StringUtils.isEmpty(formDTO.getNeighborHoodId()),IcNeighborHoodEntity::getId,formDTO.getNeighborHoodId()) -// .like(!StringUtils.isEmpty(formDTO.getNeighborHoodName()),IcNeighborHoodEntity::getNeighborHoodName,formDTO.getNeighborHoodName()); -// neighborHoodEntityQueryWrapper.eq("a.DEL_FLAG","0"); IcNeighborHoodEntity neighbor = ConvertUtils.sourceToTarget(formDTO, IcNeighborHoodEntity.class); neighbor.setDelFlag("0"); if(OrgTypeEnum.GRID.getCode().equals(formDTO.getLevel())){ @@ -330,10 +200,4 @@ public class NeighborHoodServiceImpl implements NeighborHoodService { IcHouseEntity house = ConvertUtils.sourceToTarget(formDTO, IcHouseEntity.class); return icNeighborHoodDao.searchAllNeighborhood(neighbor,house); } - - - - - - } From d719d15f633bbf326a2fc963685ea66c64762a97 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Tue, 19 Apr 2022 11:07:06 +0800 Subject: [PATCH 103/127] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9AimportTask?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AF=B9=E5=BA=94=E7=9A=84=E5=B7=A5=E5=85=B7?= =?UTF-8?q?=E7=B1=BBImportTaskUtils=EF=BC=8C=E7=94=A8=E8=B5=B7=E6=9D=A5?= =?UTF-8?q?=E6=9B=B4=E6=B8=85=E7=88=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/utils/ImportTaskUtils.java | 51 +++++++++++++++++++ .../com/epmet/controller/IcNatController.java | 9 ++-- .../epmet/service/impl/IcNatServiceImpl.java | 24 ++++----- 3 files changed, 63 insertions(+), 21 deletions(-) create mode 100644 epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/utils/ImportTaskUtils.java diff --git a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/utils/ImportTaskUtils.java b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/utils/ImportTaskUtils.java new file mode 100644 index 0000000000..80bf086374 --- /dev/null +++ b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/utils/ImportTaskUtils.java @@ -0,0 +1,51 @@ +package com.epmet.utils; + +import com.epmet.commons.tools.constant.AppClientConstant; +import com.epmet.commons.tools.feign.ResultDataResolver; +import com.epmet.commons.tools.utils.EpmetRequestHolder; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.utils.SpringContextUtils; +import com.epmet.dto.form.ImportTaskCommonFormDTO; +import com.epmet.dto.result.ImportTaskCommonResultDTO; +import com.epmet.feign.EpmetCommonServiceOpenFeignClient; + +/** + * 导入任务工具类，用于创建/完成导入工具 + */ +public class ImportTaskUtils implements ResultDataResolver { + + /** + * 创建导入任务，可能抛出8000异常，请考虑捕获异常 + * @param originFileName 上传的文件的名称 + * @param bizType 业务类型，见ImportTaskConstants常量 + * @return Result + */ + public static Result createImportTask(String originFileName, String bizType) { + ImportTaskCommonFormDTO form = new ImportTaskCommonFormDTO(); + form.setOriginFileName(originFileName); + form.setOperatorId(EpmetRequestHolder.getHeader(AppClientConstant.USER_ID)); + form.setBizType(bizType); + + return SpringContextUtils.getBean(EpmetCommonServiceOpenFeignClient.class).createImportTask(form); + } + + /** + * 结束导入任务 + * @param taskId 任务ID + * @param processStatus 处理状态 见ImportTaskConstants + * @param resultDescFilePath 结果描述文件的路径 + * @param resultDesc 结果简要描述文字 + * @return Result + */ + public static Result finishImportTask(String taskId, String processStatus, String resultDescFilePath, String resultDesc) { + ImportTaskCommonFormDTO form = new ImportTaskCommonFormDTO(); + form.setTaskId(taskId); + form.setOperatorId(EpmetRequestHolder.getHeader(AppClientConstant.USER_ID)); + form.setProcessStatus(processStatus); + form.setResultDescFilePath(resultDescFilePath); + form.setResultDesc(resultDesc); + + return SpringContextUtils.getBean(EpmetCommonServiceOpenFeignClient.class).finishImportTask(form); + } + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNatController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNatController.java index 17502c65e0..e65121e55d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNatController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNatController.java @@ -28,6 +28,7 @@ import com.epmet.dto.result.NatListCommonExcelResultDTO; import com.epmet.dto.result.NatListResultDTO; import com.epmet.feign.EpmetCommonServiceOpenFeignClient; import com.epmet.service.IcNatService; +import com.epmet.utils.ImportTaskUtils; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.io.IOUtils; @@ -221,12 +222,8 @@ public class IcNatController implements ResultDataResolver { } // 2.生成导入任务记录 - ImportTaskCommonFormDTO importTaskForm = new ImportTaskCommonFormDTO(); - importTaskForm.setOperatorId(userId); - importTaskForm.setBizType(ImportTaskConstants.BIZ_TYPE_IC_NAT); - importTaskForm.setOriginFileName(originalFilename); - - ImportTaskCommonResultDTO rstData = getResultDataOrThrowsException(commonServiceOpenFeignClient.createImportTask(importTaskForm), + ImportTaskCommonResultDTO rstData = getResultDataOrThrowsException( + ImportTaskUtils.createImportTask(originalFilename, ImportTaskConstants.BIZ_TYPE_IC_NAT), ServiceConstant.EPMET_COMMON_SERVICE, EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "excel导入核酸检测信息错误", diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java index 5307df5cb1..2723d47b37 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java @@ -40,6 +40,7 @@ import com.epmet.feign.OssFeignClient; import com.epmet.service.IcNatService; import com.epmet.service.IcNoticeService; import com.epmet.service.UserService; +import com.epmet.utils.ImportTaskUtils; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; @@ -365,30 +366,23 @@ public class IcNatServiceImpl extends BaseServiceImpl imp } } - ImportTaskCommonFormDTO importFinishTaskForm = new ImportTaskCommonFormDTO(); - importFinishTaskForm.setTaskId(importTaskId); - importFinishTaskForm.setProcessStatus(failed ? ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL : ImportTaskConstants.PROCESS_STATUS_FINISHED_SUCCESS); - importFinishTaskForm.setOperatorId(userId); - importFinishTaskForm.setResultDesc(""); - importFinishTaskForm.setResultDescFilePath(errorDesFileUrl); + // 完成导入 + Result result = ImportTaskUtils.finishImportTask(importTaskId, + failed ? ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL : ImportTaskConstants.PROCESS_STATUS_FINISHED_SUCCESS, + errorDesFileUrl, + ""); - Result result = commonServiceOpenFeignClient.finishImportTask(importFinishTaskForm); if (!result.success()) { - log.error("【核酸检测导入】finishImportTask失败"); + log.error("【核酸检测导入】导入记录状态修改为'finished_success'失败"); } } catch (Exception e) { String errorMsg = ExceptionUtils.getErrorStackTrace(e); log.error("【核酸检测导入】出错:{}", errorMsg); - ImportTaskCommonFormDTO importFinishTaskForm = new ImportTaskCommonFormDTO(); - importFinishTaskForm.setTaskId(importTaskId); - importFinishTaskForm.setProcessStatus(ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL); - importFinishTaskForm.setOperatorId(userId); - importFinishTaskForm.setResultDesc("导入失败"); + Result result = ImportTaskUtils.finishImportTask(importTaskId, ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL, null, "导入失败"); - Result result = commonServiceOpenFeignClient.finishImportTask(importFinishTaskForm); if (!result.success()) { - log.error("【核酸检测导入】导入记录状态修改为'完成'失败"); + log.error("【核酸检测导入】导入记录状态修改为'finished_fail'失败"); } } finally { // 删除临时文件 From dc261c2f9fd0338c7bb1c299209ca802f47a122a Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 19 Apr 2022 13:58:45 +0800 Subject: [PATCH 104/127] =?UTF-8?q?=E4=B8=8E=E6=88=BF=E4=B8=BB=E5=85=B3?= =?UTF-8?q?=E7=B3=BB=E6=98=AF=E6=9C=AC=E4=BA=BA=E7=9A=84=EF=BC=8C=E4=B8=BA?= =?UTF-8?q?=E6=88=BF=E4=B8=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/IcResiUserServiceImpl.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index 7e376b57ec..1f27a2999d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -1036,14 +1036,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl houseResult = govOrgOpenFeignClient.get(user.getHomeId()); - if (!houseResult.success()) { - throw new RenException(houseResult.getCode(),houseResult.getMsg()); - } - result.setOwnerName(houseResult.getData().getOwnerName()); - + result.setOwnerName(""); //获取用户所在家庭里所有人员信息 LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(IcResiUserEntity::getHomeId, user.getHomeId()); @@ -1057,6 +1050,10 @@ public class IcResiUserServiceImpl extends BaseServiceImpl Date: Tue, 19 Apr 2022 14:40:41 +0800 Subject: [PATCH 105/127] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=97=B6=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0IS=5FTENANT/IS=5FFLOATING=E7=9A=84=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/IcResiUserImportServiceImpl.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java index ee23c3f7d1..199041f81b 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java @@ -458,6 +458,8 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res columnAndValues.put("IS_CJ", "0"); columnAndValues.put("IS_DB", "0"); columnAndValues.put("IS_MB", "0"); + columnAndValues.put("IS_TENANT", "0"); + columnAndValues.put("IS_FLOATING", "0"); } else { // 该居民已存在，要做更新操作，因为还没有读取子sheet，所以这些居民最新类别没有办法获取，先设置上旧的数据 columnAndValues.put("IS_ENSURE_HOUSE", existingResiMap.get("IS_ENSURE_HOUSE")); @@ -478,6 +480,8 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res columnAndValues.put("IS_CJ", existingResiMap.get("IS_CJ")); columnAndValues.put("IS_DB", existingResiMap.get("IS_DB")); columnAndValues.put("IS_MB", existingResiMap.get("IS_MB")); + columnAndValues.put("IS_TENANT", existingResiMap.get("IS_TENANT")); + columnAndValues.put("IS_FLOATING", existingResiMap.get("IS_FLOATING")); } columnAndValues.put("AGENCY_ID", currUserAgencyId); From 56303cb484cef40ba356b16271d803eb229f25bc Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 19 Apr 2022 17:04:32 +0800 Subject: [PATCH 106/127] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/IcResiUserServiceImpl.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index cf96262820..63ad97fc96 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -1298,14 +1298,14 @@ public class IcResiUserServiceImpl extends BaseServiceImpl idCards = list.stream().map(m -> m.getIdCard()).distinct().collect(Collectors.toList()); - if (CollectionUtils.isNotEmpty(idCards)){ - Result> housesNameByIdCards = govOrgOpenFeignClient.getHousesNameByIdCards(idCards); - if (!housesNameByIdCards.success()){ + Set homeIds = list.stream().filter(m -> StringUtils.isNotBlank(m.getIdCard())).map(m -> m.getHomeId()).distinct().collect(Collectors.toSet()); + if (CollectionUtils.isNotEmpty(homeIds)){ + Result> houseInfoRes = govOrgOpenFeignClient.queryListHouseInfo(homeIds, formDTO.getCustomerId()); + if (!houseInfoRes.success()){ throw new EpmetException("查询居民所属房屋失败..."); } - if (CollectionUtils.isNotEmpty(housesNameByIdCards.getData())){ - list.forEach(l -> housesNameByIdCards.getData().stream().filter( h -> h.getIdCard().equals(l.getIdCard())).forEach(h -> l.setHouseName(h.getHouseName()))); + if (CollectionUtils.isNotEmpty(houseInfoRes.getData())){ + list.forEach(l -> houseInfoRes.getData().stream().filter( h -> h.getHomeId().equals(l.getHomeId())).forEach(h -> l.setHouseName(h.getAllName()))); } } PageInfo pageInfo = new PageInfo<>(list); From 4bc3710435fe304288c29ad4da808cc9c2e16195 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Tue, 19 Apr 2022 17:19:33 +0800 Subject: [PATCH 107/127] =?UTF-8?q?=E6=94=B9=E9=80=A0=E3=80=90=E6=A0=B8?= =?UTF-8?q?=E9=85=B8=E6=A3=80=E6=B5=8B=E5=AF=BC=E5=85=A5=E3=80=91=E3=80=90?= =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF=E5=AF=BC=E5=85=A5=E3=80=91?= =?UTF-8?q?=E3=80=90=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E3=80=91=E7=9A=84importTask=E4=BC=A0=E8=BE=93=EF=BC=8C?= =?UTF-8?q?=E5=B0=81=E8=A3=85=E4=BA=86=E5=B7=A5=E5=85=B7=E7=B1=BB=EF=BC=8C?= =?UTF-8?q?=E5=87=8F=E5=B0=91=E4=BB=A3=E7=A0=81=E3=80=82=E8=B0=83=E6=95=B4?= =?UTF-8?q?FileItem=E4=B8=B4=E6=97=B6=E6=96=87=E4=BB=B6=E7=9A=84=E4=B8=80?= =?UTF-8?q?=E4=BA=9B=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/controller/IcVaccineController.java | 9 ++---- .../epmet/service/impl/IcNatServiceImpl.java | 23 ++++++++------ .../impl/IcResiUserImportServiceImpl.java | 5 +-- .../service/impl/IcVaccineServiceImpl.java | 31 ++++++++++--------- 4 files changed, 37 insertions(+), 31 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccineController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccineController.java index 297c30ae15..166cdecf32 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccineController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccineController.java @@ -25,6 +25,7 @@ import com.epmet.dto.result.IcVaccineListResultDTO; import com.epmet.dto.result.ImportTaskCommonResultDTO; import com.epmet.feign.EpmetCommonServiceOpenFeignClient; import com.epmet.service.IcVaccineService; +import com.epmet.utils.ImportTaskUtils; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.io.IOUtils; @@ -138,12 +139,8 @@ public class IcVaccineController implements ResultDataResolver { } // 2.生成导入任务记录 - ImportTaskCommonFormDTO importTaskForm = new ImportTaskCommonFormDTO(); - importTaskForm.setOperatorId(userId); - importTaskForm.setBizType(ImportTaskConstants.BIZ_TYPE_IC_VACCINE); - importTaskForm.setOriginFileName(originalFilename); - - ImportTaskCommonResultDTO rstData = getResultDataOrThrowsException(commonServiceOpenFeignClient.createImportTask(importTaskForm), + ImportTaskCommonResultDTO rstData = getResultDataOrThrowsException( + ImportTaskUtils.createImportTask(originalFilename, ImportTaskConstants.BIZ_TYPE_IC_VACCINE), ServiceConstant.EPMET_COMMON_SERVICE, EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "excel导入疫苗接种信息错误", diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java index 2723d47b37..95a22ff271 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java @@ -49,6 +49,7 @@ import org.apache.commons.fileupload.FileItem; import org.apache.commons.fileupload.FileItemFactory; import org.apache.commons.fileupload.disk.DiskFileItemFactory; import org.apache.http.entity.ContentType; +import org.apache.poi.util.IOUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; @@ -329,7 +330,6 @@ public class IcNatServiceImpl extends BaseServiceImpl imp EasyExcel.read(filePath.toFile(), IcNatImportExcelData.class, listener).headRowNumber(2).sheet(0).doRead(); - Path errorDescFile = null; String errorDesFileUrl = null; List errorRows = listener.getErrorRows(); @@ -341,16 +341,19 @@ public class IcNatServiceImpl extends BaseServiceImpl imp errorRows.addAll(otherRows); // 生成并上传描述文件 + OutputStream os = null; + FileItem fileItem = null; if (errorRows.size() > 0) { try { // 文件生成 Path errorDescDir = FileUtils.getAndCreateDirUnderEpmetFilesDir("ic_nat", "import", "error_des"); - String fileName = UUID.randomUUID().toString().concat(".xlsx"); - errorDescFile = errorDescDir.resolve(fileName); + String timeMillis = String.valueOf(System.currentTimeMillis()); + String fileName = "icnat_import_error_".concat(timeMillis).concat(".xlsx"); - FileItemFactory factory = new DiskFileItemFactory(16, errorDescDir.toFile()); - FileItem fileItem = factory.createItem("file", ContentType.APPLICATION_OCTET_STREAM.toString(), true, fileName); - OutputStream os = fileItem.getOutputStream(); + fileItem = new DiskFileItemFactory(DiskFileItemFactory.DEFAULT_SIZE_THRESHOLD, errorDescDir.toFile()) + .createItem("file", ContentType.APPLICATION_OCTET_STREAM.toString(), false, fileName); + + os = fileItem.getOutputStream(); EasyExcel.write(os, IcNatImportExcelData.RowRemarkMessage.class).sheet("信息列表").doWrite(errorRows); // 文件上传oss @@ -358,10 +361,12 @@ public class IcNatServiceImpl extends BaseServiceImpl imp if (errorDesFileUploadResult.success()) { errorDesFileUrl = errorDesFileUploadResult.getData().getUrl(); } - } finally { - if (Files.exists(errorDescFile)) { - Files.delete(errorDescFile); + IOUtils.closeQuietly(os); + try { + fileItem.delete(); + } finally { + log.error("【核酸检测导入】删除临时描述文件失败"); } } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java index ee23c3f7d1..c680ea94b8 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java @@ -25,6 +25,7 @@ import com.epmet.commons.tools.redis.RedisUtils; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.EpmetRequestHolder; +import com.epmet.commons.tools.utils.FileUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.constants.ImportTaskConstants; import com.epmet.dao.IcResiUserDao; @@ -1244,8 +1245,8 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res // 文件名 String resultDescFileName = UUID.randomUUID().toString().concat(".xls"); - FileItemFactory factory = new DiskFileItemFactory(16, null); - FileItem fileItem = factory.createItem("file", ContentType.APPLICATION_OCTET_STREAM.toString(), true, resultDescFileName); + FileItem fileItem = new DiskFileItemFactory(DiskFileItemFactory.DEFAULT_SIZE_THRESHOLD, FileUtils.getAndCreateDirUnderEpmetFilesDir("temp").toFile()) + .createItem("file", ContentType.APPLICATION_OCTET_STREAM.toString(), false, resultDescFileName); OutputStream os = fileItem.getOutputStream(); Result uploadResult = null; try { diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineServiceImpl.java index ec33974bf8..350c361ac4 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineServiceImpl.java @@ -37,6 +37,7 @@ import com.epmet.feign.EpmetCommonServiceOpenFeignClient; import com.epmet.feign.OssFeignClient; import com.epmet.service.IcVaccineService; import com.epmet.service.UserService; +import com.epmet.utils.ImportTaskUtils; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; @@ -45,6 +46,7 @@ import org.apache.commons.fileupload.FileItem; import org.apache.commons.fileupload.FileItemFactory; import org.apache.commons.fileupload.disk.DiskFileItemFactory; import org.apache.http.entity.ContentType; +import org.apache.poi.util.IOUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; @@ -177,7 +179,6 @@ public class IcVaccineServiceImpl extends BaseServiceImpl errorRows = listener.getErrorRows(); @@ -189,16 +190,17 @@ public class IcVaccineServiceImpl extends BaseServiceImpl 0) { try { // 文件生成 Path errorDescDir = FileUtils.getAndCreateDirUnderEpmetFilesDir("ic_vaccine", "import", "error_des"); String fileName = UUID.randomUUID().toString().concat(".xlsx"); - errorDescFile = errorDescDir.resolve(fileName); - FileItemFactory factory = new DiskFileItemFactory(16, errorDescDir.toFile()); - FileItem fileItem = factory.createItem("file", ContentType.APPLICATION_OCTET_STREAM.toString(), true, fileName); - OutputStream os = fileItem.getOutputStream(); + fileItem = new DiskFileItemFactory(DiskFileItemFactory.DEFAULT_SIZE_THRESHOLD, errorDescDir.toFile()) + .createItem("file", ContentType.APPLICATION_OCTET_STREAM.toString(), false, fileName); + os = fileItem.getOutputStream(); EasyExcel.write(os, IcNatImportExcelData.RowRemarkMessage.class).sheet("信息列表").doWrite(errorRows); // 文件上传oss @@ -208,20 +210,21 @@ public class IcVaccineServiceImpl extends BaseServiceImpl Date: Tue, 19 Apr 2022 17:31:49 +0800 Subject: [PATCH 108/127] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E6=A3=80=E6=B5=8Bsql=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../screen/ScreenProjectDataDao.xml | 94 +++++++++---------- 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectDataDao.xml index 51f9a0fcb6..f132877210 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectDataDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectDataDao.xml @@ -394,61 +394,61 @@ From 639af5c1f55f2bb0170a9e35b9898031128ebb01 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Tue, 19 Apr 2022 17:46:44 +0800 Subject: [PATCH 109/127] - --- .../java/com/epmet/service/impl/IcNatServiceImpl.java | 4 ++-- .../com/epmet/service/impl/IcVaccineServiceImpl.java | 10 ++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java index 95a22ff271..5649e202fe 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java @@ -365,8 +365,8 @@ public class IcNatServiceImpl extends BaseServiceImpl imp IOUtils.closeQuietly(os); try { fileItem.delete(); - } finally { - log.error("【核酸检测导入】删除临时描述文件失败"); + } catch (Exception e){ + log.error("【核酸检测导入】删除临时描述文件失败:{}", ExceptionUtils.getErrorStackTrace(e)); } } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineServiceImpl.java index 350c361ac4..389e23ba04 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineServiceImpl.java @@ -211,10 +211,12 @@ public class IcVaccineServiceImpl extends BaseServiceImpl Date: Wed, 20 Apr 2022 10:32:23 +0800 Subject: [PATCH 110/127] =?UTF-8?q?=E4=B8=80=E4=B8=AA=E6=88=BF=E5=B1=8B?= =?UTF-8?q?=E4=B8=8B=E5=8F=AA=E6=9C=89=E4=B8=80=E4=B8=AA=E6=88=B7=E4=B8=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/IcResiUserServiceImpl.java | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index 63ad97fc96..39260d1c44 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -208,6 +208,19 @@ public class IcResiUserServiceImpl extends BaseServiceImpl wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(IcResiUserEntity::getHomeId, map.get("HOME_ID")); + wrapper.eq(IcResiUserEntity::getYhzgx, RelationshipEnum.SELF.getCode()); + List entityList = baseDao.selectList(wrapper); + if (CollectionUtils.isNotEmpty(entityList)) { + String errorMsg = "房屋下已存在户主"; + throw new EpmetException(EpmetErrorCode.ORG_ADD_FAILED.getCode(), errorMsg, errorMsg); + } + + } + //2022.04.19 end //查询组织信息 String agencyId = map.get("AGENCY_ID"); Result result = govOrgOpenFeignClient.getAgencyById(agencyId); @@ -325,6 +338,21 @@ public class IcResiUserServiceImpl extends BaseServiceImpl wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(IcResiUserEntity::getHomeId, entity.getHomeId()); + wrapper.eq(IcResiUserEntity::getYhzgx, RelationshipEnum.SELF.getCode()); + List entityList = baseDao.selectList(wrapper); + if (CollectionUtils.isNotEmpty(entityList)) { + String errorMsg = "房屋下已存在户主"; + throw new EpmetException(EpmetErrorCode.ORG_ADD_FAILED.getCode(), errorMsg, errorMsg); + } + } + } + //2022.04.19 end resiUserId = map.get("ID"); } } From 7f512791cae8f9ee9915614bd38531ad0a466083 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Wed, 20 Apr 2022 10:51:05 +0800 Subject: [PATCH 111/127] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=88=BF=E5=B1=8B=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/commons/tools/dto/result/OptionResultDTO.java | 1 + .../src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java | 1 + 2 files changed, 2 insertions(+) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/OptionResultDTO.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/OptionResultDTO.java index 95741eb813..4226c2acac 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/OptionResultDTO.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/OptionResultDTO.java @@ -20,4 +20,5 @@ public class OptionResultDTO implements Serializable { private String sysDictDataId; private List children; private Boolean usableFlag; + private String type; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java index 527a5cf986..102dbc168f 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java @@ -127,6 +127,7 @@ public class IcHouseServiceImpl extends BaseServiceImpl Date: Wed, 20 Apr 2022 13:39:54 +0800 Subject: [PATCH 112/127] =?UTF-8?q?=E8=81=94=E5=BB=BA=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BD=91=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/result/resi/ResiActDetailResultDTO.java | 3 +++ .../com/epmet/service/impl/ActInfoServiceImpl.java | 10 ++++++++++ 2 files changed, 13 insertions(+) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiActDetailResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiActDetailResultDTO.java index aa33f41e69..266ccf8e9f 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiActDetailResultDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiActDetailResultDTO.java @@ -181,6 +181,9 @@ public class ResiActDetailResultDTO implements Serializable { */ private String actType; + private String gridId; + private String gridName; + /** * 联建单位 */ diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActInfoServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActInfoServiceImpl.java index 407cb74dac..388594a48b 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActInfoServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActInfoServiceImpl.java @@ -25,6 +25,8 @@ import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.redis.common.CustomerOrgRedis; +import com.epmet.commons.tools.redis.common.bean.GridInfoCache; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; @@ -279,6 +281,14 @@ public class ActInfoServiceImpl extends BaseServiceImpl unitNames = unitIds.stream().map(option::get).collect(Collectors.toList()); detailResultDTO.setUnitIdList(unitIds); detailResultDTO.setUnitNameList(unitNames); + + if (StringUtils.isNotEmpty(dto.getGridId())) { + detailResultDTO.setGridId(dto.getGridId()); + GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(dto.getGridId()); + if (null != gridInfo) { + detailResultDTO.setGridName(gridInfo.getGridName()); + } + } } } return new Result().ok(detailResultDTO); From 6936a1c44480cabc3e1d3bae1ffe366a6b27f830 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 20 Apr 2022 16:43:59 +0800 Subject: [PATCH 113/127] =?UTF-8?q?=E5=AF=BC=E5=87=BAbug=20=E6=9C=AA?= =?UTF-8?q?=E5=8F=91=E7=8E=B0=E6=94=B9=E4=BA=86=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/BuildingServiceImpl.java | 9 ++++++--- .../com/epmet/service/impl/HouseServiceImpl.java | 12 ++++++++---- .../epmet/service/impl/NeighborHoodServiceImpl.java | 3 ++- .../src/main/resources/mapper/IcBuildingDao.xml | 2 +- .../src/main/resources/mapper/IcNeighborHoodDao.xml | 1 + 5 files changed, 18 insertions(+), 9 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java index 20e1d2d4ef..1efa048892 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java @@ -54,9 +54,11 @@ import org.springframework.util.CollectionUtils; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import java.io.InputStream; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.concurrent.ExecutorService; -import java.util.function.Function; import java.util.stream.Collectors; @Slf4j @@ -299,7 +301,8 @@ public class BuildingServiceImpl implements BuildingService { @Override public PageData listBuilding(IcBuildingListFormDTO formDTO) { - PageInfo pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()).doSelectPageInfo(() -> icBuildingDao.searchBuildingByPage(formDTO)); + PageInfo pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()) + .doSelectPageInfo(() -> icBuildingDao.searchBuildingByPage(formDTO)); List records = pageInfo.getList(); records.forEach(item -> item.setBuildingType(BuildingTypeEnums.getTypeValue(item.getBuildingTypeKey()))); return new PageData<>(pageInfo.getList(), pageInfo.getTotal()); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java index bac35ce64c..e4fdaca7e4 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java @@ -168,9 +168,15 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { pids = getPids(formDTO.getAgencyId()); } formDTO.setPids(pids); + PageInfo pageInfo = null; + if (formDTO.getIsPage()){ + pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(),formDTO.getIsPage()) + .doSelectPageInfo(() -> icHouseDao.searchHouseByPage(formDTO)); + }else{ + List resultDTOS = icHouseDao.searchHouseByPage(formDTO); + pageInfo = new PageInfo<>(resultDTOS,resultDTOS.size()); + } - PageInfo pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(),formDTO.getIsPage()).doSelectPageInfo(() -> - icHouseDao.searchHouseByPage(formDTO)); List records = pageInfo.getList(); records.forEach(item->{ item.setHouseType(HouseTypeEnums.getTypeValue(item.getHouseTypeKey())); @@ -205,8 +211,6 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { Map map = new HashMap<>(); map.put("maplist",icHouseExcels.getList()); ExcelPoiUtils.exportExcel(templatePath ,map,"房屋信息录入表",response); - - return ; } @Override diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java index ebc6b80744..991469c313 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java @@ -103,7 +103,8 @@ public class NeighborHoodServiceImpl implements NeighborHoodService { //根据组织过滤 formDTO.setAgencyId(formDTO.getId()); } - PageInfo pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()).doSelectPageInfo(() -> icNeighborHoodDao.searchNeighborhoodByPage(formDTO)); + PageInfo pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()) + .doSelectPageInfo(() -> icNeighborHoodDao.searchNeighborhoodByPage(formDTO)); return new PageData<>(pageInfo.getList(),pageInfo.getTotal()); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml index d4561898a7..a78c7fc3f4 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml @@ -147,7 +147,7 @@ AND a.DEL_FLAG = #{building.delFlag} - + order by a.CREATED_TIME, a.BUILDING_NAME + + UPDATE ic_house h,ic_building b,ic_building_unit u + SET h.HOUSE_NAME = CONCAT(b.BUILDING_NAME,'-',u.UNIT_NAME,'-',h.DOOR_NAME), + h.UPDATED_TIME = NOW() + WHERE h.DEL_FLAG = '0' + AND h.BUILDING_ID = b.ID AND b.DEL_FLAG = '0' + AND h.BUILDING_UNIT_ID = u.ID AND u.DEL_FLAG = '0' + AND h.BUILDING_ID = #{buildingId} + + - - - + SELECT + ID AS attachmentId, + FILE_NAME AS name, + ATTACHMENT_URL AS url, + ATTACHMENT_TYPE AS type, + ATTACHMENT_FORMAT AS format, + IFNULL(ATTACHMENT_SIZE,0) AS size, + IFNULL(DURATION,0) AS duration, + PROCESS_ID, + FILE_PLACE + FROM project_process_attachment + WHERE DEL_FLAG = '0' + AND PROJECT_ID = #{projectId} + order by sort + + \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml index df62d9b6dc..054839bf02 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml @@ -307,7 +307,19 @@ AND customer_id = #{customerId} AND id_card = #{idCard} - +