From 308c29bc591434868a924d6ac9e7fcf0ba189db7 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 12 May 2022 17:43:45 +0800 Subject: [PATCH] =?UTF-8?q?import=20=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/NewsDTO.java | 2 +- .../main/java/com/epmet/dto/SysDeptDTO.java | 3 +- .../java/com/epmet/dto/SysDictDataDTO.java | 2 +- .../java/com/epmet/dto/SysDictTypeDTO.java | 3 +- .../main/java/com/epmet/dto/SysMenuDTO.java | 2 +- .../main/java/com/epmet/dto/SysParamsDTO.java | 3 +- .../main/java/com/epmet/dto/SysRegionDTO.java | 3 +- .../main/java/com/epmet/dto/SysRoleDTO.java | 3 +- .../main/java/com/epmet/dto/SysUserDTO.java | 3 +- .../dto/region/LogOperationResultDTO.java | 5 --- .../java/com/epmet/dto/region/Region.java | 1 - .../com/epmet/remote/ParamsRemoteService.java | 2 +- .../controller/LogOperationController.java | 1 - .../epmet/controller/SysDeptController.java | 4 +- .../controller/SysDictTypeController.java | 6 +-- .../epmet/controller/SysMenuController.java | 8 ++-- .../epmet/controller/SysRegionController.java | 6 +-- .../epmet/controller/SysRoleController.java | 5 +-- .../epmet/controller/SysUserController.java | 11 +++-- .../com/epmet/entity/CorsConfigEntity.java | 3 -- .../com/epmet/entity/LogOperationEntity.java | 1 - .../mq/listener/RocketMQConsumerRegister.java | 9 +--- .../listener/ProjectOperationLogListener.java | 1 - .../java/com/epmet/service/NewsService.java | 2 +- .../com/epmet/service/SysDeptService.java | 2 +- .../com/epmet/service/SysDictTypeService.java | 2 +- .../com/epmet/service/SysLogErrorService.java | 2 +- .../com/epmet/service/SysLogLoginService.java | 2 +- .../epmet/service/SysLogOperationService.java | 2 +- .../com/epmet/service/SysMenuService.java | 2 +- .../com/epmet/service/SysParamsService.java | 2 +- .../com/epmet/service/SysRegionService.java | 2 +- .../com/epmet/service/SysResourceService.java | 2 +- .../com/epmet/service/SysRoleService.java | 2 +- .../com/epmet/service/SysUserService.java | 2 +- .../service/impl/CorsConfigServiceImpl.java | 1 - .../service/impl/LogOperationServiceImpl.java | 1 - .../epmet/service/impl/NewsServiceImpl.java | 1 - .../epmet/controller/BackDoorController.java | 1 - .../epmet/controller/GovLoginController.java | 1 - .../epmet/controller/GovWebController.java | 2 - .../epmet/controller/IcLoinController.java | 5 ++- .../controller/PublicUserLoginController.java | 5 --- .../com/epmet/controller/SsoController.java | 2 +- .../controller/ThirdLoginController.java | 3 -- .../java/com/epmet/jwt/JwtTokenUtils.java | 2 - .../service/impl/GovLoginServiceImpl.java | 1 - .../epmet/service/impl/GovWebServiceImpl.java | 2 - .../service/impl/IcLoginServiceImpl.java | 4 +- .../impl/PublicUserLoginServiceImpl.java | 5 ++- .../service/impl/ResourceServiceImpl.java | 2 +- .../src/test/java/com/epmet/TokenGenTest.java | 3 -- .../resources/template/add-or-update.vue.vm | 5 ++- .../src/main/resources/template/index.vue.vm | 7 +-- .../epmet/common/token/util/TokenUtil.java | 1 - .../util/AbstractDataSourceNameFetcher.java | 2 - .../aspect/ExternalAppRequestAuthAspect.java | 2 +- .../mybatis/aspect/DataFilterAspect.java | 2 +- .../dto/form/StaffPermissionFormDTO.java | 3 -- .../feign/MybatisGovAccessFeignClient.java | 6 +-- .../feign/MybatisGovOrgFeignClient.java | 3 +- .../MybatisGovAccessFeignClientFallback.java | 7 +-- .../MybatisGovOrgFeignClientFallback.java | 3 +- .../interceptor/DataFilterInterceptor.java | 1 - .../rocketmq/messages/OrgOrStaffMQMsg.java | 3 -- .../rocketmq/register/MQAbstractRegister.java | 1 - .../epmet/commons/security/jwt/JwtUtils.java | 1 - .../com/epmet/commons/thirdplat/DemoApp.java | 1 - .../com/epmet/wx/mp/handler/ScanHandler.java | 7 ++- .../epmet/wx/mp/handler/SubscribeHandler.java | 7 ++- .../tools/annotation/MaskResponse.java | 4 -- .../commons/tools/config/AsyncConfig.java | 6 ++- .../tools/constant/ThreadLocalConstant.java | 2 - .../tools/security/config/WebMvcConfig.java | 4 +- .../tools/security/dto/GovTokenDto.java | 1 - .../tools/security/password/BCrypt.java | 2 - ...oginUserHandlerMethodArgumentResolver.java | 5 --- .../tools/utils/EpmetRequestHolder.java | 1 - .../commons/tools/utils/ModuleUtils.java | 3 -- .../commons/tools/utils/TreeStringNode.java | 1 - .../java/com/epmet/auth/AuthProcessor.java | 8 ---- .../java/com/epmet/filter/AuthFilter.java | 4 +- .../filter/CpAuthGatewayFilterFactory.java | 3 +- .../healthcheck/HealthCheckController.java | 1 - .../java/com/epmet/jwt/JwtTokenUtils.java | 2 - .../form/AgenctBasicDataFormDTO.java | 1 - .../dto/epmettduck/AcUserAuthorizeDTO.java | 7 +-- .../dataaggre/dto/epmettduck/AcUserDTO.java | 7 +-- .../PrProjectTemplateCategoryDTO.java | 7 +-- .../dto/epmettduck/PrProjectTemplateDTO.java | 7 +-- .../epmettduck/PrProjectTemplateItemDTO.java | 11 ++--- .../dto/epmettduck/PrProjectThemeDTO.java | 7 +-- .../dto/epmettduck/PrPublishRangeDTO.java | 7 +-- .../dto/epmettduck/PrResultExtDTO.java | 7 +-- .../dto/epmettduck/PrUserProjectDTO.java | 7 +-- .../dto/epmettduck/PrUserProjectItemDTO.java | 11 ++--- .../dto/epmettduck/PrUserProjectLogicDTO.java | 7 +-- .../epmettduck/PrUserProjectResultDTO.java | 7 +-- .../epmettduck/PrUserProjectSettingDTO.java | 9 ++-- .../dto/epmettduck/PrUserProjectThemeDTO.java | 7 +-- .../dto/epmettduck/PrVistRecordDTO.java | 7 +-- .../dataaggre/dto/epmettduck/WxMpUserDTO.java | 11 ++--- .../form/TDuckHeaderInfoFormDTO.java | 1 - .../BadgeCertificationConfigFieldDTO.java | 7 +-- .../dataaggre/dto/epmetuser/BadgeDTO.java | 5 ++- .../dto/epmetuser/CustomerStaffDTO.java | 5 ++- .../dto/epmetuser/CustomerUserDTO.java | 5 ++- .../dto/epmetuser/GovStaffRoleDTO.java | 17 +++---- .../epmetuser/GovStaffRoleTemplateDTO.java | 17 +++---- .../dto/epmetuser/GridLatestDTO.java | 7 +-- .../dto/epmetuser/GridVisitedDTO.java | 5 ++- .../dataaggre/dto/epmetuser/OperUserDTO.java | 5 ++- .../dto/epmetuser/RegisterRelationDTO.java | 5 ++- .../dto/epmetuser/ResiUserBadgeDTO.java | 5 ++- .../dataaggre/dto/epmetuser/RoleDTO.java | 7 +-- .../dto/epmetuser/StaffAgencyVisitedDTO.java | 5 ++- .../dto/epmetuser/StaffGridVisitedDTO.java | 5 ++- .../dto/epmetuser/StaffPatrolRecordDTO.java | 3 +- .../dataaggre/dto/epmetuser/StaffRoleDTO.java | 19 ++++---- .../dto/epmetuser/StaffWechatDTO.java | 7 +-- .../dto/epmetuser/UserAdviceDTO.java | 9 ++-- .../dto/epmetuser/UserAdviceImgDTO.java | 5 ++- .../UserBadgeCertificateRecordDTO.java | 7 +-- .../dto/epmetuser/UserBaseInfoDTO.java | 5 ++- .../dto/epmetuser/UserCustomerDTO.java | 7 +-- .../dataaggre/dto/epmetuser/UserDTO.java | 7 +-- .../dto/epmetuser/UserInvitationDTO.java | 5 ++- .../dto/epmetuser/UserResiInfoDTO.java | 5 ++- .../epmetuser/UserResiRegisterVisitDTO.java | 5 ++- .../dataaggre/dto/epmetuser/UserRoleDTO.java | 7 +-- .../dto/epmetuser/UserWechatDTO.java | 7 +-- .../form/GridMemberPatrolListFormDTO.java | 3 -- .../dto/epmetuser/form/RoleListFormDTO.java | 1 - .../dto/epmetuser/form/StaffListFormDTO.java | 1 - .../result/IcUserCategoryResultDTO.java | 1 - .../govissue/IssueProjectCategoryDictDTO.java | 3 +- .../form/ShiftProjectIssueListFormDTO.java | 1 - .../dto/govorg/form/GridLivelyFormDTO.java | 1 - .../dto/govorg/form/StaffDetailV2FormDTO.java | 1 - .../govorg/result/GridLivelyResultDTO.java | 1 - .../ProjectProcessAttachmentDTO.java | 7 +-- .../govproject/ProjectProcessScanTaskDTO.java | 5 ++- .../ProjectRelatedPersonnelDTO.java | 5 ++- .../ProjectSatisfactionDetailDTO.java | 5 ++- .../ProjectSatisfactionStatisticsDTO.java | 5 ++- .../dto/govproject/ProjectStaffDTO.java | 5 ++- .../dto/govproject/ProjectTagsDTO.java | 5 ++- .../form/ProjectAnalysisFormDTO.java | 1 - .../resigroup/GroupEditSubmitRecordDTO.java | 7 +-- .../dto/resigroup/GroupInvitationDTO.java | 5 ++- .../resigroup/GroupMemeberOperationDTO.java | 5 ++- .../dto/resigroup/ResiGroupCodeDTO.java | 5 ++- .../dto/resigroup/ResiGroupMemberDTO.java | 5 ++- .../dto/resigroup/ResiGroupOperationDTO.java | 5 ++- .../resigroup/ResiGroupStatisticalDTO.java | 5 ++- .../dto/resigroup/ResiTopicAttachmentDTO.java | 5 ++- .../dto/resigroup/ResiTopicOperationDTO.java | 5 ++- .../resigroup/TopicDraftAttachmentDTO.java | 7 +-- .../dto/resigroup/TopicDraftDTO.java | 9 ++-- .../dto/resigroup/TopicDraftOperationDTO.java | 5 ++- .../dto/resigroup/TopicDraftScanTaskDTO.java | 5 ++- .../resigroup/TopicShareLinkRecordDTO.java | 5 ++- .../TopicShareLinkVisitRecordDTO.java | 7 +-- .../enums/GridMemberDataAnalysisEnums.java | 3 -- ...GridMemberDataAnalysisExcelExportBean.java | 3 +- .../controller/EpmetTDuckController.java | 1 + .../PrProjectTemplateCategoryDao.java | 6 +-- .../dao/epmettduck/PrVistRecordDao.java | 5 +-- .../dataaggre/dao/govproject/ProjectDao.java | 1 - .../dao/opercustomize/CustomerFootBarDao.java | 4 +- .../FactGridMemberStatisticsDailyEntity.java | 3 -- .../epmettduck/AcUserAuthorizeEntity.java | 5 +-- .../entity/epmettduck/AcUserEntity.java | 3 +- .../PrProjectTemplateCategoryEntity.java | 5 +-- .../epmettduck/PrProjectTemplateEntity.java | 5 +-- .../PrProjectTemplateItemEntity.java | 9 ++-- .../epmettduck/PrProjectThemeEntity.java | 5 +-- .../epmettduck/PrPublishRangeEntity.java | 5 +-- .../entity/epmettduck/PrResultExtEntity.java | 5 +-- .../epmettduck/PrUserProjectEntity.java | 5 +-- .../epmettduck/PrUserProjectLogicEntity.java | 5 +-- .../epmettduck/PrUserProjectResultEntity.java | 5 +-- .../PrUserProjectSettingEntity.java | 5 +-- .../epmettduck/PrUserProjectThemeEntity.java | 5 +-- .../entity/epmettduck/WxMpUserEntity.java | 9 ++-- .../BadgeCertificationConfigFieldEntity.java | 3 -- .../entity/epmetuser/BadgeEntity.java | 3 -- .../entity/epmetuser/CustomerStaffEntity.java | 1 - .../entity/epmetuser/GovStaffRoleEntity.java | 3 -- .../epmetuser/GovStaffRoleTemplateEntity.java | 3 -- .../entity/epmetuser/GridLatestEntity.java | 3 +- .../entity/epmetuser/GridVisitedEntity.java | 1 - .../entity/epmetuser/OperUserEntity.java | 3 -- .../epmetuser/RegisterRelationEntity.java | 3 -- .../entity/epmetuser/ResiUserBadgeEntity.java | 3 -- .../entity/epmetuser/RoleEntity.java | 5 +-- .../epmetuser/StaffAgencyVisitedEntity.java | 3 -- .../epmetuser/StaffGridVisitedEntity.java | 3 -- .../epmetuser/StaffPatrolDetailEntity.java | 1 - .../epmetuser/StaffPatrolRecordEntity.java | 1 - .../entity/epmetuser/StaffRoleEntity.java | 3 -- .../entity/epmetuser/StaffWechatEntity.java | 5 +-- .../entity/epmetuser/UserAdviceEntity.java | 5 +-- .../entity/epmetuser/UserAdviceImgEntity.java | 3 -- .../UserBadgeCertificateRecordEntity.java | 3 +- .../entity/epmetuser/UserBaseInfoEntity.java | 3 -- .../entity/epmetuser/UserCustomerEntity.java | 5 +-- .../entity/epmetuser/UserEntity.java | 5 +-- .../epmetuser/UserInvitationEntity.java | 1 - .../entity/epmetuser/UserResiInfoEntity.java | 3 -- .../UserResiRegisterVisitEntity.java | 1 - .../entity/epmetuser/UserRoleEntity.java | 5 +-- .../entity/epmetuser/UserWechatEntity.java | 5 +-- .../govproject/ProjectCategoryEntity.java | 3 -- .../entity/govproject/ProjectEntity.java | 3 -- .../govproject/ProjectOrgRelationEntity.java | 1 - .../ProjectProcessAttachmentEntity.java | 5 +-- .../govproject/ProjectProcessEntity.java | 1 - .../ProjectProcessScanTaskEntity.java | 3 -- .../ProjectRelatedPersonnelEntity.java | 3 -- .../ProjectSatisfactionDetailEntity.java | 3 -- .../ProjectSatisfactionStatisticsEntity.java | 3 -- .../entity/govproject/ProjectStaffEntity.java | 3 -- .../entity/govproject/ProjectTagsEntity.java | 3 -- .../GroupEditSubmitRecordEntity.java | 1 - .../resigroup/GroupInvitationEntity.java | 1 - .../GroupMemeberOperationEntity.java | 3 -- .../entity/resigroup/ResiGroupCodeEntity.java | 3 -- .../entity/resigroup/ResiGroupEntity.java | 1 - .../resigroup/ResiGroupMemberEntity.java | 3 -- .../resigroup/ResiGroupOperationEntity.java | 3 -- .../resigroup/ResiGroupStatisticalEntity.java | 3 -- .../resigroup/ResiTopicAttachmentEntity.java | 3 -- .../entity/resigroup/ResiTopicEntity.java | 7 +-- .../resigroup/ResiTopicOperationEntity.java | 3 -- .../resigroup/TopicDraftAttachmentEntity.java | 5 +-- .../entity/resigroup/TopicDraftEntity.java | 7 +-- .../resigroup/TopicDraftOperationEntity.java | 3 -- .../resigroup/TopicDraftScanTaskEntity.java | 3 -- .../resigroup/TopicShareLinkRecordEntity.java | 3 -- .../TopicShareLinkVisitRecordEntity.java | 3 -- .../epmet/dataaggre/redis/ResiGroupRedis.java | 1 - .../dataaggre/service/AggreGridService.java | 1 - .../service/datastats/DataStatsService.java | 2 - .../impl/EpmetMessageServiceImpl.java | 1 - .../PrProjectTemplateCategoryService.java | 5 +-- .../epmettduck/PrUserProjectItemService.java | 6 +-- .../impl/PrUserProjectItemServiceImpl.java | 4 +- .../impl/StaffPatrolDetailServiceImpl.java | 4 +- .../service/govproject/GovProjectService.java | 1 - .../impl/GovProjectServiceImpl.java | 1 - .../opercrm/impl/CustomerRelationImpl.java | 1 - .../resigroup/impl/ResiGroupServiceImpl.java | 5 ++- .../com/epmet/dto/StaffPatrolDetailDTO.java | 5 ++- .../com/epmet/dto/StaffPatrolRecordDTO.java | 5 ++- .../epmet/dto/result/ParentListResultDTO.java | 3 +- .../result/issue/IssueAvgAuditTimeDTO.java | 3 -- .../project/GridProjectCountResultDTO.java | 2 - .../index/result/IndexExplainChildResult.java | 2 - .../dto/result/AgeDistributionResultDTO.java | 1 - .../result/GenderDistributionResultDTO.java | 1 - .../result/HeartActcounttrendResultDTO.java | 1 - .../HeartVolunteerportrayalResultDTO.java | 1 - .../result/UserPointRankListResultDTO.java | 1 - .../feign/DataReportOpenFeignClient.java | 1 - .../DataReportOpenFeignClientFallBack.java | 1 - .../group/dto/form/GroupIncrTrendFormDTO.java | 1 - .../project/dto/CustomerCategoryDTO.java | 2 - .../dto/result/FactTagViewedAgencyDTO.java | 3 +- .../controller/group/GroupController.java | 2 +- .../controller/issue/IssueController.java | 2 +- .../controller/project/ProjectController.java | 16 ++----- .../publicity/PublicityController.java | 4 +- .../screen/GrassRootsGovernController.java | 5 ++- .../controller/screen/KcScreenController.java | 5 +-- .../user/StaffPatrolDetailController.java | 13 +++--- .../user/UserAnalysisController.java | 2 +- .../screen/ScreenCustomerAgencyDao.java | 1 - .../ScreenProjectCategoryOrgDailyDao.java | 3 +- .../screen/ScreenProjectOrgDailyDao.java | 3 +- .../fact/FactVolunteerServiceDailyDao.java | 4 +- .../datareport/dao/fact/IndexDictDao.java | 1 - .../ScreenKcIssueSummaryGridDailyDTO.java | 5 ++- .../ScreenKcIssueTrendGridMonthlyDTO.java | 5 ++- .../dao/user/StaffPatrolRecordDao.java | 6 +-- .../entity/user/StaffPatrolDetailEntity.java | 1 - .../entity/user/StaffPatrolRecordEntity.java | 1 - .../backdoor/impl/BackDoorServiceImpl.java | 1 - .../screen/KcScreenService.java | 2 - .../screen/ScreenProjectService.java | 1 - .../screen/impl/AnScreenServiceImpl.java | 1 - .../screen/impl/KcScreenServiceImpl.java | 3 -- ...nProjectQuantityOrgMonthlyServiceImpl.java | 7 ++- .../screen/impl/ScreenProjectServiceImpl.java | 5 ++- .../service/group/impl/GroupServiceImpl.java | 2 +- .../service/issue/impl/IssueServiceImpl.java | 2 +- .../service/project/ProjectService.java | 2 +- .../publicity/impl/PublicityServiceImpl.java | 4 +- .../service/topic/impl/TopicServiceImpl.java | 2 +- .../user/StaffPatrolDetailService.java | 10 ++--- .../impl/StaffPatrolDetailServiceImpl.java | 9 ++-- .../user/impl/UserAnalysisServiceImpl.java | 2 +- .../basereport/form/AgencyProjectFormDTO.java | 1 - .../form/GridGroupTotalFormDTO.java | 2 - .../form/GridTopicIssueFormDTO.java | 1 - .../epmet/dto/extract/DimObjectActionDTO.java | 5 ++- .../epmet/dto/extract/DimObjectStatusDTO.java | 5 ++- .../extract/FactOriginGroupMainDailyDTO.java | 16 +++---- .../FactOriginGroupMemberDailyDTO.java | 15 ++++--- .../extract/FactOriginIssueLogDailyDTO.java | 5 ++- .../extract/FactOriginIssueMainDailyDTO.java | 5 ++- .../FactOriginProjectMainDailyDTO.java | 5 ++- .../FactOriginProjectOrgPeriodDailyDTO.java | 17 +++---- .../form/GovernAbilityGridMonthlyFormDTO.java | 8 ++-- .../extract/form/IssueMainDailyFormDTO.java | 1 - .../form/PartyAbilityGridMonthlyFormDTO.java | 8 ++-- .../result/GridProjectToProjectMainDTO.java | 3 +- .../result/ProjectEvaluateResultDTO.java | 1 - .../dto/group/form/AgencyMonthlyFormDTO.java | 1 - .../FactIndexGovrnAblityGridMonthlyDTO.java | 8 ++-- .../FactIndexPartyAblityGridMonthlyDTO.java | 8 ++-- .../FactIndexServiceAblityGridMonthlyDTO.java | 6 +-- .../form/DeptGovrnAbilityDataFormDTO.java | 1 - .../form/GridGovrnAbilityDataFormDTO.java | 1 - .../form/GridPartyAbilityDataFormDTO.java | 1 - .../form/GridPartyMemberDataFormDTO.java | 4 -- .../form/OrgGovrnAbilityDataFormDTO.java | 1 - .../form/OrgPartyAbilityFormDTO.java | 1 - .../form/OrgServiceAbilityFormDTO.java | 1 - .../issue/IssueProjectCategoryDictDTO.java | 5 ++- .../ScreenCustomerWorkRecordDictDTO.java | 5 ++- .../project/form/MonthProjectListFormDTO.java | 1 - .../dto/screen/CategoryDictDataFormDTO.java | 2 - .../dto/screen/FactIndexGridScoreDTO.java | 4 +- .../screen/ScreenGovernRankDataDailyDTO.java | 6 +-- .../dto/screen/ScreenProjectImgDataDTO.java | 3 +- .../ScreenProjectProcessAttachmentDTO.java | 3 +- .../dto/screen/ScreenProjectProcessDTO.java | 9 ++-- .../dto/screen/result/TreeResultDTO.java | 3 -- .../dto/screencoll/ScreenCollFormDTO.java | 4 +- .../screencoll/form/EventDataListFormDTO.java | 3 -- .../form/PioneerDataListFormDTO.java | 1 - .../com/epmet/dto/stats/DimAgencyDTO.java | 7 +-- .../dto/stats/DimCustomerPartymemberDTO.java | 7 +-- .../java/com/epmet/dto/stats/DimDateDTO.java | 5 ++- .../com/epmet/dto/stats/DimDepartmentDTO.java | 5 ++- .../java/com/epmet/dto/stats/DimGridDTO.java | 5 ++- .../java/com/epmet/dto/stats/DimMonthDTO.java | 5 ++- .../com/epmet/dto/stats/DimQuarterDTO.java | 5 ++- .../epmet/dto/stats/DimTopicStatusDTO.java | 5 ++- .../java/com/epmet/dto/stats/DimWeekDTO.java | 5 ++- .../java/com/epmet/dto/stats/DimYearDTO.java | 5 ++- .../FactAgencyOriginProjectDailyDTO.java | 6 +-- .../FactAgencyOriginProjectMonthlyDTO.java | 6 +-- .../dto/stats/FactAgencyProjectDailyDTO.java | 6 +-- .../stats/FactAgencyProjectMonthlyDTO.java | 6 +-- .../FactGridMemberStatisticsDailyDTO.java | 5 ++- .../FactGridMemberStatisticsMonthlyDTO.java | 5 ++- .../dto/stats/FactGridProjectDailyDTO.java | 6 +-- .../dto/stats/FactGridProjectMonthlyDTO.java | 6 +-- .../dto/stats/FactGroupAgencyDailyDTO.java | 5 ++- .../dto/stats/FactGroupAgencyMonthlyDTO.java | 5 ++- .../dto/stats/FactGroupGridDailyDTO.java | 5 ++- .../stats/FactGroupTotalAgencyDailyDTO.java | 5 ++- .../dto/stats/FactGroupTotalGridDailyDTO.java | 5 ++- .../dto/stats/FactIssueAgencyDailyDTO.java | 8 ++-- .../dto/stats/FactIssueAgencyMonthlyDTO.java | 8 ++-- .../dto/stats/FactIssueGridDailyDTO.java | 8 ++-- .../dto/stats/FactIssueGridMonthlyDTO.java | 8 ++-- ...FactPartyMemberVanguardAgencyDailyDTO.java | 6 +-- .../FactPartyMemberVanguardGridDailyDTO.java | 6 +-- .../form/CustomerIdAndDateIdFormDTO.java | 1 - .../dto/stats/form/GmUploadDataFormDTO.java | 3 -- .../dto/stats/form/GmUploadEventFormDTO.java | 1 - .../FactTopicHotdiscussAgencyDailyDTO.java | 5 ++- .../FactTopicHotdiscussGridDailyDTO.java | 5 ++- .../topic/FactTopicIssueAgencyDailyDTO.java | 5 ++- .../topic/FactTopicIssueAgencyMonthlyDTO.java | 5 ++- .../topic/FactTopicIssueGridDailyDTO.java | 5 ++- .../topic/FactTopicIssueGridMonthlyDTO.java | 5 ++- .../topic/FactTopicStatusAgencyDailyDTO.java | 6 +-- .../FactTopicStatusAgencyMonthlyDTO.java | 8 ++-- .../topic/FactTopicStatusGridDailyDTO.java | 6 +-- .../topic/FactTopicTotalAgencyDailyDTO.java | 5 ++- .../topic/FactTopicTotalGridDailyDTO.java | 5 ++- .../FactParticipationUserAgencyDailyDTO.java | 12 ++--- ...FactParticipationUserAgencyMonthlyDTO.java | 12 ++--- .../FactParticipationUserGridDailyDTO.java | 13 +++--- .../FactParticipationUserGridMonthlyDTO.java | 13 +++--- .../stats/user/FactRegUserAgencyDailyDTO.java | 12 ++--- .../user/FactRegUserAgencyMonthlyDTO.java | 12 ++--- .../stats/user/FactRegUserGridDailyDTO.java | 13 +++--- .../stats/user/FactRegUserGridMonthlyDTO.java | 13 +++--- .../dto/user/result/GridUserInfoDTO.java | 1 - .../epmet/controller/DemandController.java | 17 ++++--- .../com/epmet/controller/DimController.java | 5 +-- .../controller/StatsGroupController.java | 1 - .../controller/StatsTopicController.java | 1 - .../indexcal/AgencyScoreDao.java | 1 - .../indexcal/DeptScoreDao.java | 2 +- .../ScreenProjectCategoryOrgDailyDao.java | 3 +- .../epmet/dao/partymember/PartyMemberDao.java | 8 ---- .../epmet/dao/project/ProjectProcessDao.java | 1 - .../com/epmet/dao/stats/BaseReportDao.java | 3 -- .../com/epmet/dao/stats/DimAgencyDao.java | 3 +- .../java/com/epmet/dao/stats/DimDateDao.java | 4 +- .../epmet/dao/stats/DimTopicStatusDao.java | 5 +-- ...actArticlePublishedDepartmentDailyDao.java | 3 +- .../dao/stats/FactGroupGridDailyDao.java | 3 +- .../FactParticipationUserGridDailyDao.java | 3 +- .../java/com/epmet/dao/topic/TopicDao.java | 2 +- .../extract/DimObjectActionEntity.java | 3 -- .../extract/DimObjectStatusEntity.java | 3 -- .../FactGridMemberStatisticsDailyEntity.java | 3 -- ...FactGridMemberStatisticsMonthlyEntity.java | 3 -- .../FactOriginGroupMainDailyEntity.java | 3 -- .../FactOriginGroupMemberDailyEntity.java | 5 +-- .../FactOriginIssueLogDailyEntity.java | 3 -- .../FactOriginIssueMainDailyEntity.java | 3 -- .../FactOriginProjectLogDailyEntity.java | 3 -- .../FactOriginProjectMainDailyEntity.java | 3 -- ...FactOriginProjectOrgPeriodDailyEntity.java | 3 +- .../FactOriginTopicLogDailyEntity.java | 1 - .../screen/DimLastSyncRecordEntity.java | 3 +- .../IndexGroupDetailTemplateEntity.java | 2 - .../screen/IndexGroupTemplateEntity.java | 2 - ...ScreenAnCommunityProjectProfileEntity.java | 1 - ...ScreenAnGrassRootsGovernMonthlyEntity.java | 2 - .../ScreenAnGrassRootsOrgMonthlyEntity.java | 3 -- ...creenAnGrassRootsPmTotalMonthlyEntity.java | 3 -- .../screen/ScreenKcActSummaryDailyEntity.java | 3 -- .../screen/ScreenKcActTrendMonthlyEntity.java | 3 -- .../ScreenKcGroupDetailGridDailyEntity.java | 3 -- .../ScreenKcGroupSummaryGridDailyEntity.java | 3 -- .../ScreenKcIssueSummaryGridDailyEntity.java | 3 -- .../ScreenKcIssueTrendGridMonthlyEntity.java | 3 -- .../ScreenKcNewsCategoryAnalysisEntity.java | 3 -- .../screen/ScreenKcNewsRankEntity.java | 3 -- .../ScreenKcNewsSummaryDailyEntity.java | 3 -- .../ScreenKcNewsTrendMonthlyEntity.java | 3 -- .../ScreenKcPlatformSummaryDailyEntity.java | 3 -- ...creenKcProjectCategoryGridDailyEntity.java | 3 -- ...ScreenKcProjectSatisGridMonthlyEntity.java | 3 -- ...ScreenKcProjectSummaryGridDailyEntity.java | 3 -- .../ScreenKcTopicTrendGridMonthlyEntity.java | 3 -- .../ScreenKcUserSummaryDailyEntity.java | 3 -- .../ScreenKcUserTrendGridMonthlyEntity.java | 3 -- ...eenKcVolunteerHeatRankGridDailyEntity.java | 3 -- .../ScreenKcVolunteerSummaryDailyEntity.java | 3 -- .../screen/ScreenProjectDataEntity.java | 1 - .../screen/ScreenProjectImgDataEntity.java | 3 -- .../ScreenProjectProcessAttachmentEntity.java | 3 -- .../screen/ScreenProjectProcessEntity.java | 1 - .../entity/heart/VolunteerInfoEntity.java | 3 -- .../entity/plugins/ScreenBidInfoEntity.java | 1 - .../plugins/ScreenContractInfoEntity.java | 1 - .../ScreenCustomerWorkRecordDictEntity.java | 3 -- .../epmet/entity/stats/DimCustomerEntity.java | 1 - .../stats/DimCustomerPartymemberEntity.java | 3 +- .../com/epmet/entity/stats/DimDateEntity.java | 1 - .../entity/stats/DimDepartmentEntity.java | 1 - .../com/epmet/entity/stats/DimGridEntity.java | 1 - .../epmet/entity/stats/DimMonthEntity.java | 1 - .../epmet/entity/stats/DimQuarterEntity.java | 1 - .../entity/stats/DimTopicStatusEntity.java | 1 - .../com/epmet/entity/stats/DimWeekEntity.java | 1 - .../FactAgencyOriginProjectDailyEntity.java | 2 - .../FactAgencyOriginProjectMonthlyEntity.java | 2 - .../stats/FactAgencyProjectDailyEntity.java | 2 - .../stats/FactAgencyProjectMonthlyEntity.java | 2 - .../stats/FactGridProjectDailyEntity.java | 2 - .../stats/FactGridProjectMonthlyEntity.java | 2 - .../stats/FactGroupAgencyDailyEntity.java | 3 -- .../stats/FactGroupAgencyMonthlyEntity.java | 3 -- .../stats/FactGroupGridDailyEntity.java | 3 -- .../FactGroupTotalAgencyDailyEntity.java | 3 -- .../stats/FactGroupTotalGridDailyEntity.java | 3 -- .../stats/FactIssueAgencyDailyEntity.java | 4 +- .../stats/FactIssueAgencyMonthlyEntity.java | 4 +- .../stats/FactIssueGridDailyEntity.java | 4 +- .../stats/FactIssueGridMonthlyEntity.java | 4 +- ...tPartyMemberVanguardAgencyDailyEntity.java | 2 - ...actPartyMemberVanguardGridDailyEntity.java | 2 - .../FactTopicHotdiscussAgencyDailyEntity.java | 3 -- .../FactTopicHotdiscussGridDailyEntity.java | 3 -- .../FactVolunteerServiceDailyEntity.java | 9 ++-- .../entity/stats/LastExecRecordEntity.java | 1 - .../FactTopicIssueAgencyDailyEntity.java | 3 -- .../FactTopicIssueAgencyMonthlyEntity.java | 3 -- .../topic/FactTopicIssueGridDailyEntity.java | 3 -- .../FactTopicIssueGridMonthlyEntity.java | 3 -- .../FactTopicStatusAgencyDailyEntity.java | 2 - .../FactTopicStatusAgencyMonthlyEntity.java | 4 +- .../topic/FactTopicStatusGridDailyEntity.java | 2 - .../FactTopicTotalAgencyDailyEntity.java | 3 -- .../topic/FactTopicTotalGridDailyEntity.java | 3 -- ...actParticipationUserAgencyDailyEntity.java | 8 ++-- ...tParticipationUserAgencyMonthlyEntity.java | 8 ++-- .../FactParticipationUserGridDailyEntity.java | 8 ++-- ...actParticipationUserGridMonthlyEntity.java | 8 ++-- .../user/FactRegUserAgencyDailyEntity.java | 8 ++-- .../user/FactRegUserAgencyMonthlyEntity.java | 8 ++-- .../user/FactRegUserGridDailyEntity.java | 8 ++-- .../user/FactRegUserGridMonthlyEntity.java | 8 ++-- .../StatsStaffPatrolRecordDailyEntity.java | 1 - .../voice/ArticleOperateRecordEntity.java | 1 - .../epmet/mq/RocketMQConsumerRegister.java | 11 +---- .../com/epmet/service/StatsGroupService.java | 2 - .../StatsPartyMemberVanguardService.java | 2 - .../extract/todata/ProjectExtractService.java | 3 -- .../impl/FactGridGovernDailyServiceImpl.java | 5 ++- ...FactOriginGroupMemberDailyServiceImpl.java | 7 ++- .../GovernRankDataExtractServiceImpl.java | 2 +- .../impl/PartyBaseInfoServiceImpl.java | 2 +- .../IndexCalculateDistrictServiceImpl.java | 1 - .../screen/ScreenCustomerAgencyService.java | 3 +- ...ProjectCategoryGridAndOrgDailyService.java | 11 +---- .../ScreenGovernRankDataDailyServiceImpl.java | 3 +- .../impl/ScreenGovernRankDataServiceImpl.java | 3 +- .../impl/ScreenProjectImgDataServiceImpl.java | 2 +- .../ScreenProjectOrgDailyServiceImpl.java | 4 +- ...enProjectProcessAttachmentServiceImpl.java | 2 +- ...nProjectQuantityOrgMonthlyServiceImpl.java | 3 +- .../heart/impl/HeartDemandServiceImpl.java | 6 +-- .../heart/impl/HeartVolunteerServiceImpl.java | 7 +-- .../epmet/service/impl/EIDimServiceImpl.java | 7 ++- .../impl/GovernanceDataReportServiceImpl.java | 2 - .../service/impl/StatsTopicServiceImpl.java | 5 ++- .../service/org/CustomerGridService.java | 1 - .../epmet/service/stats/DimAgencyService.java | 3 +- .../service/stats/DimCustomerService.java | 3 +- .../epmet/service/stats/DimGridService.java | 3 +- .../stats/FactGroupAgencyMonthlyService.java | 3 +- .../stats/FactTagUsedAgencyDailyService.java | 3 +- .../stats/impl/DemandStatsServiceImpl.java | 5 +-- .../DimCustomerPartymemberServiceImpl.java | 4 +- .../stats/impl/DimGridServiceImpl.java | 10 +++-- .../stats/impl/DimTopicStatusServiceImpl.java | 3 +- ...ctAgencyOriginProjectDailyServiceImpl.java | 5 +-- ...AgencyOriginProjectMonthlyServiceImpl.java | 5 +-- ...yMemberVanguardAgencyDailyServiceImpl.java | 2 +- .../FactTopicIssueAgencyDailyService.java | 3 +- .../FactTopicIssueAgencyMonthlyService.java | 3 +- .../topic/FactTopicIssueGridDailyService.java | 3 +- .../FactTopicIssueGridMonthlyService.java | 3 +- .../FactTopicStatusAgencyDailyService.java | 3 +- .../FactTopicStatusAgencyMonthlyService.java | 3 +- .../FactTopicStatusGridDailyService.java | 3 +- .../FactTopicTotalAgencyDailyService.java | 3 +- .../topic/FactTopicTotalGridDailyService.java | 3 +- .../FactTopicIssueAgencyDailyServiceImpl.java | 7 ++- ...actTopicIssueAgencyMonthlyServiceImpl.java | 7 ++- .../FactTopicIssueGridDailyServiceImpl.java | 7 ++- .../FactTopicIssueGridMonthlyServiceImpl.java | 7 ++- ...FactTopicStatusAgencyDailyServiceImpl.java | 7 ++- ...ctTopicStatusAgencyMonthlyServiceImpl.java | 7 ++- .../FactTopicStatusGridDailyServiceImpl.java | 7 ++- .../FactTopicTotalAgencyDailyServiceImpl.java | 7 ++- .../FactTopicTotalGridDailyServiceImpl.java | 7 ++- ...ctParticipationUserAgencyDailyService.java | 3 +- ...ParticipationUserAgencyMonthlyService.java | 3 +- ...FactParticipationUserGridDailyService.java | 3 +- ...ctParticipationUserGridMonthlyService.java | 3 +- .../user/FactRegUserAgencyDailyService.java | 3 +- .../user/FactRegUserGridDailyService.java | 3 +- .../user/FactRegUserGridMonthlyService.java | 3 +- ...rticipationUserAgencyDailyServiceImpl.java | 6 +-- ...icipationUserAgencyMonthlyServiceImpl.java | 7 ++- ...ParticipationUserGridDailyServiceImpl.java | 7 ++- ...rticipationUserGridMonthlyServiceImpl.java | 7 ++- .../FactRegUserAgencyDailyServiceImpl.java | 7 ++- .../impl/FactRegUserGridDailyServiceImpl.java | 7 ++- .../normalizing/batch/IndexOutputVO.java | 1 - .../com/epmet/stats/test/RedissonTest.java | 2 - .../epmet/controller/ActModelController.java | 2 - .../controller/ActProcessController.java | 1 - .../controller/ActRunningController.java | 1 + .../editor/model/ModelSaveRestResource.java | 2 +- .../com/epmet/service/ActModelService.java | 6 +-- .../com/epmet/service/ActProcessService.java | 4 +- .../main/java/com/epmet/dto/AreaCodeDTO.java | 5 ++- .../main/java/com/epmet/dto/CalenderDTO.java | 10 ++--- .../dto/result/AreaCodeDictResultDTO.java | 1 - .../dto/result/ExternalCustomerResultDTO.java | 8 ++-- .../epmet/dto/result/WorkDayResultDTO.java | 1 - .../controller/AreaCodeChildController.java | 6 +-- .../epmet/controller/CalenderController.java | 8 ++-- .../controller/ExternalAppController.java | 5 ++- .../epmet/controller/WorkDayController.java | 2 +- .../com/epmet/dao/ExternalAppSecretDao.java | 4 +- .../com/epmet/entity/AreaCodeChildEntity.java | 3 -- .../java/com/epmet/entity/AreaCodeEntity.java | 3 -- .../java/com/epmet/entity/CalenderEntity.java | 3 +- .../com/epmet/entity/ExternalAppEntity.java | 3 -- .../epmet/entity/ExternalAppSecretEntity.java | 3 -- .../epmet/entity/ExternalCustomerEntity.java | 5 +-- .../com/epmet/entity/HelperVideoEntity.java | 1 - .../service/ExternalCustomerService.java | 1 - .../com/epmet/service/ShowApiService.java | 2 - .../com/epmet/service/WorkDayService.java | 4 +- .../impl/AreaCodeChildServiceImpl.java | 4 +- .../service/impl/CalenderServiceImpl.java | 5 +-- .../service/impl/ImportTaskServiceImpl.java | 2 +- .../epmet/task/MultithreadScheduleTask.java | 3 -- .../src/main/java/com/epmet/dto/DemoDTO.java | 5 ++- .../epmet/dto/form/SaveCustomerFormDTO.java | 1 - .../com/epmet/controller/DemoController.java | 2 +- .../java/com/epmet/entity/DemoEntity.java | 1 - .../epmet/dto/form/StaffSinGridFormDTO.java | 1 - .../java/com/epmet/config/OpenApiConfig.java | 1 - .../OpenApiAccessTokenController.java | 5 ++- .../java/com/epmet/dto/ActCustomizedDTO.java | 5 ++- .../java/com/epmet/dto/ActLivePicDTO.java | 5 ++- .../java/com/epmet/dto/ActLiveRecDTO.java | 6 +-- .../java/com/epmet/dto/ActSignInPicDTO.java | 5 ++- .../java/com/epmet/dto/ActSignInRecDTO.java | 6 +-- .../java/com/epmet/dto/ActSummaryDTO.java | 5 ++- .../epmet/dto/IcActivityUnitRelationDTO.java | 5 ++- .../dto/IcCommunitySelfOrganizationDTO.java | 9 ++-- ...CommunitySelfOrganizationPersonnelDTO.java | 9 ++-- .../java/com/epmet/dto/IcSocietyOrgDTO.java | 5 ++- .../com/epmet/dto/LatestActContentDTO.java | 5 ++- .../dto/LatestActServiceRelationDTO.java | 5 ++- .../epmet/dto/LatestActUnitRelationDTO.java | 5 ++- .../AddCommunitySelfOrganizationFormDTO.java | 1 - .../EditCommunitySelfOrganizationFormDTO.java | 2 - .../demand/UserDemandNameQueryFormDTO.java | 1 - .../form/resi/ResiActInsertLiveFormDTO.java | 2 - .../dto/form/resi/VolunteerCommonFormDTO.java | 3 -- .../dto/form/work/ActListCommonFormDTO.java | 1 - .../result/resi/ResiActContentResultDTO.java | 1 - .../work/AuditingUserDetailResultDTO.java | 1 - ...tySelfOrganizationPersonnelController.java | 6 +-- .../IcPartyUnitCompletionController.java | 9 ++-- .../controller/ResiActListController.java | 2 +- .../controller/WorkActDraftController.java | 15 ++++--- .../controller/WorkActUserController.java | 5 ++- .../java/com/epmet/dao/ActSignInRecDao.java | 1 - .../java/com/epmet/dao/IcSocietyOrgDao.java | 3 +- .../com/epmet/entity/ActContentEntity.java | 3 -- .../com/epmet/entity/ActCustomizedEntity.java | 3 -- .../com/epmet/entity/ActLivePicEntity.java | 3 -- .../com/epmet/entity/ActLiveRecEntity.java | 2 - .../com/epmet/entity/ActSignInPicEntity.java | 3 -- .../com/epmet/entity/ActSignInRecEntity.java | 2 - .../com/epmet/entity/ActSummaryEntity.java | 3 -- .../epmet/entity/ActUserRelationEntity.java | 1 - .../IcCommunitySelfOrganizationEntity.java | 4 -- ...munitySelfOrganizationPersonnelEntity.java | 3 -- .../epmet/entity/IcPartyActivityEntity.java | 1 - .../com/epmet/entity/IcPartyUnitEntity.java | 5 +-- .../com/epmet/entity/IcSocietyOrgEntity.java | 1 - .../entity/IcUserDemandOperateLogEntity.java | 1 - .../IcUserDemandSatisfactionEntity.java | 1 - .../entity/IcUserDemandServiceEntity.java | 1 - .../epmet/entity/LatestActContentEntity.java | 3 -- .../com/epmet/entity/LatestActInfoEntity.java | 1 - .../entity/UserKindnessTimeLogEntity.java | 3 -- .../ExportCommunitySelfOrganizationExcel.java | 3 +- .../com/epmet/excel/IcPartyActivityExcel.java | 5 +-- .../com/epmet/excel/IcSocietyOrgExcel.java | 4 +- .../ImportCommunitySelfOrganization.java | 1 - .../com/epmet/service/ActInfoService.java | 4 +- .../IcCommunitySelfOrganizationService.java | 3 +- .../service/impl/ActContentServiceImpl.java | 4 +- .../service/impl/ActLivePicServiceImpl.java | 4 +- .../service/impl/ActLiveRecServiceImpl.java | 5 +-- .../impl/ActOperationRecServiceImpl.java | 4 +- .../service/impl/ActPointLogServiceImpl.java | 4 +- .../service/impl/ActSignInPicServiceImpl.java | 4 +- .../impl/ActStatisticalServiceImpl.java | 4 +- .../service/impl/ActSummaryServiceImpl.java | 3 +- .../service/impl/ActUserLogServiceImpl.java | 2 +- .../impl/ActUserRelationServiceImpl.java | 7 +-- ...ySelfOrganizationPersonnelServiceImpl.java | 5 +-- ...cCommunitySelfOrganizationServiceImpl.java | 1 - .../impl/LatestActContentServiceImpl.java | 4 +- .../impl/VolunteerInfoServiceImpl.java | 6 --- .../controller/ScheduleJobController.java | 1 - .../java/com/epmet/dao/ScheduleJobDao.java | 1 - .../impl/DimPartyMemberServiceImpl.java | 2 - .../service/impl/StatsGroupServiceImpl.java | 2 +- .../service/impl/TestTaskServiceImpl.java | 3 -- .../com/epmet/task/GroupAndHotTopicTask.java | 2 - .../epmet/constant/WxmpMessageConstant.java | 3 -- .../java/com/epmet/dto/SysMailLogDTO.java | 1 - .../com/epmet/dto/SysMailTemplateDTO.java | 3 +- .../com/epmet/dto/WxmpMsgSendRecordDTO.java | 3 +- .../epmet/dto/WxmpResiUserSubscribeDTO.java | 5 ++- .../WxmpTemplateMsgSubscribeStatusDTO.java | 5 ++- .../com/epmet/dto/WxmpUpdateSendDataDTO.java | 7 +-- .../epmet/dto/WxmpUpdateSendRecordDTO.java | 17 +++---- .../epmet/dto/WxmpUserSubscribeRecordDTO.java | 5 ++- .../epmet/dto/WxmpWorkUserSubscribeDTO.java | 7 +-- .../dto/form/ReceiverGroupCommonFormDTO.java | 1 - .../dto/form/WxSubscribeMessageFormDTO.java | 3 -- .../dto/form/WxmpMessagePushFormDTO.java | 2 - .../feign/EpmetMessageOpenFeignClient.java | 8 +--- .../EpmetMessageOpenFeignClientFallback.java | 8 +--- .../com/epmet/controller/InfoController.java | 13 +++--- .../epmet/controller/MailLogController.java | 1 - .../com/epmet/controller/SmsController.java | 1 - .../controller/UserMessageController.java | 1 - .../WxmpMsgSendRecordController.java | 6 +-- .../WxmpResiUserSubscribeController.java | 6 +-- ...pTemplateMsgSubscribeStatusController.java | 6 +-- .../WxmpUpdateSendDataController.java | 2 +- .../WxmpUpdateSendRecordController.java | 6 +-- .../WxmpUserSubscribeRecordController.java | 6 +-- .../WxmpWorkUserSubscribeController.java | 8 ++-- .../main/java/com/epmet/email/EmailUtils.java | 2 +- .../java/com/epmet/entity/InfoEntity.java | 3 -- .../entity/InfoGroupReceiversEntity.java | 3 -- .../epmet/entity/InfoReceiverGroupEntity.java | 3 -- .../com/epmet/entity/InfoReplyEntity.java | 3 -- .../com/epmet/entity/SystemMessageEntity.java | 4 -- .../entity/SystemMessagePenddingEntity.java | 3 -- .../epmet/entity/WxmpMsgSendRecordEntity.java | 1 - .../entity/WxmpResiUserSubscribeEntity.java | 3 -- .../WxmpTemplateMsgSubscribeStatusEntity.java | 3 -- .../entity/WxmpUpdateSendDataEntity.java | 5 +-- .../entity/WxmpUpdateSendRecordEntity.java | 13 +++--- .../entity/WxmpUserSubscribeRecordEntity.java | 3 -- .../entity/WxmpWorkUserSubscribeEntity.java | 5 +-- .../java/com/epmet/service/InfoService.java | 3 +- .../com/epmet/service/UserMessageService.java | 3 +- .../epmet/service/impl/InfoServiceImpl.java | 1 - .../impl/WxmpMsgSendRecordServiceImpl.java | 2 +- .../WxmpResiUserSubscribeServiceImpl.java | 4 +- ...TemplateMsgSubscribeStatusServiceImpl.java | 4 +- .../impl/WxmpUpdateSendDataServiceImpl.java | 4 +- .../impl/WxmpUpdateSendRecordServiceImpl.java | 4 +- .../WxmpUserSubscribeRecordServiceImpl.java | 4 +- .../WxmpWorkUserSubscribeServiceImpl.java | 6 +-- .../java/com/epmet/sms/QcloudSmsService.java | 8 ++-- .../main/java/com/epmet/sms/SmsConfig.java | 1 - .../com/epmet/cloud/CloudStorageConfig.java | 4 +- .../cloud/FastDFSCloudStorageService.java | 4 +- .../cloud/QcloudCloudStorageService.java | 4 +- .../epmet/cloud/QiniuCloudStorageService.java | 5 +-- .../com/epmet/dto/BizPointTotalDetailDTO.java | 5 ++- .../com/epmet/dto/PointAdjustmentLogDTO.java | 21 ++++----- .../epmet/dto/PointVerificationLogDTO.java | 5 ++- .../PointVerificationStatisticalDailyDTO.java | 5 ++- .../java/com/epmet/dto/SysOperateLogDTO.java | 5 ++- .../com/epmet/dto/UserPointActionLogDTO.java | 5 ++- .../dto/UserPointStatisticalDailyDTO.java | 5 ++- .../java/com/epmet/dto/UserPointTotalDTO.java | 5 ++- .../com/epmet/dto/form/AllPartyFormDTO.java | 1 - .../com/epmet/dto/form/GroupPointFormDTO.java | 1 - .../form/ResiAroundPartyPointRankFormDTO.java | 2 - .../form/WorkPointVerificationFormDTO.java | 1 - .../dto/result/ResiPointRankResultDTO.java | 2 - .../feign/EpmetPointOpenFeignClient.java | 1 - .../EpmetPointOpenFeignClientFallback.java | 1 - .../controller/GroupPointController.java | 4 -- .../entity/BizPointTotalDetailEntity.java | 3 -- .../entity/BizPointUserTotalDetailEntity.java | 3 -- .../entity/PointAdjustmentLogEntity.java | 5 +-- .../entity/PointVerificationLogEntity.java | 3 -- ...intVerificationStatisticalDailyEntity.java | 3 -- .../entity/UserPointActionLogEntity.java | 3 -- .../UserPointStatisticalDailyEntity.java | 3 -- .../epmet/entity/UserPointTotalEntity.java | 3 -- .../service/BizPointTotalDetailService.java | 4 +- .../impl/BizPointTotalDetailServiceImpl.java | 11 +++-- .../impl/PointAdjustmentLogServiceImpl.java | 3 +- .../service/impl/PointRuleServiceImpl.java | 6 ++- .../impl/PointVerificationLogServiceImpl.java | 4 +- ...rificationStatisticalDailyServiceImpl.java | 4 +- .../main/java/com/epmet/dto/AuthCodeDTO.java | 17 +++---- .../com/epmet/dto/AuthResultRecordDTO.java | 7 +-- .../com/epmet/dto/AuthorizationInfoDTO.java | 17 +++---- .../java/com/epmet/dto/BindingAccountDTO.java | 7 +-- .../java/com/epmet/dto/BusinessInfoDTO.java | 7 +-- .../com/epmet/dto/CodeAuditRecordDTO.java | 9 ++-- .../com/epmet/dto/CodeAuditResultDTO.java | 7 +-- .../java/com/epmet/dto/CodeCustomerDTO.java | 7 +-- .../main/java/com/epmet/dto/CodeExtDTO.java | 7 +-- .../main/java/com/epmet/dto/CodeMediaDTO.java | 7 +-- .../epmet/dto/CodeOperationHistoryDTO.java | 7 +-- .../epmet/dto/ComponentAccessTokenDTO.java | 5 ++- .../epmet/dto/ComponentVerifyTicketDTO.java | 5 ++- .../java/com/epmet/dto/CustomerMpDTO.java | 5 ++- .../java/com/epmet/dto/FixationAppIdDTO.java | 7 +-- .../main/java/com/epmet/dto/FuncInfoDTO.java | 17 +++---- .../com/epmet/dto/MiniCategoryInfoDTO.java | 5 ++- .../main/java/com/epmet/dto/MiniInfoDTO.java | 5 ++- .../com/epmet/dto/MiniNetworkInfoDTO.java | 5 ++- .../com/epmet/dto/OpenPlatformAccountDTO.java | 7 +-- .../com/epmet/dto/PaCustomerAgencyDTO.java | 8 ++-- .../java/com/epmet/dto/PaCustomerDTO.java | 5 ++- .../epmet/dto/PaCustomerUserAgencyDTO.java | 5 ++- .../main/java/com/epmet/dto/PaInfoDTO.java | 9 ++-- .../main/java/com/epmet/dto/PaUserDTO.java | 5 ++- .../java/com/epmet/dto/PaUserVisitedDTO.java | 5 ++- .../java/com/epmet/dto/PaUserWechatDTO.java | 7 +-- .../com/epmet/dto/PersonalTemplateDTO.java | 7 +-- .../java/com/epmet/dto/PreAuthTokenDTO.java | 7 +-- .../java/com/epmet/dto/PublicTemplateDTO.java | 29 ++++++------ .../form/BlockChainProjectProcessFormDTO.java | 45 +++++++++---------- .../epmet/dto/form/CheckPaUserFormDTO.java | 1 - .../form/ComponentVerifyTicketFormDTO.java | 1 - .../epmet/dto/form/ModifyDomainFormDTO.java | 1 - .../com/epmet/dto/form/ProjectDetailDTO.java | 1 - .../dto/form/SaveUserVisitedFormDTO.java | 1 - .../epmet/dto/form/WxCodeToTokenFormDTO.java | 1 - .../com/epmet/dto/form/WxLoginFormDTO.java | 1 - .../dto/result/CodeHistoryResultDTO.java | 1 - .../dto/result/CodeVersionInfoResultDTO.java | 1 - .../dto/result/CreateAgencyResultDTO.java | 2 - .../dto/result/CustomerAndUserResultDTO.java | 5 --- .../feign/EpmetThirdOpenFeignClient.java | 19 ++++---- .../com/epmet/feign/ThirdOpenFeignClient.java | 1 - .../EpmetThirdOpenFeignClientFallback.java | 12 +++-- .../ThirdOpenFeignClientFallback.java | 1 - .../main/java/com/epmet/utils/ThirdUtils.java | 3 -- .../epmet/apiservice/impl/DemoApiService.java | 5 +-- .../controller/AuthRedirectController.java | 9 ++-- .../controller/CodeAuditResultController.java | 8 ++-- .../com/epmet/controller/CodeController.java | 5 +-- .../controller/CodeCustomerController.java | 8 ++-- .../epmet/controller/CodeMediaController.java | 8 ++-- .../CodeOperationHistoryController.java | 8 ++-- .../ComponentVerifyTicketController.java | 4 +- .../PaCustomerAgencyController.java | 6 +-- .../controller/PaCustomerController.java | 2 +- .../PaCustomerUserAgencyController.java | 6 +-- .../controller/PaUserWechatController.java | 6 +-- .../epmet/controller/ProjectController.java | 4 +- .../com/epmet/controller/TestConttroller.java | 1 - .../controller/WeChatNotifyController.java | 4 +- .../java/com/epmet/dao/CodeCustomerDao.java | 6 +-- .../epmet/dao/ComponentAccessTokenDao.java | 4 +- .../java/com/epmet/dao/CustomerMpDao.java | 3 +- .../com/epmet/dao/OpenPlatformAccountDao.java | 5 +-- .../main/java/com/epmet/dao/PaInfoDao.java | 5 +-- .../main/java/com/epmet/dao/PaUserDao.java | 3 +- .../com/epmet/dao/PersonalTemplateDao.java | 5 ++- .../java/com/epmet/dao/PublicTemplateDao.java | 5 +-- .../java/com/epmet/entity/AuthCodeEntity.java | 1 - .../epmet/entity/AuthResultRecordEntity.java | 3 +- .../epmet/entity/AuthorizationInfoEntity.java | 1 - .../epmet/entity/BindingAccountEntity.java | 3 -- .../com/epmet/entity/BusinessInfoEntity.java | 5 +-- .../epmet/entity/CodeAuditRecordEntity.java | 3 +- .../epmet/entity/CodeAuditResultEntity.java | 5 +-- .../com/epmet/entity/CodeCustomerEntity.java | 3 +- .../java/com/epmet/entity/CodeExtEntity.java | 5 +-- .../com/epmet/entity/CodeMediaEntity.java | 5 +-- .../entity/CodeOperationHistoryEntity.java | 5 +-- .../entity/ComponentAccessTokenEntity.java | 1 - .../entity/ComponentVerifyTicketEntity.java | 3 -- .../com/epmet/entity/CustomerMpEntity.java | 3 -- .../com/epmet/entity/FixationAppIdEntity.java | 5 +-- .../java/com/epmet/entity/FuncInfoEntity.java | 5 +-- .../epmet/entity/MessagePushTextEntity.java | 3 +- .../epmet/entity/MiniCategoryInfoEntity.java | 3 -- .../java/com/epmet/entity/MiniInfoEntity.java | 3 -- .../epmet/entity/MiniNetworkInfoEntity.java | 3 -- .../entity/OpenPlatformAccountEntity.java | 3 -- .../epmet/entity/PaCustomerAgencyEntity.java | 3 -- .../com/epmet/entity/PaCustomerEntity.java | 3 -- .../entity/PaCustomerUserAgencyEntity.java | 3 -- .../java/com/epmet/entity/PaInfoEntity.java | 7 +-- .../java/com/epmet/entity/PaUserEntity.java | 3 -- .../com/epmet/entity/PaUserVisitedEntity.java | 3 -- .../com/epmet/entity/PaUserWechatEntity.java | 5 +-- .../epmet/entity/PersonalTemplateEntity.java | 5 +-- .../com/epmet/entity/PreAuthTokenEntity.java | 3 +- .../epmet/entity/PublicTemplateEntity.java | 13 +++--- .../entity/ThirdplatformActionEntity.java | 9 ++-- .../ThirdplatformCustomerActionEntity.java | 3 -- .../ThirdplatformCustomerRegisterEntity.java | 9 ++-- .../com/epmet/entity/ThirdplatformEntity.java | 7 +-- .../service/ComponentVerifyTicketService.java | 1 - .../com/epmet/service/ProjectService.java | 4 +- .../com/epmet/service/SubscribeService.java | 9 ++-- .../epmet/service/ThirdPlatformService.java | 2 +- .../impl/BlockChainProjectServiceImpl.java | 31 +++++++------ .../impl/CodeAuditResultServiceImpl.java | 6 +-- .../service/impl/CodeCustomerServiceImpl.java | 4 +- .../service/impl/CodeExtServiceImpl.java | 6 +-- .../service/impl/CodeMediaServiceImpl.java | 6 +-- .../impl/CodeOperationHistoryServiceImpl.java | 6 +-- .../impl/PaCustomerAgencyServiceImpl.java | 4 +- .../impl/PaCustomerUserAgencyServiceImpl.java | 4 +- .../service/impl/PaUserWechatServiceImpl.java | 4 +- .../service/impl/PrivateEpmetServiceImpl.java | 4 -- .../service/impl/ProjectServiceImpl.java | 4 +- .../impl/ThirdPlatformServiceImpl.java | 2 +- .../service/impl/WarrantServiceImpl.java | 5 ++- .../com/epmet/wxapi/param/WxMaNewsReq.java | 1 - .../epmet/wxapi/result/WxBasicInfoResult.java | 1 - .../epmet/wxapi/result/WxMaNewsResult.java | 1 - .../epmet/wxapi/service/WxLoginService.java | 2 - .../wxapi/service/WxMaSettingService.java | 2 - .../service/impl/WxMaSettingServiceImpl.java | 2 - .../com/epmet/dto/GovCustomerMenuDTO.java | 5 ++- .../com/epmet/dto/IcOftenUseFunctionDTO.java | 7 +-- .../java/com/epmet/dto/OperationScopeDTO.java | 5 ++- .../main/java/com/epmet/dto/RoleScopeDTO.java | 7 +-- .../form/AccessConfigAdd4RoletFormDTO.java | 1 - .../AccessConfigOpeDefaultScopesFormDTO.java | 2 - .../java/com/epmet/dto/form/MenuFormDTO.java | 1 - .../PackageAddOftenUseFunctionFormDTO.java | 1 - .../result/RoleOperationDefaultResultDTO.java | 7 +-- .../GovAccessFeignClientFallBack.java | 3 +- .../epmet/config/PermissionInitializer.java | 5 ++- .../epmet/controller/AccessController.java | 9 +++- .../controller/GovCustomerMenuController.java | 2 +- .../IcOftenUseFunctionController.java | 13 +++--- .../java/com/epmet/dao/OperationScopeDao.java | 3 +- .../epmet/dao/RoleOperationDefaultDao.java | 4 +- .../epmet/entity/GovCustomerMenuEntity.java | 3 -- .../entity/IcOftenUseFunctionEntity.java | 3 -- .../com/epmet/entity/OperationEntity.java | 7 +-- .../entity/OperationScopeDefaultEntity.java | 3 -- .../epmet/entity/OperationScopeEntity.java | 3 -- .../com/epmet/entity/RoleOperationEntity.java | 3 -- .../com/epmet/entity/RoleScopeEntity.java | 3 -- .../fallback/GovOrgFeignClientFallBack.java | 7 +-- .../service/IcOftenUseFunctionService.java | 3 +- .../service/impl/AccessConfigServiceImpl.java | 5 ++- .../impl/IcOftenUseFunctionServiceImpl.java | 3 +- .../impl/OperationScopeServiceImpl.java | 5 +-- .../impl/RoleOperationServiceImpl.java | 4 +- .../service/impl/RoleScopeServiceImpl.java | 5 +-- .../epmet/service/impl/TestServiceImpl.java | 1 - .../result/AuditedPartyMemberResultDTO.java | 1 - .../result/AuditingPartyMemberResultDTO.java | 1 - .../epmet/controller/ResiTopicController.java | 2 - .../fallback/GovOrgFeignClientFallBack.java | 5 +-- .../ResiGroupFeignClientFallBack.java | 4 +- .../epmet/service/ResiPartyMemberService.java | 9 +--- .../java/com/epmet/dto/IssueCategoryDTO.java | 5 ++- .../epmet/dto/IssueCustomerParameterDTO.java | 5 ++- .../java/com/epmet/dto/IssueProcessDTO.java | 5 ++- .../epmet/dto/IssueProjectRelationDTO.java | 5 ++- .../com/epmet/dto/IssueProjectTagDictDTO.java | 5 ++- .../epmet/dto/IssueSatisfactionDetailDTO.java | 5 ++- .../dto/IssueSatisfactionStatisticalDTO.java | 5 ++- .../dto/IssueShareLinkVisitRecordDTO.java | 9 ++-- .../main/java/com/epmet/dto/IssueTagsDTO.java | 5 ++- .../com/epmet/dto/IssueVoteDetailDTO.java | 5 ++- .../epmet/dto/IssueVoteStatisticalDTO.java | 5 ++- .../dto/IssueVoteStatisticalDailyDTO.java | 5 ++- .../com/epmet/dto/form/AddTagFormDTO.java | 1 - .../epmet/dto/form/IssueAuditionFormDTO.java | 1 - .../form/IssueShiftedFromTopicFormDTO.java | 1 - .../epmet/dto/form/MemosToRemindFormDTO.java | 1 - .../dto/form/MyPubIssuesAuditingFormDTO.java | 1 - .../dto/form/SaveIssueCategoryFormDTO.java | 1 - .../result/ApplicationDetailResultDTO.java | 1 - .../dto/result/GovIssueDetailResultDTO.java | 1 - .../dto/result/MemosToRemindResultDTO.java | 1 - .../GovIssueOpenFeignClientFallBack.java | 3 -- .../controller/IssueAuditController.java | 5 ++- .../IssueCustomerParameterController.java | 6 +-- .../controller/IssueProcessController.java | 6 +-- .../IssueProjectRelationController.java | 6 +-- .../IssueProjectTagDictController.java | 6 +-- .../IssueSatisfactionDetailController.java | 6 +-- ...ssueSatisfactionStatisticalController.java | 6 +-- .../IssueShareLinkVisitRecordController.java | 7 ++- .../controller/IssueVoteDetailController.java | 6 +-- .../IssueVoteStatisticalController.java | 2 +- .../IssueVoteStatisticalDailyController.java | 6 +-- .../java/com/epmet/dao/IssueProcessDao.java | 4 +- .../dao/IssueShareLinkVisitRecordDao.java | 6 +-- .../com/epmet/entity/IssueCategoryEntity.java | 3 -- .../entity/IssueCustomerParameterEntity.java | 3 -- .../java/com/epmet/entity/IssueEntity.java | 1 - .../com/epmet/entity/IssueProcessEntity.java | 3 -- .../IssueProjectCategoryDictEntity.java | 3 -- .../entity/IssueProjectRelationEntity.java | 3 -- .../entity/IssueProjectTagDictEntity.java | 3 -- .../entity/IssueSatisfactionDetailEntity.java | 3 -- .../IssueSatisfactionStatisticalEntity.java | 3 -- .../IssueShareLinkVisitRecordEntity.java | 5 +-- .../epmet/entity/IssueSuggestionEntity.java | 3 -- .../com/epmet/entity/IssueTagsEntity.java | 3 -- .../epmet/entity/IssueVoteDetailEntity.java | 3 -- .../IssueVoteStatisticalDailyEntity.java | 1 - .../entity/IssueVoteStatisticalEntity.java | 3 -- .../epmet/feign/GovProjectFeignClient.java | 2 +- .../com/epmet/feign/ResiGroupFeignClient.java | 2 - .../GovProjectFeignClientFallBack.java | 2 +- .../ResiGroupFeignClientFallBack.java | 3 -- .../epmet/mq/RocketMQConsumerRegister.java | 8 +--- .../epmet/service/IssueProcessService.java | 3 +- .../service/IssueProjectRelationService.java | 3 +- .../java/com/epmet/service/IssueService.java | 2 - .../IssueShareLinkVisitRecordService.java | 5 ++- .../epmet/service/IssueVoteDetailService.java | 4 +- .../service/IssueVoteStatisticalService.java | 3 +- .../impl/IssueApplicationServiceImpl.java | 4 +- .../IssueCustomerParameterServiceImpl.java | 4 +- .../service/impl/IssueProcessServiceImpl.java | 4 +- .../impl/IssueProjectRelationServiceImpl.java | 4 +- .../impl/IssueProjectTagDictServiceImpl.java | 1 - .../IssueSatisfactionDetailServiceImpl.java | 4 +- ...sueSatisfactionStatisticalServiceImpl.java | 4 +- .../IssueShareLinkVisitRecordServiceImpl.java | 1 - .../impl/IssueVoteDetailServiceImpl.java | 4 +- .../IssueVoteStatisticalDailyServiceImpl.java | 5 +-- .../impl/IssueVoteStatisticalServiceImpl.java | 5 +-- .../com/epmet/dto/form/GovFootBarFormDTO.java | 4 +- .../com/epmet/config/LoadBalancerConfig.java | 4 -- .../epmet/controller/AccessController.java | 2 - .../controller/StaffAgencyController.java | 3 +- .../com/epmet/feign/EpmetUserFeignClient.java | 2 - .../EpmetUserFeignClientFallback.java | 6 +-- .../epmet/service/impl/AccessServiceImpl.java | 2 +- .../epmet/dto/CustomerOrgParameterDTO.java | 7 +-- .../com/epmet/dto/CustomerStaffAgencyDTO.java | 5 ++- .../epmet/dto/CustomerStaffDepartmentDTO.java | 7 +-- .../com/epmet/dto/CustomerStaffGridDTO.java | 7 +-- .../java/com/epmet/dto/IcBuildingUnitDTO.java | 5 ++- .../com/epmet/dto/IcHouseChangeDetailDTO.java | 7 +-- .../com/epmet/dto/IcHouseChangeRecordDTO.java | 7 +-- .../dto/IcMatterAppointmentRecordDTO.java | 15 ++++--- .../java/com/epmet/dto/IcNeighborHoodDTO.java | 5 ++- .../com/epmet/dto/IcNeighborHoodPartDTO.java | 5 ++- .../epmet/dto/IcNeighborHoodPropertyDTO.java | 5 ++- .../epmet/dto/IcPartyServiceCenterDTO.java | 13 +++--- .../dto/IcPartyServiceCenterMatterDTO.java | 9 ++-- .../java/com/epmet/dto/IcPlaceOrgDTO.java | 5 ++- .../com/epmet/dto/IcPlacePatrolRecordDTO.java | 5 ++- .../dto/IcPlacePatrolReviewRecordDTO.java | 5 ++- .../com/epmet/dto/IcPlacePatrolTeamDTO.java | 5 ++- .../epmet/dto/IcPlacePatrolTeamStaffDTO.java | 5 ++- .../epmet/dto/IcPropertyManagementDTO.java | 5 ++- .../com/epmet/dto/StaffOrgRelationDTO.java | 5 ++- .../com/epmet/dto/StaffTransferRecordDTO.java | 5 ++- .../java/com/epmet/dto/UserIdAndPidDTO.java | 5 +-- .../dto/form/AddAgencyAndStaffFormDTO.java | 4 +- .../com/epmet/dto/form/AddAgencyFormDTO.java | 3 +- .../com/epmet/dto/form/AdminStaffFromDTO.java | 2 - .../epmet/dto/form/AgencyDeptGridFormDTO.java | 4 +- .../dto/form/CanTickStaffListFormDTO.java | 1 - .../epmet/dto/form/CreateQrCodeFormDTO.java | 1 - .../EditPlacePatrolReviewRecordFormDTO.java | 4 +- .../epmet/dto/form/IcBulidingUnitFormDTO.java | 7 +-- .../com/epmet/dto/form/StaffInfoFromDTO.java | 1 - .../dto/form/UpdateTagUseCountsFormDTO.java | 1 - .../epmet/dto/result/ActSponsorGridInfo.java | 1 - .../AppointmentExistRecordResultDTO.java | 4 -- .../ArticleAgencyGridListResultDTO.java | 4 +- .../epmet/dto/result/BuildingResultDTO.java | 1 - .../dto/result/GridListInfoResultDTO.java | 2 - .../result/IcPropertyManagementResultDTO.java | 2 - .../epmet/dto/result/MapSonOrgResultDTO.java | 1 - .../dto/result/PlaceOrgDetailResultDTO.java | 1 - .../epmet/dto/result/SubAgencyResultDTO.java | 3 +- .../java/com/epmet/dto/result/UnitDTO.java | 1 - .../UpdateBuildingHouseNumResultDTO.java | 1 - .../java/com/epmet/enums/OrgLevelEnums.java | 2 - .../epmet/feign/GovOrgOpenFeignClient.java | 2 - .../GovOrgOpenFeignClientFallback.java | 1 - .../com/epmet/config/LoadBalanceConfig.java | 4 -- .../epmet/controller/AgencyController.java | 1 - .../CustomerDepartmentController.java | 8 ++-- .../CustomerStaffDepartmentController.java | 8 ++-- .../controller/DepartmentController.java | 3 +- .../IcHouseChangeDetailController.java | 2 +- .../IcHouseChangeRecordController.java | 3 +- .../IcMatterAppointmentRecordController.java | 6 +-- .../controller/IcNeighborHoodController.java | 1 - .../IcPartyServiceCenterController.java | 9 ++-- .../IcPartyServiceCenterMatterController.java | 6 +-- .../IcPlacePatrolTeamStaffController.java | 5 +-- .../IcPropertyManagementController.java | 9 ++-- .../StaffTransferRecordController.java | 6 +-- .../epmet/dao/CustomerStaffDepartmentDao.java | 5 +-- .../java/com/epmet/dao/IcNeighborHoodDao.java | 2 +- .../epmet/dao/IcPartyServiceCenterDao.java | 3 +- .../epmet/dao/IcPropertyManagementDao.java | 3 +- .../entity/CustomerOrgParameterEntity.java | 5 +-- .../entity/CustomerPartyBranchEntity.java | 3 -- .../entity/CustomerStaffAgencyEntity.java | 3 -- .../entity/CustomerStaffDepartmentEntity.java | 5 +-- .../epmet/entity/CustomerStaffGridEntity.java | 5 +-- .../epmet/entity/IcBuildingUnitEntity.java | 3 -- .../entity/IcHouseChangeDetailEntity.java | 3 -- .../entity/IcHouseChangeRecordEntity.java | 3 -- .../java/com/epmet/entity/IcHouseEntity.java | 2 - .../IcMatterAppointmentRecordEntity.java | 9 ++-- .../epmet/entity/IcNeighborHoodEntity.java | 3 -- .../entity/IcNeighborHoodPartEntity.java | 3 -- .../entity/IcNeighborHoodPropertyEntity.java | 3 -- .../entity/IcPartyServiceCenterEntity.java | 7 +-- .../IcPartyServiceCenterMatterEntity.java | 3 -- .../com/epmet/entity/IcPlaceOrgEntity.java | 3 -- .../entity/IcPlacePatrolRecordEntity.java | 1 - .../IcPlacePatrolReviewRecordEntity.java | 1 - .../epmet/entity/IcPlacePatrolTeamEntity.java | 1 - .../entity/IcPlacePatrolTeamStaffEntity.java | 3 -- .../entity/IcPropertyManagementEntity.java | 3 -- .../epmet/entity/StaffOrgRelationEntity.java | 3 -- .../entity/StaffTransferRecordEntity.java | 3 -- .../com/epmet/excel/IcNeighborHoodExcel.java | 5 +-- .../epmet/model/BuildingErrorInfoModel.java | 1 - .../com/epmet/model/HouseErrorInfoModel.java | 2 - .../model/ImportBuildingInfoListener.java | 1 - .../epmet/model/ImportHouseInfoListener.java | 4 -- .../model/NeighborHoodErrorInfoModel.java | 1 - .../epmet/mq/RocketMQConsumerRegister.java | 1 - .../service/CustomerStaffGridService.java | 4 +- .../com/epmet/service/DepartmentService.java | 7 ++- .../IcPlacePatrolTeamStaffService.java | 3 +- .../CustomerStaffDepartmentServiceImpl.java | 2 +- .../epmet/service/impl/HouseServiceImpl.java | 1 - .../impl/IcHouseChangeDetailServiceImpl.java | 5 +-- .../impl/IcHouseChangeRecordServiceImpl.java | 5 +-- .../IcMatterAppointmentRecordServiceImpl.java | 5 +-- .../impl/IcNeighborHoodPartServiceImpl.java | 5 +-- .../IcNeighborHoodPropertyServiceImpl.java | 5 +-- ...IcPartyServiceCenterMatterServiceImpl.java | 5 +-- .../impl/IcPartyServiceCenterServiceImpl.java | 2 +- .../IcPlacePatrolTeamStaffServiceImpl.java | 4 +- .../service/impl/NeighborHoodServiceImpl.java | 3 +- .../dto/CustomerProjectParameterDTO.java | 5 ++- .../com/epmet/dto/ProjectCategoryDTO.java | 5 ++- .../com/epmet/dto/ProjectOrgRelationDTO.java | 15 ++++--- .../dto/ProjectProcessAttachmentDTO.java | 5 ++- .../java/com/epmet/dto/ProjectProcessDTO.java | 6 +-- .../epmet/dto/ProjectProcessScanTaskDTO.java | 5 ++- .../epmet/dto/ProjectRelatedPersonnelDTO.java | 5 ++- .../dto/ProjectSatisfactionDetailDTO.java | 5 ++- .../dto/ProjectSatisfactionStatisticsDTO.java | 5 ++- .../java/com/epmet/dto/ProjectStaffDTO.java | 5 ++- .../epmet/dto/ProjectSubAttachmentDTO.java | 7 +-- .../com/epmet/dto/ProjectSubProcessDTO.java | 7 +-- .../java/com/epmet/dto/ProjectTagsDTO.java | 5 ++- .../epmet/dto/form/DelCategoryFormDTO.java | 1 - .../com/epmet/dto/form/EventListFormDTO.java | 1 - .../epmet/dto/form/PatrolProjectFormDTO.java | 1 - .../com/epmet/dto/form/ReplyListFormDTO.java | 1 - .../dto/form/ThirdPlatformConfigFormDTO.java | 1 - .../com/epmet/dto/form/TickStaffFormDTO.java | 3 -- .../epmet/dto/form/UpdateViewTimeFormDTO.java | 1 - .../epmet/dto/result/LatestListResultDTO.java | 1 - .../dto/result/MyPartProjectsResultDTO.java | 1 - .../com/epmet/dto/result/PlatformFileDTO.java | 1 - .../dto/result/ProcesslistResultDTO.java | 4 +- .../ProjectInitEvaluationResultDTO.java | 2 - .../CustomerProjectParameterController.java | 6 +-- .../controller/MemoConcernController.java | 1 - .../controller/MemoWorkDiaryController.java | 5 +-- .../ProjectProcessAttachmentController.java | 6 +-- .../controller/ProjectProcessController.java | 6 +-- .../ProjectProcessScanTaskController.java | 6 +-- .../ProjectRelatedPersonnelController.java | 6 +-- .../ProjectSatisfactionDetailController.java | 6 +-- ...ojectSatisfactionStatisticsController.java | 6 +-- .../controller/ProjectStaffController.java | 6 +-- .../dao/CustomerProjectParameterDao.java | 3 +- .../main/java/com/epmet/dao/MemoAttrDao.java | 3 +- .../java/com/epmet/dao/MemoDifficultyDao.java | 3 +- .../main/java/com/epmet/dao/ProjectDao.java | 7 ++- .../dao/ProjectSatisfactionDetailDao.java | 4 +- .../dao/ProjectSatisfactionStatisticsDao.java | 3 +- .../CustomerProjectParameterEntity.java | 3 -- .../com/epmet/entity/MemoWorkDiaryEntity.java | 2 - .../epmet/entity/ProjectCategoryEntity.java | 3 -- .../entity/ProjectOrgRelationEntity.java | 1 - .../ProjectProcessAttachmentEntity.java | 3 -- .../epmet/entity/ProjectProcessEntity.java | 1 - .../entity/ProjectProcessScanTaskEntity.java | 3 -- .../entity/ProjectRelatedPersonnelEntity.java | 3 -- .../ProjectSatisfactionDetailEntity.java | 3 -- .../ProjectSatisfactionStatisticsEntity.java | 3 -- .../com/epmet/entity/ProjectStaffEntity.java | 3 -- .../entity/ProjectSubAttachmentEntity.java | 5 +-- .../epmet/entity/ProjectSubProcessEntity.java | 3 +- .../com/epmet/entity/ProjectTagsEntity.java | 3 -- .../entity/ResiEventAttachmentEntity.java | 3 -- .../com/epmet/entity/ResiEventEntity.java | 3 +- .../entity/ResiEventOperationLogEntity.java | 1 - .../epmet/entity/ResiEventReplyEntity.java | 3 -- .../java/com/epmet/redis/ProjectRedis.java | 3 +- .../epmet/service/MemoDifficultyService.java | 4 +- .../ProjectSatisfactionDetailService.java | 6 +-- .../epmet/service/ProjectStaffService.java | 3 +- .../impl/BlockChainUploadServiceImpl.java | 1 - .../CustomerProjectParameterServiceImpl.java | 4 +- .../impl/MemoDifficultyServiceImpl.java | 5 +-- .../ProjectProcessAttachmentServiceImpl.java | 4 +- .../ProjectProcessScanTaskServiceImpl.java | 4 +- .../impl/ProjectProcessServiceImpl.java | 13 +----- .../ProjectRelatedPersonnelServiceImpl.java | 4 +- ...jectSatisfactionStatisticsServiceImpl.java | 5 +-- .../service/impl/ProjectStaffServiceImpl.java | 3 +- .../service/impl/ProjectTagsServiceImpl.java | 2 +- .../impl/ResiEventReplyServiceImpl.java | 5 +-- .../java/com/epmet/dto/ArticleCoverDTO.java | 5 ++- .../epmet/dto/ArticleOperateRecordDTO.java | 5 ++- .../java/com/epmet/dto/ArticleTagsDTO.java | 5 ++- .../com/epmet/dto/ArticleVisitRecordDTO.java | 5 ++- .../java/com/epmet/dto/DraftCoverDTO.java | 5 ++- .../com/epmet/dto/GuideCollectionDTO.java | 5 ++- .../com/epmet/dto/GuideExternalLinkDTO.java | 5 ++- .../java/com/epmet/dto/GuideModuleDTO.java | 7 +-- .../com/epmet/dto/GuideModuleDictDTO.java | 5 ++- .../epmet/dto/GuideModuleDictDefaultDTO.java | 5 ++- .../java/com/epmet/dto/TagCustomerDTO.java | 5 ++- .../java/com/epmet/dto/TagDefaultDTO.java | 5 ++- .../main/java/com/epmet/dto/TagGridDTO.java | 5 ++- .../java/com/epmet/dto/form/GuideFormDTO.java | 4 -- .../epmet/dto/form/OffLineArticleFormDTO.java | 1 - .../dto/form/PublishGridListFormDTO.java | 1 - .../epmet/dto/form/PublishedListFormDTO.java | 1 - .../epmet/feign/GovVoiceOpenFeignClient.java | 1 - .../GovVoiceOpenFeignClientFallback.java | 1 - .../main/java/com/epmet/dao/ArticleDao.java | 8 +--- .../com/epmet/entity/ArticleCoverEntity.java | 3 -- .../entity/ArticlePublishRangeEntity.java | 1 - .../com/epmet/entity/ArticleTagsEntity.java | 3 -- .../entity/ArticleVisitRecordEntity.java | 3 -- .../com/epmet/entity/DraftCoverEntity.java | 3 -- .../epmet/entity/DraftPublishRangeEntity.java | 1 - .../epmet/entity/GuideCollectionEntity.java | 3 -- .../entity/GuideModuleDictDefaultEntity.java | 3 -- .../epmet/entity/GuideModuleDictEntity.java | 3 -- .../com/epmet/entity/GuideModuleEntity.java | 5 +-- .../com/epmet/entity/TagDefaultEntity.java | 3 -- .../java/com/epmet/entity/TagGridEntity.java | 3 -- .../epmet/service/SpecialSubjectService.java | 6 +-- .../impl/SpecialSubjectServiceImpl.java | 5 ++- .../entity/BaseDisputeProcessEntity.java | 1 - .../java/com/epmet/dto/OperLanguageDTO.java | 6 +-- .../main/java/com/epmet/dto/OperMenuDTO.java | 10 ++--- .../java/com/epmet/dto/OperResourceDTO.java | 5 ++- .../main/java/com/epmet/dto/OperRoleDTO.java | 6 +-- .../java/com/epmet/dto/OperRoleMenuDTO.java | 5 ++- .../java/com/epmet/dto/OperRoleUserDTO.java | 5 ++- .../feign/OperAccessOpenFeignClient.java | 6 +-- .../OperAccessOpenFeignClientFallback.java | 1 - .../controller/OperLanguageController.java | 6 +-- .../controller/OperResourceController.java | 6 +-- .../controller/OperRoleMenuController.java | 6 +-- .../controller/OperRoleUserController.java | 6 +-- .../java/com/epmet/entity/OperMenuEntity.java | 3 -- .../com/epmet/entity/OperResourceEntity.java | 4 -- .../java/com/epmet/entity/OperRoleEntity.java | 2 - .../com/epmet/entity/OperRoleMenuEntity.java | 1 - .../com/epmet/excel/OperLanguageExcel.java | 4 +- .../com/epmet/feign/EpmetUserFeignClient.java | 3 +- .../com/epmet/service/OperMenuService.java | 4 +- .../service/impl/OperLanguageServiceImpl.java | 4 +- .../service/impl/OperMenuServiceImpl.java | 6 +-- .../service/impl/OperResourceServiceImpl.java | 4 +- .../service/impl/OperRoleMenuServiceImpl.java | 4 +- .../service/impl/OperRoleServiceImpl.java | 4 +- .../service/impl/OperRoleUserServiceImpl.java | 4 +- .../epmet/dto/form/CustomerInitFormDTO.java | 1 - .../com/epmet/dto/form/PageQueryFormDTO.java | 2 - .../epmet/feign/OperCrmOpenFeignClient.java | 1 - .../OperCrmOpenFeignClientFallback.java | 1 - .../CustomerThirdplatApiserviceEntity.java | 3 -- .../CustomerThirdplatApiServiceService.java | 3 -- ...ustomerThirdplatApiServiceServiceImpl.java | 3 -- .../com/epmet/dto/CustomerFunctionDTO.java | 3 +- .../epmet/dto/CustomerFunctionDetailDTO.java | 3 +- .../epmet/dto/CustomerFunctionRoleDTO.java | 7 +-- .../java/com/epmet/dto/CustomerHomeDTO.java | 7 +-- .../com/epmet/dto/CustomerHomeDetailDTO.java | 3 +- .../epmet/dto/CustomerHomeTemplateDTO.java | 3 +- .../com/epmet/dto/CustomerStartPageDTO.java | 5 ++- .../com/epmet/dto/FunctionCustomizedDTO.java | 7 +-- .../dto/FunctionCustomizedVisitedDTO.java | 5 ++- .../main/java/com/epmet/dto/FunctionDTO.java | 3 +- .../epmet/dto/FunctionShoppingHistoryDTO.java | 3 +- .../java/com/epmet/dto/HomeComponentDTO.java | 3 +- .../main/java/com/epmet/dto/IcFormDTO.java | 5 ++- .../com/epmet/dto/IcFormItemOptionsDTO.java | 5 ++- .../dto/IcIndividualCategoryManageDTO.java | 7 +-- .../dto/IcResiCategoryStatsConfigDTO.java | 5 ++- .../dto/IcResiCategoryWarnConfigDTO.java | 5 ++- .../main/java/com/epmet/dto/ItemTypeDTO.java | 5 ++- .../form/CustomerFunctionRoleListFormDTO.java | 1 - .../epmet/dto/form/CustomerHomeFormDTO.java | 1 - .../IcResiCategoryStatsConfigFormDTO.java | 3 +- .../IcResiCategoryStatsConfigSortFormDTO.java | 3 +- .../dto/form/QueryFunctionListFormDTO.java | 1 - .../ResiCategoryStatsConfigListFormDTO.java | 4 +- .../form/SaveFunctionCustomizedFormDTO.java | 1 - .../com/epmet/dto/form/StartPageFromDTO.java | 1 - .../CustomerFunctionRoleListResultDTO.java | 2 - .../epmet/dto/result/CustomerResultDTO.java | 2 - .../dto/result/FunctionDetailResultDTO.java | 1 - .../epmet/dto/result/FunctionResultDTO.java | 2 - .../result/HomeDesignByCustomerResultDTO.java | 1 - .../IcResiCategoryStatsConfigResultDTO.java | 3 +- .../CustomerFunctionDetailController.java | 1 - .../CustomerFunctionRoleController.java | 6 +-- .../controller/CustomerHomeController.java | 8 ++-- .../CustomerHomeDetailController.java | 8 ++-- .../CustomerHomeTemplateController.java | 11 ++--- .../CustomerStartPageController.java | 3 +- .../FunctionCustomizedController.java | 2 +- .../FunctionCustomizedVisitedController.java | 7 ++- .../FunctionShoppingHistoryController.java | 6 +-- .../controller/HomeComponentController.java | 8 ++-- .../IcFormItemOptionsController.java | 2 +- .../IcIndividualCategoryManageController.java | 13 +++--- .../IcResiCategoryStatsConfigController.java | 6 +-- .../IcResiCategoryWarnConfigController.java | 6 +-- .../epmet/controller/ItemTypeController.java | 6 +-- .../epmet/dao/CustomerFunctionDetailDao.java | 1 - .../epmet/dao/CustomerFunctionRoleDao.java | 4 +- .../epmet/dao/CustomerHomeTemplateDao.java | 3 +- .../entity/CustomerFunctionDetailEntity.java | 3 -- .../epmet/entity/CustomerFunctionEntity.java | 5 +-- .../entity/CustomerFunctionRoleEntity.java | 5 +-- .../entity/CustomerHomeDetailEntity.java | 3 -- .../com/epmet/entity/CustomerHomeEntity.java | 5 +-- .../entity/CustomerHomeTemplateEntity.java | 3 -- .../epmet/entity/CustomerStartPageEntity.java | 3 -- .../entity/FunctionCustomizedEntity.java | 3 -- .../FunctionCustomizedVisitedEntity.java | 3 -- .../java/com/epmet/entity/FunctionEntity.java | 5 +-- .../entity/FunctionShoppingHistoryEntity.java | 3 -- .../com/epmet/entity/HomeComponentEntity.java | 3 -- .../java/com/epmet/entity/IcFormEntity.java | 3 -- .../epmet/entity/IcFormItemOptionsEntity.java | 3 -- .../IcIndividualCategoryManageEntity.java | 5 +-- .../IcResiCategoryWarnConfigEntity.java | 3 -- .../java/com/epmet/entity/ItemTypeEntity.java | 3 -- .../com/epmet/feign/OperCrmFeignClient.java | 7 +-- .../fallback/OperCrmFeignClientFallBack.java | 3 -- .../epmet/mq/RocketMQConsumerRegister.java | 6 --- .../java/com/epmet/service/HomeService.java | 1 - .../service/IcExportTemplateService.java | 2 +- .../IcIndividualCategoryManageService.java | 5 +-- .../ResiCategoryStatsConfigService.java | 7 +-- .../CustomerFunctionDetailServiceImpl.java | 1 - .../impl/CustomerFunctionRoleServiceImpl.java | 5 +-- .../impl/CustomerHomeDetailServiceImpl.java | 6 +-- .../service/impl/CustomerHomeServiceImpl.java | 5 +-- .../impl/CustomerHomeTemplateServiceImpl.java | 8 ++-- .../impl/CustomerStartPageServiceImpl.java | 9 ++-- .../FunctionCustomizedVisitedServiceImpl.java | 4 +- .../service/impl/FunctionServiceImpl.java | 2 +- .../FunctionShoppingHistoryServiceImpl.java | 4 +- .../impl/HomeComponentServiceImpl.java | 2 +- .../epmet/service/impl/HomeServiceImpl.java | 4 +- ...IcIndividualCategoryManageServiceImpl.java | 10 ++--- .../IcResiCategoryWarnConfigServiceImpl.java | 4 +- .../group/dto/QRCodeMultipartFileDTO.java | 1 - .../dto/act/ActCommentAttachmentDTO.java | 5 ++- .../resi/group/dto/act/ActCommentDTO.java | 5 ++- .../group/dto/act/ActOperationRecordDTO.java | 5 ++- .../group/dto/act/GroupActContentDTO.java | 5 ++- .../group/ResiGroupAchievementStatsDTO.java | 5 ++- .../group/dto/group/ResiGroupCodeDTO.java | 3 +- .../dto/group/ResiGroupOperationDTO.java | 3 +- .../group/dto/group/ResiGroupSetupDTO.java | 5 ++- .../dto/group/ResiGroupStatisticalDTO.java | 3 +- .../group/dto/group/form/GroupFormDTO.java | 1 + .../group/form/GroupPointDetailFormDTO.java | 2 - .../dto/invitation/GroupInvitationDTO.java | 3 +- .../dto/member/GroupMemeberOperationDTO.java | 3 +- .../member/form/ApplyJoinGroupFormDTO.java | 1 - .../dto/member/form/DisagreeApplyFormDTO.java | 2 - .../member/result/AchievementResultDTO.java | 1 - .../result/GroupMemberListResultDTO.java | 1 - .../member/result/VotableCountResultDTO.java | 1 - .../group/dto/notice/NoticeAttachmentDTO.java | 5 ++- .../notice/NoticeCommentAttachmentDTO.java | 5 ++- .../group/dto/notice/NoticeCommentDTO.java | 5 ++- .../resi/group/dto/notice/NoticeDTO.java | 5 ++- .../group/dto/notice/NoticeReadRecordDTO.java | 5 ++- .../notice/result/NoticeDetailResultDTO.java | 1 - .../dto/topic/ResiTopicAttachmentDTO.java | 5 ++- .../topic/ResiTopicCommentAttachmentDTO.java | 5 ++- .../resi/group/dto/topic/ResiTopicDTO.java | 7 +-- .../dto/topic/ResiTopicOperationDTO.java | 5 ++- .../dto/topic/TopicDraftAttachmentDTO.java | 7 +-- .../resi/group/dto/topic/TopicDraftDTO.java | 9 ++-- .../dto/topic/TopicDraftOperationDTO.java | 5 ++- .../dto/topic/TopicDraftScanTaskDTO.java | 5 ++- .../topic/TopicShareLinkVisitRecordDTO.java | 7 +-- .../dto/topic/form/AllMessagesFormDTO.java | 1 - .../form/ResiTopicCancelHiddenFormDTO.java | 1 - .../topic/form/ResiTopicOperationFormDTO.java | 1 - .../result/CheckTopicPublisherResultDTO.java | 2 - .../dto/topic/result/IssueGridResultDTO.java | 2 - .../ResiTopicIncludeIssueDetailResultDTO.java | 1 - .../dto/topic/result/TopicFileResultDTO.java | 1 - .../group/feign/ResiGroupOpenFeignClient.java | 3 +- .../ResiGroupOpenFeignClientFallback.java | 17 +------ .../act/controller/ActCommentController.java | 11 +++-- .../modules/act/dao/GroupActInfoDao.java | 3 +- .../impl/ActSignInRecordServiceImpl.java | 1 - .../service/impl/GroupActInfoServiceImpl.java | 5 ++- .../fallback/GovOrgFeignClientFallBack.java | 1 - .../controller/GroupIssueController.java | 4 -- .../group/controller/ResiGroupController.java | 4 -- .../epmet/modules/group/dao/ResiGroupDao.java | 2 +- .../entity/GroupEditSubmitRecordEntity.java | 1 - .../ResiGroupAchievementStatsEntity.java | 1 - .../group/entity/ResiGroupCodeEntity.java | 4 -- .../modules/group/entity/ResiGroupEntity.java | 1 - .../entity/ResiGroupOperationEntity.java | 3 -- .../group/entity/ResiGroupSetupEntity.java | 3 -- .../entity/ResiGroupStatisticalEntity.java | 3 -- .../group/service/GroupIssueService.java | 4 -- .../group/service/ResiGroupService.java | 1 - .../service/impl/GroupIssueServiceImpl.java | 9 ++-- .../impl/ResiGroupCodeServiceImpl.java | 1 - .../impl/ResiGroupOperationServiceImpl.java | 2 +- .../impl/ResiGroupStatisticalServiceImpl.java | 3 -- .../impl/StatsAchievementServiceImpl.java | 2 +- .../InvitationRecordController.java | 8 ++-- .../entity/GroupInvitationEntity.java | 1 - .../controller/ResiGroupMemberController.java | 5 ++- .../entity/GroupMemeberOperationEntity.java | 3 -- .../member/entity/GroupVisitorEntity.java | 1 - .../service/GroupMemeberOperationService.java | 2 - .../GroupMemeberOperationServiceImpl.java | 3 -- .../impl/ResiGroupMemberServiceImpl.java | 3 -- .../notice/entity/NoticeAttachmentEntity.java | 3 -- .../notice/entity/NoticeCommentEntity.java | 3 -- .../modules/notice/entity/NoticeEntity.java | 1 - .../notice/entity/NoticeReadRecordEntity.java | 3 -- .../support/GroupAchievementUtils.java | 2 +- .../TopicShareLinkRecordController.java | 5 +-- .../modules/topic/dao/TopicDraftDao.java | 9 ++-- .../entity/ResiTopicAttachmentEntity.java | 3 -- .../modules/topic/entity/ResiTopicEntity.java | 3 +- .../entity/ResiTopicOperationEntity.java | 3 -- .../entity/TopicDraftAttachmentEntity.java | 5 +-- .../topic/entity/TopicDraftEntity.java | 7 +-- .../entity/TopicDraftOperationEntity.java | 3 -- .../entity/TopicDraftScanTaskEntity.java | 3 -- .../TopicShareLinkVisitRecordEntity.java | 3 -- .../service/ResiTopicCommentService.java | 3 +- .../service/ResiTopicOperationService.java | 3 +- .../topic/service/ResiTopicService.java | 4 -- .../topic/service/TopicDraftService.java | 6 +-- .../TopicShareLinkVisitRecordService.java | 4 +- .../impl/ResiTopicAttachmentServiceImpl.java | 4 +- .../impl/ResiTopicCommentServiceImpl.java | 5 +-- .../impl/ResiTopicOperationServiceImpl.java | 5 +-- .../service/impl/ResiTopicServiceImpl.java | 11 +++-- .../impl/TopicDraftAttachmentServiceImpl.java | 3 +- .../impl/TopicDraftScanTaskServiceImpl.java | 5 +-- .../TopicShareLinkVisitRecordServiceImpl.java | 7 --- .../epmet/mq/RocketMQConsumerRegister.java | 10 +---- .../epmet/dto/StrangerAccessRecordDTO.java | 7 +-- .../StrangerAccessRecordController.java | 2 +- .../epmet/dao/StrangerAccessRecordDao.java | 6 +-- .../entity/StrangerAccessRecordEntity.java | 3 +- .../com/epmet/feign/GovOrgFeignClient.java | 1 - .../fallback/GovOrgFeignClientFallBack.java | 1 - .../service/impl/UserAccessServiceImpl.java | 1 - .../epmet/dto/IssueCustomerParameterDTO.java | 5 ++- .../src/main/java/com/epmet/dto/IssueDTO.java | 5 ++- .../java/com/epmet/dto/IssueProcessDTO.java | 5 ++- .../epmet/dto/IssueProjectRelationDTO.java | 5 ++- .../epmet/dto/IssueSatisfactionDetailDTO.java | 5 ++- .../dto/IssueSatisfactionStatisticalDTO.java | 5 ++- .../com/epmet/dto/IssueVoteDetailDTO.java | 5 ++- .../epmet/dto/IssueVoteStatisticalDTO.java | 5 ++- .../dto/IssueVoteStatisticalDailyDTO.java | 5 ++- .../main/java/com/epmet/dto/PolyLineDTO.java | 1 - .../dto/result/InitEvaluationResultDTO.java | 1 - .../com/epmet/feign/GovIssueFeignClient.java | 1 - .../EpmetUserFeignClientFallBack.java | 1 - .../fallback/GovIssueFeignClientFallBack.java | 1 - .../epmet/service/impl/IssueServiceImpl.java | 1 - .../dto/result/ResiEventNpcResultDTO.java | 2 - .../epmet/controller/ProjectController.java | 2 - .../epmet/controller/ResiEventController.java | 1 - .../fallback/GovIssueFeignClientFallBack.java | 1 - .../ResiGroupFeignClientFallBack.java | 4 +- .../modules/advice/service/AdviceService.java | 1 - .../controller/ResiMineGridController.java | 6 ++- .../service/impl/ResiMineGridServiceImpl.java | 5 --- .../person/controller/BadgeController.java | 2 +- .../modules/person/service/BadgeService.java | 2 +- .../person/service/impl/BadgeServiceImpl.java | 2 +- .../service/impl/ResiRegisterServiceImpl.java | 5 --- .../impl/ResiWarmheartedServiceImpl.java | 3 -- .../IcPartymemberStyleCategoryDictDTO.java | 5 ++- .../IcPartymemberStyleImageDTO.java | 7 +-- .../partymember/PartyBranchMembersDTO.java | 5 ++- .../partymember/PartymemberAuthRecordDTO.java | 5 ++- .../result/AuditingDetailResultDTO.java | 1 - .../result/ReviewedParyMemberResultDTO.java | 2 - .../UnderReviewParyMemberResultDTO.java | 1 - .../result/ResiWarmheartedResultDTO.java | 3 +- .../feign/ResiPartyMemberOpenFeignClient.java | 1 - ...esiPartyMemberOpenFeignClientFallback.java | 1 - .../modules/feign/GovOrgFeignClient.java | 2 +- .../fallback/GovOrgFeignClientFallBack.java | 2 +- .../IcPartymemberStyleController.java | 12 ++--- .../PartyBranchMembersController.java | 6 +-- .../PartyMemberConfirmController.java | 1 - .../entity/PartyBranchMembersEntity.java | 3 -- .../entity/PartymemberAuthRecordEntity.java | 1 - .../entity/PartymemberBaseInfoEntity.java | 5 +-- .../entity/PartymemberConfirmAutoEntity.java | 3 +- .../PartymemberConfirmManualEntity.java | 3 -- .../entity/PartymemberVisitEntity.java | 1 - .../service/IcPartymemberStyleService.java | 4 +- .../service/PartyMemberConfirmService.java | 1 - .../impl/PartyBranchMembersServiceImpl.java | 4 +- .../impl/PartymemberInfoServiceImpl.java | 1 - .../dao/ResiWarmheartedVisitDao.java | 5 +-- .../entity/ResiWarmheartedApplyEntity.java | 5 +-- .../entity/ResiWarmheartedVisitEntity.java | 1 - .../impl/ResiWarmheartedVisitServiceImpl.java | 4 +- .../epmet/feign/ResiVoiceOpenFeignClient.java | 4 +- .../ResiVoiceOpenFeignClientFallback.java | 1 - .../scan/service/impl/ScanServiceImpl.java | 1 - .../epmet/openapi/sdk/encrypt/Md5Util.java | 2 - 1519 files changed, 2368 insertions(+), 3865 deletions(-) diff --git a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/NewsDTO.java b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/NewsDTO.java index 831d5a2d0b..638722f904 100644 --- a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/NewsDTO.java +++ b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/NewsDTO.java @@ -8,10 +8,10 @@ package com.epmet.dto; -import com.fasterxml.jackson.annotation.JsonProperty; import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import javax.validation.constraints.NotBlank; diff --git a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysDeptDTO.java b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysDeptDTO.java index fbf3950bea..c416f6766d 100644 --- a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysDeptDTO.java +++ b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysDeptDTO.java @@ -8,12 +8,11 @@ package com.epmet.dto; -import com.fasterxml.jackson.annotation.JsonProperty; import com.epmet.commons.tools.utils.TreeNode; import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; - +import com.fasterxml.jackson.annotation.JsonProperty; import javax.validation.constraints.Min; import javax.validation.constraints.NotBlank; diff --git a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysDictDataDTO.java b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysDictDataDTO.java index 3664870194..7fc9e2191c 100644 --- a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysDictDataDTO.java +++ b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysDictDataDTO.java @@ -8,10 +8,10 @@ package com.epmet.dto; -import com.fasterxml.jackson.annotation.JsonProperty; import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import javax.validation.constraints.Min; diff --git a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysDictTypeDTO.java b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysDictTypeDTO.java index 4fd3c654f4..d6b99c9be5 100644 --- a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysDictTypeDTO.java +++ b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysDictTypeDTO.java @@ -8,11 +8,10 @@ package com.epmet.dto; -import com.fasterxml.jackson.annotation.JsonProperty; import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; - +import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import javax.validation.constraints.Min; diff --git a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysMenuDTO.java b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysMenuDTO.java index 441303c187..89a2dd1be8 100644 --- a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysMenuDTO.java +++ b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysMenuDTO.java @@ -8,11 +8,11 @@ package com.epmet.dto; -import com.fasterxml.jackson.annotation.JsonProperty; import com.epmet.commons.tools.utils.TreeNode; import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.fasterxml.jackson.annotation.JsonProperty; import org.hibernate.validator.constraints.Range; import javax.validation.constraints.Min; diff --git a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysParamsDTO.java b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysParamsDTO.java index 4edefe2792..1b6573d7e0 100644 --- a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysParamsDTO.java +++ b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysParamsDTO.java @@ -8,11 +8,10 @@ package com.epmet.dto; -import com.fasterxml.jackson.annotation.JsonProperty; import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; - +import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import javax.validation.constraints.NotBlank; diff --git a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysRegionDTO.java b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysRegionDTO.java index 39f62c48b1..b8b52e8721 100644 --- a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysRegionDTO.java +++ b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysRegionDTO.java @@ -8,9 +8,8 @@ package com.epmet.dto; -import com.fasterxml.jackson.annotation.JsonProperty; import com.epmet.commons.tools.validator.group.DefaultGroup; - +import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import javax.validation.constraints.Min; diff --git a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysRoleDTO.java b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysRoleDTO.java index e55e01bbd3..7279c60b81 100644 --- a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysRoleDTO.java +++ b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysRoleDTO.java @@ -8,11 +8,10 @@ package com.epmet.dto; -import com.fasterxml.jackson.annotation.JsonProperty; import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; - +import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import javax.validation.constraints.NotBlank; diff --git a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysUserDTO.java b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysUserDTO.java index bba18236ca..fa5db940bc 100644 --- a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysUserDTO.java +++ b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysUserDTO.java @@ -8,11 +8,10 @@ package com.epmet.dto; -import com.fasterxml.jackson.annotation.JsonProperty; import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; - +import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import org.hibernate.validator.constraints.Range; diff --git a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/region/LogOperationResultDTO.java b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/region/LogOperationResultDTO.java index a9cca21013..b08c9fc295 100644 --- a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/region/LogOperationResultDTO.java +++ b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/region/LogOperationResultDTO.java @@ -1,12 +1,7 @@ package com.epmet.dto.region; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Data; -import java.util.Date; - /** * */ diff --git a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/region/Region.java b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/region/Region.java index 3129ba0075..f796b54547 100644 --- a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/region/Region.java +++ b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/region/Region.java @@ -9,7 +9,6 @@ package com.epmet.dto.region; import com.fasterxml.jackson.annotation.JsonIgnore; - import lombok.Data; import java.io.Serializable; diff --git a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/remote/ParamsRemoteService.java b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/remote/ParamsRemoteService.java index ee4b533bec..88947f2583 100644 --- a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/remote/ParamsRemoteService.java +++ b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/remote/ParamsRemoteService.java @@ -9,9 +9,9 @@ package com.epmet.remote; import com.alibaba.fastjson.JSON; -import com.epmet.feign.ParamsFeignClient; import com.epmet.commons.tools.exception.ErrorCode; import com.epmet.commons.tools.exception.RenException; +import com.epmet.feign.ParamsFeignClient; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/LogOperationController.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/LogOperationController.java index bba298577f..089ad29639 100644 --- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/LogOperationController.java +++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/LogOperationController.java @@ -3,7 +3,6 @@ package com.epmet.controller; import com.epmet.commons.tools.annotation.RequirePermission; import com.epmet.commons.tools.enums.RequirePermissionEnum; import com.epmet.commons.tools.security.user.LoginUserUtil; -import com.epmet.commons.tools.utils.IpUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dto.form.LogOperationListFormDTO; diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysDeptController.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysDeptController.java index 3bedc14687..f534eac664 100644 --- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysDeptController.java +++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysDeptController.java @@ -8,14 +8,14 @@ package com.epmet.controller; -import com.epmet.dto.SysDeptDTO; -import com.epmet.service.SysDeptService; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.AssertUtils; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.dto.SysDeptDTO; +import com.epmet.service.SysDeptService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysDictTypeController.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysDictTypeController.java index 4d842f5ef1..0f81215fe5 100644 --- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysDictTypeController.java +++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysDictTypeController.java @@ -8,18 +8,18 @@ package com.epmet.controller; -import com.epmet.dto.SysDictTypeDTO; -import com.epmet.service.SysDictTypeService; -import com.epmet.commons.tools.constant.Constant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.AssertUtils; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.dto.SysDictTypeDTO; import com.epmet.entity.DictType; +import com.epmet.service.SysDictTypeService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; + import java.util.List; import java.util.Map; diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysMenuController.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysMenuController.java index 5d92ad1fba..9400789b8f 100644 --- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysMenuController.java +++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysMenuController.java @@ -8,16 +8,16 @@ package com.epmet.controller; -import com.epmet.dto.MenuResourceDTO; -import com.epmet.dto.SysMenuDTO; -import com.epmet.service.SysMenuService; -import com.epmet.service.SysResourceService; import com.epmet.commons.tools.exception.ErrorCode; import com.epmet.commons.tools.security.user.UserDetail; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.AssertUtils; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.commons.tools.validator.group.DefaultGroup; +import com.epmet.dto.MenuResourceDTO; +import com.epmet.dto.SysMenuDTO; +import com.epmet.service.SysMenuService; +import com.epmet.service.SysResourceService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysRegionController.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysRegionController.java index 660402e667..3c0f246e4b 100644 --- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysRegionController.java +++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysRegionController.java @@ -8,9 +8,6 @@ package com.epmet.controller; -import com.epmet.dto.SysRegionDTO; -import com.epmet.dto.region.RegionProvince; -import com.epmet.service.SysRegionService; import com.epmet.commons.tools.exception.ErrorCode; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.utils.Result; @@ -19,6 +16,9 @@ import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.dto.SysRegionDTO; +import com.epmet.dto.region.RegionProvince; +import com.epmet.service.SysRegionService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysRoleController.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysRoleController.java index 8f9ab0ddf9..916436069a 100644 --- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysRoleController.java +++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysRoleController.java @@ -8,9 +8,6 @@ package com.epmet.controller; -import com.epmet.dto.SysRoleDTO; -import com.epmet.service.SysRoleService; -import com.epmet.commons.tools.constant.Constant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.AssertUtils; @@ -18,8 +15,10 @@ import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.dto.SysRoleDTO; import com.epmet.service.SysRoleDataScopeService; import com.epmet.service.SysRoleMenuService; +import com.epmet.service.SysRoleService; import com.epmet.service.SysRoleUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysUserController.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysUserController.java index d21db797a2..a75447ef1a 100644 --- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysUserController.java +++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysUserController.java @@ -8,16 +8,11 @@ package com.epmet.controller; -import com.epmet.commons.tools.security.user.SecurityUser; -import com.epmet.dto.PasswordDTO; -import com.epmet.dto.SysUserDTO; -import com.epmet.service.SysResourceService; -import com.epmet.service.SysUserService; -import com.epmet.commons.tools.constant.Constant; import com.epmet.commons.tools.exception.ErrorCode; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.bo.ResourceBO; import com.epmet.commons.tools.security.password.PasswordUtils; +import com.epmet.commons.tools.security.user.SecurityUser; import com.epmet.commons.tools.security.user.UserDetail; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.ExcelUtils; @@ -27,9 +22,13 @@ import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.dto.PasswordDTO; +import com.epmet.dto.SysUserDTO; import com.epmet.excel.SysUserExcel; +import com.epmet.service.SysResourceService; import com.epmet.service.SysRoleDataScopeService; import com.epmet.service.SysRoleUserService; +import com.epmet.service.SysUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/entity/CorsConfigEntity.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/entity/CorsConfigEntity.java index 0a717f1c50..c9d0e46df3 100644 --- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/entity/CorsConfigEntity.java +++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/entity/CorsConfigEntity.java @@ -18,13 +18,10 @@ package com.epmet.entity; import com.baomidou.mybatisplus.annotation.TableName; - import com.epmet.commons.mybatis.entity.BaseEpmetEntity; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; - /** * 跨域配置表 * diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/entity/LogOperationEntity.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/entity/LogOperationEntity.java index d3f3f20402..537d1fc9b2 100644 --- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/entity/LogOperationEntity.java +++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/entity/LogOperationEntity.java @@ -18,7 +18,6 @@ package com.epmet.entity; import com.baomidou.mybatisplus.annotation.TableName; - import com.epmet.commons.mybatis.entity.BaseEpmetEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/RocketMQConsumerRegister.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/RocketMQConsumerRegister.java index 8c07d1279d..93a2f8e5f0 100644 --- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/RocketMQConsumerRegister.java +++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/RocketMQConsumerRegister.java @@ -4,19 +4,12 @@ import com.epmet.commons.rocketmq.constants.ConsomerGroupConstants; import com.epmet.commons.rocketmq.constants.TopicConstants; import com.epmet.commons.rocketmq.register.MQAbstractRegister; import com.epmet.commons.rocketmq.register.MQConsumerProperties; -import com.epmet.commons.tools.enums.EnvEnum; import com.epmet.mq.listener.listener.AuthOperationLogListener; import com.epmet.mq.listener.listener.PointOperationLogListener; import com.epmet.mq.listener.listener.ProjectOperationLogListener; -import org.apache.rocketmq.client.consumer.DefaultMQPushConsumer; -import org.apache.rocketmq.client.consumer.listener.MessageListenerConcurrently; -import org.apache.rocketmq.client.exception.MQClientException; import org.apache.rocketmq.common.protocol.heartbeat.MessageModel; -import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; -import javax.annotation.PostConstruct; - @Component public class RocketMQConsumerRegister extends MQAbstractRegister { @@ -29,4 +22,4 @@ public class RocketMQConsumerRegister extends MQAbstractRegister { // ...其他监听器类似 } -} \ No newline at end of file +} diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/listener/ProjectOperationLogListener.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/listener/ProjectOperationLogListener.java index a47d55c2de..d2de3b9bf2 100644 --- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/listener/ProjectOperationLogListener.java +++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/listener/ProjectOperationLogListener.java @@ -2,7 +2,6 @@ package com.epmet.mq.listener.listener; import com.alibaba.fastjson.JSON; import com.epmet.commons.rocketmq.constants.MQUserPropertys; -import com.epmet.commons.rocketmq.messages.LoginMQMsg; import com.epmet.commons.rocketmq.messages.ProjectChangedMQMsg; import com.epmet.commons.tools.distributedlock.DistributedLock; import com.epmet.commons.tools.exception.ExceptionUtils; diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/NewsService.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/NewsService.java index e07846797a..bc4d1a7932 100644 --- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/NewsService.java +++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/NewsService.java @@ -8,9 +8,9 @@ package com.epmet.service; -import com.epmet.dto.NewsDTO; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.NewsDTO; import com.epmet.entity.NewsEntity; import java.util.Map; diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysDeptService.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysDeptService.java index f23af1afef..9655030e62 100644 --- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysDeptService.java +++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysDeptService.java @@ -8,8 +8,8 @@ package com.epmet.service; -import com.epmet.dto.SysDeptDTO; import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.dto.SysDeptDTO; import com.epmet.entity.SysDeptEntity; import java.util.List; diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysDictTypeService.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysDictTypeService.java index 4f19658c84..fa6fdc7f3c 100644 --- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysDictTypeService.java +++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysDictTypeService.java @@ -8,9 +8,9 @@ package com.epmet.service; -import com.epmet.dto.SysDictTypeDTO; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.SysDictTypeDTO; import com.epmet.entity.DictType; import com.epmet.entity.SysDictTypeEntity; diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysLogErrorService.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysLogErrorService.java index d8a1ae2afc..49cb083951 100644 --- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysLogErrorService.java +++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysLogErrorService.java @@ -8,9 +8,9 @@ package com.epmet.service; -import com.epmet.dto.SysLogErrorDTO; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.SysLogErrorDTO; import com.epmet.entity.SysLogErrorEntity; import java.util.List; diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysLogLoginService.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysLogLoginService.java index 17d3a6958d..058f9e83d0 100644 --- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysLogLoginService.java +++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysLogLoginService.java @@ -8,9 +8,9 @@ package com.epmet.service; -import com.epmet.dto.SysLogLoginDTO; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.SysLogLoginDTO; import com.epmet.entity.SysLogLoginEntity; import java.util.List; diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysLogOperationService.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysLogOperationService.java index e55784fd09..87a830f395 100644 --- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysLogOperationService.java +++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysLogOperationService.java @@ -8,9 +8,9 @@ package com.epmet.service; -import com.epmet.dto.SysLogOperationDTO; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.SysLogOperationDTO; import com.epmet.entity.SysLogOperationEntity; import java.util.List; diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysMenuService.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysMenuService.java index d160d7700a..3f47eada25 100644 --- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysMenuService.java +++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysMenuService.java @@ -8,9 +8,9 @@ package com.epmet.service; -import com.epmet.dto.SysMenuDTO; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.security.user.UserDetail; +import com.epmet.dto.SysMenuDTO; import com.epmet.entity.SysMenuEntity; import java.util.List; diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysParamsService.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysParamsService.java index 54d5ab2b99..ef51d5d862 100644 --- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysParamsService.java +++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysParamsService.java @@ -8,9 +8,9 @@ package com.epmet.service; -import com.epmet.dto.SysParamsDTO; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.SysParamsDTO; import com.epmet.entity.SysParamsEntity; import java.util.List; diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysRegionService.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysRegionService.java index e67940e197..cfe7d84706 100644 --- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysRegionService.java +++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysRegionService.java @@ -8,9 +8,9 @@ package com.epmet.service; +import com.epmet.commons.mybatis.service.BaseService; import com.epmet.dto.SysRegionDTO; import com.epmet.dto.region.RegionProvince; -import com.epmet.commons.mybatis.service.BaseService; import com.epmet.entity.SysRegionEntity; import java.util.List; diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysResourceService.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysResourceService.java index a212657b51..83893579c8 100644 --- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysResourceService.java +++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysResourceService.java @@ -8,9 +8,9 @@ package com.epmet.service; -import com.epmet.dto.MenuResourceDTO; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.security.bo.ResourceBO; +import com.epmet.dto.MenuResourceDTO; import com.epmet.entity.SysResourceEntity; import java.util.List; diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysRoleService.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysRoleService.java index 9a740f42d6..a2d5e05982 100644 --- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysRoleService.java +++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysRoleService.java @@ -8,9 +8,9 @@ package com.epmet.service; -import com.epmet.dto.SysRoleDTO; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.SysRoleDTO; import com.epmet.entity.SysRoleEntity; import java.util.List; diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysUserService.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysUserService.java index 2681b6d027..397a06903e 100644 --- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysUserService.java +++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysUserService.java @@ -8,9 +8,9 @@ package com.epmet.service; -import com.epmet.dto.SysUserDTO; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.SysUserDTO; import com.epmet.entity.SysUserEntity; import java.util.List; diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/impl/CorsConfigServiceImpl.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/impl/CorsConfigServiceImpl.java index 2441882ea3..0554dc3b84 100644 --- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/impl/CorsConfigServiceImpl.java +++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/impl/CorsConfigServiceImpl.java @@ -13,7 +13,6 @@ import com.epmet.service.CorsConfigService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.redis.core.HashOperations; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/impl/LogOperationServiceImpl.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/impl/LogOperationServiceImpl.java index 4ccc4e868f..1cbf7e32d2 100644 --- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/impl/LogOperationServiceImpl.java +++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/impl/LogOperationServiceImpl.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.epmet.auth.constants.AuthOperationEnum; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.feign.ResultDataResolver; diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/impl/NewsServiceImpl.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/impl/NewsServiceImpl.java index 220cf7d171..211ddeb5ec 100644 --- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/impl/NewsServiceImpl.java +++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/impl/NewsServiceImpl.java @@ -9,7 +9,6 @@ package com.epmet.service.impl; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.epmet.commons.mybatis.annotation.DataFilter; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.Constant; import com.epmet.commons.tools.page.PageData; diff --git a/epmet-auth/src/main/java/com/epmet/controller/BackDoorController.java b/epmet-auth/src/main/java/com/epmet/controller/BackDoorController.java index d4edbb0b56..07efb95921 100644 --- a/epmet-auth/src/main/java/com/epmet/controller/BackDoorController.java +++ b/epmet-auth/src/main/java/com/epmet/controller/BackDoorController.java @@ -3,7 +3,6 @@ package com.epmet.controller; import com.epmet.redis.CustomerAppWxServiceUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; import java.util.Set; diff --git a/epmet-auth/src/main/java/com/epmet/controller/GovLoginController.java b/epmet-auth/src/main/java/com/epmet/controller/GovLoginController.java index 8745418f90..386e162c02 100644 --- a/epmet-auth/src/main/java/com/epmet/controller/GovLoginController.java +++ b/epmet-auth/src/main/java/com/epmet/controller/GovLoginController.java @@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.HashMap; import java.util.List; /** diff --git a/epmet-auth/src/main/java/com/epmet/controller/GovWebController.java b/epmet-auth/src/main/java/com/epmet/controller/GovWebController.java index 89fb9b183c..43b2719dc8 100644 --- a/epmet-auth/src/main/java/com/epmet/controller/GovWebController.java +++ b/epmet-auth/src/main/java/com/epmet/controller/GovWebController.java @@ -16,8 +16,6 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.HashMap; - /** * @author sun diff --git a/epmet-auth/src/main/java/com/epmet/controller/IcLoinController.java b/epmet-auth/src/main/java/com/epmet/controller/IcLoinController.java index 659945bddb..27f9cde583 100644 --- a/epmet-auth/src/main/java/com/epmet/controller/IcLoinController.java +++ b/epmet-auth/src/main/java/com/epmet/controller/IcLoinController.java @@ -29,7 +29,10 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.*; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; @RestController @RequestMapping("ic") diff --git a/epmet-auth/src/main/java/com/epmet/controller/PublicUserLoginController.java b/epmet-auth/src/main/java/com/epmet/controller/PublicUserLoginController.java index 8f93ab52fb..2e8ecb456e 100644 --- a/epmet-auth/src/main/java/com/epmet/controller/PublicUserLoginController.java +++ b/epmet-auth/src/main/java/com/epmet/controller/PublicUserLoginController.java @@ -1,7 +1,6 @@ package com.epmet.controller; import com.epmet.commons.tools.annotation.LoginUser; -import com.epmet.commons.tools.constant.Constant; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; @@ -13,11 +12,7 @@ import com.epmet.dto.form.PublicSendSmsCodeFormDTO; import com.epmet.dto.form.RegisterFormDTO; import com.epmet.dto.result.UserTokenResultDTO; import com.epmet.service.PublicUserLoginService; -import com.netflix.ribbon.proxy.annotation.Http; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpHeaders; -import org.springframework.http.HttpRequest; -import org.springframework.http.server.reactive.ServerHttpRequest; import org.springframework.web.bind.annotation.*; /** diff --git a/epmet-auth/src/main/java/com/epmet/controller/SsoController.java b/epmet-auth/src/main/java/com/epmet/controller/SsoController.java index 59fd01d2c9..8dc85dacba 100644 --- a/epmet-auth/src/main/java/com/epmet/controller/SsoController.java +++ b/epmet-auth/src/main/java/com/epmet/controller/SsoController.java @@ -6,8 +6,8 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dto.form.SsoEnteOrgFormDTO; import com.epmet.dto.form.SsoLoginFormDTO; -import com.epmet.dto.form.SsoWorkLoginFormDTO; import com.epmet.dto.form.SsoLoginOperFormDTO; +import com.epmet.dto.form.SsoWorkLoginFormDTO; import com.epmet.dto.result.SsoLoginResultDTO; import com.epmet.dto.result.UserTokenResultDTO; import com.epmet.service.SsoService; diff --git a/epmet-auth/src/main/java/com/epmet/controller/ThirdLoginController.java b/epmet-auth/src/main/java/com/epmet/controller/ThirdLoginController.java index 65e718aacf..144e18d024 100644 --- a/epmet-auth/src/main/java/com/epmet/controller/ThirdLoginController.java +++ b/epmet-auth/src/main/java/com/epmet/controller/ThirdLoginController.java @@ -1,10 +1,7 @@ package com.epmet.controller; -import com.epmet.commons.tools.annotation.LoginUser; -import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; -import com.epmet.dto.UserDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.StaffOrgsResultDTO; import com.epmet.dto.result.UserTokenResultDTO; diff --git a/epmet-auth/src/main/java/com/epmet/jwt/JwtTokenUtils.java b/epmet-auth/src/main/java/com/epmet/jwt/JwtTokenUtils.java index 33baf31c52..05e5830e99 100644 --- a/epmet-auth/src/main/java/com/epmet/jwt/JwtTokenUtils.java +++ b/epmet-auth/src/main/java/com/epmet/jwt/JwtTokenUtils.java @@ -11,14 +11,12 @@ package com.epmet.jwt; import io.jsonwebtoken.Claims; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.SignatureAlgorithm; -import org.apache.commons.codec.binary.Base64; import org.joda.time.DateTime; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import java.util.Calendar; import java.util.Date; import java.util.HashMap; import java.util.Map; diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java index 8d78665550..cbc46e33f1 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java @@ -5,7 +5,6 @@ import com.epmet.common.token.constant.LoginConstant; import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.exception.EpmetErrorCode; -import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.ExceptionUtils; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.feign.ResultDataResolver; diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/GovWebServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/GovWebServiceImpl.java index d6edfb8657..eab142e6a5 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/GovWebServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/GovWebServiceImpl.java @@ -14,8 +14,6 @@ import com.epmet.commons.tools.security.password.PasswordUtils; import com.epmet.commons.tools.utils.CpUserDetailRedis; import com.epmet.commons.tools.utils.DateUtils; import com.epmet.commons.tools.utils.Result; -import com.epmet.dto.CustomerStaffDTO; -import com.epmet.dto.form.CustomerStaffFormDTO; import com.epmet.dto.form.GovWebLoginFormDTO; import com.epmet.dto.form.GovWebOperLoginFormDTO; import com.epmet.dto.result.GovWebOperLoginResultDTO; diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/IcLoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/IcLoginServiceImpl.java index 1e1767070e..ea0ae6d5fb 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/IcLoginServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/IcLoginServiceImpl.java @@ -29,7 +29,9 @@ import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; import javax.servlet.http.HttpServletRequest; -import java.util.*; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; @Service @Slf4j diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/PublicUserLoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/PublicUserLoginServiceImpl.java index 698118c5ce..d6e88bb66e 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/PublicUserLoginServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/PublicUserLoginServiceImpl.java @@ -16,7 +16,10 @@ import com.epmet.dto.PaCustomerDTO; import com.epmet.dto.PaUserDTO; import com.epmet.dto.PaUserWechatDTO; import com.epmet.dto.form.*; -import com.epmet.dto.result.*; +import com.epmet.dto.result.RegisterResultDTO; +import com.epmet.dto.result.SaveUserResultDTO; +import com.epmet.dto.result.SendVerificationCodeResultDTO; +import com.epmet.dto.result.UserTokenResultDTO; import com.epmet.feign.EpmetMessageOpenFeignClient; import com.epmet.jwt.JwtTokenProperties; import com.epmet.jwt.JwtTokenUtils; diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/ResourceServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/ResourceServiceImpl.java index 936d7dd2bb..27218b1bd7 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/ResourceServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/ResourceServiceImpl.java @@ -8,7 +8,6 @@ package com.epmet.service.impl; -import io.jsonwebtoken.Claims; import com.epmet.commons.tools.constant.Constant; import com.epmet.commons.tools.enums.SuperAdminEnum; import com.epmet.commons.tools.exception.ErrorCode; @@ -23,6 +22,7 @@ import com.epmet.feign.ResourceFeignClient; import com.epmet.feign.UserFeignClient; import com.epmet.jwt.JwtUtils; import com.epmet.service.ResourceService; +import io.jsonwebtoken.Claims; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/epmet-auth/src/test/java/com/epmet/TokenGenTest.java b/epmet-auth/src/test/java/com/epmet/TokenGenTest.java index 578e7a6652..9783e5a013 100644 --- a/epmet-auth/src/test/java/com/epmet/TokenGenTest.java +++ b/epmet-auth/src/test/java/com/epmet/TokenGenTest.java @@ -1,12 +1,9 @@ package com.epmet; -import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult; import com.epmet.common.token.constant.LoginConstant; import com.epmet.commons.tools.security.dto.GovTokenDto; import com.epmet.commons.tools.utils.CpUserDetailRedis; -import com.epmet.commons.tools.utils.DateUtils; import com.epmet.dto.CustomerAgencyDTO; -import com.epmet.dto.result.StaffLatestAgencyResultDTO; import com.epmet.jwt.JwtTokenProperties; import com.epmet.jwt.JwtTokenUtils; import com.epmet.service.impl.GovLoginServiceImpl; diff --git a/epmet-cloud-generator/src/main/resources/template/add-or-update.vue.vm b/epmet-cloud-generator/src/main/resources/template/add-or-update.vue.vm index 435224d75b..2b277f4442 100644 --- a/epmet-cloud-generator/src/main/resources/template/add-or-update.vue.vm +++ b/epmet-cloud-generator/src/main/resources/template/add-or-update.vue.vm @@ -17,8 +17,9 @@