From e269fa19ec16fbb52eef064985194b42a9310db7 Mon Sep 17 00:00:00 2001 From: bynt <13586541001@163.com> Date: Mon, 25 Mar 2024 14:30:13 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=95=B4=E5=90=88=E5=AE=8C?= =?UTF-8?q?=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/pom.xml | 19 +- .../baiye/easyexcel/dto/ClueListenerDto.java | 29 - .../easyexcel/listener/ClueListener.java | 104 -- .../easyexcel/listener/CustomListener.java | 70 -- .../baiye/event/system/UserEventListener.java | 74 -- .../baiye/job/DistributeRecordReportJob.java | 32 - .../com/baiye/job/JobApplicationRunner.java | 57 - .../main/java/com/baiye/job/LinkWatchJob.java | 35 - .../main/java/com/baiye/job/MyJobService.java | 13 - .../com/baiye/job/OceanEngineClueJob.java | 33 - .../modules/auth/AccessTokenRequest.java | 20 - .../modules/auth/AccessTokenResponse.java | 38 - .../modules/auth/AuthAdvertiserRequest.java | 18 - .../modules/auth/AuthAdvertiserResponse.java | 37 - .../com/baiye/modules/auth/BaseModel.java | 30 - .../modules/auth/OceanEngineResponse.java | 25 - .../modules/auth/RefreshTokenRequest.java | 20 - .../modules/auth/RefreshTokenResponse.java | 29 - .../baiye/modules/auth/SendClueResponse.java | 25 - .../distribute/controller/ClueController.java | 96 -- .../controller/ClueFileController.java | 63 - .../controller/ClueRecordController.java | 51 - .../controller/ClueStageController.java | 58 - .../controller/CustomController.java | 154 --- .../controller/DirectClueController.java | 44 - .../DistributeReportController.java | 38 - .../controller/DistributeTaskController.java | 77 -- .../controller/FileContrastController.java | 62 - .../FileContrastRecordController.java | 36 - .../controller/HomepageController.java | 63 - .../controller/LabelOrganizeController.java | 63 - .../controller/ModelCallbackController.java | 42 - .../controller/OceanEngineController.java | 75 -- .../controller/OutsideReqController.java | 37 - .../controller/PushClueController.java | 62 - .../controller/PushLinkController.java | 55 - .../controller/StoreController.java | 94 -- .../controller/StoreUserController.java | 31 - .../distribute/controller/TagController.java | 44 - .../controller/TripartiteController.java | 33 - .../distribute/converter/ClueConverter.java | 29 - .../distribute/converter/CustomConverter.java | 37 - .../converter/DirectClueConverter.java | 20 - .../converter/FileContrasRecordConverter.java | 26 - .../converter/FileContrastConverter.java | 26 - .../converter/OceanEngineConverter.java | 24 - .../converter/PushClueConverter.java | 20 - .../converter/PushLinkConverter.java | 28 - .../distribute/dto/CallbackCustomDTO.java | 40 - .../distribute/dto/ChangeCustomDTO.java | 33 - .../baiye/modules/distribute/dto/ClueDTO.java | 103 -- .../modules/distribute/dto/ClueStageDTO.java | 29 - .../modules/distribute/dto/ContrastDTO.java | 21 - .../distribute/dto/CreateCustomDTO.java | 37 - .../modules/distribute/dto/CustomDTO.java | 83 -- .../distribute/dto/CustomStoreDTO.java | 33 - .../modules/distribute/dto/DBPushClueDTO.java | 32 - .../modules/distribute/dto/DirectClueDTO.java | 22 - .../modules/distribute/dto/DistributeDTO.java | 27 - .../distribute/dto/DistributeResponseDTO.java | 20 - .../distribute/dto/DistributeTaskDTO.java | 68 -- .../distribute/dto/DistributeTaskUserDTO.java | 19 - .../distribute/dto/FileContrastDTO.java | 29 - .../modules/distribute/dto/HomePageDTO.java | 23 - .../dto/OceanEngineResponseDTO.java | 23 - .../distribute/dto/OceanEngineTokenDto.java | 35 - .../modules/distribute/dto/PushClueDTO.java | 46 - .../modules/distribute/dto/PushLinkDTO.java | 45 - .../modules/distribute/dto/ReadFileDTO.java | 24 - .../distribute/dto/ReceivePushLeadsDTO.java | 18 - .../modules/distribute/dto/StoreDTO.java | 41 - .../modules/distribute/dto/StoreUserDTO.java | 23 - .../modules/distribute/dto/TripartiteDTO.java | 27 - .../distribute/entity/ClueRecordEntity.java | 61 - .../distribute/entity/ClueStageEntity.java | 39 - .../distribute/entity/CustomEntity.java | 118 -- .../distribute/entity/CustomStoreEntity.java | 46 - .../distribute/entity/DirectClueEntity.java | 65 -- .../entity/DirectClueUserEntity.java | 34 - .../entity/DistributeReportChannelEntity.java | 70 -- .../entity/DistributeReportEntity.java | 62 - .../entity/DistributeReportUserEntity.java | 66 -- .../entity/DistributeTaskEntity.java | 62 - .../entity/DistributeTaskUserEntity.java | 37 - .../distribute/entity/FileContrastEntity.java | 43 - .../entity/FileContrastRecordEntity.java | 45 - .../entity/FileContrastSourceEntity.java | 40 - .../distribute/entity/LabelEntity.java | 33 - .../entity/LabelOrganizeEntity.java | 51 - .../entity/OceanEngineSourceEntity.java | 30 - .../distribute/entity/OceanEngineToken.java | 64 -- .../distribute/entity/PushClueInfoEntity.java | 49 - .../distribute/entity/PushConfigEntity.java | 37 - .../distribute/entity/PushLinkEntity.java | 56 - .../distribute/entity/StoreEntity.java | 86 -- .../distribute/entity/StoreUserEntity.java | 34 - .../modules/distribute/entity/TagEntity.java | 33 - .../entity/UserSecretKeyEntity.java | 33 - .../modules/distribute/mapper/ClueMapper.java | 96 -- .../distribute/mapper/ClueRecordMapper.java | 51 - .../distribute/mapper/ClueStageMapper.java | 8 - .../distribute/mapper/CustomMapper.java | 98 -- .../distribute/mapper/CustomStoreMapper.java | 18 - .../distribute/mapper/DirectClueMapper.java | 41 - .../mapper/DirectClueUserMapper.java | 7 - .../mapper/DistributeReportChannelMapper.java | 12 - .../mapper/DistributeReportMapper.java | 12 - .../mapper/DistributeReportUserMapper.java | 12 - .../mapper/DistributeTaskMapper.java | 45 - .../mapper/DistributeTaskUserMapper.java | 8 - .../distribute/mapper/FileContrastMapper.java | 34 - .../mapper/FileContrastRecordMapper.java | 39 - .../mapper/FileContrastSourceMapper.java | 8 - .../distribute/mapper/LabelMapper.java | 8 - .../mapper/LabelOrganizeMapper.java | 32 - .../mapper/OceanEngineSourceMapper.java | 13 - .../mapper/OceanEngineTokenMapper.java | 39 - .../distribute/mapper/PlushClueMapper.java | 34 - .../distribute/mapper/PlushConfigMapper.java | 13 - .../distribute/mapper/PushLinkMapper.java | 47 - .../distribute/mapper/StoreMapper.java | 55 - .../distribute/mapper/StoreUserMapper.java | 20 - .../modules/distribute/mapper/TagMapper.java | 24 - .../mapper/UserSecretKeyMapper.java | 8 - .../baiye/modules/distribute/qo/ClueQo.java | 42 - .../modules/distribute/qo/ClueRecordQo.java | 43 - .../baiye/modules/distribute/qo/CustomQo.java | 71 -- .../modules/distribute/qo/DirectClueQo.java | 39 - .../distribute/qo/DistributeTaskQo.java | 31 - .../modules/distribute/qo/FileContrastQo.java | 28 - .../modules/distribute/qo/HomePageQo.java | 46 - .../distribute/qo/LabelOrganizeQo.java | 29 - .../modules/distribute/qo/OceanEnginQo.java | 28 - .../modules/distribute/qo/PushLinkQo.java | 24 - .../modules/distribute/qo/SendClueQo.java | 26 - .../baiye/modules/distribute/qo/StoreQo.java | 50 - .../distribute/service/BuildModelService.java | 18 - .../distribute/service/ClueFileService.java | 25 - .../distribute/service/ClueRecordService.java | 41 - .../distribute/service/ClueService.java | 92 -- .../distribute/service/ClueStageService.java | 14 - .../distribute/service/CustomService.java | 97 -- .../service/CustomStoreService.java | 62 - .../distribute/service/DirectClueService.java | 35 - .../service/DistributeReportService.java | 24 - .../service/DistributeTaskService.java | 70 -- .../service/FileContrastRecordService.java | 27 - .../service/FileContrastService.java | 46 - .../service/FileContrastSourceService.java | 19 - .../distribute/service/HomepageService.java | 60 - .../service/LabelOrganizeService.java | 45 - .../service/OceanEngineClueService.java | 19 - .../service/OceanEngineService.java | 123 -- .../distribute/service/OutsideReqService.java | 15 - .../distribute/service/PushClueService.java | 35 - .../distribute/service/PushConfigService.java | 40 - .../distribute/service/PushLinkService.java | 47 - .../distribute/service/StoreService.java | 85 -- .../distribute/service/StoreUserService.java | 37 - .../distribute/service/TagService.java | 35 - .../distribute/service/TripartiteService.java | 19 - .../service/impl/BuildModelServiceImpl.java | 82 -- .../service/impl/ClueFileServiceImpl.java | 128 --- .../service/impl/ClueRecordServiceImpl.java | 66 -- .../service/impl/ClueServiceImpl.java | 275 ----- .../service/impl/ClueStageServiceImpl.java | 41 - .../service/impl/CustomServiceImpl.java | 391 ------- .../service/impl/CustomStoreServiceImpl.java | 88 -- .../service/impl/DirectClueServiceImpl.java | 147 --- .../impl/DistributeReportServiceImpl.java | 327 ------ .../impl/DistributeTaskServiceImpl.java | 494 -------- .../impl/FileContrastRecordServiceImpl.java | 38 - .../service/impl/FileContrastServiceImpl.java | 198 ---- .../impl/FileContrastSourceServiceImpl.java | 29 - .../service/impl/HomepageServiceImpl.java | 264 ----- .../impl/LabelOrganizeServiceImpl.java | 142 --- .../impl/OceanEngineClueServiceImpl.java | 258 ----- .../service/impl/OceanEngineServiceImpl.java | 229 ---- .../service/impl/OutsideReqServiceImpl.java | 92 -- .../service/impl/PushClueServiceImpl.java | 116 -- .../service/impl/PushConfigServiceImpl.java | 58 - .../service/impl/PushLinkServiceImpl.java | 126 -- .../service/impl/StoreServiceImpl.java | 224 ---- .../service/impl/StoreUserServiceImpl.java | 57 - .../service/impl/TagServiceImpl.java | 52 - .../service/impl/TripartiteServiceImpl.java | 138 --- .../modules/distribute/vo/AddressDTO.java | 30 - .../vo/ChannelAssignedClueExportVo.java | 21 - .../vo/ChannelEnterClueExportVO.java | 20 - .../modules/distribute/vo/ClueRecordVO.java | 61 - .../baiye/modules/distribute/vo/ClueVO.java | 116 -- .../modules/distribute/vo/CustomStoreVO.java | 34 - .../baiye/modules/distribute/vo/CustomVO.java | 92 -- .../modules/distribute/vo/DirectClueVO.java | 56 - .../distribute/vo/DistributeTaskVO.java | 63 - .../distribute/vo/FileContrastRecordVO.java | 34 - .../modules/distribute/vo/FileContrastVO.java | 30 - .../distribute/vo/LabelOrganizeVO.java | 36 - .../modules/distribute/vo/OceanEnginVO.java | 52 - .../modules/distribute/vo/PushClueInfoVo.java | 41 - .../modules/distribute/vo/PushLinkVO.java | 47 - .../modules/distribute/vo/ReportFlowVO.java | 26 - .../distribute/vo/StoreDetailsExportVO.java | 22 - .../baiye/modules/distribute/vo/StoreVO.java | 71 -- .../baiye/properties/OceanEngineConfig.java | 20 - .../com/baiye/properties/UrlsProperties.java | 19 - .../task/DistributeTaskSyncServiceImpl.java | 38 - .../java/com/baiye/task/FileContrastTask.java | 120 -- .../java/com/baiye/task/RefreshTokenTask.java | 70 -- .../com/baiye/task/SyncTaskServiceImpl.java | 57 - .../service/DistributeTaskSyncService.java | 12 - .../baiye/task/service/SyncTaskService.java | 9 - .../com/baiye/utils/AddressSplitterUtil.java | 51 - .../java/com/baiye/utils/AssignDataUtil.java | 114 -- .../com/baiye/utils/ClueFileTestingUtil.java | 87 -- .../com/baiye/utils/DateTimeToCronUtils.java | 259 ----- .../main/java/com/baiye/utils/SerialCode.java | 25 - admin/src/main/resources/application-dev.yml | 14 - admin/src/main/resources/application-prod.yml | 21 - admin/src/main/resources/application-test.yml | 20 +- admin/src/main/resources/application.yml | 12 +- .../src/main/resources/mapper/ClueMapper.xml | 116 -- .../resources/mapper/ClueRecordMapper.xml | 87 -- .../main/resources/mapper/CustomMapper.xml | 79 -- .../resources/mapper/CustomStoreMapper.xml | 29 - .../resources/mapper/DirectClueMapper.xml | 27 - .../resources/mapper/DistributeTaskMapper.xml | 33 - .../resources/mapper/FileContrastMapper.xml | 29 - .../resources/mapper/LabelOrganizeMapper.xml | 20 - .../main/resources/mapper/PushLinkMapper.xml | 23 - .../src/main/resources/mapper/StoreMapper.xml | 66 -- .../main/resources/mapper/StoreUserMapper.xml | 19 - admin/src/test/java/CustomTest.java | 74 -- admin/src/test/java/DirectClueTest.java | 47 - admin/src/test/java/OceanEngineTest.java | 62 - admin/src/test/java/PushMessageTest.java | 41 - admin/src/test/java/RefreshTokenTest.java | 35 - .../pom.xml | 16 +- .../baiye}/upms/UpmsAutoConfiguration.java | 26 +- .../config/mybatis/FillMetaObjectHandle.java | 8 +- .../config/mybatis/MybatisPlusConfig.java | 6 +- .../upms/config/task/MdcTaskDecorator.java | 2 +- .../task/TaskExecutionConfiguration.java | 2 +- .../com/baiye/upms/log/LogConfiguration.java | 78 ++ .../com/baiye}/upms/log/LoginLogHandler.java | 2 +- ...ingAuthorizationServerLoginLogHandler.java | 140 +++ .../main/resources/META-INF/spring.factories | 2 +- ...ot.autoconfigure.AutoConfiguration.imports | 1 + .../pom.xml | 19 +- .../AdminWebSocketAutoConfiguration.java | 20 +- ...emWebsocketEventListenerConfiguration.java | 6 +- .../UserAttributeHandshakeInterceptor.java | 8 +- .../component/UserSessionKeyGenerator.java | 6 +- .../constant/AdminWebSocketConstants.java | 2 +- .../NotifyWebsocketEventListener.java | 50 +- .../SystemWebsocketEventListener.java | 12 +- .../message/AnnouncementCloseMessage.java | 3 +- .../com/baiye}/message/DictChangeMessage.java | 3 +- ...ot.autoconfigure.AutoConfiguration.imports | 1 + .../admin/upms/log/LogConfiguration.java | 72 -- ...ingAuthorizationServerLoginLogHandler.java | 129 --- ...ot.autoconfigure.AutoConfiguration.imports | 1 - ...fyWebsocketEventListenerConfiguration.java | 26 - ...ot.autoconfigure.AutoConfiguration.imports | 1 - marketing-platform-admin/pom.xml | 4 +- marketing-platform-common/common-core/pom.xml | 6 +- .../common-desensitize/pom.xml | 2 +- .../common-idempotent/pom.xml | 6 +- marketing-platform-common/common-log/pom.xml | 4 +- .../common-model/pom.xml | 5 +- .../common-redis/pom.xml | 6 +- marketing-platform-common/common-util/pom.xml | 2 +- .../common-websocket/pom.xml | 2 +- marketing-platform-common/pom.xml | 2 +- .../pom.xml | 6 +- .../extend/mybatis/plus/alias/TableAlias.java | 0 .../mybatis/plus/alias/TableAliasHelper.java | 0 .../alias/TableAliasNotFoundException.java | 0 .../plus/conditions/query/ColumnFunction.java | 0 .../query/LambdaAliasQueryWrapperX.java | 0 .../conditions/query/LambdaQueryWrapperX.java | 0 .../converter/JsonStringArrayTypeHandler.java | 0 .../ListIntToListLongTypeHandler.java | 0 .../plus/injector/CustomSqlInjector.java | 0 .../mybatis/plus/mapper/ExtendMapper.java | 0 .../mybatis/plus/methods/BaseInsertBatch.java | 0 .../InsertBatchSomeColumnByCollection.java | 0 .../plus/methods/InsertIgnoreByBatch.java | 0 .../plus/methods/InsertOrUpdateByBatch.java | 0 .../methods/InsertOrUpdateFieldByBatch.java | 0 .../mybatis/plus/service/ExtendService.java | 0 .../plus/service/impl/ExtendServiceImpl.java | 0 .../extend/mybatis/plus/toolkit/PageUtil.java | 0 .../mybatis/plus/toolkit/WrappersX.java | 0 .../plus/type/EnumNameTypeHandler.java | 0 marketing-platform-extends/pom.xml | 3 +- .../distribute-notify-biz/pom.xml | 6 +- .../distribute-notify-controller/pom.xml | 6 +- .../distribute-notify-model/pom.xml | 2 +- marketing-platform-notify/pom.xml | 2 +- marketing-platform-security/pom.xml | 2 +- .../security-core/pom.xml | 2 +- .../pom.xml | 8 +- .../security-oauth2-core/pom.xml | 2 +- .../security-oauth2-resource-server/pom.xml | 8 +- .../pom.xml | 2 +- .../DefaultAnalysisEventProcessor.java | 0 .../excel/ExcelHandlerConfiguration.java | 0 .../excel/ResponseExcelAutoConfiguration.java | 0 .../common/excel/annotation/RequestExcel.java | 0 .../excel/annotation/ResponseExcel.java | 0 .../baiye/common/excel/annotation/Sheet.java | 0 .../common/excel/aop/DynamicNameAspect.java | 0 .../aop/RequestExcelArgumentResolver.java | 0 .../aop/ResponseExcelReturnValueHandler.java | 0 .../excel/config/ExcelConfigProperties.java | 0 .../converters/BooleanStringConverter.java | 0 .../excel/converters/ChannelConverter.java | 0 .../CustomStringStringConverter.java | 0 .../converters/LocalDateStringConverter.java | 0 .../converters/LocalDateTimeConverter.java | 0 .../LocalDateTimeStringConverter.java | 0 .../excel/converters/NidStringConverter.java | 0 .../common/excel/converters/SexConverter.java | 0 .../common/excel/domain/ErrorMessage.java | 0 .../excel/domain/SheetBuildProperties.java | 0 .../enhance/DefaultWriterBuilderEnhancer.java | 0 .../excel/enhance/WriterBuilderEnhancer.java | 0 .../handler/AbstractSheetWriteHandler.java | 0 .../handler/DefaultAnalysisEventListener.java | 0 .../handler/ListAnalysisEventListener.java | 0 .../excel/handler/ManySheetWriteHandler.java | 0 .../excel/handler/SheetWriteHandler.java | 0 .../handler/SingleSheetWriteHandler.java | 0 .../common/excel/head/EmptyHeadGenerator.java | 0 .../common/excel/head/HeadGenerator.java | 0 .../com/baiye/common/excel/head/HeadMeta.java | 0 .../head/I18nHeaderCellWriteHandler.java | 0 .../common/excel/kit/ExcelException.java | 0 .../baiye/common/excel/kit/Validators.java | 0 .../common/excel/processor/NameProcessor.java | 0 .../NameSpelExpressionProcessor.java | 0 .../main/resources/META-INF/spring.factories | 0 ...ot.autoconfigure.AutoConfiguration.imports | 0 .../ballcat/excel/application/DemoData.java | 0 .../ExcelExportTestController.java | 0 .../application/ExcelFillTestController.java | 0 .../ExcelImportTestController.java | 0 .../application/ExcelTestApplication.java | 0 .../test/resources/excel/fill-template.xlsx | Bin .../src/test/resources/excel/template.xlsx | Bin .../marketing-platform-starter-file/pom.xml | 4 +- .../marketing-platform-starter-job/pom.xml | 2 +- .../marketing-platform-starter-redis/pom.xml | 4 +- .../pom.xml | 2 +- .../marketing-platform-starter-web/pom.xml | 12 +- .../pom.xml | 6 +- marketing-platform-starters/pom.xml | 2 +- marketing-platform-system/pom.xml | 3 +- marketing-platform-system/system-biz/pom.xml | 14 +- .../system-controller/pom.xml | 6 +- .../system-model/pom.xml | 8 +- .../model/entity/SysUserRolePromise.java | 58 +- pom.xml | 1018 ++++++++--------- 364 files changed, 959 insertions(+), 14317 deletions(-) delete mode 100644 admin/src/main/java/com/baiye/easyexcel/dto/ClueListenerDto.java delete mode 100644 admin/src/main/java/com/baiye/easyexcel/listener/ClueListener.java delete mode 100644 admin/src/main/java/com/baiye/easyexcel/listener/CustomListener.java delete mode 100644 admin/src/main/java/com/baiye/event/system/UserEventListener.java delete mode 100644 admin/src/main/java/com/baiye/job/DistributeRecordReportJob.java delete mode 100644 admin/src/main/java/com/baiye/job/JobApplicationRunner.java delete mode 100644 admin/src/main/java/com/baiye/job/LinkWatchJob.java delete mode 100644 admin/src/main/java/com/baiye/job/MyJobService.java delete mode 100644 admin/src/main/java/com/baiye/job/OceanEngineClueJob.java delete mode 100644 admin/src/main/java/com/baiye/modules/auth/AccessTokenRequest.java delete mode 100644 admin/src/main/java/com/baiye/modules/auth/AccessTokenResponse.java delete mode 100644 admin/src/main/java/com/baiye/modules/auth/AuthAdvertiserRequest.java delete mode 100644 admin/src/main/java/com/baiye/modules/auth/AuthAdvertiserResponse.java delete mode 100644 admin/src/main/java/com/baiye/modules/auth/BaseModel.java delete mode 100644 admin/src/main/java/com/baiye/modules/auth/OceanEngineResponse.java delete mode 100644 admin/src/main/java/com/baiye/modules/auth/RefreshTokenRequest.java delete mode 100644 admin/src/main/java/com/baiye/modules/auth/RefreshTokenResponse.java delete mode 100644 admin/src/main/java/com/baiye/modules/auth/SendClueResponse.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/controller/ClueController.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/controller/ClueFileController.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/controller/ClueRecordController.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/controller/ClueStageController.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/controller/CustomController.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/controller/DirectClueController.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/controller/DistributeReportController.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/controller/DistributeTaskController.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/controller/FileContrastController.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/controller/FileContrastRecordController.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/controller/HomepageController.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/controller/LabelOrganizeController.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/controller/ModelCallbackController.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/controller/OceanEngineController.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/controller/OutsideReqController.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/controller/PushClueController.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/controller/PushLinkController.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/controller/StoreController.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/controller/StoreUserController.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/controller/TagController.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/controller/TripartiteController.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/converter/ClueConverter.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/converter/CustomConverter.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/converter/DirectClueConverter.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/converter/FileContrasRecordConverter.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/converter/FileContrastConverter.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/converter/OceanEngineConverter.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/converter/PushClueConverter.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/converter/PushLinkConverter.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/dto/CallbackCustomDTO.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/dto/ChangeCustomDTO.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/dto/ClueDTO.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/dto/ClueStageDTO.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/dto/ContrastDTO.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/dto/CreateCustomDTO.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/dto/CustomDTO.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/dto/CustomStoreDTO.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/dto/DBPushClueDTO.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/dto/DirectClueDTO.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/dto/DistributeDTO.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/dto/DistributeResponseDTO.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/dto/DistributeTaskDTO.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/dto/DistributeTaskUserDTO.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/dto/FileContrastDTO.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/dto/HomePageDTO.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/dto/OceanEngineResponseDTO.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/dto/OceanEngineTokenDto.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/dto/PushClueDTO.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/dto/PushLinkDTO.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/dto/ReadFileDTO.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/dto/ReceivePushLeadsDTO.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/dto/StoreDTO.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/dto/StoreUserDTO.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/dto/TripartiteDTO.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/entity/ClueRecordEntity.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/entity/ClueStageEntity.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/entity/CustomEntity.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/entity/CustomStoreEntity.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/entity/DirectClueEntity.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/entity/DirectClueUserEntity.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/entity/DistributeReportChannelEntity.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/entity/DistributeReportEntity.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/entity/DistributeReportUserEntity.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/entity/DistributeTaskEntity.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/entity/DistributeTaskUserEntity.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/entity/FileContrastEntity.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/entity/FileContrastRecordEntity.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/entity/FileContrastSourceEntity.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/entity/LabelEntity.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/entity/LabelOrganizeEntity.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/entity/OceanEngineSourceEntity.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/entity/OceanEngineToken.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/entity/PushClueInfoEntity.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/entity/PushConfigEntity.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/entity/PushLinkEntity.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/entity/StoreEntity.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/entity/StoreUserEntity.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/entity/TagEntity.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/entity/UserSecretKeyEntity.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/mapper/ClueMapper.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/mapper/ClueRecordMapper.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/mapper/ClueStageMapper.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/mapper/CustomMapper.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/mapper/CustomStoreMapper.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/mapper/DirectClueMapper.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/mapper/DirectClueUserMapper.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/mapper/DistributeReportChannelMapper.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/mapper/DistributeReportMapper.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/mapper/DistributeReportUserMapper.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/mapper/DistributeTaskMapper.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/mapper/DistributeTaskUserMapper.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/mapper/FileContrastMapper.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/mapper/FileContrastRecordMapper.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/mapper/FileContrastSourceMapper.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/mapper/LabelMapper.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/mapper/LabelOrganizeMapper.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/mapper/OceanEngineSourceMapper.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/mapper/OceanEngineTokenMapper.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/mapper/PlushClueMapper.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/mapper/PlushConfigMapper.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/mapper/PushLinkMapper.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/mapper/StoreMapper.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/mapper/StoreUserMapper.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/mapper/TagMapper.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/mapper/UserSecretKeyMapper.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/qo/ClueQo.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/qo/ClueRecordQo.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/qo/CustomQo.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/qo/DirectClueQo.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/qo/DistributeTaskQo.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/qo/FileContrastQo.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/qo/HomePageQo.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/qo/LabelOrganizeQo.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/qo/OceanEnginQo.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/qo/PushLinkQo.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/qo/SendClueQo.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/qo/StoreQo.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/service/BuildModelService.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/service/ClueFileService.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/service/ClueRecordService.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/service/ClueService.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/service/ClueStageService.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/service/CustomService.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/service/CustomStoreService.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/service/DirectClueService.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/service/DistributeReportService.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/service/DistributeTaskService.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/service/FileContrastRecordService.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/service/FileContrastService.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/service/FileContrastSourceService.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/service/HomepageService.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/service/LabelOrganizeService.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/service/OceanEngineClueService.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/service/OceanEngineService.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/service/OutsideReqService.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/service/PushClueService.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/service/PushConfigService.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/service/PushLinkService.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/service/StoreService.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/service/StoreUserService.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/service/TagService.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/service/TripartiteService.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/service/impl/BuildModelServiceImpl.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/service/impl/ClueFileServiceImpl.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/service/impl/ClueRecordServiceImpl.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/service/impl/ClueServiceImpl.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/service/impl/ClueStageServiceImpl.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/service/impl/CustomServiceImpl.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/service/impl/CustomStoreServiceImpl.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/service/impl/DirectClueServiceImpl.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/service/impl/DistributeReportServiceImpl.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/service/impl/DistributeTaskServiceImpl.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/service/impl/FileContrastRecordServiceImpl.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/service/impl/FileContrastServiceImpl.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/service/impl/FileContrastSourceServiceImpl.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/service/impl/HomepageServiceImpl.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/service/impl/LabelOrganizeServiceImpl.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/service/impl/OceanEngineClueServiceImpl.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/service/impl/OceanEngineServiceImpl.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/service/impl/OutsideReqServiceImpl.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/service/impl/PushClueServiceImpl.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/service/impl/PushConfigServiceImpl.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/service/impl/PushLinkServiceImpl.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/service/impl/StoreServiceImpl.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/service/impl/StoreUserServiceImpl.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/service/impl/TagServiceImpl.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/service/impl/TripartiteServiceImpl.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/vo/AddressDTO.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/vo/ChannelAssignedClueExportVo.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/vo/ChannelEnterClueExportVO.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/vo/ClueRecordVO.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/vo/ClueVO.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/vo/CustomStoreVO.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/vo/CustomVO.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/vo/DirectClueVO.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/vo/DistributeTaskVO.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/vo/FileContrastRecordVO.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/vo/FileContrastVO.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/vo/LabelOrganizeVO.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/vo/OceanEnginVO.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/vo/PushClueInfoVo.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/vo/PushLinkVO.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/vo/ReportFlowVO.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/vo/StoreDetailsExportVO.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/vo/StoreVO.java delete mode 100644 admin/src/main/java/com/baiye/properties/OceanEngineConfig.java delete mode 100644 admin/src/main/java/com/baiye/properties/UrlsProperties.java delete mode 100644 admin/src/main/java/com/baiye/task/DistributeTaskSyncServiceImpl.java delete mode 100644 admin/src/main/java/com/baiye/task/FileContrastTask.java delete mode 100644 admin/src/main/java/com/baiye/task/RefreshTokenTask.java delete mode 100644 admin/src/main/java/com/baiye/task/SyncTaskServiceImpl.java delete mode 100644 admin/src/main/java/com/baiye/task/service/DistributeTaskSyncService.java delete mode 100644 admin/src/main/java/com/baiye/task/service/SyncTaskService.java delete mode 100644 admin/src/main/java/com/baiye/utils/AddressSplitterUtil.java delete mode 100644 admin/src/main/java/com/baiye/utils/AssignDataUtil.java delete mode 100644 admin/src/main/java/com/baiye/utils/ClueFileTestingUtil.java delete mode 100644 admin/src/main/java/com/baiye/utils/DateTimeToCronUtils.java delete mode 100644 admin/src/main/java/com/baiye/utils/SerialCode.java delete mode 100644 admin/src/main/resources/mapper/ClueMapper.xml delete mode 100644 admin/src/main/resources/mapper/ClueRecordMapper.xml delete mode 100644 admin/src/main/resources/mapper/CustomMapper.xml delete mode 100644 admin/src/main/resources/mapper/CustomStoreMapper.xml delete mode 100644 admin/src/main/resources/mapper/DirectClueMapper.xml delete mode 100644 admin/src/main/resources/mapper/DistributeTaskMapper.xml delete mode 100644 admin/src/main/resources/mapper/FileContrastMapper.xml delete mode 100644 admin/src/main/resources/mapper/LabelOrganizeMapper.xml delete mode 100644 admin/src/main/resources/mapper/PushLinkMapper.xml delete mode 100644 admin/src/main/resources/mapper/StoreMapper.xml delete mode 100644 admin/src/main/resources/mapper/StoreUserMapper.xml delete mode 100644 admin/src/test/java/CustomTest.java delete mode 100644 admin/src/test/java/DirectClueTest.java delete mode 100644 admin/src/test/java/OceanEngineTest.java delete mode 100644 admin/src/test/java/PushMessageTest.java delete mode 100644 admin/src/test/java/RefreshTokenTest.java rename marketing-platform-admin/{marketing-platform-admin-core => admin-core}/pom.xml (80%) rename marketing-platform-admin/{marketing-platform-admin-core/src/main/java/com/hccake/ballcat/admin => admin-core/src/main/java/com/baiye}/upms/UpmsAutoConfiguration.java (80%) rename marketing-platform-admin/{marketing-platform-admin-core/src/main/java/com/hccake/ballcat/admin => admin-core/src/main/java/com/baiye}/upms/config/mybatis/FillMetaObjectHandle.java (81%) rename marketing-platform-admin/{marketing-platform-admin-core/src/main/java/com/hccake/ballcat/admin => admin-core/src/main/java/com/baiye}/upms/config/mybatis/MybatisPlusConfig.java (90%) rename marketing-platform-admin/{marketing-platform-admin-core/src/main/java/com/hccake/ballcat/admin => admin-core/src/main/java/com/baiye}/upms/config/task/MdcTaskDecorator.java (93%) rename marketing-platform-admin/{marketing-platform-admin-core/src/main/java/com/hccake/ballcat/admin => admin-core/src/main/java/com/baiye}/upms/config/task/TaskExecutionConfiguration.java (96%) create mode 100644 marketing-platform-admin/admin-core/src/main/java/com/baiye/upms/log/LogConfiguration.java rename marketing-platform-admin/{marketing-platform-admin-core/src/main/java/com/hccake/ballcat/admin => admin-core/src/main/java/com/baiye}/upms/log/LoginLogHandler.java (60%) create mode 100644 marketing-platform-admin/admin-core/src/main/java/com/baiye/upms/log/SpringAuthorizationServerLoginLogHandler.java rename marketing-platform-admin/{marketing-platform-admin-core => admin-core}/src/main/resources/META-INF/spring.factories (54%) create mode 100644 marketing-platform-admin/admin-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename marketing-platform-admin/{marketing-platform-admin-websocket => admin-websocket}/pom.xml (61%) rename marketing-platform-admin/{marketing-platform-admin-websocket/src/main/java/com/hccake/ballcat/admin/websocket => admin-websocket/src/main/java/com/baiye}/AdminWebSocketAutoConfiguration.java (63%) rename marketing-platform-admin/{marketing-platform-admin-websocket/src/main/java/com/hccake/ballcat/admin/websocket => admin-websocket/src/main/java/com/baiye}/SystemWebsocketEventListenerConfiguration.java (76%) rename marketing-platform-admin/{marketing-platform-admin-websocket/src/main/java/com/hccake/ballcat/admin/websocket => admin-websocket/src/main/java/com/baiye}/component/UserAttributeHandshakeInterceptor.java (90%) rename marketing-platform-admin/{marketing-platform-admin-websocket/src/main/java/com/hccake/ballcat/admin/websocket => admin-websocket/src/main/java/com/baiye}/component/UserSessionKeyGenerator.java (81%) rename marketing-platform-admin/{marketing-platform-admin-websocket/src/main/java/com/hccake/ballcat/admin/websocket => admin-websocket/src/main/java/com/baiye}/constant/AdminWebSocketConstants.java (88%) rename marketing-platform-admin/{marketing-platform-admin-websocket/src/main/java/com/hccake/ballcat/admin/websocket => admin-websocket/src/main/java/com/baiye}/listener/NotifyWebsocketEventListener.java (53%) rename marketing-platform-admin/{marketing-platform-admin-websocket/src/main/java/com/hccake/ballcat/admin/websocket => admin-websocket/src/main/java/com/baiye}/listener/SystemWebsocketEventListener.java (69%) rename marketing-platform-admin/{marketing-platform-admin-websocket/src/main/java/com/hccake/ballcat/admin/websocket => admin-websocket/src/main/java/com/baiye}/message/AnnouncementCloseMessage.java (70%) rename marketing-platform-admin/{marketing-platform-admin-websocket/src/main/java/com/hccake/ballcat/admin/websocket => admin-websocket/src/main/java/com/baiye}/message/DictChangeMessage.java (72%) create mode 100644 marketing-platform-admin/admin-websocket/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports delete mode 100644 marketing-platform-admin/marketing-platform-admin-core/src/main/java/com/hccake/ballcat/admin/upms/log/LogConfiguration.java delete mode 100644 marketing-platform-admin/marketing-platform-admin-core/src/main/java/com/hccake/ballcat/admin/upms/log/SpringAuthorizationServerLoginLogHandler.java delete mode 100644 marketing-platform-admin/marketing-platform-admin-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports delete mode 100644 marketing-platform-admin/marketing-platform-admin-websocket/src/main/java/com/hccake/ballcat/admin/websocket/NotifyWebsocketEventListenerConfiguration.java delete mode 100644 marketing-platform-admin/marketing-platform-admin-websocket/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename marketing-platform-extends/{market-platform-extend-mybatis-plus => marketing-platform-extend-mybatis-plus}/pom.xml (94%) rename marketing-platform-extends/{market-platform-extend-mybatis-plus => marketing-platform-extend-mybatis-plus}/src/main/java/com/baiye/extend/mybatis/plus/alias/TableAlias.java (100%) rename marketing-platform-extends/{market-platform-extend-mybatis-plus => marketing-platform-extend-mybatis-plus}/src/main/java/com/baiye/extend/mybatis/plus/alias/TableAliasHelper.java (100%) rename marketing-platform-extends/{market-platform-extend-mybatis-plus => marketing-platform-extend-mybatis-plus}/src/main/java/com/baiye/extend/mybatis/plus/alias/TableAliasNotFoundException.java (100%) rename marketing-platform-extends/{market-platform-extend-mybatis-plus => marketing-platform-extend-mybatis-plus}/src/main/java/com/baiye/extend/mybatis/plus/conditions/query/ColumnFunction.java (100%) rename marketing-platform-extends/{market-platform-extend-mybatis-plus => marketing-platform-extend-mybatis-plus}/src/main/java/com/baiye/extend/mybatis/plus/conditions/query/LambdaAliasQueryWrapperX.java (100%) rename marketing-platform-extends/{market-platform-extend-mybatis-plus => marketing-platform-extend-mybatis-plus}/src/main/java/com/baiye/extend/mybatis/plus/conditions/query/LambdaQueryWrapperX.java (100%) rename marketing-platform-extends/{market-platform-extend-mybatis-plus => marketing-platform-extend-mybatis-plus}/src/main/java/com/baiye/extend/mybatis/plus/converter/JsonStringArrayTypeHandler.java (100%) rename marketing-platform-extends/{market-platform-extend-mybatis-plus => marketing-platform-extend-mybatis-plus}/src/main/java/com/baiye/extend/mybatis/plus/converter/ListIntToListLongTypeHandler.java (100%) rename marketing-platform-extends/{market-platform-extend-mybatis-plus => marketing-platform-extend-mybatis-plus}/src/main/java/com/baiye/extend/mybatis/plus/injector/CustomSqlInjector.java (100%) rename marketing-platform-extends/{market-platform-extend-mybatis-plus => marketing-platform-extend-mybatis-plus}/src/main/java/com/baiye/extend/mybatis/plus/mapper/ExtendMapper.java (100%) rename marketing-platform-extends/{market-platform-extend-mybatis-plus => marketing-platform-extend-mybatis-plus}/src/main/java/com/baiye/extend/mybatis/plus/methods/BaseInsertBatch.java (100%) rename marketing-platform-extends/{market-platform-extend-mybatis-plus => marketing-platform-extend-mybatis-plus}/src/main/java/com/baiye/extend/mybatis/plus/methods/InsertBatchSomeColumnByCollection.java (100%) rename marketing-platform-extends/{market-platform-extend-mybatis-plus => marketing-platform-extend-mybatis-plus}/src/main/java/com/baiye/extend/mybatis/plus/methods/InsertIgnoreByBatch.java (100%) rename marketing-platform-extends/{market-platform-extend-mybatis-plus => marketing-platform-extend-mybatis-plus}/src/main/java/com/baiye/extend/mybatis/plus/methods/InsertOrUpdateByBatch.java (100%) rename marketing-platform-extends/{market-platform-extend-mybatis-plus => marketing-platform-extend-mybatis-plus}/src/main/java/com/baiye/extend/mybatis/plus/methods/InsertOrUpdateFieldByBatch.java (100%) rename marketing-platform-extends/{market-platform-extend-mybatis-plus => marketing-platform-extend-mybatis-plus}/src/main/java/com/baiye/extend/mybatis/plus/service/ExtendService.java (100%) rename marketing-platform-extends/{market-platform-extend-mybatis-plus => marketing-platform-extend-mybatis-plus}/src/main/java/com/baiye/extend/mybatis/plus/service/impl/ExtendServiceImpl.java (100%) rename marketing-platform-extends/{market-platform-extend-mybatis-plus => marketing-platform-extend-mybatis-plus}/src/main/java/com/baiye/extend/mybatis/plus/toolkit/PageUtil.java (100%) rename marketing-platform-extends/{market-platform-extend-mybatis-plus => marketing-platform-extend-mybatis-plus}/src/main/java/com/baiye/extend/mybatis/plus/toolkit/WrappersX.java (100%) rename marketing-platform-extends/{market-platform-extend-mybatis-plus => marketing-platform-extend-mybatis-plus}/src/main/java/com/baiye/extend/mybatis/plus/type/EnumNameTypeHandler.java (100%) rename marketing-platform-starters/{marketing-platfrom-starter-easyexcel => marketing-platform-starter-easyexcel}/pom.xml (98%) rename marketing-platform-starters/{marketing-platfrom-starter-easyexcel => marketing-platform-starter-easyexcel}/src/main/java/com/alibaba/excel/read/processor/DefaultAnalysisEventProcessor.java (100%) rename marketing-platform-starters/{marketing-platfrom-starter-easyexcel => marketing-platform-starter-easyexcel}/src/main/java/com/baiye/common/excel/ExcelHandlerConfiguration.java (100%) rename marketing-platform-starters/{marketing-platfrom-starter-easyexcel => marketing-platform-starter-easyexcel}/src/main/java/com/baiye/common/excel/ResponseExcelAutoConfiguration.java (100%) rename marketing-platform-starters/{marketing-platfrom-starter-easyexcel => marketing-platform-starter-easyexcel}/src/main/java/com/baiye/common/excel/annotation/RequestExcel.java (100%) rename marketing-platform-starters/{marketing-platfrom-starter-easyexcel => marketing-platform-starter-easyexcel}/src/main/java/com/baiye/common/excel/annotation/ResponseExcel.java (100%) rename marketing-platform-starters/{marketing-platfrom-starter-easyexcel => marketing-platform-starter-easyexcel}/src/main/java/com/baiye/common/excel/annotation/Sheet.java (100%) rename marketing-platform-starters/{marketing-platfrom-starter-easyexcel => marketing-platform-starter-easyexcel}/src/main/java/com/baiye/common/excel/aop/DynamicNameAspect.java (100%) rename marketing-platform-starters/{marketing-platfrom-starter-easyexcel => marketing-platform-starter-easyexcel}/src/main/java/com/baiye/common/excel/aop/RequestExcelArgumentResolver.java (100%) rename marketing-platform-starters/{marketing-platfrom-starter-easyexcel => marketing-platform-starter-easyexcel}/src/main/java/com/baiye/common/excel/aop/ResponseExcelReturnValueHandler.java (100%) rename marketing-platform-starters/{marketing-platfrom-starter-easyexcel => marketing-platform-starter-easyexcel}/src/main/java/com/baiye/common/excel/config/ExcelConfigProperties.java (100%) rename marketing-platform-starters/{marketing-platfrom-starter-easyexcel => marketing-platform-starter-easyexcel}/src/main/java/com/baiye/common/excel/converters/BooleanStringConverter.java (100%) rename marketing-platform-starters/{marketing-platfrom-starter-easyexcel => marketing-platform-starter-easyexcel}/src/main/java/com/baiye/common/excel/converters/ChannelConverter.java (100%) rename marketing-platform-starters/{marketing-platfrom-starter-easyexcel => marketing-platform-starter-easyexcel}/src/main/java/com/baiye/common/excel/converters/CustomStringStringConverter.java (100%) rename marketing-platform-starters/{marketing-platfrom-starter-easyexcel => marketing-platform-starter-easyexcel}/src/main/java/com/baiye/common/excel/converters/LocalDateStringConverter.java (100%) rename marketing-platform-starters/{marketing-platfrom-starter-easyexcel => marketing-platform-starter-easyexcel}/src/main/java/com/baiye/common/excel/converters/LocalDateTimeConverter.java (100%) rename marketing-platform-starters/{marketing-platfrom-starter-easyexcel => marketing-platform-starter-easyexcel}/src/main/java/com/baiye/common/excel/converters/LocalDateTimeStringConverter.java (100%) rename marketing-platform-starters/{marketing-platfrom-starter-easyexcel => marketing-platform-starter-easyexcel}/src/main/java/com/baiye/common/excel/converters/NidStringConverter.java (100%) rename marketing-platform-starters/{marketing-platfrom-starter-easyexcel => marketing-platform-starter-easyexcel}/src/main/java/com/baiye/common/excel/converters/SexConverter.java (100%) rename marketing-platform-starters/{marketing-platfrom-starter-easyexcel => marketing-platform-starter-easyexcel}/src/main/java/com/baiye/common/excel/domain/ErrorMessage.java (100%) rename marketing-platform-starters/{marketing-platfrom-starter-easyexcel => marketing-platform-starter-easyexcel}/src/main/java/com/baiye/common/excel/domain/SheetBuildProperties.java (100%) rename marketing-platform-starters/{marketing-platfrom-starter-easyexcel => marketing-platform-starter-easyexcel}/src/main/java/com/baiye/common/excel/enhance/DefaultWriterBuilderEnhancer.java (100%) rename marketing-platform-starters/{marketing-platfrom-starter-easyexcel => marketing-platform-starter-easyexcel}/src/main/java/com/baiye/common/excel/enhance/WriterBuilderEnhancer.java (100%) rename marketing-platform-starters/{marketing-platfrom-starter-easyexcel => marketing-platform-starter-easyexcel}/src/main/java/com/baiye/common/excel/handler/AbstractSheetWriteHandler.java (100%) rename marketing-platform-starters/{marketing-platfrom-starter-easyexcel => marketing-platform-starter-easyexcel}/src/main/java/com/baiye/common/excel/handler/DefaultAnalysisEventListener.java (100%) rename marketing-platform-starters/{marketing-platfrom-starter-easyexcel => marketing-platform-starter-easyexcel}/src/main/java/com/baiye/common/excel/handler/ListAnalysisEventListener.java (100%) rename marketing-platform-starters/{marketing-platfrom-starter-easyexcel => marketing-platform-starter-easyexcel}/src/main/java/com/baiye/common/excel/handler/ManySheetWriteHandler.java (100%) rename marketing-platform-starters/{marketing-platfrom-starter-easyexcel => marketing-platform-starter-easyexcel}/src/main/java/com/baiye/common/excel/handler/SheetWriteHandler.java (100%) rename marketing-platform-starters/{marketing-platfrom-starter-easyexcel => marketing-platform-starter-easyexcel}/src/main/java/com/baiye/common/excel/handler/SingleSheetWriteHandler.java (100%) rename marketing-platform-starters/{marketing-platfrom-starter-easyexcel => marketing-platform-starter-easyexcel}/src/main/java/com/baiye/common/excel/head/EmptyHeadGenerator.java (100%) rename marketing-platform-starters/{marketing-platfrom-starter-easyexcel => marketing-platform-starter-easyexcel}/src/main/java/com/baiye/common/excel/head/HeadGenerator.java (100%) rename marketing-platform-starters/{marketing-platfrom-starter-easyexcel => marketing-platform-starter-easyexcel}/src/main/java/com/baiye/common/excel/head/HeadMeta.java (100%) rename marketing-platform-starters/{marketing-platfrom-starter-easyexcel => marketing-platform-starter-easyexcel}/src/main/java/com/baiye/common/excel/head/I18nHeaderCellWriteHandler.java (100%) rename marketing-platform-starters/{marketing-platfrom-starter-easyexcel => marketing-platform-starter-easyexcel}/src/main/java/com/baiye/common/excel/kit/ExcelException.java (100%) rename marketing-platform-starters/{marketing-platfrom-starter-easyexcel => marketing-platform-starter-easyexcel}/src/main/java/com/baiye/common/excel/kit/Validators.java (100%) rename marketing-platform-starters/{marketing-platfrom-starter-easyexcel => marketing-platform-starter-easyexcel}/src/main/java/com/baiye/common/excel/processor/NameProcessor.java (100%) rename marketing-platform-starters/{marketing-platfrom-starter-easyexcel => marketing-platform-starter-easyexcel}/src/main/java/com/baiye/common/excel/processor/NameSpelExpressionProcessor.java (100%) rename marketing-platform-starters/{marketing-platfrom-starter-easyexcel => marketing-platform-starter-easyexcel}/src/main/resources/META-INF/spring.factories (100%) rename marketing-platform-starters/{marketing-platfrom-starter-easyexcel => marketing-platform-starter-easyexcel}/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports (100%) rename marketing-platform-starters/{marketing-platfrom-starter-easyexcel => marketing-platform-starter-easyexcel}/src/test/java/hccake/ballcat/excel/application/DemoData.java (100%) rename marketing-platform-starters/{marketing-platfrom-starter-easyexcel => marketing-platform-starter-easyexcel}/src/test/java/hccake/ballcat/excel/application/ExcelExportTestController.java (100%) rename marketing-platform-starters/{marketing-platfrom-starter-easyexcel => marketing-platform-starter-easyexcel}/src/test/java/hccake/ballcat/excel/application/ExcelFillTestController.java (100%) rename marketing-platform-starters/{marketing-platfrom-starter-easyexcel => marketing-platform-starter-easyexcel}/src/test/java/hccake/ballcat/excel/application/ExcelImportTestController.java (100%) rename marketing-platform-starters/{marketing-platfrom-starter-easyexcel => marketing-platform-starter-easyexcel}/src/test/java/hccake/ballcat/excel/application/ExcelTestApplication.java (100%) rename marketing-platform-starters/{marketing-platfrom-starter-easyexcel => marketing-platform-starter-easyexcel}/src/test/resources/excel/fill-template.xlsx (100%) rename marketing-platform-starters/{marketing-platfrom-starter-easyexcel => marketing-platform-starter-easyexcel}/src/test/resources/excel/template.xlsx (100%) diff --git a/admin/pom.xml b/admin/pom.xml index 498f36c..26734fc 100644 --- a/admin/pom.xml +++ b/admin/pom.xml @@ -5,7 +5,7 @@ marketing-platform com.baiye - 1.1.0 + ${revision} 4.0.0 @@ -20,19 +20,20 @@ com.baiye security-oauth2-authorization-server - 1.1.0 + ${revision} com.baiye - admin-websocket - 1.1.0 + marketing-platform-starter-websocket + ${revision} + com.baiye admin-core - 1.1.0 + ${revision} @@ -42,12 +43,12 @@ com.baiye marketing-platform-starter-job - 1.1.0 + ${revision} com.baiye common-redis - 1.1.0 + ${revision} @@ -62,6 +63,7 @@ + org.springdoc springdoc-openapi-ui @@ -70,6 +72,7 @@ org.springdoc springdoc-openapi-security + com.github.xiaoymin @@ -131,7 +134,7 @@ com.baiye marketing-platform-starter-easyexcel - 1.1.0 + ${revision} diff --git a/admin/src/main/java/com/baiye/easyexcel/dto/ClueListenerDto.java b/admin/src/main/java/com/baiye/easyexcel/dto/ClueListenerDto.java deleted file mode 100644 index ad04930..0000000 --- a/admin/src/main/java/com/baiye/easyexcel/dto/ClueListenerDto.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.baiye.easyexcel.dto; - -import com.alibaba.excel.annotation.ExcelIgnore; -import com.alibaba.excel.annotation.ExcelProperty; -import lombok.*; - -import java.util.Date; -import java.util.List; -import java.util.Map; - -@Getter -@Setter -@AllArgsConstructor -@NoArgsConstructor -public class ClueListenerDto { - - @ExcelProperty(value = "手机号") - private String nid; - - @ExcelProperty(value = "渠道来源") - private String originName; - - @ExcelProperty(value = "备注") - private String remark; - - @ExcelProperty(value = "日期(****/**/** 00:00:00)") - private Date clueTime; - -} diff --git a/admin/src/main/java/com/baiye/easyexcel/listener/ClueListener.java b/admin/src/main/java/com/baiye/easyexcel/listener/ClueListener.java deleted file mode 100644 index 877effb..0000000 --- a/admin/src/main/java/com/baiye/easyexcel/listener/ClueListener.java +++ /dev/null @@ -1,104 +0,0 @@ -package com.baiye.easyexcel.listener; - -import cn.hutool.core.collection.CollUtil; -import cn.hutool.json.JSONUtil; -import com.alibaba.excel.context.AnalysisContext; -import com.alibaba.excel.event.AnalysisEventListener; -import com.alibaba.excel.metadata.data.ReadCellData; -import com.baiye.constant.UploadTemplateHeadConstant; -import com.baiye.modules.distribute.entity.ClueEntity; -import com.baiye.modules.distribute.entity.ClueRecordEntity; -import com.baiye.modules.distribute.service.ClueService; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; - -import java.util.*; - -@Slf4j -public class ClueListener extends AnalysisEventListener> { - - public final List rows = new ArrayList<>(); - - public final LinkedList headInfo = new LinkedList<>(); - - /** - * 监听类不被spring管理，选择手动注入service - */ - private static ClueService clueService; - - private static ClueRecordEntity clueRecordEntity; - - public ClueListener(ClueService clueService, ClueRecordEntity clueRecordEntity) { - this.clueService = clueService; - this.clueRecordEntity = clueRecordEntity; - } - - /** - * 每条数据都会回调此函数，3000条处理一次 - */ - @Override - public void invoke(Map data, AnalysisContext context) { - ClueEntity clueEntity = new ClueEntity(); - Map map = new HashMap<>(); - // 动态解析excel列 - for (int i = 0; i < headInfo.size(); i++) { - String param = data.get(i); - switch (headInfo.get(i)) { - case UploadTemplateHeadConstant.HEAD_NID: - clueEntity.setNid(param); - break; - case UploadTemplateHeadConstant.HEAD_ORIGIN: - clueEntity.setOriginName(param); - break; - case UploadTemplateHeadConstant.HEAD_REMARK: - clueEntity.setRemark(param); - break; - case UploadTemplateHeadConstant.HEAD_DATE: - clueEntity.setClueTime(param); - break; - default: - if (StringUtils.isEmpty(param)) - param = ""; - map.put(headInfo.get(i), param); - } - } - clueEntity.setOtherClue(JSONUtil.toJsonStr(map)); - rows.add(clueEntity); - // 保存 - if (rows.size() >= 3000) { - saveData(); - rows.clear(); - } - } - - /** - * 读取文件完成回调函数，清空集合剩余数据 - */ - @Override - public void doAfterAllAnalysed(AnalysisContext analysisContext) { - if (CollUtil.isNotEmpty(rows)) - saveData(); - rows.clear(); - headInfo.clear(); - } - - /** - * 读取表头 - */ - @Override - public void invokeHead(Map> headMap, AnalysisContext context) { - headMap.values().forEach(vs -> headInfo.add(vs.getStringValue())); - } - - /** - * 插入数据库 - */ - private void saveData() { - for (ClueEntity row : rows) { - row.setClueRecordId(clueRecordEntity.getClueRecordId()); - row.setCreateBy(clueRecordEntity.getCreateBy()); - } - clueService.clueFileUploadSaveAll(rows); - } - -} diff --git a/admin/src/main/java/com/baiye/easyexcel/listener/CustomListener.java b/admin/src/main/java/com/baiye/easyexcel/listener/CustomListener.java deleted file mode 100644 index 2d32b69..0000000 --- a/admin/src/main/java/com/baiye/easyexcel/listener/CustomListener.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.baiye.easyexcel.listener; - -import com.alibaba.excel.context.AnalysisContext; -import com.alibaba.excel.event.AnalysisEventListener; -import com.alibaba.excel.metadata.data.ReadCellData; -import com.baiye.constant.UploadTemplateHeadConstant; -import com.baiye.modules.distribute.dto.CustomDTO; -import com.baiye.modules.distribute.dto.ReadFileDTO; -import com.baiye.modules.distribute.entity.ClueRecordEntity; -import com.baiye.modules.distribute.entity.CustomEntity; -import com.baiye.modules.distribute.service.CustomService; -import lombok.extern.slf4j.Slf4j; - -import java.util.*; - -@Slf4j -public class CustomListener extends AnalysisEventListener> { - - public final List rows = new ArrayList<>(); - - public final LinkedList headInfo = new LinkedList<>(); - - public Integer index = 0; - /** - * 监听类不被spring管理，选择手动注入service - */ - private static CustomService customService; - - private static ClueRecordEntity clueRecordEntity; - - private static ReadFileDTO readFileDTO; - - public CustomListener(CustomService customService, ClueRecordEntity clueRecordEntity, ReadFileDTO readFileDTO) { - this.customService = customService; - this.clueRecordEntity = clueRecordEntity; - this.readFileDTO = readFileDTO; - } - - @Override - public void invoke(Map data, AnalysisContext context) { - List userIdList = readFileDTO.getDistributorsUserIdList(); - CustomDTO customDTO = new CustomDTO(); - // 动态解析excel列 - for (int i = 0; i < headInfo.size(); i++) { - String str = headInfo.get(i); - String param = data.get(i); - if (str.equals(UploadTemplateHeadConstant.HEAD_NID)) customDTO.setCustomNid(param); - else if (str.equals(UploadTemplateHeadConstant.HEAD_REMARK)) customDTO.setRemark(param); - else return; - } - customDTO.setDistributorId(userIdList.get(index)); - customDTO.setCreateBy(clueRecordEntity.getCreateBy()); - customDTO.setChannelType(2); - customDTO.setChannelName(readFileDTO.getChannelName()); - customService.createByFileType(customDTO); - index = (index < userIdList.size() - 1) ? index + 1 : 0; - } - - @Override - public void doAfterAllAnalysed(AnalysisContext analysisContext) { - } - - /** - * 读取表头 - */ - @Override - public void invokeHead(Map> headMap, AnalysisContext context) { - headMap.values().forEach(vs -> headInfo.add(vs.getStringValue())); - } -} diff --git a/admin/src/main/java/com/baiye/event/system/UserEventListener.java b/admin/src/main/java/com/baiye/event/system/UserEventListener.java deleted file mode 100644 index 0659a48..0000000 --- a/admin/src/main/java/com/baiye/event/system/UserEventListener.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.baiye.event.system; - -import cn.hutool.core.collection.CollUtil; -import com.baiye.modules.distribute.entity.*; -import com.baiye.modules.distribute.mapper.ClueMapper; -import com.baiye.modules.distribute.mapper.ClueStageMapper; -import com.baiye.modules.distribute.mapper.LabelMapper; -import com.baiye.modules.distribute.mapper.LabelOrganizeMapper; -import com.baiye.modules.distribute.service.ClueRecordService; -import com.baiye.modules.distribute.service.DistributeTaskService; -import com.baiye.security.util.SecurityUtils; -import com.baiye.system.event.UserCreatedEvent; -import com.baiye.system.event.UserDelEvent; -import com.baiye.system.model.entity.SysUser; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.context.event.EventListener; -import org.springframework.stereotype.Component; - -import java.util.List; - -/** - * ApplicationEventPublisher使用 用户操作监听类 - */ -@Component -@Slf4j -@RequiredArgsConstructor -public class UserEventListener { - - private final ClueRecordService clueRecordService; - - private final DistributeTaskService distributeTaskService; - - private final LabelMapper labelMapper; - - private final LabelOrganizeMapper labelOrganizeMapper; - - private final ClueStageMapper clueStageMapper; - - private final ClueMapper clueMapper; - - @EventListener(UserCreatedEvent.class) - public void createUser(UserCreatedEvent userCreatedEvent) { - log.info("==========创建用户 监听方法执行=========="); - SysUser sysUser = userCreatedEvent.getSysUser(); - if (SecurityUtils.getCurrentUserId() == 1 && sysUser != null) { - // 创建默认的文件记录 - ClueRecordEntity entity = clueRecordService.addDefaultRecordService(sysUser.getUserId(), "资源推送", "资源推送"); - // 创建默认的执行任务 - distributeTaskService.addDefaultTask("资源推送", null, entity.getClueRecordId().toString(), sysUser.getUserId(), null); - } - } - - @EventListener(UserDelEvent.class) - public void delUser(UserDelEvent userDelEvent) { - log.info("==========删除用户 监听方法执行=========="); - List delUserIdList = userDelEvent.getUserIdList(); - if (CollUtil.isNotEmpty(delUserIdList)) { - //1、删除资源 - clueMapper.delete(new LambdaQueryWrapper().in(ClueEntity::getAssignedBy, delUserIdList)); - //2、删除用户的任务和上传记录 - BaseMapper taskMapper = distributeTaskService.getBaseMapper(); - taskMapper.delete(new LambdaQueryWrapper().eq(DistributeTaskEntity::getCreateBy, delUserIdList)); - BaseMapper clueRecordMapper = clueRecordService.getBaseMapper(); - clueRecordMapper.delete(new LambdaQueryWrapper().eq(ClueRecordEntity::getCreateBy, delUserIdList)); - //3、 删除用户标签和标签组 - 阶段信息 - labelMapper.delete(new LambdaQueryWrapper().eq(LabelEntity::getCreateBy, delUserIdList)); - labelOrganizeMapper.delete(new LambdaQueryWrapper().eq(LabelOrganizeEntity::getCreateBy, delUserIdList)); - clueStageMapper.delete(new LambdaQueryWrapper().eq(ClueStageEntity::getCreateBy, delUserIdList)); - } - } -} diff --git a/admin/src/main/java/com/baiye/job/DistributeRecordReportJob.java b/admin/src/main/java/com/baiye/job/DistributeRecordReportJob.java deleted file mode 100644 index 3ab73e1..0000000 --- a/admin/src/main/java/com/baiye/job/DistributeRecordReportJob.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.baiye.job; - -import cn.hutool.core.date.DateUtil; -import com.baiye.modules.distribute.service.DistributeReportService; -import com.dangdang.ddframe.job.api.ShardingContext; -import com.dangdang.ddframe.job.api.simple.SimpleJob; -import com.example.jobInstance.ElasticSimpleJob; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -import javax.annotation.Resource; - -/** - * @author wjt - * @date 2023/8/14 导入分配统计 0/5 * * * * ? - */ -@Component -@Slf4j -@ElasticSimpleJob(jobName = "DistributeRecordReportJob", cron = "0 30 23 * * ?") -public class DistributeRecordReportJob implements SimpleJob { - - @Resource - private DistributeReportService distributeReportService; - - @Override - public void execute(ShardingContext shardingContext) { - log.info("流量分布定时任务开始-----{}", DateUtil.date()); - distributeReportService.distributeReport(); - log.info("流量分布定时任务结束-----{}", DateUtil.date()); - } - -} diff --git a/admin/src/main/java/com/baiye/job/JobApplicationRunner.java b/admin/src/main/java/com/baiye/job/JobApplicationRunner.java deleted file mode 100644 index eec116c..0000000 --- a/admin/src/main/java/com/baiye/job/JobApplicationRunner.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.baiye.job; - -import cn.hutool.core.collection.CollUtil; -import com.baiye.constant.PrefixKeyConstant; -import com.baiye.modules.distribute.entity.DistributeTaskEntity; -import com.baiye.modules.distribute.mapper.DistributeTaskMapper; -import com.baiye.utils.DateTimeToCronUtils; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.example.entity.Job; -import lombok.extern.slf4j.Slf4j; -import org.springframework.boot.ApplicationArguments; -import org.springframework.boot.ApplicationRunner; -import org.springframework.stereotype.Component; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 项目启动后执行 把定时任务加入到zookeeper中 - */ -@Component -@Slf4j -public class JobApplicationRunner implements ApplicationRunner { - - @Resource - private DistributeTaskMapper distributeTaskMapper; - - @Resource - private MyJobService jobService; - - @Override - public void run(ApplicationArguments args) { - log.info("==============项目启动,自动添加业务中定时任务=============="); - List distributeTaskEntities = distributeTaskMapper.selectList( - new LambdaQueryWrapper().eq(DistributeTaskEntity::getDistributeTaskType, 1) - .eq(DistributeTaskEntity::getTimeStatus, 1) - .ne(DistributeTaskEntity::getExecuteStatus, 0)); - - if (CollUtil.isNotEmpty(distributeTaskEntities)) { - for (DistributeTaskEntity distributeTaskEntity : distributeTaskEntities) { - if (distributeTaskEntity != null && distributeTaskEntity.getStartTime() != null) { - Job job = new Job(); - job.setJobName(PrefixKeyConstant.JOB_KEY + distributeTaskEntity.getDistributeTaskId()); - String cron = DateTimeToCronUtils.getCron(distributeTaskEntity.getStartTime(), - DateTimeToCronUtils.EVERYDAY); - job.setCron(cron); - job.setJobClass("com.baiye.job.LinkWatchJob"); - jobService.addJob(job); - // 暂停 - if (distributeTaskEntity.getExecuteStatus() == 3) - jobService.pauseJob(job.getJobName()); - } - } - } - } - -} diff --git a/admin/src/main/java/com/baiye/job/LinkWatchJob.java b/admin/src/main/java/com/baiye/job/LinkWatchJob.java deleted file mode 100644 index 3fbf63b..0000000 --- a/admin/src/main/java/com/baiye/job/LinkWatchJob.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.baiye.job; - -import com.baiye.modules.distribute.entity.DistributeTaskEntity; -import com.baiye.modules.distribute.service.DistributeTaskService; -import com.dangdang.ddframe.job.api.ShardingContext; -import com.dangdang.ddframe.job.api.simple.SimpleJob; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -import javax.annotation.Resource; - -/** - * 定时任务执行 - */ -@Slf4j -@Component -public class LinkWatchJob implements SimpleJob { - - @Resource - private DistributeTaskService distributeTaskService; - - @Override - public void execute(ShardingContext shardingContext) { - log.info("==============定时任务开始，任务名称ID：{}================", shardingContext.getJobName()); - String jobName = shardingContext.getJobName(); - String str = jobName.substring(jobName.lastIndexOf("_") + 1); - log.info("==============定时任务开始，ID：{}================", str); - DistributeTaskEntity entity = distributeTaskService.getById(Long.parseLong(str)); - if (entity != null) { - distributeTaskService.execute(entity); - } - - } - -} diff --git a/admin/src/main/java/com/baiye/job/MyJobService.java b/admin/src/main/java/com/baiye/job/MyJobService.java deleted file mode 100644 index bdf3c53..0000000 --- a/admin/src/main/java/com/baiye/job/MyJobService.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.baiye.job; - -import com.example.serive.impl.JobServiceImpl; -import org.springframework.stereotype.Service; - -/** - * @Author YQY - * @Date 2023/8/17 - */ -@Service -public class MyJobService extends JobServiceImpl { - -} diff --git a/admin/src/main/java/com/baiye/job/OceanEngineClueJob.java b/admin/src/main/java/com/baiye/job/OceanEngineClueJob.java deleted file mode 100644 index c5046df..0000000 --- a/admin/src/main/java/com/baiye/job/OceanEngineClueJob.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.baiye.job; - -import cn.hutool.core.date.DateUtil; -import com.baiye.modules.distribute.service.OceanEngineClueService; -import com.dangdang.ddframe.job.api.ShardingContext; -import com.dangdang.ddframe.job.api.simple.SimpleJob; -import com.example.jobInstance.ElasticSimpleJob; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -import javax.annotation.Resource; -import java.util.Date; - -/** - * @author wjt - * @date 2023/11/3 - */ -@Component -@Slf4j -@ElasticSimpleJob(jobName = "OceanEngineClueJob", cron = "0 0/15 * * * ?") -public class OceanEngineClueJob implements SimpleJob { - - @Resource - private OceanEngineClueService oceanEngineClueService; - - @Override - public void execute(ShardingContext shardingContext) { - Date currentTime = DateUtil.date(); - Date startTime = DateUtil.beginOfMinute(DateUtil.offsetMinute(currentTime, -15)); - Date endTime = DateUtil.endOfMinute(DateUtil.offsetMinute(currentTime, -1)); - oceanEngineClueService.getFeiYuSource(startTime, endTime); - } -} diff --git a/admin/src/main/java/com/baiye/modules/auth/AccessTokenRequest.java b/admin/src/main/java/com/baiye/modules/auth/AccessTokenRequest.java deleted file mode 100644 index 0d7f2d5..0000000 --- a/admin/src/main/java/com/baiye/modules/auth/AccessTokenRequest.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.baiye.modules.auth; - - -import lombok.Getter; -import lombok.Setter; - -/** - * @author Enzo - */ -@Getter -@Setter -public class AccessTokenRequest extends BaseModel { - private String appId; - - private String secret; - - private String grantType; - - private String authCode; -} diff --git a/admin/src/main/java/com/baiye/modules/auth/AccessTokenResponse.java b/admin/src/main/java/com/baiye/modules/auth/AccessTokenResponse.java deleted file mode 100644 index 63290f5..0000000 --- a/admin/src/main/java/com/baiye/modules/auth/AccessTokenResponse.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.baiye.modules.auth; - - -import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.Getter; -import lombok.Setter; - -import java.util.List; - -/** - * @author Enzo - */ -@Getter -@Setter -public class AccessTokenResponse extends OceanEngineResponse { - - @lombok.Data - public static class Data { - - @JsonProperty("access_token") - private String accessToken; - - @JsonProperty("expires_in") - private Long expiresIn; - - @JsonProperty("refresh_token") - private String refreshToken; - - @JsonProperty("advertiser_id") - private Long advertiserId; - - @JsonProperty("advertiser_ids") - private List advertiserIds; - - @JsonProperty("refresh_token_expires_in") - private Long refreshTokenExpiresIn; - } -} diff --git a/admin/src/main/java/com/baiye/modules/auth/AuthAdvertiserRequest.java b/admin/src/main/java/com/baiye/modules/auth/AuthAdvertiserRequest.java deleted file mode 100644 index c1d949c..0000000 --- a/admin/src/main/java/com/baiye/modules/auth/AuthAdvertiserRequest.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.baiye.modules.auth; - -import lombok.Getter; -import lombok.Setter; - -/** - * @author Enzo - */ -@Getter -@Setter -public class AuthAdvertiserRequest extends BaseModel { - - private String accessToken; - - private String appId; - - private String secret; -} diff --git a/admin/src/main/java/com/baiye/modules/auth/AuthAdvertiserResponse.java b/admin/src/main/java/com/baiye/modules/auth/AuthAdvertiserResponse.java deleted file mode 100644 index a1dd0a4..0000000 --- a/admin/src/main/java/com/baiye/modules/auth/AuthAdvertiserResponse.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.baiye.modules.auth; - -import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.Getter; -import lombok.Setter; - -import java.util.List; - -/** - * @author Enzo - */ -@Getter -@Setter -public class AuthAdvertiserResponse extends OceanEngineResponse { - @lombok.Data - public static class Data { - List list; - } - - @lombok.Data - public static class AuthAdvertiserInfo { - @JsonProperty("advertiser_id") - private Long advertiserId; - - @JsonProperty("advertiserName") - private String advertiserName; - - @JsonProperty("account_role") - private String accountRole; - - @JsonProperty("advertiser_role") - private Integer advertiserRole; - - @JsonProperty("is_valid") - private Boolean isValid; - } -} diff --git a/admin/src/main/java/com/baiye/modules/auth/BaseModel.java b/admin/src/main/java/com/baiye/modules/auth/BaseModel.java deleted file mode 100644 index 9dd72ee..0000000 --- a/admin/src/main/java/com/baiye/modules/auth/BaseModel.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.baiye.modules.auth; - - -import com.google.gson.FieldNamingPolicy; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; - -/** - * @author Enzo - * @date 2022-9-14 - */ -public class BaseModel { - /** - * Returns a JSON string corresponding to object state - * - * @return JSON representation - */ - - public String toJson() { - GsonBuilder gsonBuilder = new GsonBuilder(); - gsonBuilder.setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES); - Gson gson = gsonBuilder.create(); - return gson.toJson(this); - } - - @Override - public String toString() { - return toJson(); - } -} diff --git a/admin/src/main/java/com/baiye/modules/auth/OceanEngineResponse.java b/admin/src/main/java/com/baiye/modules/auth/OceanEngineResponse.java deleted file mode 100644 index 6875daa..0000000 --- a/admin/src/main/java/com/baiye/modules/auth/OceanEngineResponse.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.baiye.modules.auth; - -import cn.hutool.core.text.CharSequenceUtil; -import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.Getter; -import lombok.Setter; - -/** - * @author Enzo - */ -@Getter -@Setter -public class OceanEngineResponse { - private T data; - - @JsonProperty("code") - private int code; - - @JsonProperty("message") - private String message; - - @JsonProperty("request_id") - private String requestId = CharSequenceUtil.EMPTY; - -} diff --git a/admin/src/main/java/com/baiye/modules/auth/RefreshTokenRequest.java b/admin/src/main/java/com/baiye/modules/auth/RefreshTokenRequest.java deleted file mode 100644 index 0969570..0000000 --- a/admin/src/main/java/com/baiye/modules/auth/RefreshTokenRequest.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.baiye.modules.auth; - -import lombok.Getter; -import lombok.Setter; - -/** - * @author Enzo - */ -@Getter -@Setter -public class RefreshTokenRequest extends BaseModel { - private String appId; - - private String secret; - - private String grantType; - - private String refreshToken; - -} diff --git a/admin/src/main/java/com/baiye/modules/auth/RefreshTokenResponse.java b/admin/src/main/java/com/baiye/modules/auth/RefreshTokenResponse.java deleted file mode 100644 index be5573a..0000000 --- a/admin/src/main/java/com/baiye/modules/auth/RefreshTokenResponse.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.baiye.modules.auth; - - -import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.Getter; -import lombok.Setter; - -/** - * @author Enzo - */ -@Getter -@Setter -public class RefreshTokenResponse extends OceanEngineResponse { - - @lombok.Data - public static class Data { - @JsonProperty("access_token") - private String accessToken; - - @JsonProperty("expires_in") - private Long expiresIn; - - @JsonProperty("refresh_token") - private String refreshToken; - - @JsonProperty("refresh_token_expires_in") - private Long refreshTokenExpiresIn; - } -} diff --git a/admin/src/main/java/com/baiye/modules/auth/SendClueResponse.java b/admin/src/main/java/com/baiye/modules/auth/SendClueResponse.java deleted file mode 100644 index da13370..0000000 --- a/admin/src/main/java/com/baiye/modules/auth/SendClueResponse.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.baiye.modules.auth; - -import com.fasterxml.jackson.annotation.JsonProperty; -import com.google.gson.annotations.SerializedName; -import lombok.Data; - -/** - * @author Enzo - * @date : 2024/3/4 - */ -@Data -public class SendClueResponse { - - @SerializedName("code") - @JsonProperty("code") - private int code; - - @SerializedName("is_exist") - @JsonProperty("is_exist") - private Boolean isExist; - - @SerializedName("message") - @JsonProperty("message") - private String message; -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/controller/ClueController.java b/admin/src/main/java/com/baiye/modules/distribute/controller/ClueController.java deleted file mode 100644 index d3a77fc..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/controller/ClueController.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.baiye.modules.distribute.controller; - -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.ObjectUtil; -import com.baiye.common.excel.annotation.ResponseExcel; -import com.baiye.constant.DefaultNumberConstants; -import com.baiye.domain.PageParam; -import com.baiye.domain.PageResult; -import com.baiye.modules.distribute.dto.ClueDTO; -import com.baiye.modules.distribute.entity.ClueEntity; -import com.baiye.modules.distribute.qo.ClueQo; -import com.baiye.modules.distribute.service.ClueService; -import com.baiye.modules.distribute.vo.ClueVO; -import com.baiye.notify.event.UserAnnouncementReadEvent; -import com.baiye.result.BaseResultCode; -import com.baiye.result.R; -import com.baiye.security.util.SecurityUtils; -import com.baiye.validation.group.UpdateGroup; -import com.google.common.collect.Lists; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.RequiredArgsConstructor; -import org.springframework.context.ApplicationContext; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -@RequiredArgsConstructor -@RestController -@Tag(name = "资源管理") -@RequestMapping("/clue") -public class ClueController { - - private final ClueService clueService; - - - private final ApplicationContext publisher; - - - @GetMapping("/page") - @Operation(summary = "分页查询资源") - public R> getClueRecordPage(@Validated PageParam pageParam, ClueQo qo) { - setQueryQo(qo); - return R.ok(clueService.queryPage(pageParam, qo)); - } - - @PostMapping("/update") - @Operation(summary = "修改资源详细信息", description = "修改资源详细信息") - public R update(@Validated({UpdateGroup.class}) @RequestBody ClueDTO clueEntity) { - publisher.publishEvent(new UserAnnouncementReadEvent(clueEntity.getClueId(), SecurityUtils.getCurrentUserId())); - return clueService.update(clueEntity) ? R.ok() : R.failed(BaseResultCode.UPDATE_DATABASE_ERROR, "修改失败"); - } - - @PostMapping("/updateClue") - @Operation(summary = "修改资源", description = "修改资源") - public R updateClue(@Validated({UpdateGroup.class}) @RequestBody ClueEntity clueEntity) { - clueEntity.setIsNewClue(Boolean.FALSE); - publisher.publishEvent(new UserAnnouncementReadEvent(clueEntity.getClueId(), SecurityUtils.getCurrentUserId())); - return clueService.updateById(clueEntity) ? R.ok() : R.failed(BaseResultCode.UPDATE_DATABASE_ERROR, "修改失败"); - } - - @GetMapping("/details/{id}") - @Operation(summary = "ID查询详情") - public R getClueDetails(@PathVariable("id") Long clueId, ClueQo qo) { - return R.ok(clueService.details(clueId, qo)); - } - - @Operation(summary = "修改是否有效") - @GetMapping("/changeIsEffective") - public R update(Long id, Integer effective) { - clueService.changeEffective(id, effective); - return R.ok(); - } - - @ResponseExcel(name = "线索表单") - @GetMapping("/export") - public List exportClueData(ClueQo qo) { - setQueryQo(qo); - List list = clueService.queryList(qo); - return CollUtil.isEmpty(list) ? Lists.newArrayList(new ClueVO()) : list; - } - - private void setQueryQo(ClueQo qo) { - if (ObjectUtil.isNotNull(qo.getSalesmanType())) { - if (qo.getSalesmanType() == DefaultNumberConstants.FOUR_NUMBER) { - qo.setAssignedBy(SecurityUtils.getCurrentUserId()); - } - if (qo.getSalesmanType() == DefaultNumberConstants.ZERO_NUMBER) { - qo.setCompanyId(SecurityUtils.getCurrentUserId()); - } - } - } - - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/controller/ClueFileController.java b/admin/src/main/java/com/baiye/modules/distribute/controller/ClueFileController.java deleted file mode 100644 index 2b6c828..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/controller/ClueFileController.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.baiye.modules.distribute.controller; - -import com.alibaba.excel.EasyExcel; -import com.baiye.exception.BadRequestException; -import com.baiye.modules.distribute.dto.ReadFileDTO; -import com.baiye.modules.distribute.service.ClueFileService; -import com.baiye.result.R; -import com.baiye.validation.group.CreateGroup; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.RequiredArgsConstructor; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; - -import javax.servlet.http.HttpServletResponse; -import java.io.*; -import java.net.URLEncoder; -import java.util.ArrayList; -import java.util.Map; - -@RequiredArgsConstructor -@RestController -@Tag(name = "资源文件管理") -@RequestMapping("/clueFile") -public class ClueFileController { - - private final ClueFileService clueFileService; - - @PostMapping("/detection") - @Operation(summary = "校验表头信息") - public R> detection(@RequestParam("file") MultipartFile file) { - return R.ok(clueFileService.detection(file)); - } - - @PostMapping("/readFile") - @Operation(summary = "读取文件信息") - public R readFile(@Validated({CreateGroup.class}) @RequestBody ReadFileDTO readFileDTO) { - clueFileService.readFile(readFileDTO); - return R.ok(); - } - - @GetMapping("/export") - @Operation(summary = "导出模板") - public void exportExcelTemplate(HttpServletResponse response) { - try (InputStream inputStream = getClass().getResourceAsStream("/file/template.xlsx")) { - String fileName = URLEncoder.encode("template.xlsx", "UTF-8"); - response.setContentType("application/vnd.ms-excel"); - response.setCharacterEncoding("utf-8"); - response.setHeader("Content-disposition", "attachment;filename=" + fileName); - EasyExcel.write(response.getOutputStream()).withTemplate(inputStream).sheet().doWrite(new ArrayList<>()); - }catch (IOException e) { - throw new BadRequestException("导出失败,请联系管理员"); - } - } - - @GetMapping("/generate") - @Operation(summary = "生成秘钥") - public R> generateSecretKey() { - return R.ok(clueFileService.generateSecretKey()); - } - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/controller/ClueRecordController.java b/admin/src/main/java/com/baiye/modules/distribute/controller/ClueRecordController.java deleted file mode 100644 index 8c0a07a..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/controller/ClueRecordController.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.baiye.modules.distribute.controller; - -import com.baiye.domain.SelectData; -import com.baiye.modules.distribute.service.ClueRecordService; -import com.baiye.modules.distribute.vo.ClueRecordVO; -import com.baiye.modules.distribute.qo.ClueRecordQo; -import com.baiye.domain.PageParam; -import com.baiye.domain.PageResult; -import com.baiye.result.BaseResultCode; -import com.baiye.result.R; -import com.baiye.security.util.SecurityUtils; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.RequiredArgsConstructor; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -@RequiredArgsConstructor -@RestController -@Tag(name = "文件上传记录API") -@RequestMapping("/clueRecord") -public class ClueRecordController { - - private final ClueRecordService clueRecordService; - - @GetMapping("/page") - @Operation(summary = "分页查询导入记录") - public R> getClueRecordPage(@Validated PageParam pageParam, ClueRecordQo qo) { - return R.ok(clueRecordService.queryPage(pageParam, qo)); - } - - @DeleteMapping("/{id}") - @Operation(summary = "ID删除记录并删除本地文件") - public R deleteByUserId(@PathVariable("id") Long clueRecordId) { - return clueRecordService.deleteByUserId(clueRecordId) ? R.ok() - : R.failed(BaseResultCode.UPDATE_DATABASE_ERROR, "删除文件失败"); - } - - @GetMapping("/select") - @Operation(summary = "下拉列表数据") - public R>> listSelectData(ClueRecordQo qo) { - qo.setCreateBy(SecurityUtils.getCurrentUserId()); - qo.setAllocationStatus(0); - qo.setDistributeStatus(0); - qo.setRecordType(0); - return R.ok(clueRecordService.listSelectData(qo)); - } - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/controller/ClueStageController.java b/admin/src/main/java/com/baiye/modules/distribute/controller/ClueStageController.java deleted file mode 100644 index 8f81904..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/controller/ClueStageController.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.baiye.modules.distribute.controller; - -import com.baiye.modules.distribute.entity.ClueStageEntity; -import com.baiye.modules.distribute.service.ClueStageService; -import com.baiye.result.BaseResultCode; -import com.baiye.result.R; -import com.baiye.validation.group.CreateGroup; -import com.baiye.validation.group.UpdateGroup; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.RequiredArgsConstructor; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import javax.validation.Valid; -import java.util.List; - -@RequiredArgsConstructor -@RestController -@Tag(name = "资源阶段API") -@RequestMapping("/clueStage") -public class ClueStageController { - - private final ClueStageService clueStageService; - - @GetMapping("/list") - @Operation(summary = "列表") - public R list() { - return R.ok(clueStageService.listData()); - } - - @PostMapping("/add") - @Operation(summary = "新增线索阶段", description = "新增线索阶段") - public R save(@Validated({ CreateGroup.class }) @RequestBody ClueStageEntity clueStageEntity) { - return clueStageService.save(clueStageEntity) ? R.ok() : R.failed(BaseResultCode.UPDATE_DATABASE_ERROR, "添加失败"); - } - - @PostMapping("/addList") - @Operation(summary = "批量新增线索阶段", description = "批量新增线索阶段") - public R addList(@Valid @RequestBody List clueStageEntity) { - return clueStageService.saveBatch(clueStageEntity) ? R.ok() - : R.failed(BaseResultCode.UPDATE_DATABASE_ERROR, "添加失败"); - } - - @PostMapping("/update") - @Operation(summary = "修改线索阶段", description = "修改线索阶段") - public R update(@Validated({ UpdateGroup.class }) @RequestBody ClueStageEntity clueStageEntity) { - return clueStageService.updateById(clueStageEntity) ? R.ok() - : R.failed(BaseResultCode.UPDATE_DATABASE_ERROR, "修改失败"); - } - - @DeleteMapping("/{id}") - @Operation(summary = "ID删除线索阶段") - public R deleteByUserId(@PathVariable("id") Long id) { - return clueStageService.removeById(id) ? R.ok() : R.failed(BaseResultCode.UPDATE_DATABASE_ERROR, "删除失败"); - } - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/controller/CustomController.java b/admin/src/main/java/com/baiye/modules/distribute/controller/CustomController.java deleted file mode 100644 index 704f106..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/controller/CustomController.java +++ /dev/null @@ -1,154 +0,0 @@ -package com.baiye.modules.distribute.controller; - -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.ObjectUtil; -import com.baiye.common.excel.annotation.ResponseExcel; -import com.baiye.constant.DefaultNumberConstants; -import com.baiye.domain.PageParam; -import com.baiye.domain.PageResult; -import com.baiye.modules.distribute.converter.CustomConverter; -import com.baiye.modules.distribute.dto.ChangeCustomDTO; -import com.baiye.modules.distribute.dto.CreateCustomDTO; -import com.baiye.modules.distribute.dto.CustomDTO; -import com.baiye.modules.distribute.entity.CustomEntity; -import com.baiye.modules.distribute.qo.CustomQo; -import com.baiye.modules.distribute.service.CustomService; -import com.baiye.modules.distribute.vo.CustomVO; -import com.baiye.operation.annotation.DeleteOperationLogging; -import com.baiye.result.BaseResultCode; -import com.baiye.result.R; -import com.baiye.security.util.SecurityUtils; -import com.baiye.system.checker.AdminUserChecker; -import com.baiye.system.service.SysUserService; -import com.baiye.validation.group.CreateGroup; -import com.baiye.validation.group.SubmitGroup; -import com.baiye.validation.group.UpdateGroup; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.RequiredArgsConstructor; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import java.util.ArrayList; -import java.util.List; -import java.util.stream.Collectors; - -@RequiredArgsConstructor -@RestController -@Tag(name = "客户管理") -@RequestMapping("/custom") -public class CustomController { - - private final CustomService customService; - - private final SysUserService sysUserService; - - private final AdminUserChecker adminUserChecker; - - @GetMapping("/page") - @Operation(summary = "分页查询客户信息") - public R> queryPage(@Validated PageParam pageParam, CustomQo qo) { - setQueryQo(qo); - return R.ok(customService.queryPage(pageParam, qo)); - } - - @PostMapping("/add") - @Operation(summary = "新增客户", description = "新增客户") - public R save(@Validated({CreateGroup.class}) @RequestBody CustomDTO customDTO) { - return customService.add(customDTO) ? R.ok() : R.failed(BaseResultCode.UPDATE_DATABASE_ERROR, "添加失败"); - } - - - @PostMapping("/manual/create") - @Operation(summary = "手动创建线索", description = "新增客户") - public R manualCreate(@Validated({CreateGroup.class}) @RequestBody CreateCustomDTO createCustomDTO) { - - return Boolean.TRUE.equals(customService.createByType(createCustomDTO)) ? R.ok() : R.failed(BaseResultCode.UPDATE_DATABASE_ERROR, "添加失败"); - } - - @PostMapping("/update") - @Operation(summary = "修改客户", description = "修改客户") - public R update(@Validated({UpdateGroup.class}) @RequestBody CustomDTO customDTO) { - return customService.update(customDTO) ? R.ok() : R.failed(BaseResultCode.UPDATE_DATABASE_ERROR, "修改失败"); - } - - @GetMapping("/details") - @Operation(summary = "ID查询详情") - public R getClueDetails(@RequestParam("id") Long id) { - return R.ok(customService.details(id)); - } - - @DeleteMapping("/{id}") - @DeleteOperationLogging(msg = "删除表单信息") - @Operation(summary = "通过id删除系统角色", description = "通过id删除系统角色") - public R removeById(@PathVariable("id") Long id) { - Boolean result = customService.deleteApprovalFormById(id); - return Boolean.TRUE.equals(result) ? R.ok() : R.failed(BaseResultCode.UPDATE_DATABASE_ERROR, "删除表单失败"); - } - - @PostMapping("/audit") - @Operation(summary = "审核表单") - public R audit(@Validated({SubmitGroup.class}) @RequestBody ChangeCustomDTO dto) { - Boolean result = customService.auditFormById(dto); - return Boolean.TRUE.equals(result) ? R.ok() : R.failed(BaseResultCode.UPDATE_DATABASE_ERROR, "审核失败"); - } - - @ResponseExcel(name = "客户表单") - @GetMapping("/export") - public List exportI18nData(CustomQo customQo) { - setQueryQo(customQo); - List list = customService.queryList(customQo); - if (CollUtil.isEmpty(list)) { - return new ArrayList<>(); - } - // 转换为 excel vo 对象 - return list.stream().map(CustomConverter.INSTANCE::poToExcelVo).collect(Collectors.toList()); - } - - - @PostMapping("/reAudit") - @Operation(summary = "表单重审") - public R reAudit(@Validated({UpdateGroup.class}) @RequestBody ChangeCustomDTO dto) { - Boolean result = customService.reAuditFormById(dto); - return Boolean.TRUE.equals(result) ? R.ok() : R.failed(BaseResultCode.UPDATE_DATABASE_ERROR, "审核失败"); - } - - - - - private void setQueryQo(CustomQo customQo) { - Integer salesmanType = customQo.getSalesmanType(); - // 查询属于自己的信息 - if (!adminUserChecker.isAdminUser(sysUserService.findById - (SecurityUtils.getCurrentUserId()))) { - customQo.setCompanyId(SecurityUtils.getWhichUserId()); - } - if (ObjectUtil.isNotNull(salesmanType)) { - if (salesmanType == DefaultNumberConstants.ONE_NUMBER) { - // 查询当前用户自己的 - customQo.setCreateBy(SecurityUtils.getCurrentUserId()); - } - if (salesmanType == DefaultNumberConstants.TWO_NUMBER) { - // 查询分发员 - customQo.setDistributorId(SecurityUtils.getCurrentUserId()); - customQo.setType(2); - } - if (salesmanType == DefaultNumberConstants.THREE_NUMBER) { - // 只查询复审员 - customQo.setReviewUserId(SecurityUtils.getCurrentUserId()); - customQo.setType(3); - } - } - } - - - - @GetMapping("/recallForm") - @Operation(summary = "表单撤回") - public R recallForm(Long id) { - Boolean result = customService.recallFormById(id); - return Boolean.TRUE.equals(result) ? R.ok() : R.failed(BaseResultCode.LOGIC_CHECK_ERROR, "表单撤回失败"); - } - - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/controller/DirectClueController.java b/admin/src/main/java/com/baiye/modules/distribute/controller/DirectClueController.java deleted file mode 100644 index f945199..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/controller/DirectClueController.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.baiye.modules.distribute.controller; - -import com.baiye.domain.PageParam; -import com.baiye.domain.PageResult; -import com.baiye.modules.distribute.entity.DirectClueUserEntity; -import com.baiye.modules.distribute.qo.DirectClueQo; -import com.baiye.modules.distribute.service.DirectClueService; -import com.baiye.modules.distribute.vo.DirectClueVO; -import com.baiye.result.R; -import com.baiye.security.util.SecurityUtils; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.RequiredArgsConstructor; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import javax.validation.Valid; -import java.util.List; - -@RequiredArgsConstructor -@RestController -@Tag(name = "直达线索") -@RequestMapping("/directClue") -public class DirectClueController { - - private final DirectClueService directClueService; - - @GetMapping("/page") - @Operation(summary = "分页查询资源") - public R> getClueRecordPage(@Validated PageParam pageParam, DirectClueQo qo) { - Long salesmanUserId = qo.getSalesmanUserId(); - Long distributeUserId = qo.getDistributeUserId(); - if (salesmanUserId == null && distributeUserId == null) qo.setCreateBy(SecurityUtils.getCurrentUserId()); - else qo.setCreateBy(SecurityUtils.getWhichUserId()); - - return R.ok(directClueService.queryPage(pageParam, qo)); - } - - @PostMapping("/distribute") - @Operation(summary = "分发员分发") - public R distribute(@Valid @RequestBody List directClueUserList) { - return R.ok(directClueService.distribute(directClueUserList)); - } -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/controller/DistributeReportController.java b/admin/src/main/java/com/baiye/modules/distribute/controller/DistributeReportController.java deleted file mode 100644 index 3884750..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/controller/DistributeReportController.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.baiye.modules.distribute.controller; - -import com.baiye.modules.distribute.service.DistributeReportService; -import com.baiye.result.R; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -/** - * @author wjt - * @date 2023/8/11 - */ -@RequiredArgsConstructor -@RestController -@Tag(name = "分配信息统计") -@RequestMapping("/report") -public class DistributeReportController { - - private final DistributeReportService distributeReportService; - - @GetMapping("/report") - public void distributeReport() { - distributeReportService.distributeReport(); - } - - @GetMapping("/flow") - @Operation(summary = "流量分布统计") - public R reportFlow(@RequestParam(value = "userId", required = false) Long userId, - @RequestParam(value = "channel", required = false) String channel, - @RequestParam(value = "type", required = true) Integer type) { - return R.ok(distributeReportService.reportFlow(userId, channel, type)); - } - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/controller/DistributeTaskController.java b/admin/src/main/java/com/baiye/modules/distribute/controller/DistributeTaskController.java deleted file mode 100644 index 25ef329..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/controller/DistributeTaskController.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.baiye.modules.distribute.controller; - -import com.baiye.domain.PageParam; -import com.baiye.domain.PageResult; -import com.baiye.modules.distribute.dto.DistributeTaskDTO; -import com.baiye.modules.distribute.entity.DistributeTaskEntity; -import com.baiye.modules.distribute.qo.DistributeTaskQo; -import com.baiye.modules.distribute.service.DistributeTaskService; -import com.baiye.modules.distribute.vo.DistributeTaskVO; -import com.baiye.result.BaseResultCode; -import com.baiye.result.R; -import com.baiye.security.util.SecurityUtils; -import com.baiye.validation.group.CreateGroup; -import com.baiye.validation.group.UpdateGroup; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.RequiredArgsConstructor; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -@RequiredArgsConstructor -@RestController -@Tag(name = "分发任务管理") -@RequestMapping("/distributeTask") -public class DistributeTaskController { - - private final DistributeTaskService distributeTaskService; - - @PostMapping("/add") - @Operation(summary = "新增分发任务", description = "新增分发任务") - public R save(@Validated({ CreateGroup.class }) @RequestBody DistributeTaskDTO distributeTaskDTO) { - return distributeTaskService.add(distributeTaskDTO) ? R.ok() - : R.failed(BaseResultCode.UPDATE_DATABASE_ERROR, "添加失败"); - } - - @GetMapping("/page") - @Operation(summary = "分页查询分配任务") - public R> getClueRecordPage(@Validated PageParam pageParam, DistributeTaskQo qo) { - qo.setCreateBy(SecurityUtils.getCurrentUserId()); - return R.ok(distributeTaskService.queryPage(pageParam, qo)); - } - - @GetMapping("/details") - @Operation(summary = "ID查询详情") - public R getClueRecordPage(@RequestParam("id") Long id) { - return R.ok(distributeTaskService.details(id)); - } - - @PostMapping("/update") - @Operation(summary = "修改分发任务", description = "修改分发任务") - public R update(@Validated({ UpdateGroup.class }) @RequestBody DistributeTaskDTO distributeTaskDTO) { - return distributeTaskService.update(distributeTaskDTO) ? R.ok() - : R.failed(BaseResultCode.UPDATE_DATABASE_ERROR, "修改失败"); - } - - @PostMapping("/updateData") - @Operation(summary = "修改", description = "修改") - public R updateData( - @Validated({ UpdateGroup.class }) @RequestBody DistributeTaskEntity distributeTaskEntity) { - return distributeTaskService.updateData(distributeTaskEntity) ? R.ok() - : R.failed(BaseResultCode.UPDATE_DATABASE_ERROR, "修改失败"); - } - - @DeleteMapping("/{id}") - @Operation(summary = "ID删除任务") - public R deleteByUserId(@PathVariable("id") Long taskId) { - return distributeTaskService.del(taskId) ? R.ok() : R.failed(BaseResultCode.UPDATE_DATABASE_ERROR, "删除失败"); - } - - @GetMapping("/executeTask") - @Operation(summary = "执行任务") - public R executeTask(@RequestParam("id") Long taskId) { - return distributeTaskService.executeTask(taskId) ? R.ok() - : R.failed(BaseResultCode.UPDATE_DATABASE_ERROR, "执行失败"); - } - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/controller/FileContrastController.java b/admin/src/main/java/com/baiye/modules/distribute/controller/FileContrastController.java deleted file mode 100644 index 2a96167..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/controller/FileContrastController.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.baiye.modules.distribute.controller; - -import com.baiye.domain.PageParam; -import com.baiye.domain.PageResult; -import com.baiye.modules.distribute.qo.FileContrastQo; -import com.baiye.modules.distribute.service.FileContrastService; -import com.baiye.modules.distribute.vo.FileContrastVO; -import com.baiye.result.R; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.RequiredArgsConstructor; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; - -import java.util.List; - -/** - * @author Enzo - * @date 2024-3-13 - */ - -@RestController -@Tag(name = "文件对比") -@RequestMapping("/api/file/contrast") -@RequiredArgsConstructor -public class FileContrastController { - - private final FileContrastService fileContrastService; - - @GetMapping("/page") - @Operation(summary = "分页查询", description = "分页查询") - public R> getSysConfigPage(@Validated PageParam pageParam, FileContrastQo fileContrastQo) { - return R.ok(fileContrastService.queryPage(pageParam, fileContrastQo)); - } - - - @Operation(summary = "创建任务") - @PostMapping("/create") - public R createTask(@RequestParam("files") List files, - @RequestParam(value = "taskName") String taskName) { - return Boolean.TRUE.equals(fileContrastService.createTask(files, taskName)) ? R.ok() : R.failed("上传失败"); - } - - - @Operation(summary = "追加任务资源") - @PostMapping("/addition") - public R additionTaskSource(@RequestParam("files") List files, - @RequestParam(value = "taskId") Long taskId) { - return Boolean.TRUE.equals(fileContrastService.additionTaskSource(files, taskId)) ? R.ok() : R.failed("上传失败"); - } - - - @Operation(summary = "任务对比") - @PostMapping("/build") - public R createTask(@RequestParam("files") List files, - @RequestParam(value = "taskId") Long taskId) { - return Boolean.TRUE.equals(fileContrastService.buildContrast(files, taskId)) ? R.ok() : R.failed("上传失败"); - } - - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/controller/FileContrastRecordController.java b/admin/src/main/java/com/baiye/modules/distribute/controller/FileContrastRecordController.java deleted file mode 100644 index b1f2ca1..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/controller/FileContrastRecordController.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.baiye.modules.distribute.controller; - -import com.baiye.domain.PageParam; -import com.baiye.domain.PageResult; -import com.baiye.modules.distribute.qo.FileContrastQo; -import com.baiye.modules.distribute.service.FileContrastRecordService; -import com.baiye.modules.distribute.vo.FileContrastRecordVO; -import com.baiye.result.R; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.RequiredArgsConstructor; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * @author Enzo - * @date 2024-3-13 - */ - -@RestController -@Tag(name = "文件对比") -@RequestMapping("/api/file/contrast/record") -@RequiredArgsConstructor -public class FileContrastRecordController { - - private final FileContrastRecordService fileContrastRecordService; - - @GetMapping("/page") - @Operation(summary = "分页查询", description = "分页查询") - public R> getSysConfigPage(@Validated PageParam pageParam, FileContrastQo fileContrastQo) { - return R.ok(fileContrastRecordService.queryPage(pageParam, fileContrastQo)); - } - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/controller/HomepageController.java b/admin/src/main/java/com/baiye/modules/distribute/controller/HomepageController.java deleted file mode 100644 index 4289e6c..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/controller/HomepageController.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.baiye.modules.distribute.controller; - -import com.baiye.modules.distribute.qo.HomePageQo; -import com.baiye.modules.distribute.service.HomepageService; -import com.baiye.result.R; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; - -/** - * @author wjt - * @date 2023/12/6 - * 首页统计 - */ -@Slf4j -@RestController -@RequiredArgsConstructor -@RequestMapping("/api/homePage") -public class HomepageController { - - private final HomepageService homepageService; - - @GetMapping("/base") - @Operation(description = "今日实时") - public R baseCount() { - return R.ok(homepageService.baseCount()); - } - - - @PostMapping("/enter") - @Operation(description = "渠道录入--管理员") - public R channelEnterClue(@RequestBody HomePageQo homePageQo) { - return R.ok(homepageService.channelEnterClue(homePageQo)); - } - - @PostMapping("/assigned") - @Operation(description = "渠道分发--管理员") - public R channelAssignedClue(@RequestBody HomePageQo homePageQo) { - return R.ok(homepageService.channelAssignedClue(homePageQo)); - } - - @PostMapping("/export") - @Operation(summary = "导出") - public void channelClueExport(HttpServletResponse response, @RequestBody HomePageQo homePageQo) { - homepageService.channelClueExport(response, homePageQo); - } - - @PostMapping("/distributors") - @Operation(summary = "分发员") - public R distributorsEnterClue(@RequestBody HomePageQo homePageQo) { - return R.ok(homepageService.distributorsEnterClue(homePageQo)); - } - - @PostMapping("/salesman") - @Operation(summary = "业务员") - public R salesmanEnterClue(@RequestBody HomePageQo homePageQo) { - return R.ok(homepageService.salesmanEnterClue(homePageQo)); - } -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/controller/LabelOrganizeController.java b/admin/src/main/java/com/baiye/modules/distribute/controller/LabelOrganizeController.java deleted file mode 100644 index 64297aa..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/controller/LabelOrganizeController.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.baiye.modules.distribute.controller; - -import com.baiye.domain.PageParam; -import com.baiye.modules.distribute.entity.LabelOrganizeEntity; -import com.baiye.modules.distribute.service.LabelOrganizeService; -import com.baiye.modules.distribute.qo.LabelOrganizeQo; -import com.baiye.result.BaseResultCode; -import com.baiye.result.R; -import com.baiye.validation.group.CreateGroup; -import com.baiye.validation.group.UpdateGroup; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.RequiredArgsConstructor; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import java.util.Set; - -/** - * @author YQY - * @date 2021-12-10 - */ -@Tag(name = "标签组管理") -@RestController -@RequestMapping("/labelOrganize") -@RequiredArgsConstructor -public class LabelOrganizeController { - - private final LabelOrganizeService labelOrganizeService; - - @PostMapping("/add") - @Operation(summary = "新增标签组和标签", description = "新增标签组和标签") - public R save(@Validated({ CreateGroup.class }) @RequestBody LabelOrganizeEntity labelOrganizeEntity) { - labelOrganizeService.add(labelOrganizeEntity); - return R.ok(); - } - - @PostMapping("/update") - @Operation(summary = "修改标签组", description = "修改标签组") - public R update(@Validated({ UpdateGroup.class }) @RequestBody LabelOrganizeEntity labelOrganizeEntity) { - return labelOrganizeService.update(labelOrganizeEntity) ? R.ok() - : R.failed(BaseResultCode.UPDATE_DATABASE_ERROR, "修改标签组失败"); - } - - @DeleteMapping("/del") - @Operation(summary = "删除标签组", description = "删除标签组") - public R del(@RequestBody Set ids) { - return labelOrganizeService.del(ids) ? R.ok() : R.failed(BaseResultCode.UPDATE_DATABASE_ERROR, "删除标签组失败"); - } - - @GetMapping("/list") - @Operation(summary = "查询标签组列表", description = "查询标签组列表") - public R listLabelOrganize(LabelOrganizeQo labelOrganizeQo) { - return R.ok(labelOrganizeService.listLabelOrganize(labelOrganizeQo)); - } - - @GetMapping("/page") - @Operation(summary = "分页查询标签组", description = "分页查询标签组") - public R queryAll(@Validated PageParam pageParam, LabelOrganizeQo labelOrganizeQo) { - return R.ok(labelOrganizeService.queryPage(pageParam, labelOrganizeQo)); - } - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/controller/ModelCallbackController.java b/admin/src/main/java/com/baiye/modules/distribute/controller/ModelCallbackController.java deleted file mode 100644 index 4b93d17..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/controller/ModelCallbackController.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.baiye.modules.distribute.controller; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.json.JSONUtil; -import com.baiye.modules.auth.SendClueResponse; -import com.baiye.modules.distribute.dto.PushClueDTO; -import com.baiye.modules.distribute.service.BuildModelService; -import com.baiye.modules.distribute.service.TripartiteService; -import com.baiye.result.R; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.*; - -/** - * @author Enzo - * @date 2023-12-6 - */ -@Slf4j -@RestController -@RequiredArgsConstructor -@RequestMapping("/v1/build") -public class ModelCallbackController { - - private final BuildModelService buildModelService; - - /** - * 推送资源 - */ - @PostMapping("/model/callback") - public SendClueResponse pushClue( @RequestBody String body) { - - SendClueResponse response = new SendClueResponse(); - // PushClueDTO clueDTO = BeanUtil.toBean(body, PushClueDTO.class); - // return Boolean.TRUE.equals(buildModelService.callbackByNid(clueDTO)) ? R.ok("success") : R.failed("message callback failed"); - log.info("=============== the body {} ==============", JSONUtil.toJsonStr(body)); - response.setIsExist(Boolean.FALSE); - response.setCode(200); - - return response; - } - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/controller/OceanEngineController.java b/admin/src/main/java/com/baiye/modules/distribute/controller/OceanEngineController.java deleted file mode 100644 index d0ce65b..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/controller/OceanEngineController.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.baiye.modules.distribute.controller; - -import com.baiye.domain.PageParam; -import com.baiye.domain.PageResult; -import com.baiye.modules.distribute.dto.OceanEngineTokenDto; -import com.baiye.modules.distribute.qo.OceanEnginQo; -import com.baiye.modules.distribute.service.OceanEngineClueService; -import com.baiye.modules.distribute.service.OceanEngineService; -import com.baiye.modules.distribute.vo.OceanEnginVO; -import com.baiye.result.R; -import com.baiye.security.util.SecurityUtils; -import io.swagger.v3.oas.annotations.Operation; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; - -/** - * 巨量广告投放 - * - * @author Enzo - * @date : 2022/9/14 - */ -@Slf4j -@RestController -@RequiredArgsConstructor -@RequestMapping("/api/oceanEngine") -public class OceanEngineController { - - private final OceanEngineService oceanEngineService; - - @GetMapping(value = "/url") - public R query(String authorizeName) { - return R.ok(oceanEngineService.buildAuthorizationUrl(SecurityUtils.getCurrentUserId(), authorizeName)); - } - - - @GetMapping("/page") - @Operation(summary = "分页查询", description = "分页查询") - public R> getSysConfigPage(@Validated PageParam pageParam, OceanEnginQo oceanEnginQo) { - return R.ok(oceanEngineService.queryPage(pageParam, oceanEnginQo)); - } - - - @PostMapping("/add") - public ResponseEntity save(@Validated @RequestBody OceanEngineTokenDto oceanEngineTokenDto) { - oceanEngineTokenDto.setUserId(SecurityUtils.getCurrentUserId()); - String url = oceanEngineService.save(oceanEngineTokenDto); - return new ResponseEntity<>(url, HttpStatus.OK); - } - - - @GetMapping("update") - public ResponseEntity update(Integer status, Long id) { - oceanEngineService.updateAuthorizationStatus(status, id); - return new ResponseEntity<>(HttpStatus.NO_CONTENT); - } - - - @GetMapping(value = "/callback") - public ResponseEntity callback(@RequestParam("state") String state, @RequestParam("auth_code") String authCode, - HttpServletResponse response) throws IOException { - log.info("================== the state as {},authCode as {} ================", state, authCode); - oceanEngineService.processRequest(state, authCode); - response.sendRedirect("https://byffp.top/dashboard"); - return new ResponseEntity<>(HttpStatus.OK); - } - - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/controller/OutsideReqController.java b/admin/src/main/java/com/baiye/modules/distribute/controller/OutsideReqController.java deleted file mode 100644 index 8125f41..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/controller/OutsideReqController.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.baiye.modules.distribute.controller; - -import com.baiye.modules.distribute.dto.DBPushClueDTO; -import com.baiye.modules.distribute.dto.ReceivePushLeadsDTO; -import com.baiye.modules.distribute.service.OutsideReqService; -import com.baiye.result.BaseResultCode; -import com.baiye.result.R; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.*; - -@RequiredArgsConstructor -@RestController -@RequestMapping("/outside") -public class OutsideReqController { - - private final OutsideReqService outsideReqService; - - /** - * 推送资源 - */ - @PostMapping("/pushClue/{appKey}") - public R pushClue(@PathVariable("appKey") String appKey, @RequestBody DBPushClueDTO DBPushClueDTO) { - outsideReqService.pushClue(appKey, DBPushClueDTO); - return R.ok(); - } - - /** - * 接收外部推送的公共接口 - * @return - */ - @PostMapping("/pushLeads") - public R externalPushClue(@RequestBody ReceivePushLeadsDTO receivePushLeadsDTO) { - return outsideReqService.externalPushClue(receivePushLeadsDTO) ? R.ok() - : R.failed(BaseResultCode.UPDATE_DATABASE_ERROR, "删除文件失败"); - } - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/controller/PushClueController.java b/admin/src/main/java/com/baiye/modules/distribute/controller/PushClueController.java deleted file mode 100644 index 0154f91..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/controller/PushClueController.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.baiye.modules.distribute.controller; - -import com.baiye.domain.PageParam; -import com.baiye.domain.PageResult; -import com.baiye.modules.distribute.entity.PushConfigEntity; -import com.baiye.modules.distribute.qo.SendClueQo; -import com.baiye.modules.distribute.service.PushClueService; -import com.baiye.modules.distribute.service.PushConfigService; -import com.baiye.modules.distribute.vo.PushClueInfoVo; -import com.baiye.result.R; -import com.baiye.security.util.SecurityUtils; -import io.swagger.v3.oas.annotations.Operation; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -/** - * @author Enzo - * @date 2023-12-6 - */ -@Slf4j -@RestController -@RequiredArgsConstructor -@RequestMapping("/push/clue") -public class PushClueController { - - private final PushConfigService pushConfigService; - - - private final PushClueService pushClueService; - - @PostMapping("/config/add") - @Operation(summary = "新增配置") - public R addConfig(@RequestBody PushConfigEntity pushConfigEntity) { - pushConfigService.addConfig(pushConfigEntity); - return R.ok(); - } - - @GetMapping("/config/query") - @Operation(summary = "新增配置") - public R queryConfig() { - return R.ok(pushConfigService.queryByUserId(SecurityUtils.getCurrentUserId())); - } - - @PostMapping("/config/update") - @Operation(summary = "修改配置信息") - public R updateConfig(@RequestBody PushConfigEntity pushConfigEntity) { - pushConfigService.updateConfig(pushConfigEntity); - return R.ok(); - } - - - @GetMapping("/page") - @Operation(summary = "分页查询资源") - public R> getClueRecordPage(@Validated PageParam pageParam, SendClueQo qo) { - qo.setAssignedBy(SecurityUtils.getCurrentUserId()); - - return R.ok(pushClueService.queryPage(pageParam, qo)); - } - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/controller/PushLinkController.java b/admin/src/main/java/com/baiye/modules/distribute/controller/PushLinkController.java deleted file mode 100644 index 54ef4a0..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/controller/PushLinkController.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.baiye.modules.distribute.controller; - -import com.baiye.domain.PageParam; -import com.baiye.domain.PageResult; -import com.baiye.modules.distribute.dto.PushLinkDTO; -import com.baiye.modules.distribute.qo.PushLinkQo; -import com.baiye.modules.distribute.service.PushLinkService; -import com.baiye.modules.distribute.vo.PushLinkVO; -import com.baiye.result.BaseResultCode; -import com.baiye.result.R; -import com.baiye.security.util.SecurityUtils; -import com.baiye.validation.group.CreateGroup; -import com.baiye.validation.group.UpdateGroup; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.RequiredArgsConstructor; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -@RequiredArgsConstructor -@RestController -@Tag(name = "推送配置") -@RequestMapping("/pushLink") -public class PushLinkController { - - private final PushLinkService pushLinkService; - - @GetMapping("/page") - @Operation(summary = "分页查询") - public R> getClueRecordPage(@Validated PageParam pageParam, PushLinkQo qo) { - qo.setCreateBy(SecurityUtils.getCurrentUserId()); - return R.ok(pushLinkService.queryPage(pageParam, qo)); - } - - @PostMapping("/add") - @Operation(summary = "新增(生成)链接", description = "新增(生成)链接") - public R save(@Validated({ CreateGroup.class }) @RequestBody PushLinkDTO pushLinkDTO) { - return R.ok(pushLinkService.add(pushLinkDTO)); - } - - - @GetMapping("/detail") - @Operation(summary = "链接详情", description = "链接详情") - public R detail(Long id) { - return R.ok(pushLinkService.pushDetail(id)); - } - - - @PostMapping("/update") - @Operation(summary = "修改链接", description = "修改链接") - public R update(@Validated({UpdateGroup.class}) @RequestBody PushLinkDTO pushLinkDTO) { - return pushLinkService.update(pushLinkDTO) ? R.ok() : R.failed(BaseResultCode.UPDATE_DATABASE_ERROR, "修改失败"); - } - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/controller/StoreController.java b/admin/src/main/java/com/baiye/modules/distribute/controller/StoreController.java deleted file mode 100644 index 8a26bd7..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/controller/StoreController.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.baiye.modules.distribute.controller; - -import com.baiye.domain.PageParam; -import com.baiye.domain.PageResult; -import com.baiye.modules.distribute.dto.StoreDTO; -import com.baiye.modules.distribute.entity.StoreEntity; -import com.baiye.modules.distribute.qo.StoreQo; -import com.baiye.modules.distribute.service.StoreService; -import com.baiye.modules.distribute.vo.StoreVO; -import com.baiye.result.R; -import com.baiye.validation.group.CreateGroup; -import com.baiye.validation.group.UpdateGroup; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.RequiredArgsConstructor; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; - -/** - * @author wjt - * @date 2023/9/5 - */ -@RequiredArgsConstructor -@RestController -@Tag(name = "门店管理") -@RequestMapping("/store") -public class StoreController { - - private final StoreService storeService; - - @GetMapping("/queryPage") - @Operation(summary = "分页查询门店") - public R> queryStorePage(@Validated PageParam pageParam, StoreQo storeQo) { - return R.ok(storeService.queryStorePage(pageParam, storeQo)); - } - - @GetMapping("/queryAll") - @Operation(summary = "不分页查询门店") - public R> queryStore(StoreQo storeQo) { - return R.ok(storeService.queryStore(storeQo)); - } - - @GetMapping("/queryRange") - @Operation(summary = "查询范围内所有的门店") - public R> queryRangeStore(@RequestParam("longitude") Double longitude, - @RequestParam("latitude") Double latitude, - @RequestParam("distance") Double distance) { - return R.ok(storeService.queryRangeStore(longitude, latitude, distance)); - } - - @PostMapping("/add") - @Operation(summary = "新增门店信息") - public R addStore(@Validated({CreateGroup.class}) @RequestBody StoreEntity storeEntity) { - storeService.addStore(storeEntity); - return R.ok(); - } - - @PostMapping("/update") - @Operation(summary = "修改门店信息") - public R updateStore(@Validated({UpdateGroup.class}) @RequestBody StoreEntity storeEntity) { - storeService.updateStore(storeEntity); - return R.ok(); - } - - @DeleteMapping("/{id}") - @Operation(summary = "删除门店信息") - public R deleteStore(@PathVariable("id") Long storeId) { - storeService.deleteStore(storeId); - return R.ok(); - } - - @GetMapping("/reservation") - @Operation(summary = "门店预约") - public R>> queryStoreReservation(@RequestParam(value = "startTime", required = false) String startTime, - @RequestParam(value = "endTime", required = false) String endTime, - @RequestParam("storeId") Long storeId) { - return R.ok(storeService.queryStoreReservation(startTime, endTime, storeId)); - } - - @GetMapping("/export") - @Operation(summary = "门店预约详情导出") - public void exportStoreDetails(HttpServletResponse response, - @RequestParam(value = "startTime", required = false) String startTime, - @RequestParam(value = "endTime", required = false) String endTime, - @RequestParam("storeId") Long storeId) throws IOException { - storeService.exportStoreDetails(response, startTime, endTime, storeId); - } -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/controller/StoreUserController.java b/admin/src/main/java/com/baiye/modules/distribute/controller/StoreUserController.java deleted file mode 100644 index 3504f1e..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/controller/StoreUserController.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.baiye.modules.distribute.controller; - -import com.baiye.modules.distribute.service.StoreUserService; -import com.baiye.result.R; -import com.baiye.system.model.dto.SysUserNameRoleDTO; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; - -/** - * @author wjt - * @date 2023/9/15 - */ -@RequiredArgsConstructor -@RestController -@Tag(name = "门店用户管理") -@RequestMapping("/storeUser") -public class StoreUserController { - private final StoreUserService storeUserService; - - @GetMapping("/queryAll") - @Operation(summary = "查询门店业务员角色") - public R> queryStore() { - return R.ok(storeUserService.listByRoleCode()); - } -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/controller/TagController.java b/admin/src/main/java/com/baiye/modules/distribute/controller/TagController.java deleted file mode 100644 index fdf4bb3..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/controller/TagController.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.baiye.modules.distribute.controller; - -import com.baiye.modules.distribute.entity.TagEntity; -import com.baiye.modules.distribute.service.TagService; -import com.baiye.result.R; -import com.baiye.validation.group.CreateGroup; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.RequiredArgsConstructor; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -/** - * @author Enzo - * @date 2023-12-6 - */ - -@RestController -@Tag(name = "标签管理") -@RequestMapping("/api/tag") -@RequiredArgsConstructor -public class TagController { - - private final TagService tagService; - - @PostMapping("/add") - public R add(@Validated({CreateGroup.class}) @RequestBody TagEntity entity) { - tagService.create(entity); - return R.ok(); - } - - @PostMapping("/update") - public R update(@RequestBody List list) { - tagService.update(list); - return R.ok(); - } - - @GetMapping("/list") - public R> list(@RequestParam(value = "routeStatus", required = false) Integer routeStatus, - @RequestParam(value = "isSalesman", required = false) Boolean isSalesman) { - return R.ok(tagService.selectList(routeStatus, isSalesman)); - } -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/controller/TripartiteController.java b/admin/src/main/java/com/baiye/modules/distribute/controller/TripartiteController.java deleted file mode 100644 index 3dea2e6..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/controller/TripartiteController.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.baiye.modules.distribute.controller; - -import cn.hutool.json.JSONUtil; -import com.baiye.modules.distribute.dto.PushClueDTO; -import com.baiye.modules.distribute.service.TripartiteService; -import com.baiye.result.R; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.*; - -/** - * @author Enzo - * @date 2023-12-6 - */ -@Slf4j -@RestController -@RequiredArgsConstructor -@RequestMapping("/v1/tripartite") -public class TripartiteController { - - private final TripartiteService tripartiteService; - - /** - * 推送资源 - */ - @PostMapping("/push/clue/{appKey}") - public R pushClue(@PathVariable("appKey") String appKey, @RequestBody PushClueDTO dto) { - log.info("=============== the push appKey {},body {} ==============", appKey, JSONUtil.toJsonStr(dto)); - return Boolean.TRUE.equals(tripartiteService.callbackByAppKeyAndNid - (appKey, dto)) ? R.ok("success") : R.failed("message callback failed"); - } - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/converter/ClueConverter.java b/admin/src/main/java/com/baiye/modules/distribute/converter/ClueConverter.java deleted file mode 100644 index 08598c0..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/converter/ClueConverter.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.baiye.modules.distribute.converter; - -import com.baiye.modules.distribute.dto.ClueDTO; -import com.baiye.modules.distribute.entity.ClueEntity; -import com.baiye.modules.distribute.vo.ClueVO; -import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; - -@Mapper -public interface ClueConverter { - - ClueConverter INSTANCE = Mappers.getMapper(ClueConverter.class); - - /** - * 修改DTO 转 PO - * @param dto 修改DTO - * @return ClueEntity PO - */ - ClueEntity dtoToPo(ClueDTO dto); - - - /** - * 实体转vo - * @param entity - * @return - */ - ClueVO poToExcelVo(ClueEntity entity); - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/converter/CustomConverter.java b/admin/src/main/java/com/baiye/modules/distribute/converter/CustomConverter.java deleted file mode 100644 index 9d59b27..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/converter/CustomConverter.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.baiye.modules.distribute.converter; - -import com.baiye.modules.distribute.dto.CreateCustomDTO; -import com.baiye.modules.distribute.dto.CustomDTO; -import com.baiye.modules.distribute.entity.CustomEntity; -import com.baiye.modules.distribute.vo.CustomVO; -import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; - -@Mapper -public interface CustomConverter { - - CustomConverter INSTANCE = Mappers.getMapper(CustomConverter.class); - - /** - * 修改DTO 转 PO - * @param dto 修改DTO - * @return ClueEntity PO - */ - CustomEntity dtoToPo(CustomDTO dto); - - /** - * 修改DTO 转 PO - * @param dto 修改DTO - * @return ClueEntity PO - */ - CustomEntity dtoToPo(CreateCustomDTO dto); - - - /** - * 实体转vo - * @param entity - * @return - */ - CustomVO poToExcelVo(CustomEntity entity); - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/converter/DirectClueConverter.java b/admin/src/main/java/com/baiye/modules/distribute/converter/DirectClueConverter.java deleted file mode 100644 index 0eba197..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/converter/DirectClueConverter.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.baiye.modules.distribute.converter; - -import com.baiye.modules.distribute.dto.DirectClueDTO; -import com.baiye.modules.distribute.entity.DirectClueEntity; -import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; - -@Mapper -public interface DirectClueConverter { - - DirectClueConverter INSTANCE = Mappers.getMapper(DirectClueConverter.class); - - /** - * 修改DTO 转 PO - * @param dto 修改DTO - * @return ClueEntity PO - */ - DirectClueEntity dtoToPo(DirectClueDTO dto); - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/converter/FileContrasRecordConverter.java b/admin/src/main/java/com/baiye/modules/distribute/converter/FileContrasRecordConverter.java deleted file mode 100644 index ce63b92..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/converter/FileContrasRecordConverter.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.baiye.modules.distribute.converter; - -import com.baiye.modules.distribute.entity.FileContrastRecordEntity; -import com.baiye.modules.distribute.entity.FileContrastSourceEntity; -import com.baiye.modules.distribute.vo.FileContrastRecordVO; -import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; - -/** - * @author Enzo - * @date 2024-3-13 - */ -@Mapper -public interface FileContrasRecordConverter { - - FileContrasRecordConverter INSTANCE = Mappers.getMapper(FileContrasRecordConverter.class); - - - /** - * 实体转vo - * - * @param entity - * @return - */ - FileContrastRecordVO entityToVo(FileContrastRecordEntity entity); -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/converter/FileContrastConverter.java b/admin/src/main/java/com/baiye/modules/distribute/converter/FileContrastConverter.java deleted file mode 100644 index e9a48e7..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/converter/FileContrastConverter.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.baiye.modules.distribute.converter; - -import com.baiye.modules.distribute.entity.FileContrastEntity; -import com.baiye.modules.distribute.vo.FileContrastVO; -import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; - -/** - * @author Enzo - * @date 2024-3-13 - */ -@Mapper -public interface FileContrastConverter { - - FileContrastConverter INSTANCE = Mappers.getMapper(FileContrastConverter.class); - - - - /** - * 实体转vo - * - * @param entity - * @return - */ - FileContrastVO entityToVo(FileContrastEntity entity); -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/converter/OceanEngineConverter.java b/admin/src/main/java/com/baiye/modules/distribute/converter/OceanEngineConverter.java deleted file mode 100644 index 129bfd4..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/converter/OceanEngineConverter.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.baiye.modules.distribute.converter; - -import com.baiye.modules.distribute.entity.OceanEngineToken; -import com.baiye.modules.distribute.vo.OceanEnginVO; -import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; - -/** - * @author Enzo - * @date 2023-11-6 - */ -@Mapper -public interface OceanEngineConverter { - - OceanEngineConverter INSTANCE = Mappers.getMapper(OceanEngineConverter.class); - - /** - * 实体转Vo - * @param token - * @return - */ - OceanEnginVO entityToVo(OceanEngineToken token); - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/converter/PushClueConverter.java b/admin/src/main/java/com/baiye/modules/distribute/converter/PushClueConverter.java deleted file mode 100644 index 1d514fb..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/converter/PushClueConverter.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.baiye.modules.distribute.converter; - -import com.baiye.modules.distribute.entity.PushClueInfoEntity; -import com.baiye.modules.distribute.vo.PushClueInfoVo; -import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; - -@Mapper -public interface PushClueConverter { - - PushClueConverter INSTANCE = Mappers.getMapper(PushClueConverter.class); - - /** - * - * @param clueInfo - * @return - */ - PushClueInfoVo poToPageVo(PushClueInfoEntity clueInfo); - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/converter/PushLinkConverter.java b/admin/src/main/java/com/baiye/modules/distribute/converter/PushLinkConverter.java deleted file mode 100644 index c20d500..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/converter/PushLinkConverter.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.baiye.modules.distribute.converter; - -import com.baiye.modules.distribute.dto.PushLinkDTO; -import com.baiye.modules.distribute.entity.PushLinkEntity; -import com.baiye.modules.distribute.vo.PushLinkVO; -import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; - -@Mapper -public interface PushLinkConverter { - - PushLinkConverter INSTANCE = Mappers.getMapper(PushLinkConverter.class); - - /** - * 修改DTO 转 PO - * @param dto 修改DTO - * @return ClueEntity PO - */ - PushLinkEntity dtoToPo(PushLinkDTO dto); - - - /** - * 实体转vo - * @param entity - * @return - */ - PushLinkVO entityToVo(PushLinkEntity entity); -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/dto/CallbackCustomDTO.java b/admin/src/main/java/com/baiye/modules/distribute/dto/CallbackCustomDTO.java deleted file mode 100644 index 59f9110..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/dto/CallbackCustomDTO.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.baiye.modules.distribute.dto; - -import lombok.Builder; -import lombok.Data; - -import java.util.List; - -/** - * @author Enzo - * @date : 2023/12/7 - */ -@Data -@Builder -public class CallbackCustomDTO { - - private Integer sex; - - private String remark; - - private Long companyId; - - private String enterName; - - private String customName; - - private Integer customType; - - private String customNid; - - private Integer channelType; - - private Long reportUserId; - - private Long distributeId; - - private String channelName; - - private List identifying; - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/dto/ChangeCustomDTO.java b/admin/src/main/java/com/baiye/modules/distribute/dto/ChangeCustomDTO.java deleted file mode 100644 index caa2210..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/dto/ChangeCustomDTO.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.baiye.modules.distribute.dto; - -import com.baiye.validation.group.SubmitGroup; -import lombok.Data; - -import javax.validation.constraints.NotNull; -import java.util.List; - -@Data -public class ChangeCustomDTO { - - /** - * 客户ID - */ - @NotNull(message = "ID不能为空", groups = { SubmitGroup.class }) - private Long customId; - - /** - * 状态: 0-地理分发 1-基础分发 2-复审 - */ - @NotNull(message = "状态不能为空", groups = { SubmitGroup.class }) - private Integer status; - - /** - * 复审员用户ID - */ - private Long reviewUserId; - - /** - * 业务员用户ID - */ - private List salesmanUserId; -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/dto/ClueDTO.java b/admin/src/main/java/com/baiye/modules/distribute/dto/ClueDTO.java deleted file mode 100644 index 7a1be1f..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/dto/ClueDTO.java +++ /dev/null @@ -1,103 +0,0 @@ -package com.baiye.modules.distribute.dto; - -import com.baiye.modules.distribute.entity.LabelEntity; -import com.baiye.validation.group.UpdateGroup; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import javax.validation.constraints.NotNull; -import java.util.List; - -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class ClueDTO { - - @Schema(title = "线索ID") - @NotNull(message = "分发ID不能为空", groups = { UpdateGroup.class }) - private Long clueId; - - @Schema(title = "线索来源") - private String originName; - - @Schema(title = "手机号") - private String nid; - - @Schema(title = "线索时间") - private String clueTime; - - @Schema(title = "线索备注") - private String remark; - - @Schema(title = "记录ID") - private Long clueRecordId; - - private String otherClue; - - @Schema(title = "分配人用户ID") - private Long assignedBy; - - @Schema(title = "资源标签") - private String clueLabel; - - @Schema(title = "资源标签名称") - private String clueLabelName; - - @Schema(title = "分配人用户名") - private String assignedName; - - @Schema(title = "资源线索ID") - private Long clueStageId; - - @Schema(title = "资源线索名称") - private String clueStageName; - - @Schema(title = "创建者") - private Long createBy; - - @Schema(title = "资源线索ID") - private Boolean isNewClue; - - @Schema(title = "资源标签集合") - private List clueLabelList; - - @Schema(title = "公司管理员用户ID") - private Long companyId; - - @Schema(title = "性别(0-男，1-女)") - private Integer sex; - - @Schema(title = "客户资料") - private String customInformation; - - @Schema(title = "渠道标识") - private List channelIdentifying; - - @Schema(title = "渠道类型渠道类型(1 手动创建 2文件上传 3飞鱼回传 4话单回传 5 api回传)") - private Integer channelType; - - @Schema(title = "客户ID") - private Long customId; - - public ClueDTO(Long clueId, String originName, String nid, String remark, String otherClue, Long assignedBy, String assignedName, Long createBy, Boolean isNewClue, Long companyId, Integer sex, String customInformation, List channelIdentifying, Integer channelType, Long customId) { - this.clueId = clueId; - this.originName = originName; - this.nid = nid; - this.remark = remark; - this.otherClue = otherClue; - this.assignedBy = assignedBy; - this.assignedName = assignedName; - this.createBy = createBy; - this.isNewClue = isNewClue; - this.companyId = companyId; - this.sex = sex; - this.customInformation = customInformation; - this.channelIdentifying = channelIdentifying; - this.channelType = channelType; - this.customId = customId; - } -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/dto/ClueStageDTO.java b/admin/src/main/java/com/baiye/modules/distribute/dto/ClueStageDTO.java deleted file mode 100644 index c7e990a..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/dto/ClueStageDTO.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.baiye.modules.distribute.dto; - -import com.baiye.validation.group.CreateGroup; -import com.baiye.validation.group.UpdateGroup; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import javax.validation.constraints.NotNull; - -/** - * @Author YQY - * @Date 2023/8/15 - */ -@Data -public class ClueStageDTO { - - @Schema(title = "ID") - @NotNull(message = "ID不能为空", groups = { UpdateGroup.class }) - private Long clueStageId; - - @Schema(title = "线索阶段名称") - @NotNull(message = "线索阶段名称不能为空", groups = { CreateGroup.class }) - private String name; - - @Schema(title = "线索阶段排序") - @NotNull(message = "线索阶段排序不能为空", groups = { CreateGroup.class }) - private Integer sort; - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/dto/ContrastDTO.java b/admin/src/main/java/com/baiye/modules/distribute/dto/ContrastDTO.java deleted file mode 100644 index 9323125..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/dto/ContrastDTO.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.baiye.modules.distribute.dto; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import org.springdoc.api.annotations.ParameterObject; - -/** - * @author Enzo - * @date 2023-10-20 - */ -@Data -@Schema(title = "对比dto") -@ParameterObject -public class ContrastDTO { - private String nid; - - private String remark; - - private String isRepeat; - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/dto/CreateCustomDTO.java b/admin/src/main/java/com/baiye/modules/distribute/dto/CreateCustomDTO.java deleted file mode 100644 index 15ab884..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/dto/CreateCustomDTO.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.baiye.modules.distribute.dto; - -import com.baiye.validation.group.CreateGroup; -import com.baiye.validation.group.UpdateGroup; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import javax.validation.constraints.NotBlank; - -/** - * @author Enzo - * @date 2023-12-6 - */ -@Data -public class CreateCustomDTO { - - - public CreateCustomDTO() { - } - - @Schema(title = "客户名称") - private String customName; - - @Schema(title = "客户联系方式") - @NotBlank(message = "客户联系方式不能为空", groups = {CreateGroup.class, UpdateGroup.class}) - private String customNid; - - @Schema(title = "备注") - private String remark; - - - @Schema(title = "渠道类型") - private Integer channelType; - - - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/dto/CustomDTO.java b/admin/src/main/java/com/baiye/modules/distribute/dto/CustomDTO.java deleted file mode 100644 index 5fdd50b..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/dto/CustomDTO.java +++ /dev/null @@ -1,83 +0,0 @@ -package com.baiye.modules.distribute.dto; - -import com.baiye.modules.distribute.entity.CustomStoreEntity; -import com.baiye.validation.group.CreateGroup; -import com.baiye.validation.group.UpdateGroup; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.util.List; - -@Data -public class CustomDTO { - - @Schema(title = "ID") - @NotNull(message = "ID不能为空", groups = { UpdateGroup.class }) - private Long customId; - - @Schema(title = "客户名称") - @NotBlank(message = "客户名称不能为空", groups = { CreateGroup.class, UpdateGroup.class }) - private String customName; - - @Schema(title = "客户联系方式") - @NotBlank(message = "客户联系方式不能为空", groups = { CreateGroup.class, UpdateGroup.class }) - private String customNid; - - @Schema(title = "省") - private String economize; - - @Schema(title = "市") - private String market; - - @Schema(title = "区") - private String distinguish; - - @Schema(title = "详细地址") - private String detailAddress; - - @Schema(title = "其它地址信息-定位使用") - private String otherAddressesInfo; - - @Schema(title = "半径") - private String radius; - - @Schema(title = "报名状态 0:待提交 1:已报名") - @NotNull(message = "状态不能为空", groups = { CreateGroup.class }) - private Integer enrollStatus; - - @Schema(title = "备注") - private String remark; - - @Schema(description = "审核类型 2初审 3复审") - private Integer type; - - @Schema(title = "客户类型 0:地理 1:基本") - @NotNull(message = "客户类型不能为空", groups = { CreateGroup.class }) - private Integer customType; - - @Schema(title = "门店信息") - private List customStoreEntities; - - @Schema(title = "创建人") - private Long createBy; - - @Schema(title = "渠道类型(1 手动创建 2文件上传 3飞鱼回传 4话单回传 5 api回传)") - private Integer channelType; - - @Schema(title = "渠道名称") - private String channelName; - - @Schema(title = "分发员id") - private Long distributorId; - - @Schema(title = "业务员ID集合") - private List salesmanUserId; - - @Schema(title = "客户资料") - private String customInformation; - - @Schema(title = "性别(0-男，1-女)") - private Integer sex; -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/dto/CustomStoreDTO.java b/admin/src/main/java/com/baiye/modules/distribute/dto/CustomStoreDTO.java deleted file mode 100644 index 75aea5b..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/dto/CustomStoreDTO.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.baiye.modules.distribute.dto; - -import com.baiye.validation.group.CreateGroup; -import com.baiye.validation.group.UpdateGroup; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import javax.validation.constraints.NotNull; -import java.time.LocalDateTime; - -@Data -public class CustomStoreDTO { - - @Schema(title = "ID") - @NotNull(message = "ID不能为空", groups = { UpdateGroup.class }) - private Long customStoreId; - - @Schema(title = "门店ID") - @NotNull(message = "门店ID不能为空", groups = { CreateGroup.class }) - private Long storeId; - - @Schema(title = "客户ID") - @NotNull(message = "客户ID不能为空", groups = { CreateGroup.class }) - private Long customId; - - @Schema(title = "门店名称") - @NotNull(message = "门店名称不能为空", groups = { CreateGroup.class }) - private String storeName; - - @Schema(title = "预约时间") - @NotNull(message = "预约时间不能为空", groups = { CreateGroup.class }) - private String reservationTime; -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/dto/DBPushClueDTO.java b/admin/src/main/java/com/baiye/modules/distribute/dto/DBPushClueDTO.java deleted file mode 100644 index 3f4b0f7..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/dto/DBPushClueDTO.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.baiye.modules.distribute.dto; - -import lombok.Data; - -@Data -public class DBPushClueDTO { - - /** - * 手机号 - */ - private String mobile; - - /** - * 人工评级 - */ - private String empClientTypeName; - - /** - * 备注 - */ - private String remark; - - /** - * 人工评级推送的手机号, mobile就不是手机号字段了 - */ - private String called; - - /** - * 太空猫传递的线索ID - */ - private Long variable; -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/dto/DirectClueDTO.java b/admin/src/main/java/com/baiye/modules/distribute/dto/DirectClueDTO.java deleted file mode 100644 index 369c55c..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/dto/DirectClueDTO.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.baiye.modules.distribute.dto; - -import com.baiye.validation.group.UpdateGroup; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import javax.validation.constraints.NotNull; -import java.util.List; - -@Data -public class DirectClueDTO { - - @Schema(title = "ID") - @NotNull(message = "ID不能为空", groups = { UpdateGroup.class }) - private Long directClueId; - - @Schema(title = "有效状态 0:有效 1:无效") - private Integer effectiveStatus; - - @Schema(title = "标签") - private List clueLabel; -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/dto/DistributeDTO.java b/admin/src/main/java/com/baiye/modules/distribute/dto/DistributeDTO.java deleted file mode 100644 index b0c605d..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/dto/DistributeDTO.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.baiye.modules.distribute.dto; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import javax.validation.constraints.NotEmpty; -import java.io.Serializable; -import java.util.List; - -@Data -public class DistributeDTO implements Serializable { - - private static final long serialVersionUID = 6275518278441151400L; - - @NotEmpty(message = "部门不能为空") - private List deptIds; - - @NotEmpty(message = "资源不能为空") - private List resourceList; - - @Schema(title = "是否权重分配") - private Boolean isWeight; - - @Schema(title = "权重") - private List weights; - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/dto/DistributeResponseDTO.java b/admin/src/main/java/com/baiye/modules/distribute/dto/DistributeResponseDTO.java deleted file mode 100644 index 4919e50..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/dto/DistributeResponseDTO.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.baiye.modules.distribute.dto; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -public class DistributeResponseDTO implements Serializable { - - private static final long serialVersionUID = 2772000439619817023L; - - @Schema(title = "部门id集合") - private Long deptId; - - @Schema(title = "分配资源") - private List responseList; - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/dto/DistributeTaskDTO.java b/admin/src/main/java/com/baiye/modules/distribute/dto/DistributeTaskDTO.java deleted file mode 100644 index e0a7ebd..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/dto/DistributeTaskDTO.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.baiye.modules.distribute.dto; - -import com.baiye.validation.group.CreateGroup; -import com.baiye.validation.group.UpdateGroup; -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import org.springdoc.api.annotations.ParameterObject; -import org.springframework.format.annotation.DateTimeFormat; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.time.LocalDateTime; -import java.util.List; - -import static cn.hutool.core.date.DatePattern.NORM_DATETIME_PATTERN; - -/** - * @Author YQY - * @Date 2023/8/11 - */ -@Data -@Schema(title = "分发任务查询对象") -@ParameterObject -public class DistributeTaskDTO { - - @Schema(title = "分发任务ID") - @NotNull(message = "分发ID不能为空", groups = { UpdateGroup.class }) - private Long distributeTaskId; - - @Schema(title = "分发类型 0:手动分发 1:自动分发") - @NotNull(message = "分发类型不能为空", groups = { CreateGroup.class }) - private Integer distributeTaskType; - - @Schema(title = "任务名称") - @NotBlank(message = "任务名称不能为空", groups = { CreateGroup.class }) - private String taskName; - - @Schema(title = "分发规则 0:平均 1:权重") - @NotNull(message = "请选择分发规则", groups = { CreateGroup.class }) - private Integer ruleStatus; - - @Schema(title = "分发时间 0:实时 1:定时") - private Integer timeStatus; - - @Schema(title = "定时开始时间") - @DateTimeFormat(pattern = NORM_DATETIME_PATTERN) - @JsonFormat(pattern = NORM_DATETIME_PATTERN) - private LocalDateTime startTime; - - @Schema(title = "文件规则前缀") - private String fileRulePrefix; - - @Schema(title = "上传文件记录ID “,”相隔") - private List fileRecordIdList; - - @Schema(title = "分发任务人员和权重") - @NotEmpty(message = "分发任务人员不能为空", groups = { CreateGroup.class }) - private List users; - - @Schema(title = "执行状态 0:未执行 1:执行中 2:已执行 3:暂停") - private Integer executeStatus; - - @Schema(title = "任务默认类型 0:默认 1:非默认") - private Integer defaultType; - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/dto/DistributeTaskUserDTO.java b/admin/src/main/java/com/baiye/modules/distribute/dto/DistributeTaskUserDTO.java deleted file mode 100644 index 8fb7e9e..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/dto/DistributeTaskUserDTO.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.baiye.modules.distribute.dto; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -/** - * @Author YQY - * @Date 2023/8/11 - */ -@Data -public class DistributeTaskUserDTO { - - @Schema(title = "用户id") - private Long userId; - - @Schema(title = "权重值") - private Integer weight; - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/dto/FileContrastDTO.java b/admin/src/main/java/com/baiye/modules/distribute/dto/FileContrastDTO.java deleted file mode 100644 index acc0c5e..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/dto/FileContrastDTO.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.baiye.modules.distribute.dto; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import org.springdoc.api.annotations.ParameterObject; -import org.springframework.web.multipart.MultipartFile; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import java.util.List; - -/** - * @author wjt - * @date 2023/9/13 - */ -@Data -@Schema(title = "门店管理dto") -@ParameterObject -public class FileContrastDTO { - - private MultipartFile[] files; - - - @NotEmpty(message = "用户id不能为空") - private List userIds; - - @NotBlank(message = "任务名称不能为空") - private String taskName; -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/dto/HomePageDTO.java b/admin/src/main/java/com/baiye/modules/distribute/dto/HomePageDTO.java deleted file mode 100644 index af92279..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/dto/HomePageDTO.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.baiye.modules.distribute.dto; - -import lombok.Data; - -/** - * @author wjt - * @date 2023/12/6 - */ -@Data -public class HomePageDTO { - - private String createTime; - - private Long assignedBy; - - private String assignedName; - - private Long createBy; - - private String enterName; - - private Integer num; -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/dto/OceanEngineResponseDTO.java b/admin/src/main/java/com/baiye/modules/distribute/dto/OceanEngineResponseDTO.java deleted file mode 100644 index 84fdff4..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/dto/OceanEngineResponseDTO.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.baiye.modules.distribute.dto; - -import cn.hutool.core.text.CharSequenceUtil; -import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.Data; - -/** - * @author wjt - * @date 2023/11/10 - */ -@Data -public class OceanEngineResponseDTO { - private Object data; - - @JsonProperty("code") - private Integer code; - - @JsonProperty("message") - private String message; - - @JsonProperty("request_id") - private String requestId = CharSequenceUtil.EMPTY; -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/dto/OceanEngineTokenDto.java b/admin/src/main/java/com/baiye/modules/distribute/dto/OceanEngineTokenDto.java deleted file mode 100644 index 1c8312a..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/dto/OceanEngineTokenDto.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.baiye.modules.distribute.dto; - -import cn.hutool.core.date.DatePattern; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.Date; - -/** - * @author Enzo - * @date 2023-11-2 - */ -@Data -public class OceanEngineTokenDto implements Serializable { - private static final long serialVersionUID = -7107014280197393381L; - private Long userId; - - private Long expiresIn; - - private Long companyId; - - private Integer status; - - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DatePattern.NORM_DATETIME_PATTERN, timezone = "GMT+8") - private Date authorizeTime; - - @NotBlank - private String authorizeName; - - private Long refreshTokenExpiresIn; - - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/dto/PushClueDTO.java b/admin/src/main/java/com/baiye/modules/distribute/dto/PushClueDTO.java deleted file mode 100644 index d999192..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/dto/PushClueDTO.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.baiye.modules.distribute.dto; - -import lombok.Data; - -import java.util.Map; - -/** - * @author Enzo - * @date 2023-12-6 - */ -@Data -public class PushClueDTO { - - - - private String remark; - - /** - * 人工审核推送手机号, mobile就不是手机号字段了 - */ - private String called; - - /** - * 话单id - */ - private String recId; - - /** - * 太空猫传递的线索ID - */ - private Long variable; - - /** - * nid - */ - private String mobile; - - - private String empClientTypeName; - - - private Map clientVariables; - - - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/dto/PushLinkDTO.java b/admin/src/main/java/com/baiye/modules/distribute/dto/PushLinkDTO.java deleted file mode 100644 index c7ddb3d..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/dto/PushLinkDTO.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.baiye.modules.distribute.dto; - -import com.baiye.validation.group.CreateGroup; -import com.baiye.validation.group.UpdateGroup; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import javax.validation.constraints.NotNull; -import java.util.List; - -@Data -public class PushLinkDTO { - - @Schema(title = "ID") - @NotNull(message = "ID不能为空", groups = { UpdateGroup.class }) - private Long id; - - @Schema(title = "业务名") - @NotNull(message = "业务名不能为空", groups = { CreateGroup.class }) - private String name; - - @Schema(title = "appKey标识") - private String appKey; - - @Schema(title = "业务方、公司 用户ID") - private Long companyId; - - @Schema(title = "渠道标识") - private List channelIdentifyingList; - - - @Schema(title = "渠道链接") - private String channelUrl; - - @Schema(title = "渠道类型(0-大坝，1-飞鱼，2-第三方)") - @NotNull(message = "请选择渠道类型", groups = { CreateGroup.class }) - private Integer channelType; - - @Schema(title = "状态(1-启用接收,0-拒绝接收)") - private Integer status; - - - @Schema(title = "创建人") - private Long createBy; -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/dto/ReadFileDTO.java b/admin/src/main/java/com/baiye/modules/distribute/dto/ReadFileDTO.java deleted file mode 100644 index 2185245..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/dto/ReadFileDTO.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.baiye.modules.distribute.dto; - -import com.baiye.validation.group.CreateGroup; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import java.util.List; - -@Data -public class ReadFileDTO { - - @Schema(title = "记录ID") - private Long recordId; - - @Schema(title = "渠道名称") - @NotBlank(message = "渠道名称不能为空", groups = {CreateGroup.class}) - private String channelName; - - @Schema(title = "分发人用户ID集合") - @NotEmpty(message = "用户不能为空", groups = {CreateGroup.class}) - private List distributorsUserIdList; -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/dto/ReceivePushLeadsDTO.java b/admin/src/main/java/com/baiye/modules/distribute/dto/ReceivePushLeadsDTO.java deleted file mode 100644 index 1452a08..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/dto/ReceivePushLeadsDTO.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.baiye.modules.distribute.dto; - -import lombok.Data; - -import java.util.List; - -/** - * @Author YQY - * @Date 2023/8/10 - */ -@Data -public class ReceivePushLeadsDTO { - - private String appKey; - - private List clueList; - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/dto/StoreDTO.java b/admin/src/main/java/com/baiye/modules/distribute/dto/StoreDTO.java deleted file mode 100644 index 08e4a61..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/dto/StoreDTO.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.baiye.modules.distribute.dto; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import org.springdoc.api.annotations.ParameterObject; - -import java.math.BigDecimal; - -/** - * @author wjt - * @date 2023/9/13 - */ -@Data -@Schema(title = "门店管理dto") -@ParameterObject -public class StoreDTO { - @Schema(description = "门店名称") - private String storeName; - @Schema(description = "门店id") - private Long id; - @Schema(description = "纬度") - private BigDecimal latitude; - @Schema(description = "经度") - private BigDecimal longitude; - @Schema(description = "联系方式") - private String nid; - @Schema(description = "门店地址") - private String address; - @Schema(description = "距离/米") - private Double distance; - @Schema(description = "序号") - private Integer index; - @Schema(description = "区") - private String county; - @Schema(description = "详情") - private String detail; - @Schema(description = "营业开始时间") - private String tradeStartTime; - @Schema(description = "营业结束时间") - private String tradeEndTime; -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/dto/StoreUserDTO.java b/admin/src/main/java/com/baiye/modules/distribute/dto/StoreUserDTO.java deleted file mode 100644 index 650af05..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/dto/StoreUserDTO.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.baiye.modules.distribute.dto; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import org.springdoc.api.annotations.ParameterObject; - -/** - * @author Enzo - * @date 2023-10-20 - */ -@Data -@Schema(title = "门店管理dto") -@ParameterObject -public class StoreUserDTO { - @Schema(description = "门店名称") - private String storeName; - - @Schema(description = "用户id") - private Long userId; - - @Schema(description = "用户id") - private Long storeId; -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/dto/TripartiteDTO.java b/admin/src/main/java/com/baiye/modules/distribute/dto/TripartiteDTO.java deleted file mode 100644 index d37005f..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/dto/TripartiteDTO.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.baiye.modules.distribute.dto; - -import com.google.gson.annotations.SerializedName; -import lombok.Builder; -import lombok.Data; - -/** - * @author Enzo - * @date : 2024/3/4 - */ -@Data -@Builder -public class TripartiteDTO { - - @SerializedName("timestamp") - private Long timestamp; - - @SerializedName("request_id") - private String requestId; - - @SerializedName("nid") - private String nid; - - @SerializedName("other_info") - private String otherInfo; - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/entity/ClueRecordEntity.java b/admin/src/main/java/com/baiye/modules/distribute/entity/ClueRecordEntity.java deleted file mode 100644 index d342352..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/entity/ClueRecordEntity.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.baiye.modules.distribute.entity; - -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baiye.entity.BaseEntity; -import com.baiye.extend.mybatis.plus.alias.TableAlias; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Getter; -import lombok.Setter; - -/** - * @Author YQY - * @Date 2023/8/1 - */ -@Getter -@Setter -@TableName("tb_clue_record") -@Schema(title = "线索上传文件记录") -@TableAlias("cr") -public class ClueRecordEntity extends BaseEntity { - - private static final long serialVersionUID = 1L; - - @TableId - @Schema(title = "线索上传文件记录ID") - private Long clueRecordId; - - @Schema(title = "上传状态 0:上传中 1:上传失败 2:上传成功") - private Integer status = 0; - - @Schema(title = "上传文件名") - private String oldFileName; - - @Schema(title = "存入路径") - private String url; - - @Schema(title = "备注") - private String remark; - - @Schema(title = "渠道类型") - private String channelType; - - @Schema(title = "渠道标识") - private String channelIdentifying; - - @Schema(title = "成功条数") - private Integer successNum = 0; - - @Schema(title = "失败条数") - private Integer failNum = 0; - - @Schema(title = "分配状态: 0:未分配 1:已分配") - private Integer allocationStatus = 0; - - @Schema(title = "记录类型 0:文件上传 1:资源推送") - private Integer recordType = 0; - - @Schema(title = "分发状态 0:未分发 1:已分发") - private Integer distributeStatus = 0; - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/entity/ClueStageEntity.java b/admin/src/main/java/com/baiye/modules/distribute/entity/ClueStageEntity.java deleted file mode 100644 index 8725bd1..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/entity/ClueStageEntity.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.baiye.modules.distribute.entity; - -import com.baiye.entity.BaseEntity; -import com.baiye.validation.group.CreateGroup; -import com.baiye.validation.group.UpdateGroup; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Getter; -import lombok.Setter; -import lombok.ToString; -import org.springframework.validation.annotation.Validated; - -import javax.validation.constraints.NotNull; - -@Getter -@Setter -@ToString -@TableName("tb_clue_stage") -@Schema(title = "线索阶段表") -@Validated -public class ClueStageEntity extends BaseEntity { - - private static final long serialVersionUID = 1L; - - @TableId - @Schema(title = "ID") - @NotNull(message = "ID不能为空", groups = { UpdateGroup.class }) - private Long clueStageId; - - @Schema(title = "线索阶段名称") - @NotNull(message = "线索阶段名称不能为空", groups = { CreateGroup.class }) - private String name; - - @Schema(title = "线索阶段排序") - @NotNull(message = "线索阶段排序不能为空", groups = { CreateGroup.class }) - private Integer sort; - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/entity/CustomEntity.java b/admin/src/main/java/com/baiye/modules/distribute/entity/CustomEntity.java deleted file mode 100644 index 529d56d..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/entity/CustomEntity.java +++ /dev/null @@ -1,118 +0,0 @@ -package com.baiye.modules.distribute.entity; - -import com.baiye.entity.BaseEntity; -import com.baiye.extend.mybatis.plus.alias.TableAlias; -import com.baiye.extend.mybatis.plus.converter.JsonStringArrayTypeHandler; -import com.baiye.validation.group.CreateGroup; -import com.baiye.validation.group.UpdateGroup; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Getter; -import lombok.Setter; -import org.springframework.validation.annotation.Validated; - -import javax.validation.constraints.NotNull; -import java.util.Date; -import java.util.List; - -/** - * @author Enzo - */ -@Getter -@Setter -@TableName(value = "tb_custom", autoResultMap = true) -@TableAlias("cm") -@Validated -@Schema(title = "客户表") -public class CustomEntity extends BaseEntity { - - private static final long serialVersionUID = 1L; - - @Schema(description = "编号") - private String batchNo; - - @TableId - @Schema(title = "ID") - @NotNull(message = "ID不能为空", groups = { UpdateGroup.class }) - private Long customId; - - @Schema(title = "客户名称") - @NotNull(message = "客户名称不能为空", groups = { CreateGroup.class }) - private String customName; - - @Schema(title = "客户联系方式") - @NotNull(message = "客户联系方式不能为空", groups = { CreateGroup.class }) - private String customNid; - - @Schema(title = "省") - @NotNull(message = "地址不能为空", groups = { CreateGroup.class }) - private String economize; - - @Schema(title = "市") - @NotNull(message = "地址不能为空", groups = { CreateGroup.class }) - private String market; - - @Schema(title = "区") - private String distinguish; - - @Schema(title = "详细地址") - @NotNull(message = "详细地址不能为空", groups = { CreateGroup.class }) - private String detailAddress; - - @Schema(title = "其它地址信息-定位使用") - private String otherAddressesInfo; - - @Schema(title = "半径") - @NotNull(message = "半径不能为空", groups = { CreateGroup.class }) - private String radius; - - @Schema(title = "报名状态 0:待提交 1:已报名 2 审核通过") - @NotNull(message = "状态不能为空", groups = { CreateGroup.class }) - private Integer enrollStatus; - - @Schema(description = "审核类型 2初审 3复审") - private Integer type; - - @Schema(description = "公司id") - private Long companyId; - - @Schema(description = "录入员姓名") - private String enterName; - - @Schema(description = "分发时间") - private Date distributeTime; - - @Schema(title = "备注") - private String remark; - - @Schema(title = "客户类型 0:地理 1:基础") - private Integer customType; - - @Schema(title = "复审员id") - private Long reviewUserId; - - @Schema(title = "分发员id") - private Long distributorId; - - @Schema(title = "渠道类型渠道类型(1 手动创建 2文件上传 3飞鱼回传 4话单回传 5 api回传)") - private Integer channelType; - - @Schema(title = "性别(0-男，1-女)") - private Integer sex; - - @Schema(title = "客户资料") - private String customInformation; - - @Schema(title = "渠道名称") - private String channelName; - - @TableField(value = "channel_identifying", typeHandler = JsonStringArrayTypeHandler.class) - @Schema(title = "渠道标识") - private List channelIdentifying; - - @TableField(value = "salesman_user_id", typeHandler = JsonStringArrayTypeHandler.class) - @Schema(title = "业务员ID集合") - private List salesmanUserId; -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/entity/CustomStoreEntity.java b/admin/src/main/java/com/baiye/modules/distribute/entity/CustomStoreEntity.java deleted file mode 100644 index a38a297..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/entity/CustomStoreEntity.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.baiye.modules.distribute.entity; - -import com.baiye.entity.BaseEntity; -import com.baiye.validation.group.UpdateGroup; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Getter; -import lombok.Setter; -import org.springframework.validation.annotation.Validated; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.time.LocalDateTime; - -@Getter -@Setter -@TableName("tb_custom_store") -@Validated -@Schema(title = "客户表门店关联表") -public class CustomStoreEntity extends BaseEntity { - - private static final long serialVersionUID = 1L; - - @TableId - @Schema(title = "ID") - @NotNull(message = "ID不能为空", groups = { UpdateGroup.class }) - private Long customStoreId; - - @Schema(title = "门店ID") - @NotNull(message = "门店不能为空") - private Long storeId; - - @Schema(title = "客户ID") - private Long customId; - - @Schema(title = "门店名称") - @NotBlank(message = "门店名称不能为空") - private String storeName; - - @Schema(title = "预约日期") - private LocalDateTime reservationDate; - - @Schema(title = "预约时间") - private String reservationTime; -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/entity/DirectClueEntity.java b/admin/src/main/java/com/baiye/modules/distribute/entity/DirectClueEntity.java deleted file mode 100644 index 28ffd99..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/entity/DirectClueEntity.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.baiye.modules.distribute.entity; - -import com.baiye.entity.BaseEntity; -import com.baiye.extend.mybatis.plus.alias.TableAlias; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -import java.time.LocalDateTime; - -@Getter -@Setter -@TableName("tb_direct_clue") -@TableAlias("dc") -@Schema(title = "直达线索表") -@AllArgsConstructor -@NoArgsConstructor -public class DirectClueEntity extends BaseEntity { - - private static final long serialVersionUID = 1L; - - @TableId - @Schema(title = "直达线索ID") - private Long directClueId; - - @Schema(title = "编号") - private String batchNo; - - @Schema(title = "客户名称") - private String customName; - - @Schema(title = "nid") - private String nid; - - @Schema(title = "来源 0:巨量") - private Integer originType; - - @Schema(title = "有效状态 0:有效 1:无效") - private Integer effectiveStatus; - - @Schema(title = "资源标签") - private String clueLabelName; - - @Schema(title = "分发状态 0:未分发 1:已分发") - private Integer distributeType; - - @Schema(title = "分发日期") - private LocalDateTime distributeDate; - - @Schema(title = "资源分发的分发员用户ID") - private Long distributeUserId; - - @Schema(title = "其它线索信息") - private String otherClue; - - public DirectClueEntity(String customName, String nid, String otherClue) { - this.customName = customName; - this.nid = nid; - this.otherClue = otherClue; - } -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/entity/DirectClueUserEntity.java b/admin/src/main/java/com/baiye/modules/distribute/entity/DirectClueUserEntity.java deleted file mode 100644 index 276818f..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/entity/DirectClueUserEntity.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.baiye.modules.distribute.entity; - -import com.baiye.validation.group.CreateGroup; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Getter; -import lombok.Setter; - -import javax.validation.constraints.NotNull; - -@Getter -@Setter -@TableName("tb_direct_clue_user") -@Schema(title = "直达线索表") -public class DirectClueUserEntity { - - private static final long serialVersionUID = 1L; - - @TableId - @Schema(title = "直达线索用户关联表ID") - private Long id; - - @Schema(title = "线索ID") - @NotNull(message = "线索不能为空", groups = CreateGroup.class) - private Long clueId; - - @Schema(title = "用户ID") - @NotNull(message = "用户不能为空", groups = CreateGroup.class) - private Long userId; - - @Schema(title = "用户名") - private String userName; -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/entity/DistributeReportChannelEntity.java b/admin/src/main/java/com/baiye/modules/distribute/entity/DistributeReportChannelEntity.java deleted file mode 100644 index 6810c32..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/entity/DistributeReportChannelEntity.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.baiye.modules.distribute.entity; - -import cn.hutool.core.date.DateUtil; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Getter; -import lombok.Setter; -import lombok.ToString; - -import java.io.Serializable; -import java.util.Date; - -/** - * @author wjt - * @date 2023/8/11 - */ -@Getter -@Setter -@ToString -@TableName("tb_distribute_report_channel") -@Schema(title = "导入线索分配统计-渠道") -public class DistributeReportChannelEntity implements Serializable { - - @TableId - @Schema(title = "ID") - private Long id; - - @Schema(title = "用户id") - private Long userId; - - @Schema(title = "用户名") - private String username; - - @Schema(title = "渠道") - private String channel; - - @Schema(title = "当日量") - private Integer todayNum = 0; - - @Schema(title = "总量") - private Integer totalNum = 0; - - @Schema(title = "分配量") - private Integer distributeNum = 0; - - @Schema(title = "占比") - private double ratio; - - @Schema(title = "日环比") - private double ratioDay; - - @Schema(title = "统计日期") - private Date createTime; - - public DistributeReportChannelEntity createDistributeReportChannel(Long userId, String username, String channel, - Integer todayNum, Integer totalNum, Integer distributeNum, Double ratio, Double ratioDay) { - this.setUserId(userId); - this.setUsername(username); - this.setChannel(channel); - this.setTodayNum(todayNum); - this.setTotalNum(totalNum); - this.setDistributeNum(distributeNum); - this.setRatio(ratio); - this.setRatioDay(ratioDay); - this.setCreateTime(DateUtil.date()); - return this; - } - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/entity/DistributeReportEntity.java b/admin/src/main/java/com/baiye/modules/distribute/entity/DistributeReportEntity.java deleted file mode 100644 index 8a0ce6e..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/entity/DistributeReportEntity.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.baiye.modules.distribute.entity; - -import cn.hutool.core.date.DateUtil; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Getter; -import lombok.Setter; -import lombok.ToString; - -import java.io.Serializable; -import java.util.Date; - -/** - * @author wjt - * @date 2023/8/11 - */ -@Getter -@Setter -@ToString -@TableName("tb_distribute_report") -@Schema(title = "导入线索分配统计") -public class DistributeReportEntity implements Serializable { - - @TableId - @Schema(title = "ID") - private Long id; - - @Schema(title = "用户id") - private Long userId; - - @Schema(title = "用户名") - private String username; - - @Schema(title = "渠道") - private String channel; - - @Schema(title = "总量") - private Integer todayNum = 0; - - @Schema(title = "占比") - private double ratio; - - @Schema(title = "日环比") - private double ratioDay; - - @Schema(title = "统计日期") - private Date createTime; - - public DistributeReportEntity createDistributeReport(Long userId, String username, String channel, Integer todayNum, - Double ratio, Double ratioDay) { - this.setUserId(userId); - this.setUsername(username); - this.setChannel(channel); - this.setTodayNum(todayNum); - this.setRatio(ratio); - this.setRatioDay(ratioDay); - this.setCreateTime(DateUtil.date()); - return this; - } - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/entity/DistributeReportUserEntity.java b/admin/src/main/java/com/baiye/modules/distribute/entity/DistributeReportUserEntity.java deleted file mode 100644 index 9c0a3e5..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/entity/DistributeReportUserEntity.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.baiye.modules.distribute.entity; - -import cn.hutool.core.date.DateUtil; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Getter; -import lombok.Setter; -import lombok.ToString; - -import java.io.Serializable; -import java.util.Date; - -/** - * @author wjt - * @date 2023/8/11 - */ -@Getter -@Setter -@ToString -@TableName("tb_distribute_report_user") -@Schema(title = "导入线索分配统计-用户") -public class DistributeReportUserEntity implements Serializable { - - @TableId - @Schema(title = "ID") - private Long id; - - @Schema(title = "用户id") - private Long userId; - - @Schema(title = "用户名") - private String username; - - @Schema(title = "当日量") - private Integer todayNum = 0; - - @Schema(title = "总量") - private Integer totalNum = 0; - - @Schema(title = "分配量") - private Integer distributeNum = 0; - - @Schema(title = "占比") - private double ratio; - - @Schema(title = "日环比") - private double ratioDay; - - @Schema(title = "统计日期") - private Date createTime; - - public DistributeReportUserEntity createDistributeReportUser(Long userId, String username, Integer todayNum, - Integer totalNum, Integer distributeNum, Double ratio, Double ratioDay) { - this.setUserId(userId); - this.setUsername(username); - this.setTodayNum(todayNum); - this.setTotalNum(totalNum); - this.setDistributeNum(distributeNum); - this.setRatio(ratio); - this.setRatioDay(ratioDay); - this.setCreateTime(DateUtil.date()); - return this; - } - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/entity/DistributeTaskEntity.java b/admin/src/main/java/com/baiye/modules/distribute/entity/DistributeTaskEntity.java deleted file mode 100644 index 8d33ebe..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/entity/DistributeTaskEntity.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.baiye.modules.distribute.entity; - -import com.baiye.entity.BaseEntity; -import com.baiye.extend.mybatis.plus.alias.TableAlias; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Getter; -import lombok.Setter; -import lombok.ToString; - -import java.time.LocalDateTime; - -/** - * @Author YQY - * @Date 2023/8/11 - */ -@Getter -@Setter -@ToString -@TableName("tb_distribute_task") -@Schema(title = "分发任务") -@TableAlias("dt") -public class DistributeTaskEntity extends BaseEntity { - - private static final long serialVersionUID = 1L; - - @TableId - @Schema(title = "分发任务ID") - private Long distributeTaskId; - - @Schema(title = "分发类型 0:手动分发 1:自动分发") - private Integer distributeTaskType; - - @Schema(title = "任务名称") - private String taskName; - - @Schema(title = "分发规则 0:平均 1:权重") - private Integer ruleStatus; - - @Schema(title = "分发时间 0:实时 1:定时") - private Integer timeStatus; - - @Schema(title = "定时开始时间") - private LocalDateTime startTime; - - @Schema(title = "文件规则前缀") - private String fileRulePrefix; - - @Schema(title = "上传文件记录ID “,”相隔") - private String fileRecordId; - - @Schema(title = "执行状态 0:未执行 1:执行中 2:已执行 3:暂停") - private Integer executeStatus; - - @Schema(title = "任务默认类型 0:默认 1:非默认") - private Integer defaultType; - - @Schema(title = "任务执行次数") - private Integer executeNum; - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/entity/DistributeTaskUserEntity.java b/admin/src/main/java/com/baiye/modules/distribute/entity/DistributeTaskUserEntity.java deleted file mode 100644 index ba67d52..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/entity/DistributeTaskUserEntity.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.baiye.modules.distribute.entity; - -import com.baiye.entity.BaseEntity; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Getter; -import lombok.Setter; -import lombok.ToString; - -/** - * @Author YQY - * @Date 2023/8/11 - */ -@Getter -@Setter -@ToString -@TableName("tb_distribute_task_user") -@Schema(title = "分发任务用户权重表") -public class DistributeTaskUserEntity extends BaseEntity { - - private static final long serialVersionUID = 1L; - - @TableId - @Schema(title = "ID") - private Long id; - - @Schema(title = "分发任务ID") - private Long distributeTaskId; - - @Schema(title = "用户ID") - private Long userId; - - @Schema(title = "权重值") - private Integer weight; - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/entity/FileContrastEntity.java b/admin/src/main/java/com/baiye/modules/distribute/entity/FileContrastEntity.java deleted file mode 100644 index 7590b1c..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/entity/FileContrastEntity.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.baiye.modules.distribute.entity; - -import com.baiye.entity.BaseEntity; -import com.baiye.extend.mybatis.plus.alias.TableAlias; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Getter; -import lombok.Setter; - -import java.util.List; - - -/** - * @author Enzo - * @date : 2024-3-13 - */ - -@Getter -@Setter -@TableAlias("fl") -@Schema(title = "文件上传对比") -@TableName(value = "tb_file_contrast_task" ,autoResultMap = true) -public class FileContrastEntity extends BaseEntity { - - private static final long serialVersionUID = 7079254193191231031L; - - @TableId - @Schema(title = "ID") - private Long id; - - @Schema(title = "任务名称") - private String taskName; - - @Schema(title = "对比状态") - private Integer status; - - @Schema(title = "对比数量") - private Integer contrastNum; - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/entity/FileContrastRecordEntity.java b/admin/src/main/java/com/baiye/modules/distribute/entity/FileContrastRecordEntity.java deleted file mode 100644 index e46394f..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/entity/FileContrastRecordEntity.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.baiye.modules.distribute.entity; - -import com.baiye.entity.BaseEntity; -import com.baiye.extend.mybatis.plus.alias.TableAlias; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Getter; -import lombok.Setter; - - -/** - * @author Enzo - * @date : 2024-3-13 - */ - -@Getter -@Setter -@TableAlias("fs") -@Schema(title = "文件上传对比") -@TableName(value = "tb_file_contrast_record", autoResultMap = true) -public class FileContrastRecordEntity extends BaseEntity { - - private static final long serialVersionUID = 1272925960799071730L; - - @TableId - @Schema(title = "ID") - private Long id; - - @Schema(title = "任务id") - private Long taskId; - - @Schema(title = "对比数量") - private Integer contrastNum; - - @Schema(title = "对比状态") - private Integer status; - - @Schema(title = "文件地址") - private String filePath; - - @Schema(title = "下载地址") - private String downPath; - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/entity/FileContrastSourceEntity.java b/admin/src/main/java/com/baiye/modules/distribute/entity/FileContrastSourceEntity.java deleted file mode 100644 index 0688b46..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/entity/FileContrastSourceEntity.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.baiye.modules.distribute.entity; - -import com.baiye.entity.BaseEntity; -import com.baiye.extend.mybatis.plus.alias.TableAlias; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Getter; -import lombok.Setter; - - -/** - * @author Enzo - * @date : 2024-3-13 - */ - -@Getter -@Setter -@TableAlias("fs") -@Schema(title = "文件上传对比") -@TableName(value = "tb_file_contrast_source" ,autoResultMap = true) -public class FileContrastSourceEntity extends BaseEntity { - - - private static final long serialVersionUID = -2751989800003535012L; - - @TableId - @Schema(title = "ID") - private Long id; - - @Schema(title = "任务id") - private Long taskId; - - @Schema(title = "nid") - private String nid; - - @Schema(title = "备注") - private String remark; - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/entity/LabelEntity.java b/admin/src/main/java/com/baiye/modules/distribute/entity/LabelEntity.java deleted file mode 100644 index 2013039..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/entity/LabelEntity.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.baiye.modules.distribute.entity; - -import com.baiye.entity.BaseEntity; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Getter; -import lombok.Setter; -import lombok.ToString; - -@Getter -@Setter -@ToString -@TableName("tb_label") -@Schema(title = "标签管理") -public class LabelEntity extends BaseEntity { - - private static final long serialVersionUID = 1L; - - @TableId - @Schema(title = "ID") - private Long id; - - @Schema(title = "标签名称") - private String labelName; - - @Schema(title = "标签类型") - private Integer type; - - @Schema(title = "所属标签组ID") - private Long labelOrganizeId; - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/entity/LabelOrganizeEntity.java b/admin/src/main/java/com/baiye/modules/distribute/entity/LabelOrganizeEntity.java deleted file mode 100644 index 8d50377..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/entity/LabelOrganizeEntity.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.baiye.modules.distribute.entity; - -import com.baiye.entity.BaseEntity; -import com.baiye.extend.mybatis.plus.alias.TableAlias; -import com.baiye.validation.group.CreateGroup; -import com.baiye.validation.group.UpdateGroup; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Getter; -import lombok.Setter; -import lombok.ToString; - -import javax.validation.constraints.NotNull; -import java.util.List; -import java.util.Set; - -@Getter -@Setter -@ToString -@TableName("tb_label_organize") -@Schema(title = "标签组管理") -@TableAlias("lo") -public class LabelOrganizeEntity extends BaseEntity { - - private static final long serialVersionUID = 1L; - - @TableId - @Schema(title = "ID") - @NotNull(message = "组ID不能为空", groups = { UpdateGroup.class }) - private Long id; - - @Schema(title = "标签组名称") - @NotNull(message = "标签组名称不能为空", groups = { CreateGroup.class }) - private String name; - - @Schema(title = "是否启用标签组 0:不启用 1:启用") - @NotNull(message = "请选择是否启用标签组", groups = { CreateGroup.class }) - private Integer isEnable = 1; - - @TableField(exist = false) - private List labelList; - - @TableField(exist = false) - private List labelEntityList; - - @TableField(exist = false) - private Set delLabelId; - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/entity/OceanEngineSourceEntity.java b/admin/src/main/java/com/baiye/modules/distribute/entity/OceanEngineSourceEntity.java deleted file mode 100644 index 5442020..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/entity/OceanEngineSourceEntity.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.baiye.modules.distribute.entity; - -import com.baiye.entity.BaseEntity; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Getter; -import lombok.Setter; -import lombok.ToString; - -/** - * @author wjt - * @date 2023/11/2 - */ -@Getter -@Setter -@ToString -@TableName(value = "tb_ocean_engine_source", autoResultMap = true) -public class OceanEngineSourceEntity extends BaseEntity { - - @TableId - @Schema(title = "id") - private Long id; - - @Schema(title = "user_id") - private Long userId; - - @Schema(title = "content") - private String content; -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/entity/OceanEngineToken.java b/admin/src/main/java/com/baiye/modules/distribute/entity/OceanEngineToken.java deleted file mode 100644 index 6346ae3..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/entity/OceanEngineToken.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.baiye.modules.distribute.entity; - -import com.baiye.extend.mybatis.plus.converter.JsonStringArrayTypeHandler; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Getter; -import lombok.Setter; -import lombok.ToString; - -import java.util.Date; -import java.util.List; - - -/** - * @author Enzo - * @date : 2023-11-2 - */ - -@Getter -@Setter -@ToString -@TableName(value = "tb_ocean_engine_token", autoResultMap = true) -public class OceanEngineToken { - - @TableId - @Schema(title = "id") - private Long id; - - @Schema(name = "status") - private Integer status; - - - @Schema(name = "user_id") - private Long userId; - - @Schema(name = "authorize_name") - private String authorizeName; - - @Schema(name = "company_id") - private Long companyId; - - @Schema(name = "access_token") - private String accessToken; - - @Schema(name = "refresh_token") - private String refreshToken; - - @TableField(value = "advertiser_ids", typeHandler = JsonStringArrayTypeHandler.class) - @Schema(name = "advertiser_ids") - private List advertiserIds; - - @Schema(name = "expires_in") - private Long expiresIn; - - @Schema(name = "refresh_token_expires_in") - private Long refreshTokenExpiresIn; - - @Schema(name = "authorize_time") - private Date authorizeTime; - - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/entity/PushClueInfoEntity.java b/admin/src/main/java/com/baiye/modules/distribute/entity/PushClueInfoEntity.java deleted file mode 100644 index 8f967d5..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/entity/PushClueInfoEntity.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.baiye.modules.distribute.entity; - -import com.baiye.entity.BaseEntity; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Getter; -import lombok.Setter; -import lombok.ToString; - -/** - * @author Enzo - * @date : 2024/3/1 - */ - -@Getter -@Setter -@ToString -@TableName("tb_push_task_user") -@Schema(title = "推送线索表") -public class PushClueInfoEntity extends BaseEntity { - - private static final long serialVersionUID = 1087915923814826863L; - - @TableId - @Schema(title = "ID") - private Long id; - - @Schema(title = "用户id") - private Long userId; - - @Schema(title = "线索id") - private Long clueId; - - @Schema(title = "请求id") - private String requestId; - - @Schema(title = "推送内容") - private String pushInfo; - - @Schema(title = "推送状态") - private Integer pushStatus; - - @Schema(title = "返回消息") - private String pushResult; - - @Schema(title = "推送次数") - private Integer sendNum; -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/entity/PushConfigEntity.java b/admin/src/main/java/com/baiye/modules/distribute/entity/PushConfigEntity.java deleted file mode 100644 index 573e808..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/entity/PushConfigEntity.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.baiye.modules.distribute.entity; - -import com.baiye.entity.BaseEntity; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Getter; -import lombok.Setter; -import lombok.ToString; - -/** - * @author Enzo - * @date : 2024/3/1 - */ - -@Getter -@Setter -@ToString -@TableName("tb_push_config") -@Schema(title = "推送配置表") -public class PushConfigEntity extends BaseEntity { - - private static final long serialVersionUID = -6950203949409966313L; - - @TableId - @Schema(title = "id") - private Long id; - - @Schema(title = "用户id") - private Long userId; - - @Schema(title = "是否启用") - private Integer status; - - @Schema(title = "推送链接") - private String pushUrl; -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/entity/PushLinkEntity.java b/admin/src/main/java/com/baiye/modules/distribute/entity/PushLinkEntity.java deleted file mode 100644 index f1c9ce4..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/entity/PushLinkEntity.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.baiye.modules.distribute.entity; - -import com.baiye.entity.BaseEntity; -import com.baiye.extend.mybatis.plus.alias.TableAlias; -import com.baiye.extend.mybatis.plus.converter.JsonStringArrayTypeHandler; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Getter; -import lombok.Setter; - -import java.util.List; - -@Getter -@Setter -@TableName(value = "tb_push_link", autoResultMap = true) -@Schema(title = "推送链接") -@TableAlias("pl") -public class PushLinkEntity extends BaseEntity { - - private static final long serialVersionUID = 1L; - - @TableId(type = IdType.AUTO) - @Schema(title = "ID") - private Long id; - - @Schema(title = "业务名") - private String name; - - @Schema(title = "appKey") - private String appKey; - - @Schema(title = "记录ID") - private Long clueRecordId; - - @Schema(title = "业务方、公司 用户ID") - private Long companyId; - - @Schema(title = "渠道标识") - @TableField(value = "channel_identifying", typeHandler = JsonStringArrayTypeHandler.class) - private List channelIdentifying; - - @Schema(title = "渠道链接") - private String channelUrl; - - @Schema(title = "渠道类型(0-大坝，1-飞鱼，2-第三方)") - private Integer channelType; - - @Schema(title = "渠道类型(0~2)") - private Integer authType; - - @Schema(title = "状态(1-启用接收,0-拒绝接收)") - private Integer status; -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/entity/StoreEntity.java b/admin/src/main/java/com/baiye/modules/distribute/entity/StoreEntity.java deleted file mode 100644 index f6b1460..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/entity/StoreEntity.java +++ /dev/null @@ -1,86 +0,0 @@ -package com.baiye.modules.distribute.entity; - -import com.baiye.entity.LogicDeletedBaseEntity; -import com.baiye.extend.mybatis.plus.alias.TableAlias; -import com.baiye.validation.group.CreateGroup; -import com.baiye.validation.group.UpdateGroup; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Getter; -import lombok.Setter; - -import javax.validation.constraints.NotNull; -import java.math.BigDecimal; - -/** - * @author wjt - * @date 2023/9/5 - */ -@Getter -@Setter -@TableName("tb_store") -@Schema(title = "门店") -@TableAlias("st") -public class StoreEntity extends LogicDeletedBaseEntity { - - @TableId - @Schema(description = "ID") - @Parameter(description = "id") - @NotNull(message = "ID不能为空", groups = {UpdateGroup.class}) - private Long id; - - @Schema(description = "门店名称") - @NotNull(message = "门店名称不能为空", groups = {CreateGroup.class}) - private String storeName; - - @Schema(description = "门店类型 0-直营店 1-加盟店") - @NotNull(message = "门店类型不能为空", groups = {CreateGroup.class}) - private Integer storeType; - - @Schema(description = "门店状态 0-正常 1-未营业") - @NotNull(message = "门店状态不能为空", groups = {CreateGroup.class}) - private Integer storeStatus; - @Schema(description = "nid") - private String nid; - @Schema(description = "省份") - @NotNull(message = "省份不能为空", groups = {CreateGroup.class}) - private String province; - - @Schema(description = "城市") - @NotNull(message = "城市不能为空", groups = {CreateGroup.class}) - private String city; - - @Schema(description = "区县") - @NotNull(message = "区县不能为空", groups = {CreateGroup.class}) - private String county; - - @Schema(description = "详细地址") - private String detail; - - @Schema(description = "营业开始时间") - @NotNull(message = "营业时间不能为空", groups = {CreateGroup.class}) - private String tradeStartTime; - - @Schema(description = "营业结束时间") - @NotNull(message = "营业时间不能为空", groups = {CreateGroup.class}) - private String tradeEndTime; - - @TableField(exist = false) - @Schema(description = "地址") - private String address; - - @TableField(exist = false) - @Schema(description = "关联的坐席") - private Long userId; - - @Schema(description = "经度") - @NotNull(message = "经度不能为空", groups = {CreateGroup.class}) - private BigDecimal longitude; - - @Schema(description = "玮度") - @NotNull(message = "玮度不能为空", groups = {CreateGroup.class}) - private BigDecimal latitude; -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/entity/StoreUserEntity.java b/admin/src/main/java/com/baiye/modules/distribute/entity/StoreUserEntity.java deleted file mode 100644 index 44753e6..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/entity/StoreUserEntity.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.baiye.modules.distribute.entity; - -import com.baiye.entity.LogicDeletedBaseEntity; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Getter; -import lombok.Setter; - - -/** - * @author wjt - * @date 2023/9/15 - */ -@Getter -@Setter -@TableName("tb_store_user") -@Schema(title = "门店账号关联") -public class StoreUserEntity extends LogicDeletedBaseEntity { - - @TableId - @Schema(description = "ID") - @Parameter(description = "id") - private Long id; - - - @Schema(description = "门店id") - private Long storeId; - - - @Schema(description = "用户id") - private Long userId; -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/entity/TagEntity.java b/admin/src/main/java/com/baiye/modules/distribute/entity/TagEntity.java deleted file mode 100644 index 93761ad..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/entity/TagEntity.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.baiye.modules.distribute.entity; - -import com.baiye.entity.BaseEntity; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Getter; -import lombok.Setter; -import lombok.ToString; - -/** - * @author Enzo - * @date : 2023/12/6 - */ -@Getter -@Setter -@ToString -@TableName(value = "tb_channel_tag", autoResultMap = true) -public class TagEntity extends BaseEntity { - - private static final long serialVersionUID = 8752729281820146291L; - - @TableId - @Schema(name = "id") - private Long id; - - @Schema(name = "route_name") - private String routeName; - - @Schema(name = "route_status") - private Integer routeStatus = 1; - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/entity/UserSecretKeyEntity.java b/admin/src/main/java/com/baiye/modules/distribute/entity/UserSecretKeyEntity.java deleted file mode 100644 index 2040560..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/entity/UserSecretKeyEntity.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.baiye.modules.distribute.entity; - -import com.baiye.entity.BaseEntity; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Getter; -import lombok.Setter; - -/** - * @Author YQY - * @Date 2023/8/9 - */ -@Getter -@Setter -@TableName("tb_user_secret_key") -@Schema(title = "用户appKey和秘钥对应表") -public class UserSecretKeyEntity extends BaseEntity { - - @TableId - @Schema(title = "ID") - private Long id; - - @Schema(title = "appKey") - private String appKey; - - @Schema(title = "私钥") - private String privateKey; - - @Schema(title = "公钥") - private String publicKey; - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/mapper/ClueMapper.java b/admin/src/main/java/com/baiye/modules/distribute/mapper/ClueMapper.java deleted file mode 100644 index 559ebce..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/mapper/ClueMapper.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.baiye.modules.distribute.mapper; - -import com.baiye.domain.PageParam; -import com.baiye.domain.PageResult; -import com.baiye.extend.mybatis.plus.conditions.query.LambdaQueryWrapperX; -import com.baiye.extend.mybatis.plus.mapper.ExtendMapper; -import com.baiye.extend.mybatis.plus.toolkit.WrappersX; -import com.baiye.modules.distribute.converter.ClueConverter; -import com.baiye.modules.distribute.dto.HomePageDTO; -import com.baiye.modules.distribute.entity.ClueEntity; -import com.baiye.modules.distribute.qo.ClueQo; -import com.baiye.modules.distribute.qo.HomePageQo; -import com.baiye.modules.distribute.vo.ClueVO; -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -public interface ClueMapper extends ExtendMapper { - - List findUndistributedClueIds(@Param("list") List recordIdList); - - default PageResult queryPage(PageParam pageParam, ClueQo qo) { - IPage page = this.prodPage(pageParam); - Wrapper wrapperX = this.buildQueryWrapper(qo); - this.selectPage(page, wrapperX); - IPage convert = page.convert(ClueConverter.INSTANCE::poToExcelVo); - return new PageResult<>(convert.getRecords(), convert.getTotal()); - } - - /** - * 查询新 - * @param qo - * @return - */ - default List queryList(ClueQo qo) { - Wrapper wrapperX = buildQueryWrapper(qo); - return this.selectListByQo(wrapperX); - } - - /** - * 条件查询 - * @param wrapperX - * @return - */ - List selectListByQo(@Param(Constants.WRAPPER) Wrapper wrapperX); - - - /** - * 根据 qo 构造查询 wrapper - * @param qo 查询条件 - * @return LambdaQueryWrapperX - */ - default Wrapper buildQueryWrapper(ClueQo qo) { - - LambdaQueryWrapperX wrapperX = WrappersX.lambdaQueryX(ClueEntity.class); - wrapperX.eqIfPresent(ClueEntity::getDeleted, 0) - .eqIfPresent(ClueEntity::getNid, qo.getNid()) - .eqIfPresent(ClueEntity::getClueId, qo.getClueId()) - .eqIfPresent(ClueEntity::getCreateBy, qo.getCreateBy()) - .likeIfPresent(ClueEntity::getClueLabelName, qo.getClueLabelName()) - .eqIfPresent(ClueEntity::getAssignedBy, qo.getAssignedBy()) - .eqIfPresent(ClueEntity::getCompanyId, qo.getCompanyId()) - .eqIfPresent(ClueEntity::getCustomId, qo.getCustomId()) - .inIfPresent(ClueEntity::getAssignedBy, (Object[]) qo.getSalesmanArray()) - .orderByDesc(ClueEntity::getCreateTime); - if (StringUtils.isNotBlank(qo.getStartTime()) && StringUtils.isNotBlank(qo.getEndTime())) { - wrapperX.between(ClueEntity::getCreateTime, qo.getStartTime(), qo.getEndTime()); - } - return wrapperX; - } - - - - List selectDetailByChannelAndAssigned(@Param("qo") HomePageQo homePageQo); - - Integer addCount(@Param("date") String date, @Param("companyId") Long companyId); - - List distributorsAssignedClueByTime(@Param("qo") HomePageQo homePageQo); - - List findCustomId(@Param("assignedBy") Long assignedBy, @Param("createBy")Long createBy); - - /** - * 线索id分配人员查询 - * - * @param id - * @param createBy - * @param num - * @return - */ - List findCustomIdAndCreate(@Param("customId") Long id, @Param("createBy") Long createBy,@Param("num") Integer num); - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/mapper/ClueRecordMapper.java b/admin/src/main/java/com/baiye/modules/distribute/mapper/ClueRecordMapper.java deleted file mode 100644 index 6777a58..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/mapper/ClueRecordMapper.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.baiye.modules.distribute.mapper; - -import com.baiye.domain.SelectData; -import com.baiye.modules.distribute.entity.ClueRecordEntity; -import com.baiye.modules.distribute.vo.ClueRecordVO; -import com.baiye.modules.distribute.qo.ClueRecordQo; -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; -import com.baiye.domain.PageParam; -import com.baiye.domain.PageResult; -import com.baiye.extend.mybatis.plus.conditions.query.LambdaAliasQueryWrapperX; -import com.baiye.extend.mybatis.plus.mapper.ExtendMapper; -import com.baiye.extend.mybatis.plus.toolkit.WrappersX; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -public interface ClueRecordMapper extends ExtendMapper { - - default PageResult queryPage(PageParam pageParam, ClueRecordQo qo) { - IPage page = this.prodPage(pageParam); - - LambdaAliasQueryWrapperX wrapperX = WrappersX.lambdaAliasQueryX(ClueRecordEntity.class); - wrapperX.likeIfPresent(ClueRecordEntity::getOldFileName, qo.getOldFileName()) - .likeIfPresent(ClueRecordEntity::getChannelType, qo.getChannelType()) - .eqIfPresent(ClueRecordEntity::getStatus, qo.getStatus()) - .eqIfPresent(ClueRecordEntity::getAllocationStatus, qo.getAllocationStatus()) - .eqIfPresent(ClueRecordEntity::getDistributeStatus, qo.getDistributeStatus()) - .eqIfPresent(ClueRecordEntity::getCreateBy, qo.getCreateBy()) - .orderByDesc(ClueRecordEntity::getCreateTime); - - if (StringUtils.isNotBlank(qo.getStartTime()) && StringUtils.isNotBlank(qo.getEndTime())) { - wrapperX.between(ClueRecordEntity::getCreateTime, qo.getStartTime(), qo.getEndTime()); - } - this.selectByPage(page, wrapperX); - return new PageResult<>(page.getRecords(), page.getTotal()); - } - - IPage selectByPage(IPage page, - @Param(Constants.WRAPPER) Wrapper wrapper); - - void updateAllocationStatusAndDistributeStatus(@Param("list") List recordIdList, - @Param("status") Integer status, @Param("distributeStatus") Integer distributeStatus); - - void updateDistributeStatus(@Param("list") List recordIdList, @Param("status") Integer status); - - List> listSelectData(@Param("qo") ClueRecordQo qo); - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/mapper/ClueStageMapper.java b/admin/src/main/java/com/baiye/modules/distribute/mapper/ClueStageMapper.java deleted file mode 100644 index 91f14e6..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/mapper/ClueStageMapper.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.baiye.modules.distribute.mapper; - -import com.baiye.extend.mybatis.plus.mapper.ExtendMapper; -import com.baiye.modules.distribute.entity.ClueStageEntity; - -public interface ClueStageMapper extends ExtendMapper { - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/mapper/CustomMapper.java b/admin/src/main/java/com/baiye/modules/distribute/mapper/CustomMapper.java deleted file mode 100644 index bca3fe7..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/mapper/CustomMapper.java +++ /dev/null @@ -1,98 +0,0 @@ -package com.baiye.modules.distribute.mapper; - -import com.baiye.constant.DefaultNumberConstants; -import com.baiye.domain.PageParam; -import com.baiye.domain.PageResult; -import com.baiye.extend.mybatis.plus.conditions.query.LambdaAliasQueryWrapperX; -import com.baiye.extend.mybatis.plus.mapper.ExtendMapper; -import com.baiye.extend.mybatis.plus.toolkit.WrappersX; -import com.baiye.modules.distribute.dto.HomePageDTO; -import com.baiye.modules.distribute.entity.CustomEntity; -import com.baiye.modules.distribute.qo.CustomQo; -import com.baiye.modules.distribute.qo.HomePageQo; -import com.baiye.modules.distribute.vo.CustomVO; -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -public interface CustomMapper extends ExtendMapper { - default PageResult queryPage(PageParam pageParam, CustomQo qo) { - IPage page = this.prodPage(pageParam); - - Wrapper wrapperX = this.buildQueryWrapper(qo); - this.selectByPage(page, wrapperX, qo.getStoreId()); - return new PageResult<>(page.getRecords(), page.getTotal()); - } - - IPage selectByPage(IPage page, @Param(Constants.WRAPPER) Wrapper wrapper, @Param("storeId") Long storeId); - - /** - * 查询最大编号 - */ - String selectMaxBatchNoByCompanyId(@Param("code") String code, @Param("companyId") Long companyId); - - /** - * 根据 qo 构造查询 wrapper - * - * @param qo 查询条件 - * @return LambdaQueryWrapperX - */ - default Wrapper buildQueryWrapper(CustomQo qo) { - - LambdaAliasQueryWrapperX wrapperX = WrappersX.lambdaAliasQueryX(CustomEntity.class); - wrapperX.eqIfPresent(CustomEntity::getCreateBy, qo.getCreateBy()) - .likeIfPresent(CustomEntity::getRemark, qo.getRemark()) - .likeIfPresent(CustomEntity::getCustomName, qo.getCustomName()) - .likeIfPresent(CustomEntity::getBatchNo, qo.getBatchNo()) - .eqIfPresent(CustomEntity::getCompanyId, qo.getCompanyId()) - .eqIfPresent(CustomEntity::getCustomNid, qo.getCustomNid()) - .eqIfPresent(CustomEntity::getReviewUserId, qo.getReviewUserId()) - .eqIfPresent(CustomEntity::getType, qo.getType()) - .eqIfPresent(CustomEntity::getDistributorId, qo.getDistributorId()) - .gtIfPresent(CustomEntity::getEnrollStatus, qo.getGreaterStatus()) - .eqIfPresent(CustomEntity::getEnrollStatus, qo.getEnrollStatus()) - .inIfPresent(CustomEntity::getCustomId, qo.getCustomIds()); - if (StringUtils.isNotBlank(qo.getDistributeStartTime()) && StringUtils.isNotBlank(qo.getDistributeEndTime())) { - wrapperX.between(CustomEntity::getDistributeTime, qo.getDistributeStartTime(), qo.getDistributeEndTime()); - } - - if (StringUtils.isNotBlank(qo.getStartTime()) && StringUtils.isNotBlank(qo.getEndTime())) { - wrapperX.between(CustomEntity::getCreateTime, qo.getStartTime(), qo.getEndTime()); - } - return wrapperX; - } - - default List queryList(CustomQo customQo) { - Wrapper wrapperX = buildQueryWrapper(customQo); - return this.selectList(wrapperX); - } - - List selectByCompanyIdAndTime(@Param("qo") HomePageQo homePageQo); - - List addCount(@Param("date") String date, @Param("companyId") Long companyId); - - List distributorsEnterClueByTime(@Param("qo") HomePageQo homePageQo); - - - /** - * 修改信息 - * - * @param phone - * @param remark - * @return - */ - default int updateNidAndRemark(String phone, String remark) { - LambdaUpdateWrapper wrapper = Wrappers.lambdaUpdate() - .set(CustomEntity::getCustomNid, phone) - .set(CustomEntity::getRemark, remark) - .eq(CustomEntity::getEnrollStatus, DefaultNumberConstants.ONE_NUMBER) - .eq(CustomEntity::getCustomNid, phone); - return this.update(null, wrapper); - } -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/mapper/CustomStoreMapper.java b/admin/src/main/java/com/baiye/modules/distribute/mapper/CustomStoreMapper.java deleted file mode 100644 index 80f9961..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/mapper/CustomStoreMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.baiye.modules.distribute.mapper; - -import com.baiye.extend.mybatis.plus.mapper.ExtendMapper; -import com.baiye.modules.distribute.entity.CustomStoreEntity; -import com.baiye.modules.distribute.vo.StoreDetailsExportVO; -import org.apache.ibatis.annotations.Param; - -import java.util.Date; -import java.util.List; -import java.util.Map; - -public interface CustomStoreMapper extends ExtendMapper { - - List> countReservationByStoreIds(@Param("storeIds") List storeIds); - - List selectStoreReservationDetails(@Param("startTime")Date startTime,@Param("endTime") Date endTime,@Param("storeId") Long storeId); - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/mapper/DirectClueMapper.java b/admin/src/main/java/com/baiye/modules/distribute/mapper/DirectClueMapper.java deleted file mode 100644 index 3763675..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/mapper/DirectClueMapper.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.baiye.modules.distribute.mapper; - -import com.baiye.domain.PageParam; -import com.baiye.domain.PageResult; -import com.baiye.extend.mybatis.plus.conditions.query.LambdaAliasQueryWrapperX; -import com.baiye.extend.mybatis.plus.mapper.ExtendMapper; -import com.baiye.extend.mybatis.plus.toolkit.WrappersX; -import com.baiye.modules.distribute.entity.DirectClueEntity; -import com.baiye.modules.distribute.qo.DirectClueQo; -import com.baiye.modules.distribute.vo.DirectClueVO; -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; -import org.apache.ibatis.annotations.Param; - -public interface DirectClueMapper extends ExtendMapper { - - default PageResult queryPage(PageParam pageParam, DirectClueQo qo) { - IPage page = this.prodPage(pageParam); - - LambdaAliasQueryWrapperX wrapperX = WrappersX.lambdaAliasQueryX(DirectClueEntity.class); - wrapperX.eqIfPresent(DirectClueEntity::getCreateBy, qo.getCreateBy()) - .eqIfPresent(DirectClueEntity::getDistributeUserId, qo.getDistributeUserId()) - .likeIfPresent(DirectClueEntity::getCustomName, qo.getCustomName()) - .eqIfPresent(DirectClueEntity::getOriginType, qo.getOriginType()) - .eqIfPresent(DirectClueEntity::getEffectiveStatus, qo.getEffectiveStatus()) - .eqIfPresent(DirectClueEntity::getDistributeType, qo.getDistributeType()); - - if (qo.getSalesmanUserId() != null){ - wrapperX.exists("SELECT 1 from tb_direct_clue_user dcu where dcu.user_id = "+ qo.getSalesmanUserId() +" and dc.direct_clue_id = dcu.clue_id"); - } - if (StringUtils.isNotBlank(qo.getStartTime()) && StringUtils.isNotBlank(qo.getEndTime())) { - wrapperX.between(DirectClueEntity::getDistributeDate, qo.getStartTime(), qo.getEndTime()); - } - this.selectByPage(page, wrapperX, qo.getSalesmanUserId()); - return new PageResult<>(page.getRecords(), page.getTotal()); - } - - IPage selectByPage(IPage page, @Param(Constants.WRAPPER) Wrapper wrapper, @Param("userId") Long userId); -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/mapper/DirectClueUserMapper.java b/admin/src/main/java/com/baiye/modules/distribute/mapper/DirectClueUserMapper.java deleted file mode 100644 index 487db36..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/mapper/DirectClueUserMapper.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.baiye.modules.distribute.mapper; - -import com.baiye.extend.mybatis.plus.mapper.ExtendMapper; -import com.baiye.modules.distribute.entity.DirectClueUserEntity; - -public interface DirectClueUserMapper extends ExtendMapper { -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/mapper/DistributeReportChannelMapper.java b/admin/src/main/java/com/baiye/modules/distribute/mapper/DistributeReportChannelMapper.java deleted file mode 100644 index 12fc5b6..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/mapper/DistributeReportChannelMapper.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.baiye.modules.distribute.mapper; - -import com.baiye.extend.mybatis.plus.mapper.ExtendMapper; -import com.baiye.modules.distribute.entity.DistributeReportChannelEntity; - -/** - * @author wjt - * @date 2023/8/11 - */ -public interface DistributeReportChannelMapper extends ExtendMapper { - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/mapper/DistributeReportMapper.java b/admin/src/main/java/com/baiye/modules/distribute/mapper/DistributeReportMapper.java deleted file mode 100644 index 696c923..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/mapper/DistributeReportMapper.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.baiye.modules.distribute.mapper; - -import com.baiye.extend.mybatis.plus.mapper.ExtendMapper; -import com.baiye.modules.distribute.entity.DistributeReportEntity; - -/** - * @author wjt - * @date 2023/8/11 - */ -public interface DistributeReportMapper extends ExtendMapper { - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/mapper/DistributeReportUserMapper.java b/admin/src/main/java/com/baiye/modules/distribute/mapper/DistributeReportUserMapper.java deleted file mode 100644 index e3b02a5..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/mapper/DistributeReportUserMapper.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.baiye.modules.distribute.mapper; - -import com.baiye.extend.mybatis.plus.mapper.ExtendMapper; -import com.baiye.modules.distribute.entity.DistributeReportUserEntity; - -/** - * @author wjt - * @date 2023/8/11 - */ -public interface DistributeReportUserMapper extends ExtendMapper { - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/mapper/DistributeTaskMapper.java b/admin/src/main/java/com/baiye/modules/distribute/mapper/DistributeTaskMapper.java deleted file mode 100644 index 6565b49..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/mapper/DistributeTaskMapper.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.baiye.modules.distribute.mapper; - -import com.baiye.domain.PageParam; -import com.baiye.domain.PageResult; -import com.baiye.extend.mybatis.plus.conditions.query.LambdaAliasQueryWrapperX; -import com.baiye.extend.mybatis.plus.mapper.ExtendMapper; -import com.baiye.extend.mybatis.plus.toolkit.WrappersX; -import com.baiye.modules.distribute.entity.DistributeTaskEntity; -import com.baiye.modules.distribute.qo.DistributeTaskQo; -import com.baiye.modules.distribute.vo.DistributeTaskVO; -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; -import org.apache.ibatis.annotations.Param; - -public interface DistributeTaskMapper extends ExtendMapper { - - default PageResult queryPage(PageParam pageParam, DistributeTaskQo qo) { - IPage page = this.prodPage(pageParam); - - LambdaAliasQueryWrapperX wrapperX = WrappersX - .lambdaAliasQueryX(DistributeTaskEntity.class); - wrapperX.likeIfPresent(DistributeTaskEntity::getTaskName, qo.getTaskName()) - .eqIfPresent(DistributeTaskEntity::getExecuteStatus, qo.getExecuteStatus()) - .eqIfPresent(DistributeTaskEntity::getCreateBy, qo.getCreateBy()) - .eqIfPresent(DistributeTaskEntity::getDistributeTaskType, qo.getDistributeTaskType()) - .orderByDesc(DistributeTaskEntity::getCreateTime); - - if (StringUtils.isNotBlank(qo.getStartTime()) && StringUtils.isNotBlank(qo.getEndTime())) { - wrapperX.between(DistributeTaskEntity::getCreateTime, qo.getStartTime(), qo.getEndTime()); - } - this.selectByPage(page, wrapperX); - return new PageResult<>(page.getRecords(), page.getTotal()); - } - - IPage selectByPage(IPage page, - @Param(Constants.WRAPPER) Wrapper wrapper); - - /** - * executeNum字段自增1 - */ - void updateByExecuteNumAddOne(@Param("distributeTaskId") Long distributeTaskId); - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/mapper/DistributeTaskUserMapper.java b/admin/src/main/java/com/baiye/modules/distribute/mapper/DistributeTaskUserMapper.java deleted file mode 100644 index 7450e2d..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/mapper/DistributeTaskUserMapper.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.baiye.modules.distribute.mapper; - -import com.baiye.extend.mybatis.plus.mapper.ExtendMapper; -import com.baiye.modules.distribute.entity.DistributeTaskUserEntity; - -public interface DistributeTaskUserMapper extends ExtendMapper { - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/mapper/FileContrastMapper.java b/admin/src/main/java/com/baiye/modules/distribute/mapper/FileContrastMapper.java deleted file mode 100644 index 53c38d0..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/mapper/FileContrastMapper.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.baiye.modules.distribute.mapper; - -import com.baiye.domain.PageParam; -import com.baiye.domain.PageResult; -import com.baiye.extend.mybatis.plus.conditions.query.LambdaQueryWrapperX; -import com.baiye.extend.mybatis.plus.mapper.ExtendMapper; -import com.baiye.extend.mybatis.plus.toolkit.WrappersX; -import com.baiye.modules.distribute.entity.FileContrastEntity; -import com.baiye.modules.distribute.qo.FileContrastQo; -import com.baiye.modules.distribute.vo.FileContrastVO; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; -import org.apache.ibatis.annotations.Param; - -public interface FileContrastMapper extends ExtendMapper { - - default PageResult queryPage(PageParam pageParam, FileContrastQo qo) { - IPage page = this.prodPage(pageParam); - - LambdaQueryWrapperX wrapperX = WrappersX.lambdaQueryX(FileContrastEntity.class); - if (StringUtils.isNotBlank(qo.getStartTime()) && StringUtils.isNotBlank(qo.getEndTime())) { - wrapperX.between(FileContrastEntity::getCreateTime, qo.getStartTime(), qo.getEndTime()); - } - wrapperX.likeIfPresent(FileContrastEntity::getTaskName, qo.getTaskName()).orderByDesc(FileContrastEntity::getId); - IPage selected = this.selectByPage(page, wrapperX); - // IPage iPage = page.convert(FileContrastConverter.INSTANCE::entityToVo); - return new PageResult<>(selected.getRecords(), selected.getTotal()); - } - - IPage selectByPage(IPage page, @Param(Constants.WRAPPER) LambdaQueryWrapperX wrapper); - - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/mapper/FileContrastRecordMapper.java b/admin/src/main/java/com/baiye/modules/distribute/mapper/FileContrastRecordMapper.java deleted file mode 100644 index 358cbf5..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/mapper/FileContrastRecordMapper.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.baiye.modules.distribute.mapper; - -import com.baiye.domain.PageParam; -import com.baiye.domain.PageResult; -import com.baiye.extend.mybatis.plus.conditions.query.LambdaQueryWrapperX; -import com.baiye.extend.mybatis.plus.mapper.ExtendMapper; -import com.baiye.extend.mybatis.plus.toolkit.WrappersX; -import com.baiye.modules.distribute.converter.FileContrasRecordConverter; -import com.baiye.modules.distribute.entity.FileContrastRecordEntity; -import com.baiye.modules.distribute.qo.FileContrastQo; -import com.baiye.modules.distribute.vo.FileContrastRecordVO; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; - -public interface FileContrastRecordMapper extends ExtendMapper { - - - /** - * 分页查询 - * - * @param pageParam - * @param qo - * @return - */ - default PageResult queryPage(PageParam pageParam, FileContrastQo qo) { - IPage page = this.prodPage(pageParam); - - LambdaQueryWrapperX wrapperX = WrappersX.lambdaQueryX(FileContrastRecordEntity.class); - if (StringUtils.isNotBlank(qo.getStartTime()) && StringUtils.isNotBlank(qo.getEndTime())) { - wrapperX.between(FileContrastRecordEntity::getCreateTime, qo.getStartTime(), qo.getEndTime()); - } - wrapperX.orderByDesc(FileContrastRecordEntity::getId); - this.selectPage(page, wrapperX); - IPage iPage = page.convert(FileContrasRecordConverter.INSTANCE::entityToVo); - return new PageResult<>(iPage.getRecords(), iPage.getTotal()); - } - - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/mapper/FileContrastSourceMapper.java b/admin/src/main/java/com/baiye/modules/distribute/mapper/FileContrastSourceMapper.java deleted file mode 100644 index 44763ca..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/mapper/FileContrastSourceMapper.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.baiye.modules.distribute.mapper; - -import com.baiye.extend.mybatis.plus.mapper.ExtendMapper; -import com.baiye.modules.distribute.entity.FileContrastSourceEntity; - -public interface FileContrastSourceMapper extends ExtendMapper { - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/mapper/LabelMapper.java b/admin/src/main/java/com/baiye/modules/distribute/mapper/LabelMapper.java deleted file mode 100644 index 73e31b7..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/mapper/LabelMapper.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.baiye.modules.distribute.mapper; - -import com.baiye.extend.mybatis.plus.mapper.ExtendMapper; -import com.baiye.modules.distribute.entity.LabelEntity; - -public interface LabelMapper extends ExtendMapper { - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/mapper/LabelOrganizeMapper.java b/admin/src/main/java/com/baiye/modules/distribute/mapper/LabelOrganizeMapper.java deleted file mode 100644 index 69a2b5f..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/mapper/LabelOrganizeMapper.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.baiye.modules.distribute.mapper; - -import com.baiye.domain.PageParam; -import com.baiye.domain.PageResult; -import com.baiye.extend.mybatis.plus.conditions.query.LambdaAliasQueryWrapperX; -import com.baiye.extend.mybatis.plus.mapper.ExtendMapper; -import com.baiye.extend.mybatis.plus.toolkit.WrappersX; -import com.baiye.modules.distribute.entity.LabelOrganizeEntity; -import com.baiye.modules.distribute.vo.LabelOrganizeVO; -import com.baiye.modules.distribute.qo.LabelOrganizeQo; -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Constants; -import org.apache.ibatis.annotations.Param; - -public interface LabelOrganizeMapper extends ExtendMapper { - - default PageResult queryPage(PageParam pageParam, LabelOrganizeQo qo) { - IPage page = this.prodPage(pageParam); - LambdaAliasQueryWrapperX wrapperX = WrappersX.lambdaAliasQueryX(LabelOrganizeEntity.class); - wrapperX.likeIfPresent(LabelOrganizeEntity::getName, qo.getName()) - .eqIfPresent(LabelOrganizeEntity::getCreateBy, qo.getCreateBy()) - .orderByDesc(LabelOrganizeEntity::getCreateTime); - - this.selectByPage(page, wrapperX); - return new PageResult<>(page.getRecords(), page.getTotal()); - } - - IPage selectByPage(IPage page, - @Param(Constants.WRAPPER) Wrapper wrapper); - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/mapper/OceanEngineSourceMapper.java b/admin/src/main/java/com/baiye/modules/distribute/mapper/OceanEngineSourceMapper.java deleted file mode 100644 index 89e0a5c..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/mapper/OceanEngineSourceMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.baiye.modules.distribute.mapper; - -import com.baiye.extend.mybatis.plus.mapper.ExtendMapper; -import com.baiye.modules.distribute.entity.OceanEngineSourceEntity; -import org.apache.ibatis.annotations.Mapper; - -/** - * @author wjt - * @date 2023/11/2 - */ -@Mapper -public interface OceanEngineSourceMapper extends ExtendMapper { -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/mapper/OceanEngineTokenMapper.java b/admin/src/main/java/com/baiye/modules/distribute/mapper/OceanEngineTokenMapper.java deleted file mode 100644 index 70b7192..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/mapper/OceanEngineTokenMapper.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.baiye.modules.distribute.mapper; - -import cn.hutool.core.text.CharSequenceUtil; -import com.baiye.domain.PageParam; -import com.baiye.domain.PageResult; -import com.baiye.extend.mybatis.plus.conditions.query.LambdaQueryWrapperX; -import com.baiye.extend.mybatis.plus.mapper.ExtendMapper; -import com.baiye.extend.mybatis.plus.toolkit.WrappersX; -import com.baiye.modules.distribute.converter.OceanEngineConverter; -import com.baiye.modules.distribute.entity.OceanEngineToken; -import com.baiye.modules.distribute.qo.OceanEnginQo; -import com.baiye.modules.distribute.vo.OceanEnginVO; -import com.baomidou.mybatisplus.core.metadata.IPage; - -/** - * @author Enzo - * @date : 2023/11/2 - */ -public interface OceanEngineTokenMapper extends ExtendMapper { - /** - * 查询分页数据 - * - * @param pageParam - * @param oceanEnginQo - * @return - */ - default PageResult queryPage(PageParam pageParam, OceanEnginQo oceanEnginQo){ - IPage page = this.prodPage(pageParam); - LambdaQueryWrapperX wrapper = WrappersX.lambdaQueryX(OceanEngineToken.class) - .likeIfPresent(OceanEngineToken::getAuthorizeName, oceanEnginQo.getAuthorizeName()) - .between(CharSequenceUtil.isNotBlank(oceanEnginQo.getCreateEndTime()) && CharSequenceUtil.isNotBlank(oceanEnginQo.getCreateEndTime()), - OceanEngineToken::getAuthorizeTime, oceanEnginQo.getCreateEndTime(), oceanEnginQo.getCreateEndTime()); - this.selectPage(page, wrapper); - IPage voPage = page.convert(OceanEngineConverter.INSTANCE::entityToVo); - return new PageResult<>(voPage.getRecords(), voPage.getTotal()); - } - - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/mapper/PlushClueMapper.java b/admin/src/main/java/com/baiye/modules/distribute/mapper/PlushClueMapper.java deleted file mode 100644 index 0931479..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/mapper/PlushClueMapper.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.baiye.modules.distribute.mapper; - -import cn.hutool.core.text.CharSequenceUtil; -import com.baiye.domain.PageParam; -import com.baiye.domain.PageResult; -import com.baiye.extend.mybatis.plus.conditions.query.LambdaQueryWrapperX; -import com.baiye.extend.mybatis.plus.mapper.ExtendMapper; -import com.baiye.extend.mybatis.plus.toolkit.WrappersX; -import com.baiye.modules.distribute.converter.PushClueConverter; -import com.baiye.modules.distribute.entity.PushClueInfoEntity; -import com.baiye.modules.distribute.qo.SendClueQo; -import com.baiye.modules.distribute.vo.PushClueInfoVo; -import com.baomidou.mybatisplus.core.metadata.IPage; - -/** - * @author Enzo - * @date : 2024/3/1 - */ -public interface PlushClueMapper extends ExtendMapper { - default PageResult queryPage(PageParam pageParam, SendClueQo qo) { - IPage page = this.prodPage(pageParam); - - LambdaQueryWrapperX wrapper = WrappersX.lambdaQueryX(PushClueInfoEntity.class) - .between(CharSequenceUtil.isNotBlank(qo.getStartTime()) && CharSequenceUtil.isNotBlank(qo.getEndTime()), - PushClueInfoEntity::getCreateTime, qo.getStartTime(), qo.getEndTime()).eqIfPresent(PushClueInfoEntity::getClueId, qo.getClueId()).likeIfPresent - (PushClueInfoEntity::getRequestId, qo.getRequestId()).orderByDesc(PushClueInfoEntity::getId); - - this.selectPage(page, wrapper); - IPage voPage = page.convert(PushClueConverter.INSTANCE::poToPageVo); - return new PageResult<>(voPage.getRecords(), voPage.getTotal()); - } - - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/mapper/PlushConfigMapper.java b/admin/src/main/java/com/baiye/modules/distribute/mapper/PlushConfigMapper.java deleted file mode 100644 index 4a7333f..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/mapper/PlushConfigMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.baiye.modules.distribute.mapper; - -import com.baiye.extend.mybatis.plus.mapper.ExtendMapper; -import com.baiye.modules.distribute.entity.ClueStageEntity; -import com.baiye.modules.distribute.entity.PushConfigEntity; - -/** - * @author Enzo - * @date : 2024/3/1 - */ -public interface PlushConfigMapper extends ExtendMapper { - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/mapper/PushLinkMapper.java b/admin/src/main/java/com/baiye/modules/distribute/mapper/PushLinkMapper.java deleted file mode 100644 index 4fecd2f..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/mapper/PushLinkMapper.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.baiye.modules.distribute.mapper; - -import com.baiye.constant.DefaultNumberConstants; -import com.baiye.domain.PageParam; -import com.baiye.domain.PageResult; -import com.baiye.extend.mybatis.plus.conditions.query.LambdaQueryWrapperX; -import com.baiye.extend.mybatis.plus.mapper.ExtendMapper; -import com.baiye.extend.mybatis.plus.toolkit.WrappersX; -import com.baiye.modules.distribute.converter.PushLinkConverter; -import com.baiye.modules.distribute.entity.PushLinkEntity; -import com.baiye.modules.distribute.qo.PushLinkQo; -import com.baiye.modules.distribute.vo.PushLinkVO; -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import org.apache.ibatis.annotations.Param; - -public interface PushLinkMapper extends ExtendMapper { - - default PageResult queryPage(PageParam pageParam, PushLinkQo qo) { - IPage page = this.prodPage(pageParam); - - LambdaQueryWrapperX wrapperX = WrappersX.lambdaQueryX(PushLinkEntity.class); - if (StringUtils.isNotBlank(qo.getStartTime()) && StringUtils.isNotBlank(qo.getEndTime())) { - wrapperX.between(PushLinkEntity::getCreateTime, qo.getStartTime(), qo.getEndTime()); - } - wrapperX.likeIfPresent(PushLinkEntity::getName, qo.getName()) - .eqIfPresent(PushLinkEntity::getCreateBy, qo.getCreateBy()) - .eqIfPresent(PushLinkEntity::getChannelType, qo.getChannelType()).orderByDesc(PushLinkEntity::getId); - this.selectPage(page, wrapperX); - IPage convert = page.convert(PushLinkConverter.INSTANCE::entityToVo); - return new PageResult<>(convert.getRecords(), convert.getTotal()); - } - - IPage selectByPage(IPage page, @Param(Constants.WRAPPER) Wrapper wrapper); - - default PushLinkEntity selectByAppKey(String appKey) { - return this.selectOne(Wrappers.lambdaQuery().eq(PushLinkEntity::getAppKey, appKey)); - } - - default PushLinkEntity selectByNameAndUserId(String authorizeName, Long userId) { - return this.selectOne(Wrappers.lambdaQuery().eq(PushLinkEntity::getName, authorizeName).eq - (PushLinkEntity::getCreateBy, userId).eq(PushLinkEntity::getStatus, DefaultNumberConstants.ONE_NUMBER)); - } -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/mapper/StoreMapper.java b/admin/src/main/java/com/baiye/modules/distribute/mapper/StoreMapper.java deleted file mode 100644 index 551e5e6..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/mapper/StoreMapper.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.baiye.modules.distribute.mapper; - -import cn.hutool.core.date.DateUtil; -import com.baiye.domain.PageParam; -import com.baiye.domain.PageResult; -import com.baiye.extend.mybatis.plus.conditions.query.LambdaAliasQueryWrapperX; -import com.baiye.extend.mybatis.plus.mapper.ExtendMapper; -import com.baiye.extend.mybatis.plus.toolkit.WrappersX; -import com.baiye.modules.distribute.dto.StoreDTO; -import com.baiye.modules.distribute.entity.StoreEntity; -import com.baiye.modules.distribute.qo.StoreQo; -import com.baiye.modules.distribute.vo.StoreVO; -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Constants; -import org.apache.ibatis.annotations.Param; - -import java.util.Date; -import java.util.List; - -/** - * @author wjt - * @date 2023/9/5 - */ -public interface StoreMapper extends ExtendMapper { - - default PageResult queryPage(PageParam pageParam, StoreQo qo) { - - IPage page = this.prodPage(pageParam); - - LambdaAliasQueryWrapperX wrapperX = WrappersX.lambdaAliasQueryX(StoreEntity.class); - - wrapperX.likeIfPresent(StoreEntity::getStoreName, qo.getStoreName()) - .eqIfPresent(StoreEntity::getStoreType, qo.getStoreType()) - .eqIfPresent(StoreEntity::getProvince, qo.getProvince()) - .eqIfPresent(StoreEntity::getCity, qo.getCity()) - .eqIfPresent(StoreEntity::getCounty, qo.getCounty()) - .eq(StoreEntity::getCreateBy, qo.getCreateBy()) - .eq(StoreEntity::getDeleted, 0) - .orderByDesc(StoreEntity::getCreateTime); - - if (qo.getCreateStartTime() != null && qo.getCreateEndTime() != null) { - Date start = DateUtil.beginOfDay(DateUtil.parseDate(qo.getCreateStartTime())); - Date end = DateUtil.endOfDay(DateUtil.parseDate(qo.getCreateEndTime())); - wrapperX.between(StoreEntity::getCreateTime, start, end); - } - this.selectByPage(page, wrapperX); - return new PageResult<>(page.getRecords(), page.getTotal()); - } - - IPage selectByPage(IPage page, @Param(Constants.WRAPPER) Wrapper wrapper); - - List queryRangeStore(@Param("lng") Double lng, @Param("lat") Double lat, @Param("distance") Double distance, @Param("userId") Long userId); - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/mapper/StoreUserMapper.java b/admin/src/main/java/com/baiye/modules/distribute/mapper/StoreUserMapper.java deleted file mode 100644 index dd88a81..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/mapper/StoreUserMapper.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.baiye.modules.distribute.mapper; - -import com.baiye.extend.mybatis.plus.mapper.ExtendMapper; -import com.baiye.modules.distribute.dto.StoreUserDTO; -import com.baiye.modules.distribute.entity.StoreUserEntity; -import org.apache.ibatis.annotations.Param; - -/** - * @author wjt - * @date 2023/9/15 - */ -public interface StoreUserMapper extends ExtendMapper { - - /** - * 查询列表 - * @param storeId - * @return - */ - StoreUserDTO selectByStoreDTOByStoreId(@Param("storeId") Long storeId); -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/mapper/TagMapper.java b/admin/src/main/java/com/baiye/modules/distribute/mapper/TagMapper.java deleted file mode 100644 index eb405bb..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/mapper/TagMapper.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.baiye.modules.distribute.mapper; - -import com.baiye.domain.PageParam; -import com.baiye.domain.PageResult; -import com.baiye.extend.mybatis.plus.conditions.query.LambdaAliasQueryWrapperX; -import com.baiye.extend.mybatis.plus.mapper.ExtendMapper; -import com.baiye.extend.mybatis.plus.toolkit.WrappersX; -import com.baiye.modules.distribute.entity.DirectClueEntity; -import com.baiye.modules.distribute.entity.TagEntity; -import com.baiye.modules.distribute.qo.DirectClueQo; -import com.baiye.modules.distribute.vo.DirectClueVO; -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; -import org.apache.ibatis.annotations.Param; - -/** - * @author Enzo - * @date 2023-12-6 - */ -public interface TagMapper extends ExtendMapper { - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/mapper/UserSecretKeyMapper.java b/admin/src/main/java/com/baiye/modules/distribute/mapper/UserSecretKeyMapper.java deleted file mode 100644 index 87e653d..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/mapper/UserSecretKeyMapper.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.baiye.modules.distribute.mapper; - -import com.baiye.extend.mybatis.plus.mapper.ExtendMapper; -import com.baiye.modules.distribute.entity.UserSecretKeyEntity; - -public interface UserSecretKeyMapper extends ExtendMapper { - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/qo/ClueQo.java b/admin/src/main/java/com/baiye/modules/distribute/qo/ClueQo.java deleted file mode 100644 index 3f415fa..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/qo/ClueQo.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.baiye.modules.distribute.qo; - -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -@Data -public class ClueQo { - - @Schema(title = "线索id") - private String clueId; - - @Schema(title = "手机号") - private String nid; - - @Parameter(description = "开始时间") - private String startTime; - - @Parameter(description = "结束时间") - private String endTime; - - @Parameter(description = "结束时间") - private Long companyId; - - @Parameter(description = "创建人") - private Long createBy; - - @Schema(title = "分配人用户ID") - private Long assignedBy; - - @Schema(title = "资源标签") - private String clueLabelName; - - @Schema(title = "业务类型") - private Integer salesmanType; - - @Schema(title = "业务员id") - private Long[] salesmanArray; - - @Schema(title = "客户ID") - private Long customId; -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/qo/ClueRecordQo.java b/admin/src/main/java/com/baiye/modules/distribute/qo/ClueRecordQo.java deleted file mode 100644 index 0fe2216..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/qo/ClueRecordQo.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.baiye.modules.distribute.qo; - -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import org.springdoc.api.annotations.ParameterObject; - -@Data -@Schema(title = "导入记录查询对象") -@ParameterObject -public class ClueRecordQo { - - /** - * 上传文件名 - */ - @Parameter(description = "上传文件名") - private String oldFileName; - - @Parameter(description = "开始时间") - private String startTime; - - @Parameter(description = "结束时间") - private String endTime; - - @Parameter(description = "创建人") - private Long createBy; - - @Schema(title = "分配状态: 0:未分配 1:已分配") - private Integer allocationStatus; - - @Schema(title = "分发状态 0:未分发 1:已分发") - private Integer distributeStatus; - - @Schema(title = "上传状态 0:上传中 1:上传失败 2:上传成功") - private Integer status; - - @Schema(title = "渠道类型") - private String channelType; - - @Schema(title = "记录类型 0:文件上传 1:资源推送") - private Integer recordType; - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/qo/CustomQo.java b/admin/src/main/java/com/baiye/modules/distribute/qo/CustomQo.java deleted file mode 100644 index a0b8c44..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/qo/CustomQo.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.baiye.modules.distribute.qo; - -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import org.springdoc.api.annotations.ParameterObject; - -import java.util.List; - -@Data -@Schema(title = "客户查询对象") -@ParameterObject -public class CustomQo { - - @Parameter(description = "客户名称") - private String customName; - - @Parameter(description = "客户联系方式") - private String customNid; - - @Parameter(description = "报名状态 0:待提交 1:已报名 2已通过") - private Integer enrollStatus; - - @Schema(title = "创建者") - private Long createBy; - - @Parameter(description = "开始时间") - private String startTime; - - @Parameter(description = "结束时间") - private String endTime; - - @Parameter(description = "分发开始时间") - private String distributeStartTime; - - @Parameter(description = "分发结束时间") - private String distributeEndTime; - - @Parameter(description = "公司id") - private Long companyId; - - @Schema(title = "审核类型 1录入员 2初审 3复审") - private Integer salesmanType; - - @Schema(title = "编号") - private String batchNo; - - @Schema(title = "门店id") - private Long storeId; - - @Schema(title = "备注") - private String remark; - - @Schema(title = "复审员id") - private Long reviewUserId; - - @Schema(title = "分发员id") - private Long distributorId; - - @Parameter(description = "大于状态值") - private Integer greaterStatus; - - @Schema(description = "审核类型 2初审 3复审") - private Integer type; - - @Schema(title = "业务员ID") - private Long salesmanUserId; - - @Schema(title = "客户ID集合") - private List customIds; -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/qo/DirectClueQo.java b/admin/src/main/java/com/baiye/modules/distribute/qo/DirectClueQo.java deleted file mode 100644 index 7a09c04..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/qo/DirectClueQo.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.baiye.modules.distribute.qo; - -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -@Data -public class DirectClueQo { - - @Parameter(description = "开始时间") - private String startTime; - - @Parameter(description = "结束时间") - private String endTime; - - @Parameter(description = "创建人") - private Long createBy; - - @Schema(title = "资源分发的分发员用户ID") - private Long distributeUserId; - - @Schema(title = "资源分发的业务员用户ID") - private Long salesmanUserId; - - @Schema(title = "客户名称") - private String customName; - - @Schema(title = "来源 0:巨量") - private Integer originType; - - @Schema(title = "有效状态 0:有效 1:无效") - private Integer effectiveStatus; - - @Schema(title = "分发状态 0:未分发 1:已分发") - private Integer distributeType; - - @Schema(title = "属性") - private String attribute; -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/qo/DistributeTaskQo.java b/admin/src/main/java/com/baiye/modules/distribute/qo/DistributeTaskQo.java deleted file mode 100644 index 5aaadab..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/qo/DistributeTaskQo.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.baiye.modules.distribute.qo; - -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import org.springdoc.api.annotations.ParameterObject; - -@Data -@Schema(title = "分配任务查询对象") -@ParameterObject -public class DistributeTaskQo { - - @Parameter(description = "任务名称") - private String taskName; - - @Parameter(description = "创建人") - private Long createBy; - - @Parameter(description = "开始时间") - private String startTime; - - @Parameter(description = "结束时间") - private String endTime; - - @Schema(title = "执行状态 0:未执行 1:执行中 2:已执行") - private Integer executeStatus; - - @Schema(title = "分发类型 0:手动分发 1:自动分发") - private Integer distributeTaskType; - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/qo/FileContrastQo.java b/admin/src/main/java/com/baiye/modules/distribute/qo/FileContrastQo.java deleted file mode 100644 index 024e5f4..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/qo/FileContrastQo.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.baiye.modules.distribute.qo; - -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import org.springdoc.api.annotations.ParameterObject; - - -/** - * @author Enzo - * @date 2024-3-13 - */ -@Data -@Schema(title = "文件上传对比") -@ParameterObject -public class FileContrastQo { - - @Parameter(description = "授权名称") - private String taskName; - - @Parameter(description = "开始时间") - private String startTime; - - @Parameter(description = "结束时间") - private String endTime; - - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/qo/HomePageQo.java b/admin/src/main/java/com/baiye/modules/distribute/qo/HomePageQo.java deleted file mode 100644 index 6c224e8..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/qo/HomePageQo.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.baiye.modules.distribute.qo; - -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import org.springdoc.api.annotations.ParameterObject; - -import java.util.List; - -/** - * @author wjt - * @date 2023/12/6 - */ -@Data -@Schema(title = "首页") -@ParameterObject -public class HomePageQo { - - @Parameter(description = "公司id") - private Long companyId; - - @Parameter(description = "添加的开始时间") - private String createStartTime; - - @Parameter(description = "添加的结束时间") - private String createEndTime; - - @Parameter(description = "分配的客户id") - private Long assignedId; - - @Parameter(description = "分配的客户id") - private List assignedIdList; - - @Parameter(description = "录入员id") - private List enterIdList; - - @Parameter(description = "渠道类型(1 手动创建 2文件上传 3飞鱼回传 4话单回传 5 api回传)") - private Integer channelType; - - @Parameter(description = "下载类型 1- 录入 2-分发") - private Integer type; - - @Parameter(description = "分发员id") - private Long distributorId; - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/qo/LabelOrganizeQo.java b/admin/src/main/java/com/baiye/modules/distribute/qo/LabelOrganizeQo.java deleted file mode 100644 index ef7cf5f..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/qo/LabelOrganizeQo.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.baiye.modules.distribute.qo; - -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import org.springdoc.api.annotations.ParameterObject; - -/** - * @Author YQY - * @Date 2023/8/2 - */ -@Data -@Schema(title = "导入记录查询对象") -@ParameterObject -public class LabelOrganizeQo { - - /** - * 标签组名称 - */ - @Parameter(description = "标签组名称") - private String name; - - /** - * 创建人 - */ - @Parameter(description = "创建人") - private Long createBy; - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/qo/OceanEnginQo.java b/admin/src/main/java/com/baiye/modules/distribute/qo/OceanEnginQo.java deleted file mode 100644 index b8716d1..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/qo/OceanEnginQo.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.baiye.modules.distribute.qo; - -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import org.springdoc.api.annotations.ParameterObject; - - -/** - * @author Enzo - * @date 2023-11-6 - */ -@Data -@Schema(title = "授权管理") -@ParameterObject -public class OceanEnginQo { - - @Parameter(description = "授权名称") - private String authorizeName; - - @Parameter(description = "添加的开始时间") - private String createStartTime; - - @Parameter(description = "添加的结束时间") - private String createEndTime; - - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/qo/PushLinkQo.java b/admin/src/main/java/com/baiye/modules/distribute/qo/PushLinkQo.java deleted file mode 100644 index 0dd90d9..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/qo/PushLinkQo.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.baiye.modules.distribute.qo; - -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -@Data -public class PushLinkQo { - - @Schema(title = "业务名") - private String name; - - @Schema(title = "渠道类型(0-大坝，1-飞鱼，2-第三方)") - private Integer channelType; - - @Schema(title = "创建者") - private Long createBy; - - @Parameter(description = "开始时间") - private String startTime; - - @Parameter(description = "结束时间") - private String endTime; -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/qo/SendClueQo.java b/admin/src/main/java/com/baiye/modules/distribute/qo/SendClueQo.java deleted file mode 100644 index 07461ef..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/qo/SendClueQo.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.baiye.modules.distribute.qo; - -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -@Data -public class SendClueQo { - - @Schema(title = "线索id") - private String clueId; - - @Schema(title = "线索id") - private String requestId; - - @Parameter(description = "开始时间") - private String startTime; - - @Parameter(description = "结束时间") - private String endTime; - - - @Schema(title = "分配人用户ID") - private Long assignedBy; - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/qo/StoreQo.java b/admin/src/main/java/com/baiye/modules/distribute/qo/StoreQo.java deleted file mode 100644 index f9d8886..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/qo/StoreQo.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.baiye.modules.distribute.qo; - -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import org.springdoc.api.annotations.ParameterObject; - - -/** - * @author wjt - * @date 2023/9/5 - */ -@Data -@Schema(title = "门店管理") -@ParameterObject -public class StoreQo { - - @Parameter(description = "门店名称") - private String storeName; - - @Parameter(description = "门店类型") - private Integer storeType; - - @Parameter(description = "省份") - private String province; - - @Parameter(description = "市") - private String city; - - @Parameter(description = "区县") - private String county; - - @Parameter(description = "添加的开始时间") - private String createStartTime; - - @Parameter(description = "添加的结束时间") - private String createEndTime; - -// @Parameter(description = "营业开始时间") -// private String tradeStartTime; - -// @Parameter(description = "营业结束时间") -// private String tradeEndTime; - - @Parameter(description = "创建人") - private Long createBy; - - @Parameter(description = "身份类别 1-管理员用户 2-管理员下属用户") - private Integer roleType; -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/BuildModelService.java b/admin/src/main/java/com/baiye/modules/distribute/service/BuildModelService.java deleted file mode 100644 index 9546e56..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/service/BuildModelService.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.baiye.modules.distribute.service; - -import com.baiye.modules.distribute.dto.PushClueDTO; - -/** - * @author Enzo - * @date 2023-12-6 - */ -public interface BuildModelService { - - - /** - * 保存信息 - * @param body - * @return - */ - Boolean callbackByNid(PushClueDTO body); -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/ClueFileService.java b/admin/src/main/java/com/baiye/modules/distribute/service/ClueFileService.java deleted file mode 100644 index 9965c21..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/service/ClueFileService.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.baiye.modules.distribute.service; - -import com.baiye.modules.distribute.dto.ReadFileDTO; -import org.springframework.web.multipart.MultipartFile; - -import java.util.Map; - -public interface ClueFileService { - - /** - * 检测文件格式 - */ - Map detection(MultipartFile file); - - /** - * 文件上传资源 - */ - void readFile(ReadFileDTO readFileDTO); - - /** - * 生成秘钥 - */ - Map generateSecretKey(); - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/ClueRecordService.java b/admin/src/main/java/com/baiye/modules/distribute/service/ClueRecordService.java deleted file mode 100644 index fad07a2..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/service/ClueRecordService.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.baiye.modules.distribute.service; - -import com.baiye.domain.SelectData; -import com.baiye.modules.distribute.entity.ClueRecordEntity; -import com.baiye.modules.distribute.vo.ClueRecordVO; -import com.baiye.modules.distribute.qo.ClueRecordQo; -import com.baiye.domain.PageParam; -import com.baiye.domain.PageResult; -import com.baiye.extend.mybatis.plus.service.ExtendService; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; - -import java.util.List; - -public interface ClueRecordService extends ExtendService { - - /** - * 分页查询导入记录 - */ - PageResult queryPage(PageParam pageParam, ClueRecordQo qo); - - /** - * 通过id删除记录并删除本地文件 - */ - boolean deleteByUserId(Long clueRecordId); - - /** - * 按条件查询导入记录 - */ - List selectByWrapper(LambdaQueryWrapper wrapper); - - /** - * 新增用户时,为业务管理员创建默认的记录 - */ - ClueRecordEntity addDefaultRecordService(Long userId, String name, String channelIdentifying); - - /** - * 下拉列表 - */ - List> listSelectData(ClueRecordQo qo); - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/ClueService.java b/admin/src/main/java/com/baiye/modules/distribute/service/ClueService.java deleted file mode 100644 index 3564466..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/service/ClueService.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.baiye.modules.distribute.service; - -import com.baiye.domain.PageParam; -import com.baiye.domain.PageResult; -import com.baiye.modules.distribute.dto.ClueDTO; -import com.baiye.modules.distribute.entity.ClueEntity; -import com.baiye.extend.mybatis.plus.service.ExtendService; -import com.baiye.modules.distribute.qo.ClueQo; -import com.baiye.modules.distribute.vo.ClueVO; - -import java.util.List; - -public interface ClueService extends ExtendService { - - /** - * 批量上传 插入资源 - */ - void clueFileUploadSaveAll(List clues); - - /** - * 记录ID查询未分配的资源ID - */ - List findUndistributedClueIds(List recordIdList); - - /** - * 分页查询 - */ - PageResult queryPage(PageParam pageParam, ClueQo qo); - - /** - * 修改 - */ - boolean update(ClueDTO clueDTO); - - /** - * ID查询详情 - */ - ClueVO details(Long clueId, ClueQo qo); - - /** - * 批量插入信息 - * @param list - * @return - */ - Boolean saveClueListByStoreInfo(List list); - - /** - * 条件查询线索 - * @param qo - * @return - */ - List queryList(ClueQo qo); - - /** - * 修改是否有效 - * @param id - * @param effective - * @return - */ - Boolean changeEffective(Long id, Integer effective); - - /** - * 查询客户ID - * @param assignedBy 分配用户ID - * @param createBy 创建人 - */ - List findCustomId(Long assignedBy, Long createBy); - - /** - * 公司id与号码查询 - * @param companyId - * @param phone - * @return - * - */ - List findByCompanyIdAndNid(Long companyId, String phone); - - /** - * id查询数据 - * @param id - * @param currentUserId - * @return - */ - List findCustomIdAndCreate(Long id, Long currentUserId); - - /** - * 用户id查询 - * @param userIdList - * @return - */ - List selectListByUserId(List userIdList); -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/ClueStageService.java b/admin/src/main/java/com/baiye/modules/distribute/service/ClueStageService.java deleted file mode 100644 index 3c8d739..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/service/ClueStageService.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.baiye.modules.distribute.service; - -import com.baiye.extend.mybatis.plus.service.ExtendService; -import com.baiye.modules.distribute.entity.ClueStageEntity; - -import java.util.List; - -public interface ClueStageService extends ExtendService { - - Object listData(); - - List queryUserList(Long userId); - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/CustomService.java b/admin/src/main/java/com/baiye/modules/distribute/service/CustomService.java deleted file mode 100644 index b3991aa..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/service/CustomService.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.baiye.modules.distribute.service; - -import com.baiye.domain.PageParam; -import com.baiye.domain.PageResult; -import com.baiye.extend.mybatis.plus.service.ExtendService; -import com.baiye.modules.distribute.dto.CallbackCustomDTO; -import com.baiye.modules.distribute.dto.ChangeCustomDTO; -import com.baiye.modules.distribute.dto.CreateCustomDTO; -import com.baiye.modules.distribute.dto.CustomDTO; -import com.baiye.modules.distribute.entity.CustomEntity; -import com.baiye.modules.distribute.qo.CustomQo; -import com.baiye.modules.distribute.vo.CustomVO; - -import java.util.List; - -public interface CustomService extends ExtendService { - - /** - * 分页查询数据 - */ - PageResult queryPage(PageParam pageParam, CustomQo qo); - - /** - * 新增 - */ - boolean add(CustomDTO customDTO); - - /** - * 修改信息 - */ - boolean update(CustomDTO customDTO); - - - /** - * 表单详情 - */ - CustomVO details(Long id); - - /** - * 删除表单 - */ - Boolean deleteApprovalFormById(Long id); - - - /** - * 审批表单 - */ - Boolean auditFormById(ChangeCustomDTO dto); - - /** - * 重新审核操作 - */ - Boolean reAuditFormById(ChangeCustomDTO dto); - - /** - * 查询列表 - * @param customQo - * @return - */ - List queryList(CustomQo customQo); - - /** - * 类型创建客户 - * @param createCustomDTO - * @return - */ - Boolean createByType(CreateCustomDTO createCustomDTO); - - /** - * 文件批量-类型创建客户 - * @param customDTO - * @return - */ - Boolean createByFileType(CustomDTO customDTO); - - /** - * 创建资源 - * @param dtoList - * @return - */ - Boolean createByCallBack(List dtoList); - - /** - * 修改资源 - * @param phone - * @param remark - * @return - */ - Boolean updateByNid(String phone, String remark); - - /** - * 测回表单数据 - * @param id - * @return - */ - Boolean recallFormById(Long id); -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/CustomStoreService.java b/admin/src/main/java/com/baiye/modules/distribute/service/CustomStoreService.java deleted file mode 100644 index fac86a6..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/service/CustomStoreService.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.baiye.modules.distribute.service; - -import com.baiye.extend.mybatis.plus.service.ExtendService; -import com.baiye.modules.distribute.entity.CustomStoreEntity; -import com.baiye.modules.distribute.vo.StoreDetailsExportVO; - -import java.util.Date; -import java.util.List; -import java.util.Map; - -public interface CustomStoreService extends ExtendService { - - /** - * 根据门店，统计预约人数 - * - * @param storeIds 门店id - * @return 统计数据 - */ - Map countReservationByStoreIds(List storeIds); - - /** - * 删除 - * - * @param id - * @return - */ - Boolean deleteByCustomId(Long id); - - /** - * id查询列表 - * - * @param customId - * @return - */ - List selectListByCustomId(Long customId); - - /** - * 查询门店预约列表 - * - * @param startTime 日期 - * @param endTime 日期 - * @param storeId 门店id - * @return - */ - List selectListByStoreId(Date startTime, Date endTime, Long storeId); - - - /** - * 查询门店预约详情 - * - * @param startTime 日期 - * @param endTime 日期 - * @param storeId 门店id - * @return - */ - List selectStoreReservationDetails(Date startTime, Date endTime, Long storeId); - - /** - * 地缘获客修改时, 修改门店关联信息 - */ - void updateCustomStoreInfo(List customStoreEntities, Long customId); -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/DirectClueService.java b/admin/src/main/java/com/baiye/modules/distribute/service/DirectClueService.java deleted file mode 100644 index bba577e..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/service/DirectClueService.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.baiye.modules.distribute.service; - -import com.baiye.domain.PageParam; -import com.baiye.domain.PageResult; -import com.baiye.extend.mybatis.plus.service.ExtendService; -import com.baiye.modules.distribute.dto.DirectClueDTO; -import com.baiye.modules.distribute.entity.DirectClueEntity; -import com.baiye.modules.distribute.entity.DirectClueUserEntity; -import com.baiye.modules.distribute.qo.DirectClueQo; -import com.baiye.modules.distribute.vo.DirectClueVO; - -import java.util.List; - -public interface DirectClueService extends ExtendService { - - /** - * 分页查询 - */ - PageResult queryPage(PageParam pageParam, DirectClueQo qo); - - /** - * 修改 - */ - boolean update(DirectClueDTO directClueDTO); - - /** - * 分配后插入资源 - */ - void allocationClue(Long userId, List directClueEntityList); - - /** - * 分发员分发资源 - */ - boolean distribute(List directClueUserList); -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/DistributeReportService.java b/admin/src/main/java/com/baiye/modules/distribute/service/DistributeReportService.java deleted file mode 100644 index 2e567d0..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/service/DistributeReportService.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.baiye.modules.distribute.service; - -import com.baiye.extend.mybatis.plus.service.ExtendService; -import com.baiye.modules.distribute.entity.DistributeReportEntity; - -import java.util.Map; - -/** - * @author wjt - * @date 2023/8/11 - */ -public interface DistributeReportService extends ExtendService { - - /** - * 流量分布查询 - */ - Map reportFlow(Long userId, String channel, Integer type); - - /** - * 线索定时统计 - */ - void distributeReport(); - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/DistributeTaskService.java b/admin/src/main/java/com/baiye/modules/distribute/service/DistributeTaskService.java deleted file mode 100644 index 15b4cbe..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/service/DistributeTaskService.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.baiye.modules.distribute.service; - -import com.baiye.domain.PageParam; -import com.baiye.domain.PageResult; -import com.baiye.extend.mybatis.plus.service.ExtendService; -import com.baiye.modules.distribute.dto.DistributeTaskDTO; -import com.baiye.modules.distribute.entity.DistributeTaskEntity; -import com.baiye.modules.distribute.qo.DistributeTaskQo; -import com.baiye.modules.distribute.vo.DistributeTaskVO; - -import java.util.List; - -public interface DistributeTaskService extends ExtendService { - - /** - * 新增分发任务 - */ - Boolean add(DistributeTaskDTO distributeTaskDTO); - - /** - * 分页查询数据 - */ - PageResult queryPage(PageParam pageParam, DistributeTaskQo qo); - - /** - * 修改数据 - */ - boolean update(DistributeTaskDTO distributeTaskDTO); - - /** - * ID删除数据 - */ - boolean del(Long taskId); - - /** - * 执行任务 - */ - Boolean executeTask(Long taskId); - - /** - * ID查询 - */ - DistributeTaskVO details(Long id); - - /** - * 内部使用,定时任务调用 - */ - void execute(DistributeTaskEntity taskEntity); - - /** - * 修改 - */ - boolean updateData(DistributeTaskEntity distributeTaskEntity); - - /** - * 创建默认任务 - * @param taskName 任务名称 - * @param prefixName 文件前缀 - * @param recordId 关联的记录ID - * @param createUserId 此任务的创建人 - * @param allocationBy 此任务的分配人(可为null) - */ - void addDefaultTask(String taskName, String prefixName, String recordId, Long createUserId, Long allocationBy); - - /** - * admin检验业务管理员的默认任务--是否分配了用户 - */ - void inspectUserTask(List userIdList); - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/FileContrastRecordService.java b/admin/src/main/java/com/baiye/modules/distribute/service/FileContrastRecordService.java deleted file mode 100644 index 464bb57..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/service/FileContrastRecordService.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.baiye.modules.distribute.service; - -import com.baiye.domain.PageParam; -import com.baiye.domain.PageResult; -import com.baiye.extend.mybatis.plus.service.ExtendService; -import com.baiye.modules.distribute.entity.FileContrastRecordEntity; -import com.baiye.modules.distribute.qo.FileContrastQo; -import com.baiye.modules.distribute.vo.FileContrastRecordVO; - -/** - * @author Enzo - * @date - */ -public interface FileContrastRecordService extends ExtendService { - - - /** - * 分页查询记录 - * - * @param pageParam - * @param qo - * @return - */ - PageResult queryPage(PageParam pageParam, FileContrastQo qo); - - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/FileContrastService.java b/admin/src/main/java/com/baiye/modules/distribute/service/FileContrastService.java deleted file mode 100644 index f582916..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/service/FileContrastService.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.baiye.modules.distribute.service; - -import com.baiye.domain.PageParam; -import com.baiye.domain.PageResult; -import com.baiye.extend.mybatis.plus.service.ExtendService; -import com.baiye.modules.distribute.entity.FileContrastEntity; -import com.baiye.modules.distribute.qo.FileContrastQo; -import com.baiye.modules.distribute.vo.FileContrastVO; -import org.springframework.web.multipart.MultipartFile; - -import java.util.List; - -public interface FileContrastService extends ExtendService { - - /** - * 分页查询 - */ - PageResult queryPage(PageParam pageParam, FileContrastQo qo); - - - - /** - * 创建任务 - * @param files - * @param taskName - * @return - */ - Boolean createTask(List files, String taskName); - - - /** - * 追加资源 - * @param files - * @param taskId - * @return - */ - Boolean additionTaskSource(List files, Long taskId); - - /** - * 文件对比 - * @param files - * @param taskId - * @return - */ - Boolean buildContrast(List files, Long taskId); -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/FileContrastSourceService.java b/admin/src/main/java/com/baiye/modules/distribute/service/FileContrastSourceService.java deleted file mode 100644 index 8137520..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/service/FileContrastSourceService.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.baiye.modules.distribute.service; - -import com.baiye.extend.mybatis.plus.service.ExtendService; -import com.baiye.modules.distribute.entity.FileContrastSourceEntity; - -import java.util.List; - -public interface FileContrastSourceService extends ExtendService { - - - - - /** - * task查询数据 - * @param taskId - * @return - */ - List queryByTaskId(Long taskId); -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/HomepageService.java b/admin/src/main/java/com/baiye/modules/distribute/service/HomepageService.java deleted file mode 100644 index fa05125..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/service/HomepageService.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.baiye.modules.distribute.service; - -import com.baiye.modules.distribute.qo.HomePageQo; - -import javax.servlet.http.HttpServletResponse; -import java.util.Map; - -/** - * @author wjt - * @date 2023/12/6 - */ -public interface HomepageService { - - /** - * 基础统计 - * - * @return 统计信息 - */ - Map baseCount(); - - /** - * 渠道进线统计 - * - * @param homePageQo 条件 - * @return 统计信息 - */ - Map> channelEnterClue(HomePageQo homePageQo); - - /** - * 导出 渠道进线统计 - * - * @param response - * @param homePageQo - */ - void channelClueExport(HttpServletResponse response, HomePageQo homePageQo); - - /** - * 渠道详细统计 - * - * @param homePageQo 条件 - * @return 统计信息 - */ - Map> channelAssignedClue(HomePageQo homePageQo); - - /** - * 统计分发员的进线和分发数 - * - * @param homePageQo - * @return - */ - Object distributorsEnterClue(HomePageQo homePageQo); - - /** - * 业务员统计 - * - * @param homePageQo - * @return - */ - Object salesmanEnterClue(HomePageQo homePageQo); -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/LabelOrganizeService.java b/admin/src/main/java/com/baiye/modules/distribute/service/LabelOrganizeService.java deleted file mode 100644 index f301416..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/service/LabelOrganizeService.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.baiye.modules.distribute.service; - -import com.baiye.domain.PageParam; -import com.baiye.domain.PageResult; -import com.baiye.extend.mybatis.plus.service.ExtendService; -import com.baiye.modules.distribute.entity.LabelOrganizeEntity; -import com.baiye.modules.distribute.qo.LabelOrganizeQo; -import com.baiye.modules.distribute.vo.LabelOrganizeVO; - -import java.util.List; -import java.util.Set; - -public interface LabelOrganizeService extends ExtendService { - - /** - * 新增标签组 - */ - void add(LabelOrganizeEntity labelOrganizeEntity); - - /** - * 修改标签组 - */ - boolean update(LabelOrganizeEntity labelOrganizeEntity); - - /** - * 删除标签组 - */ - boolean del(Set ids); - - /** - * 查询标签组列表 - */ - Object listLabelOrganize(LabelOrganizeQo labelOrganizeQo); - - /** - * 分页查询标签组(返回信息有此标签组下的标签) - */ - PageResult queryPage(PageParam pageParam, LabelOrganizeQo labelOrganizeQo); - - /** - * 查询当前用户标签组列表 并返回标签信息 - */ - List queryUserList(Long userId); - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/OceanEngineClueService.java b/admin/src/main/java/com/baiye/modules/distribute/service/OceanEngineClueService.java deleted file mode 100644 index 966742b..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/service/OceanEngineClueService.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.baiye.modules.distribute.service; - -import java.util.Date; - -/** - * @author wjt - * @date 2023/11/2 - * 获取巨量线索 - */ -public interface OceanEngineClueService { - - /** - * 飞 鱼线索 - * - * @param startTime 开始时间 - * @param endTime 结束时间 - */ - void getFeiYuSource(Date startTime, Date endTime); -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/OceanEngineService.java b/admin/src/main/java/com/baiye/modules/distribute/service/OceanEngineService.java deleted file mode 100644 index fcc1344..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/service/OceanEngineService.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.baiye.modules.distribute.service; - -import com.baiye.domain.PageParam; -import com.baiye.domain.PageResult; -import com.baiye.extend.mybatis.plus.service.ExtendService; -import com.baiye.modules.distribute.dto.OceanEngineTokenDto; -import com.baiye.modules.distribute.entity.OceanEngineToken; -import com.baiye.modules.distribute.qo.OceanEnginQo; -import com.baiye.modules.distribute.vo.OceanEnginVO; - -import java.util.List; - -/** - * @author Enzo - * @date : 2023-11-2 - */ -public interface OceanEngineService extends ExtendService { - - - /** - * 构建用户授权请求 - * - * @param id - * @param authorizeName - * @return - */ - String buildAuthorizationUrl(Long id, String authorizeName); - - /** - * 获取请求信息 - * - * @param state - * @param authCode - */ - void processRequest(String state, String authCode); - - /** - * 状态查找值 - * - * @param status - * @return - */ - List findByStatus(Integer status); - - - - - - /** - * 公司获取token - * - * @param companyId - * @param authorizeName - * @return - */ - List getOceanEnginByCompanyId(Long companyId, String authorizeName); - - - - /** - * 刷新token - * - * @param accountToken - * @param companyId - * @param id - * @return - */ - String refreshToken(String accountToken, Long id, Long companyId ); - - /** - * 修改公司授权 - * @param status - * @param id - */ - Boolean updateAuthorizationStatus(Integer status, Long id); - - - /** - * 修改token - * @param expiresIn - * @param accessToken - * @param refreshTokenExpiresIn - * @param refreshToken - * @param id - * @return - */ - Boolean updateOceanEnginByResponse(Long expiresIn, String accessToken, Long refreshTokenExpiresIn, String refreshToken, Long id); - - /** - * 授权 - * - * @param oceanEngineTokenDto - * @return - */ - String save(OceanEngineTokenDto oceanEngineTokenDto); - - /** - * 分页查询数据 - * - * @param pageParam - * @param oceanEnginQo - * @return - */ - PageResult queryPage(PageParam pageParam, OceanEnginQo oceanEnginQo); - - - /** - * 根据用户id状态修改 - * - * @param id - * @param userId - * @param status - * @return - */ - Boolean updateAuthorizationStatusByUserId(Long id, Long userId, Integer status); - - /** - * 查找用户id - * @param userId - * @return - */ - OceanEngineToken findByUserId(Long userId); -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/OutsideReqService.java b/admin/src/main/java/com/baiye/modules/distribute/service/OutsideReqService.java deleted file mode 100644 index b4b4c76..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/service/OutsideReqService.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.baiye.modules.distribute.service; - -import com.baiye.modules.distribute.dto.DBPushClueDTO; -import com.baiye.modules.distribute.dto.ReceivePushLeadsDTO; - -public interface OutsideReqService { - - /** - * 推送资源 - */ - void pushClue(String appKey, DBPushClueDTO DBPushClueDTO); - - Boolean externalPushClue(ReceivePushLeadsDTO receivePushLeadsDTO); - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/PushClueService.java b/admin/src/main/java/com/baiye/modules/distribute/service/PushClueService.java deleted file mode 100644 index 54ca2b7..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/service/PushClueService.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.baiye.modules.distribute.service; - -import com.baiye.domain.PageParam; -import com.baiye.domain.PageResult; -import com.baiye.extend.mybatis.plus.service.ExtendService; -import com.baiye.modules.distribute.entity.PushClueInfoEntity; -import com.baiye.modules.distribute.qo.SendClueQo; -import com.baiye.modules.distribute.vo.PushClueInfoVo; - -/** - * @author Enzo - * @date : 2024/3/1 - */ -public interface PushClueService extends ExtendService { - - - /** - * 发送任务 - * - * @param assignedBy - * @param clueId - * @param nid - * @param remark - * @return - */ - Boolean sendClueByUserId(Long assignedBy, Long clueId, String nid, String remark); - - /** - * 查询记录 - * @param pageParam - * @param qo - * @return - */ - PageResult queryPage(PageParam pageParam, SendClueQo qo); -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/PushConfigService.java b/admin/src/main/java/com/baiye/modules/distribute/service/PushConfigService.java deleted file mode 100644 index 9d68b67..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/service/PushConfigService.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.baiye.modules.distribute.service; - -import com.baiye.extend.mybatis.plus.service.ExtendService; -import com.baiye.modules.distribute.entity.PushClueInfoEntity; -import com.baiye.modules.distribute.entity.PushConfigEntity; - -/** - * @author Enzo - * @date : 2024/3/1 - */ -public interface PushConfigService extends ExtendService { - - /** - * 添加配置 - * @param pushConfigEntity - * @return - */ - Boolean addConfig(PushConfigEntity pushConfigEntity); - - /** - * 修改配置 - * @param pushConfigEntity - * @return - */ - Boolean updateConfig(PushConfigEntity pushConfigEntity); - - /** - * 用户id查找 - * @param assignedBy - * @return - */ - PushConfigEntity queryConfigByUserId(Long assignedBy); - - /** - * 用户id查找 - * @param currentUserId - * @return - */ - PushConfigEntity queryByUserId(Long currentUserId); -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/PushLinkService.java b/admin/src/main/java/com/baiye/modules/distribute/service/PushLinkService.java deleted file mode 100644 index a61210f..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/service/PushLinkService.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.baiye.modules.distribute.service; - -import com.baiye.domain.PageParam; -import com.baiye.domain.PageResult; -import com.baiye.extend.mybatis.plus.service.ExtendService; -import com.baiye.modules.distribute.dto.PushLinkDTO; -import com.baiye.modules.distribute.entity.PushLinkEntity; -import com.baiye.modules.distribute.qo.PushLinkQo; -import com.baiye.modules.distribute.vo.PushLinkVO; - -public interface PushLinkService extends ExtendService { - - /** - * 分页查询 - */ - PageResult queryPage(PageParam pageParam, PushLinkQo qo); - - /** - * 生成推送链接 - */ - String add(PushLinkDTO pushLinkDTO); - - /** - * appKey查询 - */ - PushLinkEntity getByAppKey(String appKey); - - /** - * 修改 - */ - boolean update(PushLinkDTO pushLinkDTO); - - /** - * 根据名称与用户id查询 - * @param authorizeName - * @param userId - * @return - */ - PushLinkEntity findByNameAndUserId(String authorizeName, Long userId); - - /** - * id查询 - * @param id - * @return - */ - PushLinkVO pushDetail(Long id); -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/StoreService.java b/admin/src/main/java/com/baiye/modules/distribute/service/StoreService.java deleted file mode 100644 index 93e99ee..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/service/StoreService.java +++ /dev/null @@ -1,85 +0,0 @@ -package com.baiye.modules.distribute.service; - -import com.baiye.domain.PageParam; -import com.baiye.domain.PageResult; -import com.baiye.extend.mybatis.plus.service.ExtendService; -import com.baiye.modules.distribute.dto.StoreDTO; -import com.baiye.modules.distribute.entity.StoreEntity; -import com.baiye.modules.distribute.qo.StoreQo; -import com.baiye.modules.distribute.vo.StoreVO; - -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; - -/** - * @author wjt - * @date 2023/9/5 - */ -public interface StoreService extends ExtendService { - - /** - * 分页查询门店 - * - * @param pageParam 分页参数 - * @param storeQo 查询条件 - * @return 分页结果 - */ - PageResult queryStorePage(PageParam pageParam, StoreQo storeQo); - - /** - * 不分页查询门店 - * - * @param storeQo 查询条件 - * @return 查询结果 - */ - List queryStore(StoreQo storeQo); - - /** - * 新增 - * - * @param storeEntity 门店信息 - */ - void addStore(StoreEntity storeEntity); - - /** - * 修改 - * - * @param storeEntity 门店信息 - */ - void updateStore(StoreEntity storeEntity); - - /** - * 删除门店信息 - * - * @param storeId 门店id - */ - void deleteStore(Long storeId); - - - /** - * 查询范围内所有的门店 - * - * @param longitude - * @param latitude - * @param distance - * @return - */ - List queryRangeStore(Double longitude, Double latitude, Double distance); - - /** - * 查询门店预约详情 - * - * @param startTime - * @param endTime - * @param storeId - * @return - */ - LinkedList> queryStoreReservation(String startTime, - String endTime, - Long storeId); - - void exportStoreDetails(HttpServletResponse response, String startTime, String endTime, Long storeId) throws IOException; -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/StoreUserService.java b/admin/src/main/java/com/baiye/modules/distribute/service/StoreUserService.java deleted file mode 100644 index b5d7fd6..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/service/StoreUserService.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.baiye.modules.distribute.service; - -import com.baiye.extend.mybatis.plus.service.ExtendService; -import com.baiye.modules.distribute.dto.StoreUserDTO; -import com.baiye.modules.distribute.entity.StoreUserEntity; -import com.baiye.system.model.dto.SysUserNameRoleDTO; - -import java.util.List; - -/** - * @author wjt - * @date 2023/9/15 - */ -public interface StoreUserService extends ExtendService { - - /** - * 获取角色用户 - * - * @return List - */ - List listByRoleCode(); - - /** - * 绑定关系 - * - * @param storeId 门店 - * @param userId 坐席 - */ - void insertStoreUser(Long storeId, Long userId); - - /** - * 店铺查询用户id - * @param storeId - * @return - */ - StoreUserDTO findUserIdByStoreId(Long storeId); -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/TagService.java b/admin/src/main/java/com/baiye/modules/distribute/service/TagService.java deleted file mode 100644 index fc0bf47..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/service/TagService.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.baiye.modules.distribute.service; - -import com.baiye.extend.mybatis.plus.service.ExtendService; -import com.baiye.modules.distribute.entity.TagEntity; - -import java.util.List; - -/** - * @author Enzo - * @date : 2023/12/6 - */ -public interface TagService extends ExtendService { - - /** - * 创建标签 - * @param entity - * @return - */ - Boolean create(TagEntity entity); - - /** - * 修改标签 - * @param list - * @return - */ - Boolean update(List list); - - /** - * 查询正在使用的标签 - * @param routeStatus - * @param isSalesman - * @return - */ - List selectList(Integer routeStatus, Boolean isSalesman); -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/TripartiteService.java b/admin/src/main/java/com/baiye/modules/distribute/service/TripartiteService.java deleted file mode 100644 index 77f8f8f..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/service/TripartiteService.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.baiye.modules.distribute.service; - -import com.baiye.modules.distribute.dto.PushClueDTO; - -/** - * @author Enzo - * @date 2023-12-6 - */ -public interface TripartiteService { - - - /** - * 插入信息 - * @param appKey - * @param dto - * @return - */ - Boolean callbackByAppKeyAndNid(String appKey, PushClueDTO dto); -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/impl/BuildModelServiceImpl.java b/admin/src/main/java/com/baiye/modules/distribute/service/impl/BuildModelServiceImpl.java deleted file mode 100644 index c010dc0..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/service/impl/BuildModelServiceImpl.java +++ /dev/null @@ -1,82 +0,0 @@ -package com.baiye.modules.distribute.service.impl; - -import cn.hutool.core.codec.Base64; -import cn.hutool.core.text.CharSequenceUtil; -import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.ObjectUtil; -import com.baiye.constant.DefaultNumberConstants; -import com.baiye.enums.ClueSourceEnum; -import com.baiye.modules.distribute.dto.CallbackCustomDTO; -import com.baiye.modules.distribute.dto.ClueDTO; -import com.baiye.modules.distribute.dto.PushClueDTO; -import com.baiye.modules.distribute.entity.PushLinkEntity; -import com.baiye.modules.distribute.service.*; -import com.baiye.notify.model.entity.Announcement; -import com.baiye.polling.QueueBalance; -import com.baiye.system.enums.RoleCodeEnum; -import com.baiye.system.model.entity.SysUser; -import com.baiye.system.model.entity.SysUserRolePromise; -import com.baiye.system.service.SysUserRolePromiseService; -import com.baiye.system.service.SysUserRoleService; -import com.baiye.system.service.SysUserService; -import com.baiye.util.AESUtils; -import com.baiye.util.DecryptPnoUtil; -import com.baiye.util.RedisUtils; -import com.google.common.collect.Lists; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.ballcat.security.properties.SecurityProperties; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Collections; -import java.util.List; -import java.util.concurrent.TimeUnit; - -/** - * @author Enzo - * @date : 2023/12/6 - */ -@Slf4j -@Service -@RequiredArgsConstructor -public class BuildModelServiceImpl implements BuildModelService { - - - @Value("${snowflake.workerId}") - private int workerId; - - @Value("${snowflake.datacenterId}") - private int datacenterId; - - - - @Override - @Transactional(rollbackFor = Exception.class) - public Boolean callbackByNid(PushClueDTO dto) { - String recId = dto.getRecId(); - String called = dto.getCalled(); - String remark = dto.getRemark(); - String phone = CharSequenceUtil.EMPTY; - - String typeName = dto.getEmpClientTypeName(); - if (StringUtils.isNotBlank(dto.getMobile())) { - phone = Base64.decodeStr(dto.getMobile()); - } - // 格式校验 - if (StringUtils.isNotBlank(called) && StringUtils.isNotBlank(typeName) - && Announcement.TABLE_ALIAS.equalsIgnoreCase(typeName)) { - phone = called.length() > DefaultNumberConstants.ELEVEN_NUMBER - ? DecryptPnoUtil.decryptPno(called) : called; - } - - if (StringUtils.isNotBlank(phone) ) { - - } - return Boolean.TRUE; - } - - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/impl/ClueFileServiceImpl.java b/admin/src/main/java/com/baiye/modules/distribute/service/impl/ClueFileServiceImpl.java deleted file mode 100644 index 6c049f8..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/service/impl/ClueFileServiceImpl.java +++ /dev/null @@ -1,128 +0,0 @@ -package com.baiye.modules.distribute.service.impl; - -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.poi.excel.ExcelReader; -import com.alibaba.excel.EasyExcelFactory; -import com.baiye.constant.DefaultNumberConstants; -import com.baiye.easyexcel.listener.CustomListener; -import com.baiye.exception.BadRequestException; -import com.baiye.modules.distribute.dto.ReadFileDTO; -import com.baiye.modules.distribute.entity.ClueRecordEntity; -import com.baiye.modules.distribute.entity.UserSecretKeyEntity; -import com.baiye.modules.distribute.mapper.UserSecretKeyMapper; -import com.baiye.modules.distribute.service.ClueFileService; -import com.baiye.modules.distribute.service.ClueRecordService; -import com.baiye.modules.distribute.service.CustomService; -import com.baiye.security.util.SecurityUtils; -import com.baiye.system.properties.FileProperties; -import com.baiye.util.AppUtils; -import com.baiye.util.FileUtil; -import com.baiye.util.RsaUtil; -import com.baiye.utils.ClueFileTestingUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import org.springframework.web.multipart.MultipartFile; - -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.nio.charset.StandardCharsets; -import java.security.KeyPair; -import java.text.SimpleDateFormat; -import java.util.*; - -@Slf4j -@Service -@RequiredArgsConstructor -public class ClueFileServiceImpl implements ClueFileService { - - private final FileProperties properties; - - private final ClueRecordService clueRecordService; - - private final UserSecretKeyMapper userSecretKeyMapper; - - private final CustomService customService; - - @Override - public Map detection(MultipartFile multipartFile) { - // 检测文件的内容格式 - ExcelReader excelReader = ClueFileTestingUtil.testingExcel(multipartFile); - // 保存文件 - SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); - String path = properties.getPath().getClueFilePath() + dateFormat.format(new Date()) - + properties.getPath().getSystemSeparator(); - File file = FileUtil.upload(multipartFile, path); - // 保存文件记录 - ClueRecordEntity clueRecordEntity = new ClueRecordEntity(); - clueRecordEntity.setOldFileName(file.getName()); - clueRecordEntity.setUrl(Objects.requireNonNull(file).getPath()); - // 获取表头 - List oneReadList = excelReader.readRow(DefaultNumberConstants.ZERO_NUMBER); - clueRecordService.save(clueRecordEntity); - Map returnMap = new HashMap<>(); - returnMap.put("excelHead", oneReadList); - returnMap.put("clueRecordId", clueRecordEntity.getClueRecordId()); - return returnMap; - } - - @Override - public void readFile(ReadFileDTO readFileDTO) { - ClueRecordEntity clueRecordEntity = clueRecordService.getBaseMapper().selectOne(new LambdaQueryWrapper() - .eq(ClueRecordEntity::getClueRecordId, readFileDTO.getRecordId()) - .eq(ClueRecordEntity::getCreateBy, SecurityUtils.getCurrentUserId())); - if (ObjectUtil.isNotNull(clueRecordEntity)){ - try { - FileInputStream file = new FileInputStream(clueRecordEntity.getUrl()); - EasyExcelFactory.read(file, new CustomListener(customService, clueRecordEntity, readFileDTO)).build().readAll(); - } catch (FileNotFoundException e) { - log.error("========文件读取错误: {}==========", e.getMessage()); - } - } - } - - @Override - public Map generateSecretKey() { - Map map = new HashMap<>(); - UserSecretKeyEntity entity = userSecretKeyMapper.selectOne(new LambdaQueryWrapper() - .eq(UserSecretKeyEntity::getCreateBy, SecurityUtils.getCurrentUserId())); - if (entity != null && entity.getId() != null) { - map.put("appKey", entity.getAppKey()); - map.put("publicKey", entity.getPublicKey()); - return map; - } - try { - // 生成秘钥对 - KeyPair keyPair = RsaUtil.getKeyPair(); - String privateKey = new String(Base64.getEncoder().encode(keyPair.getPrivate().getEncoded()), StandardCharsets.UTF_8); - String publicKey = new String(Base64.getEncoder().encode(keyPair.getPublic().getEncoded()), StandardCharsets.UTF_8); - String appId = AppUtils.getAppId(); - - while (true) { - UserSecretKeyEntity userSecretKeyEntity = userSecretKeyMapper.selectOne(new LambdaQueryWrapper().eq(UserSecretKeyEntity::getPublicKey, appId)); - // 插入数据,返回数据 - if (userSecretKeyEntity == null || userSecretKeyEntity.getId() == null) { - UserSecretKeyEntity keyEntity = new UserSecretKeyEntity(); - keyEntity.setAppKey(appId); - keyEntity.setPublicKey(publicKey); - keyEntity.setPrivateKey(privateKey); - userSecretKeyMapper.insert(keyEntity); - - map.put("appKey", appId); - map.put("publicKey", publicKey); - return map; - } else { - // 重复的appId,重新生成 - appId = AppUtils.getAppId(); - privateKey = new String(Base64.getEncoder().encode(keyPair.getPrivate().getEncoded()), StandardCharsets.UTF_8); - publicKey = new String(Base64.getEncoder().encode(keyPair.getPublic().getEncoded()), StandardCharsets.UTF_8); - } - } - } catch (Exception e) { - throw new BadRequestException("生成秘钥错误"); - } - } - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/impl/ClueRecordServiceImpl.java b/admin/src/main/java/com/baiye/modules/distribute/service/impl/ClueRecordServiceImpl.java deleted file mode 100644 index 0c72f90..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/service/impl/ClueRecordServiceImpl.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.baiye.modules.distribute.service.impl; - -import com.baiye.domain.SelectData; -import com.baiye.modules.distribute.entity.ClueRecordEntity; -import com.baiye.modules.distribute.mapper.ClueRecordMapper; -import com.baiye.modules.distribute.service.ClueRecordService; -import com.baiye.modules.distribute.vo.ClueRecordVO; -import com.baiye.modules.distribute.qo.ClueRecordQo; -import com.baiye.security.util.SecurityUtils; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; -import com.baiye.util.FileUtil; -import com.baiye.domain.PageParam; -import com.baiye.domain.PageResult; -import com.baiye.extend.mybatis.plus.service.impl.ExtendServiceImpl; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; - -@Slf4j -@Service -@RequiredArgsConstructor -public class ClueRecordServiceImpl extends ExtendServiceImpl - implements ClueRecordService { - - @Override - public PageResult queryPage(PageParam pageParam, ClueRecordQo qo) { - qo.setCreateBy(SecurityUtils.getCurrentUserId()); - return baseMapper.queryPage(pageParam, qo); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public boolean deleteByUserId(Long clueRecordId) { - ClueRecordEntity clueRecordEntity = baseMapper.selectById(clueRecordId); - if (clueRecordEntity != null) - FileUtil.del(clueRecordEntity.getUrl()); - return SqlHelper.retBool(baseMapper.deleteById(clueRecordId)); - } - - @Override - public List selectByWrapper(LambdaQueryWrapper wrapper) { - return baseMapper.selectList(wrapper); - } - - @Override - public ClueRecordEntity addDefaultRecordService(Long userId, String name, String channelIdentifying) { - ClueRecordEntity clueRecordEntity = new ClueRecordEntity(); - clueRecordEntity.setStatus(2); - clueRecordEntity.setOldFileName(name); - clueRecordEntity.setRecordType(1); - clueRecordEntity.setCreateBy(userId); - clueRecordEntity.setChannelIdentifying(channelIdentifying); - baseMapper.insert(clueRecordEntity); - return clueRecordEntity; - } - - @Override - public List> listSelectData(ClueRecordQo qo) { - return baseMapper.listSelectData(qo); - } - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/impl/ClueServiceImpl.java b/admin/src/main/java/com/baiye/modules/distribute/service/impl/ClueServiceImpl.java deleted file mode 100644 index 82dbbd8..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/service/impl/ClueServiceImpl.java +++ /dev/null @@ -1,275 +0,0 @@ -package com.baiye.modules.distribute.service.impl; - -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.json.JSONArray; -import cn.hutool.json.JSONUtil; -import com.baiye.constant.DefaultNumberConstants; -import com.baiye.domain.PageParam; -import com.baiye.domain.PageResult; -import com.baiye.exception.BadRequestException; -import com.baiye.extend.mybatis.plus.service.impl.ExtendServiceImpl; -import com.baiye.modules.distribute.converter.ClueConverter; -import com.baiye.modules.distribute.dto.ClueDTO; -import com.baiye.modules.distribute.entity.*; -import com.baiye.modules.distribute.mapper.ClueMapper; -import com.baiye.modules.distribute.mapper.ClueRecordMapper; -import com.baiye.modules.distribute.qo.ClueQo; -import com.baiye.modules.distribute.service.ClueService; -import com.baiye.modules.distribute.service.ClueStageService; -import com.baiye.modules.distribute.service.LabelOrganizeService; -import com.baiye.modules.distribute.service.PushClueService; -import com.baiye.modules.distribute.vo.ClueVO; -import com.baiye.notify.event.StationNotifyPushEvent; -import com.baiye.notify.model.domain.AnnouncementNotifyInfo; -import com.baiye.security.util.SecurityUtils; -import com.baiye.util.AESUtils; -import com.baiye.util.MobileUtil; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.ballcat.security.properties.SecurityProperties; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.ApplicationContext; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.concurrent.CompletableFuture; -import java.util.stream.Collectors; - -@Slf4j -@Service -@RequiredArgsConstructor -public class ClueServiceImpl extends ExtendServiceImpl implements ClueService { - - private final PushClueService pushClueService; - - private final ClueRecordMapper clueRecordMapper; - - private final LabelOrganizeService labelOrganizeService; - - private final ClueStageService clueStageService; - - private final SecurityProperties securityProperties; - - private final ApplicationContext publisher; - - - - @Value("${snowflake.workerId}") - private int workerId; - - @Value("${snowflake.datacenterId}") - private int datacenterId; - - @Override - @Transactional(rollbackFor = Exception.class) - public void clueFileUploadSaveAll(List clues) { - if (CollUtil.isNotEmpty(clues)) { - List failClueList = new ArrayList<>(); - Long clueRecordId = clues.get(0).getClueRecordId(); - - // 手机号验证资源 - 加密手机号 - for (ClueEntity clue : clues) { - boolean bool = MobileUtil.checkPhone(clue.getNid()); - if (!bool) { - failClueList.add(clue); - } - clue.setIsNewClue(Boolean.TRUE); - clue.setNid(AESUtils.encrypt(clue.getNid(), securityProperties.getPasswordSecretKey())); - } - // 去除手机号不符合条件的资源-插入数据 - clues = clues.stream() - .filter(item -> !failClueList.stream() - .map(ClueEntity::getNid) - .collect(Collectors.toList()) - .contains(item.getNid())) - .collect(Collectors.toList()); - if (CollUtil.isNotEmpty(clues)) - baseMapper.insertBatchSomeColumn(clues); - - // 更新记录的成功失败条数 - ClueRecordEntity clueRecordEntity = clueRecordMapper.selectById(clueRecordId); - clueRecordEntity.setFailNum(clueRecordEntity.getFailNum() + failClueList.size()); - clueRecordEntity.setSuccessNum(clueRecordEntity.getSuccessNum() + clues.size()); - clueRecordEntity.setStatus(2); - clueRecordMapper.updateById(clueRecordEntity); - } - } - - @Override - public List findUndistributedClueIds(List recordIdList) { - return baseMapper.findUndistributedClueIds(recordIdList); - } - - @Override - public PageResult queryPage(PageParam pageParam, ClueQo qo) { - - // 扩展数据 - if (qo.getNid() != null) { - qo.setNid(AESUtils.encrypt(qo.getNid(), securityProperties.getPasswordSecretKey())); - } - PageResult pageResult = baseMapper.queryPage(pageParam, qo); - List recordList = pageResult.getRecords(); - - if (CollUtil.isNotEmpty(recordList)) { - for (ClueVO record : recordList) { - // // 手机号隐藏中间4位 - String decryptNid = AESUtils.decrypt(record.getNid(), securityProperties.getPasswordSecretKey()); - if (StringUtils.isNotBlank(decryptNid)) { - record.setNid(decryptNid); - if (ObjectUtil.isNotNull(qo.getSalesmanType()) && - qo.getSalesmanType() > DefaultNumberConstants.ONE_NUMBER && - qo.getSalesmanType() < DefaultNumberConstants.FOUR_NUMBER){ - record.setNid(decryptNid.replaceAll("(\\d{3})\\d{4}(\\d{4})", "$1****$2")); - } - } else { - record.setNid(""); - } - // 转换标签 - String clueLabelName = record.getClueLabelName(); - if (StringUtils.isNotBlank(clueLabelName)) { - JSONArray array = JSONUtil.parseArray(clueLabelName); - record.setClueLabelList(JSONUtil.toList(array, String.class)); - record.setClueLabelName(""); - } - } - } - return pageResult; - } - - @Override - public boolean update(ClueDTO clueDTO) { - ClueEntity clueEntity = ClueConverter.INSTANCE.dtoToPo(clueDTO); - clueEntity.setIsNewClue(Boolean.FALSE); - - // 修改标签 - List clueLabelList = clueDTO.getClueLabelList(); - if (CollUtil.isNotEmpty(clueLabelList)) { - String result = clueLabelList.stream() - .map(LabelEntity::getId) - .map(Object::toString) - .collect(Collectors.joining(",")); - clueEntity.setClueLabel(result); - List nameList = clueLabelList.stream().map(LabelEntity::getLabelName).collect(Collectors.toList()); - clueEntity.setClueLabelName(JSONUtil.toJsonStr(nameList)); - } else { - // 修改标签为空 - LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); - updateWrapper.eq(ClueEntity::getClueId, clueDTO.getClueId()); - updateWrapper.set(ClueEntity::getClueLabel, null); - updateWrapper.set(ClueEntity::getClueLabelName, null); - baseMapper.update(null, updateWrapper); - - clueEntity.setClueLabelName(null); - clueEntity.setClueLabel(null); - } - return SqlHelper.retBool(baseMapper.updateById(clueEntity)); - } - - @Override - public ClueVO details(Long clueId, ClueQo qo) { - ClueVO clueVO = new ClueVO(); - ClueEntity clueEntity = baseMapper.selectById(clueId); - if (ObjectUtil.isNull(clueEntity) || ObjectUtil.isNull(clueEntity.getClueId())){ - throw new BadRequestException("该线索不存在或已被撤回!"); - } - clueEntity.setNid(AESUtils.decrypt(clueEntity.getNid(), securityProperties.getPasswordSecretKey())); - BeanUtils.copyProperties(clueEntity, clueVO); - clueVO.setClueId(clueEntity.getClueId().toString()); - Long whichUserId = SecurityUtils.getWhichUserId(); - // 查询上级用户标签 - List organizeEntities = labelOrganizeService.queryUserList(whichUserId); - // 查询上级用户阶段 - List clueStageEntities = clueStageService.queryUserList(whichUserId); - clueVO.setOrganizeEntities(organizeEntities); - clueVO.setClueStageEntities(clueStageEntities); - - return clueVO; - } - - - @Override - public Boolean saveClueListByStoreInfo(List list) { - List entityList = Convert.toList(ClueEntity.class, list); - AnnouncementNotifyInfo notifyInfo; - for (ClueDTO dto : list) { - // 雪花算法id - Long id = IdUtil.getSnowflake(workerId, datacenterId).nextId(); - notifyInfo = new AnnouncementNotifyInfo(); - notifyInfo.setId(id); - notifyInfo.setTitle("新消息通知"); - notifyInfo.setMessageKey(dto.getClueId().toString()); - notifyInfo.setContent("您有一条新线索请及时查收!"); - notifyInfo.setCreateTime(LocalDateTime.now()); - notifyInfo.setState(DefaultNumberConstants.ZERO_NUMBER); - notifyInfo.setMessageType(DefaultNumberConstants.ONE_NUMBER); - // 异步发送线索 - CompletableFuture.runAsync(() -> pushClueService.sendClueByUserId(dto.getClueId(), dto.getAssignedBy(), dto.getNid(), dto.getRemark())); - publisher.publishEvent(new StationNotifyPushEvent(notifyInfo, Collections.singletonList(dto.getAssignedBy()))); - } - return SqlHelper.retBool(baseMapper.insertBatchSomeColumn(entityList)); - } - - @Override - public List queryList(ClueQo qo) { - // 扩展数据 - if (qo.getNid() != null) { - qo.setNid(AESUtils.encrypt(qo.getNid(), securityProperties.getPasswordSecretKey())); - } - List clueVOList = baseMapper.queryList(qo); - if (CollUtil.isNotEmpty(clueVOList)) { - for (ClueVO vo : clueVOList) { - // 转换标签 - String clueLabelName = vo.getClueLabelName(); - if (StringUtils.isNotBlank(clueLabelName)) { - JSONArray array = JSONUtil.parseArray(clueLabelName); - vo.setClueLabelList(JSONUtil.toList(array, String.class)); - } - } - } - return clueVOList; - } - - @Override - public Boolean changeEffective(Long id, Integer effective) { - LambdaUpdateWrapper wrapper = Wrappers.lambdaUpdate(ClueEntity.class) - .set(ClueEntity::getIsEffective, effective).eq(ClueEntity::getClueId, id); - return SqlHelper.retBool(this.baseMapper.update(null,wrapper)); - } - - @Override - public List findCustomId(Long assignedBy, Long createBy) { - return baseMapper.findCustomId(assignedBy, createBy); - } - - @Override - public List findByCompanyIdAndNid(Long companyId, String phone) { - return baseMapper.selectList(Wrappers.lambdaQuery(ClueEntity.class).eq - (ClueEntity::getCompanyId, companyId).eq(ClueEntity::getNid, phone).eq - (ClueEntity::getDeleted,DefaultNumberConstants.ZERO_NUMBER)); - } - - @Override - public List findCustomIdAndCreate(Long id, Long createBy) { - return baseMapper.findCustomIdAndCreate(id, createBy, DefaultNumberConstants.ZERO_NUMBER); - } - - @Override - public List selectListByUserId(List userIdList) { - - List clueEntityList = baseMapper.selectList(Wrappers.lambdaQuery(ClueEntity.class).in - (ClueEntity::getAssignedBy, userIdList).eq(ClueEntity::getDeleted, DefaultNumberConstants.ZERO_NUMBER)); - return Convert.toList(ClueVO.class,clueEntityList); - } -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/impl/ClueStageServiceImpl.java b/admin/src/main/java/com/baiye/modules/distribute/service/impl/ClueStageServiceImpl.java deleted file mode 100644 index 53aeef9..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/service/impl/ClueStageServiceImpl.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.baiye.modules.distribute.service.impl; - -import com.baiye.extend.mybatis.plus.service.impl.ExtendServiceImpl; -import com.baiye.modules.distribute.entity.ClueStageEntity; -import com.baiye.modules.distribute.mapper.ClueStageMapper; -import com.baiye.modules.distribute.service.ClueStageService; -import com.baiye.security.util.SecurityUtils; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * @Author YQY - * @Date 2023/8/15 - */ -@Service -public class ClueStageServiceImpl extends ExtendServiceImpl - implements ClueStageService { - - @Override - public Object listData() { - Long whichUserId = SecurityUtils.getWhichUserId(); - Long selectUserId; - if (whichUserId == 1) { - selectUserId = SecurityUtils.getCurrentUserId(); - } - else { - selectUserId = whichUserId; - } - return baseMapper - .selectList(new LambdaQueryWrapper().eq(ClueStageEntity::getCreateBy, selectUserId)); - } - - @Override - public List queryUserList(Long userId) { - return baseMapper - .selectList(new LambdaQueryWrapper().eq(ClueStageEntity::getCreateBy, userId)); - } - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/impl/CustomServiceImpl.java b/admin/src/main/java/com/baiye/modules/distribute/service/impl/CustomServiceImpl.java deleted file mode 100644 index 156ff62..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/service/impl/CustomServiceImpl.java +++ /dev/null @@ -1,391 +0,0 @@ -package com.baiye.modules.distribute.service.impl; - -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.date.DateTime; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.text.StrPool; -import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.ObjectUtil; -import com.baiye.constant.DefaultNumberConstants; -import com.baiye.domain.PageParam; -import com.baiye.domain.PageResult; -import com.baiye.exception.BadRequestException; -import com.baiye.extend.mybatis.plus.service.impl.ExtendServiceImpl; -import com.baiye.modules.distribute.converter.CustomConverter; -import com.baiye.modules.distribute.dto.*; -import com.baiye.modules.distribute.entity.ClueEntity; -import com.baiye.modules.distribute.entity.CustomEntity; -import com.baiye.modules.distribute.entity.CustomStoreEntity; -import com.baiye.modules.distribute.entity.StoreEntity; -import com.baiye.modules.distribute.mapper.CustomMapper; -import com.baiye.modules.distribute.qo.ClueQo; -import com.baiye.modules.distribute.qo.CustomQo; -import com.baiye.modules.distribute.service.*; -import com.baiye.modules.distribute.vo.AddressDTO; -import com.baiye.modules.distribute.vo.ClueVO; -import com.baiye.modules.distribute.vo.CustomStoreVO; -import com.baiye.modules.distribute.vo.CustomVO; -import com.baiye.polling.QueueBalance; -import com.baiye.security.userdetails.User; -import com.baiye.security.util.SecurityUtils; -import com.baiye.system.constant.DateConst; -import com.baiye.system.constant.LetterConst; -import com.baiye.system.enums.RoleCodeEnum; -import com.baiye.system.model.entity.SysUser; -import com.baiye.system.service.SysUserRoleService; -import com.baiye.system.service.SysUserService; -import com.baiye.util.AESUtils; -import com.baiye.util.RedisUtils; -import com.baiye.utils.SerialCode; -import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; -import com.google.common.collect.Lists; -import com.google.gson.Gson; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.ballcat.security.properties.SecurityProperties; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.data.redis.core.ValueOperations; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; - -@Slf4j -@Service -@RequiredArgsConstructor -public class CustomServiceImpl extends ExtendServiceImpl implements CustomService { - - private final CustomStoreService customStoreService; - - private final SecurityProperties securityProperties; - - private final SysUserRoleService sysUserRoleService; - - private final StoreUserService storeUserService; - - private final SysUserService sysUserService; - - private final ClueService clueService; - - private final StoreService storeService; - - private final RedisTemplate redisTemplate; - - @Value("${snowflake.workerId}") - private int workerId; - - @Value("${snowflake.datacenterId}") - private int datacenterId; - - - @Override - public PageResult queryPage(PageParam pageParam, CustomQo qo) { - if (qo.getSalesmanType() == DefaultNumberConstants.TWO_NUMBER && qo.getSalesmanUserId() != null) { - List customIdList = clueService.findCustomId(qo.getSalesmanUserId(), SecurityUtils.getCurrentUserId()); - qo.setCustomIds(customIdList); - } - return baseMapper.queryPage(pageParam, qo); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public boolean add(CustomDTO customDTO) { - this.validDate(customDTO); - User user = SecurityUtils.getUser(); - CustomEntity customEntity = getCustomEntity(CustomConverter.INSTANCE.dtoToPo(customDTO), user.getWhichUserId(), user.getUsername()); - int insert = baseMapper.insert(customEntity); - List customStoreEntities = customDTO.getCustomStoreEntities(); - if (CollUtil.isNotEmpty(customStoreEntities)) { - customStoreEntities.forEach(c -> c.setCustomId(customEntity.getCustomId())); - customStoreService.saveBatch(customStoreEntities); - } - return SqlHelper.retBool(insert); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public boolean update(CustomDTO customDTO) { - this.validDate(customDTO); - CustomEntity customEntity = CustomConverter.INSTANCE.dtoToPo(customDTO); - // 修改预约信息 - customStoreService.updateCustomStoreInfo(customDTO.getCustomStoreEntities(), customDTO.getCustomId()); - return SqlHelper.retBool(baseMapper.updateById(customEntity)); - } - - @Override - public CustomVO details(Long id) { - CustomVO customVO = new CustomVO(); - CustomEntity customEntity = baseMapper.selectById(id); - BeanUtils.copyProperties(customEntity, customVO); - if (CollUtil.isNotEmpty(customEntity.getSalesmanUserId())) { - customVO.setSalesmanUserId(customEntity.getSalesmanUserId().stream().map(Long::parseLong).collect(Collectors.toList())); - - ClueQo clueQo = new ClueQo(); - clueQo.setCustomId(id); - List clueVOS = clueService.queryList(clueQo); - if (CollUtil.isNotEmpty(clueVOS)) { - customVO.setUserNameList(clueVOS.stream().map(ClueVO::getAssignedName).collect(Collectors.toList())); - } - } - - List customStoreVOList = new ArrayList<>(); - List customStores = customStoreService.selectListByCustomId(id); - if (CollUtil.isNotEmpty(customStores)) { - List storeIdList = customStores.stream().map(CustomStoreEntity::getStoreId).collect(Collectors.toList()); - List storeEntities = storeService.listByIds(storeIdList); - Map> map = storeEntities.stream().collect(Collectors.groupingBy(StoreEntity::getId)); - for (CustomStoreEntity customStore : customStores) { - CustomStoreVO customStoreVO = new CustomStoreVO(); - BeanUtils.copyProperties(customStore, customStoreVO); - if (map.containsKey(customStoreVO.getStoreId())) { - customStoreVO.setStoreName(map.get(customStoreVO.getStoreId()).get(0).getStoreName()); - } - customStoreVOList.add(customStoreVO); - } - } - customVO.setCustomStoreVOList(customStoreVOList); - if (customVO.getEnrollStatus() == 2) { - StringBuilder stringBuilder = new StringBuilder(customVO.getCustomNid()); - customVO.setCustomNid(stringBuilder.replace(3, 7, "****").toString()); - } - return customVO; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public Boolean deleteApprovalFormById(Long id) { - Boolean result = customStoreService.deleteByCustomId(id); - log.info("========================= delete result as {} =========================", result); - return SqlHelper.retBool(baseMapper.deleteById(id)); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public Boolean auditFormById(ChangeCustomDTO dto) { - ValueOperations valueOperations = redisTemplate.opsForValue(); - String key = "custom::audit:" + dto.getCustomId(); - Long currentUserId = SecurityUtils.getCurrentUserId(); - // 加锁 - Boolean ifAbsent = valueOperations.setIfAbsent(key, currentUserId, 10, TimeUnit.SECONDS); - if ((null == ifAbsent) || (!ifAbsent)) throw new BadRequestException("10秒内不能重复分发同一客户"); - Integer status = dto.getStatus(); - List salesmanUserIdList = dto.getSalesmanUserId(); - - List list = Lists.newArrayList(); - CustomEntity customEntity = baseMapper.selectById(dto.getCustomId()); - if (ObjectUtil.isNotNull(customEntity) || customEntity.getEnrollStatus() != DefaultNumberConstants.TWO_NUMBER) { - String phone = AESUtils.encrypt(customEntity.getCustomNid(), securityProperties.getPasswordSecretKey()); - Long companyId = customEntity.getCompanyId(); - List clueEntityList = clueService.findByCompanyIdAndNid(companyId, phone); - if (CollUtil.isNotEmpty(clueEntityList)) { - throw new BadRequestException("该资源已分发,请勿重复操作!"); - } - if (status == 0) { - Gson gson = new Gson(); - AddressDTO address = new AddressDTO(); - BeanUtils.copyProperties(customEntity, address); - address.setCustomerName(customEntity.getCustomName()); - String otherClue = gson.toJson(address); - List customStores = customStoreService.selectListByCustomId(dto.getCustomId()); - if (CollUtil.isNotEmpty(customStores)) { - for (CustomStoreEntity store : customStores) { - Long clueId = IdUtil.getSnowflake(workerId, datacenterId).nextId(); - StoreUserDTO entity = storeUserService.findUserIdByStoreId(store.getStoreId()); - if (ObjectUtil.isNotNull(entity) && ObjectUtil.isNotNull(entity.getUserId())) { - String username = sysUserService.findById(entity.getUserId()).getUsername(); - // 扣减余额 - Boolean result = sysUserService.deductionQuantity(entity.getUserId(), entity.getStoreName()); - if (Boolean.TRUE.equals(result)) { - ClueDTO clueDTO = new ClueDTO(clueId, customEntity.getChannelName(), phone, customEntity.getRemark(), - otherClue, entity.getUserId(), username, currentUserId, Boolean.TRUE, companyId, customEntity.getSex(), - customEntity.getCustomInformation(), customEntity.getChannelIdentifying(), customEntity.getChannelType(), dto.getCustomId()); - list.add(clueDTO); - } - } - } - } - } else if (status == 1) { - if (CollUtil.isEmpty(salesmanUserIdList)) throw new BadRequestException("下发人员不能为空!"); - Map> listMap = sysUserService.listByUserIds(salesmanUserIdList).stream().collect(Collectors.groupingBy(SysUser::getUserId)); - for (Long userId : salesmanUserIdList) { - String username = listMap.get(userId).get(0).getUsername(); - // 扣减余额 - Boolean result = sysUserService.deductionQuantity(userId, null); - if (Boolean.TRUE.equals(result)) { - Long clueId = IdUtil.getSnowflake(workerId, datacenterId).nextId(); - ClueDTO clueDTO = new ClueDTO(clueId, customEntity.getChannelName(), phone, customEntity.getRemark(), null, userId, - username, currentUserId, Boolean.TRUE, companyId, customEntity.getSex(), customEntity.getCustomInformation(), - customEntity.getChannelIdentifying(), customEntity.getChannelType(), dto.getCustomId()); - list.add(clueDTO); - } - } - } else { - if (ObjectUtil.isNull(dto.getReviewUserId())) throw new BadRequestException("复审员不能为空!"); - customEntity.setType(3); - customEntity.setReviewUserId(dto.getReviewUserId()); - return SqlHelper.retBool(baseMapper.updateById(customEntity)); - } - // 插入资源,修改信息 - if (CollUtil.isNotEmpty(list)) { - clueService.saveClueListByStoreInfo(list); - customEntity.setEnrollStatus(2); - customEntity.setDistributeTime(DateUtil.date()); - customEntity.setUpdateTime(LocalDateTime.now()); - int update = baseMapper.updateById(customEntity); - - return SqlHelper.retBool(update); - } - } else throw new BadRequestException("已分发,请勿重复分发"); - return Boolean.FALSE; - } - - @Override - public Boolean reAuditFormById(ChangeCustomDTO dto) { - Long id = dto.getCustomId(); - Integer status = dto.getStatus(); - CustomEntity customEntity = baseMapper.selectById(id); - if (ObjectUtil.isNotNull(customEntity)) { - if (ObjectUtil.isNotNull(status) && status == 1) { - customEntity.setType(2); - customEntity.setCustomType(0); - customEntity.setUpdateTime(LocalDateTime.now()); - return SqlHelper.retBool(baseMapper.updateById(customEntity)); - } - } - return Boolean.FALSE; - } - - @Override - public List queryList(CustomQo customQo) { - return baseMapper.queryList(customQo); - } - - @Override - public Boolean createByType(CreateCustomDTO createCustomDTO) { - User user = SecurityUtils.getUser(); - Long whichUserId = user.getWhichUserId(); - createCustomDTO.setChannelType(DefaultNumberConstants.ONE_NUMBER); - // 查询所有分发员 - List userList = sysUserRoleService.selectUserIdByRoleCode - (whichUserId, RoleCodeEnum.ROLE_PRELIMINARY_EXAMINER.getRoleCode()); - CustomEntity customEntity = getCustomEntity(CustomConverter.INSTANCE.dtoToPo(createCustomDTO), whichUserId, user.getUsername()); - QueueBalance balance = new QueueBalance<>(); - Long distributeId = balance.chooseOne(userList); - customEntity.setCreateBy(user.getUserId()); - customEntity.setDistributorId(distributeId); - return SqlHelper.retBool(baseMapper.insert(customEntity)); - - } - - @Override - public Boolean createByFileType(CustomDTO customDTO) { - User user = SecurityUtils.getUser(); - CustomEntity customEntity = getCustomEntity(CustomConverter.INSTANCE.dtoToPo(customDTO), user.getWhichUserId(), user.getUsername()); - return SqlHelper.retBool(baseMapper.insert(customEntity)); - } - - @Override - public Boolean createByCallBack(List dtoList) { - ArrayList customEntities = Lists.newArrayList(); - CustomEntity entity = new CustomEntity(); - for (CallbackCustomDTO dto : dtoList) { - entity.setSex(dto.getSex()); - entity.setRemark(dto.getRemark()); - entity.setCustomNid(dto.getCustomNid()); - entity.setCreateBy(dto.getReportUserId()); - entity.setChannelName(dto.getChannelName()); - entity.setChannelType(dto.getChannelType()); - entity.setDistributorId(dto.getDistributeId()); - entity.setChannelIdentifying(dto.getIdentifying()); - customEntities.add(getCustomEntity(entity, dto.getCompanyId(), dto.getEnterName())); - } - return SqlHelper.retBool(this.baseMapper.insertBatchSomeColumn(customEntities)); - } - - @Override - public Boolean updateByNid(String phone, String remark) { - return SqlHelper.retBool(baseMapper.updateNidAndRemark(phone, remark)); - } - - - @Override - @Transactional(rollbackFor = Exception.class) - public Boolean recallFormById(Long id) { - // 偏移十分钟 - CustomEntity custom = this.getById(id); - DateTime offsetMinute = DateUtil.offsetMinute(DateUtil.date(), -DefaultNumberConstants.TEN_NUMBER); - if (ObjectUtil.isNull(custom) || - custom.getEnrollStatus() != DefaultNumberConstants.TWO_NUMBER || - custom.getDistributeTime().before(offsetMinute)) { - throw new BadRequestException("已超出最大撤回时间!"); - } - - // 客户id查询线索 - List clueList = clueService.findCustomIdAndCreate(id, SecurityUtils.getCurrentUserId()); - if (ObjectUtil.isNull(custom) || CollUtil.isEmpty(clueList)) { - throw new BadRequestException("该线索不存在或已分发!"); - } - for (ClueVO vo : clueList) { - // 回退余额 - Boolean result = sysUserService.addQuantity(vo.getAssignedBy()); - if (result.equals(Boolean.TRUE)) { - // 删除线索 - clueService.removeById(Long.parseLong(vo.getClueId())); - } - } - // 修改状态 - // customStoreService.deleteByCustomId(id); - custom.setUpdateTime(LocalDateTime.now()); - custom.setSalesmanUserId(Lists.newArrayList()); - custom.setEnrollStatus(DefaultNumberConstants.ONE_NUMBER); - return SqlHelper.retBool(baseMapper.updateById(custom)); - } - - - private CustomEntity getCustomEntity(CustomEntity entity, Long companyId, String username) { - String code = LetterConst.D.concat(StrPool.DASHED.concat(DateUtil.format(DateUtil.date(), DateConst.YYYY_MM_DD))); - String maxCode = baseMapper.selectMaxBatchNoByCompanyId(code, companyId); - // 拼接编号 - String newCode = StringUtils.isNotBlank(maxCode) ? - code.concat(SerialCode.getNum(Integer.parseInt - (maxCode.substring(DefaultNumberConstants.TEN_NUMBER)))) : code.concat(LetterConst.ONE); - entity.setBatchNo(newCode); - entity.setCompanyId(companyId); - entity.setEnterName(username); - entity.setUpdateTime(LocalDateTime.now()); - entity.setType(DefaultNumberConstants.TWO_NUMBER); - entity.setCustomType(DefaultNumberConstants.ONE_NUMBER); - entity.setEnrollStatus(DefaultNumberConstants.ONE_NUMBER); - return entity; - } - - - /** - * 检测数据 - */ - public void validDate(CustomDTO customDTO) { - if (customDTO.getEnrollStatus() == 1 && customDTO.getCustomType() == 0) { - String economize = customDTO.getEconomize(); - String market = customDTO.getMarket(); - String detailAddress = customDTO.getDetailAddress(); - String radius = customDTO.getRadius(); - List customStoreEntities = customDTO.getCustomStoreEntities(); - if (StringUtils.isBlank(economize) || StringUtils.isBlank(market)) - throw new BadRequestException("省市不能为空"); - if (StringUtils.isBlank(detailAddress)) throw new BadRequestException("详细地址不能为空"); - if (StringUtils.isBlank(radius)) throw new BadRequestException("半径不能为空"); - if (CollUtil.isEmpty(customStoreEntities)) throw new BadRequestException("门店信息不能为空"); - } - } - - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/impl/CustomStoreServiceImpl.java b/admin/src/main/java/com/baiye/modules/distribute/service/impl/CustomStoreServiceImpl.java deleted file mode 100644 index f772ac1..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/service/impl/CustomStoreServiceImpl.java +++ /dev/null @@ -1,88 +0,0 @@ -package com.baiye.modules.distribute.service.impl; - -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.convert.Convert; -import com.baiye.extend.mybatis.plus.service.impl.ExtendServiceImpl; -import com.baiye.modules.distribute.entity.CustomStoreEntity; -import com.baiye.modules.distribute.mapper.CustomStoreMapper; -import com.baiye.modules.distribute.service.CustomStoreService; -import com.baiye.modules.distribute.vo.StoreDetailsExportVO; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - -@Service -public class CustomStoreServiceImpl extends ExtendServiceImpl implements CustomStoreService { - @Override - public Boolean deleteByCustomId(Long id) { - return SqlHelper.retBool(baseMapper.delete - (Wrappers.lambdaQuery().eq - (CustomStoreEntity::getCustomId, id))); - } - - @Override - public List selectListByCustomId(Long customId) { - return baseMapper.selectList - (Wrappers.lambdaQuery().eq(CustomStoreEntity::getCustomId, customId)); - } - - @Override - public List selectListByStoreId(Date startTime, Date endTime, Long storeId) { - return baseMapper.selectList(Wrappers.lambdaQuery().eq(CustomStoreEntity::getStoreId, storeId).between(CustomStoreEntity::getReservationDate, startTime, endTime)); - } - - @Override - public List selectStoreReservationDetails(Date startTime, Date endTime, Long storeId) { - return baseMapper.selectStoreReservationDetails(startTime, endTime, storeId); - } - - - @Override - public Map countReservationByStoreIds(List storeIds) { - List> list = baseMapper.countReservationByStoreIds(storeIds); - Map map = new HashMap<>(10); - for (Map value : list) { - long storeId = Convert.toLong(value.get("storeId")); - int num = Convert.toInt(value.get("num")); - map.put(storeId, num); - } - return map; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void updateCustomStoreInfo(List customStoreEntities, Long customId) { - if (CollUtil.isEmpty(customStoreEntities)){ - baseMapper.delete(new LambdaQueryWrapper().eq(CustomStoreEntity::getCustomId, customId)); - return; - } - // 修改时,预约门店关联的客户ID是确定的(编辑客户时新增门店,关联客户ID) - customStoreEntities.forEach(c -> c.setCustomId(customId)); - List entities = baseMapper.selectList(new LambdaQueryWrapper().eq(CustomStoreEntity::getCustomId, customId)); - List allIdList = null; - if (CollUtil.isNotEmpty(entities)) - allIdList = entities.stream().map(CustomStoreEntity::getCustomStoreId).collect(Collectors.toList()); - - List filterList = customStoreEntities.stream().filter(c -> c.getCustomStoreId() != null).collect(Collectors.toList()); - if (CollUtil.isNotEmpty(filterList)) { - this.updateBatchById(filterList); - if (CollUtil.isNotEmpty(allIdList)) { - List customStoreIdList = filterList.stream().map(CustomStoreEntity::getCustomStoreId).collect(Collectors.toList()); - allIdList.removeAll(customStoreIdList); - if (CollUtil.isNotEmpty(allIdList)) baseMapper.deleteBatchIds(allIdList); - } - } else { - if (CollUtil.isNotEmpty(allIdList)) baseMapper.deleteBatchIds(allIdList); - } - List saveCustomStoreList = customStoreEntities.stream().filter(c -> c.getCustomStoreId() == null).collect(Collectors.toList()); - if (CollUtil.isNotEmpty(saveCustomStoreList)) baseMapper.insertBatchSomeColumn(saveCustomStoreList); - } -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/impl/DirectClueServiceImpl.java b/admin/src/main/java/com/baiye/modules/distribute/service/impl/DirectClueServiceImpl.java deleted file mode 100644 index d605768..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/service/impl/DirectClueServiceImpl.java +++ /dev/null @@ -1,147 +0,0 @@ -package com.baiye.modules.distribute.service.impl; - -import cn.hutool.core.collection.CollUtil; -import cn.hutool.json.JSONUtil; -import com.baiye.domain.PageParam; -import com.baiye.domain.PageResult; -import com.baiye.exception.BadRequestException; -import com.baiye.extend.mybatis.plus.service.impl.ExtendServiceImpl; -import com.baiye.modules.distribute.converter.DirectClueConverter; -import com.baiye.modules.distribute.dto.DirectClueDTO; -import com.baiye.modules.distribute.entity.DirectClueEntity; -import com.baiye.modules.distribute.entity.DirectClueUserEntity; -import com.baiye.modules.distribute.mapper.DirectClueMapper; -import com.baiye.modules.distribute.mapper.DirectClueUserMapper; -import com.baiye.modules.distribute.qo.DirectClueQo; -import com.baiye.modules.distribute.service.DirectClueService; -import com.baiye.modules.distribute.vo.DirectClueVO; -import com.baiye.system.enums.RoleCodeEnum; -import com.baiye.system.model.dto.SysUserNameRoleDTO; -import com.baiye.system.service.SysUserService; -import com.baiye.util.AESUtils; -import com.baiye.util.MobileUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; -import lombok.RequiredArgsConstructor; -import org.apache.commons.lang3.StringUtils; -import org.ballcat.security.properties.SecurityProperties; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.time.LocalDateTime; -import java.time.ZoneId; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - -@Service -@RequiredArgsConstructor -public class DirectClueServiceImpl extends ExtendServiceImpl implements DirectClueService { - - private static final Map userIndexMap = new HashMap<>(); - - private final SysUserService sysUserService; - - private final DirectClueUserMapper directClueUserMapper; - - private final SecurityProperties securityProperties; - - @Override - public PageResult queryPage(PageParam pageParam, DirectClueQo qo) { - Long distributeUserId = qo.getDistributeUserId(); - - PageResult pageResult = baseMapper.queryPage(pageParam, qo); - List recordList = pageResult.getRecords(); - if (CollUtil.isNotEmpty(recordList)) { - // 线索接收人映射信息 - Map> map = new HashMap<>(); - if (qo.getDistributeUserId() != null) { - List ids = recordList.stream().map(DirectClueVO::getDirectClueId).collect(Collectors.toList()); - List userEntities = directClueUserMapper.selectList(new LambdaQueryWrapper().in(DirectClueUserEntity::getClueId, ids)); - map = userEntities.stream().collect(Collectors.groupingBy(DirectClueUserEntity::getClueId)); - } - for (DirectClueVO directClueVO : recordList) { - // 手机号解密 显示位数 - String decryptNid = AESUtils.decrypt(directClueVO.getNid(), securityProperties.getPasswordSecretKey()); - if (StringUtils.isNotBlank(decryptNid) && distributeUserId != null) { - StringBuilder stringBuilder = new StringBuilder(decryptNid); - decryptNid = stringBuilder.replace(1, 9, "****").toString(); - } - directClueVO.setNid(decryptNid); - //标签类型转换 - String clueLabelName = directClueVO.getClueLabelName(); - if (StringUtils.isNotBlank(clueLabelName)) { - directClueVO.setClueLabelName(""); - directClueVO.setClueLabel(JSONUtil.toList(clueLabelName, String.class)); - } - // 线索接收人 - if (qo.getDistributeUserId() != null && map.containsKey(directClueVO.getDirectClueId())) { - List directClueUserEntities = map.get(directClueVO.getDirectClueId()); - List userNames = directClueUserEntities.stream().map(DirectClueUserEntity::getUserName).collect(Collectors.toList()); - directClueVO.setUserNameList(userNames); - } - // 其它线索信息转换 - if (StringUtils.isNotBlank(directClueVO.getOtherClue())) { - directClueVO.setOtherClueObj(JSONUtil.parseObj(directClueVO.getOtherClue())); - directClueVO.setOtherClue(""); - } - } - } - return pageResult; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public boolean update(DirectClueDTO directClueDTO) { - DirectClueEntity directClueEntity = DirectClueConverter.INSTANCE.dtoToPo(directClueDTO); - - List clueLabel = directClueDTO.getClueLabel(); - if (CollUtil.isNotEmpty(clueLabel)) { - directClueEntity.setClueLabelName(JSONUtil.toJsonStr(clueLabel)); - } - return SqlHelper.retBool(baseMapper.updateById(directClueEntity)); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void allocationClue(Long userId, List directClueEntityList) { - if (userId != null && CollUtil.isNotEmpty(directClueEntityList)) { - Date date = new Date(); - LocalDateTime dateTime = date.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime(); - - List sysUserNameRoleDTOS = sysUserService.listByRoleCodeAndUserId(RoleCodeEnum.find(25L), userId); - List userIdList = sysUserNameRoleDTOS.stream().map(SysUserNameRoleDTO::getUserId).collect(Collectors.toList()); - int index = 0; - if (userIndexMap.containsKey(userId)) index = userIndexMap.get(userId); - - for (DirectClueEntity directClueEntity : directClueEntityList) { - directClueEntity.setDistributeUserId(userIdList.get(index)); - directClueEntity.setCreateBy(userId); - directClueEntity.setDistributeDate(dateTime); - directClueEntity.setOriginType(0); - directClueEntity.setEffectiveStatus(0); - directClueEntity.setDistributeType(0); - if (MobileUtil.checkPhone(directClueEntity.getNid())) { - directClueEntity.setNid(AESUtils.encrypt(directClueEntity.getNid(), securityProperties.getPasswordSecretKey())); - } - index = (index < userIdList.size() - 1) ? index + 1 : 0; - } - userIndexMap.put(userId, index); - baseMapper.insertBatchSomeColumn(directClueEntityList); - } - } - - @Override - @Transactional(rollbackFor = Exception.class) - public boolean distribute(List directClueUserList) { - Long clueId = directClueUserList.get(0).getClueId(); - DirectClueEntity clueEntity = baseMapper.selectById(clueId); - if (clueEntity.getDistributeType() != 0) throw new BadRequestException("线索已分发"); - - clueEntity.setDistributeType(1); - baseMapper.updateById(clueEntity); - return SqlHelper.retBool(directClueUserMapper.insertBatchSomeColumn(directClueUserList)); - } -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/impl/DistributeReportServiceImpl.java b/admin/src/main/java/com/baiye/modules/distribute/service/impl/DistributeReportServiceImpl.java deleted file mode 100644 index 61634f6..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/service/impl/DistributeReportServiceImpl.java +++ /dev/null @@ -1,327 +0,0 @@ -package com.baiye.modules.distribute.service.impl; - -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.date.DateTime; -import cn.hutool.core.date.DateUnit; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.NumberUtil; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import com.baiye.exception.BadRequestException; -import com.baiye.extend.mybatis.plus.service.impl.ExtendServiceImpl; -import com.baiye.modules.distribute.entity.ClueRecordEntity; -import com.baiye.modules.distribute.entity.DistributeReportChannelEntity; -import com.baiye.modules.distribute.entity.DistributeReportEntity; -import com.baiye.modules.distribute.entity.DistributeReportUserEntity; -import com.baiye.modules.distribute.mapper.DistributeReportChannelMapper; -import com.baiye.modules.distribute.mapper.DistributeReportMapper; -import com.baiye.modules.distribute.mapper.DistributeReportUserMapper; -import com.baiye.modules.distribute.service.ClueRecordService; -import com.baiye.modules.distribute.service.DistributeReportService; -import com.baiye.modules.distribute.vo.ReportFlowVO; -import com.baiye.system.model.entity.SysUser; -import com.baiye.system.service.SysUserService; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.*; -import java.util.stream.Collectors; - -/** - * @author wjt - * @date 2023/8/11 - */ -@Slf4j -@Service -@RequiredArgsConstructor -public class DistributeReportServiceImpl extends ExtendServiceImpl - implements DistributeReportService { - - private final ClueRecordService clueRecordService; - - private final DistributeReportChannelMapper distributeReportChannelMapper; - - private final DistributeReportUserMapper distributeReportUserMapper; - - private final SysUserService sysUserService; - - @Override - public Map reportFlow(Long userId, String channel, Integer type) { - - Map map = getHomeReport(type, userId); - - List reportFlowList = new ArrayList<>(); - if (userId != null) { - if (StrUtil.isNotBlank(channel)) { - // 查询近7天 - Date date = DateUtil.offsetDay(DateUtil.yesterday(), -6); - Date beginTime = DateUtil.beginOfDay(date); - Date endTime = DateUtil.endOfDay(DateUtil.yesterday()); - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.between(DistributeReportEntity::getCreateTime, beginTime, endTime); - wrapper.eq(DistributeReportEntity::getUserId, userId); - wrapper.eq(DistributeReportEntity::getChannel, channel); - List distributeReportEntityList = baseMapper.selectList(wrapper); - if (CollUtil.isEmpty(distributeReportEntityList)) { - return map; - } - reportFlowList = getReportFlowList(distributeReportEntityList, beginTime, endTime); - map.put("type", 3); - map.put("data", reportFlowList); - return map; - } - map.put("type", 2); - LambdaQueryWrapper wrapperChannel = new LambdaQueryWrapper<>(); - wrapperChannel.eq(DistributeReportChannelEntity::getUserId, userId); - List channelList = distributeReportChannelMapper.selectList(wrapperChannel); - - for (DistributeReportChannelEntity channelEntity : channelList) { - ReportFlowVO reportFlowVO = new ReportFlowVO(); - reportFlowVO.setName(channelEntity.getChannel()); - reportFlowVO.setRatio(channelEntity.getRatio()); - reportFlowVO.setRatioDay(channelEntity.getRatioDay()); - reportFlowVO.setTotalNum(channelEntity.getTotalNum()); - reportFlowList.add(reportFlowVO); - } - map.put("data", reportFlowList); - } else { - List distributeReportUserList = distributeReportUserMapper.selectList(null); - for (DistributeReportUserEntity distributeReportUserEntity : distributeReportUserList) { - ReportFlowVO reportFlowVO = new ReportFlowVO(); - reportFlowVO.setName(distributeReportUserEntity.getUsername()); - reportFlowVO.setRatio(distributeReportUserEntity.getRatio()); - reportFlowVO.setRatioDay(distributeReportUserEntity.getRatioDay()); - reportFlowVO.setTotalNum(distributeReportUserEntity.getTotalNum()); - reportFlowList.add(reportFlowVO); - } - map.put("data", reportFlowList); - map.put("type", 1); - return map; - } - return map; - } - - /** - * 获取昨日导入和分配数 - */ - private Map getHomeReport(Integer type, Long userId) { - Map map = new HashMap<>(8); - LambdaQueryWrapper wrapperUser = new LambdaQueryWrapper<>(); - DateTime dateTime = DateUtil.beginOfDay(DateUtil.yesterday()); - DateTime dateTime1 = DateUtil.endOfDay(DateUtil.yesterday()); - wrapperUser.between(DistributeReportUserEntity::getCreateTime, dateTime, dateTime1); - int yesterdayImportNum = 0; - int yesterdayDistributeNum = 0; - if (type == 1) { - List distributeReportUserList = distributeReportUserMapper - .selectList(wrapperUser); - if (CollUtil.isNotEmpty(distributeReportUserList)) { - for (DistributeReportUserEntity distributeReportUserEntity : distributeReportUserList) { - yesterdayImportNum += distributeReportUserEntity.getTodayNum(); - yesterdayDistributeNum += distributeReportUserEntity.getDistributeNum(); - } - } - } else { - if (userId == null) { - throw new BadRequestException("参数异常"); - } - wrapperUser.eq(DistributeReportUserEntity::getUserId, userId); - DistributeReportUserEntity distributeReportUserEntity = distributeReportUserMapper.selectOne(wrapperUser); - - if (distributeReportUserEntity != null) { - yesterdayImportNum = distributeReportUserEntity.getTodayNum(); - yesterdayDistributeNum = distributeReportUserEntity.getDistributeNum(); - } - } - map.put("yesterdayImportNum", yesterdayImportNum); - map.put("yesterdayDistributeNum", yesterdayDistributeNum); - return map; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void distributeReport() { - - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.between(ClueRecordEntity::getCreateTime, DateUtil.beginOfDay(DateUtil.date()), - DateUtil.endOfDay(DateUtil.date())); - wrapper.eq(ClueRecordEntity::getStatus, 2); - List allRecordInTodayList = clueRecordService.selectByWrapper(wrapper); - if (CollUtil.isEmpty(allRecordInTodayList)) { - return; - } - //今日总量 - int sum = allRecordInTodayList.stream().mapToInt(ClueRecordEntity::getSuccessNum).sum(); - if (sum < 1) { - return; - } - // 提取所有用户 - Set collect = allRecordInTodayList.stream() - .map(ClueRecordEntity::getCreateBy) - .collect(Collectors.toSet()); - Map userNameList = getUserName(collect); - - // 1.按公司分组 - Map> recordByUserMap = allRecordInTodayList.stream() - .collect(Collectors.groupingBy(ClueRecordEntity::getCreateBy)); - if (ObjectUtil.isEmpty(recordByUserMap)) { - return; - } - List distributeReportUserList = new ArrayList<>(); - // 之前的总量 - Long historyTotal = distributeReportUserMapper.selectCount( - new LambdaQueryWrapper().select(DistributeReportUserEntity::getTotalNum)); - - int totalAll = historyTotal.intValue() + sum; - - // 记录之前得统计id - List ids = new ArrayList<>(); - for (Map.Entry> entry : recordByUserMap.entrySet()) { - Long userId = entry.getKey(); - List clueRecordByUserList = entry.getValue(); - // 今日新增数 - int sumByUser = clueRecordByUserList.stream().mapToInt(ClueRecordEntity::getSuccessNum).sum(); - // 上次对象 - DistributeReportUserEntity distributeReportUserByYesterday = distributeReportUserMapper - .selectOne(new LambdaQueryWrapper() - .eq(DistributeReportUserEntity::getUserId, userId)); - int yesterdayNum = 0; - int yesterdayTotalNum = 0; - if (distributeReportUserByYesterday != null) { - // 上次新增数 - if (DateUtil.betweenDay(distributeReportUserByYesterday.getCreateTime(), DateUtil.yesterday(), - true) == 0) { - - yesterdayNum = distributeReportUserByYesterday.getTodayNum(); - } - yesterdayTotalNum = distributeReportUserByYesterday.getTotalNum(); - ids.add(distributeReportUserByYesterday.getId()); - } else { - distributeReportUserByYesterday = new DistributeReportUserEntity(); - } - // 总数 - int totalNum = yesterdayTotalNum + sumByUser; - // 分发数 - int distributeNum = clueRecordByUserList.stream() - .filter(c -> c.getAllocationStatus() == 1) - .mapToInt(ClueRecordEntity::getSuccessNum) - .sum(); - double ratio; - ratio = NumberUtil.div(totalNum, totalAll); - double ratioDay = 0.0; - if (yesterdayNum > 0) { - ratioDay = NumberUtil.div(NumberUtil.min(sumByUser, yesterdayNum), yesterdayNum); - } - String userName = userNameList.get(userId) == null ? "" : userNameList.get(userId); - distributeReportUserByYesterday.createDistributeReportUser(userId, userName, sumByUser, totalNum, - distributeNum, ratio, ratioDay); - distributeReportUserList.add(distributeReportUserByYesterday); - - // 按渠道统计 - dealByChannel(clueRecordByUserList, userId, totalNum, userName); - } - if (CollUtil.isNotEmpty(ids)) { - distributeReportUserMapper.deleteBatchIds(ids); - } - distributeReportUserMapper.insertBatchSomeColumn(distributeReportUserList); - } - - private void dealByChannel(List clueRecordByUserList, Long userId, Integer totalNumByUser, - String userName) { - List list = new ArrayList<>(); - List distributeReportEntityList = new ArrayList<>(); - // .按渠道分组 - Map> recordByChannelMap = clueRecordByUserList.stream() - .filter(c -> StrUtil.isNotBlank(c.getChannelIdentifying())) - .collect(Collectors.groupingBy(ClueRecordEntity::getChannelIdentifying)); - if (ObjectUtil.isEmpty(recordByChannelMap)) { - return; - } - List ids = new ArrayList<>(); - for (Map.Entry> entryByChannel : recordByChannelMap.entrySet()) { - String channel = entryByChannel.getKey(); - List clueRecordByChannel = entryByChannel.getValue(); - int sumByUser = clueRecordByChannel.stream().mapToInt(ClueRecordEntity::getSuccessNum).sum(); - // 查询昨日信息 - DistributeReportChannelEntity distributeReportUserByYesterday = distributeReportChannelMapper - .selectOne(new LambdaQueryWrapper() - .eq(DistributeReportChannelEntity::getUserId, userId) - .eq(DistributeReportChannelEntity::getChannel, channel)); - int yesterdayNum = 0; - int yesterdayTotalNum = 0; - if (distributeReportUserByYesterday != null) { - if (DateUtil.betweenDay(distributeReportUserByYesterday.getCreateTime(), DateUtil.yesterday(), - true) == 0) { - yesterdayNum = distributeReportUserByYesterday.getTodayNum(); - } - yesterdayTotalNum = distributeReportUserByYesterday.getTotalNum(); - ids.add(distributeReportUserByYesterday.getId()); - } else { - distributeReportUserByYesterday = new DistributeReportChannelEntity(); - } - int totalNum = yesterdayTotalNum + sumByUser; - int distributeNum = clueRecordByChannel.stream() - .filter(c -> c.getAllocationStatus() == 1) - .mapToInt(ClueRecordEntity::getSuccessNum) - .sum(); - double ratio = NumberUtil.div(totalNum, totalNumByUser.intValue()); - double ratioDay = 0.0; - if (yesterdayNum > 0) { - ratioDay = NumberUtil.div(NumberUtil.min(sumByUser, yesterdayNum), yesterdayNum); - } - - distributeReportUserByYesterday.createDistributeReportChannel(userId, userName, channel, sumByUser, - totalNum, distributeNum, ratio, ratioDay); - list.add(distributeReportUserByYesterday); - - DistributeReportEntity distributeReport = new DistributeReportEntity().createDistributeReport(userId, - userName, channel, sumByUser, NumberUtil.div(sumByUser, totalNum), ratioDay); - distributeReportEntityList.add(distributeReport); - } - if (CollUtil.isNotEmpty(ids)) { - distributeReportChannelMapper.deleteBatchIds(ids); - } - distributeReportChannelMapper.insertBatchSomeColumn(list); - baseMapper.insertBatchSomeColumn(distributeReportEntityList); - } - - private List getReportFlowList(List distributeReportEntityList, - Date beginTime, Date endTime) { - Map callMap = new HashMap<>(8); - for (DistributeReportEntity reportDeduct : distributeReportEntityList) { - callMap.put(reportDeduct.getCreateTime().toString(), reportDeduct); - } - List list = new ArrayList<>(); - long betweenDay = DateUtil.between(beginTime, endTime, DateUnit.DAY); - for (int i = 0; i <= betweenDay; i++) { - String time = DateUtil.format(DateUtil.offsetDay(beginTime, i), "yyyy-MM-dd"); - ReportFlowVO reportFlowVO = new ReportFlowVO(); - if (callMap.containsKey(time)) { - DistributeReportEntity reportDeduct = callMap.get(time); - reportFlowVO.setRatioDay(reportDeduct.getRatioDay()); - reportFlowVO.setRatio(reportDeduct.getRatio()); - reportFlowVO.setTotalNum(reportDeduct.getTodayNum()); - } else { - reportFlowVO.setRatioDay(0.0); - reportFlowVO.setRatio(0.0); - reportFlowVO.setTotalNum(0); - } - reportFlowVO.setName(time); - list.add(reportFlowVO); - } - return list; - } - - public Map getUserName(Set ids) { - List sysUsers = sysUserService.listByUserIds(ids); - Map map = new HashMap<>(8); - for (SysUser sysUser : sysUsers) { - map.put(sysUser.getUserId(), sysUser.getUsername()); - } - return map; - } - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/impl/DistributeTaskServiceImpl.java b/admin/src/main/java/com/baiye/modules/distribute/service/impl/DistributeTaskServiceImpl.java deleted file mode 100644 index 78416ee..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/service/impl/DistributeTaskServiceImpl.java +++ /dev/null @@ -1,494 +0,0 @@ -package com.baiye.modules.distribute.service.impl; - -import cn.hutool.core.collection.CollUtil; -import com.baiye.constant.DefaultNumberConstants; -import com.baiye.constant.PrefixKeyConstant; -import com.baiye.domain.PageParam; -import com.baiye.domain.PageResult; -import com.baiye.exception.BadRequestException; -import com.baiye.extend.mybatis.plus.service.impl.ExtendServiceImpl; -import com.baiye.job.MyJobService; -import com.baiye.modules.distribute.dto.DistributeDTO; -import com.baiye.modules.distribute.dto.DistributeResponseDTO; -import com.baiye.modules.distribute.dto.DistributeTaskDTO; -import com.baiye.modules.distribute.dto.DistributeTaskUserDTO; -import com.baiye.modules.distribute.entity.ClueEntity; -import com.baiye.modules.distribute.entity.ClueRecordEntity; -import com.baiye.modules.distribute.entity.DistributeTaskEntity; -import com.baiye.modules.distribute.entity.DistributeTaskUserEntity; -import com.baiye.modules.distribute.mapper.ClueRecordMapper; -import com.baiye.modules.distribute.mapper.DistributeTaskMapper; -import com.baiye.modules.distribute.mapper.DistributeTaskUserMapper; -import com.baiye.modules.distribute.qo.DistributeTaskQo; -import com.baiye.modules.distribute.service.ClueService; -import com.baiye.modules.distribute.service.DistributeTaskService; -import com.baiye.modules.distribute.vo.DistributeTaskVO; -import com.baiye.security.util.SecurityUtils; -import com.baiye.system.checker.AdminUserChecker; -import com.baiye.system.model.entity.SysUser; -import com.baiye.system.service.SysUserService; -import com.baiye.task.service.DistributeTaskSyncService; -import com.baiye.utils.AssignDataUtil; -import com.baiye.utils.DateTimeToCronUtils; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; -import com.example.entity.Job; -import lombok.RequiredArgsConstructor; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.time.LocalDateTime; -import java.util.*; -import java.util.stream.Collectors; - -@Service -@RequiredArgsConstructor -public class DistributeTaskServiceImpl extends ExtendServiceImpl implements DistributeTaskService { - - private final DistributeTaskUserMapper distributeTaskUserMapper; - - private final ClueService clueService; - - private final SysUserService sysUserService; - - private final ClueRecordMapper clueRecordMapper; - - private final MyJobService jobService; - - private final AdminUserChecker adminUserChecker; - - private final DistributeTaskSyncService distributeTaskSyncService; - - @Override - @Transactional(rollbackFor = Exception.class) - public Boolean add(DistributeTaskDTO distributeTaskDTO) { - List fileRecordIdList = distributeTaskDTO.getFileRecordIdList(); - List userList = distributeTaskDTO.getUsers(); - List userIdList = userList.stream().map(DistributeTaskUserDTO::getUserId).collect(Collectors.toList()); - // 验证数据 - this.inspectUserTask(userIdList); - this.verifyData(distributeTaskDTO); - // 执行逻辑 - DistributeTaskEntity taskEntity = new DistributeTaskEntity(); - BeanUtils.copyProperties(distributeTaskDTO, taskEntity); - if (CollUtil.isNotEmpty(fileRecordIdList)) { - // 修改文件记录分配状态 - clueRecordMapper.updateDistributeStatus(fileRecordIdList, 1); - // 绑定文件 - String result = fileRecordIdList.stream().map(String::valueOf).collect(Collectors.joining(",")); - taskEntity.setFileRecordId(result); - } - taskEntity.setExecuteStatus(DefaultNumberConstants.ZERO_NUMBER); - if (distributeTaskDTO.getDefaultType() == null) - taskEntity.setDefaultType(1); - boolean bool = SqlHelper.retBool(baseMapper.insert(taskEntity)); - // 插入任务用户映射 - this.insertUser(userList, taskEntity.getDistributeTaskId()); - return bool; - } - - @Override - public PageResult queryPage(PageParam pageParam, DistributeTaskQo qo) { - return baseMapper.queryPage(pageParam, qo); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public boolean update(DistributeTaskDTO distributeTaskDTO) { - Long taskId = distributeTaskDTO.getDistributeTaskId(); - List fileRecordIdList = distributeTaskDTO.getFileRecordIdList(); - Integer status = distributeTaskDTO.getTimeStatus(); - LocalDateTime startTime = distributeTaskDTO.getStartTime(); - Long distributeTaskId = distributeTaskDTO.getDistributeTaskId(); - Integer distributeTaskType = distributeTaskDTO.getDistributeTaskType(); - Integer executeStatus = distributeTaskDTO.getExecuteStatus(); - List userList = distributeTaskDTO.getUsers(); - - if (CollUtil.isNotEmpty(userList)) { - // 验证数据 - List userIdList = userList.stream().map(DistributeTaskUserDTO::getUserId).collect(Collectors.toList()); - this.inspectUserTask(userIdList); - } - this.verifyData(distributeTaskDTO); - // 执行逻辑 - DistributeTaskEntity taskEntity = baseMapper.selectById(distributeTaskId); - - // 1、修改手动任务信息 - if (distributeTaskType != null && distributeTaskType == 0) { - if (!distributeTaskType.equals(taskEntity.getDistributeTaskType())) { - // 删除定时任务 - jobService.removeJob(PrefixKeyConstant.JOB_KEY + taskId); - } - if (CollUtil.isNotEmpty(fileRecordIdList)) { - String result = fileRecordIdList.stream().map(String::valueOf).collect(Collectors.joining(",")); - taskEntity.setFileRecordId(result); - } - } - // 2、修改自动任务信息 - if (distributeTaskType != null && distributeTaskType == 1 && taskEntity.getDistributeTaskType() == 1) { - Integer timeStatus = taskEntity.getTimeStatus(); - LocalDateTime time = taskEntity.getStartTime(); - if (timeStatus == 1 && status == 0) { - // 删除定时任务 - jobService.removeJob(PrefixKeyConstant.JOB_KEY + taskId); - } - if (timeStatus == 1 && status == 1 && startTime != null && time != null && !startTime.isEqual(time)) { - // 修改定时任务 - this.addJob(taskId, startTime, false); - } - } - if (executeStatus != null && executeStatus == 3 && !executeStatus.equals(taskEntity.getExecuteStatus())) { - jobService.pauseJob(PrefixKeyConstant.JOB_KEY + taskId); - } - BeanUtils.copyProperties(distributeTaskDTO, taskEntity); - - // 修改任务用户关系映射 - if (CollUtil.isNotEmpty(distributeTaskDTO.getUsers())) { - distributeTaskUserMapper.delete(new LambdaQueryWrapper() - .eq(DistributeTaskUserEntity::getDistributeTaskId, distributeTaskId)); - this.insertUser(distributeTaskDTO.getUsers(), taskEntity.getDistributeTaskId()); - } - - baseMapper.updateById(taskEntity); - return true; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public boolean del(Long taskId) { - // 删除时任务未执行 文件记录状态回退 - DistributeTaskEntity entity = baseMapper.selectById(taskId); - if (entity.getExecuteStatus() == 0) { - String fileRecordId = entity.getFileRecordId(); - List recordIdList = Arrays.stream(fileRecordId.split(",")).map(Long::parseLong).collect(Collectors.toList()); - clueRecordMapper.updateDistributeStatus(recordIdList, 0); - } - // 删除 - int taskBool = baseMapper.deleteById(taskId); - int userBool = distributeTaskUserMapper.delete(new LambdaQueryWrapper() - .eq(DistributeTaskUserEntity::getDistributeTaskId, taskId)); - // 删除定时任务 - jobService.removeJob(PrefixKeyConstant.JOB_KEY + taskId); - return taskBool > 0 && userBool > 0; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public Boolean executeTask(Long taskId) { - DistributeTaskEntity taskEntity = baseMapper.selectById(taskId); - DistributeTaskEntity updateEntity = new DistributeTaskEntity(); - updateEntity.setDistributeTaskId(taskId); - if (taskEntity != null) { - // 执行手动任务(立即执行分发) - Integer timeStatus = taskEntity.getTimeStatus(); - if (taskEntity.getDistributeTaskType() == 0 || (timeStatus != null && timeStatus == 0)) { - this.execute(taskEntity); - updateEntity.setExecuteStatus(2); - } - // 执行自动任务(对定时任务进行修改) - if (taskEntity.getDistributeTaskType() == 1 && timeStatus != null && timeStatus == 1) { - Job jobDetail = jobService.getJobDetail(PrefixKeyConstant.JOB_KEY + taskId); - if (jobDetail != null && jobDetail.getJobName() != null) { - jobService.resumeJob(PrefixKeyConstant.JOB_KEY + taskId);// 开启定时任务 - } else { - this.addJob(taskId, taskEntity.getStartTime(), true);// 添加定时任务 - } - updateEntity.setExecuteStatus(1); - } - // 修改任务 - baseMapper.updateById(updateEntity); - } - return true; - } - - @Override - public DistributeTaskVO details(Long id) { - DistributeTaskVO distributeTaskVO = new DistributeTaskVO(); - DistributeTaskEntity distributeTaskEntity = baseMapper.selectById(id); - BeanUtils.copyProperties(distributeTaskEntity, distributeTaskVO); - - List userEntities = distributeTaskUserMapper - .selectList(new LambdaQueryWrapper() - .eq(DistributeTaskUserEntity::getDistributeTaskId, id)); - - // 返回用户权重任务关联信息 - if (CollUtil.isNotEmpty(userEntities)) { - Map> map = userEntities.stream().collect(Collectors.groupingBy(DistributeTaskUserEntity::getUserId)); - List sysUsers = sysUserService.listByUserIds(map.keySet()); - List> list = new ArrayList<>(); - for (SysUser sysUser : sysUsers) { - Long userId = sysUser.getUserId(); - Map userMap = new HashMap<>(); - userMap.put("userId", userId); - userMap.put("userName", sysUser.getUsername()); - if (map.containsKey(userId)) { - DistributeTaskUserEntity distributeTaskUserEntity = map.get(userId).get(0); - userMap.put("weight", distributeTaskUserEntity.getWeight()); - } - list.add(userMap); - } - distributeTaskVO.setUserList(list); - } - // 返回任务和文件记录信息 - if (distributeTaskEntity.getDistributeTaskType() == DefaultNumberConstants.ZERO_NUMBER) { - String fileRecordId = distributeTaskEntity.getFileRecordId(); - List recordIdList = Arrays.stream(fileRecordId.split(",")).map(Long::parseLong).collect(Collectors.toList()); - List clueRecordEntities = clueRecordMapper.selectBatchIds(recordIdList); - List> list = new ArrayList<>(); - for (ClueRecordEntity clueRecordEntity : clueRecordEntities) { - Map recordMap = new HashMap<>(); - recordMap.put("recordId", clueRecordEntity.getClueRecordId()); - recordMap.put("fileName", clueRecordEntity.getOldFileName()); - list.add(recordMap); - } - distributeTaskVO.setRecordList(list); - } - return distributeTaskVO; - } - - /** - * 执行 - */ - @Override - @Transactional(rollbackFor = Exception.class) - public void execute(DistributeTaskEntity taskEntity) { - if (taskEntity != null) { - String fileRecordId = taskEntity.getFileRecordId(); - Long createBy = taskEntity.getCreateBy(); - // 任务中指定的分配人 - List userEntities = distributeTaskUserMapper - .selectList(new LambdaQueryWrapper() - .eq(DistributeTaskUserEntity::getDistributeTaskId, taskEntity.getDistributeTaskId())); - if (CollUtil.isEmpty(userEntities)) throw new BadRequestException("任务无分配人"); - List userIdList = userEntities.stream().map(DistributeTaskUserEntity::getUserId).collect(Collectors.toList()); - // 查看任务类型 获取文件记录ID - List recordIdList = new ArrayList<>(); - if (StringUtils.isNotBlank(fileRecordId) && (taskEntity.getDistributeTaskType() == 0 || taskEntity.getDefaultType() == 0)) { - recordIdList = Arrays.stream(fileRecordId.split(",")).map(Long::parseLong).collect(Collectors.toList()); - } else { - String fileRulePrefix = taskEntity.getFileRulePrefix(); - List recordEntities = clueRecordMapper.selectList(new LambdaQueryWrapper() - .likeRight(ClueRecordEntity::getOldFileName, fileRulePrefix) - .eq(ClueRecordEntity::getCreateBy, taskEntity.getCreateBy()) - .eq(ClueRecordEntity::getAllocationStatus, 0)); - if (CollUtil.isNotEmpty(recordEntities)) { - recordIdList = recordEntities.stream().map(ClueRecordEntity::getClueRecordId).collect(Collectors.toList()); - } - } - - if (CollUtil.isNotEmpty(recordIdList)) { - // 查询分配人用户信息 - List sysUsers = sysUserService.listByUserIds(userIdList); - Map> userIdMap = sysUsers.stream().collect(Collectors.groupingBy(SysUser::getUserId)); - // 获取文件中未分配的资源 - List clueIds = clueService.findUndistributedClueIds(recordIdList); - // 分配 - if (CollUtil.isNotEmpty(clueIds)) { - DistributeDTO distributeDTO = new DistributeDTO(); - distributeDTO.setDeptIds(userIdList); - distributeDTO.setResourceList(clueIds); - if (taskEntity.getRuleStatus() == DefaultNumberConstants.ONE_NUMBER) { - distributeDTO.setIsWeight(true); - List weightList = userEntities.stream().map(DistributeTaskUserEntity::getWeight).collect(Collectors.toList()); - List weights = weightList.stream().map(i -> i * 10.0).collect(Collectors.toList()); - distributeDTO.setWeights(weights); - } - List responseDTOS = AssignDataUtil.assignData(distributeDTO); - // 查询业务管理员用户的默认文件记录 - Map> map = null; - if (adminUserChecker.isAdminUser(createBy)) { - List recordEntities = clueRecordMapper.selectList( - new LambdaQueryWrapper().in(ClueRecordEntity::getCreateBy, userIdList) - .eq(ClueRecordEntity::getRecordType, DefaultNumberConstants.ONE_NUMBER)); - map = recordEntities.stream().collect(Collectors.groupingBy(ClueRecordEntity::getCreateBy)); - } - List clueEntityList = new ArrayList<>(); - Map updateUserNumMap = new HashMap<>(); - // 更新分配信息 - for (DistributeResponseDTO responseDTO : responseDTOS) { - Long assignedBy = responseDTO.getDeptId(); - updateUserNumMap.put(assignedBy, responseDTO.getResponseList().size()); - - for (Long clueId : responseDTO.getResponseList()) { - ClueEntity clueEntity = new ClueEntity(); - clueEntity.setClueId(clueId); - // 业务员更新的是分配人,否则是admin给业务管理员分配(分配到默认创建的记录中) - if (!adminUserChecker.isAdminUser(createBy)) { - clueEntity.setAssignedBy(assignedBy); - if (userIdMap.containsKey(assignedBy)) { - SysUser sysUser = userIdMap.get(assignedBy).get(0); - clueEntity.setAssignedName(sysUser.getUsername()); - } - } - // admin给业务管理员分配 改变线索的记录ID即可 - else { - if (CollUtil.isNotEmpty(map) && map.containsKey(assignedBy)) { - ClueRecordEntity clueRecordEntity = map.get(assignedBy).get(0); - clueEntity.setClueRecordId(clueRecordEntity.getClueRecordId()); - } - } - // 批量修改数据 - clueEntityList.add(clueEntity); - if (clueEntityList.size() >= 3000) { - clueService.updateBatchById(clueEntityList); - clueEntityList.clear(); - } - } - } - // 批量修改数据 - if (CollUtil.isNotEmpty(clueEntityList)) clueService.updateBatchById(clueEntityList); - // 用户分发量检测-扣减-修改 - boolean bool = sysUserService.detectionAvailableNumUpdate(updateUserNumMap); - if (!bool) throw new BadRequestException("分发失败"); - // 修改任务执行次数+1 - baseMapper.updateByExecuteNumAddOne(taskEntity.getDistributeTaskId()); - // 修改记录分配状态 - if (CollUtil.isNotEmpty(recordIdList)) { - clueRecordMapper.updateAllocationStatusAndDistributeStatus(recordIdList, 1, 1); - } - // 异步分发下级任务 - if (adminUserChecker.isAdminUser(createBy)) distributeTaskSyncService.executeTask(userIdList, this); - } - } - } - } - - @Override - public boolean updateData(DistributeTaskEntity distributeTaskEntity) { - return SqlHelper.retBool(baseMapper.updateById(distributeTaskEntity)); - } - - @Override - public void addDefaultTask(String taskName, String prefixName, String recordId, Long createUserId, Long allocationBy) { - // 创建默认任务 - DistributeTaskEntity taskEntity = new DistributeTaskEntity(); - taskEntity.setDistributeTaskType(1); - taskEntity.setTaskName(taskName); - taskEntity.setRuleStatus(0); - taskEntity.setTimeStatus(0); - taskEntity.setFileRulePrefix(prefixName); - taskEntity.setExecuteStatus(0); - taskEntity.setFileRecordId(recordId); - taskEntity.setDefaultType(0); - taskEntity.setCreateBy(createUserId); - // admin管理员创建是默认开启,业务管理员创建时由于不确定是否创建了子用户,所以无法自动开启 - if (createUserId == 1) taskEntity.setExecuteStatus(1); - baseMapper.insert(taskEntity); - - // 任务默认当前选中用户平均分配 - if (createUserId == 1) { - DistributeTaskUserEntity taskUserEntity = new DistributeTaskUserEntity(); - taskUserEntity.setUserId(allocationBy); - taskUserEntity.setDistributeTaskId(taskEntity.getDistributeTaskId()); - distributeTaskUserMapper.insert(taskUserEntity); - } - } - - /** - * 添加修改定时任务 - * - * @param taskId 任务ID - * @param startTime 时间 - * @param bool 执行类型 true:添加 false:修改 - */ - private void addJob(Long taskId, LocalDateTime startTime, Boolean bool) { - Job job = new Job(); - job.setJobName(PrefixKeyConstant.JOB_KEY + taskId); - String cron = DateTimeToCronUtils.getCron(startTime, DateTimeToCronUtils.EVERYDAY); - job.setCron(cron); - job.setJobClass("com.baiye.job.LinkWatchJob"); - if (bool) { - jobService.addJob(job); - } else { - jobService.updateJob(job); - } - } - - /** - * 验证数据 - */ - private void verifyData(DistributeTaskDTO distributeTaskDTO) { - Long taskId = distributeTaskDTO.getDistributeTaskId(); - Integer defaultType = distributeTaskDTO.getDefaultType(); - Integer taskType = distributeTaskDTO.getDistributeTaskType(); - List fileRecordIdList = distributeTaskDTO.getFileRecordIdList(); - String fileRulePrefix = distributeTaskDTO.getFileRulePrefix(); - Integer ruleStatus = distributeTaskDTO.getRuleStatus(); - Integer timeStatus = distributeTaskDTO.getTimeStatus(); - LocalDateTime startTime = distributeTaskDTO.getStartTime(); - List userList = distributeTaskDTO.getUsers(); - // 校验数据 - if (taskType != null) { - if (taskType == DefaultNumberConstants.ZERO_NUMBER && CollUtil.isEmpty(fileRecordIdList)) { - throw new BadRequestException("文件不能为空,请选择分发文件!"); - } - if (taskType == DefaultNumberConstants.ONE_NUMBER) { - if (StringUtils.isBlank(fileRulePrefix) && taskId != null && defaultType != null && defaultType == 1) - throw new BadRequestException("文件规则前缀不能为空"); - if (timeStatus == DefaultNumberConstants.ONE_NUMBER && startTime == null) - throw new BadRequestException("定时任务请选择时间"); - } - if (ruleStatus == DefaultNumberConstants.ONE_NUMBER) { - int sum = userList.stream().mapToInt(DistributeTaskUserDTO::getWeight).sum(); - if (sum != DefaultNumberConstants.TEN_NUMBER) throw new BadRequestException("权重分配不符合10份制"); - } - List userIds = userList.stream().map(DistributeTaskUserDTO::getUserId).collect(Collectors.toList()); - String nickName = sysUserService.detectionAvailableNum(userIds); - if (StringUtils.isNotBlank(nickName)) throw new BadRequestException(nickName + "余额不足"); - } - } - - /** - * 插入任务用户映射 - */ - private void insertUser(List userList, Long distributeTaskId) { - List addEntityList = new ArrayList<>(); - for (DistributeTaskUserDTO distributeTaskUserDTO : userList) { - DistributeTaskUserEntity distributeTaskUserEntity = new DistributeTaskUserEntity(); - distributeTaskUserEntity.setUserId(distributeTaskUserDTO.getUserId()); - distributeTaskUserEntity.setWeight(distributeTaskUserDTO.getWeight()); - distributeTaskUserEntity.setDistributeTaskId(distributeTaskId); - addEntityList.add(distributeTaskUserEntity); - } - distributeTaskUserMapper.insertBatchSomeColumn(addEntityList); - } - - /** - * admin检验业务管理员的默认任务--是否分配了用户 - */ - public void inspectUserTask(List userIdList) { - if (SecurityUtils.getCurrentUserId() == 1 && CollUtil.isNotEmpty(userIdList)) { - List taskEntities = baseMapper.selectList( - new LambdaQueryWrapper().in(DistributeTaskEntity::getCreateBy, userIdList) - .eq(DistributeTaskEntity::getDefaultType, 0) - .ne(DistributeTaskEntity::getExecuteStatus, 0)); - if (CollUtil.isNotEmpty(taskEntities)) { - List taskIds = taskEntities.stream().map(DistributeTaskEntity::getDistributeTaskId).collect(Collectors.toList()); - if (taskIds.size() < userIdList.size()) { - throw new BadRequestException("用户默认分发任务无分配用户,请检查用户的分配任务"); - } - List taskUserEntities = distributeTaskUserMapper - .selectList(new LambdaQueryWrapper() - .in(DistributeTaskUserEntity::getDistributeTaskId, taskIds)); - if (CollUtil.isNotEmpty(taskUserEntities)) { - Map> map = taskUserEntities.stream() - .collect(Collectors.groupingBy(DistributeTaskUserEntity::getDistributeTaskId)); - for (Long taskId : taskIds) { - if (!map.containsKey(taskId)) { - Map> listMap = taskEntities.stream().collect(Collectors.groupingBy(DistributeTaskEntity::getDistributeTaskId)); - Long createBy = listMap.get(taskId).get(0).getCreateBy(); - SysUser sysUser = sysUserService.getById(createBy); - throw new BadRequestException("用户:" + sysUser.getUsername() + " 默认分发任务中无分配人,请通知整改后操作该用户"); - } - } - } else { - throw new BadRequestException("用户默认分发任务无分配用户,请检查用户的分配任务"); - } - } else { - throw new BadRequestException("用户无默认分发任务,请检查用户的分配任务"); - } - } - } -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/impl/FileContrastRecordServiceImpl.java b/admin/src/main/java/com/baiye/modules/distribute/service/impl/FileContrastRecordServiceImpl.java deleted file mode 100644 index 0c2aad2..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/service/impl/FileContrastRecordServiceImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.baiye.modules.distribute.service.impl; - -import com.baiye.domain.PageParam; -import com.baiye.domain.PageResult; -import com.baiye.extend.mybatis.plus.service.impl.ExtendServiceImpl; -import com.baiye.modules.distribute.entity.FileContrastRecordEntity; -import com.baiye.modules.distribute.mapper.FileContrastRecordMapper; -import com.baiye.modules.distribute.mapper.FileContrastSourceMapper; -import com.baiye.modules.distribute.qo.FileContrastQo; -import com.baiye.modules.distribute.service.FileContrastRecordService; -import com.baiye.modules.distribute.vo.FileContrastRecordVO; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; - -/** - * @author Enzo - * @date 2024-3-13 - */ -@Service -@RequiredArgsConstructor -public class FileContrastRecordServiceImpl extends - ExtendServiceImpl implements FileContrastRecordService { - - - - - - private final FileContrastSourceMapper fileContrastSourceMapper; - - @Override - public PageResult queryPage(PageParam pageParam, FileContrastQo qo) { - return baseMapper.queryPage(pageParam, qo); - } - - - - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/impl/FileContrastServiceImpl.java b/admin/src/main/java/com/baiye/modules/distribute/service/impl/FileContrastServiceImpl.java deleted file mode 100644 index 0bae0dd..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/service/impl/FileContrastServiceImpl.java +++ /dev/null @@ -1,198 +0,0 @@ -package com.baiye.modules.distribute.service.impl; - -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.text.CharSequenceUtil; -import cn.hutool.core.text.csv.CsvData; -import cn.hutool.core.text.csv.CsvReader; -import cn.hutool.core.text.csv.CsvRow; -import cn.hutool.core.text.csv.CsvUtil; -import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.poi.excel.ExcelReader; -import cn.hutool.poi.excel.ExcelUtil; -import com.baiye.constant.DefaultNumberConstants; -import com.baiye.constant.FileConstant; -import com.baiye.domain.PageParam; -import com.baiye.domain.PageResult; -import com.baiye.extend.mybatis.plus.service.impl.ExtendServiceImpl; -import com.baiye.modules.distribute.dto.ContrastDTO; -import com.baiye.modules.distribute.entity.FileContrastEntity; -import com.baiye.modules.distribute.entity.FileContrastRecordEntity; -import com.baiye.modules.distribute.entity.FileContrastSourceEntity; -import com.baiye.modules.distribute.mapper.FileContrastMapper; -import com.baiye.modules.distribute.mapper.FileContrastSourceMapper; -import com.baiye.modules.distribute.qo.FileContrastQo; -import com.baiye.modules.distribute.service.FileContrastRecordService; -import com.baiye.modules.distribute.service.FileContrastService; -import com.baiye.modules.distribute.vo.FileContrastVO; -import com.baiye.task.FileContrastTask; -import com.baiye.util.AESUtils; -import com.baiye.util.FileUtil; -import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; -import com.google.common.collect.Lists; -import lombok.RequiredArgsConstructor; -import org.apache.commons.lang3.StringUtils; -import org.ballcat.security.properties.SecurityProperties; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.multipart.MultipartFile; - -import java.io.File; -import java.util.List; - -/** - * @author Enzo - * @date 2024-3-13 - */ -@Service -@RequiredArgsConstructor -public class FileContrastServiceImpl extends ExtendServiceImpl implements FileContrastService { - - - @Value("${snowflake.workerId}") - private int workerId; - - @Value("${snowflake.datacenterId}") - private int datacenterId; - - private final FileContrastTask fileContrastTask; - - private final SecurityProperties securityProperties; - - private final FileContrastSourceMapper fileContrastSourceMapper; - - private final FileContrastRecordService fileContrastRecordService; - - @Override - public PageResult queryPage(PageParam pageParam, FileContrastQo qo) { - return baseMapper.queryPage(pageParam, qo); - } - - - @Override - @Transactional(rollbackFor = Exception.class) - public Boolean createTask(List files, String taskName) { - List contrastDTOList = Lists.newArrayList(); - for (MultipartFile file : files) { - String originalFilename = file.getOriginalFilename(); - if (StringUtils.isNotBlank(originalFilename)) { - // 解析文件 - contrastDTOList = parseFile(file, originalFilename); - } - } - contrastDTOList.forEach(dto -> - dto.setNid(AESUtils.encrypt(dto.getNid(), securityProperties.getPasswordSecretKey()))); - // 雪花算法id - Long id = IdUtil.getSnowflake(workerId, datacenterId).nextId(); - // 保存数据 - FileContrastEntity fileContrast = new FileContrastEntity(); - fileContrast.setId(id); - fileContrast.setTaskName(taskName); - fileContrast.setContrastNum(contrastDTOList.size()); - // 转换数据 - List sourceEntityList = - Convert.toList(FileContrastSourceEntity.class, contrastDTOList); - sourceEntityList.forEach(str -> str.setTaskId(id)); - fileContrastSourceMapper.insertBatchSomeColumn(sourceEntityList); - return this.save(fileContrast); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public Boolean additionTaskSource(List files, Long taskId) { - FileContrastEntity contrast = getById(taskId); - if (ObjectUtil.isNotNull(contrast) && ObjectUtil.isNotNull(contrast.getId())) { - List contrastDTOList = Lists.newArrayList(); - for (MultipartFile file : files) { - String originalFilename = file.getOriginalFilename(); - if (StringUtils.isNotBlank(originalFilename)) { - // 解析文件 - contrastDTOList = parseFile(file, originalFilename); - } - } - contrastDTOList.forEach(dto -> - dto.setNid(AESUtils.encrypt(dto.getNid(), securityProperties.getPasswordSecretKey()))); - // 修改数量 - contrast.setContrastNum(ObjectUtil.isNotNull(contrast.getContrastNum()) ? - contrast.getContrastNum() + contrastDTOList.size() : contrastDTOList.size()); - this.updateById(contrast); - List sourceEntityList = Convert.toList(FileContrastSourceEntity.class, contrastDTOList); - sourceEntityList.forEach(str -> str.setTaskId(taskId)); - return SqlHelper.retBool(fileContrastSourceMapper.insertBatchSomeColumn(sourceEntityList)); - } - return Boolean.FALSE; - } - - @Override - public Boolean buildContrast(List files, Long taskId) { - FileContrastEntity contrast = baseMapper.selectById(taskId); - if (ObjectUtil.isNotNull(contrast)) { - List contrastDTOList = Lists.newArrayList(); - for (MultipartFile file : files) { - String originalFilename = file.getOriginalFilename(); - if (StringUtils.isNotBlank(originalFilename)) { - // 解析文件 - contrastDTOList = parseFile(file, originalFilename); - } - } - // 雪花算法id - Long id = IdUtil.getSnowflake(workerId, datacenterId).nextId(); - FileContrastRecordEntity fileContrastRecord = new FileContrastRecordEntity(); - fileContrastRecord.setTaskId(taskId); - fileContrastRecord.setId(id); - fileContrastRecord.setContrastNum(contrastDTOList.size()); - fileContrastRecord.setStatus(DefaultNumberConstants.ZERO_NUMBER); - fileContrastRecordService.save(fileContrastRecord); - fileContrastTask.doRunTask(contrastDTOList, contrast, fileContrastRecord); - return Boolean.TRUE; - } - return Boolean.FALSE; - } - - private List parseFile(MultipartFile file, String originalFilename) { - List dtoList = Lists.newArrayList(); - // 解析 文件 - File upload = FileUtil.multiToFile(file); - if (ObjectUtil.isNotNull(upload)) { - if (originalFilename.endsWith(FileConstant.XLS_FILE_SUB_NAME) - || originalFilename.endsWith(FileConstant.XLSX_FILE_SUB_NAME)) { - ExcelReader reader = ExcelUtil.getReader(upload); - for (List objects : reader.read()) { - if (CollUtil.isNotEmpty(objects)) { - ContrastDTO dto = new ContrastDTO(); - if (ObjectUtil.isNotNull(objects.get(DefaultNumberConstants.ZERO_NUMBER))) { - dto.setNid(objects.get - (DefaultNumberConstants.ZERO_NUMBER).toString()); - - } - if (objects.size() > DefaultNumberConstants.ONE_NUMBER) { - Object object = objects.get(DefaultNumberConstants.ONE_NUMBER); - dto.setRemark(ObjectUtil.isNotNull(object) ? object.toString() : CharSequenceUtil.EMPTY); - } - dtoList.add(dto); - } - } - } - if (originalFilename.endsWith(FileConstant.CSV_FILE_SUB_NAME)) { - CsvReader reader = CsvUtil.getReader(); - CsvData read = reader.read(upload); - for (CsvRow row : read.getRows()) { - ContrastDTO dto = new ContrastDTO(); - if (CollUtil.isNotEmpty(row)) { - if (ObjectUtil.isNotNull(row.get(DefaultNumberConstants.ZERO_NUMBER))) { - dto.setNid(row.get(DefaultNumberConstants.ZERO_NUMBER)); - } - if (row.size() > DefaultNumberConstants.ONE_NUMBER) { - String string = row.get(DefaultNumberConstants.ONE_NUMBER); - dto.setRemark(StringUtils.isNotBlank(string) ? string : CharSequenceUtil.EMPTY); - } - dtoList.add(dto); - } - } - } - } - return dtoList; - } -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/impl/FileContrastSourceServiceImpl.java b/admin/src/main/java/com/baiye/modules/distribute/service/impl/FileContrastSourceServiceImpl.java deleted file mode 100644 index 7085f9e..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/service/impl/FileContrastSourceServiceImpl.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.baiye.modules.distribute.service.impl; - -import com.baiye.extend.mybatis.plus.service.impl.ExtendServiceImpl; -import com.baiye.extend.mybatis.plus.toolkit.WrappersX; -import com.baiye.modules.distribute.entity.FileContrastSourceEntity; -import com.baiye.modules.distribute.mapper.FileContrastSourceMapper; -import com.baiye.modules.distribute.service.FileContrastSourceService; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * @author Enzo - * @date 2024-3-13 - */ -@Service -@RequiredArgsConstructor -public class FileContrastSourceServiceImpl extends - ExtendServiceImpl implements FileContrastSourceService { - - - @Override - public List queryByTaskId(Long taskId) { - return baseMapper.selectList - (WrappersX.lambdaQueryX(FileContrastSourceEntity.class).eq(FileContrastSourceEntity::getTaskId, taskId)); - } - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/impl/HomepageServiceImpl.java b/admin/src/main/java/com/baiye/modules/distribute/service/impl/HomepageServiceImpl.java deleted file mode 100644 index f76c454..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/service/impl/HomepageServiceImpl.java +++ /dev/null @@ -1,264 +0,0 @@ -package com.baiye.modules.distribute.service.impl; - -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.date.DateUnit; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.io.IoUtil; -import cn.hutool.core.util.NumberUtil; -import cn.hutool.poi.excel.ExcelUtil; -import cn.hutool.poi.excel.ExcelWriter; -import com.baiye.enums.ChannelTypeEnum; -import com.baiye.exception.BadRequestException; -import com.baiye.modules.distribute.dto.HomePageDTO; -import com.baiye.modules.distribute.mapper.ClueMapper; -import com.baiye.modules.distribute.mapper.CustomMapper; -import com.baiye.modules.distribute.qo.HomePageQo; -import com.baiye.modules.distribute.service.HomepageService; -import com.baiye.modules.distribute.vo.ChannelAssignedClueExportVo; -import com.baiye.modules.distribute.vo.ChannelEnterClueExportVO; -import com.baiye.security.util.SecurityUtils; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -import javax.servlet.ServletOutputStream; -import javax.servlet.http.HttpServletResponse; -import java.math.BigDecimal; -import java.util.*; -import java.util.stream.Collectors; - -/** - * @author wjt - * @date 2023/12/6 - */ -@Service -@Slf4j -@RequiredArgsConstructor -public class HomepageServiceImpl implements HomepageService { - - private final ClueMapper clueMapper; - private final CustomMapper customMapper; - - - @Override - public Map baseCount() { - //进线 - List list = customMapper.addCount(DateUtil.format(DateUtil.date(), "yyyy-MM-dd"), SecurityUtils.getCurrentUserId()); - //分发 - Integer assignedNum = clueMapper.addCount(DateUtil.format(DateUtil.date(), "yyyy-MM-dd"), SecurityUtils.getCurrentUserId()); - //进线数 - Integer enterNum = 0; - //分发率 - double assignedRate = 0.0; - //重审数 - int reviewNum = 0; - if (CollUtil.isNotEmpty(list)) { - enterNum = list.size(); - assignedRate = NumberUtil.div(assignedNum, enterNum).doubleValue(); - reviewNum = (int) list.stream().filter(type -> type == 3).count(); - } - Map map = new HashMap<>(16); - map.put("enterNum", enterNum); - map.put("assignedNum", assignedNum); - map.put("reviewNum", reviewNum); - map.put("assignedRate", assignedRate); - return map; - } - - @Override - public Map> channelEnterClue(HomePageQo homePageQo) { - Long currentUserId = SecurityUtils.getCurrentUserId(); - homePageQo.setCompanyId(currentUserId); - List homePageDTO = customMapper.selectByCompanyIdAndTime(homePageQo); - if (CollUtil.isEmpty(homePageDTO)) { - return null; - } - //按录入员分组 - Map> homePageByChannelType = homePageDTO.stream() - .collect(Collectors.groupingBy(HomePageDTO::getEnterName)); - return dealDateSource(homePageByChannelType, homePageQo); - } - - @Override - public void channelClueExport(HttpServletResponse response, HomePageQo homePageQo) { - Long currentUserId = SecurityUtils.getCurrentUserId(); - homePageQo.setCompanyId(currentUserId); - if (homePageQo.getType() == 1) { - channelEnterClueExport(response, homePageQo); - } else { - channelAssignedClueExport(response, homePageQo); - } - } - - private void channelEnterClueExport(HttpServletResponse response, HomePageQo homePageQo) { - List homePageDTO = customMapper.selectByCompanyIdAndTime(homePageQo); - if (CollUtil.isEmpty(homePageDTO)) { - return; - } - //渠道商 - String channelType = ChannelTypeEnum.find(homePageQo.getChannelType()); - List list = new ArrayList<>(); - //按录入员分组 - Map> homePageByChannelType = homePageDTO.stream() - .collect(Collectors.groupingBy(HomePageDTO::getEnterName)); - for (Map.Entry> entry : homePageByChannelType.entrySet()) { - //录入员 - String key = entry.getKey(); - List value = entry.getValue(); - //按时间分组 - Map> collect = value.stream().collect(Collectors.groupingBy(HomePageDTO::getCreateTime)); - - for (Map.Entry> map : collect.entrySet()) { - String time = map.getKey(); - int size = map.getValue().size(); - ChannelEnterClueExportVO channelEnterClueExportVO = new ChannelEnterClueExportVO(); - channelEnterClueExportVO.setChannelType(channelType); - channelEnterClueExportVO.setEnterBy(key); - channelEnterClueExportVO.setDate(time); - channelEnterClueExportVO.setNum(size); - list.add(channelEnterClueExportVO); - } - } - //导出 - try { - ExcelWriter writer = ExcelUtil.getWriter(); - writer.write(list, true); - response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8"); - response.setHeader("Content-Disposition", "attachment;filename=export.xlsx"); - ServletOutputStream out = response.getOutputStream(); - writer.flush(out, true); - writer.close(); - IoUtil.close(out); - } catch (Exception e) { - throw new BadRequestException("导出失败"); - } - } - - @Override - public Map> channelAssignedClue(HomePageQo homePageQo) { - Long currentUserId = SecurityUtils.getCurrentUserId(); - homePageQo.setCompanyId(currentUserId); - List homePageDTO = clueMapper.selectDetailByChannelAndAssigned(homePageQo); - if (CollUtil.isEmpty(homePageDTO)) { - return null; - } - //按分配人分组 - Map> homePageByAssigned = homePageDTO.stream() - .collect(Collectors.groupingBy(HomePageDTO::getAssignedName)); - return dealDateSource(homePageByAssigned, homePageQo); - } - - public void channelAssignedClueExport(HttpServletResponse response, HomePageQo homePageQo) { - List homePageDTO = clueMapper.selectDetailByChannelAndAssigned(homePageQo); - if (CollUtil.isEmpty(homePageDTO)) { - return; - } - //渠道商 - String channelType = ChannelTypeEnum.find(homePageQo.getChannelType()); - List list = new ArrayList<>(); - //按分配人分组 - Map> homePageByAssigned = homePageDTO.stream() - .collect(Collectors.groupingBy(HomePageDTO::getAssignedName)); - for (Map.Entry> entry : homePageByAssigned.entrySet()) { - //分配员 - String key = entry.getKey(); - List value = entry.getValue(); - //按时间分组 - Map> collect = value.stream().collect(Collectors.groupingBy(HomePageDTO::getCreateTime)); - - for (Map.Entry> map : collect.entrySet()) { - String time = map.getKey(); - int size = map.getValue().size(); - ChannelAssignedClueExportVo channelAssignedClueExportVo = new ChannelAssignedClueExportVo(); - channelAssignedClueExportVo.setChannelType(channelType); - channelAssignedClueExportVo.setAssignedBy(key); - channelAssignedClueExportVo.setDate(time); - channelAssignedClueExportVo.setNum(size); - list.add(channelAssignedClueExportVo); - } - } - //导出 - try { - ExcelWriter writer = ExcelUtil.getWriter(); - writer.write(list, true); - response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8"); - response.setHeader("Content-Disposition", "attachment;filename=export.xlsx"); - ServletOutputStream out = response.getOutputStream(); - writer.flush(out, true); - writer.close(); - IoUtil.close(out); - } catch (Exception e) { - throw new BadRequestException("导出失败"); - } - } - - private Map> dealDateSource(Map> homePageList, HomePageQo homePageQo) { - //返回统计值 结构如 {0：{"2023-12-6":100}} - Map> mapChannelType = new HashMap<>(16); - for (Map.Entry> entry : homePageList.entrySet()) { - //录入员名称 - String key = entry.getKey(); - List value = entry.getValue(); - //按时间分组 - Map> homePageByTime = value.stream() - .collect(Collectors.groupingBy(HomePageDTO::getCreateTime)); - long betweenDay = DateUtil.between(DateUtil.parseDate(homePageQo.getCreateStartTime()), DateUtil.parseDate(homePageQo.getCreateEndTime()), DateUnit.DAY); - //返回日期值 如{"2023-12-6":100} - Map mapNum = new LinkedHashMap<>(16); - for (int i = 0; i <= betweenDay; i++) { - String time = DateUtil.format(DateUtil.offsetDay(DateUtil.parseDate(homePageQo.getCreateStartTime()), i), "yyyy-MM-dd"); - if (homePageByTime.containsKey(time)) { - List homePageS = homePageByTime.get(time); - mapNum.put(time, homePageS.size()); - } else { - mapNum.put(time, 0); - } - } - mapChannelType.put(key, mapNum); - } - return mapChannelType; - } - - - @Override - public Object distributorsEnterClue(HomePageQo homePageQo) { - homePageQo.setDistributorId(SecurityUtils.getCurrentUserId()); - //分发员进线 - List enterList = customMapper.distributorsEnterClueByTime(homePageQo); - Map enterMap = enterList.stream() - .collect(Collectors.toMap(HomePageDTO::getCreateTime, HomePageDTO::getNum)); - //分发员分发数 - List assignedList = clueMapper.distributorsAssignedClueByTime(homePageQo); - Map assignedMap = assignedList.stream() - .collect(Collectors.toMap(HomePageDTO::getCreateTime, HomePageDTO::getNum)); - - Map> map = new LinkedHashMap<>(8); - long betweenDay = DateUtil.between(DateUtil.parseDate(homePageQo.getCreateStartTime()), DateUtil.parseDate(homePageQo.getCreateEndTime()), DateUnit.DAY); - for (int i = 0; i <= betweenDay; i++) { - Map mapNum = new LinkedHashMap<>(16); - String time = DateUtil.format(DateUtil.offsetDay(DateUtil.parseDate(homePageQo.getCreateStartTime()), i), "yyyy-MM-dd"); - mapNum.put("enter", enterMap.getOrDefault(time, 0)); - mapNum.put("assigned", assignedMap.getOrDefault(time, 0)); - map.put(time, mapNum); - } - return map; - } - - @Override - public Object salesmanEnterClue(HomePageQo homePageQo) { - homePageQo.setAssignedId(SecurityUtils.getCurrentUserId()); - //业务员进线数 - List assignedList = clueMapper.distributorsAssignedClueByTime(homePageQo); - Map assignedMap = assignedList.stream() - .collect(Collectors.toMap(HomePageDTO::getCreateTime, HomePageDTO::getNum)); - - Map map = new LinkedHashMap<>(8); - long betweenDay = DateUtil.between(DateUtil.parseDate(homePageQo.getCreateStartTime()), DateUtil.parseDate(homePageQo.getCreateEndTime()), DateUnit.DAY); - //返回日期值 如{"2023-12-6":100} - for (int i = 0; i <= betweenDay; i++) { - String time = DateUtil.format(DateUtil.offsetDay(DateUtil.parseDate(homePageQo.getCreateStartTime()), i), "yyyy-MM-dd"); - map.put(time, assignedMap.getOrDefault(time, 0)); - } - return map; - } -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/impl/LabelOrganizeServiceImpl.java b/admin/src/main/java/com/baiye/modules/distribute/service/impl/LabelOrganizeServiceImpl.java deleted file mode 100644 index aa4e4ee..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/service/impl/LabelOrganizeServiceImpl.java +++ /dev/null @@ -1,142 +0,0 @@ -package com.baiye.modules.distribute.service.impl; - -import cn.hutool.core.collection.CollUtil; -import com.baiye.domain.PageParam; -import com.baiye.domain.PageResult; -import com.baiye.extend.mybatis.plus.service.impl.ExtendServiceImpl; -import com.baiye.modules.distribute.entity.LabelEntity; -import com.baiye.modules.distribute.entity.LabelOrganizeEntity; -import com.baiye.modules.distribute.mapper.LabelMapper; -import com.baiye.modules.distribute.mapper.LabelOrganizeMapper; -import com.baiye.modules.distribute.service.LabelOrganizeService; -import com.baiye.modules.distribute.vo.LabelOrganizeVO; -import com.baiye.modules.distribute.qo.LabelOrganizeQo; -import com.baiye.security.util.SecurityUtils; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.*; -import java.util.stream.Collectors; - -/** - * @Author YQY - * @Date 2023/8/8 - */ -@Service -@RequiredArgsConstructor -public class LabelOrganizeServiceImpl extends ExtendServiceImpl - implements LabelOrganizeService { - - private final LabelMapper labelMapper; - - @Override - @Transactional(rollbackFor = Exception.class) - public void add(LabelOrganizeEntity labelOrganizeEntity) { - baseMapper.insert(labelOrganizeEntity); - List labelList = labelOrganizeEntity.getLabelList(); - if (CollUtil.isNotEmpty(labelList)) { - HashSet stringHashSet = new HashSet<>(labelList); - List list = new ArrayList<>(); - for (String label : stringHashSet) { - LabelEntity labelEntity = new LabelEntity(); - labelEntity.setLabelOrganizeId(labelOrganizeEntity.getId()); - labelEntity.setLabelName(label); - list.add(labelEntity); - } - labelMapper.insertBatchSomeColumn(list); - } - } - - @Override - @Transactional(rollbackFor = Exception.class) - public boolean update(LabelOrganizeEntity labelOrganize) { - Set delLabelIds = labelOrganize.getDelLabelId(); - List labelList = labelOrganize.getLabelList(); - // 1、删除标签信息 - if (CollUtil.isNotEmpty(delLabelIds)) { - labelMapper.deleteBatchIds(delLabelIds); - } - // 2、修改标签组信息 - baseMapper.updateById(labelOrganize); - // 3、是否有新增标签 - if (CollUtil.isNotEmpty(labelList)) { - List addLabelList = new ArrayList<>(); - List entityList = labelMapper.selectList( - new LambdaQueryWrapper().eq(LabelEntity::getLabelOrganizeId, labelOrganize.getId())); - List list = entityList.stream().map(LabelEntity::getLabelName).collect(Collectors.toList()); - // 去重 - for (String labelName : labelList) { - if (!list.contains(labelName)) { - LabelEntity labelEntity = new LabelEntity(); - labelEntity.setLabelName(labelName); - labelEntity.setLabelOrganizeId(labelOrganize.getId()); - addLabelList.add(labelEntity); - } - } - if (CollUtil.isNotEmpty(addLabelList)) - labelMapper.insertBatchSomeColumn(addLabelList); - } - return true; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public boolean del(Set ids) { - // 1、删除组信息 - this.removeBatchByIds(ids); - // 2、删除标签信息 - if (CollUtil.isNotEmpty(ids)) { - labelMapper.delete(new LambdaQueryWrapper().in(LabelEntity::getLabelOrganizeId, ids)); - } - return true; - } - - @Override - public Object listLabelOrganize(LabelOrganizeQo labelOrganizeQo) { - return baseMapper.selectList(new LambdaQueryWrapper().eq(LabelOrganizeEntity::getCreateBy, - SecurityUtils.getCurrentUserId())); - } - - @Override - public PageResult queryPage(PageParam pageParam, LabelOrganizeQo labelOrganizeQo) { - labelOrganizeQo.setCreateBy(SecurityUtils.getCurrentUserId()); - PageResult pageResult = baseMapper.queryPage(pageParam, labelOrganizeQo); - // 查询所有标签 - List labelEntityList = labelMapper.selectList( - new LambdaQueryWrapper().eq(LabelEntity::getCreateBy, SecurityUtils.getCurrentUserId())); - Map> labelMap = labelEntityList.stream() - .collect(Collectors.groupingBy(LabelEntity::getLabelOrganizeId)); - // 返回标签组时返回组的标签信息 - for (LabelOrganizeVO record : pageResult.getRecords()) { - if (labelMap.containsKey(record.getId())) { - record.setLabelList(labelMap.get(record.getId())); - } - } - return pageResult; - } - - @Override - public List queryUserList(Long userId) { - List entities = baseMapper - .selectList(new LambdaQueryWrapper().eq(LabelOrganizeEntity::getCreateBy, userId)); - List organizeIds = entities.stream().map(LabelOrganizeEntity::getId).collect(Collectors.toList()); - if (CollUtil.isNotEmpty(organizeIds)) { - // 查询标签组下标签 - List labelEntityList = labelMapper - .selectList(new LambdaQueryWrapper().in(LabelEntity::getLabelOrganizeId, organizeIds)); - Map> map = labelEntityList.stream() - .collect(Collectors.groupingBy(LabelEntity::getLabelOrganizeId)); - // 插入标签信息 - for (LabelOrganizeEntity entity : entities) { - Long organizeId = entity.getId(); - if (map.containsKey(organizeId)) { - entity.setLabelEntityList(map.get(organizeId)); - } - } - } - return entities; - } - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/impl/OceanEngineClueServiceImpl.java b/admin/src/main/java/com/baiye/modules/distribute/service/impl/OceanEngineClueServiceImpl.java deleted file mode 100644 index 124a50d..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/service/impl/OceanEngineClueServiceImpl.java +++ /dev/null @@ -1,258 +0,0 @@ -package com.baiye.modules.distribute.service.impl; - -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.URLUtil; -import cn.hutool.http.HttpRequest; -import cn.hutool.json.JSONArray; -import cn.hutool.json.JSONObject; -import cn.hutool.json.JSONUtil; -import com.baiye.constant.DefaultNumberConstants; -import com.baiye.constant.UrlConstant; -import com.baiye.enums.ClueSourceEnum; -import com.baiye.extend.mybatis.plus.service.impl.ExtendServiceImpl; -import com.baiye.modules.distribute.dto.CallbackCustomDTO; -import com.baiye.modules.distribute.dto.ClueDTO; -import com.baiye.modules.distribute.dto.OceanEngineResponseDTO; -import com.baiye.modules.distribute.entity.OceanEngineSourceEntity; -import com.baiye.modules.distribute.entity.OceanEngineToken; -import com.baiye.modules.distribute.entity.PushLinkEntity; -import com.baiye.modules.distribute.mapper.OceanEngineSourceMapper; -import com.baiye.modules.distribute.service.*; -import com.baiye.polling.QueueBalance; -import com.baiye.system.enums.RoleCodeEnum; -import com.baiye.system.model.entity.SysUser; -import com.baiye.system.model.entity.SysUserRolePromise; -import com.baiye.system.service.SysUserRolePromiseService; -import com.baiye.system.service.SysUserRoleService; -import com.baiye.system.service.SysUserService; -import com.baiye.util.AESUtils; -import com.google.common.collect.Lists; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.ballcat.security.properties.SecurityProperties; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.nio.charset.Charset; -import java.util.*; -import java.util.concurrent.CompletableFuture; - -/** - * @author wjt - * @date 2023/11/2 - */ -@Service -@RequiredArgsConstructor -@Slf4j -public class OceanEngineClueServiceImpl extends ExtendServiceImpl implements OceanEngineClueService { - - - @Value("${snowflake.workerId}") - private int workerId; - - @Value("${snowflake.datacenterId}") - private int datacenterId; - - private final ClueService clueService; - - private final CustomService customService; - - private final SysUserService sysUserService; - - private final PushLinkService pushLinkService; - - private final SecurityProperties securityProperties; - - private final OceanEngineService oceanEngineService; - - private final SysUserRoleService sysUserRoleService; - - private final SysUserRolePromiseService sysUserRolePromiseService; - - - @Override - public void getFeiYuSource(Date startTime, Date endTime) { - - //查询需要同步线索的token - List oceanEngineTokens = oceanEngineService.findByStatus(1); - if (CollUtil.isEmpty(oceanEngineTokens)) { - return; - } - for (OceanEngineToken oceanEngineToken : oceanEngineTokens) { - String accessToken = oceanEngineToken.getAccessToken(); - //管家ids - List advertiserIds = oceanEngineToken.getAdvertiserIds(); - CompletableFuture.runAsync(() -> getAdvertiser(oceanEngineToken.getUserId(), oceanEngineToken.getCompanyId(), oceanEngineToken.getAuthorizeName(), accessToken, advertiserIds, startTime, endTime)); - } - } - - /** - * 通过管家id和token 查询广告商id - * - * @param companyId - * @param authorizeName - * @param accessToken token - * @param advertisers 管家id - */ - private void getAdvertiser(Long userId, Long companyId, String authorizeName, String accessToken, List advertisers, Date startTime, Date endTime) { - log.info("=================== 巨量飞鱼,拉取用户{} ===================", userId); - if (CollUtil.isEmpty(advertisers)) { - log.info("=================== 巨量飞鱼,拉取用户{} 无管家 ===================", userId); - return; - } - List advertiseList = getAdvertiseIds(accessToken, advertisers); - if (CollUtil.isEmpty(advertiseList)) { - log.info("=================== 巨量飞鱼,拉取用户{} 无广告商 ===================", userId); - return; - } - Map map = new HashMap<>(5); - map.put("advertiser_ids", advertiseList.toString()); - map.put("start_time", startTime); - map.put("end_time", endTime); - JSONArray array = reqOceanEngineClue(accessToken, map); - log.info("=================== 巨量飞鱼,线索数量{} ===================", array.size()); - if (CollUtil.isEmpty(array)) { - return; - } - parseAndSaveData(userId, companyId, authorizeName, array); - } - - /** - * 跟据管家号获取广告商号 - * - * @param accessToken token - * @param advertisers 管家号 - * @return 广告主id - */ - public List getAdvertiseIds(String accessToken, List advertisers) { - //所有广告主的id - List advertiseList = new ArrayList<>(); - for (String id : advertisers) { - String body = HttpRequest.get(UrlConstant.GET_ADVERTISER + "?" + "advertiser_id=" + id). - header("Access-Token", accessToken).execute().body(); - OceanEngineResponseDTO response = JSONUtil.toBean(body, OceanEngineResponseDTO.class); - if (response.getCode() == 0) { - if (response.getData() != null) { - JSONObject json = JSONUtil.parseObj(response.getData()); - JSONArray results = json.getJSONArray("list"); - for (int i = 0; i < results.size(); i++) { - JSONObject jsonObject = results.getJSONObject(i); - String advertiserId = jsonObject.getStr("advertiser_id"); - advertiseList.add(advertiserId); - } - } - } else { - log.error("管家号:{},获取广告主失败 {}", id, response); - } - } - return advertiseList; - } - - /** - * 同步飞鱼线索 - * - * @param accessToken token - * @param map 时间参数 - */ - public JSONArray reqOceanEngineClue(String accessToken, Map map) { - JSONObject data = getClueList(map, accessToken); - if (data == null) { - return null; - } - JSONObject pageInfo = data.getJSONObject("page_info"); - //总数 - int totalNumber = pageInfo.getInt("total_number"); - if (totalNumber > DefaultNumberConstants.TEN_NUMBER) { - map.put("page", 1); - map.put("page_size", totalNumber); - data = getClueList(map, accessToken); - if (data == null) { - return null; - } - } - return data.getJSONArray("list"); - } - - public static JSONObject getClueList(Map map, String accessToken) { - String body = HttpRequest.get(UrlConstant.SYNC_CLUE_URL + "?" + URLUtil.buildQuery(map, Charset.defaultCharset())).header("Access-Token", accessToken).execute().body(); - OceanEngineResponseDTO response = JSONUtil.toBean(body, OceanEngineResponseDTO.class); - if (response.getCode() == 0) { - if (response.getData() != null) { - return JSONUtil.parseObj(response.getData()); - } - } else { - log.error("获取飞鱼线索失败 {}", response); - } - return null; - } - - /** - * 解析线索 - * - * @param userId 用户id - * @param companyId - * @param authorizeName - * @param array 线索 - */ - @Transactional(rollbackFor = Exception.class) - public void parseAndSaveData(Long userId, Long companyId, String authorizeName, JSONArray array) { - List oceanEngineSources = Lists.newArrayList(); - List dtoList = Lists.newArrayList(); - SysUser byId = sysUserService.findById(userId); - List userList = sysUserRoleService.selectUserIdByRoleCode - (companyId, RoleCodeEnum.ROLE_PRELIMINARY_EXAMINER.getRoleCode()); - PushLinkEntity pushLinkEntity = pushLinkService.findByNameAndUserId(authorizeName, userId); - if (ObjectUtil.isNotNull(pushLinkEntity)) { - - for (int i = 0; i < array.size(); i++) { - JSONObject json = array.getJSONObject(i); - Map map = new HashMap<>(); - //飞鱼线索id - map.put("clueId", json.getStr("clue_id")); - map.put("createTimeDetail", json.getStr("create_time_detail")); - //广告商名称 - map.put("advertiserName", json.getStr("advertiser_name")); - map.put("wx", json.getStr("weixin")); - map.put("address", json.getStr("location")); - //线索留资(key-value形式的备注) - map.put("remarkDict", json.getStr("remark_dict")); - //线索名 - String name = json.getStr("name"); - String phone = json.getStr("telephone"); - - //===========原数据保存 - OceanEngineSourceEntity oceanEngineSource = new OceanEngineSourceEntity(); - oceanEngineSource.setUserId(userId); - oceanEngineSources.add(oceanEngineSource); - oceanEngineSource.setContent(JSONUtil.toJsonStr(json)); - // 传递线索 - String jsonStr = JSONUtil.toJsonStr(map); - // 查询所有分发员 - QueueBalance balance = new QueueBalance<>(); - Long distributeId = balance.chooseOne(userList); - SysUserRolePromise promise = sysUserRolePromiseService.queryIsShowByUserId(distributeId); - if (ObjectUtil.isNotNull(promise) && ObjectUtil.isNotNull - (promise.getIsAutoAudits()) && promise.getIsAutoAudits().equals(Boolean.TRUE)) { - List list = Lists.newArrayList(); - // 雪花算法id - Long clueId = IdUtil.getSnowflake(workerId, datacenterId).nextId(); - ClueDTO clueDTO = ClueDTO.builder().originName(ClueSourceEnum.STORE_DISTRIBUTION.getDescription()).clueId(clueId).remark - (jsonStr).nid(AESUtils.encrypt(phone, securityProperties.getPasswordSecretKey())).assignedBy - (userId).createBy(distributeId).isNewClue(Boolean.TRUE).build(); - list.add(clueDTO); - clueService.saveClueListByStoreInfo(list); - } - - CallbackCustomDTO customDTO = CallbackCustomDTO.builder().channelType(DefaultNumberConstants.THREE_NUMBER).customNid(phone).channelName(pushLinkEntity.getName()) - .customName(name).distributeId(distributeId).sex(DefaultNumberConstants.MINUS_ONE_NUMBER).identifying(pushLinkEntity.getChannelIdentifying()).reportUserId - (userId).remark(jsonStr).companyId(byId.getWhichUserId()).enterName(byId.getUsername()).build(); - dtoList.add(customDTO); - } - } - customService.createByCallBack(dtoList); - baseMapper.insertBatchSomeColumn(oceanEngineSources); - } -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/impl/OceanEngineServiceImpl.java b/admin/src/main/java/com/baiye/modules/distribute/service/impl/OceanEngineServiceImpl.java deleted file mode 100644 index 6494fd8..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/service/impl/OceanEngineServiceImpl.java +++ /dev/null @@ -1,229 +0,0 @@ -package com.baiye.modules.distribute.service.impl; - -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.text.CharSequenceUtil; -import cn.hutool.core.text.StrPool; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import cn.hutool.http.HttpUtil; -import cn.hutool.json.JSONUtil; -import com.baiye.constant.DefaultNumberConstants; -import com.baiye.constant.UrlConstant; -import com.baiye.domain.PageParam; -import com.baiye.domain.PageResult; -import com.baiye.exception.BadRequestException; -import com.baiye.extend.mybatis.plus.service.impl.ExtendServiceImpl; -import com.baiye.extend.mybatis.plus.toolkit.WrappersX; -import com.baiye.modules.auth.AccessTokenRequest; -import com.baiye.modules.auth.AccessTokenResponse; -import com.baiye.modules.auth.RefreshTokenRequest; -import com.baiye.modules.auth.RefreshTokenResponse; -import com.baiye.modules.distribute.dto.OceanEngineTokenDto; -import com.baiye.modules.distribute.entity.OceanEngineToken; -import com.baiye.modules.distribute.mapper.OceanEngineTokenMapper; -import com.baiye.modules.distribute.qo.OceanEnginQo; -import com.baiye.modules.distribute.service.OceanEngineService; -import com.baiye.modules.distribute.vo.OceanEnginVO; -import com.baiye.properties.OceanEngineConfig; -import com.baiye.util.AESUtils; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.ballcat.security.properties.SecurityProperties; -import org.jsoup.helper.DataUtil; -import org.springframework.cache.annotation.CacheEvict; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; - -/** - * @author Enzo - * @date : 2023/9/14 - */ -@Slf4j -@Service -@RequiredArgsConstructor -public class OceanEngineServiceImpl extends ExtendServiceImpl implements OceanEngineService { - - - private final OceanEngineTokenMapper oceanEngineTokenMapper; - - private final SecurityProperties securityProperties; - - private final OceanEngineConfig oceanEngineConfig; - - - @Override - public String buildAuthorizationUrl(Long id, String authorizeName) { - return String.format - (UrlConstant.CONNECT_OAUTH2_AUTHORIZE_URL, - oceanEngineConfig.getAppId(), AESUtils.encrypt(id.toString().concat(StrPool.COLON). - concat(authorizeName), securityProperties.getPasswordSecretKey()), oceanEngineConfig.getRedirectUrl()); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void processRequest(String state, String authCode) { - AccessTokenRequest request = new AccessTokenRequest(); - request.setAppId(oceanEngineConfig.getAppId()); - request.setSecret(oceanEngineConfig.getAppSecret()); - request.setGrantType("auth_code"); - request.setAuthCode(authCode); - String requestBody = request.toString(); - String result = HttpUtil.post(UrlConstant.OAUTH2_ACCESS_TOKEN_URL, requestBody); - if (StringUtils.isNotBlank(requestBody)) { - AccessTokenResponse accessTokenResponse = JSONUtil.toBean(result, AccessTokenResponse.class); - AccessTokenResponse.Data data = accessTokenResponse.getData(); - log.info("=================== the response as data {} ==========", JSONUtil.toJsonStr(data)); - if (accessTokenResponse.getCode() == DefaultNumberConstants.ZERO_NUMBER) { - String decrypt = AESUtils.decrypt(state, securityProperties.getPasswordSecretKey()); - if (StringUtils.isNotBlank(decrypt)) { - String[] split = decrypt.split(StrPool.COLON); - if (split.length > DefaultNumberConstants.ONE_NUMBER) { - long parseLong = Long.parseLong(split[DefaultNumberConstants.ZERO_NUMBER]); - String authorizeName = split[DefaultNumberConstants.ONE_NUMBER]; - OceanEngineToken byUserId = oceanEngineTokenMapper.selectOne(WrappersX.lambdaQueryX(OceanEngineToken.class) - .eq(OceanEngineToken::getUserId, parseLong).eq(OceanEngineToken::getAuthorizeName, authorizeName)); - if (ObjectUtil.isNull(byUserId)) { - byUserId = new OceanEngineToken(); - byUserId.setCompanyId(parseLong); - byUserId.setAuthorizeName(authorizeName); - byUserId.setExpiresIn(data.getExpiresIn()); - byUserId.setUserId(byUserId.getUserId()); - byUserId.setAccessToken(data.getAccessToken()); - byUserId.setRefreshToken(data.getRefreshToken()); - byUserId.setAdvertiserIds(data.getAdvertiserIds()); - byUserId.setStatus(DefaultNumberConstants.ONE_NUMBER); - byUserId.setRefreshTokenExpiresIn(data.getRefreshTokenExpiresIn()); - oceanEngineTokenMapper.insert(byUserId); - return; - } - byUserId.setAuthorizeTime(DateUtil.date()); - byUserId.setExpiresIn(data.getExpiresIn()); - byUserId.setAccessToken(data.getAccessToken()); - byUserId.setRefreshToken(data.getRefreshToken()); - byUserId.setAdvertiserIds(data.getAdvertiserIds()); - byUserId.setStatus(DefaultNumberConstants.ONE_NUMBER); - byUserId.setRefreshTokenExpiresIn(data.getRefreshTokenExpiresIn()); - oceanEngineTokenMapper.updateById(byUserId); - } - } - } - } - } - - @Override - public List findByStatus(Integer status) { - return oceanEngineTokenMapper.selectList - (WrappersX.lambdaQueryX(OceanEngineToken.class).eq(OceanEngineToken::getStatus, status)); - } - - - @Override - public List getOceanEnginByCompanyId(Long companyId, String authorizeName) { - return oceanEngineTokenMapper.selectList - (WrappersX.lambdaQueryX(OceanEngineToken.class).eq - (OceanEngineToken::getStatus, DefaultNumberConstants.ONE_NUMBER).eq - (OceanEngineToken::getUserId, companyId)); - } - - - @Override - @Transactional(rollbackFor = Exception.class) - @CacheEvict(cacheNames = "oceanEnginCache", key = "'id:' + #id") - public String refreshToken(String accountToken, Long id, Long userId) { - RefreshTokenRequest request = new RefreshTokenRequest(); - request.setRefreshToken(accountToken); - request.setAppId(oceanEngineConfig.getAppId()); - request.setSecret(oceanEngineConfig.getAppSecret()); - request.setGrantType("refresh_token"); - String requestBody = request.toString(); - String result = HttpUtil.post(UrlConstant.OAUTH2_REFRESH_TOKEN_URL, requestBody); - if (StringUtils.isNotBlank(requestBody)) { - RefreshTokenResponse refreshTokenResponse = JSONUtil.toBean(result, RefreshTokenResponse.class); - if (refreshTokenResponse.getCode() == DefaultNumberConstants.ZERO_NUMBER) { - RefreshTokenResponse.Data data = refreshTokenResponse.getData(); - // 判断信息是否为空 - if (StringUtils.isNotBlank(data.getAccessToken()) - && StringUtils.isNotBlank(data.getRefreshToken())) { - this.updateOceanEnginByResponse - (data.getExpiresIn(), data.getAccessToken(), data.getRefreshTokenExpiresIn(), data.getRefreshToken(), id); - return data.getAccessToken(); - } - } - } - return CharSequenceUtil.EMPTY; - } - - @Override - @Transactional(rollbackFor = Exception.class) - @CacheEvict(cacheNames = "oceanEnginCache", key = "'id:' + #id") - public Boolean updateAuthorizationStatus(Integer status, Long id) { - OceanEngineToken token = new OceanEngineToken(); - token.setId(id); - token.setStatus(status); - return SqlHelper.retBool(oceanEngineTokenMapper.updateById(token)); - } - - - @Override - @Transactional(rollbackFor = Exception.class) - @CacheEvict(cacheNames = "oceanEnginCache", key = "'id:' + #id") - public Boolean updateOceanEnginByResponse(Long expiresIn, String accessToken, Long refreshTokenExpiresIn, String refreshToken, Long id) { - OceanEngineToken token = new OceanEngineToken(); - token.setId(id); - token.setExpiresIn(expiresIn); - token.setAccessToken(accessToken); - token.setRefreshToken(refreshToken); - token.setRefreshTokenExpiresIn(refreshTokenExpiresIn); - return SqlHelper.retBool(oceanEngineTokenMapper.updateById(token)); - } - - @Override - public String save(OceanEngineTokenDto oceanEngineTokenDto) { - Long userId = oceanEngineTokenDto.getUserId(); - String authorizeName = oceanEngineTokenDto.getAuthorizeName(); - List byCompanyIdAndAndAuthorizeName = - oceanEngineTokenMapper.selectList(Wrappers.lambdaQuery(OceanEngineToken.class).eq - (OceanEngineToken::getUserId, userId).eq(OceanEngineToken::getAuthorizeName, authorizeName)); - if (ObjectUtil.isNotEmpty(byCompanyIdAndAndAuthorizeName)) { - throw new BadRequestException("该授权名称已存在"); - } - OceanEngineToken token = new OceanEngineToken(); - token.setUserId(userId); - token.setAuthorizeName(authorizeName); - token.setStatus(DefaultNumberConstants.MINUS_ONE_NUMBER); - oceanEngineTokenMapper.insert(token); - return this.buildAuthorizationUrl(userId, authorizeName); - } - - @Override - public PageResult queryPage(PageParam pageParam, OceanEnginQo oceanEnginQo) { - return baseMapper.queryPage(pageParam, oceanEnginQo); - } - - @Override - @Transactional(rollbackFor = Exception.class) - @CacheEvict(cacheNames = "oceanEnginCache", key = "'id:' + #id") - public Boolean updateAuthorizationStatusByUserId(Long id, Long userId, Integer status) { - OceanEngineToken token = new OceanEngineToken(); - token.setUserId(userId); - token.setStatus(status); - return SqlHelper.retBool(oceanEngineTokenMapper.updateById(token)); - } - - @Override - public OceanEngineToken findByUserId(Long userId) { - List oceanEngineTokens = oceanEngineTokenMapper.selectList - (WrappersX.lambdaQueryX().eq(OceanEngineToken::getUserId, userId).orderByDesc(OceanEngineToken::getId)); - if (CollUtil.isNotEmpty(oceanEngineTokens)){ - return oceanEngineTokens.get(DefaultNumberConstants.ZERO_NUMBER); - } - return new OceanEngineToken(); - } - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/impl/OutsideReqServiceImpl.java b/admin/src/main/java/com/baiye/modules/distribute/service/impl/OutsideReqServiceImpl.java deleted file mode 100644 index 60aff28..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/service/impl/OutsideReqServiceImpl.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.baiye.modules.distribute.service.impl; - -import cn.hutool.core.collection.CollUtil; -import cn.hutool.json.JSONUtil; -import com.baiye.modules.distribute.dto.ClueDTO; -import com.baiye.modules.distribute.dto.DBPushClueDTO; -import com.baiye.modules.distribute.dto.ReceivePushLeadsDTO; -import com.baiye.modules.distribute.entity.ClueEntity; -import com.baiye.modules.distribute.entity.UserSecretKeyEntity; -import com.baiye.modules.distribute.mapper.UserSecretKeyMapper; -import com.baiye.modules.distribute.service.ClueService; -import com.baiye.modules.distribute.service.OutsideReqService; -import com.baiye.task.service.SyncTaskService; -import com.baiye.util.DecryptPnoUtil; -import com.baiye.util.MobileUtil; -import com.baiye.util.RsaUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Service; - -import java.nio.charset.StandardCharsets; -import java.util.*; - -@Service -@RequiredArgsConstructor -@Slf4j -public class OutsideReqServiceImpl implements OutsideReqService { - - private final ClueService clueService; - - private final UserSecretKeyMapper userSecretKeyMapper; - - private final SyncTaskService syncTaskService; - - @Override - public void pushClue(String appKey, DBPushClueDTO dbPushClueDTO) { - log.info("推送appKey：{}，推送信息：{}", appKey, dbPushClueDTO); - if (dbPushClueDTO != null && (dbPushClueDTO.getMobile() != null || dbPushClueDTO.getCalled() != null)) { - String mobileDecodeStr; - String remark = dbPushClueDTO.getRemark(); - String empClientTypeName = dbPushClueDTO.getEmpClientTypeName(); - String called = dbPushClueDTO.getCalled(); - Long variable = dbPushClueDTO.getVariable(); - - try { - if (StringUtils.isNotBlank(dbPushClueDTO.getMobile())) { - byte[] mobileDecode = Base64.getDecoder().decode(dbPushClueDTO.getMobile()); - mobileDecodeStr = new String(mobileDecode, StandardCharsets.UTF_8); - } else if (StringUtils.isNotBlank(called) && StringUtils.isNotBlank(empClientTypeName) && empClientTypeName.equals("A")) { - mobileDecodeStr = DecryptPnoUtil.decryptPno(called); - }else { - return; - } - } catch (Exception e) { - log.error("============解密手机号失败============"); - return; - } - // 添加线索 - boolean bool = MobileUtil.checkPhone(mobileDecodeStr); - if (bool) syncTaskService.pushClueExecuteTask(appKey, mobileDecodeStr, remark, variable); - else log.error("============号码非法============"); - } - } - - @Override - public Boolean externalPushClue(ReceivePushLeadsDTO receivePushLeadsDTO) { - String appKey = receivePushLeadsDTO.getAppKey(); - List clueList = receivePushLeadsDTO.getClueList(); - - UserSecretKeyEntity entity = userSecretKeyMapper.selectOne(new LambdaQueryWrapper().eq(UserSecretKeyEntity::getAppKey, appKey)); - if (entity != null && CollUtil.isNotEmpty(clueList)) { - List clueEntityList = new ArrayList<>(); - for (String clueStr : clueList) { - String jsonStr = null; - try { - jsonStr = RsaUtil.decryptByPrivateKey(clueStr, RsaUtil.getPrivateKey(entity.getPrivateKey())); - } catch (Exception e) { - log.error("解密失败"); - } - ClueDTO clueDTO = JSONUtil.toBean(jsonStr, ClueDTO.class); - ClueEntity clueEntity = new ClueEntity(); - BeanUtils.copyProperties(clueDTO, clueEntity); - } - return clueService.saveBatch(clueEntityList); - } - return true; - } - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/impl/PushClueServiceImpl.java b/admin/src/main/java/com/baiye/modules/distribute/service/impl/PushClueServiceImpl.java deleted file mode 100644 index 23f9589..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/service/impl/PushClueServiceImpl.java +++ /dev/null @@ -1,116 +0,0 @@ -package com.baiye.modules.distribute.service.impl; - -import cn.hutool.core.codec.Base64; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.text.CharSequenceUtil; -import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import cn.hutool.http.HttpUtil; -import cn.hutool.json.JSONUtil; -import com.baiye.constant.DefaultNumberConstants; -import com.baiye.domain.PageParam; -import com.baiye.domain.PageResult; -import com.baiye.extend.mybatis.plus.service.impl.ExtendServiceImpl; -import com.baiye.modules.auth.SendClueResponse; -import com.baiye.modules.distribute.dto.TripartiteDTO; -import com.baiye.modules.distribute.entity.PushClueInfoEntity; -import com.baiye.modules.distribute.entity.PushConfigEntity; -import com.baiye.modules.distribute.mapper.PlushClueMapper; -import com.baiye.modules.distribute.qo.SendClueQo; -import com.baiye.modules.distribute.service.PushClueService; -import com.baiye.modules.distribute.service.PushConfigService; -import com.baiye.modules.distribute.vo.PushClueInfoVo; -import com.baiye.util.AESUtils; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.ballcat.security.properties.SecurityProperties; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Service; - -/** - * @author Enzo - * @date : 2023/12/6 - */ -@Slf4j -@Service -@RequiredArgsConstructor -public class PushClueServiceImpl extends ExtendServiceImpl implements PushClueService { - - - @Value("${snowflake.workerId}") - private int workerId; - - @Value("${snowflake.datacenterId}") - private int datacenterId; - - private final PushConfigService pushConfigService; - - private final SecurityProperties securityProperties; - - - @Override - public Boolean sendClueByUserId(Long clueId, Long assignedBy, String nid, String remark) { - log.info("============ the assigned id as {} ============", assignedBy); - PushConfigEntity entity = pushConfigService.queryConfigByUserId(assignedBy); - if (ObjectUtil.isNotNull(entity) && ObjectUtil.isNotNull(entity.getStatus()) && - entity.getStatus() == DefaultNumberConstants.ONE_NUMBER) { - SendClueResponse firstResponse = new SendClueResponse(); - String pushUrl = entity.getPushUrl(); - Gson gson = new GsonBuilder().disableHtmlEscaping().create(); - Long requestId = IdUtil.getSnowflake(workerId, datacenterId).nextId(); - String decrypt = AESUtils.decrypt(nid, securityProperties.getPasswordSecretKey()); - TripartiteDTO tripartiteDTO = - TripartiteDTO.builder().nid(Base64.encode(decrypt)).timestamp - (DateUtil.currentSeconds()).requestId(String.valueOf(requestId)).build(); - String sendInfo = gson.toJson(tripartiteDTO); - String result = HttpUtil.post(pushUrl, sendInfo); - log.info("============ the first response as {} ============", result); - - if (JSONUtil.isTypeJSON(result)) { - firstResponse = gson.fromJson(result, SendClueResponse.class); - } - // 插入请求 - saveSendInfo(assignedBy, clueId, requestId, sendInfo, DefaultNumberConstants.ONE_NUMBER, - ObjectUtil.isNotNull(firstResponse.getMessage()) ? firstResponse.getMessage() : CharSequenceUtil.EMPTY, firstResponse.getCode()); - if (ObjectUtil.isNotNull(firstResponse.getIsExist()) && - firstResponse.getIsExist().equals(Boolean.FALSE)) { - tripartiteDTO.setOtherInfo(Base64.encode(remark)); - SendClueResponse secondResponse = new SendClueResponse(); - tripartiteDTO.setRequestId(String.valueOf(requestId)); - tripartiteDTO.setTimestamp(DateUtil.currentSeconds()); - String json = gson.toJson(tripartiteDTO); - String post = HttpUtil.post(pushUrl, gson.toJson(tripartiteDTO)); - log.info("============ the second response as {} ============", result); - if (JSONUtil.isTypeJSON(result)) { - secondResponse = gson.fromJson(post, SendClueResponse.class); - } - // 插入二次请求 - saveSendInfo(assignedBy, clueId, requestId, json, DefaultNumberConstants.TWO_NUMBER, - ObjectUtil.isNotNull(secondResponse.getMessage()) ? - secondResponse.getMessage() : CharSequenceUtil.EMPTY, secondResponse.getCode()); - } - } - return Boolean.TRUE; - } - - @Override - public PageResult queryPage(PageParam pageParam, SendClueQo qo) { - return baseMapper.queryPage(pageParam, qo); - } - - private void saveSendInfo(Long assignedBy, Long clueId, Long requestId, String sendInfo, Integer num, String message, Integer code) { - PushClueInfoEntity clueInfo = new PushClueInfoEntity(); - clueInfo.setSendNum(num); - clueInfo.setClueId(clueId); - clueInfo.setPushResult(message); - clueInfo.setPushInfo(sendInfo); - clueInfo.setUserId(assignedBy); - clueInfo.setRequestId(String.valueOf(requestId)); - clueInfo.setPushStatus(code.equals(DefaultNumberConstants.TWO_HUNDRED) ? DefaultNumberConstants.ONE_NUMBER : DefaultNumberConstants.ZERO_NUMBER); - this.save(clueInfo); - } - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/impl/PushConfigServiceImpl.java b/admin/src/main/java/com/baiye/modules/distribute/service/impl/PushConfigServiceImpl.java deleted file mode 100644 index ed6ac5c..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/service/impl/PushConfigServiceImpl.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.baiye.modules.distribute.service.impl; - -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.ObjectUtil; -import com.baiye.constant.DefaultNumberConstants; -import com.baiye.extend.mybatis.plus.service.impl.ExtendServiceImpl; -import com.baiye.modules.distribute.entity.PushConfigEntity; -import com.baiye.modules.distribute.mapper.PlushConfigMapper; -import com.baiye.modules.distribute.service.PushConfigService; -import com.baiye.security.util.SecurityUtils; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * @author Enzo - * @date : 2023/12/6 - */ -@Slf4j -@Service -@RequiredArgsConstructor -public class PushConfigServiceImpl extends ExtendServiceImpl implements PushConfigService { - - - @Override - public Boolean addConfig(PushConfigEntity pushConfigEntity) { - Long currentUserId = SecurityUtils.getCurrentUserId(); - PushConfigEntity config = baseMapper.selectOne - (new LambdaQueryWrapper().eq(PushConfigEntity::getCreateBy, currentUserId)); - // 存在进行修改 - if (ObjectUtil.isNotNull(config)) { - pushConfigEntity.setId(config.getId()); - return this.updateById(pushConfigEntity); - } - return this.save(pushConfigEntity); - } - - @Override - public Boolean updateConfig(PushConfigEntity pushConfigEntity) { - return this.updateById(pushConfigEntity); - } - - @Override - public PushConfigEntity queryConfigByUserId(Long assignedBy) { - return baseMapper.selectOne - (new LambdaQueryWrapper().eq(PushConfigEntity::getUserId, assignedBy)); - } - - @Override - public PushConfigEntity queryByUserId(Long currentUserId) { - List selectList = baseMapper.selectList( - (new LambdaQueryWrapper().eq(PushConfigEntity::getUserId, currentUserId)).orderByDesc(PushConfigEntity::getId)); - return CollUtil.isNotEmpty(selectList) ? selectList.get(DefaultNumberConstants.ZERO_NUMBER) : new PushConfigEntity(); - } -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/impl/PushLinkServiceImpl.java b/admin/src/main/java/com/baiye/modules/distribute/service/impl/PushLinkServiceImpl.java deleted file mode 100644 index 95073e0..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/service/impl/PushLinkServiceImpl.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.baiye.modules.distribute.service.impl; - -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.ObjectUtil; -import com.baiye.constant.DefaultNumberConstants; -import com.baiye.core.annotation.CacheDel; -import com.baiye.core.annotation.Cached; -import com.baiye.domain.PageParam; -import com.baiye.domain.PageResult; -import com.baiye.exception.BadRequestException; -import com.baiye.extend.mybatis.plus.service.impl.ExtendServiceImpl; -import com.baiye.modules.distribute.converter.PushLinkConverter; -import com.baiye.modules.distribute.dto.OceanEngineTokenDto; -import com.baiye.modules.distribute.dto.PushLinkDTO; -import com.baiye.modules.distribute.entity.OceanEngineToken; -import com.baiye.modules.distribute.entity.PushLinkEntity; -import com.baiye.modules.distribute.mapper.PushLinkMapper; -import com.baiye.modules.distribute.qo.PushLinkQo; -import com.baiye.modules.distribute.service.OceanEngineService; -import com.baiye.modules.distribute.service.PushLinkService; -import com.baiye.modules.distribute.vo.PushLinkVO; -import com.baiye.properties.UrlsProperties; -import com.baiye.security.userdetails.User; -import com.baiye.security.util.SecurityUtils; -import com.baiye.util.AppUtils; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -@Service -@RequiredArgsConstructor -public class PushLinkServiceImpl extends ExtendServiceImpl implements PushLinkService { - - private final UrlsProperties urlsProperties; - - private final OceanEngineService oceanEngineService; - - @Override - public PageResult queryPage(PageParam pageParam, PushLinkQo qo) { - return baseMapper.queryPage(pageParam, qo); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public String add(PushLinkDTO pushLinkDTO) { - User user = SecurityUtils.getUser(); - Long currentUserId = user.getUserId(); - String name = pushLinkDTO.getName(); - Integer channelType = pushLinkDTO.getChannelType(); - String baseUrl = urlsProperties.getDbPushUrl(); - PushLinkEntity pushLinkEntity = PushLinkConverter.INSTANCE.dtoToPo(pushLinkDTO); - PushLinkEntity linkEntity = baseMapper.selectOne(new LambdaQueryWrapper() - .eq(PushLinkEntity::getName, name) - .eq(PushLinkEntity::getCreateBy, currentUserId)); - if (ObjectUtil.isNotNull(linkEntity)) throw new BadRequestException("渠道名称重复,请重新输入"); - - // 大坝推送接口参数拼接 - if (channelType == DefaultNumberConstants.ONE_NUMBER) { - String appKey = AppUtils.getAppId(); - while (true) { - PushLinkEntity entity = baseMapper.selectOne(new LambdaQueryWrapper().eq(PushLinkEntity::getAppKey, appKey)); - if (ObjectUtil.isNull(entity)) break; - appKey = AppUtils.getAppId(); - } - pushLinkEntity.setChannelType(DefaultNumberConstants.ONE_NUMBER); - baseUrl = baseUrl.concat(appKey).concat("?dataType=detail&encrypt=1"); - pushLinkEntity.setAppKey(appKey); - } else if (channelType == DefaultNumberConstants.ZERO_NUMBER) { - pushLinkEntity.setChannelType(DefaultNumberConstants.ZERO_NUMBER); - OceanEngineTokenDto tokenDto = new OceanEngineTokenDto(); - tokenDto.setUserId(currentUserId); - tokenDto.setCompanyId(user.getWhichUserId()); - tokenDto.setAuthorizeName(pushLinkDTO.getName()); - baseUrl = oceanEngineService.save(tokenDto); - } - - pushLinkEntity.setChannelUrl(baseUrl); - pushLinkEntity.setCompanyId(user.getWhichUserId()); - pushLinkEntity.setStatus(DefaultNumberConstants.ONE_NUMBER); - pushLinkEntity.setChannelIdentifying(pushLinkDTO.getChannelIdentifyingList()); - /*if (CollUtil.isNotEmpty(pushLinkDTO.getChannelIdentifyingList())) { - pushLinkEntity.setChannelIdentifying(JSONUtil.toJsonStr(pushLinkDTO.getChannelIdentifyingList())); - }*/ - baseMapper.insert(pushLinkEntity); - return baseUrl; - } - - @Override - @CacheDel(key = "pushLinkCache", keyJoint = "#p0.appKey") - @Transactional(rollbackFor = Exception.class) - public boolean update(PushLinkDTO pushLinkDTO) { - PushLinkEntity pushLinkEntity = PushLinkConverter.INSTANCE.dtoToPo(pushLinkDTO); - if (CollUtil.isNotEmpty(pushLinkDTO.getChannelIdentifyingList())){ - pushLinkEntity.setChannelIdentifying(pushLinkDTO.getChannelIdentifyingList()); - } - // 修改飞鱼状态 - if (ObjectUtil.isNotNull(pushLinkDTO.getChannelType()) - && pushLinkDTO.getChannelType() == DefaultNumberConstants.ONE_NUMBER) { - OceanEngineToken byUserId = oceanEngineService.findByUserId(pushLinkDTO.getCreateBy()); - if (ObjectUtil.isNotNull(byUserId) && !byUserId.getStatus().equals(pushLinkDTO.getStatus())){ - oceanEngineService.updateAuthorizationStatusByUserId(byUserId.getId(), pushLinkDTO.getCreateBy(), pushLinkDTO.getStatus()); - } - } - return SqlHelper.retBool(baseMapper.updateById(pushLinkEntity)); - } - - - - @Override - @Cached(key = "pushLinkCache", keyJoint = "#appKey") - public PushLinkEntity getByAppKey(String appKey) { - return baseMapper.selectByAppKey(appKey); - } - - @Override - public PushLinkEntity findByNameAndUserId(String authorizeName, Long userId) { - return baseMapper.selectByNameAndUserId(authorizeName, userId); - } - - @Override - public PushLinkVO pushDetail(Long id) { - return PushLinkConverter.INSTANCE.entityToVo(this.baseMapper.selectById(id)); - } -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/impl/StoreServiceImpl.java b/admin/src/main/java/com/baiye/modules/distribute/service/impl/StoreServiceImpl.java deleted file mode 100644 index 18730cd..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/service/impl/StoreServiceImpl.java +++ /dev/null @@ -1,224 +0,0 @@ -package com.baiye.modules.distribute.service.impl; - -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.date.DateUnit; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.io.IoUtil; -import cn.hutool.core.util.StrUtil; -import cn.hutool.poi.excel.ExcelUtil; -import cn.hutool.poi.excel.ExcelWriter; -import com.baiye.domain.PageParam; -import com.baiye.domain.PageResult; -import com.baiye.exception.BadRequestException; -import com.baiye.extend.mybatis.plus.service.impl.ExtendServiceImpl; -import com.baiye.modules.distribute.dto.StoreDTO; -import com.baiye.modules.distribute.entity.CustomStoreEntity; -import com.baiye.modules.distribute.entity.StoreEntity; -import com.baiye.modules.distribute.mapper.StoreMapper; -import com.baiye.modules.distribute.qo.StoreQo; -import com.baiye.modules.distribute.service.CustomStoreService; -import com.baiye.modules.distribute.service.StoreService; -import com.baiye.modules.distribute.service.StoreUserService; -import com.baiye.modules.distribute.vo.StoreDetailsExportVO; -import com.baiye.modules.distribute.vo.StoreVO; -import com.baiye.security.util.SecurityUtils; -import com.baiye.system.model.dto.SysUserNameRoleDTO; -import com.baiye.system.service.SysUserService; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -import javax.servlet.ServletOutputStream; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.util.*; -import java.util.stream.Collectors; - -/** - * @author wjt - * @date 2023/9/5 - */ -@Service -@RequiredArgsConstructor -@Slf4j -public class StoreServiceImpl extends ExtendServiceImpl implements StoreService { - - private final CustomStoreService customStoreService; - private final StoreUserService storeUserService; - private final SysUserService sysUserService; - - @Override - public PageResult queryStorePage(PageParam pageParam, StoreQo storeQo) { - storeQo.setCreateBy(SecurityUtils.getCurrentUserId()); - PageResult storeEntityPageResult = baseMapper.queryPage(pageParam, storeQo); - List records = storeEntityPageResult.getRecords(); - if (CollUtil.isNotEmpty(records)) { - List storeIds = records.stream().map(StoreVO::getId).collect(Collectors.toList()); - Map map = customStoreService.countReservationByStoreIds(storeIds); - - //获取门店关联的用户 - List userIds = records.stream().map(StoreVO::getUserId).filter(Objects::nonNull).collect(Collectors.toList()); - Map userInfo = new HashMap<>(8); - if (CollUtil.isNotEmpty(userIds)) { - List sysUserNameRoleS = sysUserService.listUserNameByUserIds(userIds); - userInfo = sysUserNameRoleS.stream().collect(Collectors.toMap(SysUserNameRoleDTO::getUserId, SysUserNameRoleDTO::getUserName)); - } - for (StoreVO vo : records) { - StringBuilder address = new StringBuilder(); - if (StrUtil.isNotBlank(vo.getProvince())) { - address.append(vo.getProvince()); - } - if (StrUtil.isNotBlank(vo.getCity())) { - address.append(vo.getCity()); - } - if (StrUtil.isNotBlank(vo.getCounty())) { - address.append(vo.getCounty()); - } - if (StrUtil.isNotBlank(vo.getDetail())) { - address.append(vo.getDetail()); - } - vo.setAddress(address.toString()); - String tradeTime = vo.getTradeStartTime() + - " - " + - vo.getTradeEndTime(); - vo.setTradeTime(tradeTime); - vo.setReservationNum(map.get(vo.getId())); - if (vo.getUserId() != null) { - vo.setUserName(userInfo.get(vo.getUserId())); - } - } - } - return storeEntityPageResult; - } - - @Override - public List queryStore(StoreQo qo) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - if (qo.getStoreName() != null) { - wrapper.like(StoreEntity::getStoreName, qo.getStoreName()); - } - if (qo.getRoleType() != null) { - wrapper.eq(StoreEntity::getCreateBy, qo.getRoleType() == 1 ? SecurityUtils.getCurrentUserId() : SecurityUtils.getWhichUserId()); - } - wrapper.eq(StoreEntity::getDeleted, 0); - wrapper.orderByDesc(StoreEntity::getCreateTime); - List storeEntities = baseMapper.selectList(wrapper); - return Convert.toList(StoreVO.class, storeEntities); - } - - @Override - public void addStore(StoreEntity storeEntity) { - //同一个公司门店名不能重复 - Long currentUserId = SecurityUtils.getCurrentUserId(); - StoreEntity storeEntity1 = baseMapper.selectOne(new LambdaQueryWrapper().eq(StoreEntity::getCreateBy, currentUserId).eq(StoreEntity::getStoreName, storeEntity.getStoreName())); - if (storeEntity1 != null) { - throw new BadRequestException("门店名称重复"); - } -// String tradeStartTime = StrUtil.subBefore(storeEntity.getTradeStartTime(), ":", true); -// String tradeEndTime = StrUtil.subBefore(storeEntity.getTradeEndTime(), ":", true); -// storeEntity.setTradeStartTime(tradeStartTime); -// storeEntity.setTradeEndTime(tradeEndTime); - baseMapper.insert(storeEntity); - if (storeEntity.getUserId() != null) { - storeUserService.insertStoreUser(storeEntity.getId(), storeEntity.getUserId()); - } - } - - @Override - public void updateStore(StoreEntity storeEntity) { - // StoreEntity storeEntityUpdate = new StoreEntity(); -// storeEntityUpdate.setId(storeEntity.getId()); -// if (storeEntity.getStoreName() != null) { -// storeEntityUpdate.setStoreName(storeEntity.getStoreName()); -// } -// if (storeEntity.getStoreType() != null) { -// storeEntityUpdate.setStoreType(storeEntity.getStoreType()); -// } -// if (storeEntity.getStoreStatus() != null) { -// storeEntityUpdate.setStoreStatus(storeEntity.getStoreStatus()); -// } -// //营业时间 -// if (storeEntity.getTradeStartTime() != null) { -// storeEntityUpdate.setTradeStartTime(storeEntity.getTradeStartTime()); -// } -// if (storeEntity.getTradeEndTime() != null) { -// storeEntityUpdate.setTradeEndTime(storeEntity.getTradeEndTime()); -// } -// storeService.updateStore(storeEntityUpdate); - baseMapper.updateById(storeEntity); - } - - @Override - public void deleteStore(Long storeId) { - baseMapper.deleteById(storeId); - } - - @Override - public List queryRangeStore(Double longitude, Double latitude, Double distance) { - List list = new ArrayList<>(); - //todo - Long userId = SecurityUtils.getWhichUserId(); - - List stores = baseMapper.queryRangeStore(longitude, latitude, distance, userId); - if (CollUtil.isNotEmpty(stores)) { - int index = 0; - for (StoreDTO store : stores) { - store.setIndex(index); - String s = store.getCounty() == null ? "" : store.getCounty(); - String s1 = store.getDetail() == null ? "" : store.getDetail(); - store.setAddress(s + s1); - index++; - list.add(store); - } - } - return list; - } - - @Override - public LinkedList> queryStoreReservation(String startTime, String endTime, Long storeId) { - Date start = DateUtil.beginOfDay(DateUtil.parseDate(startTime)); - Date end = DateUtil.endOfDay(DateUtil.parseDate(endTime)); - List customStoreEntities = customStoreService.selectListByStoreId(start, end, storeId); - LinkedList> list = new LinkedList<>(); - if (CollUtil.isNotEmpty(customStoreEntities)) { - HashMap map = new HashMap<>(8); - //按时间分组 - customStoreEntities.forEach(c -> { - String format = DateUtil.format(c.getReservationDate(), "yyyy-MM-dd"); - if (map.containsKey(format)) { - map.put(format, map.get(format) + 1); - } else { - map.put(format, 1); - } - }); - - int between = (int) DateUtil.between(start, end, DateUnit.DAY); - for (int i = 0; i <= between; i++) { - HashMap dataMap = new HashMap<>(2); - Date date = DateUtil.offsetDay(start, i); - dataMap.put("time", DateUtil.format(date, "yyyy-MM-dd")); - dataMap.put("num", map.getOrDefault(DateUtil.format(date, "yyyy-MM-dd"), 0)); - list.add(dataMap); - } - } - return list; - } - - @Override - public void exportStoreDetails(HttpServletResponse response, String startTime, String endTime, Long storeId) throws IOException { - Date start = DateUtil.beginOfDay(DateUtil.parseDate(startTime)); - Date end = DateUtil.endOfDay(DateUtil.parseDate(endTime)); - List storeDetailsExportList = customStoreService.selectStoreReservationDetails(start, end, storeId); - ExcelWriter writer = ExcelUtil.getWriter(); - - writer.write(storeDetailsExportList, true); - response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8"); - response.setHeader("Content-Disposition", "attachment;filename=export.xlsx"); - ServletOutputStream out = response.getOutputStream(); - writer.flush(out, true); - writer.close(); - IoUtil.close(out); - } -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/impl/StoreUserServiceImpl.java b/admin/src/main/java/com/baiye/modules/distribute/service/impl/StoreUserServiceImpl.java deleted file mode 100644 index c6d707e..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/service/impl/StoreUserServiceImpl.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.baiye.modules.distribute.service.impl; - -import cn.hutool.core.collection.CollUtil; -import com.baiye.extend.mybatis.plus.service.impl.ExtendServiceImpl; -import com.baiye.modules.distribute.dto.StoreUserDTO; -import com.baiye.modules.distribute.entity.StoreUserEntity; -import com.baiye.modules.distribute.mapper.StoreUserMapper; -import com.baiye.modules.distribute.service.StoreUserService; -import com.baiye.security.util.SecurityUtils; -import com.baiye.system.model.dto.SysUserNameRoleDTO; -import com.baiye.system.properties.BusinessProperties; -import com.baiye.system.service.SysUserService; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import lombok.AllArgsConstructor; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * @author wjt - * @date 2023/9/15 - */ -@Service -@AllArgsConstructor -public class StoreUserServiceImpl extends ExtendServiceImpl implements StoreUserService { - - private final SysUserService sysUserService; - - private final BusinessProperties businessProperties; - - @Override - public List listByRoleCode() { - - //todo 可以1对多,不去重 -// List list = new ArrayList<>(); -// if (sysUserNameRoleS != null) { -// //已经绑定的业务员 -// List storeUserEntities = baseMapper.selectList(new LambdaQueryWrapper().eq(StoreUserEntity::getCreateBy, SecurityUtils.getCurrentUserId())); -// list = sysUserNameRoleS.stream().filter(item -> !storeUserEntities.stream().map(StoreUserEntity::getUserId).collect(Collectors.toList()).contains(item.getUserId())).collect(Collectors.toList()); -// } - return sysUserService.listByRoleCodeAndUserId(businessProperties.getStoreCode(), SecurityUtils.getCurrentUserId()); - } - - @Override - public void insertStoreUser(Long storeId, Long userId) { - StoreUserEntity storeUserEntity = new StoreUserEntity(); - storeUserEntity.setStoreId(storeId); - storeUserEntity.setUserId(userId); - baseMapper.insert(storeUserEntity); - } - - @Override - public StoreUserDTO findUserIdByStoreId(Long storeId) { - return baseMapper.selectByStoreDTOByStoreId(storeId); - } - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/impl/TagServiceImpl.java b/admin/src/main/java/com/baiye/modules/distribute/service/impl/TagServiceImpl.java deleted file mode 100644 index 243dd21..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/service/impl/TagServiceImpl.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.baiye.modules.distribute.service.impl; - -import cn.hutool.core.util.ObjectUtil; -import com.baiye.extend.mybatis.plus.conditions.query.LambdaQueryWrapperX; -import com.baiye.extend.mybatis.plus.service.impl.ExtendServiceImpl; -import com.baiye.extend.mybatis.plus.toolkit.WrappersX; -import com.baiye.modules.distribute.entity.TagEntity; -import com.baiye.modules.distribute.mapper.TagMapper; -import com.baiye.modules.distribute.service.TagService; -import com.baiye.security.util.SecurityUtils; -import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; - -/** - * @author Enzo - * @date : 2023/12/6 - */ -@Slf4j -@Service -@RequiredArgsConstructor -public class TagServiceImpl extends ExtendServiceImpl implements TagService { - - @Override - @Transactional(rollbackFor = Exception.class) - public Boolean create(TagEntity entity) { - entity.setCreateBy(SecurityUtils.getCurrentUserId()); - return SqlHelper.retBool(this.baseMapper.insert(entity)); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public Boolean update(List list) { - return this.updateBatchById(list); - } - - @Override - public List selectList(Integer routeStatus, Boolean isSalesman) { - Long userId = SecurityUtils.getCurrentUserId(); - LambdaQueryWrapperX wrapperX = WrappersX.lambdaQueryX().eq - (TagEntity::getCreateBy, userId); - if (ObjectUtil.isNotNull(routeStatus)) { - wrapperX.eq(TagEntity::getRouteStatus, routeStatus); - } - return this.baseMapper.selectList(wrapperX.orderByDesc(TagEntity::getId)); - } - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/impl/TripartiteServiceImpl.java b/admin/src/main/java/com/baiye/modules/distribute/service/impl/TripartiteServiceImpl.java deleted file mode 100644 index 1f8839a..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/service/impl/TripartiteServiceImpl.java +++ /dev/null @@ -1,138 +0,0 @@ -package com.baiye.modules.distribute.service.impl; - -import cn.hutool.cache.CacheUtil; -import cn.hutool.core.codec.Base64; -import cn.hutool.core.text.CharSequenceUtil; -import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.ObjectUtil; -import com.baiye.constant.DefaultNumberConstants; -import com.baiye.enums.ClueSourceEnum; -import com.baiye.modules.distribute.dto.CallbackCustomDTO; -import com.baiye.modules.distribute.dto.ClueDTO; -import com.baiye.modules.distribute.dto.PushClueDTO; -import com.baiye.modules.distribute.entity.PushLinkEntity; -import com.baiye.modules.distribute.service.ClueService; -import com.baiye.modules.distribute.service.CustomService; -import com.baiye.modules.distribute.service.PushLinkService; -import com.baiye.modules.distribute.service.TripartiteService; -import com.baiye.notify.model.entity.Announcement; -import com.baiye.polling.QueueBalance; -import com.baiye.system.enums.RoleCodeEnum; -import com.baiye.system.model.entity.SysUser; -import com.baiye.system.model.entity.SysUserRolePromise; -import com.baiye.system.service.SysUserRolePromiseService; -import com.baiye.system.service.SysUserRoleService; -import com.baiye.system.service.SysUserService; -import com.baiye.util.AESUtils; -import com.baiye.util.DecryptPnoUtil; -import com.baiye.util.RedisUtils; -import com.google.common.collect.Lists; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.ballcat.security.properties.SecurityProperties; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Collections; -import java.util.List; -import java.util.concurrent.TimeUnit; - -/** - * @author Enzo - * @date : 2023/12/6 - */ -@Slf4j -@Service -@RequiredArgsConstructor -public class TripartiteServiceImpl implements TripartiteService { - - - @Value("${snowflake.workerId}") - private int workerId; - - @Value("${snowflake.datacenterId}") - private int datacenterId; - - private final RedisUtils redisUtils; - - private final ClueService clueService; - - private final CustomService customService; - - private final SysUserService sysUserService; - - private final PushLinkService pushLinkService; - - private final SecurityProperties securityProperties; - - private final SysUserRoleService sysUserRoleService; - - private final SysUserRolePromiseService sysUserRolePromiseService; - - - @Override - @Transactional(rollbackFor = Exception.class) - public Boolean callbackByAppKeyAndNid(String appKey, PushClueDTO dto) { - String recId = dto.getRecId(); - String called = dto.getCalled(); - String remark = dto.getRemark(); - String phone = CharSequenceUtil.EMPTY; - - String typeName = dto.getEmpClientTypeName(); - if (StringUtils.isNotBlank(dto.getMobile())) { - phone = Base64.decodeStr(dto.getMobile()); - } - // 格式校验 - if (StringUtils.isNotBlank(called) && StringUtils.isNotBlank(typeName) - && Announcement.TABLE_ALIAS.equalsIgnoreCase(typeName)) { - phone = called.length() > DefaultNumberConstants.ELEVEN_NUMBER - ? DecryptPnoUtil.decryptPno(called) : called; - } - - PushLinkEntity byAppKey = pushLinkService.getByAppKey(appKey); - if (StringUtils.isNotBlank(phone) && ObjectUtil.isNotNull(byAppKey)) { - // 所属哪个公司 - Long baseUserId = byAppKey.getCompanyId(); - // 录入员id - Long reportUserId = byAppKey.getCreateBy(); - // 已经存在的进行修改 - if (StringUtils.isNotBlank(recId) && ObjectUtil.isNotNull(redisUtils.get(recId))) { - return customService.updateByNid(phone, remark); - } - List channelIdentifying = byAppKey.getChannelIdentifying(); - // 查询所有分发员 - List userList = sysUserRoleService.selectUserIdByRoleCode - (baseUserId, RoleCodeEnum.ROLE_PRELIMINARY_EXAMINER.getRoleCode()); - QueueBalance balance = new QueueBalance<>(); - Long distributeId = balance.chooseOne(userList); - log.info("============ the distribute id {} this assigned id {} ============", userList, distributeId); - if (ObjectUtil.isNotNull(distributeId)) { - SysUserRolePromise promise = sysUserRolePromiseService.queryIsShowByUserId(distributeId); - if (ObjectUtil.isNotNull(promise) && ObjectUtil.isNotNull - (promise.getIsAutoAudits()) && promise.getIsAutoAudits().equals(Boolean.TRUE)) { - List list = Lists.newArrayList(); - // 雪花算法id - Long clueId = IdUtil.getSnowflake(workerId, datacenterId).nextId(); - ClueDTO clueDTO = ClueDTO.builder().originName(ClueSourceEnum.STORE_DISTRIBUTION.getDescription()).clueId(clueId).remark - (remark).nid(AESUtils.encrypt(phone, securityProperties.getPasswordSecretKey())).assignedBy - (reportUserId).createBy(distributeId).isNewClue(Boolean.TRUE).build(); - list.add(clueDTO); - clueService.saveClueListByStoreInfo(list); - } - SysUser byId = sysUserService.findById(reportUserId); - CallbackCustomDTO customDTO = CallbackCustomDTO.builder().channelType(DefaultNumberConstants.FOUR_NUMBER).customNid(phone).channelName(byAppKey.getName()). - distributeId(distributeId).sex(DefaultNumberConstants.MINUS_ONE_NUMBER).identifying(channelIdentifying).reportUserId(reportUserId).remark(remark).companyId - (byId.getWhichUserId()).enterName(byId.getUsername()).build(); - if (StringUtils.isNotBlank(recId)) { - // 缓存三天 - redisUtils.set(recId, phone, DefaultNumberConstants.THREE_NUMBER, TimeUnit.DAYS); - } - // 插入资源表 - return customService.createByCallBack(Collections.singletonList(customDTO)); - } - } - return Boolean.TRUE; - } -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/vo/AddressDTO.java b/admin/src/main/java/com/baiye/modules/distribute/vo/AddressDTO.java deleted file mode 100644 index 5dae132..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/vo/AddressDTO.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.baiye.modules.distribute.vo; - -import com.google.gson.annotations.SerializedName; -import lombok.Data; - -/** - * @author Enzo - * @date : 2023/9/12 - */ -@Data -public class AddressDTO { - - @SerializedName("客户名称") - private String customerName; - - - @SerializedName("省份") - private String economize; - - @SerializedName("城市") - private String market; - - @SerializedName("区域") - private String distinguish; - - @SerializedName("详细地址") - private String detailAddress; - - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/vo/ChannelAssignedClueExportVo.java b/admin/src/main/java/com/baiye/modules/distribute/vo/ChannelAssignedClueExportVo.java deleted file mode 100644 index 234c766..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/vo/ChannelAssignedClueExportVo.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.baiye.modules.distribute.vo; - -import cn.hutool.core.annotation.Alias; -import lombok.Data; - -/** - * @author wjt - * @date 2023/12/7 - */ -@Data -public class ChannelAssignedClueExportVo { - - @Alias(value = "渠道") - private String channelType; - @Alias(value = "分配人") - private String assignedBy; - @Alias(value = "日期") - private String date; - @Alias(value = "录入量") - private Integer num; -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/vo/ChannelEnterClueExportVO.java b/admin/src/main/java/com/baiye/modules/distribute/vo/ChannelEnterClueExportVO.java deleted file mode 100644 index 2c4e610..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/vo/ChannelEnterClueExportVO.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.baiye.modules.distribute.vo; - -import cn.hutool.core.annotation.Alias; -import lombok.Data; - -/** - * @author wjt - * @date 2023/12/7 - */ -@Data -public class ChannelEnterClueExportVO { - @Alias(value = "渠道") - private String channelType; - @Alias(value = "录入员") - private String enterBy; - @Alias(value = "日期") - private String date; - @Alias(value = "录入量") - private Integer num; -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/vo/ClueRecordVO.java b/admin/src/main/java/com/baiye/modules/distribute/vo/ClueRecordVO.java deleted file mode 100644 index 9a1bcd9..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/vo/ClueRecordVO.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.baiye.modules.distribute.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.io.Serializable; -import java.time.LocalDateTime; - -/** - * @Author YQY - * @Date 2023/8/2 - */ -@Data -@Schema(title = "导入文件记录VO") -public class ClueRecordVO implements Serializable { - - private static final long serialVersionUID = 1L; - - @Schema(title = "线索上传文件记录ID") - private Long clueRecordId; - - @Schema(title = "上传状态 0:上传中 1:上传失败 2:上传成功") - private Integer status; - - @Schema(title = "任务id") - private Long taskId; - - @Schema(title = "上传文件名") - private String oldFileName; - - @Schema(title = "存入路径") - private String url; - - @Schema(title = "备注") - private String remark; - - @Schema(title = "成功条数") - private Integer successNum; - - @Schema(title = "失败条数") - private Integer failNum; - - @Schema(title = "渠道类型") - private String channelType; - - @Schema(title = "分配状态: 0:未分配 1:已分配") - private Integer allocationStatus; - - @Schema(title = "分发状态 0:未分发 1:已分发") - private Integer distributeStatus; - - @Schema(title = "记录类型 0:文件上传 1:资源推送") - private Integer recordType; - - @Schema(title = "渠道标识") - private String channelIdentifying; - - @Schema(title = "创建时间") - private LocalDateTime createTime; - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/vo/ClueVO.java b/admin/src/main/java/com/baiye/modules/distribute/vo/ClueVO.java deleted file mode 100644 index 8beb62f..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/vo/ClueVO.java +++ /dev/null @@ -1,116 +0,0 @@ -package com.baiye.modules.distribute.vo; - -import com.alibaba.excel.annotation.ExcelIgnore; -import com.alibaba.excel.annotation.ExcelProperty; -import com.baiye.common.excel.converters.*; -import com.baiye.modules.distribute.entity.ClueStageEntity; -import com.baiye.modules.distribute.entity.LabelOrganizeEntity; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.time.LocalDateTime; -import java.util.List; - -@Data -public class ClueVO { - - @ExcelIgnore - @Schema(title = "线索ID") - private String clueId; - - @ExcelIgnore - // @ExcelProperty(value = "是否有效", converter = BooleanStringConverter.class, index = 7) - @Schema(title = "是否有效") - private Boolean isEffective; - - - @Schema(title = "手机号") - @ExcelProperty(value = "手机号", converter = NidStringConverter.class, index = 0) - private String nid; - - - @Schema(title = "线索来源") - @ExcelProperty(value = "线索来源名称", index = 1) - private String originName; - - - @Schema(title = "线索备注") - @ExcelProperty(value = "线索备注", index = 2) - private String remark; - - @ExcelIgnore - @Schema(title = "记录ID") - private Long clueRecordId; - - @Schema(title = "其它资源字段") - @ExcelIgnore - // @ExcelProperty(value = "其它资源字段", index = 4) - private String otherClue; - - @ExcelIgnore - @Schema(title = "分配人用户ID") - private Long assignedBy; - - @ExcelIgnore - @Schema(title = "线索时间") - private String clueTime; - - @Schema(title = "资源标签") - @ExcelProperty(value = "资源标签", index = 6) - private String clueLabel; - - @ExcelIgnore - @Schema(title = "资源标签名称") - private String clueLabelName; - - - @Schema(title = "创建时间") - @ExcelProperty(value = "线索时间", converter = LocalDateTimeConverter.class, index = 5) - private LocalDateTime createTime; - - @ExcelIgnore - @Schema(title = "分配人用户名") - private String assignedName; - - @ExcelIgnore - @Schema(title = "资源线索ID") - private Long clueStageId; - - @ExcelIgnore - @Schema(title = "资源线索名称") - private String clueStageName; - - @ExcelProperty(value = "资源标签集合", converter = CustomStringStringConverter.class, index = 7) - @Schema(title = "资源标签集合") - private List clueLabelList; - - @ExcelIgnore - @Schema(title = "资源线索ID") - private Boolean isNewClue; - - @ExcelIgnore - @Schema(title = "标签组-标签信息") - List organizeEntities; - - @ExcelIgnore - @Schema(title = "阶段信息") - List clueStageEntities; - - @ExcelProperty(value = "性别", converter = SexConverter.class, index = 4) - @Schema(title = "性别(0-男，1-女)") - private Integer sex; - - @Schema(title = "客户资料") - @ExcelProperty(value = "客户资料", index = 3) - private String customInformation; - - @ExcelIgnore - @Schema(title = "渠道标识") - private List channelIdentifying; - - @ExcelIgnore - // @ExcelProperty(value = "线索来源渠道", converter = ChannelConverter.class, index = 7) - @Schema(title = "渠道类型渠道类型(1 手动创建 2文件上传 3飞鱼回传 4话单回传 5 api回传)") - private Integer channelType; - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/vo/CustomStoreVO.java b/admin/src/main/java/com/baiye/modules/distribute/vo/CustomStoreVO.java deleted file mode 100644 index 8371581..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/vo/CustomStoreVO.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.baiye.modules.distribute.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.time.LocalDateTime; - -@Data -public class CustomStoreVO { - - @Schema(title = "ID") - private Long customStoreId; - - @Schema(title = "门店ID") - private Long storeId; - - @Schema(title = "客户ID") - private Long customId; - - @Schema(title = "门店名称") - private String storeName; - - @Schema(title = "预约日期") - private LocalDateTime reservationDate; - - @Schema(title = "预约时间") - private String reservationTime; - - @Schema(description = "营业开始时间") - private String tradeStartTime; - - @Schema(description = "营业结束时间") - private String tradeEndTime; -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/vo/CustomVO.java b/admin/src/main/java/com/baiye/modules/distribute/vo/CustomVO.java deleted file mode 100644 index 6e9fbf0..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/vo/CustomVO.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.baiye.modules.distribute.vo; - -import cn.hutool.core.date.DatePattern; -import com.alibaba.excel.annotation.ExcelIgnore; -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.time.LocalDateTime; -import java.util.Date; -import java.util.List; - -@Data -public class CustomVO { - - @Schema(description = "编号") - private String batchNo; - - @Schema(title = "ID") - @ExcelIgnore - private Long customId; - - @Schema(title = "客户名称") - private String customName; - - @Schema(title = "客户联系方式") - private String customNid; - - @Schema(title = "省") - private String economize; - - @Schema(title = "市") - private String market; - - @Schema(title = "区") - private String distinguish; - - @Schema(title = "详细地址") - private String detailAddress; - - @ExcelIgnore - @Schema(title = "其它地址信息-定位使用") - private String otherAddressesInfo; - - @Schema(title = "半径") - private String radius; - - @Schema(title = "录入时间") - private String enterName; - - @Schema(title = "报名状态 0:待提交 1:已报名 2 审核通过") - private Integer enrollStatus; - - @Schema(title = "创建时间") - private LocalDateTime createTime; - - @Schema(description = "分发时间") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DatePattern.NORM_DATETIME_PATTERN, timezone = "GMT+8") - private Date distributeTime; - - @Schema(title = "门店信息") - @ExcelIgnore - private List customStoreVOList; - - @Schema(description = "审核类型 1初审 2复审") - private Integer type; - - @ExcelIgnore - @Schema(description = "公司id") - private Long companyId; - - @Schema(title = "备注") - private String remark; - - @Schema(title = "客户类型 0:地理 1:基本") - private Integer customType; - - @Schema(title = "渠道类型渠道类型(1 手动创建 2文件上传 3飞鱼回传 4话单回传 5 api回传)") - private Integer channelType; - - @Schema(title = "性别(0-男，1-女)") - private Integer sex; - - @Schema(title = "客户资料") - private String customInformation; - - @Schema(title = "业务员ID集合") - private List salesmanUserId; - - @Schema(title = "业务员用户名") - private List userNameList; -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/vo/DirectClueVO.java b/admin/src/main/java/com/baiye/modules/distribute/vo/DirectClueVO.java deleted file mode 100644 index aa2f0e5..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/vo/DirectClueVO.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.baiye.modules.distribute.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.time.LocalDateTime; -import java.util.List; - -@Data -public class DirectClueVO { - - @Schema(title = "直达线索ID") - private Long directClueId; - - @Schema(title = "编号") - private String batchNo; - - @Schema(title = "客户名称") - private String customName; - - @Schema(title = "nid") - private String nid; - - @Schema(title = "来源 0:巨量") - private Integer originType; - - @Schema(title = "有效状态 0:有效 1:无效") - private Integer effectiveStatus; - - @Schema(title = "资源标签") - private String clueLabelName; - - @Schema(title = "分发状态 0:未分发 1:已分发") - private Integer distributeType; - - @Schema(title = "分发日期") - private LocalDateTime distributeDate; - - @Schema(title = "资源分发的分发员用户ID") - private Long distributeUserId; - - @Schema(title = "其它线索信息") - private String otherClue; - - @Schema(title = "创建时间") - private LocalDateTime createTime; - - @Schema(title = "标签") - private List clueLabel; - - @Schema(title = "线索接收人用户名") - private List userNameList; - - @Schema(title = "其它线索") - private Object otherClueObj; -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/vo/DistributeTaskVO.java b/admin/src/main/java/com/baiye/modules/distribute/vo/DistributeTaskVO.java deleted file mode 100644 index b826a6a..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/vo/DistributeTaskVO.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.baiye.modules.distribute.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.time.LocalDateTime; -import java.util.List; -import java.util.Map; - -/** - * @Author YQY - * @Date 2023/8/11 - */ -@Data -@Schema(title = "分发任务VO") -public class DistributeTaskVO { - - @Schema(title = "分发任务ID") - private Long distributeTaskId; - - @Schema(title = "分发类型 0:手动分发 1:自动分发") - private Integer distributeTaskType; - - @Schema(title = "任务名称") - private String taskName; - - @Schema(title = "分发规则 0:平均 1:权重") - private Integer ruleStatus; - - @Schema(title = "分发时间 0:实时 1:定时") - private Integer timeStatus; - - @Schema(title = "定时开始时间") - private LocalDateTime startTime; - - @Schema(title = "文件规则前缀") - private String fileRulePrefix; - - @Schema(title = "上传文件记录ID “,”相隔") - private String fileRecordId; - - @Schema(title = "执行状态 0:未执行 1:执行中 2:已执行") - private Integer executeStatus; - - @Schema(title = "创建者") - private Long createBy; - - @Schema(title = "创建时间") - private LocalDateTime createTime; - - @Schema(title = "用户信息") - private List> userList; - - @Schema(title = "文件记录信息") - private List> recordList; - - @Schema(title = "任务默认类型 0:默认 1:非默认") - private Integer defaultType; - - @Schema(title = "任务执行次数") - private Integer executeNum; - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/vo/FileContrastRecordVO.java b/admin/src/main/java/com/baiye/modules/distribute/vo/FileContrastRecordVO.java deleted file mode 100644 index 0db9d42..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/vo/FileContrastRecordVO.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.baiye.modules.distribute.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.time.LocalDateTime; - - -/** - * @author Enzo - * @date 2023-11-6 - */ -@Data -public class FileContrastRecordVO { - - - @Schema(title = "任务id") - private Long taskId; - - @Schema(title = "对比状态") - private Integer status; - - @Schema(title = "文件地址") - private String filePath; - - @Schema(title = "下载地址") - private String downPath; - - @Schema(title = "创建时间") - private LocalDateTime createTime; - - @Schema(title = "修改时间") - private LocalDateTime updateTime; -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/vo/FileContrastVO.java b/admin/src/main/java/com/baiye/modules/distribute/vo/FileContrastVO.java deleted file mode 100644 index b68b3ba..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/vo/FileContrastVO.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.baiye.modules.distribute.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.time.LocalDateTime; - - -/** - * @author Enzo - * @date 2023-11-6 - */ -@Data -public class FileContrastVO { - - @Schema(title = "ID") - private Long id; - - @Schema(title = "任务名称") - private String taskName; - - @Schema(title = "对比数量") - private Integer contrastNum; - - @Schema(title = "创建时间") - private LocalDateTime createTime; - - @Schema(title = "修改时间") - private LocalDateTime updateTime; -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/vo/LabelOrganizeVO.java b/admin/src/main/java/com/baiye/modules/distribute/vo/LabelOrganizeVO.java deleted file mode 100644 index 9e3ee97..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/vo/LabelOrganizeVO.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.baiye.modules.distribute.vo; - -import com.baiye.modules.distribute.entity.LabelEntity; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.io.Serializable; -import java.time.LocalDateTime; -import java.util.List; - -/** - * @Author YQY - * @Date 2023/8/8 - */ -@Data -@Schema(title = "标签组VO") -public class LabelOrganizeVO implements Serializable { - - private static final long serialVersionUID = 1L; - - @Schema(title = "ID") - private Long id; - - @Schema(title = "标签组名称") - private String name; - - @Schema(title = "是否启用标签组 0:不启用 1:启用") - private Integer isEnable; - - @Schema(title = "创建时间") - private LocalDateTime createTime; - - @Schema(title = "标签") - private List labelList; - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/vo/OceanEnginVO.java b/admin/src/main/java/com/baiye/modules/distribute/vo/OceanEnginVO.java deleted file mode 100644 index 36abfd5..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/vo/OceanEnginVO.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.baiye.modules.distribute.vo; - -import com.baiye.extend.mybatis.plus.converter.JsonStringArrayTypeHandler; -import com.baomidou.mybatisplus.annotation.TableField; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.util.Date; -import java.util.List; - - -/** - * @author Enzo - * @date 2023-11-6 - */ -@Data -public class OceanEnginVO { - @Schema(title = "id") - private Long id; - - @Schema(name = "status") - private Integer status; - - - @Schema(name = "user_id") - private Long userId; - - @Schema(name = "authorize_name") - private String authorizeName; - - @Schema(name = "company_id") - private Long companyId; - - @Schema(name = "access_token") - private String accessToken; - - @Schema(name = "refresh_token") - private String refreshToken; - - @TableField(typeHandler = JsonStringArrayTypeHandler.class) - @Schema(name = "advertiser_ids") - private List advertiserIds; - - @Schema(name = "expires_in") - private Long expiresIn; - - @Schema(name = "refresh_token_expires_in") - private Long refreshTokenExpiresIn; - - @Schema(name = "authorize_time") - private Date authorizeTime; -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/vo/PushClueInfoVo.java b/admin/src/main/java/com/baiye/modules/distribute/vo/PushClueInfoVo.java deleted file mode 100644 index c72b1ee..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/vo/PushClueInfoVo.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.baiye.modules.distribute.vo; - -import com.baiye.entity.BaseEntity; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Getter; -import lombok.Setter; -import lombok.ToString; - -/** - * @author Enzo - * @date : 2024/3/1 - */ - -@Getter -@Setter -@ToString -@Schema(title = "推送线索表") -public class PushClueInfoVo extends BaseEntity { - - private static final long serialVersionUID = 1087915923814826863L; - - @Schema(title = "用户id") - private Long userId; - - @Schema(title = "线索id") - private Long clueId; - - @Schema(title = "请求id") - private String requestId; - - @Schema(title = "推送内容") - private String pushInfo; - - @Schema(title = "推送状态") - private Integer pushStatus; - - @Schema(title = "第几次推送") - private Integer sendNum; -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/vo/PushLinkVO.java b/admin/src/main/java/com/baiye/modules/distribute/vo/PushLinkVO.java deleted file mode 100644 index aa83681..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/vo/PushLinkVO.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.baiye.modules.distribute.vo; - -import com.baiye.extend.mybatis.plus.converter.JsonStringArrayTypeHandler; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.time.LocalDateTime; -import java.util.List; - -@Data - -public class PushLinkVO { - - @TableId - @Schema(title = "ID") - private Long id; - - @Schema(title = "业务名") - private String name; - - @Schema(title = "渠道标识集合") - @TableField(value = "channel_identifying", typeHandler = JsonStringArrayTypeHandler.class) - private List channelIdentifying; - - // @Schema(title = "渠道标识") - // private String channelIdentifying; - - @Schema(title = "渠道链接") - private String channelUrl; - - @Schema(title = "渠道类型(0-大坝，1-飞鱼，2-第三方)") - private Integer channelType; - - @Schema(title = "状态(1-启用接收,0-拒绝接收)") - private Integer status; - - @Schema(title = "渠道类型(0 巨量 1 百度)") - private Integer authType; - - @Schema(title = "创建者") - private Long createBy; - - @Schema(title = "创建时间") - private LocalDateTime createTime; -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/vo/ReportFlowVO.java b/admin/src/main/java/com/baiye/modules/distribute/vo/ReportFlowVO.java deleted file mode 100644 index 58eddd0..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/vo/ReportFlowVO.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.baiye.modules.distribute.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -/** - * @author wjt - * @date 2023/8/2 - */ -@Data -@Schema(title = "标签组VO") -public class ReportFlowVO { - - @Schema(title = "公司名/渠道/日期") - private String name; - - @Schema(title = "总量") - private Integer totalNum; - - @Schema(title = "占比") - private Double ratio; - - @Schema(title = "日环比") - private Double ratioDay; - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/vo/StoreDetailsExportVO.java b/admin/src/main/java/com/baiye/modules/distribute/vo/StoreDetailsExportVO.java deleted file mode 100644 index 7df08a4..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/vo/StoreDetailsExportVO.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.baiye.modules.distribute.vo; - -import cn.hutool.core.annotation.Alias; -import lombok.Data; - -/** - * @author wjt - * @date 2023/9/20 - */ -@Data -public class StoreDetailsExportVO { - @Alias(value = "预约日期") - private String reservationDate; - @Alias(value = "预约时间") - private String reservationTime; - @Alias(value = "客户名称") - private String customName; - @Alias(value = "联系方式") - private String customNid; - @Alias(value = "住址") - private String detailAddress; -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/vo/StoreVO.java b/admin/src/main/java/com/baiye/modules/distribute/vo/StoreVO.java deleted file mode 100644 index 3f30827..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/vo/StoreVO.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.baiye.modules.distribute.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.math.BigDecimal; -import java.time.LocalDateTime; - - -/** - * @author wjt - * @date 2023/9/6 - */ -@Data -public class StoreVO { - @Schema(description = "ID") - private Long id; - - @Schema(description = "门店名称") - private String storeName; - - @Schema(description = "门店类型 0-直营店 1-加盟店") - private Integer storeType; - - @Schema(description = "门店状态 0-正常 1-未营业") - private Integer storeStatus; - - @Schema(description = "省份") - private String province; - - @Schema(description = "城市") - private String city; - - @Schema(description = "区县") - private String county; - - @Schema(description = "详情") - private String detail; - - @Schema(description = "营业开始时间") - private String tradeStartTime; - - @Schema(description = "营业结束时间") - private String tradeEndTime; - - @Schema(description = "预约数") - private Integer reservationNum; - - @Schema(description = "门店地址") - private String address; - - @Schema(description = "营业时间") - private String tradeTime; - - @Schema(description = "经度") - private BigDecimal longitude; - - @Schema(description = "玮度") - private BigDecimal latitude; - - @Schema(description = "创建时间") - private LocalDateTime createTime; - - @Schema(description = "联系方式") - private String nid; - - @Schema(description = "关联的用户id") - private Long userId; - @Schema(description = "关联的用户名称") - private String userName; -} diff --git a/admin/src/main/java/com/baiye/properties/OceanEngineConfig.java b/admin/src/main/java/com/baiye/properties/OceanEngineConfig.java deleted file mode 100644 index b09e8a5..0000000 --- a/admin/src/main/java/com/baiye/properties/OceanEngineConfig.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.baiye.properties; - -import lombok.Data; -import lombok.experimental.Accessors; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.context.annotation.Configuration; - -/** - * @author Enzo - */ -@Data -@Configuration -@Accessors(chain = true) -@ConfigurationProperties(prefix = "ocean.engine") -public class OceanEngineConfig { - private String appId; - private String appSecret; - private String redirectUrl; - private String welcomeUrl; -} diff --git a/admin/src/main/java/com/baiye/properties/UrlsProperties.java b/admin/src/main/java/com/baiye/properties/UrlsProperties.java deleted file mode 100644 index 39e0651..0000000 --- a/admin/src/main/java/com/baiye/properties/UrlsProperties.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.baiye.properties; - -import lombok.Getter; -import lombok.Setter; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.context.annotation.Configuration; - -@Getter -@Setter -@Configuration -@ConfigurationProperties(prefix = "urls") -public class UrlsProperties { - - /** - * 大坝推送链接地址 - */ - private String dbPushUrl; - -} diff --git a/admin/src/main/java/com/baiye/task/DistributeTaskSyncServiceImpl.java b/admin/src/main/java/com/baiye/task/DistributeTaskSyncServiceImpl.java deleted file mode 100644 index d2c796d..0000000 --- a/admin/src/main/java/com/baiye/task/DistributeTaskSyncServiceImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.baiye.task; - -import cn.hutool.core.collection.CollUtil; -import com.baiye.modules.distribute.entity.DistributeTaskEntity; -import com.baiye.modules.distribute.mapper.DistributeTaskMapper; -import com.baiye.modules.distribute.service.DistributeTaskService; -import com.baiye.task.service.DistributeTaskSyncService; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -import java.util.List; - -@Component -@RequiredArgsConstructor -@Slf4j -public class DistributeTaskSyncServiceImpl implements DistributeTaskSyncService { - - private final DistributeTaskMapper distributeTaskMapper; - - @Override - public void executeTask(List userIdList, DistributeTaskService distributeTaskService) { - List taskEntities = distributeTaskMapper - .selectList(new LambdaQueryWrapper().eq(DistributeTaskEntity::getDefaultType, 0) - .in(DistributeTaskEntity::getCreateBy, userIdList)); - if (CollUtil.isNotEmpty(taskEntities)) { - for (DistributeTaskEntity distributeTaskEntity : taskEntities) { - Integer executeStatus = distributeTaskEntity.getExecuteStatus(); - Integer distributeTaskType = distributeTaskEntity.getDistributeTaskType(); - Integer timeStatus = distributeTaskEntity.getTimeStatus(); - if ((distributeTaskType == 1 && timeStatus == 0) && executeStatus != 0 && executeStatus != 3) { - distributeTaskService.execute(distributeTaskEntity); - } - } - } - } -} diff --git a/admin/src/main/java/com/baiye/task/FileContrastTask.java b/admin/src/main/java/com/baiye/task/FileContrastTask.java deleted file mode 100644 index 07b4a06..0000000 --- a/admin/src/main/java/com/baiye/task/FileContrastTask.java +++ /dev/null @@ -1,120 +0,0 @@ -package com.baiye.task; - -import cn.hutool.core.convert.Convert; -import cn.hutool.core.date.DatePattern; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.io.FileUtil; -import cn.hutool.core.text.StrPool; -import cn.hutool.core.text.csv.CsvUtil; -import cn.hutool.core.text.csv.CsvWriter; -import cn.hutool.core.util.CharsetUtil; -import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.ObjectUtil; -import com.baiye.constant.DefaultNumberConstants; -import com.baiye.constant.FileConstant; -import com.baiye.modules.distribute.dto.ContrastDTO; -import com.baiye.modules.distribute.entity.FileContrastEntity; -import com.baiye.modules.distribute.entity.FileContrastRecordEntity; -import com.baiye.modules.distribute.entity.FileContrastSourceEntity; -import com.baiye.modules.distribute.mapper.FileContrastMapper; -import com.baiye.modules.distribute.service.FileContrastRecordService; -import com.baiye.modules.distribute.service.FileContrastSourceService; -import com.baiye.system.properties.FileProperties; -import com.baiye.util.AESUtils; -import com.baiye.util.CompressUtil; -import com.google.common.collect.Lists; -import com.google.common.collect.Sets; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.ballcat.security.properties.SecurityProperties; -import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Component; -import org.springframework.transaction.annotation.Transactional; - -import java.util.ArrayList; -import java.util.List; -import java.util.Set; -import java.util.stream.Collectors; - -/** - * @author Enzo - * @date : 2024/1/4 - */ - -@Slf4j -@Component -@RequiredArgsConstructor -public class FileContrastTask { - - - private final FileProperties properties; - - private final SecurityProperties securityProperties; - - private final FileContrastMapper fileContrastMapper; - - private final FileContrastSourceService fileContrastSourceService; - - private final FileContrastRecordService fileContrastRecordService; - - - @Async - @Transactional(rollbackFor = Exception.class) - public void doRunTask(List contrastDTOList, FileContrastEntity entity, FileContrastRecordEntity fileContrastRecord) { - - log.info("================== run task begin time {} ==================", DateUtil.now()); - String uuid = IdUtil.fastSimpleUUID(); - String format = DateUtil.format(DateUtil.date(), DatePattern.NORM_DATE_PATTERN); - // 上传id - Set uploadSet = contrastDTOList.stream().map - (ContrastDTO::getNid).collect(Collectors.toSet()); - // 查询数据 - List querySet = fileContrastSourceService.queryByTaskId(entity.getId()); - Set selectSet = querySet.stream().map - (vo -> AESUtils.decrypt(vo.getNid(), - securityProperties.getPasswordSecretKey())).collect(Collectors.toSet()); - // 交集 - Set strings = Sets.newHashSet(Sets.intersection(selectSet, uploadSet)); - - List insertList = Lists.newArrayList(); - for (ContrastDTO dto : contrastDTOList) { - if (strings.contains(dto.getNid())) { - dto.setIsRepeat("是"); - } else { - dto.setIsRepeat("否"); - insertList.add(dto); - } - } - // 保存文件 - String fileName = properties.getPath().getPath(). - concat(format).concat(properties.getPath().getSystemSeparator()); - String csvPath = fileName.concat(uuid).concat(StrPool.DOT).concat(FileConstant.CSV_FILE_SUB_NAME); - CsvWriter writer = CsvUtil.getWriter(csvPath, CharsetUtil.CHARSET_UTF_8); - String zipPath = fileName.concat(uuid).concat(FileConstant.ZIP_FILE_SUB_NAME); - writer.writeHeaderLine("号码", "备注", "是否重复"); - for (ContrastDTO dto : contrastDTOList) { - writer.writeLine(dto.getNid(), dto.getRemark(), dto.getIsRepeat()); - } - writer.close(); - // 设置压缩文件 - CompressUtil.decryptionCompression(zipPath, csvPath, null); - String filePath = zipPath.substring - (zipPath.lastIndexOf(StrPool.SLASH) + DefaultNumberConstants.ONE_NUMBER); - FileUtil.del(csvPath); - String downPath = properties.getDownUrl().concat - (format).concat(properties.getPath().getSystemSeparator()).concat(filePath); - // 保存记录 - List sourceEntityList = Convert.toList(FileContrastSourceEntity.class, insertList); - sourceEntityList.forEach(dto -> dto.setTaskId(entity.getId())); - fileContrastSourceService.saveBatch(sourceEntityList); - // 修改数量 - entity.setContrastNum(ObjectUtil.isNotNull(entity.getContrastNum()) - ? entity.getContrastNum() + contrastDTOList.size() : contrastDTOList.size()); - fileContrastMapper.updateById(entity); - // 修改记录 - fileContrastRecord.setDownPath(downPath); - fileContrastRecord.setStatus(DefaultNumberConstants.ONE_NUMBER); - fileContrastRecordService.updateById(fileContrastRecord); - log.info("================== run task end time {} ==================", DateUtil.now()); - } -} diff --git a/admin/src/main/java/com/baiye/task/RefreshTokenTask.java b/admin/src/main/java/com/baiye/task/RefreshTokenTask.java deleted file mode 100644 index 1801dfc..0000000 --- a/admin/src/main/java/com/baiye/task/RefreshTokenTask.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.baiye.task; - -import cn.hutool.core.collection.CollUtil; -import cn.hutool.http.HttpUtil; -import cn.hutool.json.JSONUtil; -import com.baiye.constant.DefaultNumberConstants; -import com.baiye.constant.ResponseConstant; -import com.baiye.constant.UrlConstant; -import com.baiye.modules.auth.RefreshTokenRequest; -import com.baiye.modules.auth.RefreshTokenResponse; -import com.baiye.modules.distribute.entity.OceanEngineToken; -import com.baiye.modules.distribute.service.OceanEngineService; -import com.baiye.properties.OceanEngineConfig; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.springframework.context.annotation.Configuration; -import org.springframework.scheduling.annotation.Scheduled; -import org.springframework.stereotype.Component; - -import java.util.List; - -/** - * @author Enzo - * @date : 2022/9/14 - */ -@Slf4j -@Component -@RequiredArgsConstructor -public class RefreshTokenTask { - - private final OceanEngineConfig oceanEngineConfig; - - private final OceanEngineService oceanEngineService; - - /** - * 定时刷新token - */ - @Scheduled(cron = "0 30 * * * ?") - public void updateAccountMassNum() { - List engineTokens - = oceanEngineService.findByStatus(DefaultNumberConstants.ONE_NUMBER); - if (CollUtil.isNotEmpty(engineTokens)) { - for (OceanEngineToken engineToken : engineTokens) { - RefreshTokenRequest request = new RefreshTokenRequest(); - request.setRefreshToken(engineToken.getRefreshToken()); - request.setSecret(oceanEngineConfig.getAppSecret()); - request.setAppId(oceanEngineConfig.getAppId()); - request.setGrantType("refresh_token"); - String requestBody = request.toString(); - String result = HttpUtil.post(UrlConstant.OAUTH2_REFRESH_TOKEN_URL, requestBody); - if (StringUtils.isNotBlank(requestBody)) { - RefreshTokenResponse refreshTokenResponse = JSONUtil.toBean(result, RefreshTokenResponse.class); - if (refreshTokenResponse.getCode() == DefaultNumberConstants.ZERO_NUMBER) { - RefreshTokenResponse.Data data = refreshTokenResponse.getData(); - if (StringUtils.isNotBlank(data.getAccessToken()) && StringUtils.isNotBlank(data.getRefreshToken())) { - Boolean response = oceanEngineService.updateOceanEnginByResponse - (data.getExpiresIn(), data.getAccessToken(), data.getRefreshTokenExpiresIn(), data.getRefreshToken(), engineToken.getId()); - log.info("============= update token former token as {}, response token as {}, update response as {} =============", - engineToken.getAccessToken(), data.getAccessToken(), response); - } - } - if (refreshTokenResponse.getCode() == ResponseConstant.OCENA_NO_PERMISSION) { - oceanEngineService.updateAuthorizationStatus(DefaultNumberConstants.ZERO_NUMBER, engineToken.getId()); - } - } - } - } - } -} diff --git a/admin/src/main/java/com/baiye/task/SyncTaskServiceImpl.java b/admin/src/main/java/com/baiye/task/SyncTaskServiceImpl.java deleted file mode 100644 index 80d7318..0000000 --- a/admin/src/main/java/com/baiye/task/SyncTaskServiceImpl.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.baiye.task; - -import com.baiye.modules.distribute.entity.ClueEntity; -import com.baiye.modules.distribute.entity.DistributeTaskEntity; -import com.baiye.modules.distribute.entity.PushLinkEntity; -import com.baiye.modules.distribute.mapper.DistributeTaskMapper; -import com.baiye.modules.distribute.service.ClueService; -import com.baiye.modules.distribute.service.DistributeTaskService; -import com.baiye.modules.distribute.service.PushLinkService; -import com.baiye.task.service.SyncTaskService; -import com.baiye.util.AESUtils; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.ballcat.security.properties.SecurityProperties; -import org.springframework.stereotype.Component; - -@Component -@RequiredArgsConstructor -@Slf4j -public class SyncTaskServiceImpl implements SyncTaskService { - - private final PushLinkService pushLinkService; - - private final SecurityProperties securityProperties; - - private final ClueService clueService; - - private final DistributeTaskMapper distributeTaskMapper; - - private final DistributeTaskService distributeTaskService; - - - - @Override - public void pushClueExecuteTask(String appKey, String mobile, String remark, Long variable) { - // 查询appKey映射的记录 - PushLinkEntity linkEntity = pushLinkService.getByAppKey(appKey); - if (linkEntity != null) { - // 添加资源信息 - ClueEntity clueEntity = new ClueEntity(); - clueEntity.setNid(AESUtils.encrypt(mobile, securityProperties.getPasswordSecretKey())); - clueEntity.setClueRecordId(linkEntity.getClueRecordId()); - // clueEntity.setOtherClue(JSONUtil.toJsonStr(dbPushClueDTO)); - clueEntity.setCreateBy(linkEntity.getCreateBy()); - clueEntity.setRemark(remark); - clueEntity.setVariable(variable); - clueService.save(clueEntity); - // 执行任务 - DistributeTaskEntity entity = distributeTaskMapper.selectOne( - new LambdaQueryWrapper().eq(DistributeTaskEntity::getDefaultType, 0) - .eq(DistributeTaskEntity::getCreateBy, linkEntity.getCreateBy()) - .eq(DistributeTaskEntity::getFileRecordId, linkEntity.getClueRecordId())); - if (entity.getExecuteStatus() != 0 && entity.getExecuteStatus() != 3) distributeTaskService.execute(entity); - } - } -} diff --git a/admin/src/main/java/com/baiye/task/service/DistributeTaskSyncService.java b/admin/src/main/java/com/baiye/task/service/DistributeTaskSyncService.java deleted file mode 100644 index 3c5f388..0000000 --- a/admin/src/main/java/com/baiye/task/service/DistributeTaskSyncService.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.baiye.task.service; - -import com.baiye.modules.distribute.service.DistributeTaskService; -import org.springframework.scheduling.annotation.Async; - -import java.util.List; - -public interface DistributeTaskSyncService { - - @Async - void executeTask(List userIdList, DistributeTaskService distributeTaskService); -} diff --git a/admin/src/main/java/com/baiye/task/service/SyncTaskService.java b/admin/src/main/java/com/baiye/task/service/SyncTaskService.java deleted file mode 100644 index 0641621..0000000 --- a/admin/src/main/java/com/baiye/task/service/SyncTaskService.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.baiye.task.service; - -import org.springframework.scheduling.annotation.Async; - -public interface SyncTaskService { - - @Async - void pushClueExecuteTask(String appKey, String mobile, String remark, Long variable); -} diff --git a/admin/src/main/java/com/baiye/utils/AddressSplitterUtil.java b/admin/src/main/java/com/baiye/utils/AddressSplitterUtil.java deleted file mode 100644 index cba3fda..0000000 --- a/admin/src/main/java/com/baiye/utils/AddressSplitterUtil.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.baiye.utils; - -import java.util.*; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -/** - * @author wjt - * @date 2023/9/6 - */ -public class AddressSplitterUtil { - - public static Map getAddress(String address) { - - String province = null, city = null, county = null; - String regex1 = "(?[^省]+^自治区|.*?自治区|.*?省|.*?行政区)"; - Matcher m1 = Pattern.compile(regex1).matcher(address); - while (m1.find()) { - province = m1.group("province"); - if (province != null) { - address = address.replaceFirst(province, ""); - break; - } - } - String regex2 = "(?[^辖区]+辖区|[^盟]+盟|[^自治州]+自治州|[^地区]+地区|[^市]+市|.+区划)"; - Matcher m2 = Pattern.compile(regex2).matcher(address); - while (m2.find()) { - city = m2.group("city"); - if (city != null) { - address = address.replaceFirst(city, ""); - break; - } - } - String regex3 = "(?[^市]+市|[^县]+县|[^旗]+旗|.+区)"; - Matcher m3 = Pattern.compile(regex3).matcher(address); - while (m3.find()) { - county = m3.group("district"); - if (county != null) { - address = address.replaceFirst(county, ""); - break; - } - } - Map map = new HashMap<>(4); - map.put("province", province); - map.put("city", city); - map.put("county", county); - map.put("detail", address); - return map; - } - -} diff --git a/admin/src/main/java/com/baiye/utils/AssignDataUtil.java b/admin/src/main/java/com/baiye/utils/AssignDataUtil.java deleted file mode 100644 index 8b1bb50..0000000 --- a/admin/src/main/java/com/baiye/utils/AssignDataUtil.java +++ /dev/null @@ -1,114 +0,0 @@ -package com.baiye.utils; - -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.map.MapUtil; -import cn.hutool.core.util.NumberUtil; -import com.baiye.constant.DefaultNumberConstants; -import com.baiye.exception.BadRequestException; -import com.baiye.modules.distribute.dto.DistributeDTO; -import com.baiye.modules.distribute.dto.DistributeResponseDTO; -import com.google.common.collect.Lists; -import com.google.common.collect.Sets; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - -/** - * @Author YQY - * @Date 2023/8/14 - */ -public class AssignDataUtil { - - public static List assignData(DistributeDTO distribution) { - int size = distribution.getDeptIds().size(); - List deptIds = distribution.getDeptIds(); - List weights = distribution.getWeights(); - // 返回数据结果 - List list = new ArrayList<>(); - List resourceList = distribution.getResourceList(); - // 数据打乱 - Collections.shuffle(resourceList); - // 去除重复数据 - List arrayList = Lists.newArrayList(Sets.newHashSet(resourceList)); - int resourceSize = arrayList.size(); - Boolean isWeight = distribution.getIsWeight(); - if (isWeight == null || !isWeight) { - int remainder = resourceList.size() % deptIds.size(); - int number = resourceList.size() / deptIds.size(); - int offset = DefaultNumberConstants.ZERO_NUMBER; - List value; - DistributeResponseDTO distributeResponseDTO; - for (int i = DefaultNumberConstants.ZERO_NUMBER; i < deptIds.size(); i++) { - distributeResponseDTO = new DistributeResponseDTO(); - if (remainder > DefaultNumberConstants.ZERO_NUMBER) { - value = resourceList.subList(i * number + offset, (i + DefaultNumberConstants.ONE_NUMBER) * number - + offset + DefaultNumberConstants.ONE_NUMBER); - remainder--; - offset++; - } - else { - value = resourceList.subList(i * number + offset, - (i + DefaultNumberConstants.ONE_NUMBER) * number + offset); - } - distributeResponseDTO.setResponseList(value); - distributeResponseDTO.setDeptId(deptIds.get(i)); - list.add(distributeResponseDTO); - } - return list; - } - // 集合求和 - if (CollUtil.isEmpty(weights)) { - throw new BadRequestException("参数错误"); - } - double sum = weights.stream().mapToDouble(Double::doubleValue).sum(); - if (sum != DefaultNumberConstants.ONE_HUNDRED) { - throw new BadRequestException("比率不足100%,无法分配"); - } - // 进行排序保证最大比例在后 - Map deptMap = deptIds.stream() - .collect(Collectors.toMap(key -> key, key -> weights.get(deptIds.indexOf(key)))); - Map longDoubleMap = MapUtil.sortByValue(deptMap, Boolean.FALSE); - List value; - DistributeResponseDTO distributeResponseDTO; - int num = DefaultNumberConstants.ZERO_NUMBER; - for (Map.Entry longDoubleEntry : longDoubleMap.entrySet()) { - Long key = longDoubleEntry.getKey(); - Double aDouble = longDoubleEntry.getValue(); - distributeResponseDTO = new DistributeResponseDTO(); - if (size - DefaultNumberConstants.ONE_NUMBER > num) { - num++; - double div = NumberUtil.div(aDouble, Double.valueOf(DefaultNumberConstants.ONE_HUNDRED), - DefaultNumberConstants.TWO_HUNDRED); - int count = (int) Math.floor(NumberUtil.mul(resourceSize, div)); - if (count == DefaultNumberConstants.ONE_NUMBER) { - int middle = arrayList.size() / DefaultNumberConstants.TWO_NUMBER; - value = Lists.newArrayList(arrayList.get(middle)); - distributeResponseDTO.setResponseList(value); - distributeResponseDTO.setDeptId(key); - list.add(distributeResponseDTO); - // copyOnWriteArrayList.remove(middle); - arrayList = CollUtil.subtractToList(arrayList, value); - continue; - } - value = Lists.newArrayList(arrayList.subList(DefaultNumberConstants.ZERO_NUMBER, count)); - distributeResponseDTO.setResponseList(value); - distributeResponseDTO.setDeptId(key); - list.add(distributeResponseDTO); - // 差集方式删除元素 - arrayList = CollUtil.subtractToList(arrayList, value); - // copyOnWriteArrayList.removeAll(value); - } - else { - value = Lists.newCopyOnWriteArrayList(Lists.newArrayList(arrayList)); - distributeResponseDTO.setResponseList(value); - distributeResponseDTO.setDeptId(longDoubleEntry.getKey()); - list.add(distributeResponseDTO); - } - } - return list; - } - -} diff --git a/admin/src/main/java/com/baiye/utils/ClueFileTestingUtil.java b/admin/src/main/java/com/baiye/utils/ClueFileTestingUtil.java deleted file mode 100644 index 098845d..0000000 --- a/admin/src/main/java/com/baiye/utils/ClueFileTestingUtil.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.baiye.utils; - -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.io.FileUtil; -import cn.hutool.poi.excel.ExcelReader; -import cn.hutool.poi.excel.ExcelUtil; -import com.baiye.constant.UploadTemplateHeadConstant; -import com.baiye.exception.BadRequestException; -import org.springframework.web.multipart.MultipartFile; - -import java.io.IOException; -import java.io.InputStream; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.List; -import java.util.Random; - -/** - * 检测格式内容(头信息)工具类 - */ -public class ClueFileTestingUtil { - - private static SimpleDateFormat timeOne = new SimpleDateFormat("yyyyMMddHHmmssSSS"); - - /** - * 检测Excel文件格式，内容，量 - */ - public static ExcelReader testingExcel(MultipartFile file) { - String fileSuffix = FileUtil.getSuffix(file.getOriginalFilename()); - if (!(fileSuffix.equals("xlsx") || fileSuffix.equals("xls"))) { - throw new BadRequestException("文件格式错误！ 请上传xlsx、xls格式"); - } - InputStream inputStream; - ExcelReader reader; - List row; - try { - inputStream = file.getInputStream(); - reader = ExcelUtil.getReader(inputStream); - // 检测头信息 - row = reader.readRow(0); - if (!row.contains(UploadTemplateHeadConstant.HEAD_NID)) { - throw new BadRequestException("文件模板中缺少 手机号 头信息的列,请下载基础模板"); - } -// if (!row.contains(UploadTemplateHeadConstant.HEAD_ORIGIN)) { -// throw new BadRequestException("文件模板中缺少 渠道来源 头信息的列,请下载基础模板"); -// } - if (!row.contains(UploadTemplateHeadConstant.HEAD_REMARK)) { - throw new BadRequestException("文件模板中缺少 备注 头信息的列,请下载基础模板"); - } -// if (!row.contains(UploadTemplateHeadConstant.HEAD_DATE)) { -// throw new BadRequestException("文件模板中缺少 日期(****/**/** 00:00:00) 头信息的列,请下载基础模板"); -// } - } - catch (IOException e) { - throw new BadRequestException("文件读取错误,请检查文件"); - } - // 检测excel数量 - int rowCount = reader.getRowCount() - 1; - if (rowCount < 1) { - throw new BadRequestException("空文件,请检查文件内容"); - } - // 如果第二行就是空行 判断为空文件 - List rowData = reader.readRow(1); - if (CollUtil.isEmpty(rowData)) { - throw new BadRequestException("空文件,请检查文件内容"); - } - if (rowCount > 1000000) - throw new BadRequestException("文件行数不得超过100w行,请处理"); - return reader; - } - - /** - * 生成(时间+随机数)的文件名 - */ - public static String randomFileName(String old) { - Random random = new Random(); - // 1.得到老文件.后面的文件夹后缀名 如：.jsp .png - String suffix = old.substring(old.lastIndexOf("."), old.length()); - // 2.4位的随机数1000--10000的数字 - int num = random.nextInt(9000) + 1000; - // 3.得到当前时间 - String format = timeOne.format(new Date()); - // 4.时间 + _ + 随机数 + 后缀名 返回一个新的文件名 - return format + "_" + num + suffix; - } - -} diff --git a/admin/src/main/java/com/baiye/utils/DateTimeToCronUtils.java b/admin/src/main/java/com/baiye/utils/DateTimeToCronUtils.java deleted file mode 100644 index 7a9ad26..0000000 --- a/admin/src/main/java/com/baiye/utils/DateTimeToCronUtils.java +++ /dev/null @@ -1,259 +0,0 @@ -package com.baiye.utils; - -import cn.hutool.core.date.DateUtil; - -import java.text.SimpleDateFormat; -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.util.Date; - -/** - * @Description 日期时间转Cron表达式 - */ -public class DateTimeToCronUtils { - - /** - * 每年format格式 - */ - public static final String YEAR = "ss mm HH dd MM ? yyyy"; - - /** - * 每周format格式 - */ - public static final String MONDAY = "ss mm HH ? * 1"; - - public static final String TUESDAY = "ss mm HH ? * 2"; - - public static final String WEDNESDAY = "ss mm HH ? * 3"; - - public static final String THURSDAY = "ss mm HH ? * 4"; - - public static final String FRIDAY = "ss mm HH ? * 5"; - - public static final String SATURDAY = "ss mm HH ? * 6"; - - public static final String SUNDAY = "ss mm HH ? * 7"; - - /** - * 每天format格式 - */ - public static final String EVERYDAY = "ss mm HH * * ?"; - - /** - * 间隔-每天format格式 - */ - public static final String INTERVAL_DAY = "0 0 0 1/param * ? "; - - /** - * 间隔-每小时format格式 - */ - public static final String INTERVAL_HOUR = "0 0 0/param * * ?"; - - /** - * 间隔-指定小时的多少分钟 - */ - public static final String INTERVAL_HOUR_MINUTE = "0 minute */param * * ?"; - - /** - * 间隔-每分钟format格式 - */ - public static final String INTERVAL_MINUTE = "0 0/param * * * ? "; - - /** - * 每分钟多少秒执行一次 - */ - public static final String INTERVAL_MINUTE_SECONDS = "seconds 0/param * * * ? "; - - /** - * 间隔-每秒format格式 - */ - public static final String INTERVAL_SECONDS = "*/param * * * * ? "; - - /** - * LocalDateTime格式化为String - * @param date LocalDateTime - * @param dateFormat format格式 - * @return String - * @author longwei - */ - public static String formatDateByPattern(LocalDateTime date, String dateFormat) { - return DateUtil.format(date, dateFormat); - } - - /** - * date格式化为String - * @param date date - * @param dateFormat format格式 - * @return String - * @author longwei - */ - public static String formatDateByPattern(Date date, String dateFormat) { - SimpleDateFormat sdf = new SimpleDateFormat(dateFormat); - String formatTimeStr = null; - if (date != null) { - formatTimeStr = sdf.format(date); - } - return formatTimeStr; - } - - /** - * 时间转换Cron表达式 - * @param date date - * @param dateFormat format格式 - * @return Cron表达式 - * @author longwei - */ - public static String getCron(Date date, String dateFormat) { - return formatDateByPattern(date, dateFormat); - } - - /** - * 时间转换Cron表达式 - * @param date date - * @param dateFormat format格式 - * @return Cron表达式 - * @author longwei - */ - public static String getCron(LocalDateTime date, String dateFormat) { - return formatDateByPattern(date, dateFormat); - } - - /** - * 间隔天转换Cron表达式 - * @param param 天 - * @return Cron表达式 - * @author longwei - */ - public static String getIntervalDayCron(String param) { - return INTERVAL_DAY.replace("param", param); - } - - /** - * 间隔小时转换Cron表达式 - * @param param 小时 - * @return Cron表达式 - * @author longwei - */ - public static String getIntervalHourCron(String param) { - return INTERVAL_HOUR.replace("param", param); - } - - /** - * 间隔分钟转换Cron表达式 - * @param param 分钟 - * @return Cron表达式 - * @author longwei - */ - public static String getIntervalMinuteCron(String param) { - return INTERVAL_MINUTE.replace("param", param); - } - - /** - * 间隔秒转换Cron表达式 使用此方法注意, quartz 中是不允许秒数超过60的，否则会报错， 此方法 如果 s > 60 != 60 会有损失时间精度， - * 比如你想1分30秒执行一次 可能只是会每分的30秒执行一次， 这样看来还是一分钟执行一次， 同样超过 一小时也是. - * @param param 秒 - * @return Cron表达式 - * @author longwei - */ - public static String getIntervalSecondsCron(String param) { - - Integer i = Integer.valueOf(param); - - // 判断多少秒 - if (i > 59) { - - // 超过 59 秒使用分钟 四舍五入 分钟会存在一些时间的偏移 - // long minutes = Math.round(i / 60.0); - long minutes = i / 60; // 分钟 - - // 判断有没有超过 59 分钟 否则轮小时 - if (minutes > 59) { - - /// 606/ 小时 80 / 60 = 1.333 算出小时 - long hour = minutes / 60; - - // 计算出剩余多少分钟 - long min = minutes % 60; - - // 如果有多余分钟 - if (min > 0) { - // 替换字符串 - String str = INTERVAL_HOUR_MINUTE.replace("param", hour + ""); - return str.replace("minute", min + ""); - } - - return INTERVAL_HOUR.replace("param", hour + ""); - - } - - // 判断剩余多少秒 - long seconds = i % 60; - - if (seconds > 0) { - // 进行替换拼接cron 有可能就是 1分25秒执行一次 每分钟的第25s执行 - String str = INTERVAL_MINUTE_SECONDS.replace("param", minutes + ""); - - return str.replace("seconds", seconds + ""); - } - - return INTERVAL_MINUTE.replace("param", minutes + ""); - } - - return INTERVAL_SECONDS.replace("param", param); - } - - public static void main(String[] args) { - // Date date = new Date(); - // - // String cron = getCron(date, YEAR); - // System.out.println("date-每年执行一次" + cron); - // - // cron = getCron(date, MONDAY); - // System.out.println("date-每周一执行" + cron); - // - // cron = getCron(date, EVERYDAY); - // System.out.println("date-每天执行" + cron); - // - // - // System.out.println("------------------------------"); - // - // LocalDateTime localDateTime = LocalDateTime.now(); - // - // cron = getCron(localDateTime, YEAR); - // System.out.println("localDateTime-每年执行一次" + cron); - // - // cron = getCron(localDateTime, MONDAY); - // System.out.println("localDateTime-每周一执行" + cron); - // - // cron = getCron(localDateTime, EVERYDAY); - // System.out.println("localDateTime-每天执行" + cron); - // - LocalDate localDate = LocalDate.now(); - LocalDateTime dateTime = localDate.atTime(13, 14, 56); - String cron = getCron(dateTime, EVERYDAY); - System.out.println("localDateTime-每天指定时间执行" + cron); - // - // cron = getIntervalDayCron("1"); - // System.out.println("localDateTime-间隔1天执行" + cron); - // - // cron = getIntervalHourCron("2"); - // System.out.println("localDateTime-间隔2小时执行" + cron); - // - // cron = getIntervalMinuteCron("5"); - // System.out.println("localDateTime-间隔5分钟执行" + cron); - - // String intervalMinuteCron = getIntervalSecondsCron("2"); - // - // System.out.println(intervalMinuteCron); - - // System.out.println(System.currentTimeMillis()); - - String intervalHourCron = getIntervalMinuteCron("1"); - - // String intervalSecondsCron = getIntervalSecondsCron("80"); - - System.out.println(intervalHourCron); - - } - -} diff --git a/admin/src/main/java/com/baiye/utils/SerialCode.java b/admin/src/main/java/com/baiye/utils/SerialCode.java deleted file mode 100644 index 1ee2958..0000000 --- a/admin/src/main/java/com/baiye/utils/SerialCode.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.baiye.utils; - -import java.util.concurrent.atomic.AtomicInteger; - -/** - * @author Enzo - * @date : 2023/9/8 - */ -public class SerialCode { - - /** - * 轮次编号生成规则 - * 1、如果当前时间没有核酸轮次，直接新增 ，默认为：HSJC-yyyyMMdd01 - * 2、查询到有核酸轮次，查找当前那一天最大的轮次编号，自增1 - * - * @param code 当前最大编码 - */ - public static String getNum(Integer code) { - AtomicInteger intCode = new AtomicInteger(code); - int andIncrement = intCode.incrementAndGet(); - int length = String.valueOf(code).length() + 1; - return String.format("%0".concat(String.valueOf(length).concat("d")), andIncrement); - } - -} diff --git a/admin/src/main/resources/application-dev.yml b/admin/src/main/resources/application-dev.yml index 9873a16..0f66754 100644 --- a/admin/src/main/resources/application-dev.yml +++ b/admin/src/main/resources/application-dev.yml @@ -10,21 +10,7 @@ spring: timeout: 5000 database: 7 -business: - roleCodes: - # admin超级管理员 - - ROLE_ADMIN - # 业务管理员 - - ROLE_SALES_EXECUTIVE - #门店专员 - storeCode: ROLE_STORE_SALESMAN -file: - downUrl: http://39.100.77.21:8001/file/ - - -urls: - dbPushUrl: http://cs.tuoz.net:8100/v1/tripartite/push/clue/ springdoc: swagger-ui: diff --git a/admin/src/main/resources/application-prod.yml b/admin/src/main/resources/application-prod.yml index 425659d..1bd82a9 100644 --- a/admin/src/main/resources/application-prod.yml +++ b/admin/src/main/resources/application-prod.yml @@ -9,30 +9,9 @@ spring: port: 6379 -business: - roleCodes: - # admin超级管理员 - - ROLE_ADMIN - # 业务管理员 - - ROLE_SALES_EXECUTIVE - #门店专员 - storeCode: ROLE_STORE_SALESMAN -urls: - dbPushUrl: https://byffp.top/api/v1/tripartite/push/clue/ - -file: - downUrl: https://byffp.top/file/ # 生产环境关闭文档 ballcat: openapi: enabled: false - -# 巨量引擎配置 -ocean: - engine: - appId: 1780961834344489 - appSecret: 155c1019be762c6be1c634439eab354370f2a097 - redirectUrl: https://byffp.top/api/api/oceanEngine/callback - diff --git a/admin/src/main/resources/application-test.yml b/admin/src/main/resources/application-test.yml index bde40be..04e7fd4 100644 --- a/admin/src/main/resources/application-test.yml +++ b/admin/src/main/resources/application-test.yml @@ -10,16 +10,7 @@ spring: timeout: 5000 database: 7 -business: - roleCodes: - # admin超级管理员 - - ROLE_ADMIN - # 业务管理员 - - ROLE_SALES_EXECUTIVE - #门店专员 - storeCode: ROLE_STORE_SALESMAN -urls: - dbPushUrl: http://39.100.77.21:8001/api/v1/tripartite/push/clue/ + #mybatis plus 设置 mybatis-plus: @@ -33,12 +24,3 @@ springdoc: - { name: 'admin', url: '/v3/api-docs' } - { name: 'api', url: 'http://ballcat-api/v3/api-docs' } -file: - downUrl: http://39.100.77.21:8001/file/ - -# 巨量引擎配置 -ocean: - engine: - appId: 1781876509884547 - appSecret: f29f140fc78f18a704ca1aee6edb875485b60c18 - redirectUrl: http://39.100.77.21:8000/api/oceanEngine/callback diff --git a/admin/src/main/resources/application.yml b/admin/src/main/resources/application.yml index 5641b73..303709d 100644 --- a/admin/src/main/resources/application.yml +++ b/admin/src/main/resources/application.yml @@ -1,5 +1,5 @@ server: - port: 8000 + port: 8088 spring: application: @@ -52,13 +52,9 @@ ballcat: - /favicon.ico - /captcha/** - /outside/** - - /store/** - - /v1/tripartite/** - - /api/oceanEngine/** - - /oceanEngine/** # 项目 redis 缓存的 key 前缀 redis: - key-prefix: 'ballcat:' + key-prefix: 'marketing:' springdoc: # 开启 oauth2 端点显示 @@ -99,5 +95,5 @@ elasticjob: server-list: localhost:2181 snowflake: - workerId: 9 - datacenterId: 9 + workerId: 10 + datacenterId: 10 diff --git a/admin/src/main/resources/mapper/ClueMapper.xml b/admin/src/main/resources/mapper/ClueMapper.xml deleted file mode 100644 index a3d1dff..0000000 --- a/admin/src/main/resources/mapper/ClueMapper.xml +++ /dev/null @@ -1,116 +0,0 @@ - - - - - ce.clue_id, - ce.is_new_clue, - ce.origin_name, - ce.nid, - ce.clue_time, - ce.remark, - ce.clue_record_id, - ce.other_clue, - ce.assigned_by, - ce.clue_label, - ce.clue_label_name, - ce.create_by, - ce.create_time, - ce.assigned_name, - ce.clue_stage_id, - ce.clue_stage_name, - ce.sex, - ce.custom_information, - ce.channel_identifying, - ce.channel_type - - - - - - - - - - - - - - - - - diff --git a/admin/src/main/resources/mapper/ClueRecordMapper.xml b/admin/src/main/resources/mapper/ClueRecordMapper.xml deleted file mode 100644 index 566fb7a..0000000 --- a/admin/src/main/resources/mapper/ClueRecordMapper.xml +++ /dev/null @@ -1,87 +0,0 @@ - - - - - cr - . - clue_record_id - , - cr.status, - cr.task_id, - cr.old_file_name, - cr.url, - cr.remark, - cr.success_num, - cr.fail_num, - cr.channel_type, - cr.channel_identifying, - cr.allocation_status, - cr.distribute_status, - cr.record_type, - cr.create_time, - cr.update_time - - - - - - - UPDATE - tb_clue_record - SET - allocation_status = #{status}, - distribute_status = #{distributeStatus} - where - - clue_record_id = #{list[0]} - - - clue_record_id in - - #{type} - - - - - - UPDATE - tb_clue_record - SET - distribute_status = #{status} - where - - clue_record_id = #{list[0]} - - - clue_record_id in - - #{type} - - - - - \ No newline at end of file diff --git a/admin/src/main/resources/mapper/CustomMapper.xml b/admin/src/main/resources/mapper/CustomMapper.xml deleted file mode 100644 index acaa6a8..0000000 --- a/admin/src/main/resources/mapper/CustomMapper.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - - cm - . - enter_name - , - cm.custom_id, - cm.custom_name, - cm.custom_nid, - cm.economize, - cm.market, - cm.distinguish, - cm.detail_address, - cm.radius, - cm.batch_no, - cm.enroll_status, - cm.remark, - cm.create_time, - cm.update_time, - cm.custom_type, - cm.distribute_time - - - - - - - - - - - - diff --git a/admin/src/main/resources/mapper/CustomStoreMapper.xml b/admin/src/main/resources/mapper/CustomStoreMapper.xml deleted file mode 100644 index d7b241b..0000000 --- a/admin/src/main/resources/mapper/CustomStoreMapper.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/admin/src/main/resources/mapper/DirectClueMapper.xml b/admin/src/main/resources/mapper/DirectClueMapper.xml deleted file mode 100644 index afca374..0000000 --- a/admin/src/main/resources/mapper/DirectClueMapper.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - dc.direct_clue_id, - dc.batch_no, - dc.nid, - dc.custom_name, - dc.origin_type, - dc.effective_status, - dc.clue_label_name, - dc.distribute_type, - dc.distribute_date, - dc.distribute_user_id, - dc.other_clue, - dc.create_time - - - - \ No newline at end of file diff --git a/admin/src/main/resources/mapper/DistributeTaskMapper.xml b/admin/src/main/resources/mapper/DistributeTaskMapper.xml deleted file mode 100644 index 71a1a18..0000000 --- a/admin/src/main/resources/mapper/DistributeTaskMapper.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - dt.distribute_task_id, - dt.distribute_task_type, - dt.task_name, - dt.rule_status, - dt.time_status, - dt.start_time, - dt.file_rule_prefix, - dt.file_record_id, - dt.default_type, - dt.execute_num, - dt.create_time, - dt.create_by, - dt.execute_status - - - - - - UPDATE tb_distribute_task SET execute_num = execute_num + 1 WHERE distribute_task_id = #{distributeTaskId}; - - - - \ No newline at end of file diff --git a/admin/src/main/resources/mapper/FileContrastMapper.xml b/admin/src/main/resources/mapper/FileContrastMapper.xml deleted file mode 100644 index 494bb98..0000000 --- a/admin/src/main/resources/mapper/FileContrastMapper.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - fl.id, - fl.task_name, - fl.contrast_num, - fl.create_time, - fl.create_by - - - - diff --git a/admin/src/main/resources/mapper/LabelOrganizeMapper.xml b/admin/src/main/resources/mapper/LabelOrganizeMapper.xml deleted file mode 100644 index d296e5f..0000000 --- a/admin/src/main/resources/mapper/LabelOrganizeMapper.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - lo.id, - lo.name, - lo.is_enable, - lo.create_time, - lo.update_time - - - - - \ No newline at end of file diff --git a/admin/src/main/resources/mapper/PushLinkMapper.xml b/admin/src/main/resources/mapper/PushLinkMapper.xml deleted file mode 100644 index 2d965c3..0000000 --- a/admin/src/main/resources/mapper/PushLinkMapper.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - pl.id, - pl.name, - pl.app_key, - pl.channel_identifying, - pl.channel_url, - pl.channel_type, - pl.status, - pl.create_time, - pl.create_by - - - - diff --git a/admin/src/main/resources/mapper/StoreMapper.xml b/admin/src/main/resources/mapper/StoreMapper.xml deleted file mode 100644 index c3f8b38..0000000 --- a/admin/src/main/resources/mapper/StoreMapper.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - st - . - id - , - st.store_name, - st.store_type, - st.store_status, - st.nid, - st.province, - st.city, - st.county, - st.detail, - st.trade_start_time, - st.trade_end_time, - st.create_by, - st.create_time, - st.longitude, - st.latitude - - - - - - - - \ No newline at end of file diff --git a/admin/src/main/resources/mapper/StoreUserMapper.xml b/admin/src/main/resources/mapper/StoreUserMapper.xml deleted file mode 100644 index cabada6..0000000 --- a/admin/src/main/resources/mapper/StoreUserMapper.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - st.id as storeId, - st.store_name, - tsu.user_id - - - - diff --git a/admin/src/test/java/CustomTest.java b/admin/src/test/java/CustomTest.java deleted file mode 100644 index 942256d..0000000 --- a/admin/src/test/java/CustomTest.java +++ /dev/null @@ -1,74 +0,0 @@ -import cn.hutool.json.JSONUtil; -import com.baiye.AdminApplication; -import com.baiye.modules.distribute.dto.CustomDTO; -import com.baiye.modules.distribute.entity.CustomStoreEntity; -import com.baiye.modules.distribute.service.CustomService; -import com.baiye.modules.distribute.vo.AddressDTO; -import com.google.common.collect.Lists; -import com.google.gson.Gson; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -import javax.annotation.Resource; -import java.util.List; -/** - * @author Enzo - * @date : 2022/9/23 - */ - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = AdminApplication.class, - webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) -public class CustomTest { - - @Resource - private CustomService customService; - @Test - public void saveRecord() { - CustomDTO customDTO = new CustomDTO(); - - List newed = Lists.newArrayList(); - customDTO.setCustomName("xXX"); - customDTO.setCustomNid("12345678"); - customDTO.setEconomize("浙江"); - customDTO.setMarket("丽水"); - customDTO.setDistinguish("皇后区"); - customDTO.setDetailAddress("xxxxxx168"); - customDTO.setRadius("18.1923"); - customDTO.setEnrollStatus(1); - - CustomStoreEntity store = new CustomStoreEntity(); - store.setStoreId(1111L); - store.setStoreName("xxxx"); - store.setReservationTime(""); - newed.add(store); - customDTO.setCustomStoreEntities(newed); - customService.add(customDTO); - - } - - @Test - public void audit() { - - - } - - @Test - public void json(){ - Gson gson = new Gson(); - AddressDTO addressDTO = new AddressDTO(); - addressDTO.setDetailAddress("xxx"); - addressDTO.setDistinguish("xxx"); - addressDTO.setEconomize("xxx"); - addressDTO.setMarket("xxx"); - String jsonStr = JSONUtil.toJsonStr(addressDTO); - System.out.println(gson.toJson(addressDTO)); - System.out.println(jsonStr); - } - - - -} - diff --git a/admin/src/test/java/DirectClueTest.java b/admin/src/test/java/DirectClueTest.java deleted file mode 100644 index 8276f42..0000000 --- a/admin/src/test/java/DirectClueTest.java +++ /dev/null @@ -1,47 +0,0 @@ -import com.baiye.AdminApplication; -import com.baiye.modules.distribute.entity.DirectClueEntity; -import com.baiye.modules.distribute.service.DirectClueService; -import com.baiye.util.AESUtils; -import org.ballcat.security.properties.SecurityProperties; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -import javax.annotation.Resource; -import java.time.LocalDateTime; -import java.time.ZoneId; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = AdminApplication.class, - webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) -public class DirectClueTest { - - @Resource - private DirectClueService directClueService; - @Resource - private SecurityProperties securityProperties; - - @Test - public void test1(){ - List list = new ArrayList<>(); - for (int i = 0; i < 10; i++) { - DirectClueEntity directClueEntity = new DirectClueEntity(); - directClueEntity.setCustomName("y" + i); - String nid = "1346263987" + i; - String phone = AESUtils.encrypt(nid, securityProperties.getPasswordSecretKey()); - directClueEntity.setNid(phone); - directClueEntity.setEffectiveStatus(0); - directClueEntity.setDistributeType(0); - Date date = new Date(); - LocalDateTime localDateTime = date.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime(); - directClueEntity.setDistributeDate(localDateTime); - directClueEntity.setCreateBy(182L); - list.add(directClueEntity); - } - directClueService.allocationClue(182L, list); - } -} diff --git a/admin/src/test/java/OceanEngineTest.java b/admin/src/test/java/OceanEngineTest.java deleted file mode 100644 index cef444e..0000000 --- a/admin/src/test/java/OceanEngineTest.java +++ /dev/null @@ -1,62 +0,0 @@ -import cn.hutool.http.HttpUtil; -import com.baiye.AdminApplication; -import com.baiye.modules.auth.RefreshTokenRequest; -import com.baiye.modules.distribute.service.OceanEngineService; -import com.baiye.polling.QueueBalance; -import com.google.common.collect.Lists; -import lombok.extern.slf4j.Slf4j; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -import java.util.ArrayList; -import java.util.List; - -/** - * @author Enzo - * @date : 2022/9/16 - */ -@Slf4j -@RunWith(SpringRunner.class) -@SpringBootTest(classes = AdminApplication.class, - webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) -public class OceanEngineTest { - - @Autowired - private OceanEngineService oceanEngineService; - - - @Test - public void getSetting() { - String s = oceanEngineService.buildAuthorizationUrl(188L, "飞鱼"); - - System.out.println(); - // String accessToken = getClueList(); - // log.info("========= the accessToken as {} ==============", accessToken); - - } - - - @Test - public void getAdIds() { - - RefreshTokenRequest request = new RefreshTokenRequest(); - request.setRefreshToken("4609cd758f9df2980fea3b803006eecb3e79c2ce"); - request.setSecret("f1bef553cd635b7cd8057052654ebaaa30fa92a5"); - request.setAppId("1744002574259247"); - request.setGrantType("refresh_token"); - String requestBody = request.toString(); - String result = HttpUtil.post("https://ad.oceanengine.com/open_api/oauth2/refresh_token/", requestBody); - System.out.println(); - } - - @Test - public void userIdPolling() { - - - } - - -} diff --git a/admin/src/test/java/PushMessageTest.java b/admin/src/test/java/PushMessageTest.java deleted file mode 100644 index ec9ed86..0000000 --- a/admin/src/test/java/PushMessageTest.java +++ /dev/null @@ -1,41 +0,0 @@ -import com.baiye.AdminApplication; -import com.baiye.notify.event.StationNotifyPushEvent; -import com.baiye.notify.model.domain.AnnouncementNotifyInfo; -import lombok.extern.slf4j.Slf4j; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.context.ApplicationContext; -import org.springframework.test.context.junit4.SpringRunner; - -import java.time.LocalDateTime; -import java.util.Collections; - -/** - * @author Enzo - * @date : 2023/11/24 - */ -@Slf4j -@RunWith(SpringRunner.class) -@SpringBootTest(classes = AdminApplication.class, - webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) -public class PushMessageTest { - - @Autowired - private ApplicationContext publisher; - - @Test - public void pushMessage() { - // 发布事件，监听者进行实际的 websocket 推送 - AnnouncementNotifyInfo notifyInfo = new AnnouncementNotifyInfo(); - notifyInfo.setTitle("变形金刚"); - notifyInfo.setMessageKey("783"); - notifyInfo.setContent("《变形金刚》是美国科幻动作系列电影，改编自起源于20世纪80年代的变形金刚品牌系列。该电影系列由派拉蒙影业公司和梦工厂发行。"); - notifyInfo.setCreateTime(LocalDateTime.now()); - notifyInfo.setMessageType(1); - notifyInfo.setState(0); - publisher.publishEvent( new StationNotifyPushEvent(notifyInfo, Collections.singletonList(137L))); - } -} - diff --git a/admin/src/test/java/RefreshTokenTest.java b/admin/src/test/java/RefreshTokenTest.java deleted file mode 100644 index f413d09..0000000 --- a/admin/src/test/java/RefreshTokenTest.java +++ /dev/null @@ -1,35 +0,0 @@ -import com.baiye.AdminApplication; -import com.baiye.modules.distribute.service.OceanEngineService; -import com.baiye.notify.event.StationNotifyPushEvent; -import com.baiye.notify.model.domain.AnnouncementNotifyInfo; -import lombok.extern.slf4j.Slf4j; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -import java.time.LocalDateTime; -import java.util.Collections; - -/** - * @author Enzo - * @date : 2023/11/27 - */ - -@Slf4j -@RunWith(SpringRunner.class) -@SpringBootTest(classes = AdminApplication.class, - webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) -public class RefreshTokenTest { - - @Autowired - private OceanEngineService oceanEngineService; - - - @Test - public void pushMessage() { - oceanEngineService.refreshToken("1fcf974a1df2bc604c9ad1865bc80b94bbfb3348", 1L, 188L); - } - -} diff --git a/marketing-platform-admin/marketing-platform-admin-core/pom.xml b/marketing-platform-admin/admin-core/pom.xml similarity index 80% rename from marketing-platform-admin/marketing-platform-admin-core/pom.xml rename to marketing-platform-admin/admin-core/pom.xml index 139e075..2620225 100644 --- a/marketing-platform-admin/marketing-platform-admin-core/pom.xml +++ b/marketing-platform-admin/admin-core/pom.xml @@ -2,12 +2,12 @@ - com.hz.baiye marketing-platform-admin + com.baiye ${revision} 4.0.0 - marketing-platform-admin-core + admin-core @@ -19,41 +19,37 @@ com.baiye common-desensitize - 1.1.0 com.baiye common-model - 1.1.0 com.baiye security-oauth2-authorization-server compile - 1.1.0 com.baiye security-oauth2-resource-server - 1.1.0 com.baiye system-controller - 1.1.0 + com.baiye marketing-platform-starter-web - 1.1.0 + ${revision} com.baiye - distribute-notify-controller - 1.1.0 + marketing-platform-notify-controller + ${revision} diff --git a/marketing-platform-admin/marketing-platform-admin-core/src/main/java/com/hccake/ballcat/admin/upms/UpmsAutoConfiguration.java b/marketing-platform-admin/admin-core/src/main/java/com/baiye/upms/UpmsAutoConfiguration.java similarity index 80% rename from marketing-platform-admin/marketing-platform-admin-core/src/main/java/com/hccake/ballcat/admin/upms/UpmsAutoConfiguration.java rename to marketing-platform-admin/admin-core/src/main/java/com/baiye/upms/UpmsAutoConfiguration.java index 90089aa..ad346cc 100644 --- a/marketing-platform-admin/marketing-platform-admin-core/src/main/java/com/hccake/ballcat/admin/upms/UpmsAutoConfiguration.java +++ b/marketing-platform-admin/admin-core/src/main/java/com/baiye/upms/UpmsAutoConfiguration.java @@ -1,12 +1,12 @@ -package com.hccake.ballcat.admin.upms; +package com.baiye.upms; -import com.hccake.ballcat.admin.upms.log.LogConfiguration; -import com.hccake.ballcat.system.authentication.BallcatOAuth2TokenResponseEnhancer; -import com.hccake.ballcat.system.authentication.DefaultUserInfoCoordinatorImpl; -import com.hccake.ballcat.system.authentication.SysUserDetailsServiceImpl; -import com.hccake.ballcat.system.authentication.UserInfoCoordinator; -import com.hccake.ballcat.system.properties.SystemProperties; -import com.hccake.ballcat.system.service.SysUserService; +//import com.hccake.ballcat.admin.upms.log.LogConfiguration; +import com.baiye.system.authentication.BallcatOAuth2TokenResponseEnhancer; +import com.baiye.system.authentication.DefaultUserInfoCoordinatorImpl; +import com.baiye.system.authentication.SysUserDetailsServiceImpl; +import com.baiye.system.authentication.UserInfoCoordinator; +import com.baiye.system.properties.SystemProperties; +import com.baiye.system.service.SysUserService; import org.ballcat.security.properties.SecurityProperties; import org.ballcat.springsecurity.oauth2.server.authorization.web.authentication.OAuth2TokenResponseEnhancer; import org.ballcat.springsecurity.oauth2.server.resource.introspection.SpringAuthorizationServerSharedStoredOpaqueTokenIntrospector; @@ -19,7 +19,6 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Import; import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.security.oauth2.server.authorization.OAuth2Authorization; @@ -31,11 +30,12 @@ import org.springframework.security.oauth2.server.resource.introspection.OpaqueT */ @EnableAsync @AutoConfiguration -@MapperScan("com.hccake.ballcat.**.mapper") -@ComponentScan({ "com.hccake.ballcat.admin.upms", "com.hccake.ballcat.system", "com.hccake.ballcat.log", - "com.hccake.ballcat.file", "com.hccake.ballcat.notify" }) +@MapperScan("com.baiye.**.mapper") +// @ComponentScan({ "com.hccake.ballcat.admin.upms", "com.hccake.ballcat.system", +// "com.hccake.ballcat.log", +// "com.hccake.ballcat.file", "com.hccake.ballcat.notify" }) +@ComponentScan({ "com.baiye.upms", "com.baiye.system" }) @EnableConfigurationProperties({ SystemProperties.class, SecurityProperties.class }) -@Import(LogConfiguration.class) public class UpmsAutoConfiguration { /** diff --git a/marketing-platform-admin/marketing-platform-admin-core/src/main/java/com/hccake/ballcat/admin/upms/config/mybatis/FillMetaObjectHandle.java b/marketing-platform-admin/admin-core/src/main/java/com/baiye/upms/config/mybatis/FillMetaObjectHandle.java similarity index 81% rename from marketing-platform-admin/marketing-platform-admin-core/src/main/java/com/hccake/ballcat/admin/upms/config/mybatis/FillMetaObjectHandle.java rename to marketing-platform-admin/admin-core/src/main/java/com/baiye/upms/config/mybatis/FillMetaObjectHandle.java index 56fbb3a..b8549e9 100644 --- a/marketing-platform-admin/marketing-platform-admin-core/src/main/java/com/hccake/ballcat/admin/upms/config/mybatis/FillMetaObjectHandle.java +++ b/marketing-platform-admin/admin-core/src/main/java/com/baiye/upms/config/mybatis/FillMetaObjectHandle.java @@ -1,9 +1,9 @@ -package com.hccake.ballcat.admin.upms.config.mybatis; +package com.baiye.upms.config.mybatis; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; -import com.hccake.ballcat.common.core.constant.GlobalConstants; -import com.hccake.ballcat.common.security.userdetails.User; -import com.hccake.ballcat.common.security.util.SecurityUtils; +import com.baiye.constant.GlobalConstants; +import com.baiye.security.userdetails.User; +import com.baiye.security.util.SecurityUtils; import lombok.extern.slf4j.Slf4j; import org.apache.ibatis.reflection.MetaObject; diff --git a/marketing-platform-admin/marketing-platform-admin-core/src/main/java/com/hccake/ballcat/admin/upms/config/mybatis/MybatisPlusConfig.java b/marketing-platform-admin/admin-core/src/main/java/com/baiye/upms/config/mybatis/MybatisPlusConfig.java similarity index 90% rename from marketing-platform-admin/marketing-platform-admin-core/src/main/java/com/hccake/ballcat/admin/upms/config/mybatis/MybatisPlusConfig.java rename to marketing-platform-admin/admin-core/src/main/java/com/baiye/upms/config/mybatis/MybatisPlusConfig.java index c738e00..e982996 100644 --- a/marketing-platform-admin/marketing-platform-admin-core/src/main/java/com/hccake/ballcat/admin/upms/config/mybatis/MybatisPlusConfig.java +++ b/marketing-platform-admin/admin-core/src/main/java/com/baiye/upms/config/mybatis/MybatisPlusConfig.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.admin.upms.config.mybatis; +package com.baiye.upms.config.mybatis; import com.baomidou.mybatisplus.annotation.DbType; import com.baomidou.mybatisplus.annotation.FieldFill; @@ -7,8 +7,8 @@ import com.baomidou.mybatisplus.core.injector.AbstractMethod; import com.baomidou.mybatisplus.core.injector.ISqlInjector; import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; -import com.hccake.extend.mybatis.plus.injector.CustomSqlInjector; -import com.hccake.extend.mybatis.plus.methods.InsertBatchSomeColumnByCollection; +import com.baiye.extend.mybatis.plus.injector.CustomSqlInjector; +import com.baiye.extend.mybatis.plus.methods.InsertBatchSomeColumnByCollection; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/marketing-platform-admin/marketing-platform-admin-core/src/main/java/com/hccake/ballcat/admin/upms/config/task/MdcTaskDecorator.java b/marketing-platform-admin/admin-core/src/main/java/com/baiye/upms/config/task/MdcTaskDecorator.java similarity index 93% rename from marketing-platform-admin/marketing-platform-admin-core/src/main/java/com/hccake/ballcat/admin/upms/config/task/MdcTaskDecorator.java rename to marketing-platform-admin/admin-core/src/main/java/com/baiye/upms/config/task/MdcTaskDecorator.java index 827ac9e..d32fa76 100644 --- a/marketing-platform-admin/marketing-platform-admin-core/src/main/java/com/hccake/ballcat/admin/upms/config/task/MdcTaskDecorator.java +++ b/marketing-platform-admin/admin-core/src/main/java/com/baiye/upms/config/task/MdcTaskDecorator.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.admin.upms.config.task; +package com.baiye.upms.config.task; import cn.hutool.core.map.MapUtil; import org.slf4j.MDC; diff --git a/marketing-platform-admin/marketing-platform-admin-core/src/main/java/com/hccake/ballcat/admin/upms/config/task/TaskExecutionConfiguration.java b/marketing-platform-admin/admin-core/src/main/java/com/baiye/upms/config/task/TaskExecutionConfiguration.java similarity index 96% rename from marketing-platform-admin/marketing-platform-admin-core/src/main/java/com/hccake/ballcat/admin/upms/config/task/TaskExecutionConfiguration.java rename to marketing-platform-admin/admin-core/src/main/java/com/baiye/upms/config/task/TaskExecutionConfiguration.java index 9126a58..fa3c9c6 100644 --- a/marketing-platform-admin/marketing-platform-admin-core/src/main/java/com/hccake/ballcat/admin/upms/config/task/TaskExecutionConfiguration.java +++ b/marketing-platform-admin/admin-core/src/main/java/com/baiye/upms/config/task/TaskExecutionConfiguration.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.admin.upms.config.task; +package com.baiye.upms.config.task; import org.springframework.boot.task.TaskExecutorCustomizer; import org.springframework.context.annotation.Bean; diff --git a/marketing-platform-admin/admin-core/src/main/java/com/baiye/upms/log/LogConfiguration.java b/marketing-platform-admin/admin-core/src/main/java/com/baiye/upms/log/LogConfiguration.java new file mode 100644 index 0000000..806f551 --- /dev/null +++ b/marketing-platform-admin/admin-core/src/main/java/com/baiye/upms/log/LogConfiguration.java @@ -0,0 +1,78 @@ +// package com.hccake.ballcat.admin.upms.log; +// +// import com.hccake.ballcat.common.log.access.handler.AccessLogHandler; +// import com.hccake.ballcat.common.log.operation.handler.OperationLogHandler; +// import com.hccake.ballcat.log.handler.CustomAccessLogHandler; +// import com.hccake.ballcat.log.handler.CustomOperationLogHandler; +// import com.hccake.ballcat.log.model.entity.AccessLog; +// import com.hccake.ballcat.log.model.entity.OperationLog; +// import com.hccake.ballcat.log.service.AccessLogService; +// import com.hccake.ballcat.log.service.LoginLogService; +// import com.hccake.ballcat.log.service.OperationLogService; +// import com.hccake.ballcat.log.thread.AccessLogSaveThread; +// import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; +// import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; +// import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; +// import org.springframework.context.annotation.Bean; +// import org.springframework.context.annotation.Configuration; +// import +// org.springframework.security.oauth2.server.authorization.config.annotation.web.configurers.OAuth2AuthorizationServerConfigurer; +// import +// org.springframework.security.oauth2.server.authorization.settings.AuthorizationServerSettings; +// +/// ** +// * @author hccake +// */ +// @Configuration(proxyBeanMethods = false) +// @ConditionalOnClass(LoginLogService.class) +// public class LogConfiguration { +// +// /** +// * 访问日志保存 +// * @param accessLogService 访问日志Service +// * @return CustomAccessLogHandler +// */ +// @Bean +// @ConditionalOnBean(AccessLogService.class) +// @ConditionalOnMissingBean(AccessLogHandler.class) +// public AccessLogHandler customAccessLogHandler(AccessLogService +// accessLogService) { +// return new CustomAccessLogHandler(new AccessLogSaveThread(accessLogService)); +// } +// +// /** +// * 操作日志处理器 +// * @param operationLogService 操作日志Service +// * @return CustomOperationLogHandler +// */ +// @Bean +// @ConditionalOnBean(OperationLogService.class) +// @ConditionalOnMissingBean(OperationLogHandler.class) +// public OperationLogHandler customOperationLogHandler(OperationLogService +// operationLogService) { +// return new CustomOperationLogHandler(operationLogService); +// } +// +// @ConditionalOnClass(OAuth2AuthorizationServerConfigurer.class) +// @ConditionalOnBean(LoginLogService.class) +// @ConditionalOnMissingBean(LoginLogHandler.class) +// @Configuration(proxyBeanMethods = false) +// static class SpringAuthorizationServerLoginLogConfiguration { +// +// /** +// * Spring Authorization Server 的登录日志处理，监听登录事件记录登录登出 +// * @param loginLogService 操作日志Service +// * @param authorizationServerSettings 授权服务器设置 +// * @return SpringAuthorizationServerLoginLogHandler +// */ +// @Bean +// public LoginLogHandler springAuthorizationServerLoginLogHandler(LoginLogService +// loginLogService, +// AuthorizationServerSettings authorizationServerSettings) { +// return new SpringAuthorizationServerLoginLogHandler(loginLogService, +// authorizationServerSettings); +// } +// +// } +// +// } \ No newline at end of file diff --git a/marketing-platform-admin/marketing-platform-admin-core/src/main/java/com/hccake/ballcat/admin/upms/log/LoginLogHandler.java b/marketing-platform-admin/admin-core/src/main/java/com/baiye/upms/log/LoginLogHandler.java similarity index 60% rename from marketing-platform-admin/marketing-platform-admin-core/src/main/java/com/hccake/ballcat/admin/upms/log/LoginLogHandler.java rename to marketing-platform-admin/admin-core/src/main/java/com/baiye/upms/log/LoginLogHandler.java index 6f089e9..646b19c 100644 --- a/marketing-platform-admin/marketing-platform-admin-core/src/main/java/com/hccake/ballcat/admin/upms/log/LoginLogHandler.java +++ b/marketing-platform-admin/admin-core/src/main/java/com/baiye/upms/log/LoginLogHandler.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.admin.upms.log; +package com.baiye.upms.log; /** * @author hccake diff --git a/marketing-platform-admin/admin-core/src/main/java/com/baiye/upms/log/SpringAuthorizationServerLoginLogHandler.java b/marketing-platform-admin/admin-core/src/main/java/com/baiye/upms/log/SpringAuthorizationServerLoginLogHandler.java new file mode 100644 index 0000000..dd3cd6e --- /dev/null +++ b/marketing-platform-admin/admin-core/src/main/java/com/baiye/upms/log/SpringAuthorizationServerLoginLogHandler.java @@ -0,0 +1,140 @@ +// package com.hccake.ballcat.admin.upms.log; +// +// import com.hccake.ballcat.common.core.util.WebUtils; +//// import com.hccake.ballcat.common.log.operation.enums.LogStatusEnum; +// import com.hccake.ballcat.common.security.util.SecurityUtils; +//// import com.hccake.ballcat.log.enums.LoginEventTypeEnum; +//// import com.hccake.ballcat.log.model.entity.LoginLog; +//// import com.hccake.ballcat.log.service.LoginLogService; +// import lombok.RequiredArgsConstructor; +// import +// org.ballcat.springsecurity.oauth2.server.authorization.authentication.OAuth2TokenRevocationAuthenticationToken; +// import org.springframework.context.event.EventListener; +// import org.springframework.security.authentication.ProviderNotFoundException; +// import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +// import +// org.springframework.security.authentication.event.AbstractAuthenticationFailureEvent; +// import org.springframework.security.authentication.event.AuthenticationSuccessEvent; +// import org.springframework.security.authentication.event.LogoutSuccessEvent; +// import org.springframework.security.oauth2.server.authorization.OAuth2Authorization; +// import +// org.springframework.security.oauth2.server.authorization.authentication.OAuth2AccessTokenAuthenticationToken; +// import +// org.springframework.security.oauth2.server.authorization.authentication.OAuth2AuthorizationGrantAuthenticationToken; +// import +// org.springframework.security.oauth2.server.authorization.settings.AuthorizationServerSettings; +// +// import javax.servlet.http.HttpServletRequest; +// +//// import static com.hccake.ballcat.log.handler.LoginLogUtils.prodLoginLog; +// +/// ** +// * spring 授权服务器的登录日志处理器 +// * +// * @author hccake +// */ +// @RequiredArgsConstructor +// public class SpringAuthorizationServerLoginLogHandler implements LoginLogHandler { +// +//// private final LoginLogService loginLogService; +// +// private final AuthorizationServerSettings authorizationServerSettings; +// +// /** +// * 登录成功事件监听 记录用户登录日志 +// * @param event 登录成功 event +// */ +// @EventListener(AuthenticationSuccessEvent.class) +// public void onAuthenticationSuccessEvent(AuthenticationSuccessEvent event) { +// Object source = event.getSource(); +// String username = null; +// +// String tokenEndpoint = authorizationServerSettings.getTokenEndpoint(); +// HttpServletRequest request = WebUtils.getRequest(); +// boolean isOauth2LoginRequest = request.getRequestURI().equals(tokenEndpoint); +// +// // Oauth2登录 和表单登录 处理分开 +// if (isOauth2LoginRequest && source instanceof OAuth2AccessTokenAuthenticationToken) { +// username = SecurityUtils.getAuthentication().getName(); +// } +// else if (!isOauth2LoginRequest && source instanceof +// UsernamePasswordAuthenticationToken) { +// username = ((UsernamePasswordAuthenticationToken) source).getName(); +// } +// +//// if (username != null) { +//// LoginLog loginLog = prodLoginLog(username).setMsg("登录成功") +//// .setStatus(LogStatusEnum.SUCCESS.getValue()) +//// .setEventType(LoginEventTypeEnum.LOGIN.getValue()); +//// loginLogService.save(loginLog); +//// } +// } +// +// /** +// * 监听鉴权失败事件，记录登录失败日志 +// * @param event the event +// */ +// @EventListener(AbstractAuthenticationFailureEvent.class) +// public void onAuthenticationFailureEvent(AbstractAuthenticationFailureEvent event) { +// if (event.getException().getClass().isAssignableFrom(ProviderNotFoundException.class)) +// { +// return; +// } +// +// Object source = event.getSource(); +// String username = null; +// +// String tokenEndpoint = authorizationServerSettings.getTokenEndpoint(); +// HttpServletRequest request = WebUtils.getRequest(); +// boolean isOauth2LoginRequest = request.getRequestURI().equals(tokenEndpoint); +// +// // Oauth2登录 和表单登录 处理分开 +// if (isOauth2LoginRequest && source instanceof +// OAuth2AuthorizationGrantAuthenticationToken) { +// username = ((OAuth2AuthorizationGrantAuthenticationToken) source).getName(); +// } +// else if (!isOauth2LoginRequest && source instanceof +// UsernamePasswordAuthenticationToken) { +// username = ((UsernamePasswordAuthenticationToken) source).getName(); +// } +// +//// if (username != null) { +//// LoginLog loginLog = prodLoginLog(username).setMsg(event.getException().getMessage()) +//// .setEventType(LoginEventTypeEnum.LOGIN.getValue()) +//// .setStatus(LogStatusEnum.FAIL.getValue()); +//// loginLogService.save(loginLog); +//// } +// } +// +// /** +// * 登出成功事件监听 +// * @param event the event +// */ +// @EventListener(LogoutSuccessEvent.class) +// public void onLogoutSuccessEvent(LogoutSuccessEvent event) { +// Object source = event.getSource(); +// String username = null; +// +// String tokenRevocationEndpoint = +// authorizationServerSettings.getTokenRevocationEndpoint(); +// HttpServletRequest request = WebUtils.getRequest(); +// boolean isOauth2Login = request.getRequestURI().equals(tokenRevocationEndpoint); +// +// // Oauth2撤销令牌 和表单登出 处理分开 +// if (isOauth2Login && source instanceof OAuth2TokenRevocationAuthenticationToken) { +// OAuth2Authorization authorization = ((OAuth2TokenRevocationAuthenticationToken) +// source).getAuthorization(); +// username = authorization.getPrincipalName(); +// } +// else if (!isOauth2Login && source instanceof UsernamePasswordAuthenticationToken) { +// username = ((UsernamePasswordAuthenticationToken) source).getName(); +// } +// +//// if (username != null) { +//// LoginLog loginLog = prodLoginLog(username).setMsg("登出成功") +//// .setEventType(LoginEventTypeEnum.LOGOUT.getValue()); +//// loginLogService.save(loginLog); +//// } +// } +// +// } diff --git a/marketing-platform-admin/marketing-platform-admin-core/src/main/resources/META-INF/spring.factories b/marketing-platform-admin/admin-core/src/main/resources/META-INF/spring.factories similarity index 54% rename from marketing-platform-admin/marketing-platform-admin-core/src/main/resources/META-INF/spring.factories rename to marketing-platform-admin/admin-core/src/main/resources/META-INF/spring.factories index 9b59bf2..44aa29b 100644 --- a/marketing-platform-admin/marketing-platform-admin-core/src/main/resources/META-INF/spring.factories +++ b/marketing-platform-admin/admin-core/src/main/resources/META-INF/spring.factories @@ -1,2 +1,2 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.hccake.ballcat.admin.upms.UpmsAutoConfiguration \ No newline at end of file + com.baiye.upms.UpmsAutoConfiguration \ No newline at end of file diff --git a/marketing-platform-admin/admin-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/marketing-platform-admin/admin-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..8b53834 --- /dev/null +++ b/marketing-platform-admin/admin-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.baiye.upms.UpmsAutoConfiguration \ No newline at end of file diff --git a/marketing-platform-admin/marketing-platform-admin-websocket/pom.xml b/marketing-platform-admin/admin-websocket/pom.xml similarity index 61% rename from marketing-platform-admin/marketing-platform-admin-websocket/pom.xml rename to marketing-platform-admin/admin-websocket/pom.xml index c6f6c7f..21c7a16 100644 --- a/marketing-platform-admin/marketing-platform-admin-websocket/pom.xml +++ b/marketing-platform-admin/admin-websocket/pom.xml @@ -2,22 +2,31 @@ - com.baiye marketing-platform-admin + com.baiye ${revision} 4.0.0 - marketing-platform-admin-websocket + admin-websocket - com.hz.baiye - marketing-platform-admin-core + com.baiye + admin-core + 1.0.0 + + + com.baiye + marketing-platform-starter-websocket 1.0.0 + com.baiye - ballcat-spring-boot-starter-websocket + distribute-notify-biz + 1.0.0 + compile + diff --git a/marketing-platform-admin/marketing-platform-admin-websocket/src/main/java/com/hccake/ballcat/admin/websocket/AdminWebSocketAutoConfiguration.java b/marketing-platform-admin/admin-websocket/src/main/java/com/baiye/AdminWebSocketAutoConfiguration.java similarity index 63% rename from marketing-platform-admin/marketing-platform-admin-websocket/src/main/java/com/hccake/ballcat/admin/websocket/AdminWebSocketAutoConfiguration.java rename to marketing-platform-admin/admin-websocket/src/main/java/com/baiye/AdminWebSocketAutoConfiguration.java index aea5ce7..5c8a6be 100644 --- a/marketing-platform-admin/marketing-platform-admin-websocket/src/main/java/com/hccake/ballcat/admin/websocket/AdminWebSocketAutoConfiguration.java +++ b/marketing-platform-admin/admin-websocket/src/main/java/com/baiye/AdminWebSocketAutoConfiguration.java @@ -1,8 +1,8 @@ -package com.hccake.ballcat.admin.websocket; +package com.baiye; -import com.hccake.ballcat.admin.websocket.component.UserAttributeHandshakeInterceptor; -import com.hccake.ballcat.admin.websocket.component.UserSessionKeyGenerator; -import com.hccake.ballcat.common.websocket.session.SessionKeyGenerator; +import com.baiye.component.UserAttributeHandshakeInterceptor; +import com.baiye.component.UserSessionKeyGenerator; +import com.baiye.session.SessionKeyGenerator; import lombok.RequiredArgsConstructor; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; @@ -14,16 +14,12 @@ import org.springframework.web.socket.server.HandshakeInterceptor; * @author Hccake 2021/1/5 * @version 1.0 */ -@Import({ SystemWebsocketEventListenerConfiguration.class, NotifyWebsocketEventListenerConfiguration.class }) +@Import({ SystemWebsocketEventListenerConfiguration.class}) @Configuration @RequiredArgsConstructor public class AdminWebSocketAutoConfiguration { - @Bean - @ConditionalOnMissingBean(UserAttributeHandshakeInterceptor.class) - public HandshakeInterceptor authenticationHandshakeInterceptor() { - return new UserAttributeHandshakeInterceptor(); - } + @Bean @ConditionalOnMissingBean(SessionKeyGenerator.class) @@ -31,4 +27,8 @@ public class AdminWebSocketAutoConfiguration { return new UserSessionKeyGenerator(); } + @Bean + public HandshakeInterceptor authenticationHandshakeInterceptor() { + return new UserAttributeHandshakeInterceptor(); + } } diff --git a/marketing-platform-admin/marketing-platform-admin-websocket/src/main/java/com/hccake/ballcat/admin/websocket/SystemWebsocketEventListenerConfiguration.java b/marketing-platform-admin/admin-websocket/src/main/java/com/baiye/SystemWebsocketEventListenerConfiguration.java similarity index 76% rename from marketing-platform-admin/marketing-platform-admin-websocket/src/main/java/com/hccake/ballcat/admin/websocket/SystemWebsocketEventListenerConfiguration.java rename to marketing-platform-admin/admin-websocket/src/main/java/com/baiye/SystemWebsocketEventListenerConfiguration.java index 83411ef..9675c05 100644 --- a/marketing-platform-admin/marketing-platform-admin-websocket/src/main/java/com/hccake/ballcat/admin/websocket/SystemWebsocketEventListenerConfiguration.java +++ b/marketing-platform-admin/admin-websocket/src/main/java/com/baiye/SystemWebsocketEventListenerConfiguration.java @@ -1,7 +1,7 @@ -package com.hccake.ballcat.admin.websocket; +package com.baiye; -import com.hccake.ballcat.admin.websocket.listener.SystemWebsocketEventListener; -import com.hccake.ballcat.common.websocket.distribute.MessageDistributor; +import com.baiye.listener.SystemWebsocketEventListener; +import com.baiye.distribute.MessageDistributor; import lombok.RequiredArgsConstructor; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.context.annotation.Bean; diff --git a/marketing-platform-admin/marketing-platform-admin-websocket/src/main/java/com/hccake/ballcat/admin/websocket/component/UserAttributeHandshakeInterceptor.java b/marketing-platform-admin/admin-websocket/src/main/java/com/baiye/component/UserAttributeHandshakeInterceptor.java similarity index 90% rename from marketing-platform-admin/marketing-platform-admin-websocket/src/main/java/com/hccake/ballcat/admin/websocket/component/UserAttributeHandshakeInterceptor.java rename to marketing-platform-admin/admin-websocket/src/main/java/com/baiye/component/UserAttributeHandshakeInterceptor.java index 25aebf4..902e30b 100644 --- a/marketing-platform-admin/marketing-platform-admin-websocket/src/main/java/com/hccake/ballcat/admin/websocket/component/UserAttributeHandshakeInterceptor.java +++ b/marketing-platform-admin/admin-websocket/src/main/java/com/baiye/component/UserAttributeHandshakeInterceptor.java @@ -1,8 +1,8 @@ -package com.hccake.ballcat.admin.websocket.component; +package com.baiye.component; -import com.hccake.ballcat.admin.websocket.constant.AdminWebSocketConstants; -import com.hccake.ballcat.common.security.userdetails.User; -import com.hccake.ballcat.common.security.util.SecurityUtils; +import com.baiye.constant.AdminWebSocketConstants; +import com.baiye.security.userdetails.User; +import com.baiye.security.util.SecurityUtils; import lombok.RequiredArgsConstructor; import org.springframework.http.server.ServerHttpRequest; import org.springframework.http.server.ServerHttpResponse; diff --git a/marketing-platform-admin/marketing-platform-admin-websocket/src/main/java/com/hccake/ballcat/admin/websocket/component/UserSessionKeyGenerator.java b/marketing-platform-admin/admin-websocket/src/main/java/com/baiye/component/UserSessionKeyGenerator.java similarity index 81% rename from marketing-platform-admin/marketing-platform-admin-websocket/src/main/java/com/hccake/ballcat/admin/websocket/component/UserSessionKeyGenerator.java rename to marketing-platform-admin/admin-websocket/src/main/java/com/baiye/component/UserSessionKeyGenerator.java index 5aeab1f..d8760f0 100644 --- a/marketing-platform-admin/marketing-platform-admin-websocket/src/main/java/com/hccake/ballcat/admin/websocket/component/UserSessionKeyGenerator.java +++ b/marketing-platform-admin/admin-websocket/src/main/java/com/baiye/component/UserSessionKeyGenerator.java @@ -1,7 +1,7 @@ -package com.hccake.ballcat.admin.websocket.component; +package com.baiye.component; -import com.hccake.ballcat.admin.websocket.constant.AdminWebSocketConstants; -import com.hccake.ballcat.common.websocket.session.SessionKeyGenerator; +import com.baiye.constant.AdminWebSocketConstants; +import com.baiye.session.SessionKeyGenerator; import lombok.RequiredArgsConstructor; import org.springframework.web.socket.WebSocketSession; diff --git a/marketing-platform-admin/marketing-platform-admin-websocket/src/main/java/com/hccake/ballcat/admin/websocket/constant/AdminWebSocketConstants.java b/marketing-platform-admin/admin-websocket/src/main/java/com/baiye/constant/AdminWebSocketConstants.java similarity index 88% rename from marketing-platform-admin/marketing-platform-admin-websocket/src/main/java/com/hccake/ballcat/admin/websocket/constant/AdminWebSocketConstants.java rename to marketing-platform-admin/admin-websocket/src/main/java/com/baiye/constant/AdminWebSocketConstants.java index 680b2a2..183b2d1 100644 --- a/marketing-platform-admin/marketing-platform-admin-websocket/src/main/java/com/hccake/ballcat/admin/websocket/constant/AdminWebSocketConstants.java +++ b/marketing-platform-admin/admin-websocket/src/main/java/com/baiye/constant/AdminWebSocketConstants.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.admin.websocket.constant; +package com.baiye.constant; /** * @author Hccake 2021/1/5 diff --git a/marketing-platform-admin/marketing-platform-admin-websocket/src/main/java/com/hccake/ballcat/admin/websocket/listener/NotifyWebsocketEventListener.java b/marketing-platform-admin/admin-websocket/src/main/java/com/baiye/listener/NotifyWebsocketEventListener.java similarity index 53% rename from marketing-platform-admin/marketing-platform-admin-websocket/src/main/java/com/hccake/ballcat/admin/websocket/listener/NotifyWebsocketEventListener.java rename to marketing-platform-admin/admin-websocket/src/main/java/com/baiye/listener/NotifyWebsocketEventListener.java index b2624a3..e8aeadd 100644 --- a/marketing-platform-admin/marketing-platform-admin-websocket/src/main/java/com/hccake/ballcat/admin/websocket/listener/NotifyWebsocketEventListener.java +++ b/marketing-platform-admin/admin-websocket/src/main/java/com/baiye/listener/NotifyWebsocketEventListener.java @@ -1,19 +1,21 @@ -package com.hccake.ballcat.admin.websocket.listener; - -import com.hccake.ballcat.common.util.JsonUtils; -import com.hccake.ballcat.common.websocket.distribute.MessageDO; -import com.hccake.ballcat.common.websocket.distribute.MessageDistributor; -import com.hccake.ballcat.notify.event.AnnouncementCloseEvent; -import com.hccake.ballcat.notify.event.StationNotifyPushEvent; -import com.hccake.ballcat.notify.handler.NotifyInfoDelegateHandler; -import com.hccake.ballcat.notify.model.domain.NotifyInfo; -import com.hccake.ballcat.admin.websocket.message.AnnouncementCloseMessage; -import com.hccake.ballcat.system.model.entity.SysUser; +package com.baiye.listener; + + +import com.baiye.distribute.MessageDO; +import com.baiye.distribute.MessageDistributor; +import com.baiye.message.AnnouncementCloseMessage; +import com.baiye.notify.event.AnnouncementCloseEvent; +import com.baiye.notify.event.StationNotifyPushEvent; +import com.baiye.notify.handler.NotifyInfoDelegateHandler; +import com.baiye.notify.model.domain.NotifyInfo; +import com.baiye.util.JsonUtils; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.context.event.EventListener; import org.springframework.scheduling.annotation.Async; +import org.springframework.stereotype.Component; +import java.time.LocalTime; import java.util.List; /** @@ -21,6 +23,7 @@ import java.util.List; * @version 1.0 */ @Slf4j +@Component @RequiredArgsConstructor public class NotifyWebsocketEventListener { @@ -30,6 +33,7 @@ public class NotifyWebsocketEventListener { /** * 公告关闭事件监听 + * * @param event the AnnouncementCloseEvent */ @Async @@ -47,14 +51,36 @@ public class NotifyWebsocketEventListener { /** * 站内通知推送事件 + * * @param event the StationNotifyPushEvent */ @Async @EventListener(StationNotifyPushEvent.class) public void onAnnouncementPublishEvent(StationNotifyPushEvent event) { + log.info("============ onAnnouncementPublishEvent time {} ============", LocalTime.now()); NotifyInfo notifyInfo = event.getNotifyInfo(); - List userList = event.getUserList(); + List userList = event.getUserIdList(); notifyInfoDelegateHandler.handle(userList, notifyInfo); } + + + + /** + * 公告关闭事件监听 + * + * @param event the AnnouncementCloseEvent + */ + @Async + @EventListener(AnnouncementCloseEvent.class) + public void read(AnnouncementCloseEvent event) { + // 构建公告关闭的消息体 + AnnouncementCloseMessage message = new AnnouncementCloseMessage(); + message.setId(event.getId()); + String msg = JsonUtils.toJson(message); + + // 广播公告关闭信息 + MessageDO messageDO = new MessageDO().setMessageText(msg).setNeedBroadcast(true); + messageDistributor.distribute(messageDO); + } } diff --git a/marketing-platform-admin/marketing-platform-admin-websocket/src/main/java/com/hccake/ballcat/admin/websocket/listener/SystemWebsocketEventListener.java b/marketing-platform-admin/admin-websocket/src/main/java/com/baiye/listener/SystemWebsocketEventListener.java similarity index 69% rename from marketing-platform-admin/marketing-platform-admin-websocket/src/main/java/com/hccake/ballcat/admin/websocket/listener/SystemWebsocketEventListener.java rename to marketing-platform-admin/admin-websocket/src/main/java/com/baiye/listener/SystemWebsocketEventListener.java index ac7b4ea..3bd2718 100644 --- a/marketing-platform-admin/marketing-platform-admin-websocket/src/main/java/com/hccake/ballcat/admin/websocket/listener/SystemWebsocketEventListener.java +++ b/marketing-platform-admin/admin-websocket/src/main/java/com/baiye/listener/SystemWebsocketEventListener.java @@ -1,10 +1,10 @@ -package com.hccake.ballcat.admin.websocket.listener; +package com.baiye.listener; -import com.hccake.ballcat.common.util.JsonUtils; -import com.hccake.ballcat.common.websocket.distribute.MessageDO; -import com.hccake.ballcat.common.websocket.distribute.MessageDistributor; -import com.hccake.ballcat.system.event.DictChangeEvent; -import com.hccake.ballcat.admin.websocket.message.DictChangeMessage; +import com.baiye.util.JsonUtils; +import com.baiye.distribute.MessageDO; +import com.baiye.distribute.MessageDistributor; +import com.baiye.system.event.DictChangeEvent; +import com.baiye.message.DictChangeMessage; import lombok.RequiredArgsConstructor; import org.springframework.context.event.EventListener; import org.springframework.scheduling.annotation.Async; diff --git a/marketing-platform-admin/marketing-platform-admin-websocket/src/main/java/com/hccake/ballcat/admin/websocket/message/AnnouncementCloseMessage.java b/marketing-platform-admin/admin-websocket/src/main/java/com/baiye/message/AnnouncementCloseMessage.java similarity index 70% rename from marketing-platform-admin/marketing-platform-admin-websocket/src/main/java/com/hccake/ballcat/admin/websocket/message/AnnouncementCloseMessage.java rename to marketing-platform-admin/admin-websocket/src/main/java/com/baiye/message/AnnouncementCloseMessage.java index aa5b1b7..3381100 100644 --- a/marketing-platform-admin/marketing-platform-admin-websocket/src/main/java/com/hccake/ballcat/admin/websocket/message/AnnouncementCloseMessage.java +++ b/marketing-platform-admin/admin-websocket/src/main/java/com/baiye/message/AnnouncementCloseMessage.java @@ -1,6 +1,5 @@ -package com.hccake.ballcat.admin.websocket.message; +package com.baiye.message; -import com.hccake.ballcat.common.websocket.message.JsonWebSocketMessage; import lombok.Getter; import lombok.Setter; diff --git a/marketing-platform-admin/marketing-platform-admin-websocket/src/main/java/com/hccake/ballcat/admin/websocket/message/DictChangeMessage.java b/marketing-platform-admin/admin-websocket/src/main/java/com/baiye/message/DictChangeMessage.java similarity index 72% rename from marketing-platform-admin/marketing-platform-admin-websocket/src/main/java/com/hccake/ballcat/admin/websocket/message/DictChangeMessage.java rename to marketing-platform-admin/admin-websocket/src/main/java/com/baiye/message/DictChangeMessage.java index 41b7a74..3f4ba64 100644 --- a/marketing-platform-admin/marketing-platform-admin-websocket/src/main/java/com/hccake/ballcat/admin/websocket/message/DictChangeMessage.java +++ b/marketing-platform-admin/admin-websocket/src/main/java/com/baiye/message/DictChangeMessage.java @@ -1,6 +1,5 @@ -package com.hccake.ballcat.admin.websocket.message; +package com.baiye.message; -import com.hccake.ballcat.common.websocket.message.JsonWebSocketMessage; import lombok.Getter; import lombok.Setter; diff --git a/marketing-platform-admin/admin-websocket/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/marketing-platform-admin/admin-websocket/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..385abad --- /dev/null +++ b/marketing-platform-admin/admin-websocket/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.baiye.AdminWebSocketAutoConfiguration \ No newline at end of file diff --git a/marketing-platform-admin/marketing-platform-admin-core/src/main/java/com/hccake/ballcat/admin/upms/log/LogConfiguration.java b/marketing-platform-admin/marketing-platform-admin-core/src/main/java/com/hccake/ballcat/admin/upms/log/LogConfiguration.java deleted file mode 100644 index 189cecb..0000000 --- a/marketing-platform-admin/marketing-platform-admin-core/src/main/java/com/hccake/ballcat/admin/upms/log/LogConfiguration.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.hccake.ballcat.admin.upms.log; - -import com.hccake.ballcat.common.log.access.handler.AccessLogHandler; -import com.hccake.ballcat.common.log.operation.handler.OperationLogHandler; -import com.hccake.ballcat.log.handler.CustomAccessLogHandler; -import com.hccake.ballcat.log.handler.CustomOperationLogHandler; -import com.hccake.ballcat.log.model.entity.AccessLog; -import com.hccake.ballcat.log.model.entity.OperationLog; -import com.hccake.ballcat.log.service.AccessLogService; -import com.hccake.ballcat.log.service.LoginLogService; -import com.hccake.ballcat.log.service.OperationLogService; -import com.hccake.ballcat.log.thread.AccessLogSaveThread; -import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; -import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; -import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.security.oauth2.server.authorization.config.annotation.web.configurers.OAuth2AuthorizationServerConfigurer; -import org.springframework.security.oauth2.server.authorization.settings.AuthorizationServerSettings; - -/** - * @author hccake - */ -@Configuration(proxyBeanMethods = false) -@ConditionalOnClass(LoginLogService.class) -public class LogConfiguration { - - /** - * 访问日志保存 - * @param accessLogService 访问日志Service - * @return CustomAccessLogHandler - */ - @Bean - @ConditionalOnBean(AccessLogService.class) - @ConditionalOnMissingBean(AccessLogHandler.class) - public AccessLogHandler customAccessLogHandler(AccessLogService accessLogService) { - return new CustomAccessLogHandler(new AccessLogSaveThread(accessLogService)); - } - - /** - * 操作日志处理器 - * @param operationLogService 操作日志Service - * @return CustomOperationLogHandler - */ - @Bean - @ConditionalOnBean(OperationLogService.class) - @ConditionalOnMissingBean(OperationLogHandler.class) - public OperationLogHandler customOperationLogHandler(OperationLogService operationLogService) { - return new CustomOperationLogHandler(operationLogService); - } - - @ConditionalOnClass(OAuth2AuthorizationServerConfigurer.class) - @ConditionalOnBean(LoginLogService.class) - @ConditionalOnMissingBean(LoginLogHandler.class) - @Configuration(proxyBeanMethods = false) - static class SpringAuthorizationServerLoginLogConfiguration { - - /** - * Spring Authorization Server 的登录日志处理，监听登录事件记录登录登出 - * @param loginLogService 操作日志Service - * @param authorizationServerSettings 授权服务器设置 - * @return SpringAuthorizationServerLoginLogHandler - */ - @Bean - public LoginLogHandler springAuthorizationServerLoginLogHandler(LoginLogService loginLogService, - AuthorizationServerSettings authorizationServerSettings) { - return new SpringAuthorizationServerLoginLogHandler(loginLogService, authorizationServerSettings); - } - - } - -} \ No newline at end of file diff --git a/marketing-platform-admin/marketing-platform-admin-core/src/main/java/com/hccake/ballcat/admin/upms/log/SpringAuthorizationServerLoginLogHandler.java b/marketing-platform-admin/marketing-platform-admin-core/src/main/java/com/hccake/ballcat/admin/upms/log/SpringAuthorizationServerLoginLogHandler.java deleted file mode 100644 index 49f492a..0000000 --- a/marketing-platform-admin/marketing-platform-admin-core/src/main/java/com/hccake/ballcat/admin/upms/log/SpringAuthorizationServerLoginLogHandler.java +++ /dev/null @@ -1,129 +0,0 @@ -package com.hccake.ballcat.admin.upms.log; - -import com.hccake.ballcat.common.core.util.WebUtils; -import com.hccake.ballcat.common.log.operation.enums.LogStatusEnum; -import com.hccake.ballcat.common.security.util.SecurityUtils; -import com.hccake.ballcat.log.enums.LoginEventTypeEnum; -import com.hccake.ballcat.log.model.entity.LoginLog; -import com.hccake.ballcat.log.service.LoginLogService; -import lombok.RequiredArgsConstructor; -import org.ballcat.springsecurity.oauth2.server.authorization.authentication.OAuth2TokenRevocationAuthenticationToken; -import org.springframework.context.event.EventListener; -import org.springframework.security.authentication.ProviderNotFoundException; -import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; -import org.springframework.security.authentication.event.AbstractAuthenticationFailureEvent; -import org.springframework.security.authentication.event.AuthenticationSuccessEvent; -import org.springframework.security.authentication.event.LogoutSuccessEvent; -import org.springframework.security.oauth2.server.authorization.OAuth2Authorization; -import org.springframework.security.oauth2.server.authorization.authentication.OAuth2AccessTokenAuthenticationToken; -import org.springframework.security.oauth2.server.authorization.authentication.OAuth2AuthorizationGrantAuthenticationToken; -import org.springframework.security.oauth2.server.authorization.settings.AuthorizationServerSettings; - -import javax.servlet.http.HttpServletRequest; - -import static com.hccake.ballcat.log.handler.LoginLogUtils.prodLoginLog; - -/** - * spring 授权服务器的登录日志处理器 - * - * @author hccake - */ -@RequiredArgsConstructor -public class SpringAuthorizationServerLoginLogHandler implements LoginLogHandler { - - private final LoginLogService loginLogService; - - private final AuthorizationServerSettings authorizationServerSettings; - - /** - * 登录成功事件监听 记录用户登录日志 - * @param event 登录成功 event - */ - @EventListener(AuthenticationSuccessEvent.class) - public void onAuthenticationSuccessEvent(AuthenticationSuccessEvent event) { - Object source = event.getSource(); - String username = null; - - String tokenEndpoint = authorizationServerSettings.getTokenEndpoint(); - HttpServletRequest request = WebUtils.getRequest(); - boolean isOauth2LoginRequest = request.getRequestURI().equals(tokenEndpoint); - - // Oauth2登录 和表单登录 处理分开 - if (isOauth2LoginRequest && source instanceof OAuth2AccessTokenAuthenticationToken) { - username = SecurityUtils.getAuthentication().getName(); - } - else if (!isOauth2LoginRequest && source instanceof UsernamePasswordAuthenticationToken) { - username = ((UsernamePasswordAuthenticationToken) source).getName(); - } - - if (username != null) { - LoginLog loginLog = prodLoginLog(username).setMsg("登录成功") - .setStatus(LogStatusEnum.SUCCESS.getValue()) - .setEventType(LoginEventTypeEnum.LOGIN.getValue()); - loginLogService.save(loginLog); - } - } - - /** - * 监听鉴权失败事件，记录登录失败日志 - * @param event the event - */ - @EventListener(AbstractAuthenticationFailureEvent.class) - public void onAuthenticationFailureEvent(AbstractAuthenticationFailureEvent event) { - if (event.getException().getClass().isAssignableFrom(ProviderNotFoundException.class)) { - return; - } - - Object source = event.getSource(); - String username = null; - - String tokenEndpoint = authorizationServerSettings.getTokenEndpoint(); - HttpServletRequest request = WebUtils.getRequest(); - boolean isOauth2LoginRequest = request.getRequestURI().equals(tokenEndpoint); - - // Oauth2登录 和表单登录 处理分开 - if (isOauth2LoginRequest && source instanceof OAuth2AuthorizationGrantAuthenticationToken) { - username = ((OAuth2AuthorizationGrantAuthenticationToken) source).getName(); - } - else if (!isOauth2LoginRequest && source instanceof UsernamePasswordAuthenticationToken) { - username = ((UsernamePasswordAuthenticationToken) source).getName(); - } - - if (username != null) { - LoginLog loginLog = prodLoginLog(username).setMsg(event.getException().getMessage()) - .setEventType(LoginEventTypeEnum.LOGIN.getValue()) - .setStatus(LogStatusEnum.FAIL.getValue()); - loginLogService.save(loginLog); - } - } - - /** - * 登出成功事件监听 - * @param event the event - */ - @EventListener(LogoutSuccessEvent.class) - public void onLogoutSuccessEvent(LogoutSuccessEvent event) { - Object source = event.getSource(); - String username = null; - - String tokenRevocationEndpoint = authorizationServerSettings.getTokenRevocationEndpoint(); - HttpServletRequest request = WebUtils.getRequest(); - boolean isOauth2Login = request.getRequestURI().equals(tokenRevocationEndpoint); - - // Oauth2撤销令牌 和表单登出 处理分开 - if (isOauth2Login && source instanceof OAuth2TokenRevocationAuthenticationToken) { - OAuth2Authorization authorization = ((OAuth2TokenRevocationAuthenticationToken) source).getAuthorization(); - username = authorization.getPrincipalName(); - } - else if (!isOauth2Login && source instanceof UsernamePasswordAuthenticationToken) { - username = ((UsernamePasswordAuthenticationToken) source).getName(); - } - - if (username != null) { - LoginLog loginLog = prodLoginLog(username).setMsg("登出成功") - .setEventType(LoginEventTypeEnum.LOGOUT.getValue()); - loginLogService.save(loginLog); - } - } - -} diff --git a/marketing-platform-admin/marketing-platform-admin-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/marketing-platform-admin/marketing-platform-admin-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 1f721c6..0000000 --- a/marketing-platform-admin/marketing-platform-admin-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -com.hccake.ballcat.admin.upms.UpmsAutoConfiguration \ No newline at end of file diff --git a/marketing-platform-admin/marketing-platform-admin-websocket/src/main/java/com/hccake/ballcat/admin/websocket/NotifyWebsocketEventListenerConfiguration.java b/marketing-platform-admin/marketing-platform-admin-websocket/src/main/java/com/hccake/ballcat/admin/websocket/NotifyWebsocketEventListenerConfiguration.java deleted file mode 100644 index 58f6486..0000000 --- a/marketing-platform-admin/marketing-platform-admin-websocket/src/main/java/com/hccake/ballcat/admin/websocket/NotifyWebsocketEventListenerConfiguration.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.hccake.ballcat.admin.websocket; - -import com.hccake.ballcat.admin.websocket.listener.NotifyWebsocketEventListener; -import com.hccake.ballcat.common.websocket.distribute.MessageDistributor; -import com.hccake.ballcat.notify.handler.NotifyInfoDelegateHandler; -import com.hccake.ballcat.notify.model.domain.NotifyInfo; -import com.hccake.ballcat.notify.service.UserAnnouncementService; -import lombok.RequiredArgsConstructor; -import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -@RequiredArgsConstructor -@ConditionalOnClass({ NotifyWebsocketEventListener.class, UserAnnouncementService.class }) -@Configuration(proxyBeanMethods = false) -public class NotifyWebsocketEventListenerConfiguration { - - private final MessageDistributor messageDistributor; - - @Bean - public NotifyWebsocketEventListener notifyWebsocketEventListener( - NotifyInfoDelegateHandler notifyInfoDelegateHandler) { - return new NotifyWebsocketEventListener(messageDistributor, notifyInfoDelegateHandler); - } - -} diff --git a/marketing-platform-admin/marketing-platform-admin-websocket/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/marketing-platform-admin/marketing-platform-admin-websocket/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 5a8d836..0000000 --- a/marketing-platform-admin/marketing-platform-admin-websocket/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -com.hccake.ballcat.admin.websocket.AdminWebSocketAutoConfiguration \ No newline at end of file diff --git a/marketing-platform-admin/pom.xml b/marketing-platform-admin/pom.xml index f6f1dcd..9c8c1ff 100644 --- a/marketing-platform-admin/pom.xml +++ b/marketing-platform-admin/pom.xml @@ -11,7 +11,7 @@ pom - marketing-platform-admin-core - marketing-platform-admin-websocket + admin-core + admin-websocket diff --git a/marketing-platform-common/common-core/pom.xml b/marketing-platform-common/common-core/pom.xml index 8f14648..c193e43 100644 --- a/marketing-platform-common/common-core/pom.xml +++ b/marketing-platform-common/common-core/pom.xml @@ -4,7 +4,7 @@ marketing-platform-common com.baiye - 1.1.0 + ${revision} 4.0.0 common-core @@ -27,12 +27,12 @@ com.baiye common-model - 1.1.0 + ${revision} com.baiye common-util - 1.1.0 + ${revision} jakarta.servlet diff --git a/marketing-platform-common/common-desensitize/pom.xml b/marketing-platform-common/common-desensitize/pom.xml index ab63e53..b7a1da9 100644 --- a/marketing-platform-common/common-desensitize/pom.xml +++ b/marketing-platform-common/common-desensitize/pom.xml @@ -4,7 +4,7 @@ marketing-platform-common com.baiye - 1.1.0 + ${revision} 4.0.0 common-desensitize diff --git a/marketing-platform-common/common-idempotent/pom.xml b/marketing-platform-common/common-idempotent/pom.xml index fc87247..915b3f1 100644 --- a/marketing-platform-common/common-idempotent/pom.xml +++ b/marketing-platform-common/common-idempotent/pom.xml @@ -4,7 +4,7 @@ marketing-platform-common com.baiye - 1.1.0 + ${revision} 4.0.0 common-idempotent @@ -18,12 +18,12 @@ com.baiye common-core - 1.1.0 + ${revision} com.baiye common-util - 1.1.0 + ${revision} jakarta.servlet diff --git a/marketing-platform-common/common-log/pom.xml b/marketing-platform-common/common-log/pom.xml index 4953145..3202719 100644 --- a/marketing-platform-common/common-log/pom.xml +++ b/marketing-platform-common/common-log/pom.xml @@ -4,7 +4,7 @@ marketing-platform-common com.baiye - 1.1.0 + ${revision} 4.0.0 common-log @@ -13,7 +13,7 @@ com.baiye common-core - 1.1.0 + ${revision} jakarta.servlet diff --git a/marketing-platform-common/common-model/pom.xml b/marketing-platform-common/common-model/pom.xml index be2969c..f040cb9 100644 --- a/marketing-platform-common/common-model/pom.xml +++ b/marketing-platform-common/common-model/pom.xml @@ -4,7 +4,7 @@ marketing-platform-common com.baiye - 1.1.0 + ${revision} 4.0.0 common-model @@ -14,11 +14,12 @@ com.baomidou mybatis-plus-annotation + com.baiye common-i18n - 1.1.0 + io.swagger.core.v3 swagger-annotations diff --git a/marketing-platform-common/common-redis/pom.xml b/marketing-platform-common/common-redis/pom.xml index 5ed7819..18871fe 100644 --- a/marketing-platform-common/common-redis/pom.xml +++ b/marketing-platform-common/common-redis/pom.xml @@ -4,7 +4,7 @@ marketing-platform-common com.baiye - 1.1.0 + ${revision} 4.0.0 common-redis @@ -17,12 +17,12 @@ com.baiye common-core - 1.1.0 + ${revision} com.baiye common-util - 1.1.0 + ${revision} io.lettuce diff --git a/marketing-platform-common/common-util/pom.xml b/marketing-platform-common/common-util/pom.xml index 1a3d7bb..bdf6629 100644 --- a/marketing-platform-common/common-util/pom.xml +++ b/marketing-platform-common/common-util/pom.xml @@ -4,7 +4,7 @@ marketing-platform-common com.baiye - 1.1.0 + ${revision} 4.0.0 common-util diff --git a/marketing-platform-common/common-websocket/pom.xml b/marketing-platform-common/common-websocket/pom.xml index 469a8a1..320b1db 100644 --- a/marketing-platform-common/common-websocket/pom.xml +++ b/marketing-platform-common/common-websocket/pom.xml @@ -13,7 +13,7 @@ com.baiye common-util - 1.1.0 + ${revision} jakarta.annotation diff --git a/marketing-platform-common/pom.xml b/marketing-platform-common/pom.xml index f01ee19..75c3fa6 100644 --- a/marketing-platform-common/pom.xml +++ b/marketing-platform-common/pom.xml @@ -2,7 +2,7 @@ - com.hz.baiye + com.baiye marketing-platform ${revision} diff --git a/marketing-platform-extends/market-platform-extend-mybatis-plus/pom.xml b/marketing-platform-extends/marketing-platform-extend-mybatis-plus/pom.xml similarity index 94% rename from marketing-platform-extends/market-platform-extend-mybatis-plus/pom.xml rename to marketing-platform-extends/marketing-platform-extend-mybatis-plus/pom.xml index 794831d..b7b3d84 100644 --- a/marketing-platform-extends/market-platform-extend-mybatis-plus/pom.xml +++ b/marketing-platform-extends/marketing-platform-extend-mybatis-plus/pom.xml @@ -4,7 +4,7 @@ marketing-platform-extends com.baiye - 1.1.0 + ${revision} 4.0.0 marketing-platform-extend-mybatis-plus @@ -27,12 +27,12 @@ com.baiye common-core - 1.1.0 + ${revision} com.baiye common-model - 1.1.0 + ${revision} org.springframework.boot diff --git a/marketing-platform-extends/market-platform-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/alias/TableAlias.java b/marketing-platform-extends/marketing-platform-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/alias/TableAlias.java similarity index 100% rename from marketing-platform-extends/market-platform-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/alias/TableAlias.java rename to marketing-platform-extends/marketing-platform-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/alias/TableAlias.java diff --git a/marketing-platform-extends/market-platform-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/alias/TableAliasHelper.java b/marketing-platform-extends/marketing-platform-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/alias/TableAliasHelper.java similarity index 100% rename from marketing-platform-extends/market-platform-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/alias/TableAliasHelper.java rename to marketing-platform-extends/marketing-platform-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/alias/TableAliasHelper.java diff --git a/marketing-platform-extends/market-platform-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/alias/TableAliasNotFoundException.java b/marketing-platform-extends/marketing-platform-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/alias/TableAliasNotFoundException.java similarity index 100% rename from marketing-platform-extends/market-platform-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/alias/TableAliasNotFoundException.java rename to marketing-platform-extends/marketing-platform-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/alias/TableAliasNotFoundException.java diff --git a/marketing-platform-extends/market-platform-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/conditions/query/ColumnFunction.java b/marketing-platform-extends/marketing-platform-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/conditions/query/ColumnFunction.java similarity index 100% rename from marketing-platform-extends/market-platform-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/conditions/query/ColumnFunction.java rename to marketing-platform-extends/marketing-platform-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/conditions/query/ColumnFunction.java diff --git a/marketing-platform-extends/market-platform-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/conditions/query/LambdaAliasQueryWrapperX.java b/marketing-platform-extends/marketing-platform-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/conditions/query/LambdaAliasQueryWrapperX.java similarity index 100% rename from marketing-platform-extends/market-platform-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/conditions/query/LambdaAliasQueryWrapperX.java rename to marketing-platform-extends/marketing-platform-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/conditions/query/LambdaAliasQueryWrapperX.java diff --git a/marketing-platform-extends/market-platform-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/conditions/query/LambdaQueryWrapperX.java b/marketing-platform-extends/marketing-platform-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/conditions/query/LambdaQueryWrapperX.java similarity index 100% rename from marketing-platform-extends/market-platform-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/conditions/query/LambdaQueryWrapperX.java rename to marketing-platform-extends/marketing-platform-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/conditions/query/LambdaQueryWrapperX.java diff --git a/marketing-platform-extends/market-platform-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/converter/JsonStringArrayTypeHandler.java b/marketing-platform-extends/marketing-platform-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/converter/JsonStringArrayTypeHandler.java similarity index 100% rename from marketing-platform-extends/market-platform-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/converter/JsonStringArrayTypeHandler.java rename to marketing-platform-extends/marketing-platform-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/converter/JsonStringArrayTypeHandler.java diff --git a/marketing-platform-extends/market-platform-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/converter/ListIntToListLongTypeHandler.java b/marketing-platform-extends/marketing-platform-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/converter/ListIntToListLongTypeHandler.java similarity index 100% rename from marketing-platform-extends/market-platform-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/converter/ListIntToListLongTypeHandler.java rename to marketing-platform-extends/marketing-platform-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/converter/ListIntToListLongTypeHandler.java diff --git a/marketing-platform-extends/market-platform-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/injector/CustomSqlInjector.java b/marketing-platform-extends/marketing-platform-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/injector/CustomSqlInjector.java similarity index 100% rename from marketing-platform-extends/market-platform-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/injector/CustomSqlInjector.java rename to marketing-platform-extends/marketing-platform-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/injector/CustomSqlInjector.java diff --git a/marketing-platform-extends/market-platform-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/mapper/ExtendMapper.java b/marketing-platform-extends/marketing-platform-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/mapper/ExtendMapper.java similarity index 100% rename from marketing-platform-extends/market-platform-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/mapper/ExtendMapper.java rename to marketing-platform-extends/marketing-platform-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/mapper/ExtendMapper.java diff --git a/marketing-platform-extends/market-platform-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/methods/BaseInsertBatch.java b/marketing-platform-extends/marketing-platform-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/methods/BaseInsertBatch.java similarity index 100% rename from marketing-platform-extends/market-platform-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/methods/BaseInsertBatch.java rename to marketing-platform-extends/marketing-platform-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/methods/BaseInsertBatch.java diff --git a/marketing-platform-extends/market-platform-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/methods/InsertBatchSomeColumnByCollection.java b/marketing-platform-extends/marketing-platform-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/methods/InsertBatchSomeColumnByCollection.java similarity index 100% rename from marketing-platform-extends/market-platform-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/methods/InsertBatchSomeColumnByCollection.java rename to marketing-platform-extends/marketing-platform-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/methods/InsertBatchSomeColumnByCollection.java diff --git a/marketing-platform-extends/market-platform-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/methods/InsertIgnoreByBatch.java b/marketing-platform-extends/marketing-platform-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/methods/InsertIgnoreByBatch.java similarity index 100% rename from marketing-platform-extends/market-platform-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/methods/InsertIgnoreByBatch.java rename to marketing-platform-extends/marketing-platform-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/methods/InsertIgnoreByBatch.java diff --git a/marketing-platform-extends/market-platform-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/methods/InsertOrUpdateByBatch.java b/marketing-platform-extends/marketing-platform-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/methods/InsertOrUpdateByBatch.java similarity index 100% rename from marketing-platform-extends/market-platform-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/methods/InsertOrUpdateByBatch.java rename to marketing-platform-extends/marketing-platform-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/methods/InsertOrUpdateByBatch.java diff --git a/marketing-platform-extends/market-platform-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/methods/InsertOrUpdateFieldByBatch.java b/marketing-platform-extends/marketing-platform-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/methods/InsertOrUpdateFieldByBatch.java similarity index 100% rename from marketing-platform-extends/market-platform-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/methods/InsertOrUpdateFieldByBatch.java rename to marketing-platform-extends/marketing-platform-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/methods/InsertOrUpdateFieldByBatch.java diff --git a/marketing-platform-extends/market-platform-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/service/ExtendService.java b/marketing-platform-extends/marketing-platform-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/service/ExtendService.java similarity index 100% rename from marketing-platform-extends/market-platform-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/service/ExtendService.java rename to marketing-platform-extends/marketing-platform-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/service/ExtendService.java diff --git a/marketing-platform-extends/market-platform-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/service/impl/ExtendServiceImpl.java b/marketing-platform-extends/marketing-platform-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/service/impl/ExtendServiceImpl.java similarity index 100% rename from marketing-platform-extends/market-platform-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/service/impl/ExtendServiceImpl.java rename to marketing-platform-extends/marketing-platform-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/service/impl/ExtendServiceImpl.java diff --git a/marketing-platform-extends/market-platform-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/toolkit/PageUtil.java b/marketing-platform-extends/marketing-platform-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/toolkit/PageUtil.java similarity index 100% rename from marketing-platform-extends/market-platform-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/toolkit/PageUtil.java rename to marketing-platform-extends/marketing-platform-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/toolkit/PageUtil.java diff --git a/marketing-platform-extends/market-platform-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/toolkit/WrappersX.java b/marketing-platform-extends/marketing-platform-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/toolkit/WrappersX.java similarity index 100% rename from marketing-platform-extends/market-platform-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/toolkit/WrappersX.java rename to marketing-platform-extends/marketing-platform-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/toolkit/WrappersX.java diff --git a/marketing-platform-extends/market-platform-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/type/EnumNameTypeHandler.java b/marketing-platform-extends/marketing-platform-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/type/EnumNameTypeHandler.java similarity index 100% rename from marketing-platform-extends/market-platform-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/type/EnumNameTypeHandler.java rename to marketing-platform-extends/marketing-platform-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/type/EnumNameTypeHandler.java diff --git a/marketing-platform-extends/pom.xml b/marketing-platform-extends/pom.xml index 0ac9556..e0ff7d7 100644 --- a/marketing-platform-extends/pom.xml +++ b/marketing-platform-extends/pom.xml @@ -2,8 +2,9 @@ + - com.hz.baiye + com.baiye marketing-platform ${revision} diff --git a/marketing-platform-notify/distribute-notify-biz/pom.xml b/marketing-platform-notify/distribute-notify-biz/pom.xml index d8ebae3..01a3625 100644 --- a/marketing-platform-notify/distribute-notify-biz/pom.xml +++ b/marketing-platform-notify/distribute-notify-biz/pom.xml @@ -4,10 +4,10 @@ com.baiye marketing-platform-notify - 1.1.0 + ${revision} 4.0.0 - distribute-notify-biz + marketing-platform-notify-biz @@ -18,7 +18,7 @@ com.baiye distribute-notify-model - 1.1.0 + ${revision} diff --git a/marketing-platform-notify/distribute-notify-controller/pom.xml b/marketing-platform-notify/distribute-notify-controller/pom.xml index d5d264f..f4bb2c3 100644 --- a/marketing-platform-notify/distribute-notify-controller/pom.xml +++ b/marketing-platform-notify/distribute-notify-controller/pom.xml @@ -4,10 +4,10 @@ com.baiye marketing-platform-notify - 1.1.0 + ${revision} 4.0.0 - distribute-notify-controller + marketing-platform-notify-controller @@ -19,7 +19,7 @@ com.baiye distribute-notify-biz - 1.1.0 + ${revision} diff --git a/marketing-platform-notify/distribute-notify-model/pom.xml b/marketing-platform-notify/distribute-notify-model/pom.xml index a836131..84a51be 100644 --- a/marketing-platform-notify/distribute-notify-model/pom.xml +++ b/marketing-platform-notify/distribute-notify-model/pom.xml @@ -4,7 +4,7 @@ com.baiye marketing-platform-notify - 1.1.0 + ${revision} 4.0.0 distribute-notify-model diff --git a/marketing-platform-notify/pom.xml b/marketing-platform-notify/pom.xml index b87ef2a..d4f0367 100644 --- a/marketing-platform-notify/pom.xml +++ b/marketing-platform-notify/pom.xml @@ -2,7 +2,7 @@ - com.hz.baiye + com.baiye marketing-platform ${revision} diff --git a/marketing-platform-security/pom.xml b/marketing-platform-security/pom.xml index bb75964..871e032 100644 --- a/marketing-platform-security/pom.xml +++ b/marketing-platform-security/pom.xml @@ -2,7 +2,7 @@ - com.hz.baiye + com.baiye marketing-platform ${revision} diff --git a/marketing-platform-security/security-core/pom.xml b/marketing-platform-security/security-core/pom.xml index 6f27418..bde46a6 100644 --- a/marketing-platform-security/security-core/pom.xml +++ b/marketing-platform-security/security-core/pom.xml @@ -4,7 +4,7 @@ marketing-platform-security com.baiye - 1.1.0 + ${revision} 4.0.0 security-core diff --git a/marketing-platform-security/security-oauth2-authorization-server/pom.xml b/marketing-platform-security/security-oauth2-authorization-server/pom.xml index 4aa6906..9b38315 100644 --- a/marketing-platform-security/security-oauth2-authorization-server/pom.xml +++ b/marketing-platform-security/security-oauth2-authorization-server/pom.xml @@ -4,7 +4,7 @@ marketing-platform-security com.baiye - 1.1.0 + ${revision} 4.0.0 security-oauth2-authorization-server @@ -13,17 +13,17 @@ com.baiye common-core - 1.1.0 + ${revision} com.baiye security-core - 1.1.0 + ${revision} com.baiye security-oauth2-core - 1.1.0 + ${revision} jakarta.servlet diff --git a/marketing-platform-security/security-oauth2-core/pom.xml b/marketing-platform-security/security-oauth2-core/pom.xml index 547a6cb..f3cb661 100644 --- a/marketing-platform-security/security-oauth2-core/pom.xml +++ b/marketing-platform-security/security-oauth2-core/pom.xml @@ -4,7 +4,7 @@ marketing-platform-security com.baiye - 1.1.0 + ${revision} 4.0.0 security-oauth2-core diff --git a/marketing-platform-security/security-oauth2-resource-server/pom.xml b/marketing-platform-security/security-oauth2-resource-server/pom.xml index 5700aaf..234ffe0 100644 --- a/marketing-platform-security/security-oauth2-resource-server/pom.xml +++ b/marketing-platform-security/security-oauth2-resource-server/pom.xml @@ -4,7 +4,7 @@ marketing-platform-security com.baiye - 1.1.0 + ${revision} 4.0.0 security-oauth2-resource-server @@ -13,17 +13,17 @@ com.baiye common-model - 1.1.0 + ${revision} com.baiye common-util - 1.1.0 + ${revision} com.baiye security-oauth2-core - 1.1.0 + ${revision} jakarta.servlet diff --git a/marketing-platform-starters/marketing-platfrom-starter-easyexcel/pom.xml b/marketing-platform-starters/marketing-platform-starter-easyexcel/pom.xml similarity index 98% rename from marketing-platform-starters/marketing-platfrom-starter-easyexcel/pom.xml rename to marketing-platform-starters/marketing-platform-starter-easyexcel/pom.xml index 90fe17f..bd93220 100644 --- a/marketing-platform-starters/marketing-platfrom-starter-easyexcel/pom.xml +++ b/marketing-platform-starters/marketing-platform-starter-easyexcel/pom.xml @@ -4,7 +4,7 @@ marketing-platform-starters com.baiye - 1.1.0 + ${revision} 4.0.0 marketing-platform-starter-easyexcel diff --git a/marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/main/java/com/alibaba/excel/read/processor/DefaultAnalysisEventProcessor.java b/marketing-platform-starters/marketing-platform-starter-easyexcel/src/main/java/com/alibaba/excel/read/processor/DefaultAnalysisEventProcessor.java similarity index 100% rename from marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/main/java/com/alibaba/excel/read/processor/DefaultAnalysisEventProcessor.java rename to marketing-platform-starters/marketing-platform-starter-easyexcel/src/main/java/com/alibaba/excel/read/processor/DefaultAnalysisEventProcessor.java diff --git a/marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/main/java/com/baiye/common/excel/ExcelHandlerConfiguration.java b/marketing-platform-starters/marketing-platform-starter-easyexcel/src/main/java/com/baiye/common/excel/ExcelHandlerConfiguration.java similarity index 100% rename from marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/main/java/com/baiye/common/excel/ExcelHandlerConfiguration.java rename to marketing-platform-starters/marketing-platform-starter-easyexcel/src/main/java/com/baiye/common/excel/ExcelHandlerConfiguration.java diff --git a/marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/main/java/com/baiye/common/excel/ResponseExcelAutoConfiguration.java b/marketing-platform-starters/marketing-platform-starter-easyexcel/src/main/java/com/baiye/common/excel/ResponseExcelAutoConfiguration.java similarity index 100% rename from marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/main/java/com/baiye/common/excel/ResponseExcelAutoConfiguration.java rename to marketing-platform-starters/marketing-platform-starter-easyexcel/src/main/java/com/baiye/common/excel/ResponseExcelAutoConfiguration.java diff --git a/marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/main/java/com/baiye/common/excel/annotation/RequestExcel.java b/marketing-platform-starters/marketing-platform-starter-easyexcel/src/main/java/com/baiye/common/excel/annotation/RequestExcel.java similarity index 100% rename from marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/main/java/com/baiye/common/excel/annotation/RequestExcel.java rename to marketing-platform-starters/marketing-platform-starter-easyexcel/src/main/java/com/baiye/common/excel/annotation/RequestExcel.java diff --git a/marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/main/java/com/baiye/common/excel/annotation/ResponseExcel.java b/marketing-platform-starters/marketing-platform-starter-easyexcel/src/main/java/com/baiye/common/excel/annotation/ResponseExcel.java similarity index 100% rename from marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/main/java/com/baiye/common/excel/annotation/ResponseExcel.java rename to marketing-platform-starters/marketing-platform-starter-easyexcel/src/main/java/com/baiye/common/excel/annotation/ResponseExcel.java diff --git a/marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/main/java/com/baiye/common/excel/annotation/Sheet.java b/marketing-platform-starters/marketing-platform-starter-easyexcel/src/main/java/com/baiye/common/excel/annotation/Sheet.java similarity index 100% rename from marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/main/java/com/baiye/common/excel/annotation/Sheet.java rename to marketing-platform-starters/marketing-platform-starter-easyexcel/src/main/java/com/baiye/common/excel/annotation/Sheet.java diff --git a/marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/main/java/com/baiye/common/excel/aop/DynamicNameAspect.java b/marketing-platform-starters/marketing-platform-starter-easyexcel/src/main/java/com/baiye/common/excel/aop/DynamicNameAspect.java similarity index 100% rename from marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/main/java/com/baiye/common/excel/aop/DynamicNameAspect.java rename to marketing-platform-starters/marketing-platform-starter-easyexcel/src/main/java/com/baiye/common/excel/aop/DynamicNameAspect.java diff --git a/marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/main/java/com/baiye/common/excel/aop/RequestExcelArgumentResolver.java b/marketing-platform-starters/marketing-platform-starter-easyexcel/src/main/java/com/baiye/common/excel/aop/RequestExcelArgumentResolver.java similarity index 100% rename from marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/main/java/com/baiye/common/excel/aop/RequestExcelArgumentResolver.java rename to marketing-platform-starters/marketing-platform-starter-easyexcel/src/main/java/com/baiye/common/excel/aop/RequestExcelArgumentResolver.java diff --git a/marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/main/java/com/baiye/common/excel/aop/ResponseExcelReturnValueHandler.java b/marketing-platform-starters/marketing-platform-starter-easyexcel/src/main/java/com/baiye/common/excel/aop/ResponseExcelReturnValueHandler.java similarity index 100% rename from marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/main/java/com/baiye/common/excel/aop/ResponseExcelReturnValueHandler.java rename to marketing-platform-starters/marketing-platform-starter-easyexcel/src/main/java/com/baiye/common/excel/aop/ResponseExcelReturnValueHandler.java diff --git a/marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/main/java/com/baiye/common/excel/config/ExcelConfigProperties.java b/marketing-platform-starters/marketing-platform-starter-easyexcel/src/main/java/com/baiye/common/excel/config/ExcelConfigProperties.java similarity index 100% rename from marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/main/java/com/baiye/common/excel/config/ExcelConfigProperties.java rename to marketing-platform-starters/marketing-platform-starter-easyexcel/src/main/java/com/baiye/common/excel/config/ExcelConfigProperties.java diff --git a/marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/main/java/com/baiye/common/excel/converters/BooleanStringConverter.java b/marketing-platform-starters/marketing-platform-starter-easyexcel/src/main/java/com/baiye/common/excel/converters/BooleanStringConverter.java similarity index 100% rename from marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/main/java/com/baiye/common/excel/converters/BooleanStringConverter.java rename to marketing-platform-starters/marketing-platform-starter-easyexcel/src/main/java/com/baiye/common/excel/converters/BooleanStringConverter.java diff --git a/marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/main/java/com/baiye/common/excel/converters/ChannelConverter.java b/marketing-platform-starters/marketing-platform-starter-easyexcel/src/main/java/com/baiye/common/excel/converters/ChannelConverter.java similarity index 100% rename from marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/main/java/com/baiye/common/excel/converters/ChannelConverter.java rename to marketing-platform-starters/marketing-platform-starter-easyexcel/src/main/java/com/baiye/common/excel/converters/ChannelConverter.java diff --git a/marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/main/java/com/baiye/common/excel/converters/CustomStringStringConverter.java b/marketing-platform-starters/marketing-platform-starter-easyexcel/src/main/java/com/baiye/common/excel/converters/CustomStringStringConverter.java similarity index 100% rename from marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/main/java/com/baiye/common/excel/converters/CustomStringStringConverter.java rename to marketing-platform-starters/marketing-platform-starter-easyexcel/src/main/java/com/baiye/common/excel/converters/CustomStringStringConverter.java diff --git a/marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/main/java/com/baiye/common/excel/converters/LocalDateStringConverter.java b/marketing-platform-starters/marketing-platform-starter-easyexcel/src/main/java/com/baiye/common/excel/converters/LocalDateStringConverter.java similarity index 100% rename from marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/main/java/com/baiye/common/excel/converters/LocalDateStringConverter.java rename to marketing-platform-starters/marketing-platform-starter-easyexcel/src/main/java/com/baiye/common/excel/converters/LocalDateStringConverter.java diff --git a/marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/main/java/com/baiye/common/excel/converters/LocalDateTimeConverter.java b/marketing-platform-starters/marketing-platform-starter-easyexcel/src/main/java/com/baiye/common/excel/converters/LocalDateTimeConverter.java similarity index 100% rename from marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/main/java/com/baiye/common/excel/converters/LocalDateTimeConverter.java rename to marketing-platform-starters/marketing-platform-starter-easyexcel/src/main/java/com/baiye/common/excel/converters/LocalDateTimeConverter.java diff --git a/marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/main/java/com/baiye/common/excel/converters/LocalDateTimeStringConverter.java b/marketing-platform-starters/marketing-platform-starter-easyexcel/src/main/java/com/baiye/common/excel/converters/LocalDateTimeStringConverter.java similarity index 100% rename from marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/main/java/com/baiye/common/excel/converters/LocalDateTimeStringConverter.java rename to marketing-platform-starters/marketing-platform-starter-easyexcel/src/main/java/com/baiye/common/excel/converters/LocalDateTimeStringConverter.java diff --git a/marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/main/java/com/baiye/common/excel/converters/NidStringConverter.java b/marketing-platform-starters/marketing-platform-starter-easyexcel/src/main/java/com/baiye/common/excel/converters/NidStringConverter.java similarity index 100% rename from marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/main/java/com/baiye/common/excel/converters/NidStringConverter.java rename to marketing-platform-starters/marketing-platform-starter-easyexcel/src/main/java/com/baiye/common/excel/converters/NidStringConverter.java diff --git a/marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/main/java/com/baiye/common/excel/converters/SexConverter.java b/marketing-platform-starters/marketing-platform-starter-easyexcel/src/main/java/com/baiye/common/excel/converters/SexConverter.java similarity index 100% rename from marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/main/java/com/baiye/common/excel/converters/SexConverter.java rename to marketing-platform-starters/marketing-platform-starter-easyexcel/src/main/java/com/baiye/common/excel/converters/SexConverter.java diff --git a/marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/main/java/com/baiye/common/excel/domain/ErrorMessage.java b/marketing-platform-starters/marketing-platform-starter-easyexcel/src/main/java/com/baiye/common/excel/domain/ErrorMessage.java similarity index 100% rename from marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/main/java/com/baiye/common/excel/domain/ErrorMessage.java rename to marketing-platform-starters/marketing-platform-starter-easyexcel/src/main/java/com/baiye/common/excel/domain/ErrorMessage.java diff --git a/marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/main/java/com/baiye/common/excel/domain/SheetBuildProperties.java b/marketing-platform-starters/marketing-platform-starter-easyexcel/src/main/java/com/baiye/common/excel/domain/SheetBuildProperties.java similarity index 100% rename from marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/main/java/com/baiye/common/excel/domain/SheetBuildProperties.java rename to marketing-platform-starters/marketing-platform-starter-easyexcel/src/main/java/com/baiye/common/excel/domain/SheetBuildProperties.java diff --git a/marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/main/java/com/baiye/common/excel/enhance/DefaultWriterBuilderEnhancer.java b/marketing-platform-starters/marketing-platform-starter-easyexcel/src/main/java/com/baiye/common/excel/enhance/DefaultWriterBuilderEnhancer.java similarity index 100% rename from marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/main/java/com/baiye/common/excel/enhance/DefaultWriterBuilderEnhancer.java rename to marketing-platform-starters/marketing-platform-starter-easyexcel/src/main/java/com/baiye/common/excel/enhance/DefaultWriterBuilderEnhancer.java diff --git a/marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/main/java/com/baiye/common/excel/enhance/WriterBuilderEnhancer.java b/marketing-platform-starters/marketing-platform-starter-easyexcel/src/main/java/com/baiye/common/excel/enhance/WriterBuilderEnhancer.java similarity index 100% rename from marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/main/java/com/baiye/common/excel/enhance/WriterBuilderEnhancer.java rename to marketing-platform-starters/marketing-platform-starter-easyexcel/src/main/java/com/baiye/common/excel/enhance/WriterBuilderEnhancer.java diff --git a/marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/main/java/com/baiye/common/excel/handler/AbstractSheetWriteHandler.java b/marketing-platform-starters/marketing-platform-starter-easyexcel/src/main/java/com/baiye/common/excel/handler/AbstractSheetWriteHandler.java similarity index 100% rename from marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/main/java/com/baiye/common/excel/handler/AbstractSheetWriteHandler.java rename to marketing-platform-starters/marketing-platform-starter-easyexcel/src/main/java/com/baiye/common/excel/handler/AbstractSheetWriteHandler.java diff --git a/marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/main/java/com/baiye/common/excel/handler/DefaultAnalysisEventListener.java b/marketing-platform-starters/marketing-platform-starter-easyexcel/src/main/java/com/baiye/common/excel/handler/DefaultAnalysisEventListener.java similarity index 100% rename from marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/main/java/com/baiye/common/excel/handler/DefaultAnalysisEventListener.java rename to marketing-platform-starters/marketing-platform-starter-easyexcel/src/main/java/com/baiye/common/excel/handler/DefaultAnalysisEventListener.java diff --git a/marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/main/java/com/baiye/common/excel/handler/ListAnalysisEventListener.java b/marketing-platform-starters/marketing-platform-starter-easyexcel/src/main/java/com/baiye/common/excel/handler/ListAnalysisEventListener.java similarity index 100% rename from marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/main/java/com/baiye/common/excel/handler/ListAnalysisEventListener.java rename to marketing-platform-starters/marketing-platform-starter-easyexcel/src/main/java/com/baiye/common/excel/handler/ListAnalysisEventListener.java diff --git a/marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/main/java/com/baiye/common/excel/handler/ManySheetWriteHandler.java b/marketing-platform-starters/marketing-platform-starter-easyexcel/src/main/java/com/baiye/common/excel/handler/ManySheetWriteHandler.java similarity index 100% rename from marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/main/java/com/baiye/common/excel/handler/ManySheetWriteHandler.java rename to marketing-platform-starters/marketing-platform-starter-easyexcel/src/main/java/com/baiye/common/excel/handler/ManySheetWriteHandler.java diff --git a/marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/main/java/com/baiye/common/excel/handler/SheetWriteHandler.java b/marketing-platform-starters/marketing-platform-starter-easyexcel/src/main/java/com/baiye/common/excel/handler/SheetWriteHandler.java similarity index 100% rename from marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/main/java/com/baiye/common/excel/handler/SheetWriteHandler.java rename to marketing-platform-starters/marketing-platform-starter-easyexcel/src/main/java/com/baiye/common/excel/handler/SheetWriteHandler.java diff --git a/marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/main/java/com/baiye/common/excel/handler/SingleSheetWriteHandler.java b/marketing-platform-starters/marketing-platform-starter-easyexcel/src/main/java/com/baiye/common/excel/handler/SingleSheetWriteHandler.java similarity index 100% rename from marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/main/java/com/baiye/common/excel/handler/SingleSheetWriteHandler.java rename to marketing-platform-starters/marketing-platform-starter-easyexcel/src/main/java/com/baiye/common/excel/handler/SingleSheetWriteHandler.java diff --git a/marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/main/java/com/baiye/common/excel/head/EmptyHeadGenerator.java b/marketing-platform-starters/marketing-platform-starter-easyexcel/src/main/java/com/baiye/common/excel/head/EmptyHeadGenerator.java similarity index 100% rename from marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/main/java/com/baiye/common/excel/head/EmptyHeadGenerator.java rename to marketing-platform-starters/marketing-platform-starter-easyexcel/src/main/java/com/baiye/common/excel/head/EmptyHeadGenerator.java diff --git a/marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/main/java/com/baiye/common/excel/head/HeadGenerator.java b/marketing-platform-starters/marketing-platform-starter-easyexcel/src/main/java/com/baiye/common/excel/head/HeadGenerator.java similarity index 100% rename from marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/main/java/com/baiye/common/excel/head/HeadGenerator.java rename to marketing-platform-starters/marketing-platform-starter-easyexcel/src/main/java/com/baiye/common/excel/head/HeadGenerator.java diff --git a/marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/main/java/com/baiye/common/excel/head/HeadMeta.java b/marketing-platform-starters/marketing-platform-starter-easyexcel/src/main/java/com/baiye/common/excel/head/HeadMeta.java similarity index 100% rename from marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/main/java/com/baiye/common/excel/head/HeadMeta.java rename to marketing-platform-starters/marketing-platform-starter-easyexcel/src/main/java/com/baiye/common/excel/head/HeadMeta.java diff --git a/marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/main/java/com/baiye/common/excel/head/I18nHeaderCellWriteHandler.java b/marketing-platform-starters/marketing-platform-starter-easyexcel/src/main/java/com/baiye/common/excel/head/I18nHeaderCellWriteHandler.java similarity index 100% rename from marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/main/java/com/baiye/common/excel/head/I18nHeaderCellWriteHandler.java rename to marketing-platform-starters/marketing-platform-starter-easyexcel/src/main/java/com/baiye/common/excel/head/I18nHeaderCellWriteHandler.java diff --git a/marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/main/java/com/baiye/common/excel/kit/ExcelException.java b/marketing-platform-starters/marketing-platform-starter-easyexcel/src/main/java/com/baiye/common/excel/kit/ExcelException.java similarity index 100% rename from marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/main/java/com/baiye/common/excel/kit/ExcelException.java rename to marketing-platform-starters/marketing-platform-starter-easyexcel/src/main/java/com/baiye/common/excel/kit/ExcelException.java diff --git a/marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/main/java/com/baiye/common/excel/kit/Validators.java b/marketing-platform-starters/marketing-platform-starter-easyexcel/src/main/java/com/baiye/common/excel/kit/Validators.java similarity index 100% rename from marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/main/java/com/baiye/common/excel/kit/Validators.java rename to marketing-platform-starters/marketing-platform-starter-easyexcel/src/main/java/com/baiye/common/excel/kit/Validators.java diff --git a/marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/main/java/com/baiye/common/excel/processor/NameProcessor.java b/marketing-platform-starters/marketing-platform-starter-easyexcel/src/main/java/com/baiye/common/excel/processor/NameProcessor.java similarity index 100% rename from marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/main/java/com/baiye/common/excel/processor/NameProcessor.java rename to marketing-platform-starters/marketing-platform-starter-easyexcel/src/main/java/com/baiye/common/excel/processor/NameProcessor.java diff --git a/marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/main/java/com/baiye/common/excel/processor/NameSpelExpressionProcessor.java b/marketing-platform-starters/marketing-platform-starter-easyexcel/src/main/java/com/baiye/common/excel/processor/NameSpelExpressionProcessor.java similarity index 100% rename from marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/main/java/com/baiye/common/excel/processor/NameSpelExpressionProcessor.java rename to marketing-platform-starters/marketing-platform-starter-easyexcel/src/main/java/com/baiye/common/excel/processor/NameSpelExpressionProcessor.java diff --git a/marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/main/resources/META-INF/spring.factories b/marketing-platform-starters/marketing-platform-starter-easyexcel/src/main/resources/META-INF/spring.factories similarity index 100% rename from marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/main/resources/META-INF/spring.factories rename to marketing-platform-starters/marketing-platform-starter-easyexcel/src/main/resources/META-INF/spring.factories diff --git a/marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/marketing-platform-starters/marketing-platform-starter-easyexcel/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to marketing-platform-starters/marketing-platform-starter-easyexcel/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/test/java/hccake/ballcat/excel/application/DemoData.java b/marketing-platform-starters/marketing-platform-starter-easyexcel/src/test/java/hccake/ballcat/excel/application/DemoData.java similarity index 100% rename from marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/test/java/hccake/ballcat/excel/application/DemoData.java rename to marketing-platform-starters/marketing-platform-starter-easyexcel/src/test/java/hccake/ballcat/excel/application/DemoData.java diff --git a/marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/test/java/hccake/ballcat/excel/application/ExcelExportTestController.java b/marketing-platform-starters/marketing-platform-starter-easyexcel/src/test/java/hccake/ballcat/excel/application/ExcelExportTestController.java similarity index 100% rename from marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/test/java/hccake/ballcat/excel/application/ExcelExportTestController.java rename to marketing-platform-starters/marketing-platform-starter-easyexcel/src/test/java/hccake/ballcat/excel/application/ExcelExportTestController.java diff --git a/marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/test/java/hccake/ballcat/excel/application/ExcelFillTestController.java b/marketing-platform-starters/marketing-platform-starter-easyexcel/src/test/java/hccake/ballcat/excel/application/ExcelFillTestController.java similarity index 100% rename from marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/test/java/hccake/ballcat/excel/application/ExcelFillTestController.java rename to marketing-platform-starters/marketing-platform-starter-easyexcel/src/test/java/hccake/ballcat/excel/application/ExcelFillTestController.java diff --git a/marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/test/java/hccake/ballcat/excel/application/ExcelImportTestController.java b/marketing-platform-starters/marketing-platform-starter-easyexcel/src/test/java/hccake/ballcat/excel/application/ExcelImportTestController.java similarity index 100% rename from marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/test/java/hccake/ballcat/excel/application/ExcelImportTestController.java rename to marketing-platform-starters/marketing-platform-starter-easyexcel/src/test/java/hccake/ballcat/excel/application/ExcelImportTestController.java diff --git a/marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/test/java/hccake/ballcat/excel/application/ExcelTestApplication.java b/marketing-platform-starters/marketing-platform-starter-easyexcel/src/test/java/hccake/ballcat/excel/application/ExcelTestApplication.java similarity index 100% rename from marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/test/java/hccake/ballcat/excel/application/ExcelTestApplication.java rename to marketing-platform-starters/marketing-platform-starter-easyexcel/src/test/java/hccake/ballcat/excel/application/ExcelTestApplication.java diff --git a/marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/test/resources/excel/fill-template.xlsx b/marketing-platform-starters/marketing-platform-starter-easyexcel/src/test/resources/excel/fill-template.xlsx similarity index 100% rename from marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/test/resources/excel/fill-template.xlsx rename to marketing-platform-starters/marketing-platform-starter-easyexcel/src/test/resources/excel/fill-template.xlsx diff --git a/marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/test/resources/excel/template.xlsx b/marketing-platform-starters/marketing-platform-starter-easyexcel/src/test/resources/excel/template.xlsx similarity index 100% rename from marketing-platform-starters/marketing-platfrom-starter-easyexcel/src/test/resources/excel/template.xlsx rename to marketing-platform-starters/marketing-platform-starter-easyexcel/src/test/resources/excel/template.xlsx diff --git a/marketing-platform-starters/marketing-platform-starter-file/pom.xml b/marketing-platform-starters/marketing-platform-starter-file/pom.xml index e468b1c..7b0c186 100644 --- a/marketing-platform-starters/marketing-platform-starter-file/pom.xml +++ b/marketing-platform-starters/marketing-platform-starter-file/pom.xml @@ -4,7 +4,7 @@ marketing-platform-starters com.baiye - 1.1.0 + ${revision} 4.0.0 marketing-platform-starter-file @@ -13,7 +13,7 @@ com.baiye common-util - 1.1.0 + ${revision} cn.hutool diff --git a/marketing-platform-starters/marketing-platform-starter-job/pom.xml b/marketing-platform-starters/marketing-platform-starter-job/pom.xml index 58e991d..16a3e06 100644 --- a/marketing-platform-starters/marketing-platform-starter-job/pom.xml +++ b/marketing-platform-starters/marketing-platform-starter-job/pom.xml @@ -5,7 +5,7 @@ marketing-platform-starters com.baiye - 1.1.0 + ${revision} 4.0.0 diff --git a/marketing-platform-starters/marketing-platform-starter-redis/pom.xml b/marketing-platform-starters/marketing-platform-starter-redis/pom.xml index 8bff063..3ba49d4 100644 --- a/marketing-platform-starters/marketing-platform-starter-redis/pom.xml +++ b/marketing-platform-starters/marketing-platform-starter-redis/pom.xml @@ -4,7 +4,7 @@ marketing-platform-starters com.baiye - 1.1.0 + ${revision} 4.0.0 marketing-platform-starter-redis @@ -18,7 +18,7 @@ com.baiye common-redis - 1.1.0 + ${revision} org.springframework.boot diff --git a/marketing-platform-starters/marketing-platform-starter-swagger/pom.xml b/marketing-platform-starters/marketing-platform-starter-swagger/pom.xml index d0e0667..6de36f3 100644 --- a/marketing-platform-starters/marketing-platform-starter-swagger/pom.xml +++ b/marketing-platform-starters/marketing-platform-starter-swagger/pom.xml @@ -4,7 +4,7 @@ marketing-platform-starters com.baiye - 1.1.0 + ${revision} 4.0.0 marketing-platform-starter-swagger diff --git a/marketing-platform-starters/marketing-platform-starter-web/pom.xml b/marketing-platform-starters/marketing-platform-starter-web/pom.xml index c77d209..b3608e1 100644 --- a/marketing-platform-starters/marketing-platform-starter-web/pom.xml +++ b/marketing-platform-starters/marketing-platform-starter-web/pom.xml @@ -4,7 +4,7 @@ marketing-platform-starters com.baiye - 1.1.0 + ${revision} 4.0.0 marketing-platform-starter-web @@ -13,22 +13,24 @@ com.baiye common-core - 1.1.0 + ${revision} + com.baiye common-desensitize - 1.1.0 + ${revision} + com.baiye common-model - 1.1.0 + ${revision} com.baiye common-util - 1.1.0 + ${revision} diff --git a/marketing-platform-starters/marketing-platform-starter-websocket/pom.xml b/marketing-platform-starters/marketing-platform-starter-websocket/pom.xml index e36d9dd..11073b3 100644 --- a/marketing-platform-starters/marketing-platform-starter-websocket/pom.xml +++ b/marketing-platform-starters/marketing-platform-starter-websocket/pom.xml @@ -4,7 +4,7 @@ marketing-platform-starters com.baiye - 1.1.0 + ${revision} 4.0.0 marketing-platform-starter-websocket @@ -13,12 +13,12 @@ com.baiye common-util - 1.1.0 + ${revision} com.baiye common-websocket - 1.1.0 + ${revision} diff --git a/marketing-platform-starters/pom.xml b/marketing-platform-starters/pom.xml index d6a38c9..f2f7d2a 100644 --- a/marketing-platform-starters/pom.xml +++ b/marketing-platform-starters/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - com.hz.baiye + com.baiye marketing-platform ${revision} diff --git a/marketing-platform-system/pom.xml b/marketing-platform-system/pom.xml index 0861713..62c18ba 100644 --- a/marketing-platform-system/pom.xml +++ b/marketing-platform-system/pom.xml @@ -2,7 +2,7 @@ - com.hz.baiye + com.baiye marketing-platform ${revision} @@ -29,7 +29,6 @@ com.baiye marketing-platform-extend-mybatis-plus - 1.1.0 diff --git a/marketing-platform-system/system-biz/pom.xml b/marketing-platform-system/system-biz/pom.xml index 55be45e..08d0b74 100644 --- a/marketing-platform-system/system-biz/pom.xml +++ b/marketing-platform-system/system-biz/pom.xml @@ -4,7 +4,7 @@ marketing-platform-system com.baiye - 1.1.0 + ${revision} 4.0.0 system-biz @@ -13,22 +13,22 @@ com.baiye common-redis - 1.1.0 + ${revision} com.baiye security-core - 1.1.0 + ${revision} com.baiye security-oauth2-core - 1.1.0 + ${revision} com.baiye system-model - 1.1.0 + ${revision} org.springframework.boot @@ -39,12 +39,12 @@ com.baiye security-oauth2-authorization-server true - 1.1.0 + ${revision} com.baiye marketing-platform-starter-file - 1.1.0 + ${revision} diff --git a/marketing-platform-system/system-controller/pom.xml b/marketing-platform-system/system-controller/pom.xml index 3116d40..6f84c2b 100644 --- a/marketing-platform-system/system-controller/pom.xml +++ b/marketing-platform-system/system-controller/pom.xml @@ -4,7 +4,7 @@ marketing-platform-system com.baiye - 1.1.0 + ${revision} 4.0.0 system-controller @@ -13,12 +13,12 @@ com.baiye common-log - 1.1.0 + ${revision} com.baiye system-biz - 1.1.0 + ${revision} diff --git a/marketing-platform-system/system-model/pom.xml b/marketing-platform-system/system-model/pom.xml index b30df5a..38d5eae 100644 --- a/marketing-platform-system/system-model/pom.xml +++ b/marketing-platform-system/system-model/pom.xml @@ -4,7 +4,7 @@ marketing-platform-system com.baiye - 1.1.0 + ${revision} 4.0.0 system-model @@ -17,13 +17,15 @@ com.baiye common-desensitize - 1.1.0 + ${revision} + + com.baiye common-i18n - 1.1.0 + io.swagger.core.v3 swagger-annotations diff --git a/marketing-platform-system/system-model/src/main/java/com/baiye/system/model/entity/SysUserRolePromise.java b/marketing-platform-system/system-model/src/main/java/com/baiye/system/model/entity/SysUserRolePromise.java index 9d4d4b2..a3c4a1f 100644 --- a/marketing-platform-system/system-model/src/main/java/com/baiye/system/model/entity/SysUserRolePromise.java +++ b/marketing-platform-system/system-model/src/main/java/com/baiye/system/model/entity/SysUserRolePromise.java @@ -18,47 +18,47 @@ import java.util.List; @Data @TableAlias("urp") -@TableName(value = "sys_user_role_promise",autoResultMap = true) +@TableName(value = "sys_user_role_promise", autoResultMap = true) @Schema(title = "用户角色") public class SysUserRolePromise implements Serializable { - private static final long serialVersionUID = 355851270267008536L; + private static final long serialVersionUID = 355851270267008536L; - @TableId - private Long id; + @TableId + private Long id; - /** - * 用户ID - */ - @Schema(title = "用户id") - private Long userId; + /** + * 用户ID + */ + @Schema(title = "用户id") + private Long userId; - /** - * 公司id - */ - @Schema(title = "公司id") - private Long companyId; + /** + * 公司id + */ + @Schema(title = "公司id") + private Long companyId; - /** - * 角色Code - */ - @Schema(title = "角色Code") - @TableField(value = "role_codes", typeHandler = JsonStringArrayTypeHandler.class) - private List roleCodes; + /** + * 角色Code + */ + @Schema(title = "角色Code") + @TableField(value = "role_codes", typeHandler = JsonStringArrayTypeHandler.class) + private List roleCodes; - /** - * 权限类型 1 审核 2权限 - */ - @Schema(title = "权限类型") - private Integer roleType; + /** + * 权限类型 1 审核 2权限 + */ + @Schema(title = "权限类型") + private Integer roleType; - @Schema(title = "是否审核") - private Boolean isAutoAudits; + @Schema(title = "是否审核") + private Boolean isAutoAudits; - @Schema(title = "ni是否可见") - private Boolean isShowNid; + @Schema(title = "ni是否可见") + private Boolean isShowNid; } diff --git a/pom.xml b/pom.xml index d70e048..1a81836 100644 --- a/pom.xml +++ b/pom.xml @@ -1,542 +1,534 @@ - 4.0.0 - com.baiye - ad-distribute - ${revision} - pom + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + com.baiye + marketing-platform + ${revision} + pom - - admin - marketing-platform-system - marketing-platform-common - marketing-platform-security - marketing-platform-admin - marketing-platform-notify - marketing-platform-starters - marketing-platform-extends - + + admin + marketing-platform-system + marketing-platform-common + marketing-platform-security + marketing-platform-admin + marketing-platform-notify + marketing-platform-starters + marketing-platform-extends + - - 1.0.0 - 1.8 - UTF-8 - UTF-8 - 1.4.0 + + 1.0.0 + 1.8 + UTF-8 + UTF-8 - - 1.5.0 - 3.11.0 - 1.6 - 3.3.1 - 3.0.0 - 3.5.0 - 3.3.0 - 3.1.0 - 1.6.13 - 0.0.39 + + 1.5.0 + 3.11.0 + 1.6 + 3.3.1 + 3.0.0 + 3.5.0 + 3.3.0 + 3.1.0 + 1.6.13 + 0.0.39 - - 4.11.28.ALL - 3.3.2 - 1.2.83 - 5.8.16 - 2.2.7 - 2.7.0 - 1.15.3 - 4.3 - 2.6.3 - 1.18.26 - 1.5.3.Final - 3.5.3.1 - 3.5.10 - 4.1.2 - 1.3.2 - 2.2.0 - 2.20.70 - 0.4.2 - 2.7.12 - 1.7.0 - 3.0.0 - 1.6.8 - 0.4.2 - 2.4.0 - 1.6.2 - - 1.53.0 - 3.21.7 - 0.6.1 - 1.7.1 - 1.3.2 - + + 4.11.28.ALL + 3.3.2 + 1.2.83 + 5.8.16 + 2.2.7 + 2.7.0 + 1.15.3 + 4.3 + 2.6.3 + 1.18.26 + 1.5.3.Final + 3.5.3.1 + 3.5.10 + 4.1.2 + 1.3.2 + 2.2.0 + 2.20.70 + 0.4.2 + 2.7.12 + 1.7.0 + 3.0.0 + 1.6.8 + 0.4.2 + 2.4.0 + 1.6.2 + + 1.53.0 + 3.21.7 + 0.6.1 + 1.7.1 + 1.3.2 + - - - - - - - org.springframework.boot - spring-boot-dependencies - ${spring-boot.version} - import - pom - - - - cn.hutool - hutool-bom - ${hutool.version} - import - pom - + + + + + + + org.springframework.boot + spring-boot-dependencies + ${spring-boot.version} + import + pom + + + + cn.hutool + hutool-bom + ${hutool.version} + import + pom + - - - cn.hutool - hutool-all - ${hutool.version} - + + + cn.hutool + hutool-all + ${hutool.version} + - - - org.springdoc - springdoc-openapi - ${springdoc-openapi.verison} - import - pom - - - - software.amazon.awssdk - bom - ${software.amazon.awssdk.version} - import - pom - + + + org.springdoc + springdoc-openapi + ${springdoc-openapi.verison} + import + pom + + + + software.amazon.awssdk + bom + ${software.amazon.awssdk.version} + import + pom + - - - - com.alibaba - easyexcel - ${easyexcel.version} - - - - com.alibaba - fastjson - ${fastjson.version} - true - - - com.baomidou - mybatis-plus-annotation - ${mybatis-plus.version} - - - com.baomidou - mybatis-plus-boot-starter - ${mybatis-plus.version} - - - com.baomidou - mybatis-plus-core - ${mybatis-plus.version} - - - - com.baomidou - mybatis-plus-extension - ${mybatis-plus.version} - - - - com.github.jsqlparser - jsqlparser - ${jsqlparser.version} - - - com.nimbusds - nimbus-jose-jwt - 9.15.2 - - - - commons-net - commons-net - 3.9.0 - - - io.springfox - springfox-boot-starter - ${springfox.version} - - - io.springfox - springfox-swagger-ui - ${springfox.version} - - - - io.springfox - springfox-swagger2 - ${springfox.version} - - - - io.swagger.core.v3 - swagger-annotations - ${io.swagger.v3.version} - - - io.swagger.core.v3 - swagger-models - ${io.swagger.v3.version} - - - - io.swagger - swagger-annotations - ${swagger.version} - - - io.swagger - swagger-models - ${swagger.version} - - - - org.apache.poi - poi-ooxml - ${poi.version} - - - org.apache.rocketmq - rocketmq-spring-boot-starter - ${rocketmq.version} - - - - org.jsoup - jsoup - ${jsoup.version} - - - org.lionsoul - ip2region - ${ip2region.version} - - - - org.mapstruct - mapstruct - ${mapstruct.version} - - - - org.mybatis - mybatis - ${mybatis.version} - - - - org.projectlombok - lombok - ${lombok.version} - - - - org.springframework.security - spring-security-oauth2-authorization-server - ${spring-authorization-server.version} - + + + + com.alibaba + easyexcel + ${easyexcel.version} + + + + com.alibaba + fastjson + ${fastjson.version} + true + + + com.baomidou + mybatis-plus-annotation + ${mybatis-plus.version} + - - - io.grpc - grpc-protobuf - ${grpc.version} - - - io.grpc - grpc-stub - ${grpc.version} - - - io.grpc - grpc-netty - ${grpc.version} - + + com.baiye + common-i18n + 1.1.0 + - - - com.baiye - admin-core - 1.1.0 - - - com.baiye - admin-websocket - 1.1.0 - - - com.baiye - common-core - 1.1.0 - - - com.baiye - common-desensitize - 1.1.0 - - - com.baiye - common-i18n - 1.1.0 - - - com.baiye - common-idempotent - 1.1.0 - - - com.baiye - common-log - 1.1.0 - - - com.baiye - common-model - 1.1.0 - - - com.baiye - common-redis - 1.1.0 - - - com.baiye - common-util - 1.1.0 - - - com.baiye - common-websocket - 1.1.0 - - - - com.baiye - ad-distribute-extend-mybatis-plus - 1.1.0 - - - - com.baiye - security-core - 1.1.0 - - - com.baiye - ad-distribute-starter-file - 1.1.0 - + + com.baomidou + mybatis-plus-boot-starter + ${mybatis-plus.version} + + + com.baomidou + mybatis-plus-core + ${mybatis-plus.version} + + + + com.baomidou + mybatis-plus-extension + ${mybatis-plus.version} + + + + com.github.jsqlparser + jsqlparser + ${jsqlparser.version} + + + com.nimbusds + nimbus-jose-jwt + 9.15.2 + + + + commons-net + commons-net + 3.9.0 + + + io.springfox + springfox-boot-starter + ${springfox.version} + + + io.springfox + springfox-swagger-ui + ${springfox.version} + + + + io.springfox + springfox-swagger2 + ${springfox.version} + + + + io.swagger.core.v3 + swagger-annotations + ${io.swagger.v3.version} + + + io.swagger.core.v3 + swagger-models + ${io.swagger.v3.version} + + + + io.swagger + swagger-annotations + ${swagger.version} + + + io.swagger + swagger-models + ${swagger.version} + + + + org.apache.poi + poi-ooxml + ${poi.version} + + + org.apache.rocketmq + rocketmq-spring-boot-starter + ${rocketmq.version} + + + + org.jsoup + jsoup + ${jsoup.version} + + + org.lionsoul + ip2region + ${ip2region.version} + + + + org.mapstruct + mapstruct + ${mapstruct.version} + + + + org.mybatis + mybatis + ${mybatis.version} + + + + org.projectlombok + lombok + ${lombok.version} + + + + org.springframework.security + spring-security-oauth2-authorization-server + ${spring-authorization-server.version} + - - com.baiye - ad-distribute-starter-redis - 1.1.0 - + + + io.grpc + grpc-protobuf + ${grpc.version} + + + io.grpc + grpc-stub + ${grpc.version} + + + io.grpc + grpc-netty + ${grpc.version} + - - com.baiye - ad-distribute-starter-swagger - 1.1.0 - - - - com.baiye - ad-distribute-starter-websocket - 1.1.0 - + + com.baiye + admin-websocket + ${revision} + - - com.baiye - security-oauth2-authorization-server - 1.1.0 - - - com.baiye - security-oauth2-core - 1.1.0 - - - com.baiye - security-oauth2-resource-server - 1.1.0 - - - - com.baiye - system-biz - 1.1.0 - - - com.baiye - system-controller - 1.1.0 - - - com.baiye - system-model - 1.1.0 - - + + com.baiye + common-core + ${revision} + + + com.baiye + common-desensitize + ${revision} + + + com.baiye + common-idempotent + ${revision} + + + com.baiye + common-log + ${revision} + + + com.baiye + common-model + ${revision} + + + com.baiye + common-redis + ${revision} + + + com.baiye + common-util + ${revision} + + + com.baiye + common-websocket + ${revision} + + + + com.baiye + marketing-platform-extend-mybatis-plus + ${revision} + + + + com.baiye + security-core + ${revision} + - - - com.github.whvcse - easy-captcha - ${captcha.version} - + + com.baiye + marketing-platform-starter-file + ${revision} + - - net.lingala.zip4j - zip4j - ${zip4j.version} - + + com.baiye + marketing-platform-starter-redis + ${revision} + - - + + com.baiye + marketing-platform-starter-swagger + ${revision} + - - - - - - - org.apache.maven.plugins - maven-gpg-plugin - ${maven-gpg-plugin.version} - - - - sign - - sign-artifacts - verify - - - - - - ossrh - - + + com.baiye + security-oauth2-authorization-server + ${revision} + + + com.baiye + security-oauth2-core + ${revision} + + + com.baiye + security-oauth2-resource-server + ${revision} + + + + com.baiye + system-biz + ${revision} + + + com.baiye + system-controller + ${revision} + + + com.baiye + system-model + ${revision} + + - - - - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - ossrh - - - https://oss.sonatype.org/content/repositories/snapshots - ossrh - - + + + com.github.whvcse + easy-captcha + ${captcha.version} + - - - - - true - src/main/resources - - **/*.yml - **/*.yaml - logback-spring.xml - - - - false - src/main/resources - - **/*.yml - **/*.yaml - logback-spring.xml - - - + + net.lingala.zip4j + zip4j + ${zip4j.version} + - - - org.codehaus.mojo - flatten-maven-plugin - - resolveCiFriendliesOnly - true - - - - - flatten - - flatten - process-resources - - - - clean - - flatten.clean - clean - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.verison} - - - org.apache.maven.plugins - maven-gpg-plugin - ${maven-gpg-plugin.version} - - - org.apache.maven.plugins - maven-resources-plugin - ${maven-resources-plugin.version} - + + - - - org.apache.maven.plugins - maven-surefire-plugin - ${maven-surefire-plugin.version} - - - org.codehaus.mojo - flatten-maven-plugin - ${flatten-maven-plugin.version} - - - org.springframework.boot - spring-boot-maven-plugin - ${spring-boot.version} - - - - + + + + + + + org.apache.maven.plugins + maven-gpg-plugin + ${maven-gpg-plugin.version} + + + + sign + + sign-artifacts + verify + + + + + + ossrh + + + + + + + + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + ossrh + + + https://oss.sonatype.org/content/repositories/snapshots + ossrh + + + + + + + + true + src/main/resources + + **/*.yml + **/*.yaml + logback-spring.xml + + + + false + src/main/resources + + **/*.yml + **/*.yaml + logback-spring.xml + + + + + + + org.codehaus.mojo + flatten-maven-plugin + + resolveCiFriendliesOnly + true + + + + + flatten + + flatten + process-resources + + + + clean + + flatten.clean + clean + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.verison} + + + org.apache.maven.plugins + maven-gpg-plugin + ${maven-gpg-plugin.version} + + + org.apache.maven.plugins + maven-resources-plugin + ${maven-resources-plugin.version} + + + + + org.apache.maven.plugins + maven-surefire-plugin + ${maven-surefire-plugin.version} + + + org.codehaus.mojo + flatten-maven-plugin + ${flatten-maven-plugin.version} + + + org.springframework.boot + spring-boot-maven-plugin + ${spring-boot.version} + + + +