From 4987e7694dc1c3ad4cd48235ce84da1b33546dc8 Mon Sep 17 00:00:00 2001 From: weicw <594098497@qq.com> Date: Fri, 30 Oct 2026 18:57:56 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E5=88=A0=E9=99=A4=E5=8E=86=E5=8F=B2?= =?UTF-8?q?=E5=89=AF=E6=9C=AC=20modules/=EF=BC=88=E4=B8=8D=E5=8F=82?= =?UTF-8?q?=E4=B8=8E=E6=9E=84=E5=BB=BA=EF=BC=8C=E5=90=AB=E6=97=A0=E9=89=B4?= =?UTF-8?q?=E6=9D=83=E8=B0=83=E8=AF=95=E7=AB=AF=E7=82=B9=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/common/core/Constants.java | 93 - .../common/core/annotation/OperationLog.java | 41 - .../core/annotation/OperationModule.java | 21 - .../common/core/annotation/QueryField.java | 22 - modules/common/core/annotation/QueryType.java | 42 - .../core/aspect/OperationLogAspect.java | 211 -- .../common/core/config/ConfigProperties.java | 105 - .../core/config/HttpMessageConverter.java | 15 - .../common/core/config/MybatisPlusConfig.java | 106 - .../core/config/RestTemplateConfig.java | 29 - .../common/core/config/SpringContextUtil.java | 62 - modules/common/core/config/SwaggerConfig.java | 72 - modules/common/core/config/WebMvcConfig.java | 31 - .../core/constants/BalanceConstants.java | 10 - .../core/constants/DomainConstants.java | 10 - .../common/core/constants/OrderConstants.java | 37 - .../core/constants/PlatformConstants.java | 12 - .../core/constants/ProfitConstants.java | 9 - .../common/core/constants/RedisConstants.java | 39 - .../common/core/enums/ChatMessageType.java | 25 - modules/common/core/enums/GreenWebType.java | 52 - .../core/exception/BusinessException.java | 48 - .../exception/GlobalExceptionHandler.java | 56 - .../core/security/JwtAccessDeniedHandler.java | 29 - .../security/JwtAuthenticationEntryPoint.java | 30 - .../security/JwtAuthenticationFilter.java | 99 - modules/common/core/security/JwtSubject.java | 31 - modules/common/core/security/JwtUtil.java | 141 -- .../common/core/security/SecurityConfig.java | 92 - .../core/socketio/cache/ClientCache.java | 75 - .../core/socketio/config/SocketIOConfig.java | 82 - .../socketio/handler/SocketIOHandler.java | 104 - .../common/core/utils/AlipayConfigUtil.java | 110 - modules/common/core/utils/CacheClient.java | 263 --- modules/common/core/utils/CommonUtil.java | 235 -- modules/common/core/utils/DomainUtil.java | 32 - modules/common/core/utils/FileServerUtil.java | 401 ---- modules/common/core/utils/GreenWebUtils.java | 317 --- modules/common/core/utils/HttpUtils.java | 311 --- modules/common/core/utils/ImageUtil.java | 62 - .../common/core/utils/JChardetFacadeUtil.java | 2025 ----------------- modules/common/core/utils/JSONUtil.java | 69 - modules/common/core/utils/MyQrCodeUtil.java | 62 - modules/common/core/utils/OpenOfficeUtil.java | 124 - modules/common/core/utils/PushUtil.java | 96 - modules/common/core/utils/RedisUtil.java | 281 --- modules/common/core/utils/RequestUtil.java | 155 -- modules/common/core/utils/SignCheckUtil.java | 196 -- modules/common/core/utils/WxNativeUtil.java | 19 - modules/common/core/utils/WxOfficialUtil.java | 106 - modules/common/core/utils/WxUtil.java | 134 -- modules/common/core/utils/WxWorkUtil.java | 134 -- modules/common/core/web/ApiResult.java | 87 - modules/common/core/web/BaseController.java | 263 --- modules/common/core/web/BaseParam.java | 76 - modules/common/core/web/BatchParam.java | 57 - modules/common/core/web/ExistenceParam.java | 96 - modules/common/core/web/PageParam.java | 343 --- modules/common/core/web/PageResult.java | 51 - .../controller/AccessKeyController.java | 150 -- .../system/controller/AliOssController.java | 283 --- .../system/controller/AppController.java | 139 -- .../system/controller/AppRenewController.java | 139 -- .../system/controller/AppUrlController.java | 134 -- .../system/controller/AppUserController.java | 129 -- .../system/controller/CacheController.java | 116 - .../ChatConversationController.java | 126 - .../controller/ChatMessageController.java | 132 -- .../system/controller/CompanyController.java | 314 --- .../system/controller/DictController.java | 185 -- .../system/controller/DictDataController.java | 146 -- .../controller/DictionaryController.java | 155 -- .../controller/DictionaryDataController.java | 127 -- .../system/controller/EmailController.java | 49 - .../controller/EnvironmentController.java | 139 -- .../system/controller/FileController.java | 457 ---- .../controller/LoginRecordController.java | 58 - .../system/controller/MainController.java | 575 ----- .../system/controller/MenuController.java | 173 -- .../controller/MerchantAccountController.java | 178 -- .../controller/MerchantApplyController.java | 122 - .../system/controller/MerchantController.java | 141 -- .../controller/MerchantTypeController.java | 121 - .../system/controller/ModulesController.java | 139 -- .../system/controller/NoticeController.java | 142 -- .../NotifyByBalancePayController.java | 58 - .../controller/OperationRecordController.java | 62 - .../system/controller/OrderController.java | 180 -- .../controller/OrderInfoController.java | 138 -- .../controller/OrganizationController.java | 139 -- .../system/controller/PaymentController.java | 246 -- .../system/controller/PlugController.java | 139 -- .../controller/RechargeOrderController.java | 191 -- .../controller/RedisUtilController.java | 77 - .../system/controller/RoleController.java | 154 -- .../system/controller/RoleMenuController.java | 100 - .../system/controller/SettingController.java | 193 -- .../system/controller/TenantController.java | 193 -- .../controller/UserBalanceLogController.java | 132 -- .../controller/UserCollectionController.java | 136 -- .../system/controller/UserController.java | 399 ---- .../system/controller/UserFileController.java | 164 -- .../controller/UserGradeController.java | 127 -- .../controller/UserGroupController.java | 133 -- .../controller/UserOauthController.java | 132 -- .../controller/UserRefereeController.java | 132 -- .../common/system/controller/VerifyTxt.java | 19 - .../system/controller/VersionController.java | 138 -- .../controller/WhiteDomainController.java | 149 -- .../system/controller/WxLoginController.java | 366 --- .../controller/WxNativePayController.java | 147 -- .../controller/WxOfficialController.java | 291 --- .../controller/WxPayNotifyController.java | 88 - modules/common/system/entity/AccessKey.java | 54 - modules/common/system/entity/App.java | 212 -- modules/common/system/entity/AppRenew.java | 60 - modules/common/system/entity/AppUrl.java | 53 - modules/common/system/entity/AppUser.java | 71 - modules/common/system/entity/Cache.java | 34 - .../system/entity/ChatConversation.java | 64 - modules/common/system/entity/ChatMessage.java | 90 - modules/common/system/entity/Company.java | 254 --- modules/common/system/entity/Dict.java | 57 - modules/common/system/entity/DictData.java | 63 - modules/common/system/entity/Dictionary.java | 56 - .../common/system/entity/DictionaryData.java | 64 - modules/common/system/entity/EmailRecord.java | 56 - modules/common/system/entity/Environment.java | 76 - modules/common/system/entity/FileRecord.java | 91 - modules/common/system/entity/KVEntity.java | 56 - modules/common/system/entity/LoginRecord.java | 73 - modules/common/system/entity/Menu.java | 90 - modules/common/system/entity/Merchant.java | 126 - .../common/system/entity/MerchantAccount.java | 90 - .../common/system/entity/MerchantApply.java | 83 - .../common/system/entity/MerchantType.java | 49 - modules/common/system/entity/Modules.java | 60 - modules/common/system/entity/Mp.java | 99 - modules/common/system/entity/Notice.java | 94 - .../common/system/entity/OperationRecord.java | 95 - modules/common/system/entity/Order.java | 245 -- modules/common/system/entity/OrderInfo.java | 102 - .../common/system/entity/Organization.java | 77 - modules/common/system/entity/Payment.java | 91 - modules/common/system/entity/Plug.java | 83 - .../common/system/entity/RechargeOrder.java | 131 -- modules/common/system/entity/Role.java | 56 - modules/common/system/entity/RoleMenu.java | 44 - modules/common/system/entity/Setting.java | 58 - .../common/system/entity/TemplateMessage.java | 49 - .../system/entity/TemplateMessageDTO.java | 35 - modules/common/system/entity/Tenant.java | 82 - modules/common/system/entity/User.java | 320 --- .../common/system/entity/UserBalanceLog.java | 84 - .../common/system/entity/UserCollection.java | 44 - modules/common/system/entity/UserFile.java | 76 - modules/common/system/entity/UserGrade.java | 70 - modules/common/system/entity/UserGroup.java | 58 - modules/common/system/entity/UserOauth.java | 66 - modules/common/system/entity/UserReferee.java | 58 - modules/common/system/entity/UserRole.java | 49 - modules/common/system/entity/Version.java | 81 - modules/common/system/entity/WhiteDomain.java | 58 - .../common/system/mapper/AccessKeyMapper.java | 37 - modules/common/system/mapper/AppMapper.java | 37 - .../common/system/mapper/AppRenewMapper.java | 37 - .../common/system/mapper/AppUrlMapper.java | 37 - .../common/system/mapper/AppUserMapper.java | 37 - .../system/mapper/ChatConversationMapper.java | 37 - .../system/mapper/ChatMessageMapper.java | 37 - .../common/system/mapper/CompanyMapper.java | 61 - .../common/system/mapper/DictDataMapper.java | 47 - modules/common/system/mapper/DictMapper.java | 14 - .../system/mapper/DictionaryDataMapper.java | 47 - .../system/mapper/DictionaryMapper.java | 14 - .../system/mapper/EmailRecordMapper.java | 14 - .../system/mapper/EnvironmentMapper.java | 37 - .../system/mapper/FileRecordMapper.java | 47 - .../system/mapper/LoginRecordMapper.java | 48 - modules/common/system/mapper/MenuMapper.java | 22 - .../system/mapper/MerchantAccountMapper.java | 41 - .../system/mapper/MerchantApplyMapper.java | 37 - .../common/system/mapper/MerchantMapper.java | 37 - .../system/mapper/MerchantTypeMapper.java | 37 - .../common/system/mapper/ModulesMapper.java | 37 - .../common/system/mapper/NoticeMapper.java | 37 - .../system/mapper/OperationRecordMapper.java | 48 - .../common/system/mapper/OrderInfoMapper.java | 37 - modules/common/system/mapper/OrderMapper.java | 44 - .../system/mapper/OrganizationMapper.java | 37 - .../common/system/mapper/PaymentMapper.java | 37 - modules/common/system/mapper/PlugMapper.java | 37 - .../system/mapper/RechargeOrderMapper.java | 37 - modules/common/system/mapper/RoleMapper.java | 22 - .../common/system/mapper/RoleMenuMapper.java | 39 - .../common/system/mapper/SettingMapper.java | 40 - .../common/system/mapper/TenantMapper.java | 42 - .../system/mapper/UserBalanceLogMapper.java | 37 - .../system/mapper/UserCollectionMapper.java | 37 - .../common/system/mapper/UserFileMapper.java | 14 - .../common/system/mapper/UserGradeMapper.java | 37 - .../common/system/mapper/UserGroupMapper.java | 37 - modules/common/system/mapper/UserMapper.java | 55 - .../common/system/mapper/UserOauthMapper.java | 37 - .../system/mapper/UserRefereeMapper.java | 37 - .../common/system/mapper/UserRoleMapper.java | 45 - .../common/system/mapper/VersionMapper.java | 37 - .../system/mapper/WhiteDomainMapper.java | 37 - .../system/mapper/xml/AccessKeyMapper.xml | 44 - .../common/system/mapper/xml/AppMapper.xml | 203 -- .../system/mapper/xml/AppRenewMapper.xml | 53 - .../common/system/mapper/xml/AppUrlMapper.xml | 47 - .../system/mapper/xml/AppUserMapper.xml | 52 - .../mapper/xml/ChatConversationMapper.xml | 56 - .../system/mapper/xml/ChatMessageMapper.xml | 78 - .../system/mapper/xml/CompanyMapper.xml | 177 -- .../system/mapper/xml/DictDataMapper.xml | 71 - .../common/system/mapper/xml/DictMapper.xml | 5 - .../mapper/xml/DictionaryDataMapper.xml | 71 - .../system/mapper/xml/DictionaryMapper.xml | 5 - .../system/mapper/xml/EmailRecordMapper.xml | 5 - .../system/mapper/xml/EnvironmentMapper.xml | 68 - .../system/mapper/xml/FileRecordMapper.xml | 80 - .../system/mapper/xml/LoginRecordMapper.xml | 62 - .../common/system/mapper/xml/MenuMapper.xml | 35 - .../mapper/xml/MerchantAccountMapper.xml | 61 - .../system/mapper/xml/MerchantApplyMapper.xml | 81 - .../system/mapper/xml/MerchantMapper.xml | 93 - .../system/mapper/xml/MerchantTypeMapper.xml | 48 - .../system/mapper/xml/ModulesMapper.xml | 56 - .../common/system/mapper/xml/NoticeMapper.xml | 80 - .../mapper/xml/OperationRecordMapper.xml | 71 - .../system/mapper/xml/OrderInfoMapper.xml | 86 - .../common/system/mapper/xml/OrderMapper.xml | 135 -- .../system/mapper/xml/OrganizationMapper.xml | 86 - .../system/mapper/xml/PaymentMapper.xml | 77 - .../common/system/mapper/xml/PlugMapper.xml | 74 - .../system/mapper/xml/RechargeOrderMapper.xml | 106 - .../common/system/mapper/xml/RoleMapper.xml | 22 - .../system/mapper/xml/RoleMenuMapper.xml | 42 - .../system/mapper/xml/SettingMapper.xml | 33 - .../common/system/mapper/xml/TenantMapper.xml | 68 - .../mapper/xml/UserBalanceLogMapper.xml | 84 - .../mapper/xml/UserCollectionMapper.xml | 38 - .../system/mapper/xml/UserFileMapper.xml | 5 - .../system/mapper/xml/UserGradeMapper.xml | 62 - .../system/mapper/xml/UserGroupMapper.xml | 50 - .../common/system/mapper/xml/UserMapper.xml | 240 -- .../system/mapper/xml/UserOauthMapper.xml | 59 - .../system/mapper/xml/UserRefereeMapper.xml | 50 - .../system/mapper/xml/UserRoleMapper.xml | 35 - .../system/mapper/xml/VersionMapper.xml | 71 - .../system/mapper/xml/WhiteDomainMapper.xml | 50 - .../common/system/param/AccessKeyParam.java | 55 - modules/common/system/param/AlipayParam.java | 31 - modules/common/system/param/AppParam.java | 214 -- .../common/system/param/AppRenewParam.java | 56 - modules/common/system/param/AppUrlParam.java | 46 - modules/common/system/param/AppUserParam.java | 66 - modules/common/system/param/CacheParam.java | 25 - .../system/param/ChatConversationParam.java | 56 - .../common/system/param/ChatMessageParam.java | 76 - modules/common/system/param/CompanyParam.java | 153 -- .../common/system/param/DictDataParam.java | 55 - modules/common/system/param/DictParam.java | 38 - .../system/param/DictionaryDataParam.java | 55 - .../common/system/param/DictionaryParam.java | 38 - .../common/system/param/EnvironmentParam.java | 66 - .../common/system/param/FileRecordParam.java | 75 - modules/common/system/param/LoginParam.java | 40 - .../common/system/param/LoginRecordParam.java | 60 - modules/common/system/param/MenuParam.java | 75 - .../system/param/MerchantAccountParam.java | 55 - .../system/param/MerchantApplyParam.java | 82 - .../common/system/param/MerchantParam.java | 99 - .../system/param/MerchantTypeParam.java | 43 - modules/common/system/param/ModulesParam.java | 54 - modules/common/system/param/NoticeParam.java | 86 - .../system/param/OperationRecordParam.java | 67 - .../common/system/param/OrderInfoParam.java | 101 - modules/common/system/param/OrderParam.java | 135 -- .../system/param/OrganizationParam.java | 65 - modules/common/system/param/PaymentParam.java | 77 - modules/common/system/param/PlugParam.java | 79 - .../system/param/RechargeOrderParam.java | 106 - modules/common/system/param/RoleParam.java | 42 - modules/common/system/param/SettingParam.java | 50 - .../common/system/param/SmsCaptchaParam.java | 34 - modules/common/system/param/TenantParam.java | 55 - .../system/param/UpdatePasswordParam.java | 34 - .../system/param/UserBalanceLogParam.java | 77 - .../system/param/UserCollectionParam.java | 37 - .../common/system/param/UserFileParam.java | 40 - .../common/system/param/UserGradeParam.java | 60 - .../common/system/param/UserGroupParam.java | 47 - .../common/system/param/UserImportParam.java | 42 - .../common/system/param/UserOauthParam.java | 57 - modules/common/system/param/UserParam.java | 239 -- .../common/system/param/UserRefereeParam.java | 48 - modules/common/system/param/VersionParam.java | 71 - .../common/system/param/WhiteDomainParam.java | 48 - .../common/system/result/CaptchaResult.java | 30 - modules/common/system/result/LoginResult.java | 31 - modules/common/system/result/RedisResult.java | 35 - .../system/result/SmsCaptchaResult.java | 26 - .../system/service/AccessKeyService.java | 42 - .../system/service/AppRenewService.java | 42 - modules/common/system/service/AppService.java | 42 - .../common/system/service/AppUrlService.java | 42 - .../common/system/service/AppUserService.java | 42 - .../service/ChatConversationService.java | 42 - .../system/service/ChatMessageService.java | 42 - .../common/system/service/CompanyService.java | 52 - .../system/service/DictDataService.java | 52 - .../common/system/service/DictService.java | 14 - .../system/service/DictionaryDataService.java | 51 - .../system/service/DictionaryService.java | 14 - .../system/service/EmailRecordService.java | 51 - .../system/service/EnvironmentService.java | 42 - .../system/service/FileRecordService.java | 60 - .../system/service/LoginRecordService.java | 54 - .../common/system/service/MenuService.java | 18 - .../service/MerchantAccountService.java | 42 - .../system/service/MerchantApplyService.java | 42 - .../system/service/MerchantService.java | 42 - .../system/service/MerchantTypeService.java | 42 - .../common/system/service/ModulesService.java | 42 - .../common/system/service/NoticeService.java | 42 - .../service/OperationRecordService.java | 49 - .../system/service/OrderInfoService.java | 42 - .../common/system/service/OrderService.java | 48 - .../system/service/OrganizationService.java | 42 - .../common/system/service/PaymentService.java | 42 - .../common/system/service/PlugService.java | 42 - .../system/service/RechargeOrderService.java | 42 - .../system/service/RoleMenuService.java | 35 - .../common/system/service/RoleService.java | 15 - .../common/system/service/SettingService.java | 60 - .../common/system/service/TenantService.java | 46 - .../system/service/UserBalanceLogService.java | 42 - .../system/service/UserCollectionService.java | 42 - .../system/service/UserFileService.java | 14 - .../system/service/UserGradeService.java | 42 - .../system/service/UserGroupService.java | 42 - .../system/service/UserOauthService.java | 42 - .../system/service/UserRefereeService.java | 42 - .../system/service/UserRoleService.java | 42 - .../common/system/service/UserService.java | 113 - .../common/system/service/VersionService.java | 42 - .../system/service/WhiteDomainService.java | 42 - .../service/impl/AccessKeyServiceImpl.java | 47 - .../service/impl/AppRenewServiceImpl.java | 47 - .../system/service/impl/AppServiceImpl.java | 47 - .../service/impl/AppUrlServiceImpl.java | 47 - .../service/impl/AppUserServiceImpl.java | 47 - .../impl/ChatConversationServiceImpl.java | 47 - .../service/impl/ChatMessageServiceImpl.java | 47 - .../service/impl/CompanyServiceImpl.java | 87 - .../service/impl/DictDataServiceImpl.java | 52 - .../system/service/impl/DictServiceImpl.java | 18 - .../impl/DictionaryDataServiceImpl.java | 52 - .../service/impl/DictionaryServiceImpl.java | 18 - .../service/impl/EmailRecordServiceImpl.java | 86 - .../service/impl/EnvironmentServiceImpl.java | 47 - .../service/impl/FileRecordServiceImpl.java | 114 - .../service/impl/LoginRecordServiceImpl.java | 78 - .../system/service/impl/MenuServiceImpl.java | 234 -- .../impl/MerchantAccountServiceImpl.java | 47 - .../impl/MerchantApplyServiceImpl.java | 47 - .../service/impl/MerchantServiceImpl.java | 47 - .../service/impl/MerchantTypeServiceImpl.java | 47 - .../service/impl/ModulesServiceImpl.java | 47 - .../service/impl/NoticeServiceImpl.java | 47 - .../impl/OperationRecordServiceImpl.java | 52 - .../service/impl/OrderInfoServiceImpl.java | 47 - .../system/service/impl/OrderServiceImpl.java | 171 -- .../service/impl/OrganizationServiceImpl.java | 45 - .../service/impl/PaymentServiceImpl.java | 47 - .../system/service/impl/PlugServiceImpl.java | 47 - .../impl/RechargeOrderServiceImpl.java | 47 - .../service/impl/RoleMenuServiceImpl.java | 31 - .../system/service/impl/RoleServiceImpl.java | 26 - .../service/impl/SettingServiceImpl.java | 179 -- .../service/impl/TenantServiceImpl.java | 648 ------ .../impl/UserBalanceLogServiceImpl.java | 47 - .../impl/UserCollectionServiceImpl.java | 47 - .../service/impl/UserFileServiceImpl.java | 18 - .../service/impl/UserGradeServiceImpl.java | 47 - .../service/impl/UserGroupServiceImpl.java | 47 - .../service/impl/UserOauthServiceImpl.java | 47 - .../service/impl/UserRefereeServiceImpl.java | 47 - .../service/impl/UserRoleServiceImpl.java | 37 - .../system/service/impl/UserServiceImpl.java | 272 --- .../service/impl/VersionServiceImpl.java | 47 - .../service/impl/WhiteDomainServiceImpl.java | 47 - .../common/system/vo/ChatConversationVO.java | 18 - modules/common/system/vo/PushMessageVO.java | 36 - .../system/vo/faceId/HeadPortraitResult.java | 17 - .../vo/idcheck/BackRecognitionResult.java | 11 - .../vo/idcheck/FrontRecognitionResult.java | 15 - .../common/system/vo/idcheck/IdCardInfor.java | 14 - .../common/system/vo/idcheck/Response.java | 10 - .../system/vo/idcheck/VerifyResult.java | 14 - modules/oa/controller/AppController.java | 318 --- modules/oa/controller/AppFieldController.java | 116 - modules/oa/controller/AppRenewController.java | 127 -- modules/oa/controller/AppUrlController.java | 105 - modules/oa/controller/AppUserController.java | 117 - modules/oa/controller/AssetsController.java | 233 -- .../oa/controller/AssetsUserController.java | 110 - modules/oa/controller/CompanyController.java | 141 -- .../oa/controller/CompanyFieldController.java | 116 - .../oa/controller/CompanyUserController.java | 118 - modules/oa/controller/LinkController.java | 116 - modules/oa/controller/ProductController.java | 108 - .../oa/controller/ProductTabsController.java | 108 - modules/oa/controller/TaskController.java | 255 --- .../oa/controller/TaskCountController.java | 121 - .../oa/controller/TaskRecordController.java | 135 -- modules/oa/controller/TaskUserController.java | 119 - modules/oa/entity/App.java | 271 --- modules/oa/entity/AppField.java | 55 - modules/oa/entity/AppRenew.java | 80 - modules/oa/entity/AppUrl.java | 62 - modules/oa/entity/AppUser.java | 70 - modules/oa/entity/Assets.java | 173 -- modules/oa/entity/AssetsUser.java | 52 - modules/oa/entity/Company.java | 181 -- modules/oa/entity/CompanyField.java | 55 - modules/oa/entity/CompanyUser.java | 69 - modules/oa/entity/Link.java | 72 - modules/oa/entity/Product.java | 100 - modules/oa/entity/ProductTabs.java | 81 - modules/oa/entity/Task.java | 156 -- modules/oa/entity/TaskCount.java | 87 - modules/oa/entity/TaskRecord.java | 86 - modules/oa/entity/TaskUser.java | 50 - modules/oa/mapper/AppFieldMapper.java | 37 - modules/oa/mapper/AppMapper.java | 37 - modules/oa/mapper/AppRenewMapper.java | 37 - modules/oa/mapper/AppUrlMapper.java | 37 - modules/oa/mapper/AppUserMapper.java | 37 - modules/oa/mapper/AssetsMapper.java | 37 - modules/oa/mapper/AssetsUserMapper.java | 37 - modules/oa/mapper/CompanyFieldMapper.java | 37 - modules/oa/mapper/CompanyMapper.java | 37 - modules/oa/mapper/CompanyUserMapper.java | 37 - modules/oa/mapper/LinkMapper.java | 37 - modules/oa/mapper/ProductMapper.java | 37 - modules/oa/mapper/ProductTabsMapper.java | 37 - modules/oa/mapper/TaskCountMapper.java | 39 - modules/oa/mapper/TaskMapper.java | 44 - modules/oa/mapper/TaskRecordMapper.java | 37 - modules/oa/mapper/TaskUserMapper.java | 37 - modules/oa/mapper/xml/AppFieldMapper.xml | 50 - modules/oa/mapper/xml/AppMapper.xml | 229 -- modules/oa/mapper/xml/AppRenewMapper.xml | 61 - modules/oa/mapper/xml/AppUrlMapper.xml | 54 - modules/oa/mapper/xml/AppUserMapper.xml | 51 - modules/oa/mapper/xml/AssetsMapper.xml | 149 -- modules/oa/mapper/xml/AssetsUserMapper.xml | 44 - modules/oa/mapper/xml/CompanyFieldMapper.xml | 50 - modules/oa/mapper/xml/CompanyMapper.xml | 179 -- modules/oa/mapper/xml/CompanyUserMapper.xml | 44 - modules/oa/mapper/xml/LinkMapper.xml | 65 - modules/oa/mapper/xml/ProductMapper.xml | 75 - modules/oa/mapper/xml/ProductTabsMapper.xml | 74 - modules/oa/mapper/xml/TaskCountMapper.xml | 62 - modules/oa/mapper/xml/TaskMapper.xml | 131 -- modules/oa/mapper/xml/TaskRecordMapper.xml | 62 - modules/oa/mapper/xml/TaskUserMapper.xml | 44 - modules/oa/param/AppFieldParam.java | 51 - modules/oa/param/AppParam.java | 240 -- modules/oa/param/AppRenewParam.java | 63 - modules/oa/param/AppUrlParam.java | 51 - modules/oa/param/AppUserParam.java | 66 - modules/oa/param/AssetsParam.java | 154 -- modules/oa/param/AssetsUserParam.java | 45 - modules/oa/param/CompanyFieldParam.java | 51 - modules/oa/param/CompanyParam.java | 190 -- modules/oa/param/CompanyUserParam.java | 45 - modules/oa/param/LinkParam.java | 65 - modules/oa/param/ProductParam.java | 67 - modules/oa/param/ProductTabsParam.java | 74 - modules/oa/param/TaskCountParam.java | 66 - modules/oa/param/TaskParam.java | 134 -- modules/oa/param/TaskRecordParam.java | 62 - modules/oa/param/TaskUserParam.java | 45 - modules/oa/service/AppFieldService.java | 42 - modules/oa/service/AppRenewService.java | 42 - modules/oa/service/AppService.java | 42 - modules/oa/service/AppUrlService.java | 42 - modules/oa/service/AppUserService.java | 42 - modules/oa/service/AssetsService.java | 42 - modules/oa/service/AssetsUserService.java | 42 - modules/oa/service/CompanyFieldService.java | 42 - modules/oa/service/CompanyService.java | 42 - modules/oa/service/CompanyUserService.java | 42 - modules/oa/service/LinkService.java | 42 - modules/oa/service/ProductService.java | 42 - modules/oa/service/ProductTabsService.java | 42 - modules/oa/service/TaskCountService.java | 44 - modules/oa/service/TaskRecordService.java | 42 - modules/oa/service/TaskService.java | 53 - modules/oa/service/TaskUserService.java | 42 - .../oa/service/impl/AppFieldServiceImpl.java | 47 - .../oa/service/impl/AppRenewServiceImpl.java | 47 - modules/oa/service/impl/AppServiceImpl.java | 47 - .../oa/service/impl/AppUrlServiceImpl.java | 47 - .../oa/service/impl/AppUserServiceImpl.java | 93 - .../oa/service/impl/AssetsServiceImpl.java | 47 - .../service/impl/AssetsUserServiceImpl.java | 47 - .../service/impl/CompanyFieldServiceImpl.java | 47 - .../oa/service/impl/CompanyServiceImpl.java | 47 - .../service/impl/CompanyUserServiceImpl.java | 96 - modules/oa/service/impl/LinkServiceImpl.java | 47 - .../oa/service/impl/ProductServiceImpl.java | 58 - .../service/impl/ProductTabsServiceImpl.java | 47 - .../oa/service/impl/TaskCountServiceImpl.java | 145 -- .../service/impl/TaskRecordServiceImpl.java | 90 - modules/oa/service/impl/TaskServiceImpl.java | 252 -- .../oa/service/impl/TaskUserServiceImpl.java | 47 - modules/shop/controller/BrandController.java | 118 - modules/shop/controller/CartController.java | 187 -- .../shop/controller/CashierController.java | 218 -- .../ChatConversationController.java | 112 - .../controller/ChatMessageController.java | 112 - modules/shop/controller/CountController.java | 123 - .../controller/DealerApplyController.java | 144 -- .../controller/DealerCapitalController.java | 113 - .../controller/DealerOrderController.java | 113 - .../controller/DealerRefereeController.java | 113 - .../controller/DealerSettingController.java | 107 - .../shop/controller/DealerUserController.java | 192 -- .../controller/DealerWithdrawController.java | 113 - .../controller/GoodsCategoryController.java | 248 -- modules/shop/controller/GoodsController.java | 180 -- .../shop/controller/GoodsSkuController.java | 157 -- .../shop/controller/GoodsSpecController.java | 110 - .../controller/MerchantAccountController.java | 140 -- .../controller/MerchantApplyController.java | 105 - .../shop/controller/MerchantController.java | 141 -- .../controller/MerchantTypeController.java | 110 - modules/shop/controller/OrderController.java | 107 - .../shop/controller/OrderGoodsController.java | 113 - .../shop/controller/OrderInfoController.java | 107 - .../controller/OrderInfoLogController.java | 112 - .../controller/RechargeOrderController.java | 182 -- modules/shop/controller/SpecController.java | 119 - .../shop/controller/SpecValueController.java | 109 - .../controller/UserAddressController.java | 117 - .../controller/UserBalanceLogController.java | 142 -- .../controller/UserCollectionController.java | 112 - modules/shop/controller/UsersController.java | 107 - .../controller/WechatDepositController.java | 118 - .../controller/WxNativePayController.java | 158 -- .../controller/WxPayNotifyController.java | 148 -- .../controller/WxPayNotifyNbgController.java | 96 - modules/shop/entity/Brand.java | 51 - modules/shop/entity/Cart.java | 110 - modules/shop/entity/Cashier.java | 100 - modules/shop/entity/ChatConversation.java | 62 - modules/shop/entity/ChatMessage.java | 74 - modules/shop/entity/Count.java | 67 - modules/shop/entity/DealerApply.java | 66 - modules/shop/entity/DealerCapital.java | 58 - modules/shop/entity/DealerOrder.java | 76 - modules/shop/entity/DealerReferee.java | 48 - modules/shop/entity/DealerSetting.java | 41 - modules/shop/entity/DealerUser.java | 91 - modules/shop/entity/DealerWithdraw.java | 76 - modules/shop/entity/Goods.java | 143 -- modules/shop/entity/GoodsCategory.java | 107 - modules/shop/entity/GoodsSku.java | 88 - modules/shop/entity/GoodsSkuVO.java | 24 - modules/shop/entity/GoodsSpec.java | 54 - modules/shop/entity/Merchant.java | 136 -- modules/shop/entity/MerchantAccount.java | 88 - modules/shop/entity/MerchantApply.java | 84 - modules/shop/entity/MerchantType.java | 50 - modules/shop/entity/Order.java | 173 -- modules/shop/entity/OrderGoods.java | 105 - modules/shop/entity/OrderInfo.java | 98 - modules/shop/entity/OrderInfoLog.java | 49 - modules/shop/entity/Payment.java | 90 - modules/shop/entity/RechargeOrder.java | 104 - modules/shop/entity/Spec.java | 59 - modules/shop/entity/SpecValue.java | 44 - modules/shop/entity/UserAddress.java | 71 - modules/shop/entity/UserBalanceLog.java | 83 - modules/shop/entity/UserCollection.java | 42 - modules/shop/entity/Users.java | 75 - modules/shop/entity/WechatDeposit.java | 67 - modules/shop/mapper/BrandMapper.java | 37 - modules/shop/mapper/CartMapper.java | 37 - modules/shop/mapper/CashierMapper.java | 37 - .../shop/mapper/ChatConversationMapper.java | 37 - modules/shop/mapper/ChatMessageMapper.java | 37 - modules/shop/mapper/CountMapper.java | 37 - modules/shop/mapper/DealerApplyMapper.java | 37 - modules/shop/mapper/DealerCapitalMapper.java | 37 - modules/shop/mapper/DealerOrderMapper.java | 37 - modules/shop/mapper/DealerRefereeMapper.java | 37 - modules/shop/mapper/DealerSettingMapper.java | 37 - modules/shop/mapper/DealerUserMapper.java | 37 - modules/shop/mapper/DealerWithdrawMapper.java | 37 - modules/shop/mapper/GoodsCategoryMapper.java | 37 - modules/shop/mapper/GoodsMapper.java | 37 - modules/shop/mapper/GoodsSkuMapper.java | 37 - modules/shop/mapper/GoodsSpecMapper.java | 37 - .../shop/mapper/MerchantAccountMapper.java | 41 - modules/shop/mapper/MerchantApplyMapper.java | 37 - modules/shop/mapper/MerchantMapper.java | 37 - modules/shop/mapper/MerchantTypeMapper.java | 37 - modules/shop/mapper/OrderGoodsMapper.java | 37 - modules/shop/mapper/OrderInfoLogMapper.java | 37 - modules/shop/mapper/OrderInfoMapper.java | 42 - modules/shop/mapper/OrderMapper.java | 37 - modules/shop/mapper/RechargeOrderMapper.java | 35 - modules/shop/mapper/SpecMapper.java | 37 - modules/shop/mapper/SpecValueMapper.java | 37 - modules/shop/mapper/UserAddressMapper.java | 37 - modules/shop/mapper/UserBalanceLogMapper.java | 37 - modules/shop/mapper/UserCollectionMapper.java | 37 - modules/shop/mapper/UsersMapper.java | 37 - modules/shop/mapper/WechatDepositMapper.java | 37 - modules/shop/mapper/xml/BrandMapper.xml | 51 - modules/shop/mapper/xml/CartMapper.xml | 75 - modules/shop/mapper/xml/CashierMapper.xml | 81 - .../mapper/xml/ChatConversationMapper.xml | 60 - modules/shop/mapper/xml/ChatMessageMapper.xml | 72 - modules/shop/mapper/xml/CountMapper.xml | 63 - modules/shop/mapper/xml/DealerApplyMapper.xml | 63 - .../shop/mapper/xml/DealerCapitalMapper.xml | 54 - modules/shop/mapper/xml/DealerOrderMapper.xml | 72 - .../shop/mapper/xml/DealerRefereeMapper.xml | 45 - .../shop/mapper/xml/DealerSettingMapper.xml | 36 - modules/shop/mapper/xml/DealerUserMapper.xml | 72 - .../shop/mapper/xml/DealerWithdrawMapper.xml | 72 - .../shop/mapper/xml/GoodsCategoryMapper.xml | 93 - modules/shop/mapper/xml/GoodsMapper.xml | 122 - modules/shop/mapper/xml/GoodsSkuMapper.xml | 78 - modules/shop/mapper/xml/GoodsSpecMapper.xml | 45 - .../shop/mapper/xml/MerchantAccountMapper.xml | 63 - .../shop/mapper/xml/MerchantApplyMapper.xml | 81 - modules/shop/mapper/xml/MerchantMapper.xml | 111 - .../shop/mapper/xml/MerchantTypeMapper.xml | 48 - modules/shop/mapper/xml/OrderGoodsMapper.xml | 96 - .../shop/mapper/xml/OrderInfoLogMapper.xml | 48 - modules/shop/mapper/xml/OrderInfoMapper.xml | 90 - modules/shop/mapper/xml/OrderMapper.xml | 169 -- .../shop/mapper/xml/RechargeOrderMapper.xml | 99 - modules/shop/mapper/xml/SpecMapper.xml | 57 - modules/shop/mapper/xml/SpecValueMapper.xml | 42 - modules/shop/mapper/xml/UserAddressMapper.xml | 69 - .../shop/mapper/xml/UserBalanceLogMapper.xml | 69 - .../shop/mapper/xml/UserCollectionMapper.xml | 42 - modules/shop/mapper/xml/UsersMapper.xml | 83 - .../shop/mapper/xml/WechatDepositMapper.xml | 71 - modules/shop/param/BrandParam.java | 47 - modules/shop/param/CartParam.java | 83 - modules/shop/param/CashierParam.java | 88 - modules/shop/param/ChatConversationParam.java | 57 - modules/shop/param/ChatMessageParam.java | 71 - modules/shop/param/CountParam.java | 64 - modules/shop/param/DealerApplyParam.java | 63 - modules/shop/param/DealerCapitalParam.java | 53 - modules/shop/param/DealerOrderParam.java | 78 - modules/shop/param/DealerRefereeParam.java | 42 - modules/shop/param/DealerSettingParam.java | 36 - modules/shop/param/DealerUserParam.java | 75 - modules/shop/param/DealerWithdrawParam.java | 71 - modules/shop/param/GoodsCategoryParam.java | 95 - modules/shop/param/GoodsParam.java | 130 -- modules/shop/param/GoodsSkuParam.java | 77 - modules/shop/param/GoodsSpecParam.java | 48 - modules/shop/param/MerchantAccountParam.java | 56 - modules/shop/param/MerchantApplyParam.java | 81 - modules/shop/param/MerchantParam.java | 116 - modules/shop/param/MerchantTypeParam.java | 44 - modules/shop/param/OrderGoodsParam.java | 103 - modules/shop/param/OrderInfoLogParam.java | 45 - modules/shop/param/OrderInfoParam.java | 96 - modules/shop/param/OrderParam.java | 184 -- modules/shop/param/RechargeOrderParam.java | 105 - modules/shop/param/SpecParam.java | 55 - modules/shop/param/SpecValueParam.java | 37 - modules/shop/param/UserAddressParam.java | 66 - modules/shop/param/UserBalanceLogParam.java | 67 - modules/shop/param/UserCollectionParam.java | 38 - modules/shop/param/UsersParam.java | 75 - modules/shop/param/WechatDepositParam.java | 66 - modules/shop/service/BrandService.java | 42 - modules/shop/service/CartService.java | 45 - modules/shop/service/CashierService.java | 44 - .../shop/service/ChatConversationService.java | 42 - modules/shop/service/ChatMessageService.java | 42 - modules/shop/service/CountService.java | 42 - modules/shop/service/DealerApplyService.java | 42 - .../shop/service/DealerCapitalService.java | 42 - modules/shop/service/DealerOrderService.java | 42 - .../shop/service/DealerRefereeService.java | 42 - .../shop/service/DealerSettingService.java | 42 - modules/shop/service/DealerUserService.java | 42 - .../shop/service/DealerWithdrawService.java | 42 - .../shop/service/GoodsCategoryService.java | 42 - modules/shop/service/GoodsService.java | 53 - modules/shop/service/GoodsSkuService.java | 42 - modules/shop/service/GoodsSpecService.java | 42 - .../shop/service/MerchantAccountService.java | 42 - .../shop/service/MerchantApplyService.java | 42 - modules/shop/service/MerchantService.java | 42 - modules/shop/service/MerchantTypeService.java | 42 - modules/shop/service/OrderGoodsService.java | 42 - modules/shop/service/OrderInfoLogService.java | 42 - modules/shop/service/OrderInfoService.java | 48 - modules/shop/service/OrderService.java | 42 - .../shop/service/RechargeOrderService.java | 40 - modules/shop/service/SpecService.java | 42 - modules/shop/service/SpecValueService.java | 42 - modules/shop/service/UserAddressService.java | 42 - .../shop/service/UserBalanceLogService.java | 42 - .../shop/service/UserCollectionService.java | 42 - modules/shop/service/UsersService.java | 46 - .../shop/service/WechatDepositService.java | 42 - .../shop/service/impl/BrandServiceImpl.java | 47 - .../shop/service/impl/CartServiceImpl.java | 124 - .../shop/service/impl/CashierServiceImpl.java | 115 - .../impl/ChatConversationServiceImpl.java | 47 - .../service/impl/ChatMessageServiceImpl.java | 47 - .../shop/service/impl/CountServiceImpl.java | 47 - .../service/impl/DealerApplyServiceImpl.java | 47 - .../impl/DealerCapitalServiceImpl.java | 47 - .../service/impl/DealerOrderServiceImpl.java | 47 - .../impl/DealerRefereeServiceImpl.java | 47 - .../impl/DealerSettingServiceImpl.java | 47 - .../service/impl/DealerUserServiceImpl.java | 47 - .../impl/DealerWithdrawServiceImpl.java | 47 - .../impl/GoodsCategoryServiceImpl.java | 47 - .../shop/service/impl/GoodsServiceImpl.java | 143 -- .../service/impl/GoodsSkuServiceImpl.java | 47 - .../service/impl/GoodsSpecServiceImpl.java | 47 - .../impl/MerchantAccountServiceImpl.java | 47 - .../impl/MerchantApplyServiceImpl.java | 47 - .../service/impl/MerchantServiceImpl.java | 47 - .../service/impl/MerchantTypeServiceImpl.java | 47 - .../service/impl/OrderGoodsServiceImpl.java | 47 - .../service/impl/OrderInfoLogServiceImpl.java | 47 - .../service/impl/OrderInfoServiceImpl.java | 70 - .../shop/service/impl/OrderServiceImpl.java | 47 - .../impl/RechargeOrderServiceImpl.java | 43 - .../shop/service/impl/SpecServiceImpl.java | 47 - .../service/impl/SpecValueServiceImpl.java | 47 - .../service/impl/UserAddressServiceImpl.java | 47 - .../impl/UserBalanceLogServiceImpl.java | 47 - .../impl/UserCollectionServiceImpl.java | 47 - .../shop/service/impl/UsersServiceImpl.java | 58 - .../impl/WechatDepositServiceImpl.java | 47 - modules/shop/task/OrderTask.java | 113 - modules/shop/vo/CartShopVo.java | 42 - modules/shop/vo/CartVo.java | 40 - modules/shop/vo/CashierVo.java | 46 - 762 files changed, 61619 deletions(-) delete mode 100644 modules/common/core/Constants.java delete mode 100644 modules/common/core/annotation/OperationLog.java delete mode 100644 modules/common/core/annotation/OperationModule.java delete mode 100644 modules/common/core/annotation/QueryField.java delete mode 100644 modules/common/core/annotation/QueryType.java delete mode 100644 modules/common/core/aspect/OperationLogAspect.java delete mode 100644 modules/common/core/config/ConfigProperties.java delete mode 100644 modules/common/core/config/HttpMessageConverter.java delete mode 100644 modules/common/core/config/MybatisPlusConfig.java delete mode 100644 modules/common/core/config/RestTemplateConfig.java delete mode 100644 modules/common/core/config/SpringContextUtil.java delete mode 100644 modules/common/core/config/SwaggerConfig.java delete mode 100644 modules/common/core/config/WebMvcConfig.java delete mode 100644 modules/common/core/constants/BalanceConstants.java delete mode 100644 modules/common/core/constants/DomainConstants.java delete mode 100644 modules/common/core/constants/OrderConstants.java delete mode 100644 modules/common/core/constants/PlatformConstants.java delete mode 100644 modules/common/core/constants/ProfitConstants.java delete mode 100644 modules/common/core/constants/RedisConstants.java delete mode 100644 modules/common/core/enums/ChatMessageType.java delete mode 100644 modules/common/core/enums/GreenWebType.java delete mode 100644 modules/common/core/exception/BusinessException.java delete mode 100644 modules/common/core/exception/GlobalExceptionHandler.java delete mode 100644 modules/common/core/security/JwtAccessDeniedHandler.java delete mode 100644 modules/common/core/security/JwtAuthenticationEntryPoint.java delete mode 100644 modules/common/core/security/JwtAuthenticationFilter.java delete mode 100644 modules/common/core/security/JwtSubject.java delete mode 100644 modules/common/core/security/JwtUtil.java delete mode 100644 modules/common/core/security/SecurityConfig.java delete mode 100644 modules/common/core/socketio/cache/ClientCache.java delete mode 100644 modules/common/core/socketio/config/SocketIOConfig.java delete mode 100644 modules/common/core/socketio/handler/SocketIOHandler.java delete mode 100644 modules/common/core/utils/AlipayConfigUtil.java delete mode 100644 modules/common/core/utils/CacheClient.java delete mode 100644 modules/common/core/utils/CommonUtil.java delete mode 100644 modules/common/core/utils/DomainUtil.java delete mode 100644 modules/common/core/utils/FileServerUtil.java delete mode 100644 modules/common/core/utils/GreenWebUtils.java delete mode 100644 modules/common/core/utils/HttpUtils.java delete mode 100644 modules/common/core/utils/ImageUtil.java delete mode 100644 modules/common/core/utils/JChardetFacadeUtil.java delete mode 100644 modules/common/core/utils/JSONUtil.java delete mode 100644 modules/common/core/utils/MyQrCodeUtil.java delete mode 100644 modules/common/core/utils/OpenOfficeUtil.java delete mode 100644 modules/common/core/utils/PushUtil.java delete mode 100644 modules/common/core/utils/RedisUtil.java delete mode 100644 modules/common/core/utils/RequestUtil.java delete mode 100644 modules/common/core/utils/SignCheckUtil.java delete mode 100644 modules/common/core/utils/WxNativeUtil.java delete mode 100644 modules/common/core/utils/WxOfficialUtil.java delete mode 100644 modules/common/core/utils/WxUtil.java delete mode 100644 modules/common/core/utils/WxWorkUtil.java delete mode 100644 modules/common/core/web/ApiResult.java delete mode 100644 modules/common/core/web/BaseController.java delete mode 100644 modules/common/core/web/BaseParam.java delete mode 100644 modules/common/core/web/BatchParam.java delete mode 100644 modules/common/core/web/ExistenceParam.java delete mode 100644 modules/common/core/web/PageParam.java delete mode 100644 modules/common/core/web/PageResult.java delete mode 100644 modules/common/system/controller/AccessKeyController.java delete mode 100644 modules/common/system/controller/AliOssController.java delete mode 100644 modules/common/system/controller/AppController.java delete mode 100644 modules/common/system/controller/AppRenewController.java delete mode 100644 modules/common/system/controller/AppUrlController.java delete mode 100644 modules/common/system/controller/AppUserController.java delete mode 100644 modules/common/system/controller/CacheController.java delete mode 100644 modules/common/system/controller/ChatConversationController.java delete mode 100644 modules/common/system/controller/ChatMessageController.java delete mode 100644 modules/common/system/controller/CompanyController.java delete mode 100644 modules/common/system/controller/DictController.java delete mode 100644 modules/common/system/controller/DictDataController.java delete mode 100644 modules/common/system/controller/DictionaryController.java delete mode 100644 modules/common/system/controller/DictionaryDataController.java delete mode 100644 modules/common/system/controller/EmailController.java delete mode 100644 modules/common/system/controller/EnvironmentController.java delete mode 100644 modules/common/system/controller/FileController.java delete mode 100644 modules/common/system/controller/LoginRecordController.java delete mode 100644 modules/common/system/controller/MainController.java delete mode 100644 modules/common/system/controller/MenuController.java delete mode 100644 modules/common/system/controller/MerchantAccountController.java delete mode 100644 modules/common/system/controller/MerchantApplyController.java delete mode 100644 modules/common/system/controller/MerchantController.java delete mode 100644 modules/common/system/controller/MerchantTypeController.java delete mode 100644 modules/common/system/controller/ModulesController.java delete mode 100644 modules/common/system/controller/NoticeController.java delete mode 100644 modules/common/system/controller/NotifyByBalancePayController.java delete mode 100644 modules/common/system/controller/OperationRecordController.java delete mode 100644 modules/common/system/controller/OrderController.java delete mode 100644 modules/common/system/controller/OrderInfoController.java delete mode 100644 modules/common/system/controller/OrganizationController.java delete mode 100644 modules/common/system/controller/PaymentController.java delete mode 100644 modules/common/system/controller/PlugController.java delete mode 100644 modules/common/system/controller/RechargeOrderController.java delete mode 100644 modules/common/system/controller/RedisUtilController.java delete mode 100644 modules/common/system/controller/RoleController.java delete mode 100644 modules/common/system/controller/RoleMenuController.java delete mode 100644 modules/common/system/controller/SettingController.java delete mode 100644 modules/common/system/controller/TenantController.java delete mode 100644 modules/common/system/controller/UserBalanceLogController.java delete mode 100644 modules/common/system/controller/UserCollectionController.java delete mode 100644 modules/common/system/controller/UserController.java delete mode 100644 modules/common/system/controller/UserFileController.java delete mode 100644 modules/common/system/controller/UserGradeController.java delete mode 100644 modules/common/system/controller/UserGroupController.java delete mode 100644 modules/common/system/controller/UserOauthController.java delete mode 100644 modules/common/system/controller/UserRefereeController.java delete mode 100644 modules/common/system/controller/VerifyTxt.java delete mode 100644 modules/common/system/controller/VersionController.java delete mode 100644 modules/common/system/controller/WhiteDomainController.java delete mode 100644 modules/common/system/controller/WxLoginController.java delete mode 100644 modules/common/system/controller/WxNativePayController.java delete mode 100644 modules/common/system/controller/WxOfficialController.java delete mode 100644 modules/common/system/controller/WxPayNotifyController.java delete mode 100644 modules/common/system/entity/AccessKey.java delete mode 100644 modules/common/system/entity/App.java delete mode 100644 modules/common/system/entity/AppRenew.java delete mode 100644 modules/common/system/entity/AppUrl.java delete mode 100644 modules/common/system/entity/AppUser.java delete mode 100644 modules/common/system/entity/Cache.java delete mode 100644 modules/common/system/entity/ChatConversation.java delete mode 100644 modules/common/system/entity/ChatMessage.java delete mode 100644 modules/common/system/entity/Company.java delete mode 100644 modules/common/system/entity/Dict.java delete mode 100644 modules/common/system/entity/DictData.java delete mode 100644 modules/common/system/entity/Dictionary.java delete mode 100644 modules/common/system/entity/DictionaryData.java delete mode 100644 modules/common/system/entity/EmailRecord.java delete mode 100644 modules/common/system/entity/Environment.java delete mode 100644 modules/common/system/entity/FileRecord.java delete mode 100644 modules/common/system/entity/KVEntity.java delete mode 100644 modules/common/system/entity/LoginRecord.java delete mode 100644 modules/common/system/entity/Menu.java delete mode 100644 modules/common/system/entity/Merchant.java delete mode 100644 modules/common/system/entity/MerchantAccount.java delete mode 100644 modules/common/system/entity/MerchantApply.java delete mode 100644 modules/common/system/entity/MerchantType.java delete mode 100644 modules/common/system/entity/Modules.java delete mode 100644 modules/common/system/entity/Mp.java delete mode 100644 modules/common/system/entity/Notice.java delete mode 100644 modules/common/system/entity/OperationRecord.java delete mode 100644 modules/common/system/entity/Order.java delete mode 100644 modules/common/system/entity/OrderInfo.java delete mode 100644 modules/common/system/entity/Organization.java delete mode 100644 modules/common/system/entity/Payment.java delete mode 100644 modules/common/system/entity/Plug.java delete mode 100644 modules/common/system/entity/RechargeOrder.java delete mode 100644 modules/common/system/entity/Role.java delete mode 100644 modules/common/system/entity/RoleMenu.java delete mode 100644 modules/common/system/entity/Setting.java delete mode 100644 modules/common/system/entity/TemplateMessage.java delete mode 100644 modules/common/system/entity/TemplateMessageDTO.java delete mode 100644 modules/common/system/entity/Tenant.java delete mode 100644 modules/common/system/entity/User.java delete mode 100644 modules/common/system/entity/UserBalanceLog.java delete mode 100644 modules/common/system/entity/UserCollection.java delete mode 100644 modules/common/system/entity/UserFile.java delete mode 100644 modules/common/system/entity/UserGrade.java delete mode 100644 modules/common/system/entity/UserGroup.java delete mode 100644 modules/common/system/entity/UserOauth.java delete mode 100644 modules/common/system/entity/UserReferee.java delete mode 100644 modules/common/system/entity/UserRole.java delete mode 100644 modules/common/system/entity/Version.java delete mode 100644 modules/common/system/entity/WhiteDomain.java delete mode 100644 modules/common/system/mapper/AccessKeyMapper.java delete mode 100644 modules/common/system/mapper/AppMapper.java delete mode 100644 modules/common/system/mapper/AppRenewMapper.java delete mode 100644 modules/common/system/mapper/AppUrlMapper.java delete mode 100644 modules/common/system/mapper/AppUserMapper.java delete mode 100644 modules/common/system/mapper/ChatConversationMapper.java delete mode 100644 modules/common/system/mapper/ChatMessageMapper.java delete mode 100644 modules/common/system/mapper/CompanyMapper.java delete mode 100644 modules/common/system/mapper/DictDataMapper.java delete mode 100644 modules/common/system/mapper/DictMapper.java delete mode 100644 modules/common/system/mapper/DictionaryDataMapper.java delete mode 100644 modules/common/system/mapper/DictionaryMapper.java delete mode 100644 modules/common/system/mapper/EmailRecordMapper.java delete mode 100644 modules/common/system/mapper/EnvironmentMapper.java delete mode 100644 modules/common/system/mapper/FileRecordMapper.java delete mode 100644 modules/common/system/mapper/LoginRecordMapper.java delete mode 100644 modules/common/system/mapper/MenuMapper.java delete mode 100644 modules/common/system/mapper/MerchantAccountMapper.java delete mode 100644 modules/common/system/mapper/MerchantApplyMapper.java delete mode 100644 modules/common/system/mapper/MerchantMapper.java delete mode 100644 modules/common/system/mapper/MerchantTypeMapper.java delete mode 100644 modules/common/system/mapper/ModulesMapper.java delete mode 100644 modules/common/system/mapper/NoticeMapper.java delete mode 100644 modules/common/system/mapper/OperationRecordMapper.java delete mode 100644 modules/common/system/mapper/OrderInfoMapper.java delete mode 100644 modules/common/system/mapper/OrderMapper.java delete mode 100644 modules/common/system/mapper/OrganizationMapper.java delete mode 100644 modules/common/system/mapper/PaymentMapper.java delete mode 100644 modules/common/system/mapper/PlugMapper.java delete mode 100644 modules/common/system/mapper/RechargeOrderMapper.java delete mode 100644 modules/common/system/mapper/RoleMapper.java delete mode 100644 modules/common/system/mapper/RoleMenuMapper.java delete mode 100644 modules/common/system/mapper/SettingMapper.java delete mode 100644 modules/common/system/mapper/TenantMapper.java delete mode 100644 modules/common/system/mapper/UserBalanceLogMapper.java delete mode 100644 modules/common/system/mapper/UserCollectionMapper.java delete mode 100644 modules/common/system/mapper/UserFileMapper.java delete mode 100644 modules/common/system/mapper/UserGradeMapper.java delete mode 100644 modules/common/system/mapper/UserGroupMapper.java delete mode 100644 modules/common/system/mapper/UserMapper.java delete mode 100644 modules/common/system/mapper/UserOauthMapper.java delete mode 100644 modules/common/system/mapper/UserRefereeMapper.java delete mode 100644 modules/common/system/mapper/UserRoleMapper.java delete mode 100644 modules/common/system/mapper/VersionMapper.java delete mode 100644 modules/common/system/mapper/WhiteDomainMapper.java delete mode 100644 modules/common/system/mapper/xml/AccessKeyMapper.xml delete mode 100644 modules/common/system/mapper/xml/AppMapper.xml delete mode 100644 modules/common/system/mapper/xml/AppRenewMapper.xml delete mode 100644 modules/common/system/mapper/xml/AppUrlMapper.xml delete mode 100644 modules/common/system/mapper/xml/AppUserMapper.xml delete mode 100644 modules/common/system/mapper/xml/ChatConversationMapper.xml delete mode 100644 modules/common/system/mapper/xml/ChatMessageMapper.xml delete mode 100644 modules/common/system/mapper/xml/CompanyMapper.xml delete mode 100644 modules/common/system/mapper/xml/DictDataMapper.xml delete mode 100644 modules/common/system/mapper/xml/DictMapper.xml delete mode 100644 modules/common/system/mapper/xml/DictionaryDataMapper.xml delete mode 100644 modules/common/system/mapper/xml/DictionaryMapper.xml delete mode 100644 modules/common/system/mapper/xml/EmailRecordMapper.xml delete mode 100644 modules/common/system/mapper/xml/EnvironmentMapper.xml delete mode 100644 modules/common/system/mapper/xml/FileRecordMapper.xml delete mode 100644 modules/common/system/mapper/xml/LoginRecordMapper.xml delete mode 100644 modules/common/system/mapper/xml/MenuMapper.xml delete mode 100644 modules/common/system/mapper/xml/MerchantAccountMapper.xml delete mode 100644 modules/common/system/mapper/xml/MerchantApplyMapper.xml delete mode 100644 modules/common/system/mapper/xml/MerchantMapper.xml delete mode 100644 modules/common/system/mapper/xml/MerchantTypeMapper.xml delete mode 100644 modules/common/system/mapper/xml/ModulesMapper.xml delete mode 100644 modules/common/system/mapper/xml/NoticeMapper.xml delete mode 100644 modules/common/system/mapper/xml/OperationRecordMapper.xml delete mode 100644 modules/common/system/mapper/xml/OrderInfoMapper.xml delete mode 100644 modules/common/system/mapper/xml/OrderMapper.xml delete mode 100644 modules/common/system/mapper/xml/OrganizationMapper.xml delete mode 100644 modules/common/system/mapper/xml/PaymentMapper.xml delete mode 100644 modules/common/system/mapper/xml/PlugMapper.xml delete mode 100644 modules/common/system/mapper/xml/RechargeOrderMapper.xml delete mode 100644 modules/common/system/mapper/xml/RoleMapper.xml delete mode 100644 modules/common/system/mapper/xml/RoleMenuMapper.xml delete mode 100644 modules/common/system/mapper/xml/SettingMapper.xml delete mode 100644 modules/common/system/mapper/xml/TenantMapper.xml delete mode 100644 modules/common/system/mapper/xml/UserBalanceLogMapper.xml delete mode 100644 modules/common/system/mapper/xml/UserCollectionMapper.xml delete mode 100644 modules/common/system/mapper/xml/UserFileMapper.xml delete mode 100644 modules/common/system/mapper/xml/UserGradeMapper.xml delete mode 100644 modules/common/system/mapper/xml/UserGroupMapper.xml delete mode 100644 modules/common/system/mapper/xml/UserMapper.xml delete mode 100644 modules/common/system/mapper/xml/UserOauthMapper.xml delete mode 100644 modules/common/system/mapper/xml/UserRefereeMapper.xml delete mode 100644 modules/common/system/mapper/xml/UserRoleMapper.xml delete mode 100644 modules/common/system/mapper/xml/VersionMapper.xml delete mode 100644 modules/common/system/mapper/xml/WhiteDomainMapper.xml delete mode 100644 modules/common/system/param/AccessKeyParam.java delete mode 100644 modules/common/system/param/AlipayParam.java delete mode 100644 modules/common/system/param/AppParam.java delete mode 100644 modules/common/system/param/AppRenewParam.java delete mode 100644 modules/common/system/param/AppUrlParam.java delete mode 100644 modules/common/system/param/AppUserParam.java delete mode 100644 modules/common/system/param/CacheParam.java delete mode 100644 modules/common/system/param/ChatConversationParam.java delete mode 100644 modules/common/system/param/ChatMessageParam.java delete mode 100644 modules/common/system/param/CompanyParam.java delete mode 100644 modules/common/system/param/DictDataParam.java delete mode 100644 modules/common/system/param/DictParam.java delete mode 100644 modules/common/system/param/DictionaryDataParam.java delete mode 100644 modules/common/system/param/DictionaryParam.java delete mode 100644 modules/common/system/param/EnvironmentParam.java delete mode 100644 modules/common/system/param/FileRecordParam.java delete mode 100644 modules/common/system/param/LoginParam.java delete mode 100644 modules/common/system/param/LoginRecordParam.java delete mode 100644 modules/common/system/param/MenuParam.java delete mode 100644 modules/common/system/param/MerchantAccountParam.java delete mode 100644 modules/common/system/param/MerchantApplyParam.java delete mode 100644 modules/common/system/param/MerchantParam.java delete mode 100644 modules/common/system/param/MerchantTypeParam.java delete mode 100644 modules/common/system/param/ModulesParam.java delete mode 100644 modules/common/system/param/NoticeParam.java delete mode 100644 modules/common/system/param/OperationRecordParam.java delete mode 100644 modules/common/system/param/OrderInfoParam.java delete mode 100644 modules/common/system/param/OrderParam.java delete mode 100644 modules/common/system/param/OrganizationParam.java delete mode 100644 modules/common/system/param/PaymentParam.java delete mode 100644 modules/common/system/param/PlugParam.java delete mode 100644 modules/common/system/param/RechargeOrderParam.java delete mode 100644 modules/common/system/param/RoleParam.java delete mode 100644 modules/common/system/param/SettingParam.java delete mode 100644 modules/common/system/param/SmsCaptchaParam.java delete mode 100644 modules/common/system/param/TenantParam.java delete mode 100644 modules/common/system/param/UpdatePasswordParam.java delete mode 100644 modules/common/system/param/UserBalanceLogParam.java delete mode 100644 modules/common/system/param/UserCollectionParam.java delete mode 100644 modules/common/system/param/UserFileParam.java delete mode 100644 modules/common/system/param/UserGradeParam.java delete mode 100644 modules/common/system/param/UserGroupParam.java delete mode 100644 modules/common/system/param/UserImportParam.java delete mode 100644 modules/common/system/param/UserOauthParam.java delete mode 100644 modules/common/system/param/UserParam.java delete mode 100644 modules/common/system/param/UserRefereeParam.java delete mode 100644 modules/common/system/param/VersionParam.java delete mode 100644 modules/common/system/param/WhiteDomainParam.java delete mode 100644 modules/common/system/result/CaptchaResult.java delete mode 100644 modules/common/system/result/LoginResult.java delete mode 100644 modules/common/system/result/RedisResult.java delete mode 100644 modules/common/system/result/SmsCaptchaResult.java delete mode 100644 modules/common/system/service/AccessKeyService.java delete mode 100644 modules/common/system/service/AppRenewService.java delete mode 100644 modules/common/system/service/AppService.java delete mode 100644 modules/common/system/service/AppUrlService.java delete mode 100644 modules/common/system/service/AppUserService.java delete mode 100644 modules/common/system/service/ChatConversationService.java delete mode 100644 modules/common/system/service/ChatMessageService.java delete mode 100644 modules/common/system/service/CompanyService.java delete mode 100644 modules/common/system/service/DictDataService.java delete mode 100644 modules/common/system/service/DictService.java delete mode 100644 modules/common/system/service/DictionaryDataService.java delete mode 100644 modules/common/system/service/DictionaryService.java delete mode 100644 modules/common/system/service/EmailRecordService.java delete mode 100644 modules/common/system/service/EnvironmentService.java delete mode 100644 modules/common/system/service/FileRecordService.java delete mode 100644 modules/common/system/service/LoginRecordService.java delete mode 100644 modules/common/system/service/MenuService.java delete mode 100644 modules/common/system/service/MerchantAccountService.java delete mode 100644 modules/common/system/service/MerchantApplyService.java delete mode 100644 modules/common/system/service/MerchantService.java delete mode 100644 modules/common/system/service/MerchantTypeService.java delete mode 100644 modules/common/system/service/ModulesService.java delete mode 100644 modules/common/system/service/NoticeService.java delete mode 100644 modules/common/system/service/OperationRecordService.java delete mode 100644 modules/common/system/service/OrderInfoService.java delete mode 100644 modules/common/system/service/OrderService.java delete mode 100644 modules/common/system/service/OrganizationService.java delete mode 100644 modules/common/system/service/PaymentService.java delete mode 100644 modules/common/system/service/PlugService.java delete mode 100644 modules/common/system/service/RechargeOrderService.java delete mode 100644 modules/common/system/service/RoleMenuService.java delete mode 100644 modules/common/system/service/RoleService.java delete mode 100644 modules/common/system/service/SettingService.java delete mode 100644 modules/common/system/service/TenantService.java delete mode 100644 modules/common/system/service/UserBalanceLogService.java delete mode 100644 modules/common/system/service/UserCollectionService.java delete mode 100644 modules/common/system/service/UserFileService.java delete mode 100644 modules/common/system/service/UserGradeService.java delete mode 100644 modules/common/system/service/UserGroupService.java delete mode 100644 modules/common/system/service/UserOauthService.java delete mode 100644 modules/common/system/service/UserRefereeService.java delete mode 100644 modules/common/system/service/UserRoleService.java delete mode 100644 modules/common/system/service/UserService.java delete mode 100644 modules/common/system/service/VersionService.java delete mode 100644 modules/common/system/service/WhiteDomainService.java delete mode 100644 modules/common/system/service/impl/AccessKeyServiceImpl.java delete mode 100644 modules/common/system/service/impl/AppRenewServiceImpl.java delete mode 100644 modules/common/system/service/impl/AppServiceImpl.java delete mode 100644 modules/common/system/service/impl/AppUrlServiceImpl.java delete mode 100644 modules/common/system/service/impl/AppUserServiceImpl.java delete mode 100644 modules/common/system/service/impl/ChatConversationServiceImpl.java delete mode 100644 modules/common/system/service/impl/ChatMessageServiceImpl.java delete mode 100644 modules/common/system/service/impl/CompanyServiceImpl.java delete mode 100644 modules/common/system/service/impl/DictDataServiceImpl.java delete mode 100644 modules/common/system/service/impl/DictServiceImpl.java delete mode 100644 modules/common/system/service/impl/DictionaryDataServiceImpl.java delete mode 100644 modules/common/system/service/impl/DictionaryServiceImpl.java delete mode 100644 modules/common/system/service/impl/EmailRecordServiceImpl.java delete mode 100644 modules/common/system/service/impl/EnvironmentServiceImpl.java delete mode 100644 modules/common/system/service/impl/FileRecordServiceImpl.java delete mode 100644 modules/common/system/service/impl/LoginRecordServiceImpl.java delete mode 100644 modules/common/system/service/impl/MenuServiceImpl.java delete mode 100644 modules/common/system/service/impl/MerchantAccountServiceImpl.java delete mode 100644 modules/common/system/service/impl/MerchantApplyServiceImpl.java delete mode 100644 modules/common/system/service/impl/MerchantServiceImpl.java delete mode 100644 modules/common/system/service/impl/MerchantTypeServiceImpl.java delete mode 100644 modules/common/system/service/impl/ModulesServiceImpl.java delete mode 100644 modules/common/system/service/impl/NoticeServiceImpl.java delete mode 100644 modules/common/system/service/impl/OperationRecordServiceImpl.java delete mode 100644 modules/common/system/service/impl/OrderInfoServiceImpl.java delete mode 100644 modules/common/system/service/impl/OrderServiceImpl.java delete mode 100644 modules/common/system/service/impl/OrganizationServiceImpl.java delete mode 100644 modules/common/system/service/impl/PaymentServiceImpl.java delete mode 100644 modules/common/system/service/impl/PlugServiceImpl.java delete mode 100644 modules/common/system/service/impl/RechargeOrderServiceImpl.java delete mode 100644 modules/common/system/service/impl/RoleMenuServiceImpl.java delete mode 100644 modules/common/system/service/impl/RoleServiceImpl.java delete mode 100644 modules/common/system/service/impl/SettingServiceImpl.java delete mode 100644 modules/common/system/service/impl/TenantServiceImpl.java delete mode 100644 modules/common/system/service/impl/UserBalanceLogServiceImpl.java delete mode 100644 modules/common/system/service/impl/UserCollectionServiceImpl.java delete mode 100644 modules/common/system/service/impl/UserFileServiceImpl.java delete mode 100644 modules/common/system/service/impl/UserGradeServiceImpl.java delete mode 100644 modules/common/system/service/impl/UserGroupServiceImpl.java delete mode 100644 modules/common/system/service/impl/UserOauthServiceImpl.java delete mode 100644 modules/common/system/service/impl/UserRefereeServiceImpl.java delete mode 100644 modules/common/system/service/impl/UserRoleServiceImpl.java delete mode 100644 modules/common/system/service/impl/UserServiceImpl.java delete mode 100644 modules/common/system/service/impl/VersionServiceImpl.java delete mode 100644 modules/common/system/service/impl/WhiteDomainServiceImpl.java delete mode 100644 modules/common/system/vo/ChatConversationVO.java delete mode 100644 modules/common/system/vo/PushMessageVO.java delete mode 100644 modules/common/system/vo/faceId/HeadPortraitResult.java delete mode 100644 modules/common/system/vo/idcheck/BackRecognitionResult.java delete mode 100644 modules/common/system/vo/idcheck/FrontRecognitionResult.java delete mode 100644 modules/common/system/vo/idcheck/IdCardInfor.java delete mode 100644 modules/common/system/vo/idcheck/Response.java delete mode 100644 modules/common/system/vo/idcheck/VerifyResult.java delete mode 100644 modules/oa/controller/AppController.java delete mode 100644 modules/oa/controller/AppFieldController.java delete mode 100644 modules/oa/controller/AppRenewController.java delete mode 100644 modules/oa/controller/AppUrlController.java delete mode 100644 modules/oa/controller/AppUserController.java delete mode 100644 modules/oa/controller/AssetsController.java delete mode 100644 modules/oa/controller/AssetsUserController.java delete mode 100644 modules/oa/controller/CompanyController.java delete mode 100644 modules/oa/controller/CompanyFieldController.java delete mode 100644 modules/oa/controller/CompanyUserController.java delete mode 100644 modules/oa/controller/LinkController.java delete mode 100644 modules/oa/controller/ProductController.java delete mode 100644 modules/oa/controller/ProductTabsController.java delete mode 100644 modules/oa/controller/TaskController.java delete mode 100644 modules/oa/controller/TaskCountController.java delete mode 100644 modules/oa/controller/TaskRecordController.java delete mode 100644 modules/oa/controller/TaskUserController.java delete mode 100644 modules/oa/entity/App.java delete mode 100644 modules/oa/entity/AppField.java delete mode 100644 modules/oa/entity/AppRenew.java delete mode 100644 modules/oa/entity/AppUrl.java delete mode 100644 modules/oa/entity/AppUser.java delete mode 100644 modules/oa/entity/Assets.java delete mode 100644 modules/oa/entity/AssetsUser.java delete mode 100644 modules/oa/entity/Company.java delete mode 100644 modules/oa/entity/CompanyField.java delete mode 100644 modules/oa/entity/CompanyUser.java delete mode 100644 modules/oa/entity/Link.java delete mode 100644 modules/oa/entity/Product.java delete mode 100644 modules/oa/entity/ProductTabs.java delete mode 100644 modules/oa/entity/Task.java delete mode 100644 modules/oa/entity/TaskCount.java delete mode 100644 modules/oa/entity/TaskRecord.java delete mode 100644 modules/oa/entity/TaskUser.java delete mode 100644 modules/oa/mapper/AppFieldMapper.java delete mode 100644 modules/oa/mapper/AppMapper.java delete mode 100644 modules/oa/mapper/AppRenewMapper.java delete mode 100644 modules/oa/mapper/AppUrlMapper.java delete mode 100644 modules/oa/mapper/AppUserMapper.java delete mode 100644 modules/oa/mapper/AssetsMapper.java delete mode 100644 modules/oa/mapper/AssetsUserMapper.java delete mode 100644 modules/oa/mapper/CompanyFieldMapper.java delete mode 100644 modules/oa/mapper/CompanyMapper.java delete mode 100644 modules/oa/mapper/CompanyUserMapper.java delete mode 100644 modules/oa/mapper/LinkMapper.java delete mode 100644 modules/oa/mapper/ProductMapper.java delete mode 100644 modules/oa/mapper/ProductTabsMapper.java delete mode 100644 modules/oa/mapper/TaskCountMapper.java delete mode 100644 modules/oa/mapper/TaskMapper.java delete mode 100644 modules/oa/mapper/TaskRecordMapper.java delete mode 100644 modules/oa/mapper/TaskUserMapper.java delete mode 100644 modules/oa/mapper/xml/AppFieldMapper.xml delete mode 100644 modules/oa/mapper/xml/AppMapper.xml delete mode 100644 modules/oa/mapper/xml/AppRenewMapper.xml delete mode 100644 modules/oa/mapper/xml/AppUrlMapper.xml delete mode 100644 modules/oa/mapper/xml/AppUserMapper.xml delete mode 100644 modules/oa/mapper/xml/AssetsMapper.xml delete mode 100644 modules/oa/mapper/xml/AssetsUserMapper.xml delete mode 100644 modules/oa/mapper/xml/CompanyFieldMapper.xml delete mode 100644 modules/oa/mapper/xml/CompanyMapper.xml delete mode 100644 modules/oa/mapper/xml/CompanyUserMapper.xml delete mode 100644 modules/oa/mapper/xml/LinkMapper.xml delete mode 100644 modules/oa/mapper/xml/ProductMapper.xml delete mode 100644 modules/oa/mapper/xml/ProductTabsMapper.xml delete mode 100644 modules/oa/mapper/xml/TaskCountMapper.xml delete mode 100644 modules/oa/mapper/xml/TaskMapper.xml delete mode 100644 modules/oa/mapper/xml/TaskRecordMapper.xml delete mode 100644 modules/oa/mapper/xml/TaskUserMapper.xml delete mode 100644 modules/oa/param/AppFieldParam.java delete mode 100644 modules/oa/param/AppParam.java delete mode 100644 modules/oa/param/AppRenewParam.java delete mode 100644 modules/oa/param/AppUrlParam.java delete mode 100644 modules/oa/param/AppUserParam.java delete mode 100644 modules/oa/param/AssetsParam.java delete mode 100644 modules/oa/param/AssetsUserParam.java delete mode 100644 modules/oa/param/CompanyFieldParam.java delete mode 100644 modules/oa/param/CompanyParam.java delete mode 100644 modules/oa/param/CompanyUserParam.java delete mode 100644 modules/oa/param/LinkParam.java delete mode 100644 modules/oa/param/ProductParam.java delete mode 100644 modules/oa/param/ProductTabsParam.java delete mode 100644 modules/oa/param/TaskCountParam.java delete mode 100644 modules/oa/param/TaskParam.java delete mode 100644 modules/oa/param/TaskRecordParam.java delete mode 100644 modules/oa/param/TaskUserParam.java delete mode 100644 modules/oa/service/AppFieldService.java delete mode 100644 modules/oa/service/AppRenewService.java delete mode 100644 modules/oa/service/AppService.java delete mode 100644 modules/oa/service/AppUrlService.java delete mode 100644 modules/oa/service/AppUserService.java delete mode 100644 modules/oa/service/AssetsService.java delete mode 100644 modules/oa/service/AssetsUserService.java delete mode 100644 modules/oa/service/CompanyFieldService.java delete mode 100644 modules/oa/service/CompanyService.java delete mode 100644 modules/oa/service/CompanyUserService.java delete mode 100644 modules/oa/service/LinkService.java delete mode 100644 modules/oa/service/ProductService.java delete mode 100644 modules/oa/service/ProductTabsService.java delete mode 100644 modules/oa/service/TaskCountService.java delete mode 100644 modules/oa/service/TaskRecordService.java delete mode 100644 modules/oa/service/TaskService.java delete mode 100644 modules/oa/service/TaskUserService.java delete mode 100644 modules/oa/service/impl/AppFieldServiceImpl.java delete mode 100644 modules/oa/service/impl/AppRenewServiceImpl.java delete mode 100644 modules/oa/service/impl/AppServiceImpl.java delete mode 100644 modules/oa/service/impl/AppUrlServiceImpl.java delete mode 100644 modules/oa/service/impl/AppUserServiceImpl.java delete mode 100644 modules/oa/service/impl/AssetsServiceImpl.java delete mode 100644 modules/oa/service/impl/AssetsUserServiceImpl.java delete mode 100644 modules/oa/service/impl/CompanyFieldServiceImpl.java delete mode 100644 modules/oa/service/impl/CompanyServiceImpl.java delete mode 100644 modules/oa/service/impl/CompanyUserServiceImpl.java delete mode 100644 modules/oa/service/impl/LinkServiceImpl.java delete mode 100644 modules/oa/service/impl/ProductServiceImpl.java delete mode 100644 modules/oa/service/impl/ProductTabsServiceImpl.java delete mode 100644 modules/oa/service/impl/TaskCountServiceImpl.java delete mode 100644 modules/oa/service/impl/TaskRecordServiceImpl.java delete mode 100644 modules/oa/service/impl/TaskServiceImpl.java delete mode 100644 modules/oa/service/impl/TaskUserServiceImpl.java delete mode 100644 modules/shop/controller/BrandController.java delete mode 100644 modules/shop/controller/CartController.java delete mode 100644 modules/shop/controller/CashierController.java delete mode 100644 modules/shop/controller/ChatConversationController.java delete mode 100644 modules/shop/controller/ChatMessageController.java delete mode 100644 modules/shop/controller/CountController.java delete mode 100644 modules/shop/controller/DealerApplyController.java delete mode 100644 modules/shop/controller/DealerCapitalController.java delete mode 100644 modules/shop/controller/DealerOrderController.java delete mode 100644 modules/shop/controller/DealerRefereeController.java delete mode 100644 modules/shop/controller/DealerSettingController.java delete mode 100644 modules/shop/controller/DealerUserController.java delete mode 100644 modules/shop/controller/DealerWithdrawController.java delete mode 100644 modules/shop/controller/GoodsCategoryController.java delete mode 100644 modules/shop/controller/GoodsController.java delete mode 100644 modules/shop/controller/GoodsSkuController.java delete mode 100644 modules/shop/controller/GoodsSpecController.java delete mode 100644 modules/shop/controller/MerchantAccountController.java delete mode 100644 modules/shop/controller/MerchantApplyController.java delete mode 100644 modules/shop/controller/MerchantController.java delete mode 100644 modules/shop/controller/MerchantTypeController.java delete mode 100644 modules/shop/controller/OrderController.java delete mode 100644 modules/shop/controller/OrderGoodsController.java delete mode 100644 modules/shop/controller/OrderInfoController.java delete mode 100644 modules/shop/controller/OrderInfoLogController.java delete mode 100644 modules/shop/controller/RechargeOrderController.java delete mode 100644 modules/shop/controller/SpecController.java delete mode 100644 modules/shop/controller/SpecValueController.java delete mode 100644 modules/shop/controller/UserAddressController.java delete mode 100644 modules/shop/controller/UserBalanceLogController.java delete mode 100644 modules/shop/controller/UserCollectionController.java delete mode 100644 modules/shop/controller/UsersController.java delete mode 100644 modules/shop/controller/WechatDepositController.java delete mode 100644 modules/shop/controller/WxNativePayController.java delete mode 100644 modules/shop/controller/WxPayNotifyController.java delete mode 100644 modules/shop/controller/WxPayNotifyNbgController.java delete mode 100644 modules/shop/entity/Brand.java delete mode 100644 modules/shop/entity/Cart.java delete mode 100644 modules/shop/entity/Cashier.java delete mode 100644 modules/shop/entity/ChatConversation.java delete mode 100644 modules/shop/entity/ChatMessage.java delete mode 100644 modules/shop/entity/Count.java delete mode 100644 modules/shop/entity/DealerApply.java delete mode 100644 modules/shop/entity/DealerCapital.java delete mode 100644 modules/shop/entity/DealerOrder.java delete mode 100644 modules/shop/entity/DealerReferee.java delete mode 100644 modules/shop/entity/DealerSetting.java delete mode 100644 modules/shop/entity/DealerUser.java delete mode 100644 modules/shop/entity/DealerWithdraw.java delete mode 100644 modules/shop/entity/Goods.java delete mode 100644 modules/shop/entity/GoodsCategory.java delete mode 100644 modules/shop/entity/GoodsSku.java delete mode 100644 modules/shop/entity/GoodsSkuVO.java delete mode 100644 modules/shop/entity/GoodsSpec.java delete mode 100644 modules/shop/entity/Merchant.java delete mode 100644 modules/shop/entity/MerchantAccount.java delete mode 100644 modules/shop/entity/MerchantApply.java delete mode 100644 modules/shop/entity/MerchantType.java delete mode 100644 modules/shop/entity/Order.java delete mode 100644 modules/shop/entity/OrderGoods.java delete mode 100644 modules/shop/entity/OrderInfo.java delete mode 100644 modules/shop/entity/OrderInfoLog.java delete mode 100644 modules/shop/entity/Payment.java delete mode 100644 modules/shop/entity/RechargeOrder.java delete mode 100644 modules/shop/entity/Spec.java delete mode 100644 modules/shop/entity/SpecValue.java delete mode 100644 modules/shop/entity/UserAddress.java delete mode 100644 modules/shop/entity/UserBalanceLog.java delete mode 100644 modules/shop/entity/UserCollection.java delete mode 100644 modules/shop/entity/Users.java delete mode 100644 modules/shop/entity/WechatDeposit.java delete mode 100644 modules/shop/mapper/BrandMapper.java delete mode 100644 modules/shop/mapper/CartMapper.java delete mode 100644 modules/shop/mapper/CashierMapper.java delete mode 100644 modules/shop/mapper/ChatConversationMapper.java delete mode 100644 modules/shop/mapper/ChatMessageMapper.java delete mode 100644 modules/shop/mapper/CountMapper.java delete mode 100644 modules/shop/mapper/DealerApplyMapper.java delete mode 100644 modules/shop/mapper/DealerCapitalMapper.java delete mode 100644 modules/shop/mapper/DealerOrderMapper.java delete mode 100644 modules/shop/mapper/DealerRefereeMapper.java delete mode 100644 modules/shop/mapper/DealerSettingMapper.java delete mode 100644 modules/shop/mapper/DealerUserMapper.java delete mode 100644 modules/shop/mapper/DealerWithdrawMapper.java delete mode 100644 modules/shop/mapper/GoodsCategoryMapper.java delete mode 100644 modules/shop/mapper/GoodsMapper.java delete mode 100644 modules/shop/mapper/GoodsSkuMapper.java delete mode 100644 modules/shop/mapper/GoodsSpecMapper.java delete mode 100644 modules/shop/mapper/MerchantAccountMapper.java delete mode 100644 modules/shop/mapper/MerchantApplyMapper.java delete mode 100644 modules/shop/mapper/MerchantMapper.java delete mode 100644 modules/shop/mapper/MerchantTypeMapper.java delete mode 100644 modules/shop/mapper/OrderGoodsMapper.java delete mode 100644 modules/shop/mapper/OrderInfoLogMapper.java delete mode 100644 modules/shop/mapper/OrderInfoMapper.java delete mode 100644 modules/shop/mapper/OrderMapper.java delete mode 100644 modules/shop/mapper/RechargeOrderMapper.java delete mode 100644 modules/shop/mapper/SpecMapper.java delete mode 100644 modules/shop/mapper/SpecValueMapper.java delete mode 100644 modules/shop/mapper/UserAddressMapper.java delete mode 100644 modules/shop/mapper/UserBalanceLogMapper.java delete mode 100644 modules/shop/mapper/UserCollectionMapper.java delete mode 100644 modules/shop/mapper/UsersMapper.java delete mode 100644 modules/shop/mapper/WechatDepositMapper.java delete mode 100644 modules/shop/mapper/xml/BrandMapper.xml delete mode 100644 modules/shop/mapper/xml/CartMapper.xml delete mode 100644 modules/shop/mapper/xml/CashierMapper.xml delete mode 100644 modules/shop/mapper/xml/ChatConversationMapper.xml delete mode 100644 modules/shop/mapper/xml/ChatMessageMapper.xml delete mode 100644 modules/shop/mapper/xml/CountMapper.xml delete mode 100644 modules/shop/mapper/xml/DealerApplyMapper.xml delete mode 100644 modules/shop/mapper/xml/DealerCapitalMapper.xml delete mode 100644 modules/shop/mapper/xml/DealerOrderMapper.xml delete mode 100644 modules/shop/mapper/xml/DealerRefereeMapper.xml delete mode 100644 modules/shop/mapper/xml/DealerSettingMapper.xml delete mode 100644 modules/shop/mapper/xml/DealerUserMapper.xml delete mode 100644 modules/shop/mapper/xml/DealerWithdrawMapper.xml delete mode 100644 modules/shop/mapper/xml/GoodsCategoryMapper.xml delete mode 100644 modules/shop/mapper/xml/GoodsMapper.xml delete mode 100644 modules/shop/mapper/xml/GoodsSkuMapper.xml delete mode 100644 modules/shop/mapper/xml/GoodsSpecMapper.xml delete mode 100644 modules/shop/mapper/xml/MerchantAccountMapper.xml delete mode 100644 modules/shop/mapper/xml/MerchantApplyMapper.xml delete mode 100644 modules/shop/mapper/xml/MerchantMapper.xml delete mode 100644 modules/shop/mapper/xml/MerchantTypeMapper.xml delete mode 100644 modules/shop/mapper/xml/OrderGoodsMapper.xml delete mode 100644 modules/shop/mapper/xml/OrderInfoLogMapper.xml delete mode 100644 modules/shop/mapper/xml/OrderInfoMapper.xml delete mode 100644 modules/shop/mapper/xml/OrderMapper.xml delete mode 100644 modules/shop/mapper/xml/RechargeOrderMapper.xml delete mode 100644 modules/shop/mapper/xml/SpecMapper.xml delete mode 100644 modules/shop/mapper/xml/SpecValueMapper.xml delete mode 100644 modules/shop/mapper/xml/UserAddressMapper.xml delete mode 100644 modules/shop/mapper/xml/UserBalanceLogMapper.xml delete mode 100644 modules/shop/mapper/xml/UserCollectionMapper.xml delete mode 100644 modules/shop/mapper/xml/UsersMapper.xml delete mode 100644 modules/shop/mapper/xml/WechatDepositMapper.xml delete mode 100644 modules/shop/param/BrandParam.java delete mode 100644 modules/shop/param/CartParam.java delete mode 100644 modules/shop/param/CashierParam.java delete mode 100644 modules/shop/param/ChatConversationParam.java delete mode 100644 modules/shop/param/ChatMessageParam.java delete mode 100644 modules/shop/param/CountParam.java delete mode 100644 modules/shop/param/DealerApplyParam.java delete mode 100644 modules/shop/param/DealerCapitalParam.java delete mode 100644 modules/shop/param/DealerOrderParam.java delete mode 100644 modules/shop/param/DealerRefereeParam.java delete mode 100644 modules/shop/param/DealerSettingParam.java delete mode 100644 modules/shop/param/DealerUserParam.java delete mode 100644 modules/shop/param/DealerWithdrawParam.java delete mode 100644 modules/shop/param/GoodsCategoryParam.java delete mode 100644 modules/shop/param/GoodsParam.java delete mode 100644 modules/shop/param/GoodsSkuParam.java delete mode 100644 modules/shop/param/GoodsSpecParam.java delete mode 100644 modules/shop/param/MerchantAccountParam.java delete mode 100644 modules/shop/param/MerchantApplyParam.java delete mode 100644 modules/shop/param/MerchantParam.java delete mode 100644 modules/shop/param/MerchantTypeParam.java delete mode 100644 modules/shop/param/OrderGoodsParam.java delete mode 100644 modules/shop/param/OrderInfoLogParam.java delete mode 100644 modules/shop/param/OrderInfoParam.java delete mode 100644 modules/shop/param/OrderParam.java delete mode 100644 modules/shop/param/RechargeOrderParam.java delete mode 100644 modules/shop/param/SpecParam.java delete mode 100644 modules/shop/param/SpecValueParam.java delete mode 100644 modules/shop/param/UserAddressParam.java delete mode 100644 modules/shop/param/UserBalanceLogParam.java delete mode 100644 modules/shop/param/UserCollectionParam.java delete mode 100644 modules/shop/param/UsersParam.java delete mode 100644 modules/shop/param/WechatDepositParam.java delete mode 100644 modules/shop/service/BrandService.java delete mode 100644 modules/shop/service/CartService.java delete mode 100644 modules/shop/service/CashierService.java delete mode 100644 modules/shop/service/ChatConversationService.java delete mode 100644 modules/shop/service/ChatMessageService.java delete mode 100644 modules/shop/service/CountService.java delete mode 100644 modules/shop/service/DealerApplyService.java delete mode 100644 modules/shop/service/DealerCapitalService.java delete mode 100644 modules/shop/service/DealerOrderService.java delete mode 100644 modules/shop/service/DealerRefereeService.java delete mode 100644 modules/shop/service/DealerSettingService.java delete mode 100644 modules/shop/service/DealerUserService.java delete mode 100644 modules/shop/service/DealerWithdrawService.java delete mode 100644 modules/shop/service/GoodsCategoryService.java delete mode 100644 modules/shop/service/GoodsService.java delete mode 100644 modules/shop/service/GoodsSkuService.java delete mode 100644 modules/shop/service/GoodsSpecService.java delete mode 100644 modules/shop/service/MerchantAccountService.java delete mode 100644 modules/shop/service/MerchantApplyService.java delete mode 100644 modules/shop/service/MerchantService.java delete mode 100644 modules/shop/service/MerchantTypeService.java delete mode 100644 modules/shop/service/OrderGoodsService.java delete mode 100644 modules/shop/service/OrderInfoLogService.java delete mode 100644 modules/shop/service/OrderInfoService.java delete mode 100644 modules/shop/service/OrderService.java delete mode 100644 modules/shop/service/RechargeOrderService.java delete mode 100644 modules/shop/service/SpecService.java delete mode 100644 modules/shop/service/SpecValueService.java delete mode 100644 modules/shop/service/UserAddressService.java delete mode 100644 modules/shop/service/UserBalanceLogService.java delete mode 100644 modules/shop/service/UserCollectionService.java delete mode 100644 modules/shop/service/UsersService.java delete mode 100644 modules/shop/service/WechatDepositService.java delete mode 100644 modules/shop/service/impl/BrandServiceImpl.java delete mode 100644 modules/shop/service/impl/CartServiceImpl.java delete mode 100644 modules/shop/service/impl/CashierServiceImpl.java delete mode 100644 modules/shop/service/impl/ChatConversationServiceImpl.java delete mode 100644 modules/shop/service/impl/ChatMessageServiceImpl.java delete mode 100644 modules/shop/service/impl/CountServiceImpl.java delete mode 100644 modules/shop/service/impl/DealerApplyServiceImpl.java delete mode 100644 modules/shop/service/impl/DealerCapitalServiceImpl.java delete mode 100644 modules/shop/service/impl/DealerOrderServiceImpl.java delete mode 100644 modules/shop/service/impl/DealerRefereeServiceImpl.java delete mode 100644 modules/shop/service/impl/DealerSettingServiceImpl.java delete mode 100644 modules/shop/service/impl/DealerUserServiceImpl.java delete mode 100644 modules/shop/service/impl/DealerWithdrawServiceImpl.java delete mode 100644 modules/shop/service/impl/GoodsCategoryServiceImpl.java delete mode 100644 modules/shop/service/impl/GoodsServiceImpl.java delete mode 100644 modules/shop/service/impl/GoodsSkuServiceImpl.java delete mode 100644 modules/shop/service/impl/GoodsSpecServiceImpl.java delete mode 100644 modules/shop/service/impl/MerchantAccountServiceImpl.java delete mode 100644 modules/shop/service/impl/MerchantApplyServiceImpl.java delete mode 100644 modules/shop/service/impl/MerchantServiceImpl.java delete mode 100644 modules/shop/service/impl/MerchantTypeServiceImpl.java delete mode 100644 modules/shop/service/impl/OrderGoodsServiceImpl.java delete mode 100644 modules/shop/service/impl/OrderInfoLogServiceImpl.java delete mode 100644 modules/shop/service/impl/OrderInfoServiceImpl.java delete mode 100644 modules/shop/service/impl/OrderServiceImpl.java delete mode 100644 modules/shop/service/impl/RechargeOrderServiceImpl.java delete mode 100644 modules/shop/service/impl/SpecServiceImpl.java delete mode 100644 modules/shop/service/impl/SpecValueServiceImpl.java delete mode 100644 modules/shop/service/impl/UserAddressServiceImpl.java delete mode 100644 modules/shop/service/impl/UserBalanceLogServiceImpl.java delete mode 100644 modules/shop/service/impl/UserCollectionServiceImpl.java delete mode 100644 modules/shop/service/impl/UsersServiceImpl.java delete mode 100644 modules/shop/service/impl/WechatDepositServiceImpl.java delete mode 100644 modules/shop/task/OrderTask.java delete mode 100644 modules/shop/vo/CartShopVo.java delete mode 100644 modules/shop/vo/CartVo.java delete mode 100644 modules/shop/vo/CashierVo.java diff --git a/modules/common/core/Constants.java b/modules/common/core/Constants.java deleted file mode 100644 index be48387..0000000 --- a/modules/common/core/Constants.java +++ /dev/null @@ -1,93 +0,0 @@ -package com.gxwebsoft.common.core; - -/** - * 系统常量 - * Created by WebSoft on 2019-10-29 15:55 - */ -public class Constants { - /** - * 默认成功码 - */ - public static final int RESULT_OK_CODE = 0; - - /** - * 默认失败码 - */ - public static final int RESULT_ERROR_CODE = 1; - - /** - * 默认成功信息 - */ - public static final String RESULT_OK_MSG = "操作成功"; - - /** - * 默认失败信息 - */ - public static final String RESULT_ERROR_MSG = "操作失败"; - - /** - * 无权限错误码 - */ - public static final int UNAUTHORIZED_CODE = 403; - - /** - * 无权限提示信息 - */ - public static final String UNAUTHORIZED_MSG = "没有访问权限"; - - /** - * 未认证错误码 - */ - public static final int UNAUTHENTICATED_CODE = 401; - - /** - * 未认证提示信息 - */ - public static final String UNAUTHENTICATED_MSG = "请先登录"; - - /** - * 登录过期错误码 - */ - public static final int TOKEN_EXPIRED_CODE = 401; - - /** - * 登录过期提示信息 - */ - public static final String TOKEN_EXPIRED_MSG = "登录已过期"; - - /** - * 非法token错误码 - */ - public static final int BAD_CREDENTIALS_CODE = 401; - - /** - * 非法token提示信息 - */ - public static final String BAD_CREDENTIALS_MSG = "请退出重新登录"; - - /** - * 表示升序的值 - */ - public static final String ORDER_ASC_VALUE = "asc"; - - /** - * 表示降序的值 - */ - public static final String ORDER_DESC_VALUE = "desc"; - - /** - * token通过header传递的名称 - */ - public static final String TOKEN_HEADER_NAME = "Authorization"; - - /** - * token通过参数传递的名称 - */ - public static final String TOKEN_PARAM_NAME = "access_token"; - - /** - * token认证类型 - */ - public static final String TOKEN_TYPE = "Bearer"; - -} diff --git a/modules/common/core/annotation/OperationLog.java b/modules/common/core/annotation/OperationLog.java deleted file mode 100644 index 87bdf2c..0000000 --- a/modules/common/core/annotation/OperationLog.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.gxwebsoft.common.core.annotation; - -import java.lang.annotation.*; - -/** - * 操作日志记录注解 - * - * @author WebSoft - * @since 2020-03-21 17:03:08 - */ -@Documented -@Target({ElementType.METHOD}) -@Retention(RetentionPolicy.RUNTIME) -public @interface OperationLog { - - /** - * 操作功能 - */ - String value() default ""; - - /** - * 操作模块 - */ - String module() default ""; - - /** - * 备注 - */ - String comments() default ""; - - /** - * 是否记录请求参数 - */ - boolean param() default true; - - /** - * 是否记录返回结果 - */ - boolean result() default true; - -} diff --git a/modules/common/core/annotation/OperationModule.java b/modules/common/core/annotation/OperationModule.java deleted file mode 100644 index 60ab018..0000000 --- a/modules/common/core/annotation/OperationModule.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.gxwebsoft.common.core.annotation; - -import java.lang.annotation.*; - -/** - * 操作日志模块注解 - * - * @author WebSoft - * @since 2021-09-01 20:48:16 - */ -@Documented -@Target({ElementType.TYPE}) -@Retention(RetentionPolicy.RUNTIME) -public @interface OperationModule { - - /** - * 模块名称 - */ - String value(); - -} diff --git a/modules/common/core/annotation/QueryField.java b/modules/common/core/annotation/QueryField.java deleted file mode 100644 index 9377b9b..0000000 --- a/modules/common/core/annotation/QueryField.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.gxwebsoft.common.core.annotation; - -import java.lang.annotation.*; - -/** - * 查询条件注解 - * - * @author WebSoft - * @since 2021-09-01 20:48:16 - */ -@Documented -@Retention(RetentionPolicy.RUNTIME) -@Target({ElementType.FIELD, ElementType.ANNOTATION_TYPE}) -public @interface QueryField { - - // 字段名称 - String value() default ""; - - // 查询方式 - QueryType type() default QueryType.LIKE; - -} diff --git a/modules/common/core/annotation/QueryType.java b/modules/common/core/annotation/QueryType.java deleted file mode 100644 index 3eb540e..0000000 --- a/modules/common/core/annotation/QueryType.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.common.core.annotation; - -/** - * 查询方式 - * - * @author WebSoft - * @since 2021-09-01 20:48:16 - */ -public enum QueryType { - // 等于 - EQ, - // 不等于 - NE, - // 大于 - GT, - // 大于等于 - GE, - // 小于 - LT, - // 小于等于 - LE, - // 包含 - LIKE, - // 不包含 - NOT_LIKE, - // 结尾等于 - LIKE_LEFT, - // 开头等于 - LIKE_RIGHT, - // 为NULL - IS_NULL, - // 不为空 - IS_NOT_NULL, - // IN - IN, - // NOT IN - NOT_IN, - // IN条件解析逗号分割 - IN_STR, - // NOT IN条件解析逗号分割 - NOT_IN_STR -} diff --git a/modules/common/core/aspect/OperationLogAspect.java b/modules/common/core/aspect/OperationLogAspect.java deleted file mode 100644 index 9c59a9e..0000000 --- a/modules/common/core/aspect/OperationLogAspect.java +++ /dev/null @@ -1,211 +0,0 @@ -package com.gxwebsoft.common.core.aspect; - -import cn.hutool.core.util.ArrayUtil; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import cn.hutool.extra.servlet.ServletUtil; -import cn.hutool.http.useragent.UserAgent; -import cn.hutool.http.useragent.UserAgentUtil; -import com.gxwebsoft.common.core.annotation.OperationLog; -import com.gxwebsoft.common.core.annotation.OperationModule; -import com.gxwebsoft.common.core.utils.JSONUtil; -import com.gxwebsoft.common.system.entity.OperationRecord; -import com.gxwebsoft.common.system.entity.User; -import com.gxwebsoft.common.system.service.OperationRecordService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.aspectj.lang.JoinPoint; -import org.aspectj.lang.annotation.*; -import org.aspectj.lang.reflect.MethodSignature; -import org.springframework.security.core.Authentication; -import org.springframework.security.core.context.SecurityContextHolder; -import org.springframework.stereotype.Component; -import org.springframework.web.context.request.RequestContextHolder; -import org.springframework.web.context.request.ServletRequestAttributes; -import org.springframework.web.multipart.MultipartFile; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.lang.reflect.Method; -import java.util.Map; - -/** - * 操作日志记录 - * - * @author WebSoft - * @since 2020-03-21 16:58:16:05 - */ -@Aspect -@Component -public class OperationLogAspect { - @Resource - private OperationRecordService operationRecordService; - - // 参数、返回结果、错误信息等最大保存长度 - private static final int MAX_LENGTH = 1000; - // 用于记录请求耗时 - private final ThreadLocal startTime = new ThreadLocal<>(); - - @Pointcut("@annotation(com.gxwebsoft.common.core.annotation.OperationLog)") - public void operationLog() { - } - - @Before("operationLog()") - public void doBefore(JoinPoint joinPoint) throws Throwable { - startTime.set(System.currentTimeMillis()); - } - - @AfterReturning(pointcut = "operationLog()", returning = "result") - public void doAfterReturning(JoinPoint joinPoint, Object result) { - saveLog(joinPoint, result, null); - } - - @AfterThrowing(value = "operationLog()", throwing = "e") - public void doAfterThrowing(JoinPoint joinPoint, Exception e) { - saveLog(joinPoint, null, e); - } - - /** - * 保存操作记录 - */ - private void saveLog(JoinPoint joinPoint, Object result, Exception e) { - OperationRecord record = new OperationRecord(); - // 记录操作耗时 - if (startTime.get() != null) { - record.setSpendTime(System.currentTimeMillis() - startTime.get()); - } - // 记录当前登录用户id、租户id - User user = getLoginUser(); - if (user != null) { - record.setUserId(user.getUserId()); - record.setTenantId(user.getTenantId()); - } - // 记录请求地址、请求方式、ip - ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); - HttpServletRequest request = (attributes == null ? null : attributes.getRequest()); - if (request != null) { - record.setUrl(request.getRequestURI()); - record.setRequestMethod(request.getMethod()); - UserAgent ua = UserAgentUtil.parse(ServletUtil.getHeaderIgnoreCase(request, "User-Agent")); - record.setOs(ua.getPlatform().toString()); - record.setDevice(ua.getOs().toString()); - record.setBrowser(ua.getBrowser().toString()); - record.setIp(ServletUtil.getClientIP(request)); - } - // 记录异常信息 - if (e != null) { - record.setStatus(1); - record.setError(StrUtil.sub(e.toString(), 0, MAX_LENGTH)); - } - // 记录模块名、操作功能、请求方法、请求参数、返回结果 - MethodSignature signature = (MethodSignature) joinPoint.getSignature(); - record.setMethod(joinPoint.getTarget().getClass().getName() + "." + signature.getName()); - Method method = signature.getMethod(); - if (method != null) { - OperationLog ol = method.getAnnotation(OperationLog.class); - if (ol != null) { - // 记录操作功能 - record.setDescription(getDescription(method, ol)); - // 记录操作模块 - record.setModule(getModule(joinPoint, ol)); - // 记录备注 - if (StrUtil.isNotEmpty(ol.comments())) { - record.setComments(ol.comments()); - } - // 记录请求参数 - if (ol.param() && request != null) { - record.setParams(StrUtil.sub(getParams(joinPoint, request), 0, MAX_LENGTH)); - } - // 记录请求结果 - if (ol.result() && result != null) { - record.setResult(StrUtil.sub(JSONUtil.toJSONString(result), 0, MAX_LENGTH)); - } - } - } - operationRecordService.saveAsync(record); - } - - /** - * 获取当前登录用户 - */ - private User getLoginUser() { - Authentication subject = SecurityContextHolder.getContext().getAuthentication(); - if (subject != null) { - Object object = subject.getPrincipal(); - if (object instanceof User) { - return (User) object; - } - } - return null; - } - - /** - * 获取请求参数 - * - * @param joinPoint JoinPoint - * @param request HttpServletRequest - * @return String - */ - private String getParams(JoinPoint joinPoint, HttpServletRequest request) { - String params; - Map paramsMap = ServletUtil.getParamMap(request); - if (paramsMap.keySet().size() > 0) { - params = JSONUtil.toJSONString(paramsMap); - } else { - StringBuilder sb = new StringBuilder(); - for (Object arg : joinPoint.getArgs()) { - if (ObjectUtil.isNull(arg) - || arg instanceof MultipartFile - || arg instanceof HttpServletRequest - || arg instanceof HttpServletResponse) { - continue; - } - sb.append(JSONUtil.toJSONString(arg)).append(" "); - } - params = sb.toString(); - } - return params; - } - - /** - * 获取操作模块 - * - * @param joinPoint JoinPoint - * @param ol OperationLog - * @return String - */ - private String getModule(JoinPoint joinPoint, OperationLog ol) { - if (StrUtil.isNotEmpty(ol.module())) { - return ol.module(); - } - OperationModule om = joinPoint.getTarget().getClass().getAnnotation(OperationModule.class); - if (om != null && StrUtil.isNotEmpty(om.value())) { - return om.value(); - } - Api api = joinPoint.getTarget().getClass().getAnnotation(Api.class); - if (api != null && api.tags() != null) { - return ArrayUtil.join(api.tags(), ","); - } - return null; - } - - /** - * 获取操作功能 - * - * @param method Method - * @param ol OperationLog - * @return String - */ - private String getDescription(Method method, OperationLog ol) { - if (StrUtil.isNotEmpty(ol.value())) { - return ol.value(); - } - ApiOperation ao = method.getAnnotation(ApiOperation.class); - if (ao != null && StrUtil.isNotEmpty(ao.value())) { - return ao.value(); - } - return null; - } - -} diff --git a/modules/common/core/config/ConfigProperties.java b/modules/common/core/config/ConfigProperties.java deleted file mode 100644 index dfee5d3..0000000 --- a/modules/common/core/config/ConfigProperties.java +++ /dev/null @@ -1,105 +0,0 @@ -package com.gxwebsoft.common.core.config; - -import lombok.Data; -import org.springframework.boot.context.properties.ConfigurationProperties; - -/** - * 系统配置属性 - * - * @author WebSoft - * @since 2021-08-30 17:58:16 - */ -@Data -@ConfigurationProperties(prefix = "config") -public class ConfigProperties { - /** - * 文件上传磁盘位置 - */ - private Integer uploadLocation = 0; - - /** - * 文件上传是否使用uuid命名 - */ - private Boolean uploadUuidName = true; - - /** - * 文件上传生成缩略图的大小(kb) - */ - private Integer thumbnailSize = 60; - - /** - * OpenOffice的安装目录 - */ - private String openOfficeHome; - - /** - * swagger扫描包 - */ - private String swaggerBasePackage; - - /** - * swagger文档标题 - */ - private String swaggerTitle; - - /** - * swagger文档描述 - */ - private String swaggerDescription; - - /** - * swagger文档版本号 - */ - private String swaggerVersion; - - /** - * swagger地址 - */ - private String swaggerHost; - - /** - * token过期时间, 单位秒 - */ - private Long tokenExpireTime = 60 * 60 * 30 * 24L; - - /** - * token快要过期自动刷新时间, 单位分钟 - */ - private int tokenRefreshTime = 30; - - /** - * 生成token的密钥Key的base64字符 - */ - private String tokenKey; - - /** - * 文件上传目录 - */ - private String uploadPath; - - /** - * 本地文件上传目录(开发环境) - */ - private String localUploadPath; - - /** - * 文件服务器 - */ - private String fileServer; - - /** - * 网关地址 - */ - private String serverUrl; - - /** - * 阿里云存储 OSS - * Endpoint - */ - private String endpoint; - private String accessKeyId; - private String accessKeySecret; - private String bucketName; - private String bucketDomain; - -} diff --git a/modules/common/core/config/HttpMessageConverter.java b/modules/common/core/config/HttpMessageConverter.java deleted file mode 100644 index 6bae59d..0000000 --- a/modules/common/core/config/HttpMessageConverter.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.gxwebsoft.common.core.config; - -import org.springframework.http.MediaType; -import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; - -import java.util.ArrayList; -import java.util.List; - -public class HttpMessageConverter extends MappingJackson2HttpMessageConverter { - public HttpMessageConverter(){ - List mediaTypes = new ArrayList<>(); - mediaTypes.add(MediaType.APPLICATION_FORM_URLENCODED); - setSupportedMediaTypes(mediaTypes); - } -} diff --git a/modules/common/core/config/MybatisPlusConfig.java b/modules/common/core/config/MybatisPlusConfig.java deleted file mode 100644 index 5436065..0000000 --- a/modules/common/core/config/MybatisPlusConfig.java +++ /dev/null @@ -1,106 +0,0 @@ -package com.gxwebsoft.common.core.config; - -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.annotation.DbType; -import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; -import com.baomidou.mybatisplus.extension.plugins.handler.TenantLineHandler; -import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; -import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor; -import com.gxwebsoft.common.core.utils.RedisUtil; -import com.gxwebsoft.common.system.entity.User; -import net.sf.jsqlparser.expression.Expression; -import net.sf.jsqlparser.expression.LongValue; -import net.sf.jsqlparser.expression.NullValue; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.security.core.Authentication; -import org.springframework.security.core.context.SecurityContextHolder; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import java.util.Arrays; - -/** - * MybatisPlus配置 - * - * @author WebSoft - * @since 2018-02-22 11:29:28 - */ -@Configuration -public class MybatisPlusConfig { - @Resource - private RedisUtil redisUtil; - - @Bean - public MybatisPlusInterceptor mybatisPlusInterceptor(HttpServletRequest request) { - MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor(); - - // 多租户插件配置 - TenantLineHandler tenantLineHandler = new TenantLineHandler() { - - @Override - public Expression getTenantId() { - // 从域名拿ID - String Domain = request.getHeader("Domain"); - if (StrUtil.isNotBlank(Domain)) { - String key = "Domain:" + Domain; - String tenantId = redisUtil.get(key); - if(tenantId != null){ - System.out.println("授权域名" + Domain + " => " + tenantId); - return new LongValue(tenantId); - } - } - // 从请求头拿ID - final String tenantId = request.getHeader("tenantId"); - if(tenantId != null){ - return new LongValue(tenantId); - } - return getLoginUserTenantId(); - } - - @Override - public boolean ignoreTable(String tableName) { - return Arrays.asList( - "sys_tenant", - "sys_dictionary", - "sys_dictionary_data", - "sys_user_oauth", - "sys_email_record", - "sys_plug", - "sys_version", - "sys_order", - "sys_white_domain" - ).contains(tableName); - } - }; - TenantLineInnerInterceptor tenantLineInnerInterceptor = new TenantLineInnerInterceptor(tenantLineHandler); - interceptor.addInnerInterceptor(tenantLineInnerInterceptor); - - // 分页插件配置 - PaginationInnerInterceptor paginationInnerInterceptor = new PaginationInnerInterceptor(DbType.MYSQL); - interceptor.addInnerInterceptor(paginationInnerInterceptor); - - return interceptor; - } - - /** - * 获取当前登录用户的租户id - * - * @return Integer - */ - public Expression getLoginUserTenantId() { - try { - Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); - if (authentication != null) { - Object object = authentication.getPrincipal(); - if (object instanceof User) { - return new LongValue(((User) object).getTenantId()); - } - } - } catch (Exception e) { - System.out.println(e.getMessage()); - } - return new NullValue(); - } - -} diff --git a/modules/common/core/config/RestTemplateConfig.java b/modules/common/core/config/RestTemplateConfig.java deleted file mode 100644 index 786798f..0000000 --- a/modules/common/core/config/RestTemplateConfig.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.gxwebsoft.common.core.config; - -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.http.client.ClientHttpRequestFactory; -import org.springframework.http.client.SimpleClientHttpRequestFactory; -import org.springframework.web.client.RestTemplate; - - -@Configuration -public class RestTemplateConfig { - - @Bean - public RestTemplate restTemplate(ClientHttpRequestFactory factory) { - RestTemplate restTemplate = new RestTemplate(factory); - restTemplate.getMessageConverters().add(new HttpMessageConverter()); - return restTemplate; - } - @Bean - public ClientHttpRequestFactory simpleClientHttpRequestFactory() { - SimpleClientHttpRequestFactory factory = new SimpleClientHttpRequestFactory(); - // ms - factory.setReadTimeout(60000); - // ms - factory.setConnectTimeout(60000); - - return factory; - } -} diff --git a/modules/common/core/config/SpringContextUtil.java b/modules/common/core/config/SpringContextUtil.java deleted file mode 100644 index 4e6d883..0000000 --- a/modules/common/core/config/SpringContextUtil.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.gxwebsoft.common.core.config; - -import org.springframework.beans.BeansException; -import org.springframework.context.ApplicationContext; -import org.springframework.context.ApplicationContextAware; -import org.springframework.stereotype.Component; - -/** - * @Author ds - * @Date 2022-05-05 - */ -@Component -public class SpringContextUtil implements ApplicationContextAware { - /** - * spring的应用上下文 - */ - private static ApplicationContext applicationContext; - - /** - * 初始化时将应用上下文设置进applicationContext - * @param applicationContext - * @throws BeansException - */ - @Override - public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { - SpringContextUtil.applicationContext=applicationContext; - } - - public static ApplicationContext getApplicationContext(){ - return applicationContext; - } - - /** - * 根据bean名称获取某个bean对象 - * - * @param name bean名称 - * @return Object - * @throws BeansException - */ - public static Object getBean(String name) throws BeansException { - return applicationContext.getBean(name); - } - - /** - * 根据bean的class获取某个bean对象 - * @param beanClass - * @param - * @return - * @throws BeansException - */ - public static T getBean(Class beanClass) throws BeansException { - return applicationContext.getBean(beanClass); - } - - /** - * 获取spring.profiles.active - * @return - */ - public static String getProfile(){ - return getApplicationContext().getEnvironment().getActiveProfiles()[0]; - } -} diff --git a/modules/common/core/config/SwaggerConfig.java b/modules/common/core/config/SwaggerConfig.java deleted file mode 100644 index 32c56c8..0000000 --- a/modules/common/core/config/SwaggerConfig.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.gxwebsoft.common.core.config; - -import cn.hutool.core.util.StrUtil; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import springfox.documentation.builders.ApiInfoBuilder; -import springfox.documentation.builders.PathSelectors; -import springfox.documentation.builders.RequestHandlerSelectors; -import springfox.documentation.oas.annotations.EnableOpenApi; -import springfox.documentation.service.*; -import springfox.documentation.spi.DocumentationType; -import springfox.documentation.spi.service.contexts.SecurityContext; -import springfox.documentation.spring.web.plugins.Docket; - -import javax.annotation.Resource; -import java.util.Collections; -import java.util.List; - -/** - * Swagger配置 - * - * @author WebSoft - * @since 2018-02-22 11:29:05 - */ -@EnableOpenApi -@Configuration -public class SwaggerConfig { - @Resource - private ConfigProperties config; - - @Bean - public Docket createRestApi() { - Docket docket = new Docket(DocumentationType.OAS_30); - if (StrUtil.isNotBlank(config.getSwaggerHost())) { - docket.host(config.getSwaggerHost()); - } - return docket - .apiInfo(apiInfo()) - .select() - .apis(RequestHandlerSelectors.basePackage(config.getSwaggerBasePackage())) - .paths(PathSelectors.any()) - .build() - .securitySchemes(securitySchemes()) - .securityContexts(securityContexts()); - } - - private ApiInfo apiInfo() { - return new ApiInfoBuilder() - .title(config.getSwaggerTitle()) - .description(config.getSwaggerDescription()) - .version(config.getSwaggerVersion()) - .termsOfServiceUrl("") - .build(); - } - - private List securitySchemes() { - return Collections.singletonList( - new ApiKey("Authorization", "Authorization", "header") - ); - } - - private List securityContexts() { - AuthorizationScope[] scopes = {new AuthorizationScope("global", "accessEverything")}; - List references = Collections.singletonList( - new SecurityReference("Authorization", scopes) - ); - return Collections.singletonList(SecurityContext.builder() - .securityReferences(references) - .build()); - } - -} diff --git a/modules/common/core/config/WebMvcConfig.java b/modules/common/core/config/WebMvcConfig.java deleted file mode 100644 index 2ed9d8b..0000000 --- a/modules/common/core/config/WebMvcConfig.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.gxwebsoft.common.core.config; - -import com.gxwebsoft.common.core.Constants; -import org.springframework.context.annotation.Configuration; -import org.springframework.web.servlet.config.annotation.CorsRegistry; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; - -/** - * WebMvc配置, 拦截器、资源映射等都在此配置 - * - * @author WebSoft - * @since 2019-06-12 10:11:16 - */ -@Configuration -public class WebMvcConfig implements WebMvcConfigurer { - - /** - * 支持跨域访问 - */ - @Override - public void addCorsMappings(CorsRegistry registry) { - registry.addMapping("/**") - .allowedOriginPatterns("*") - .allowedHeaders("*") - .exposedHeaders(Constants.TOKEN_HEADER_NAME) - .allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS", "PATCH") - .allowCredentials(true) - .maxAge(3600); - } - -} diff --git a/modules/common/core/constants/BalanceConstants.java b/modules/common/core/constants/BalanceConstants.java deleted file mode 100644 index 6857250..0000000 --- a/modules/common/core/constants/BalanceConstants.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.gxwebsoft.common.core.constants; - -public class BalanceConstants { - // 余额变动场景 - public static final Integer BALANCE_RECHARGE = 10; // 用户充值 - public static final Integer BALANCE_USE = 20; // 用户消费 - public static final Integer BALANCE_RE_LET = 21; // 续租 - public static final Integer BALANCE_ADMIN = 30; // 管理员操作 - public static final Integer BALANCE_REFUND = 40; // 订单退款 -} diff --git a/modules/common/core/constants/DomainConstants.java b/modules/common/core/constants/DomainConstants.java deleted file mode 100644 index c101769..0000000 --- a/modules/common/core/constants/DomainConstants.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.gxwebsoft.common.core.constants; - -public class DomainConstants { - public static final String ROOT_DOMAIN = "websoft.top"; // 根域名 - public static final String PREFIX = "https://"; // 域名前缀 - public static final String ADMIN_SUFFIX = ".".concat(ROOT_DOMAIN); // 后台管理域名拼接 - public static final String WEB_SUFFIX = ".wsdns.cn"; // 应用域名拼接 - public static final String DOMAIN = PREFIX.concat(ROOT_DOMAIN); // 完整域名 - -} diff --git a/modules/common/core/constants/OrderConstants.java b/modules/common/core/constants/OrderConstants.java deleted file mode 100644 index e866654..0000000 --- a/modules/common/core/constants/OrderConstants.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gxwebsoft.common.core.constants; - -public class OrderConstants { - // 支付方式 - public static final String PAY_METHOD_BALANCE = "10"; // 余额支付 - public static final String PAY_METHOD_WX = "20"; // 微信支付 - public static final String PAY_METHOD_ALIPAY = "30"; // 支付宝支付 - public static final String PAY_METHOD_OTHER = "40"; // 其他支付 - - // 付款状态 - public static final Integer PAY_STATUS_NO_PAY = 10; // 未付款 - public static final Integer PAY_STATUS_SUCCESS = 20; // 已付款 - - // 发货状态 - public static final Integer DELIVERY_STATUS_NO = 10; // 未发货 - public static final Integer DELIVERY_STATUS_YES = 20; // 已发货 - public static final Integer DELIVERY_STATUS_30 = 30; // 部分发货 - - // 收货状态 - public static final Integer RECEIPT_STATUS_NO = 10; // 未收货 - public static final Integer RECEIPT_STATUS_YES = 20; // 已收货 - public static final Integer RECEIPT_STATUS_RETURN = 30; // 已退货 - - // 订单状态 - public static final Integer ORDER_STATUS_DOING = 10; // 进行中 - public static final Integer ORDER_STATUS_CANCEL = 20; // 已取消 - public static final Integer ORDER_STATUS_TO_CANCEL = 21; // 待取消 - public static final Integer ORDER_STATUS_COMPLETED = 30; // 已完成 - - // 订单结算状态 - public static final Integer ORDER_SETTLED_YES = 1; // 已结算 - public static final Integer ORDER_SETTLED_NO = 0; // 未结算 - - - - -} diff --git a/modules/common/core/constants/PlatformConstants.java b/modules/common/core/constants/PlatformConstants.java deleted file mode 100644 index 896f8e3..0000000 --- a/modules/common/core/constants/PlatformConstants.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.gxwebsoft.common.core.constants; - -public class PlatformConstants { - public static final String MP_OFFICIAL = "MP-OFFICIAL"; // 微信公众号 - public static final String MP_WEIXIN = "MP-WEIXIN"; // 微信小程序 - public static final String MP_ALIPAY = "MP-ALIPAY"; // 支付宝小程序 - public static final String WEB = "WEB"; // web（同H5） - public static final String H5 = "H5"; // H5（推荐使用 WEB） - public static final String APP = "APP"; // App - public static final String MP_BAIDU = "MP-BAIDU"; // 百度小程序 - public static final String MP_TOUTIAO = "MP-TOUTIAO"; // 百度小程序 -} diff --git a/modules/common/core/constants/ProfitConstants.java b/modules/common/core/constants/ProfitConstants.java deleted file mode 100644 index 2cb60fd..0000000 --- a/modules/common/core/constants/ProfitConstants.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.gxwebsoft.common.core.constants; - -public class ProfitConstants { - // 收益类型 - public static final Integer PROFIT_TYPE10 = 10; // 推广收益 - public static final Integer PROFIT_TYPE20 = 20; // 团队收益 - public static final Integer PROFIT_TYPE30 = 30; // 门店收益 - public static final Integer PROFIT_TYPE40 = 30; // 区域收益 -} diff --git a/modules/common/core/constants/RedisConstants.java b/modules/common/core/constants/RedisConstants.java deleted file mode 100644 index 2765754..0000000 --- a/modules/common/core/constants/RedisConstants.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.gxwebsoft.common.core.constants; - -public class RedisConstants { - // 短信验证码Key - public static final String SMS_CODE_KEY = "sms"; - // 验证码过期时间 - public static final Long SMS_CODE_TTL = 5L; - // 微信凭证access-token - public static final String ACCESS_TOKEN_KEY = "access-token"; - // 空值防止击穿数据库 - public static final Long CACHE_NULL_TTL = 2L; - // 商户信息 - public static final String MERCHANT_KEY = "merchant"; - // 添加商户定位点 - public static final String MERCHANT_GEO_KEY = "merchant-geo"; - - // token - public static final String TOKEN_USER_ID = "cache:token:"; - // 排行榜 - public static final String USER_RANKING_BY_APPS = "userRankingByApps"; - // 搜索历史 - public static final String SEARCH_HISTORY = "searchHistory"; - // 租户系统设置信息 - public static final String TEN_ANT_SETTING_KEY = "setting"; - // 排行榜Key - public static final String USER_RANKING_BY_APPS_5 = "cache5:userRankingByApps"; - - - - // 哗啦啦key - public static final String getAllShop = "allShop"; - public static final String getBaseInfo = "baseInfo"; - public static final String getFoodClassCategory = "foodCategory"; - public static final String getOpenFood = "openFood"; - public static final String haulalaGeoKey = "cache10:hualala-geo"; - public static final String HLL_CART_KEY = "hll-cart"; // hll-cart[shopId]:[userId] - public static final String HLL_CART_FOOD_KEY = "hll-cart-list"; // hll-cart-list[shopId]:[userId] - -} diff --git a/modules/common/core/enums/ChatMessageType.java b/modules/common/core/enums/ChatMessageType.java deleted file mode 100644 index 9ebb38e..0000000 --- a/modules/common/core/enums/ChatMessageType.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.gxwebsoft.common.core.enums; - -public enum ChatMessageType { - TEXT( 1, "text"), - IMAGE(2, "image"), - VOICE(3, "voice"), - CARD(4, "card"), - ; - - private int index; - - private String name; - ChatMessageType(int i, String text) { - this.name = text; - this.index = i; - } - - public String getName() { - return name; - } - - public int getIndex() { - return index; - } -} diff --git a/modules/common/core/enums/GreenWebType.java b/modules/common/core/enums/GreenWebType.java deleted file mode 100644 index d9a0a5f..0000000 --- a/modules/common/core/enums/GreenWebType.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.gxwebsoft.common.core.enums; - -public enum GreenWebType { - /** - * 用户昵称 - */ - nickname_detection, - /** - * 聊天互动 - */ - chat_detection, - /** - * 动态评论 - */ - comment_detection, - /** - * 教学无聊 - */ - pgc_detection, - /** - * 图片检测service: baselineCheck通用基线检测 - */ - baselineCheck, - /** - * 视频检测 - */ - videoDetection; - - public enum ChatMessageType { - TEXT( 1, "text"), - IMAGE(2, "image"), - VOICE(3, "voice"), - CARD(4, "card"), - ; - - private int index; - - private String name; - ChatMessageType(int i, String text) { - this.name = text; - this.index = i; - } - - public String getName() { - return name; - } - - public int getIndex() { - return index; - } - } -} diff --git a/modules/common/core/exception/BusinessException.java b/modules/common/core/exception/BusinessException.java deleted file mode 100644 index 8e10e82..0000000 --- a/modules/common/core/exception/BusinessException.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.gxwebsoft.common.core.exception; - -import com.gxwebsoft.common.core.Constants; - -/** - * 自定义业务异常 - * - * @author WebSoft - * @since 2018-02-22 11:29:28 - */ -public class BusinessException extends RuntimeException { - private static final long serialVersionUID = 1L; - - private Integer code; - - public BusinessException() { - this(Constants.RESULT_ERROR_MSG); - } - - public BusinessException(String message) { - this(Constants.RESULT_ERROR_CODE, message); - } - - public BusinessException(Integer code, String message) { - super(message); - this.code = code; - } - - public BusinessException(Integer code, String message, Throwable cause) { - super(message, cause); - this.code = code; - } - - public BusinessException(Integer code, String message, Throwable cause, - boolean enableSuppression, boolean writableStackTrace) { - super(message, cause, enableSuppression, writableStackTrace); - this.code = code; - } - - public Integer getCode() { - return code; - } - - public void setCode(Integer code) { - this.code = code; - } - -} diff --git a/modules/common/core/exception/GlobalExceptionHandler.java b/modules/common/core/exception/GlobalExceptionHandler.java deleted file mode 100644 index 6649a2d..0000000 --- a/modules/common/core/exception/GlobalExceptionHandler.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.gxwebsoft.common.core.exception; - -import com.gxwebsoft.common.core.Constants; -import com.gxwebsoft.common.core.utils.CommonUtil; -import com.gxwebsoft.common.core.web.ApiResult; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.security.access.AccessDeniedException; -import org.springframework.web.HttpRequestMethodNotSupportedException; -import org.springframework.web.bind.annotation.ControllerAdvice; -import org.springframework.web.bind.annotation.ExceptionHandler; -import org.springframework.web.bind.annotation.ResponseBody; - -import javax.servlet.http.HttpServletResponse; - -/** - * 全局异常处理器 - * - * @author WebSoft - * @since 2018-02-22 11:29:30 - */ -@ControllerAdvice -public class GlobalExceptionHandler { - private final Logger logger = LoggerFactory.getLogger(getClass()); - - @ResponseBody - @ExceptionHandler(HttpRequestMethodNotSupportedException.class) - public ApiResult methodNotSupportedExceptionHandler(HttpRequestMethodNotSupportedException e, - HttpServletResponse response) { - CommonUtil.addCrossHeaders(response); - return new ApiResult<>(Constants.RESULT_ERROR_CODE, "请求方式不正确").setError(e.toString()); - } - - @ResponseBody - @ExceptionHandler(AccessDeniedException.class) - public ApiResult accessDeniedExceptionHandler(AccessDeniedException e, HttpServletResponse response) { - CommonUtil.addCrossHeaders(response); - return new ApiResult<>(Constants.UNAUTHORIZED_CODE, Constants.UNAUTHORIZED_MSG).setError(e.toString()); - } - - @ResponseBody - @ExceptionHandler(BusinessException.class) - public ApiResult businessExceptionHandler(BusinessException e, HttpServletResponse response) { - CommonUtil.addCrossHeaders(response); - return new ApiResult<>(e.getCode(), e.getMessage()); - } - - @ResponseBody - @ExceptionHandler(Throwable.class) - public ApiResult exceptionHandler(Throwable e, HttpServletResponse response) { - logger.error(e.getMessage(), e); - CommonUtil.addCrossHeaders(response); - return new ApiResult<>(Constants.RESULT_ERROR_CODE, Constants.RESULT_ERROR_MSG).setError(e.toString()); - } - -} diff --git a/modules/common/core/security/JwtAccessDeniedHandler.java b/modules/common/core/security/JwtAccessDeniedHandler.java deleted file mode 100644 index 66acb5c..0000000 --- a/modules/common/core/security/JwtAccessDeniedHandler.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.gxwebsoft.common.core.security; - -import com.gxwebsoft.common.core.Constants; -import com.gxwebsoft.common.core.utils.CommonUtil; -import org.springframework.security.access.AccessDeniedException; -import org.springframework.security.web.access.AccessDeniedHandler; -import org.springframework.stereotype.Component; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; - -/** - * 没有访问权限异常处理 - * - * @author WebSoft - * @since 2020-03-25 00:35:03 - */ -@Component -public class JwtAccessDeniedHandler implements AccessDeniedHandler { - - @Override - public void handle(HttpServletRequest request, HttpServletResponse response, AccessDeniedException e) - throws IOException, ServletException { - CommonUtil.responseError(response, Constants.UNAUTHORIZED_CODE, Constants.UNAUTHORIZED_MSG, e.getMessage()); - } - -} diff --git a/modules/common/core/security/JwtAuthenticationEntryPoint.java b/modules/common/core/security/JwtAuthenticationEntryPoint.java deleted file mode 100644 index 42b7f3f..0000000 --- a/modules/common/core/security/JwtAuthenticationEntryPoint.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.gxwebsoft.common.core.security; - -import com.gxwebsoft.common.core.Constants; -import com.gxwebsoft.common.core.utils.CommonUtil; -import org.springframework.security.core.AuthenticationException; -import org.springframework.security.web.AuthenticationEntryPoint; -import org.springframework.stereotype.Component; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; - -/** - * 没有登录异常处理 - * - * @author WebSoft - * @since 2020-03-25 00:35:03 - */ -@Component -public class JwtAuthenticationEntryPoint implements AuthenticationEntryPoint { - - @Override - public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException e) - throws IOException, ServletException { - CommonUtil.responseError(response, Constants.UNAUTHENTICATED_CODE, Constants.UNAUTHENTICATED_MSG, - e.getMessage()); - } - -} diff --git a/modules/common/core/security/JwtAuthenticationFilter.java b/modules/common/core/security/JwtAuthenticationFilter.java deleted file mode 100644 index 76cec8a..0000000 --- a/modules/common/core/security/JwtAuthenticationFilter.java +++ /dev/null @@ -1,99 +0,0 @@ -package com.gxwebsoft.common.core.security; - -import cn.hutool.core.util.StrUtil; -import com.gxwebsoft.common.core.Constants; -import com.gxwebsoft.common.core.config.ConfigProperties; -import com.gxwebsoft.common.core.utils.CommonUtil; -import com.gxwebsoft.common.core.utils.RedisUtil; -import com.gxwebsoft.common.core.utils.SignCheckUtil; -import com.gxwebsoft.common.system.entity.LoginRecord; -import com.gxwebsoft.common.system.entity.Menu; -import com.gxwebsoft.common.system.entity.User; -import com.gxwebsoft.common.system.service.LoginRecordService; -import com.gxwebsoft.common.system.service.UserService; -import io.jsonwebtoken.Claims; -import io.jsonwebtoken.ExpiredJwtException; -import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; -import org.springframework.security.core.context.SecurityContextHolder; -import org.springframework.security.core.userdetails.UsernameNotFoundException; -import org.springframework.stereotype.Component; -import org.springframework.web.filter.OncePerRequestFilter; - -import javax.annotation.Resource; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.util.Date; -import java.util.List; -import java.util.stream.Collectors; - -/** - * 处理携带token的请求过滤器 - * - * @author WebSoft - * @since 2020-03-30 20:48:05 - */ -@Component -public class JwtAuthenticationFilter extends OncePerRequestFilter { - @Resource - private ConfigProperties configProperties; - @Resource - private UserService userService; - @Resource - private RedisUtil redisUtil; - @Resource - private LoginRecordService loginRecordService; - - @Override - protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain) - throws ServletException, IOException { - String access_token = JwtUtil.getAccessToken(request); - if (StrUtil.isNotBlank(access_token)) { - try { - // 解析token - Claims claims = JwtUtil.parseToken(access_token, configProperties.getTokenKey()); - JwtSubject jwtSubject = JwtUtil.getJwtSubject(claims); - - // 校验服务器域名白名单 - final SignCheckUtil checkUtil = new SignCheckUtil(); - String key = "WhiteDomain:" + jwtSubject.getTenantId(); - List whiteDomains = redisUtil.get(key, List.class); - if (!checkUtil.checkWhiteDomains(whiteDomains, request.getServerName())) { - throw new UsernameNotFoundException("The requested domain name is not on the whitelist"); - } - - User user = userService.getByUsername(jwtSubject.getUsername(), jwtSubject.getTenantId()); - if (user == null) { - throw new UsernameNotFoundException("Username not found"); - } - List authorities = user.getAuthorities().stream() - .filter(m -> StrUtil.isNotBlank(m.getAuthority())).collect(Collectors.toList()); - UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken( - user, null, authorities); - SecurityContextHolder.getContext().setAuthentication(authentication); - - // token将要过期签发新token, 防止突然退出登录 - long expiration = (claims.getExpiration().getTime() - new Date().getTime()) / 1000 / 60; - if (expiration < configProperties.getTokenRefreshTime()) { - String token = JwtUtil.buildToken(jwtSubject, configProperties.getTokenExpireTime(), - configProperties.getTokenKey()); - response.addHeader(Constants.TOKEN_HEADER_NAME, token); - loginRecordService.saveAsync(user.getUsername(), LoginRecord.TYPE_REFRESH, null, - user.getTenantId(), request); - } - } catch (ExpiredJwtException e) { - CommonUtil.responseError(response, Constants.TOKEN_EXPIRED_CODE, Constants.TOKEN_EXPIRED_MSG, - e.getMessage()); - return; - } catch (Exception e) { - CommonUtil.responseError(response, Constants.BAD_CREDENTIALS_CODE, Constants.BAD_CREDENTIALS_MSG, - e.toString()); - return; - } - } - chain.doFilter(request, response); - } - -} diff --git a/modules/common/core/security/JwtSubject.java b/modules/common/core/security/JwtSubject.java deleted file mode 100644 index 1a0ff7d..0000000 --- a/modules/common/core/security/JwtSubject.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.gxwebsoft.common.core.security; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; - -/** - * Jwt载体 - * - * @author WebSoft - * @since 2021-09-03 00:11:12 - */ -@Data -@NoArgsConstructor -@AllArgsConstructor -public class JwtSubject implements Serializable { - private static final long serialVersionUID = 1L; - - /** - * 账号 - */ - private String username; - - /** - * 租户id - */ - private Integer tenantId; - -} diff --git a/modules/common/core/security/JwtUtil.java b/modules/common/core/security/JwtUtil.java deleted file mode 100644 index 2f05d23..0000000 --- a/modules/common/core/security/JwtUtil.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.gxwebsoft.common.core.security; - -import cn.hutool.core.util.StrUtil; -import cn.hutool.extra.servlet.ServletUtil; -import com.gxwebsoft.common.core.Constants; -import com.gxwebsoft.common.core.utils.JSONUtil; -import io.jsonwebtoken.Claims; -import io.jsonwebtoken.Jwts; -import io.jsonwebtoken.SignatureAlgorithm; -import io.jsonwebtoken.io.Decoders; -import io.jsonwebtoken.io.Encoders; -import io.jsonwebtoken.security.Keys; - -import javax.servlet.http.HttpServletRequest; -import java.security.Key; -import java.util.Date; - -/** - * JWT工具类 - * - * @author WebSoft - * @since 2018-01-21 16:30:59 - */ -public class JwtUtil { - - /** - * 获取请求中的access_token - * - * @param request HttpServletRequest - * @return String - */ - public static String getAccessToken(HttpServletRequest request) { - String access_token = ServletUtil.getHeaderIgnoreCase(request, Constants.TOKEN_HEADER_NAME); - if (StrUtil.isNotBlank(access_token)) { - if (access_token.startsWith(Constants.TOKEN_TYPE)) { - access_token = StrUtil.removePrefix(access_token, Constants.TOKEN_TYPE).trim(); - } - } else { - access_token = request.getParameter(Constants.TOKEN_PARAM_NAME); - } - return access_token; - } - - /** - * 生成token - * - * @param subject 载体 - * @param expire 过期时间 - * @param base64EncodedKey base64编码的Key - * @return token - */ - public static String buildToken(JwtSubject subject, Long expire, String base64EncodedKey) { - return buildToken(JSONUtil.toJSONString(subject), expire, decodeKey(base64EncodedKey)); - } - - /** - * 生成token - * - * @param subject 载体 - * @param expire 过期时间 - * @param key 密钥 - * @return token - */ - public static String buildToken(String subject, Long expire, Key key) { - Date expireDate = new Date(new Date().getTime() + 1000 * expire); - return Jwts.builder() - .setSubject(subject) - .setExpiration(expireDate) - .setIssuedAt(new Date()) - .signWith(key) - .compact(); - } - - /** - * 解析token - * - * @param token token - * @param base64EncodedKey base64编码的Key - * @return Claims - */ - public static Claims parseToken(String token, String base64EncodedKey) { - return parseToken(token, decodeKey(base64EncodedKey)); - } - - /** - * 解析token - * - * @param token token - * @param key 密钥 - * @return Claims - */ - public static Claims parseToken(String token, Key key) { - return Jwts.parserBuilder() - .setSigningKey(key) - .build() - .parseClaimsJws(token) - .getBody(); - } - - /** - * 获取JwtSubject - * - * @param claims Claims - * @return JwtSubject - */ - public static JwtSubject getJwtSubject(Claims claims) { - return JSONUtil.parseObject(claims.getSubject(), JwtSubject.class); - } - - /** - * 生成Key - * - * @return Key - */ - public static Key randomKey() { - return Keys.secretKeyFor(SignatureAlgorithm.HS256); - } - - /** - * base64编码key - * - * @return String - */ - public static String encodeKey(Key key) { - return Encoders.BASE64.encode(key.getEncoded()); - } - - /** - * base64编码Key - * - * @param base64EncodedKey base64编码的key - * @return Key - */ - public static Key decodeKey(String base64EncodedKey) { - if (StrUtil.isBlank(base64EncodedKey)) { - return null; - } - return Keys.hmacShaKeyFor(Decoders.BASE64.decode(base64EncodedKey)); - } - -} diff --git a/modules/common/core/security/SecurityConfig.java b/modules/common/core/security/SecurityConfig.java deleted file mode 100644 index 127bea5..0000000 --- a/modules/common/core/security/SecurityConfig.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.gxwebsoft.common.core.security; - -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.http.HttpMethod; -import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity; -import org.springframework.security.config.annotation.web.builders.HttpSecurity; -import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; -import org.springframework.security.config.http.SessionCreationPolicy; -import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; -import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; - -import javax.annotation.Resource; - -/** - * Spring Security配置 - * - * @author WebSoft - * @since 2020-03-23 18:04:52 - */ -@Configuration -@EnableWebSecurity -@EnableGlobalMethodSecurity(prePostEnabled = true) -public class SecurityConfig extends WebSecurityConfigurerAdapter { - @Resource - private JwtAccessDeniedHandler jwtAccessDeniedHandler; - @Resource - private JwtAuthenticationEntryPoint jwtAuthenticationEntryPoint; - @Resource - private JwtAuthenticationFilter jwtAuthenticationFilter; - - @Override - protected void configure(HttpSecurity http) throws Exception { - http.authorizeRequests() - .antMatchers(HttpMethod.OPTIONS, "/**") - .permitAll() - .antMatchers(HttpMethod.GET, "/api/file/**","/**", "/api/captcha", "/") - .permitAll() - .antMatchers( - "/api/login", - "/api/register", - "/api/existence", - "/api/oss/upload", - "/druid/**", - "/swagger-resources/**", - "/webjars/**", - "/hxz/v1/**", - "/api/sendSmsCaptcha", - "/api/loginBySms", - "/api/parseToken/*", - "/api/login-alipay/*", - "/api/wx-login/loginByMpWxPhone", - "/api/wx-login/loginByOpenId", - "/api/system/wx-native-pay/**", - "/api/system/wx-pay/**", - "/api/wxWorkQrConnect", - "/api/sys/user-plan-log/wx-pay/**", - "/api/wx-official/**", - "/lvQ4EoivKJ.txt", - "/api/think/think-recharge-log/refund-notify" - ) - .permitAll() - .anyRequest() - .authenticated() - .and() - .sessionManagement() - .sessionCreationPolicy(SessionCreationPolicy.STATELESS) - .and() - .csrf() - .disable() - .cors() - .and() - .logout() - .disable() - .headers() - .frameOptions() - .disable() - .and() - .exceptionHandling() - .accessDeniedHandler(jwtAccessDeniedHandler) - .authenticationEntryPoint(jwtAuthenticationEntryPoint) - .and() - .addFilterBefore(jwtAuthenticationFilter, UsernamePasswordAuthenticationFilter.class); - } - - @Bean - public BCryptPasswordEncoder bCryptPasswordEncoder() { - return new BCryptPasswordEncoder(); - } - -} diff --git a/modules/common/core/socketio/cache/ClientCache.java b/modules/common/core/socketio/cache/ClientCache.java deleted file mode 100644 index 399b56b..0000000 --- a/modules/common/core/socketio/cache/ClientCache.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.gxwebsoft.common.core.socketio.cache; - -import com.corundumstudio.socketio.SocketIOClient; -import com.corundumstudio.socketio.SocketIOServer; -import org.springframework.stereotype.Component; -import org.springframework.util.CollectionUtils; - -import java.util.HashMap; -import java.util.Map; -import java.util.UUID; -import java.util.concurrent.ConcurrentHashMap; - -/** - * @Author - * @Description 用户信息缓存 - * @Date 14:00 2022/1/21 - * @Param - * @return - **/ -@Component -public class ClientCache { - - private static Map> concurrentHashMap = new ConcurrentHashMap<>(); - - private static SocketIOServer socketIOServer; - - public static SocketIOServer getSocketIOServer() { - return socketIOServer; - } - - public static void setSocketIOServer(SocketIOServer instance) { - socketIOServer = instance; - } - public void saveClient(String userId,UUID sessionId,SocketIOClient socketIOClient){ - HashMap sessionIdClientCache = concurrentHashMap.get(userId); - if(sessionIdClientCache == null){ - sessionIdClientCache = new HashMap<>(); - } - sessionIdClientCache.put(sessionId,socketIOClient); - concurrentHashMap.put(userId,sessionIdClientCache); - } - - - public HashMap getUserClient(String userId){ - return concurrentHashMap.get(userId); - } - - public void deleteSessionClientByUserId(String userId,UUID sessionId){ - concurrentHashMap.get(userId).remove(sessionId); - } - - - public void deleteUserCacheByUserId(String userId){ - concurrentHashMap.remove(userId); - } - - public int getOnLineCount(){ - return concurrentHashMap.size(); - } - - public void sendUserEvent(String userId,String event, Object message) { - // 发送到接收方 - HashMap userClient = concurrentHashMap.get(userId); - - // 查看对方是否在线 - if(!CollectionUtils.isEmpty(userClient)){ - for (UUID uuid : userClient.keySet()) { - SocketIOClient ioClient = userClient.get(uuid); - ioClient.sendEvent(event, message); - - } - } - } - -} diff --git a/modules/common/core/socketio/config/SocketIOConfig.java b/modules/common/core/socketio/config/SocketIOConfig.java deleted file mode 100644 index d79884f..0000000 --- a/modules/common/core/socketio/config/SocketIOConfig.java +++ /dev/null @@ -1,82 +0,0 @@ -package com.gxwebsoft.common.core.socketio.config; - -import com.corundumstudio.socketio.SocketIOServer; -import com.gxwebsoft.common.core.config.ConfigProperties; -import com.gxwebsoft.common.core.security.JwtSubject; -import com.gxwebsoft.common.core.security.JwtUtil; -import com.gxwebsoft.common.core.socketio.cache.ClientCache; -import com.gxwebsoft.common.core.socketio.handler.SocketIOHandler; -import com.gxwebsoft.common.system.entity.User; -import com.gxwebsoft.common.system.service.UserService; -import io.jsonwebtoken.Claims; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.InitializingBean; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Configuration; -import org.springframework.util.StringUtils; - -import javax.annotation.Resource; -import java.io.InputStream; - -/** - * socket服务配置 - * @author machenike - */ -@Configuration -public class SocketIOConfig implements InitializingBean { - - private final static Logger logger = LoggerFactory.getLogger(SocketIOConfig.class); - @Value("${socketio.host}") - private String host; - - @Value("${socketio.port}") - private Integer port; - - @Resource - private SocketIOHandler socketIOHandler; - - @Resource - private UserService userService; - - @Resource - private ConfigProperties configProperties; - - @Override - public void afterPropertiesSet() throws Exception { - com.corundumstudio.socketio.Configuration config = new com.corundumstudio.socketio.Configuration(); - //设置host - config.setHostname(host); - //设置端口 - config.setPort(port); - config.setBossThreads(1); - config.setAuthorizationListener(handshakeData -> { - String userId =handshakeData.getSingleUrlParam("userId"); - String token = handshakeData.getSingleUrlParam("token"); - logger.info("身份验证 token：{}", token); - if(!StringUtils.hasText(token) || !StringUtils.hasText(userId)){ - return false; - } - // 身份验证 - Claims claims = JwtUtil.parseToken(token, configProperties.getTokenKey()); - JwtSubject jwtSubject = JwtUtil.getJwtSubject(claims); - User user = userService.getByUsername(jwtSubject.getUsername(), jwtSubject.getTenantId()); - - if (user == null || !user.getUserId().equals(Integer.valueOf(userId))) { - return false; - } - return true; - }); - - InputStream resourceAsStream = this.getClass().getResourceAsStream("/jks/love.jks"); // 读取证书文件流 - config.setKeyStore(resourceAsStream); // 设置证书文件 - config.setKeyStorePassword("123456"); // 设置证书密码 - - // 启动socket服务 -// SocketIOServer server = new SocketIOServer(config); -// server.addListeners(socketIOHandler); -// server.start(); -// ClientCache.setSocketIOServer(server); -// logger.debug("Netty SocketIO启动：{}:{}",host,port); - } -} diff --git a/modules/common/core/socketio/handler/SocketIOHandler.java b/modules/common/core/socketio/handler/SocketIOHandler.java deleted file mode 100644 index 5df67ec..0000000 --- a/modules/common/core/socketio/handler/SocketIOHandler.java +++ /dev/null @@ -1,104 +0,0 @@ -package com.gxwebsoft.common.core.socketio.handler; - -import com.baomidou.mybatisplus.core.toolkit.StringUtils; -import com.corundumstudio.socketio.AckRequest; -import com.corundumstudio.socketio.SocketIOClient; -import com.corundumstudio.socketio.annotation.OnConnect; -import com.corundumstudio.socketio.annotation.OnDisconnect; -import com.corundumstudio.socketio.annotation.OnEvent; -import com.gxwebsoft.common.core.config.ConfigProperties; -import com.gxwebsoft.common.core.socketio.cache.ClientCache; -import com.gxwebsoft.common.system.entity.ChatMessage; -import com.gxwebsoft.common.system.service.ChatConversationService; -import com.gxwebsoft.common.system.service.ChatMessageService; -import com.gxwebsoft.common.system.service.UserService; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Component; -import org.springframework.transaction.annotation.Transactional; - -import javax.annotation.Resource; -import java.util.UUID; - - -/** - * socket处理拦截器 - * @author machenike - */ - -@Component -public class SocketIOHandler { - - - @Resource - private ChatMessageService messageService; - - @Resource - private ChatConversationService conversationService; - - @Resource - private ClientCache clientCache; - - @Resource - private UserService userService; - - @Resource - private ConfigProperties configProperties; - /** - * 日志 - */ - private final static Logger logger = LoggerFactory.getLogger(SocketIOHandler.class); - - - - - /** - * 客户端连上socket服务器时执行此事件 - * @param client - */ - @OnConnect - public void onConnect(SocketIOClient client) { - String userId = client.getHandshakeData().getSingleUrlParam("userId"); - logger.debug("socket client auth success [userId="+userId+"]"); - UUID sessionId = client.getSessionId(); - - - // 管理员 - String isAdmin = client.getHandshakeData().getSingleUrlParam("isAdmin"); - if(StringUtils.isNotBlank(isAdmin)){ - // todo 权限验证 - clientCache.saveClient("admin",sessionId, client); - }else { - clientCache.saveClient(userId,sessionId, client); - } - - System.out.println("userId: "+userId+"连接建立成功 - "+sessionId); - logger.info("当前在线人数:{}",clientCache.getOnLineCount()); - - } - - - /** - * 客户端断开socket服务器时执行此事件 - * @param client - */ - @OnDisconnect - public void onDisconnect(SocketIOClient client) { - String userId = client.getHandshakeData().getSingleUrlParam("userId"); - UUID sessionId = client.getSessionId(); - clientCache.deleteSessionClientByUserId(userId,sessionId); - System.out.println("userId: "+userId+"连接关闭成功 - "+sessionId); - - } - - /** - * - * @param client - */ - @OnEvent( value = "message") - @Transactional - public void onMessage(SocketIOClient client, AckRequest request, ChatMessage message) { - - } - -} diff --git a/modules/common/core/utils/AlipayConfigUtil.java b/modules/common/core/utils/AlipayConfigUtil.java deleted file mode 100644 index 42975ef..0000000 --- a/modules/common/core/utils/AlipayConfigUtil.java +++ /dev/null @@ -1,110 +0,0 @@ -package com.gxwebsoft.common.core.utils; - -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import com.alipay.api.AlipayApiException; -import com.alipay.api.AlipayConstants; -import com.alipay.api.CertAlipayRequest; -import com.alipay.api.DefaultAlipayClient; -import com.gxwebsoft.common.core.config.ConfigProperties; -import com.gxwebsoft.common.core.exception.BusinessException; -import org.springframework.data.redis.core.StringRedisTemplate; -import org.springframework.stereotype.Component; - -import javax.annotation.Resource; - -/** - * 支付宝工具类 - * @author leng - * - */ -@Component -public class AlipayConfigUtil { - private final StringRedisTemplate stringRedisTemplate; - public Integer tenantId; - public String gateway; - public JSONObject config; - public String appId; - public String privateKey; - public String appCertPublicKey; - public String alipayCertPublicKey; - public String alipayRootCert; - - @Resource - private ConfigProperties pathConfig; - - public AlipayConfigUtil(StringRedisTemplate stringRedisTemplate){ - this.stringRedisTemplate = stringRedisTemplate; - } - - // 实例化客户端 - public DefaultAlipayClient alipayClient(Integer tenantId) throws AlipayApiException { - this.gateway = "https://openapi.alipay.com/gateway.do"; - this.tenantId = tenantId; - this.payment(tenantId); - CertAlipayRequest certAlipayRequest = new CertAlipayRequest(); - certAlipayRequest.setServerUrl(this.gateway); - certAlipayRequest.setAppId(this.appId); - certAlipayRequest.setPrivateKey(this.privateKey); - certAlipayRequest.setFormat(AlipayConstants.FORMAT_JSON); - certAlipayRequest.setCharset(AlipayConstants.CHARSET_UTF8); - certAlipayRequest.setSignType(AlipayConstants.SIGN_TYPE_RSA2); - certAlipayRequest.setCertPath(this.appCertPublicKey); - certAlipayRequest.setAlipayPublicCertPath(this.alipayCertPublicKey); - certAlipayRequest.setRootCertPath(this.alipayRootCert); -// System.out.println("this.appId = " + this.appId); -// System.out.println("this.appId = " + this.gateway); -// System.out.println("this.appId = " + this.privateKey); -// System.out.println("this.appId = " + this.appCertPublicKey); -// System.out.println("this.appId = " + this.alipayCertPublicKey); -// System.out.println("this.appId = " + this.alipayRootCert); -// System.out.println("this.config = " + this.config); - return new DefaultAlipayClient(certAlipayRequest); - } - - /** - * 获取支付宝秘钥 - */ - public JSONObject payment(Integer tenantId) { - System.out.println("tenantId = " + tenantId); - String key = "cache".concat(tenantId.toString()).concat(":setting:payment"); - System.out.println("key = " + key); - String cache = stringRedisTemplate.opsForValue().get(key); - if (cache == null) { - throw new BusinessException("支付方式未配置"); - } - // 解析json数据 - JSONObject payment = JSON.parseObject(cache.getBytes()); - this.config = payment; - this.appId = payment.getString("alipayAppId"); - this.privateKey = payment.getString("privateKey"); - this.appCertPublicKey = pathConfig.getUploadPath() + "file" + payment.getString("appCertPublicKey"); - this.alipayCertPublicKey = pathConfig.getUploadPath() + "file" + payment.getString("alipayCertPublicKey"); - this.alipayRootCert = pathConfig.getUploadPath() + "file" + payment.getString("alipayRootCert"); - return payment; - } - - public String appId(){ - return this.appId; - } - - public String privateKey(){ - return this.privateKey; - } - - public String appCertPublicKey(){ - return this.appCertPublicKey; - } - - public String alipayCertPublicKey(){ - return this.alipayCertPublicKey; - } - - public String alipayRootCert(){ - return this.alipayRootCert; - } - - - - -} diff --git a/modules/common/core/utils/CacheClient.java b/modules/common/core/utils/CacheClient.java deleted file mode 100644 index fef6b48..0000000 --- a/modules/common/core/utils/CacheClient.java +++ /dev/null @@ -1,263 +0,0 @@ -package com.gxwebsoft.common.core.utils; - -import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import com.gxwebsoft.common.system.entity.User; -import com.gxwebsoft.common.system.result.RedisResult; -import org.springframework.data.geo.Point; -import org.springframework.data.redis.core.StringRedisTemplate; -import org.springframework.security.core.Authentication; -import org.springframework.security.core.context.SecurityContextHolder; -import org.springframework.stereotype.Component; - -import java.time.LocalDateTime; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.TimeUnit; -import java.util.function.Function; - -import static com.gxwebsoft.common.core.constants.RedisConstants.CACHE_NULL_TTL; - -@Component -public class CacheClient { - private final StringRedisTemplate stringRedisTemplate; - public static Integer tenantId; - - public CacheClient(StringRedisTemplate stringRedisTemplate){ - this.stringRedisTemplate = stringRedisTemplate; - } - - /** - * 写入redis缓存 - * @param key [表名]:id - * @param entity 实体类对象 - */ - public void set(String key, T entity){ - stringRedisTemplate.opsForValue().set(prefix(key), JSONUtil.toJSONString(entity)); - } - - /** - * 写入redis缓存 - * @param key [表名]:id - * @param entity 实体类对象 - * 示例 cacheClient.set("merchant:"+id,merchant,1L,TimeUnit.DAYS) - */ - public void set(String key, T entity, Long time, TimeUnit unit){ - stringRedisTemplate.opsForValue().set(prefix(key), JSONUtil.toJSONString(entity),time,unit); - } - - /** - * 读取redis缓存 - * @param key [表名]:id - * 示例 cacheClient.get(key) - * @return merchant - */ - public String get(String key) { - return stringRedisTemplate.opsForValue().get(prefix(key)); - } - - /** - * 读取redis缓存 - * @param key [表名]:id - * @param clazz Merchant.class - * @param - * 示例 cacheClient.get("merchant:"+id,Merchant.class) - * @return merchant - */ - public T get(String key, Class clazz) { - String json = stringRedisTemplate.opsForValue().get(prefix(key)); - if(StrUtil.isNotBlank(json)){ - return JSONUtil.parseObject(json, clazz); - } - return null; - } - - /** - * 写redis缓存(哈希类型) - * @param key [表名]:id - * @param field 字段 - * 示例 cacheClient.get("merchant:"+id,Merchant.class) - */ - public void hPut(String key, String field, T entity) { - stringRedisTemplate.opsForHash().put(prefix(key),field,JSONUtil.toJSONString(entity)); - } - - /** - * 写redis缓存(哈希类型) - * @param key [表名]:id - * @param map 字段 - * 示例 cacheClient.get("merchant:"+id,Merchant.class) - */ - public void hPutAll(String key, Map map) { - stringRedisTemplate.opsForHash().putAll(prefix(key),map); - } - - /** - * 读取redis缓存(哈希类型) - * 示例 cacheClient.get("merchant:"+id,Merchant.class) - * @param key [表名]:id - * @param field 字段 - * @return merchant - */ - public T hGet(String key, String field, Class clazz) { - Object obj = stringRedisTemplate.opsForHash().get(prefix(key), field); - return JSONUtil.parseObject(JSONUtil.toJSONString(obj),clazz); - } - - public List hValues(String key){ - return stringRedisTemplate.opsForHash().values(prefix(key)); - } - - public Long hSize(String key){ - return stringRedisTemplate.opsForHash().size(prefix(key)); - } - - // 逻辑过期方式写入redis - public void setWithLogicalExpire(String key, T value, Long time, TimeUnit unit){ - // 设置逻辑过期时间 - final RedisResult redisResult = new RedisResult<>(); - redisResult.setData(value); - redisResult.setExpireTime(LocalDateTime.now().plusSeconds(unit.toSeconds(time))); - stringRedisTemplate.opsForValue().set(prefix(key),JSONUtil.toJSONString(redisResult)); - } - - // 读取redis - public R query(String keyPrefix, ID id, Class clazz, Function dbFallback, Long time, TimeUnit unit){ - String key = keyPrefix + id; - // 1.从redis查询缓存 - final String json = stringRedisTemplate.opsForValue().get(prefix(key)); - // 2.判断是否存在 - if (StrUtil.isNotBlank(json)) { - // 3.存在，直接返回 - return JSONUtil.parseObject(json,clazz); - } - // 判断命中的是否为空值 - if (json != null) { - return null; - } - // 4. 不存在，跟进ID查询数据库 - R r = dbFallback.apply(id); - // 5. 数据库不存在，返回错误 - if(r == null){ - // 空值写入数据库 - this.set(prefix(key),"",CACHE_NULL_TTL,TimeUnit.MINUTES); - return null; - } - // 写入redis - this.set(prefix(key),r,time,unit); - return r; - } - - /** - * 添加商户定位点 - * @param key geo - * @param id - * 示例 cacheClient.geoAdd("merchant-geo",merchant) - */ - public void geoAdd(String key, Double x, Double y, String id){ - stringRedisTemplate.opsForGeo().add(prefix(key),new Point(x,y),id); - } - - /** - * 删除定位 - * @param key geo - * @param id - * 示例 cacheClient.geoRemove("merchant-geo",id) - */ - public void geoRemove(String key, Integer id){ - stringRedisTemplate.opsForGeo().remove(prefix(key),id.toString()); - } - - - - public void sAdd(String key, T entity){ - stringRedisTemplate.opsForSet().add(prefix(key),JSONUtil.toJSONString(entity)); - } - - public Set sMembers(String key){ - return stringRedisTemplate.opsForSet().members(prefix(key)); - } - - // 更新排行榜 - public void zAdd(String key, Integer userId, Double value) { - stringRedisTemplate.opsForZSet().add(prefix(key),userId.toString(),value); - } - // 增加元素的score值，并返回增加后的值 - public Double zIncrementScore(String key,Integer userId, Double delta){ - return stringRedisTemplate.opsForZSet().incrementScore(key, userId.toString(), delta); - } - // 获取排名榜 - public Set range(String key, Integer start, Integer end) { - return stringRedisTemplate.opsForZSet().range(prefix(key), start, end); - } - // 获取排名榜 - public Set reverseRange(String key, Integer start, Integer end){ - return stringRedisTemplate.opsForZSet().reverseRange(prefix(key), start, end); - } - // 获取分数 - public Double score(String key, Object value){ - return stringRedisTemplate.opsForZSet().score(prefix(key), value); - } - - public void delete(String key){ - stringRedisTemplate.delete(prefix(key)); - } - - // 存储在list头部 - public void leftPush(String key, String keyword){ - stringRedisTemplate.opsForList().leftPush(prefix(key),keyword); - } - - // 获取列表指定范围内的元素 - public List listRange(String key,Long start, Long end){ - return stringRedisTemplate.opsForList().range(prefix(key), start, end); - } - - // 获取列表长度 - public Long listSize(String key){ - return stringRedisTemplate.opsForList().size(prefix(key)); - } - - // 裁剪list - public void listTrim(String key){ - stringRedisTemplate.opsForList().trim(prefix(key), 0L, 100L); - } - - /** - * 读取后台系统设置信息 - * @param keyName 键名wx-word - * @param tenantId 租户ID - * @return - * key示例 cache10048:setting:wx-work - */ - public JSONObject getSettingInfo(String keyName,Integer tenantId){ - String key = "cache" + tenantId + ":setting:" + keyName; - final String cache = stringRedisTemplate.opsForValue().get(key); - assert cache != null; - return JSON.parseObject(cache); - } - - /** - * KEY前缀 - * cache[tenantId]:[key+id] - */ - public static String prefix(String key){ - String prefix = "cache"; - Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); - if (authentication != null) { - Object object = authentication.getPrincipal(); - if (object instanceof User) { - final Integer tenantId = ((User) object).getTenantId(); - prefix = prefix.concat(tenantId.toString()).concat(":"); - } - } - return prefix.concat(key); - } - - // 组装key - public String key(String name,Integer id){ - return name.concat(":").concat(id.toString()); - } -} diff --git a/modules/common/core/utils/CommonUtil.java b/modules/common/core/utils/CommonUtil.java deleted file mode 100644 index c11decb..0000000 --- a/modules/common/core/utils/CommonUtil.java +++ /dev/null @@ -1,235 +0,0 @@ -package com.gxwebsoft.common.core.utils; - -import cn.hutool.core.date.DatePattern; -import cn.hutool.core.date.DateTime; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.RandomUtil; -import com.gxwebsoft.common.core.Constants; -import com.gxwebsoft.common.core.web.ApiResult; - -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.io.PrintWriter; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.UUID; -import java.util.function.BiConsumer; -import java.util.function.Consumer; -import java.util.function.Function; - -/** - * 常用工具方法 - * - * @author WebSoft - * @since 2017-06-10 10:10:22 - */ -public class CommonUtil { - // 生成uuid的字符 - private static final String[] chars = new String[]{ - "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", - "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z", - "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", - "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", - "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z" - }; - - /** - * 生成8位uuid - * - * @return String - */ - public static String randomUUID8() { - StringBuilder sb = new StringBuilder(); - String uuid = UUID.randomUUID().toString().replace("-", ""); - for (int i = 0; i < 8; i++) { - String str = uuid.substring(i * 4, i * 4 + 4); - int x = Integer.parseInt(str, 16); - sb.append(chars[x % 0x3E]); - } - return sb.toString(); - } - - /** - * 生成16位uuid - * - * @return String - */ - public static String randomUUID16() { - StringBuilder sb = new StringBuilder(); - String uuid = UUID.randomUUID().toString().replace("-", ""); - for (int i = 0; i < 16; i++) { - String str = uuid.substring(i * 2, i * 2 + 2); - int x = Integer.parseInt(str, 16); - sb.append(chars[x % 0x3E]); - } - return sb.toString(); - } - - /** - * 获取当前时间 - * - * @return String - */ - public static String currentTime() { - Date date = new Date(); - SimpleDateFormat sdf = new SimpleDateFormat("yyMMddHHmmss"); - return sdf.format(date); - } - - /** - * 生成10位随机用户名 - * - * @return String - */ - public static String randomUsername(String prefix) { - Date date = new Date(); - SimpleDateFormat sdf = new SimpleDateFormat("yyMMddHHmmss"); - String currentTime = sdf.format(date); - return prefix + currentTime; - } - - /** - * 生成订单号 - * 20233191166110426 - * 20230419135802391412 - * @return - */ - public static String createOrderNo() { - String prefix = DateTime.now().toString(DatePattern.PURE_DATETIME_PATTERN); - return prefix + RandomUtil.randomNumbers(2); - } - - /** - * 生成订单号 - * @param tenantId - * 20233191166110426 - * 20230419135802391412 - * @return - */ - public static String createOrderNo(String tenantId) { - String prefix = DateTime.now().toString(DatePattern.PURE_DATETIME_PATTERN); - return prefix + tenantId + RandomUtil.randomNumbers(2); - } - - /** - * 生成订单水流号 - * @param tenantId - * @return - */ - public static String serialNo(int tenantId) { - String prefix = DateTime.now().toString(DatePattern.PURE_DATETIME_PATTERN); - return prefix + tenantId + RandomUtil.randomNumbers(2); - } - - /** - * 检查List是否有重复元素 - * - * @param list List - * @param mapper 获取需要检查的字段的Function - * @param 数据的类型 - * @param 需要检查的字段的类型 - * @return boolean - */ - public static boolean checkRepeat(List list, Function mapper) { - for (int i = 0; i < list.size(); i++) { - for (int j = 0; j < list.size(); j++) { - if (i != j && mapper.apply(list.get(i)).equals(mapper.apply(list.get(j)))) { - return true; - } - } - } - return false; - } - - /** - * List转为树形结构 - * - * @param data List - * @param parentId 顶级的parentId - * @param parentIdMapper 获取parentId的Function - * @param idMapper 获取id的Function - * @param consumer 赋值children的Consumer - * @param 数据的类型 - * @param parentId的类型 - * @return List - */ - public static List toTreeData(List data, R parentId, - Function parentIdMapper, - Function idMapper, - BiConsumer> consumer) { - List result = new ArrayList<>(); - for (T d : data) { - R dParentId = parentIdMapper.apply(d); - if (ObjectUtil.equals(parentId, dParentId)) { - R dId = idMapper.apply(d); - List children = toTreeData(data, dId, parentIdMapper, idMapper, consumer); - consumer.accept(d, children); - result.add(d); - } - } - return result; - } - - /** - * 遍历树形结构数据 - * - * @param data List - * @param consumer 回调 - * @param mapper 获取children的Function - * @param 数据的类型 - */ - public static void eachTreeData(List data, Consumer consumer, Function> mapper) { - for (T d : data) { - consumer.accept(d); - List children = mapper.apply(d); - if (children != null && children.size() > 0) { - eachTreeData(children, consumer, mapper); - } - } - } - - /** - * 获取集合中的第一条数据 - * - * @param records 集合 - * @return 第一条数据 - */ - public static T listGetOne(List records) { - return records == null || records.size() == 0 ? null : records.get(0); - } - - /** - * 支持跨域 - * - * @param response HttpServletResponse - */ - public static void addCrossHeaders(HttpServletResponse response) { - response.setHeader("Access-Control-Max-Age", "3600"); - response.setHeader("Access-Control-Allow-Origin", "*"); - response.setHeader("Access-Control-Allow-Methods", "*"); - response.setHeader("Access-Control-Allow-Headers", "*"); - response.setHeader("Access-Control-Expose-Headers", Constants.TOKEN_HEADER_NAME); - } - - /** - * 输出错误信息 - * - * @param response HttpServletResponse - * @param code 错误码 - * @param message 提示信息 - * @param error 错误信息 - */ - public static void responseError(HttpServletResponse response, Integer code, String message, String error) { - response.setContentType("application/json;charset=UTF-8"); - try { - PrintWriter out = response.getWriter(); - out.write(JSONUtil.toJSONString(new ApiResult<>(code, message, null, error))); - out.flush(); - } catch (IOException e) { - e.printStackTrace(); - } - } - -} diff --git a/modules/common/core/utils/DomainUtil.java b/modules/common/core/utils/DomainUtil.java deleted file mode 100644 index c2b84cd..0000000 --- a/modules/common/core/utils/DomainUtil.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.gxwebsoft.common.core.utils; - -import static com.gxwebsoft.common.core.constants.DomainConstants.*; - -public class DomainUtil { - - /** - * 根域名 - * @return domain.com - */ - public static String getRootDomain() { - return ROOT_DOMAIN; - } - - /** - * 管理后台地址 - * @return https://{tenantId}.websoft.top - */ - public static String getAdminUrl(String tenantId) { - return PREFIX.concat(tenantId).concat(ADMIN_SUFFIX); - } - - /** - * 应用网址 - * @param tenantId - * @return https://{tenantId}.wsdns.cn - */ - public static String getSiteUrl(String tenantId){ - return PREFIX.concat(tenantId).concat(WEB_SUFFIX); - } - -} diff --git a/modules/common/core/utils/FileServerUtil.java b/modules/common/core/utils/FileServerUtil.java deleted file mode 100644 index 45201d2..0000000 --- a/modules/common/core/utils/FileServerUtil.java +++ /dev/null @@ -1,401 +0,0 @@ -package com.gxwebsoft.common.core.utils; - -import cn.hutool.core.img.ImgUtil; -import cn.hutool.core.io.FileUtil; -import cn.hutool.core.io.IORuntimeException; -import cn.hutool.core.io.IoUtil; -import cn.hutool.core.util.StrUtil; -import org.apache.tika.Tika; -import org.springframework.web.multipart.MultipartFile; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.*; -import java.net.MalformedURLException; -import java.net.URLEncoder; -import java.text.SimpleDateFormat; -import java.util.*; - -/** - * 文件上传下载工具类 - * - * @author WebSoft - * @since 2018-12-14 08:38:53 - */ -public class FileServerUtil { - // 除 text/* 外也需要设置输出编码的 content-type - private final static List SET_CHARSET_CONTENT_TYPES = Arrays.asList( - "application/json", - "application/javascript" - ); - - /** - * 上传文件 - * - * @param file MultipartFile - * @param directory 文件保存的目录 - * @param uuidName 是否用uuid命名 - * @return File - */ - public static File upload(MultipartFile file, String directory, boolean uuidName) - throws IOException, IllegalStateException { - File outFile = getUploadFile(file.getOriginalFilename(), directory, uuidName); - if (!outFile.getParentFile().exists()) { - if (!outFile.getParentFile().mkdirs()) { - throw new RuntimeException("make directory fail"); - } - } - file.transferTo(outFile); - return outFile; - } - - /** - * 上传base64格式文件 - * - * @param base64 base64编码字符 - * @param fileName 文件名称, 为空使用uuid命名 - * @param directory 文件保存的目录 - * @return File - */ - public static File upload(String base64, String fileName, String directory) - throws FileNotFoundException, IORuntimeException { - if (StrUtil.isBlank(base64) || !base64.startsWith("data:image/") || !base64.contains(";base64,")) { - throw new RuntimeException("base64 data error"); - } - String suffix = "." + base64.substring(11, base64.indexOf(";")); // 获取文件后缀 - boolean uuidName = StrUtil.isBlank(fileName); - File outFile = getUploadFile(uuidName ? suffix : fileName, directory, uuidName); - byte[] bytes = Base64.getDecoder().decode(base64.substring(base64.indexOf(";") + 8).getBytes()); - IoUtil.write(new FileOutputStream(outFile), true, bytes); - return outFile; - } - - /** - * 获取上传文件位置 - * - * @param name 文件名称 - * @param directory 上传目录 - * @param uuidName 是否使用uuid命名 - * @return File - */ - public static File getUploadFile(String name, String directory, boolean uuidName) { - // 当前日期作为上传子目录 - String dir = new SimpleDateFormat("yyyyMMdd/").format(new Date()); - // 获取文件后缀 - String suffix = (name == null || !name.contains(".")) ? "" : name.substring(name.lastIndexOf(".")); - // 使用uuid命名 - if (uuidName || name == null) { - String uuid = UUID.randomUUID().toString().replaceAll("-", ""); - return new File(directory, dir + uuid + suffix); - } - // 使用原名称, 存在相同则加(1) - File file = new File(directory, dir + name); - String prefix = StrUtil.removeSuffix(name, suffix); - int sameSize = 2; - while (file.exists()) { - file = new File(directory, dir + prefix + "(" + sameSize + ")" + suffix); - sameSize++; - } - return file; - } - - /** - * 查看文件, 支持断点续传 - * - * @param file 文件 - * @param pdfDir office转pdf输出目录 - * @param officeHome openOffice安装目录 - * @param response HttpServletResponse - * @param request HttpServletRequest - */ - public static void preview(File file, String pdfDir, String officeHome, - HttpServletResponse response, HttpServletRequest request) { - preview(file, false, null, pdfDir, officeHome, response, request); - } - - /** - * 查看文件, 支持断点续传 - * - * @param file 文件 - * @param forceDownload 是否强制下载 - * @param fileName 强制下载的文件名称 - * @param pdfDir office转pdf输出目录 - * @param officeHome openOffice安装目录 - * @param response HttpServletResponse - * @param request HttpServletRequest - */ - public static void preview(File file, boolean forceDownload, String fileName, String pdfDir, String officeHome, - HttpServletResponse response, HttpServletRequest request) { - CommonUtil.addCrossHeaders(response); - if (file == null || !file.exists()) { - outNotFund(response); - return; - } - if (forceDownload) { - setDownloadHeader(response, StrUtil.isBlank(fileName) ? file.getName() : fileName); - } else { - // office转pdf预览 - if (OpenOfficeUtil.canConverter(file.getName())) { - File pdfFile = OpenOfficeUtil.converterToPDF(file.getAbsolutePath(), pdfDir, officeHome); - if (pdfFile != null) { - file = pdfFile; - } - } - // 获取文件类型 - String contentType = getContentType(file); - if (contentType != null) { - response.setContentType(contentType); - // 设置编码 - if (contentType.startsWith("text/") || SET_CHARSET_CONTENT_TYPES.contains(contentType)) { - try { - String charset = JChardetFacadeUtil.detectCodepage(file.toURI().toURL()); - if (charset != null) { - response.setCharacterEncoding(charset); - } - } catch (MalformedURLException e) { - e.printStackTrace(); - } - } - } else { - setDownloadHeader(response, file.getName()); - } - } - response.setHeader("Cache-Control", "public"); - output(file, response, request); - } - - /** - * 查看缩略图 - * - * @param file 原文件 - * @param thumbnail 缩略图文件 - * @param size 缩略图文件的最大值(kb) - * @param response HttpServletResponse - * @param request HttpServletRequest - */ - public static void previewThumbnail(File file, File thumbnail, Integer size, - HttpServletResponse response, HttpServletRequest request) { - // 如果是图片并且缩略图不存在则生成 - if (!thumbnail.exists() && isImage(file)) { - long fileSize = file.length(); - if ((fileSize / 1024) > size) { - try { - if (thumbnail.getParentFile().mkdirs()) { - System.out.println("生成缩略图1>>>>>>>>>>>>>>>> = " + thumbnail); - ImgUtil.scale(file, thumbnail, size / (fileSize / 1024f)); - if (thumbnail.exists() && thumbnail.length() > file.length()) { - FileUtil.copy(file, thumbnail, true); - } - }else{ - System.out.println("生成缩略图2>>>>>>>>>>>>>>>> = " + thumbnail); - ImgUtil.scale(file, thumbnail, size / (fileSize / 1024f)); - if (thumbnail.exists() && thumbnail.length() > file.length()) { - FileUtil.copy(file, thumbnail, true); - } - } - } catch (Exception e) { - e.printStackTrace(); - } - } else { - preview(file, null, null, response, request); - return; - } - } - preview(thumbnail.exists() ? thumbnail : file, null, null, response, request); - } - - /** - * 输出文件流, 支持断点续传 - * - * @param file 文件 - * @param response HttpServletResponse - * @param request HttpServletRequest - */ - public static void output(File file, HttpServletResponse response, HttpServletRequest request) { - long length = file.length(); // 文件总大小 - long start = 0, to = length - 1; // 开始读取位置, 结束读取位置 - long lastModified = file.lastModified(); // 文件修改时间 - response.setHeader("Accept-Ranges", "bytes"); - response.setHeader("ETag", "\"" + length + "-" + lastModified + "\""); - response.setHeader("Last-Modified", new Date(lastModified).toString()); - String range = request.getHeader("Range"); - if (range != null) { - response.setStatus(HttpServletResponse.SC_PARTIAL_CONTENT); - String[] ranges = range.replace("bytes=", "").split("-"); - start = Long.parseLong(ranges[0].trim()); - if (ranges.length > 1) { - to = Long.parseLong(ranges[1].trim()); - } - response.setHeader("Content-Range", "bytes " + start + "-" + to + "/" + length); - } - response.setHeader("Content-Length", String.valueOf(to - start + 1)); - try { - output(file, response.getOutputStream(), 2048, start, to); - } catch (IOException e) { - e.printStackTrace(); - } - } - - /** - * 输出文件流 - * - * @param file 文件 - * @param os 输出流 - */ - public static void output(File file, OutputStream os) { - output(file, os, null); - } - - /** - * 输出文件流 - * - * @param file 文件 - * @param os 输出流 - * @param size 读取缓冲区大小 - */ - public static void output(File file, OutputStream os, Integer size) { - output(file, os, size, null, null); - } - - /** - * 输出文件流, 支持分片 - * - * @param file 文件 - * @param os 输出流 - * @param size 读取缓冲区大小 - * @param start 开始位置 - * @param to 结束位置 - */ - public static void output(File file, OutputStream os, Integer size, Long start, Long to) { - BufferedInputStream is = null; - try { - is = new BufferedInputStream(new FileInputStream(file)); - if (start != null) { - long skip = is.skip(start); - if (skip < start) { - System.out.println("ERROR: skip fail[ skipped=" + skip + ", start= " + start + " ]"); - } - to = to - start + 1; - } - byte[] bytes = new byte[size == null ? 2048 : size]; - int len; - if (to == null) { - while ((len = is.read(bytes)) != -1) { - os.write(bytes, 0, len); - } - } else { - while (to > 0 && (len = is.read(bytes)) != -1) { - os.write(bytes, 0, to < len ? (int) ((long) to) : len); - to -= len; - } - } - os.flush(); - } catch (IOException ignored) { - } catch (Exception e) { - e.printStackTrace(); - } finally { - if (os != null) { - try { - os.close(); - } catch (IOException ignored) { - } - } - if (is != null) { - try { - is.close(); - } catch (IOException e) { - System.out.println(e.getMessage()); - } - } - } - } - - /** - * 获取文件类型 - * - * @param file 文件 - * @return String - */ - public static String getContentType(File file) { - String contentType = null; - if (file.exists()) { - try { - contentType = new Tika().detect(file); - } catch (IOException e) { - e.printStackTrace(); - } - } - return contentType; - } - - /** - * 判断文件是否是图片类型 - * - * @param file 文件 - * @return boolean - */ - public static boolean isImage(File file) { - return isImage(getContentType(file)); - } - - /** - * 判断文件是否是图片类型 - * - * @param contentType 文件类型 - * @return boolean - */ - public static boolean isImage(String contentType) { - return contentType != null && contentType.startsWith("image/"); - } - - /** - * 设置下载文件的header - * - * @param response HttpServletResponse - * @param fileName 文件名称 - */ - public static void setDownloadHeader(HttpServletResponse response, String fileName) { - response.setContentType("application/force-download"); - try { - fileName = URLEncoder.encode(fileName, "utf-8"); - } catch (UnsupportedEncodingException e) { - e.printStackTrace(); - } - response.setHeader("Content-Disposition", "attachment;fileName=" + fileName); - } - - /** - * 输出404错误页面 - * - * @param response HttpServletResponse - */ - public static void outNotFund(HttpServletResponse response) { - response.setStatus(HttpServletResponse.SC_NOT_FOUND); - outMessage("404 Not Found", null, response); - } - - /** - * 输出错误页面 - * - * @param title 标题 - * @param message 内容 - * @param response HttpServletResponse - */ - public static void outMessage(String title, String message, HttpServletResponse response) { - response.setContentType("text/html;charset=UTF-8"); - try { - PrintWriter writer = response.getWriter(); - writer.write(""); - writer.write("" + title + ""); - writer.write("

" + title + "

"); - if (message != null) { - writer.write(message); - } - writer.write("

WebSoft File Server

"); - writer.flush(); - } catch (IOException e) { - e.printStackTrace(); - } - } - -} diff --git a/modules/common/core/utils/GreenWebUtils.java b/modules/common/core/utils/GreenWebUtils.java deleted file mode 100644 index ea72c9f..0000000 --- a/modules/common/core/utils/GreenWebUtils.java +++ /dev/null @@ -1,317 +0,0 @@ -package com.gxwebsoft.common.core.utils; - - -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson2.JSONObject; -import com.alibaba.fastjson2.TypeReference; -import com.aliyun.green20220302.Client; -import com.aliyun.green20220302.models.*; -import com.aliyun.teaopenapi.models.Config; -import com.aliyun.teautil.models.RuntimeOptions; -import com.gxwebsoft.common.core.enums.GreenWebType; -import com.gxwebsoft.common.system.vo.faceId.HeadPortraitResult; -import org.apache.http.HttpEntity; -import org.apache.http.HttpResponse; -import org.apache.http.util.EntityUtils; -import org.springframework.stereotype.Component; -import org.springframework.util.StringUtils; - -import java.util.*; - - -@Component -public class GreenWebUtils { - private static Client contentGreenClient = null; - - static final String accessKeyId = "LTAI5t8UTh8CTXEi2dYxobhj"; - static final String accessKeySecret = "fNdJOT4KAjrVrzHNAcSJuUCy9ZljD9"; - - static final String[] badAudioLabel = {"violence", "political_content", "sexual_content", "sexual_sounds", "contraband", "profanity", "religion", "cyberbullying", "negative_content", "specified_speaking", "specified_lyrics"}; -// static final String[] badVideoLabel = {"pornographic_adultContent","pornographic_adultToys","pornographic_artwork","pornographic_adultContent_tii","sexual_suggestiveContent","sexual_breastNudity","sexual_cleavage","sexual_femaleUnderwear","sexual_maleTopless","sexual_femaleShoulder","sexual_cartoon","sexual_pregnancy","sexual_underage","political_politicalFigure_1","political_politicalFigure_2","political_politicalFigure_3","political_politicalFigure_name_tii",""}; - - private static class ContentGreenClientHolder { - private static final Client INSTANCE = createContentGreenClient(); - } - - private static Client createContentGreenClient() { - Config config = new Config(); - config.setAccessKeyId(accessKeyId); - config.setAccessKeySecret(accessKeySecret); - config.setRegionId("cn-shenzhen"); - config.setEndpoint("green-cip.cn-shenzhen.aliyuncs.com"); - config.setReadTimeout(6000); - config.setConnectTimeout(3000); - try { - return new Client(config); - } catch (Exception e) { - throw new RuntimeException(e); - } - } - - - public static Client getContentGreenClient() { - - if (contentGreenClient == null) { - contentGreenClient = ContentGreenClientHolder.INSTANCE; - } - return contentGreenClient; - } - - /** - * 文本审核 - * - * @param text - * @param type - * @return - */ - public static boolean testText(String text, GreenWebType type) { - if (!StringUtils.hasText(text)) { - return false; - } - - JSONObject serviceParameters = new JSONObject(); - serviceParameters.put("content", text); - - // 创建RuntimeObject实例并设置运行参数。 - RuntimeOptions runtime = new RuntimeOptions(); - runtime.readTimeout = 10000; - runtime.connectTimeout = 10000; - - TextModerationRequest textModerationRequest = new TextModerationRequest(); - textModerationRequest.setService(type.name()); - textModerationRequest.setServiceParameters(serviceParameters.toJSONString()); - -// try { - TextModerationResponse response = null; - try { - response = getContentGreenClient().textModerationWithOptions(textModerationRequest, runtime); - } catch (Exception e) { - e.printStackTrace(); - return false; - } - if (response.statusCode != 200) { - return false; - } - - TextModerationResponseBody result = response.getBody(); - Integer code = result.getCode(); - if (code != null && code == 200) { - TextModerationResponseBody.TextModerationResponseBodyData data = result.getData(); - return !StringUtils.hasText(data.getReason()); - - } else { - return false; - } - } - - /** - * 图片审核 - * - * @param imgUrl - * @param type - * @return - */ - - public static boolean testImage(String imgUrl, GreenWebType type) { - - if(!imgUrl.contains("?x-oss-process=image/resize")) { - imgUrl += "?x-oss-process=image/resize,w_750/quality,Q_90"; - } - - Map serviceParameters = new HashMap<>(); - //公网可访问的URL。 - serviceParameters.put("imageUrl", imgUrl); - serviceParameters.put("dataId", UUID.randomUUID().toString()); - - ImageModerationRequest request = new ImageModerationRequest(); - // 图片检测service: baselineCheck通用基线检测。 - request.setService(type.name()); - request.setServiceParameters(JSON.toJSONString(serviceParameters)); - - RuntimeOptions runtime = new RuntimeOptions(); - runtime.readTimeout = 10000; - runtime.connectTimeout = 10000; - ImageModerationResponse response = null; - try { - response = getContentGreenClient().imageModerationWithOptions(request, runtime); - System.out.println(response); - } catch (Exception e) { - e.printStackTrace(); - return false; - } - - ImageModerationResponseBody body = response.getBody(); - - String[] unSafeLabelArr = {"pornographic_adultContent_tii","pornographic_adultContent","sexual_suggestiveContent",""}; - if (body.getCode() == 200) { - ImageModerationResponseBody.ImageModerationResponseBodyData data = body.getData(); - System.out.println("dataId=" + data.getDataId()); - List results = data.getResult(); - for (ImageModerationResponseBody.ImageModerationResponseBodyDataResult result : results) { - - if (!"nonLabel".equals(result.getLabel())) { - System.out.println(String.format("Label: %s,Confidence: %f",result.getLabel(),result.getConfidence())); - return false; - } - } - } else { - return false; - } - return true; - } - - /** - * 视频审核（异步） - * - * @param videoUrl - * @param type - * @return - */ - public static String testVideo(String videoUrl, GreenWebType type) { - - JSONObject serviceParameters = new JSONObject(); - serviceParameters.put("url", videoUrl); - - VideoModerationRequest videoModerationRequest = new VideoModerationRequest(); - // 检测类型：videoDetection - videoModerationRequest.setService(type.name()); - videoModerationRequest.setServiceParameters(serviceParameters.toJSONString()); - - - try { - VideoModerationResponse response = getContentGreenClient().videoModeration(videoModerationRequest); - if (response.getStatusCode() == 200) { - VideoModerationResponseBody result = response.getBody(); - System.out.println(JSON.toJSONString(result)); - System.out.println("requestId = " + result.getRequestId()); - System.out.println("code = " + result.getCode()); - System.out.println("msg = " + result.getMessage()); - Integer code = result.getCode(); - if (200 == code) { - VideoModerationResponseBody.VideoModerationResponseBodyData data = result.getData(); - return data.taskId; - } else { - return null; - } - } else { - return null; - } - } catch (Exception e) { - e.printStackTrace(); - return null; - } - - } - - /** - * 获取视频审核结果 - * - * @param taskId - * @param type - * @return - */ - public static boolean getTestVideoResult(String taskId, GreenWebType type) { - - - JSONObject serviceParameters = new JSONObject(); - // 提交任务时返回的taskId。 - serviceParameters.put("taskId", taskId); - VideoModerationResultRequest videoModerationResultRequest = new VideoModerationResultRequest(); - videoModerationResultRequest.setService(type.name()); - videoModerationResultRequest.setServiceParameters(serviceParameters.toJSONString()); - try { - VideoModerationResultResponse response = getContentGreenClient().videoModerationResult(videoModerationResultRequest); - if (response.getStatusCode() == 200) { - VideoModerationResultResponseBody result = response.getBody(); - System.out.println("requestId=" + result.getRequestId()); - System.out.println("code=" + result.getCode()); - System.out.println("msg=" + result.getMessage()); - if (200 == result.getCode()) { - VideoModerationResultResponseBody.VideoModerationResultResponseBodyData data = result.getData(); - VideoModerationResultResponseBody.VideoModerationResultResponseBodyDataAudioResult audioResult = data.getAudioResult(); - VideoModerationResultResponseBody.VideoModerationResultResponseBodyDataFrameResult frameResult = data.getFrameResult(); - boolean hasBadAudio = audioResult.sliceDetails.stream().filter(w -> { - String labels = w.getLabels(); - String[] labelArr = labels.split(","); - return Arrays.stream(labelArr).filter(l -> { - return Arrays.stream(badAudioLabel).filter(b -> b.equals(l)).findFirst().isPresent(); - }).findFirst().isPresent(); - }).findFirst().isPresent(); - if (hasBadAudio) { - return false; - } - boolean hasBadVideo = frameResult.getFrames().stream().filter(w -> { - return w.getResults().stream().filter(r -> { - return r.getResult().stream().filter(r2 -> { - return !"nonLabel".equals(r2.label); - }).findFirst().isPresent(); - }).findFirst().isPresent(); - }).findFirst().isPresent(); - if (hasBadVideo) { - return false; - } - } else { - return false; - } - } else { - return false; - } - } catch (Exception e) { - return false; - } - return true; - } - - - /** - * 鉴别头像是否是真人头像（非卡通） 2. 鉴别图片是否有性感，色情信息 3. 鉴别头像是否有广告，敏感信息，以及二维码等 4. 鉴别头像性别。 - * - * @param imageBase64 - * @param imageType - * @param genter - * @return - */ - public static boolean testAvatar(String imageBase64, String imageType, Integer genter) { - String host = "https://edishead.market.alicloudapi.com"; - String path = "/faceId/headPortrait/getResult"; - String method = "POST"; - String appcode = "566b5786c5874464909d8c0b7f64cdc7"; - Map headers = new HashMap(); - //最后在header中的格式(中间是英文空格)为Authorization:APPCODE 83359fd73fe94948385f570e3c139105 - headers.put("Authorization", "APPCODE " + appcode); - //根据API的要求，定义相对应的Content-Type - headers.put("Content-Type", "application/x-www-form-urlencoded; charset=UTF-8"); - Map querys = new HashMap(); - Map bodys = new HashMap(); - bodys.put("image", imageBase64); - bodys.put("imageType", imageType); - HttpResponse response = null; - try { - response = HttpUtils.doPost(host, path, method, headers, querys, bodys); - HttpEntity entity = response.getEntity(); - String string = EntityUtils.toString(entity); - HeadPortraitResult result = JSONObject.parseObject(string, new TypeReference() { - }); - if (!"0000".equals(result.getCode())) { - return false; - } - if (!"normal".equals(result.getPorn()) || !"normal".equals(result.getAd())) { - return false; - } - if (result.getFaceCount() != 1 || result.getCartoonImg()) { - return false; - } - - if (!genter.equals(result.getGenterList()[0])) { - return false; - } - - - } catch (Exception e) { - e.printStackTrace(); - return false; - } - System.out.println(response.toString()); - return true; - } -} diff --git a/modules/common/core/utils/HttpUtils.java b/modules/common/core/utils/HttpUtils.java deleted file mode 100644 index 888acc2..0000000 --- a/modules/common/core/utils/HttpUtils.java +++ /dev/null @@ -1,311 +0,0 @@ -package com.gxwebsoft.common.core.utils; - -import org.apache.commons.lang3.StringUtils; -import org.apache.http.HttpResponse; -import org.apache.http.NameValuePair; -import org.apache.http.client.HttpClient; -import org.apache.http.client.entity.UrlEncodedFormEntity; -import org.apache.http.client.methods.HttpDelete; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.client.methods.HttpPut; -import org.apache.http.conn.ClientConnectionManager; -import org.apache.http.conn.scheme.Scheme; -import org.apache.http.conn.scheme.SchemeRegistry; -import org.apache.http.conn.ssl.SSLSocketFactory; -import org.apache.http.entity.ByteArrayEntity; -import org.apache.http.entity.StringEntity; -import org.apache.http.impl.client.DefaultHttpClient; -import org.apache.http.message.BasicNameValuePair; - -import javax.net.ssl.SSLContext; -import javax.net.ssl.TrustManager; -import javax.net.ssl.X509TrustManager; -import java.io.UnsupportedEncodingException; -import java.net.URLEncoder; -import java.security.KeyManagementException; -import java.security.NoSuchAlgorithmException; -import java.security.cert.X509Certificate; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -public class HttpUtils { - - /** - * get - * - * @param host - * @param path - * @param method - * @param headers - * @param querys - * @return - * @throws Exception - */ - public static HttpResponse doGet(String host, String path, String method, - Map headers, - Map querys) - throws Exception { - HttpClient httpClient = wrapClient(host); - - HttpGet request = new HttpGet(buildUrl(host, path, querys)); - for (Map.Entry e : headers.entrySet()) { - request.addHeader(e.getKey(), e.getValue()); - } - - return httpClient.execute(request); - } - - /** - * post form - * - * @param host - * @param path - * @param method - * @param headers - * @param querys - * @param bodys - * @return - * @throws Exception - */ - public static HttpResponse doPost(String host, String path, String method, - Map headers, - Map querys, - Map bodys) - throws Exception { - HttpClient httpClient = wrapClient(host); - - HttpPost request = new HttpPost(buildUrl(host, path, querys)); - for (Map.Entry e : headers.entrySet()) { - request.addHeader(e.getKey(), e.getValue()); - } - - if (bodys != null) { - List nameValuePairList = new ArrayList(); - - for (String key : bodys.keySet()) { - nameValuePairList.add(new BasicNameValuePair(key, bodys.get(key))); - } - UrlEncodedFormEntity formEntity = new UrlEncodedFormEntity(nameValuePairList, "utf-8"); - formEntity.setContentType("application/x-www-form-urlencoded; charset=UTF-8"); - request.setEntity(formEntity); - } - - return httpClient.execute(request); - } - - /** - * Post String - * - * @param host - * @param path - * @param method - * @param headers - * @param querys - * @param body - * @return - * @throws Exception - */ - public static HttpResponse doPost(String host, String path, String method, - Map headers, - Map querys, - String body) - throws Exception { - HttpClient httpClient = wrapClient(host); - - HttpPost request = new HttpPost(buildUrl(host, path, querys)); - for (Map.Entry e : headers.entrySet()) { - request.addHeader(e.getKey(), e.getValue()); - } - - if (StringUtils.isNotBlank(body)) { - request.setEntity(new StringEntity(body, "utf-8")); - } - - return httpClient.execute(request); - } - - /** - * Post stream - * - * @param host - * @param path - * @param method - * @param headers - * @param querys - * @param body - * @return - * @throws Exception - */ - public static HttpResponse doPost(String host, String path, String method, - Map headers, - Map querys, - byte[] body) - throws Exception { - HttpClient httpClient = wrapClient(host); - - HttpPost request = new HttpPost(buildUrl(host, path, querys)); - for (Map.Entry e : headers.entrySet()) { - request.addHeader(e.getKey(), e.getValue()); - } - - if (body != null) { - request.setEntity(new ByteArrayEntity(body)); - } - - return httpClient.execute(request); - } - - /** - * Put String - * @param host - * @param path - * @param method - * @param headers - * @param querys - * @param body - * @return - * @throws Exception - */ - public static HttpResponse doPut(String host, String path, String method, - Map headers, - Map querys, - String body) - throws Exception { - HttpClient httpClient = wrapClient(host); - - HttpPut request = new HttpPut(buildUrl(host, path, querys)); - for (Map.Entry e : headers.entrySet()) { - request.addHeader(e.getKey(), e.getValue()); - } - - if (StringUtils.isNotBlank(body)) { - request.setEntity(new StringEntity(body, "utf-8")); - } - - return httpClient.execute(request); - } - - /** - * Put stream - * @param host - * @param path - * @param method - * @param headers - * @param querys - * @param body - * @return - * @throws Exception - */ - public static HttpResponse doPut(String host, String path, String method, - Map headers, - Map querys, - byte[] body) - throws Exception { - HttpClient httpClient = wrapClient(host); - - HttpPut request = new HttpPut(buildUrl(host, path, querys)); - for (Map.Entry e : headers.entrySet()) { - request.addHeader(e.getKey(), e.getValue()); - } - - if (body != null) { - request.setEntity(new ByteArrayEntity(body)); - } - - return httpClient.execute(request); - } - - /** - * Delete - * - * @param host - * @param path - * @param method - * @param headers - * @param querys - * @return - * @throws Exception - */ - public static HttpResponse doDelete(String host, String path, String method, - Map headers, - Map querys) - throws Exception { - HttpClient httpClient = wrapClient(host); - - HttpDelete request = new HttpDelete(buildUrl(host, path, querys)); - for (Map.Entry e : headers.entrySet()) { - request.addHeader(e.getKey(), e.getValue()); - } - - return httpClient.execute(request); - } - - private static String buildUrl(String host, String path, Map querys) throws UnsupportedEncodingException { - StringBuilder sbUrl = new StringBuilder(); - sbUrl.append(host); - if (!StringUtils.isBlank(path)) { - sbUrl.append(path); - } - if (null != querys) { - StringBuilder sbQuery = new StringBuilder(); - for (Map.Entry query : querys.entrySet()) { - if (0 < sbQuery.length()) { - sbQuery.append("&"); - } - if (StringUtils.isBlank(query.getKey()) && !StringUtils.isBlank(query.getValue())) { - sbQuery.append(query.getValue()); - } - if (!StringUtils.isBlank(query.getKey())) { - sbQuery.append(query.getKey()); - if (!StringUtils.isBlank(query.getValue())) { - sbQuery.append("="); - sbQuery.append(URLEncoder.encode(query.getValue(), "utf-8")); - } - } - } - if (0 < sbQuery.length()) { - sbUrl.append("?").append(sbQuery); - } - } - - return sbUrl.toString(); - } - - private static HttpClient wrapClient(String host) { - HttpClient httpClient = new DefaultHttpClient(); - if (host.startsWith("https://")) { - sslClient(httpClient); - } - - return httpClient; - } - - private static void sslClient(HttpClient httpClient) { - try { - SSLContext ctx = SSLContext.getInstance("TLS"); - X509TrustManager tm = new X509TrustManager() { - public X509Certificate[] getAcceptedIssuers() { - return null; - } - public void checkClientTrusted(X509Certificate[] xcs, String str) { - - } - public void checkServerTrusted(X509Certificate[] xcs, String str) { - - } - }; - ctx.init(null, new TrustManager[] { tm }, null); - SSLSocketFactory ssf = new SSLSocketFactory(ctx); - ssf.setHostnameVerifier(SSLSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER); - ClientConnectionManager ccm = httpClient.getConnectionManager(); - SchemeRegistry registry = ccm.getSchemeRegistry(); - registry.register(new Scheme("https", 443, ssf)); - } catch (KeyManagementException ex) { - throw new RuntimeException(ex); - } catch (NoSuchAlgorithmException ex) { - throw new RuntimeException(ex); - } - } -} \ No newline at end of file diff --git a/modules/common/core/utils/ImageUtil.java b/modules/common/core/utils/ImageUtil.java deleted file mode 100644 index 9a1e18f..0000000 --- a/modules/common/core/utils/ImageUtil.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.gxwebsoft.common.core.utils; - -import cn.hutool.core.codec.Base64Encoder; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.net.HttpURLConnection; -import java.net.URL; - -public class ImageUtil { - public static String ImageBase64(String imgUrl) { - URL url = null; - InputStream is = null; - ByteArrayOutputStream outStream = null; - HttpURLConnection httpUrl = null; - try{ - url = new URL(imgUrl); - httpUrl = (HttpURLConnection) url.openConnection(); - httpUrl.connect(); - httpUrl.getInputStream(); - is = httpUrl.getInputStream(); - - outStream = new ByteArrayOutputStream(); - //创建一个Buffer字符串 - byte[] buffer = new byte[1024]; - //每次读取的字符串长度，如果为-1，代表全部读取完毕 - int len = 0; - //使用一个输入流从buffer里把数据读取出来 - while( (len=is.read(buffer)) != -1 ){ - //用输出流往buffer里写入数据，中间参数代表从哪个位置开始读，len代表读取的长度 - outStream.write(buffer, 0, len); - } - // 对字节数组Base64编码 - return new Base64Encoder().encode(outStream.toByteArray()); - }catch (Exception e) { - e.printStackTrace(); - } - finally{ - if(is != null) - { - try { - is.close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - if(outStream != null) - { - try { - outStream.close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - if(httpUrl != null) - { - httpUrl.disconnect(); - } - } - return imgUrl; - } -} diff --git a/modules/common/core/utils/JChardetFacadeUtil.java b/modules/common/core/utils/JChardetFacadeUtil.java deleted file mode 100644 index 1b49fb7..0000000 --- a/modules/common/core/utils/JChardetFacadeUtil.java +++ /dev/null @@ -1,2025 +0,0 @@ -package com.gxwebsoft.common.core.utils; - -import java.io.*; -import java.net.URL; -import java.nio.charset.Charset; -import java.nio.charset.UnsupportedCharsetException; - -/** - * 文件编码检测工具, 核心代码来自 cpDetector 和 jChardet, 可以检测大多数文件的编码 - * - * @author WebSoft - * @since 2020-09-15 09:24:20 - */ -public class JChardetFacadeUtil { - - public static String detectCodepage(URL url) { - try { - Charset ret = JChardetFacade.getInstance().detectCodepage(url); - return ret == null ? null : ret.name(); - } catch (Exception ignored) { - } - return null; - } - - /** - * 下面代码来自: https://github.com/r91987/cpdetector - */ - public static class JChardetFacade extends AbstractCodepageDetector implements nsICharsetDetectionObserver { - private static JChardetFacade instance = null; - private static nsDetector det; - private byte[] buf = new byte[4096]; - private Charset codpage = null; - private boolean m_guessing = true; - private int amountOfVerifiers = 0; - - private JChardetFacade() { - det = new nsDetector(0); - det.Init(this); - this.amountOfVerifiers = det.getProbableCharsets().length; - } - - public static JChardetFacade getInstance() { - if (instance == null) { - instance = new JChardetFacade(); - } - - return instance; - } - - public synchronized Charset detectCodepage(InputStream in, int length) throws IOException { - this.Reset(); - int read = 0; - boolean done = false; - boolean isAscii = true; - Charset ret = null; - - int len; - do { - len = in.read(this.buf, 0, Math.min(this.buf.length, length - read)); - if (len > 0) { - read += len; - } - - if (!done) { - done = det.DoIt(this.buf, len, false); - } - } while (len > 0 && !done); - - det.DataEnd(); - if (this.codpage == null) { - if (this.m_guessing) { - ret = this.guess(); - } - } else { - ret = this.codpage; - } - return ret; - } - - private Charset guess() { - Charset ret = null; - String[] possibilities = det.getProbableCharsets(); - if (possibilities.length == this.amountOfVerifiers) { - ret = Charset.forName("US-ASCII"); - } else { - String check = possibilities[0]; - if (!check.equalsIgnoreCase("nomatch")) { - for (int i = 0; ret == null && i < possibilities.length; ++i) { - try { - ret = Charset.forName(possibilities[i]); - } catch (UnsupportedCharsetException ignored) { - } - } - } - } - return ret; - } - - public void Notify(String charset) { - this.codpage = Charset.forName(charset); - } - - public void Reset() { - det.Reset(); - this.codpage = null; - } - - public boolean isGuessing() { - return this.m_guessing; - } - - public synchronized void setGuessing(boolean guessing) { - this.m_guessing = guessing; - } - } - - /** - * - */ - public static abstract class AbstractCodepageDetector implements ICodepageDetector { - public AbstractCodepageDetector() { - } - - public Charset detectCodepage(URL url) throws IOException { - BufferedInputStream in = new BufferedInputStream(url.openStream()); - Charset result = this.detectCodepage(in, 2147483647); - in.close(); - return result; - } - - public final Reader open(URL url) throws IOException { - Reader ret = null; - Charset cs = this.detectCodepage(url); - if (cs != null) { - ret = new InputStreamReader(new BufferedInputStream(url.openStream()), cs); - } - - return ret; - } - - public int compareTo(Object o) { - String other = o.getClass().getName(); - String mine = this.getClass().getName(); - return mine.compareTo(other); - } - } - - /** - * - */ - interface ICodepageDetector extends Serializable, Comparable { - Reader open(URL var1) throws IOException; - - Charset detectCodepage(URL var1) throws IOException; - - Charset detectCodepage(InputStream var1, int var2) throws IOException; - } - - /** - * 以下代码开始是由Mozilla组织提供的JChardet, 它可以检测大多数文件的编码 - * http://jchardet.sourceforge.net/ - */ - public static class nsDetector extends nsPSMDetector implements nsICharsetDetector { - nsICharsetDetectionObserver mObserver = null; - - public nsDetector() { - } - - public nsDetector(int var1) { - super(var1); - } - - public void Init(nsICharsetDetectionObserver var1) { - this.mObserver = var1; - } - - public boolean DoIt(byte[] var1, int var2, boolean var3) { - if (var1 != null && !var3) { - this.HandleData(var1, var2); - return this.mDone; - } else { - return false; - } - } - - public void Done() { - this.DataEnd(); - } - - public void Report(String var1) { - if (this.mObserver != null) { - this.mObserver.Notify(var1); - } - - } - - public boolean isAscii(byte[] var1, int var2) { - for (int var3 = 0; var3 < var2; ++var3) { - if ((128 & var1[var3]) != 0) { - return false; - } - } - - return true; - } - } - - /** - * - */ - public static abstract class nsPSMDetector { - public static final int ALL = 0; - public static final int JAPANESE = 1; - public static final int CHINESE = 2; - public static final int SIMPLIFIED_CHINESE = 3; - public static final int TRADITIONAL_CHINESE = 4; - public static final int KOREAN = 5; - public static final int NO_OF_LANGUAGES = 6; - public static final int MAX_VERIFIERS = 16; - nsVerifier[] mVerifier; - nsEUCStatistics[] mStatisticsData; - nsEUCSampler mSampler = new nsEUCSampler(); - byte[] mState = new byte[16]; - int[] mItemIdx = new int[16]; - int mItems; - int mClassItems; - boolean mDone; - boolean mRunSampler; - boolean mClassRunSampler; - - public nsPSMDetector() { - this.initVerifiers(0); - this.Reset(); - } - - public nsPSMDetector(int var1) { - this.initVerifiers(var1); - this.Reset(); - } - - public nsPSMDetector(int var1, nsVerifier[] var2, nsEUCStatistics[] var3) { - this.mClassRunSampler = var3 != null; - this.mStatisticsData = var3; - this.mVerifier = var2; - this.mClassItems = var1; - this.Reset(); - } - - public void Reset() { - this.mRunSampler = this.mClassRunSampler; - this.mDone = false; - this.mItems = this.mClassItems; - - for (int var1 = 0; var1 < this.mItems; this.mItemIdx[var1] = var1++) { - this.mState[var1] = 0; - } - - this.mSampler.Reset(); - } - - protected void initVerifiers(int var1) { - boolean var2 = false; - int var3; - if (var1 >= 0 && var1 < 6) { - var3 = var1; - } else { - var3 = 0; - } - - this.mVerifier = null; - this.mStatisticsData = null; - if (var3 == 4) { - this.mVerifier = new nsVerifier[]{new nsUTF8Verifier(), new nsBIG5Verifier(), new nsISO2022CNVerifier(), new nsEUCTWVerifier(), new nsCP1252Verifier(), new nsUCS2BEVerifier(), new nsUCS2LEVerifier()}; - this.mStatisticsData = new nsEUCStatistics[]{null, new Big5Statistics(), null, new EUCTWStatistics(), null, null, null}; - } else if (var3 == 5) { - this.mVerifier = new nsVerifier[]{new nsUTF8Verifier(), new nsEUCKRVerifier(), new nsISO2022KRVerifier(), new nsCP1252Verifier(), new nsUCS2BEVerifier(), new nsUCS2LEVerifier()}; - } else if (var3 == 3) { - this.mVerifier = new nsVerifier[]{new nsUTF8Verifier(), new nsGB2312Verifier(), new nsGB18030Verifier(), new nsISO2022CNVerifier(), new nsHZVerifier(), new nsCP1252Verifier(), new nsUCS2BEVerifier(), new nsUCS2LEVerifier()}; - } else if (var3 == 1) { - this.mVerifier = new nsVerifier[]{new nsUTF8Verifier(), new nsSJISVerifier(), new nsEUCJPVerifier(), new nsISO2022JPVerifier(), new nsCP1252Verifier(), new nsUCS2BEVerifier(), new nsUCS2LEVerifier()}; - } else if (var3 == 2) { - this.mVerifier = new nsVerifier[]{new nsUTF8Verifier(), new nsGB2312Verifier(), new nsGB18030Verifier(), new nsBIG5Verifier(), new nsISO2022CNVerifier(), new nsHZVerifier(), new nsEUCTWVerifier(), new nsCP1252Verifier(), new nsUCS2BEVerifier(), new nsUCS2LEVerifier()}; - this.mStatisticsData = new nsEUCStatistics[]{null, new GB2312Statistics(), null, new Big5Statistics(), null, null, new EUCTWStatistics(), null, null, null}; - } else if (var3 == 0) { - this.mVerifier = new nsVerifier[]{new nsUTF8Verifier(), new nsSJISVerifier(), new nsEUCJPVerifier(), new nsISO2022JPVerifier(), new nsEUCKRVerifier(), new nsISO2022KRVerifier(), new nsBIG5Verifier(), new nsEUCTWVerifier(), new nsGB2312Verifier(), new nsGB18030Verifier(), new nsISO2022CNVerifier(), new nsHZVerifier(), new nsCP1252Verifier(), new nsUCS2BEVerifier(), new nsUCS2LEVerifier()}; - this.mStatisticsData = new nsEUCStatistics[]{null, null, new EUCJPStatistics(), null, new EUCKRStatistics(), null, new Big5Statistics(), new EUCTWStatistics(), new GB2312Statistics(), null, null, null, null, null, null}; - } - - this.mClassRunSampler = this.mStatisticsData != null; - this.mClassItems = this.mVerifier.length; - } - - public abstract void Report(String var1); - - public boolean HandleData(byte[] var1, int var2) { - for (int var3 = 0; var3 < var2; ++var3) { - byte var5 = var1[var3]; - int var4 = 0; - - while (var4 < this.mItems) { - byte var6 = nsVerifier.getNextState(this.mVerifier[this.mItemIdx[var4]], var5, this.mState[var4]); - if (var6 == 2) { - this.Report(this.mVerifier[this.mItemIdx[var4]].charset()); - this.mDone = true; - return this.mDone; - } - - if (var6 == 1) { - --this.mItems; - if (var4 < this.mItems) { - this.mItemIdx[var4] = this.mItemIdx[this.mItems]; - this.mState[var4] = this.mState[this.mItems]; - } - } else { - this.mState[var4++] = var6; - } - } - - if (this.mItems <= 1) { - if (1 == this.mItems) { - this.Report(this.mVerifier[this.mItemIdx[0]].charset()); - } - - this.mDone = true; - return this.mDone; - } - - int var7 = 0; - int var8 = 0; - - for (var4 = 0; var4 < this.mItems; ++var4) { - if (!this.mVerifier[this.mItemIdx[var4]].isUCS2() && !this.mVerifier[this.mItemIdx[var4]].isUCS2()) { - ++var7; - var8 = var4; - } - } - - if (1 == var7) { - this.Report(this.mVerifier[this.mItemIdx[var8]].charset()); - this.mDone = true; - return this.mDone; - } - } - - if (this.mRunSampler) { - this.Sample(var1, var2); - } - - return this.mDone; - } - - public void DataEnd() { - if (!this.mDone) { - if (this.mItems == 2) { - if (this.mVerifier[this.mItemIdx[0]].charset().equals("GB18030")) { - this.Report(this.mVerifier[this.mItemIdx[1]].charset()); - this.mDone = true; - } else if (this.mVerifier[this.mItemIdx[1]].charset().equals("GB18030")) { - this.Report(this.mVerifier[this.mItemIdx[0]].charset()); - this.mDone = true; - } - } - - if (this.mRunSampler) { - this.Sample((byte[]) null, 0, true); - } - - } - } - - public void Sample(byte[] var1, int var2) { - this.Sample(var1, var2, false); - } - - public void Sample(byte[] var1, int var2, boolean var3) { - int var4 = 0; - int var6 = 0; - - int var5; - for (var5 = 0; var5 < this.mItems; ++var5) { - if (null != this.mStatisticsData[this.mItemIdx[var5]]) { - ++var6; - } - - if (!this.mVerifier[this.mItemIdx[var5]].isUCS2() && !this.mVerifier[this.mItemIdx[var5]].charset().equals("GB18030")) { - ++var4; - } - } - - this.mRunSampler = var6 > 1; - if (this.mRunSampler) { - this.mRunSampler = this.mSampler.Sample(var1, var2); - if ((var3 && this.mSampler.GetSomeData() || this.mSampler.EnoughData()) && var6 == var4) { - this.mSampler.CalFreq(); - int var7 = -1; - int var8 = 0; - float var9 = 0.0F; - - for (var5 = 0; var5 < this.mItems; ++var5) { - if (null != this.mStatisticsData[this.mItemIdx[var5]] && !this.mVerifier[this.mItemIdx[var5]].charset().equals("Big5")) { - float var10 = this.mSampler.GetScore(this.mStatisticsData[this.mItemIdx[var5]].mFirstByteFreq(), this.mStatisticsData[this.mItemIdx[var5]].mFirstByteWeight(), this.mStatisticsData[this.mItemIdx[var5]].mSecondByteFreq(), this.mStatisticsData[this.mItemIdx[var5]].mSecondByteWeight()); - if (0 == var8++ || var9 > var10) { - var9 = var10; - var7 = var5; - } - } - } - - if (var7 >= 0) { - this.Report(this.mVerifier[this.mItemIdx[var7]].charset()); - this.mDone = true; - } - } - } - - } - - public String[] getProbableCharsets() { - String[] var1; - if (this.mItems <= 0) { - var1 = new String[]{"nomatch"}; - return var1; - } else { - var1 = new String[this.mItems]; - - for (int var2 = 0; var2 < this.mItems; ++var2) { - var1[var2] = this.mVerifier[this.mItemIdx[var2]].charset(); - } - - return var1; - } - } - } - - /** - * - */ - public static interface nsICharsetDetectionObserver { - void Notify(String var1); - } - - /** - * - */ - public static interface nsICharsetDetector { - void Init(nsICharsetDetectionObserver var1); - - boolean DoIt(byte[] var1, int var2, boolean var3); - - void Done(); - } - - /** - * - */ - public static abstract class nsVerifier { - static final byte eStart = 0; - static final byte eError = 1; - static final byte eItsMe = 2; - static final int eidxSft4bits = 3; - static final int eSftMsk4bits = 7; - static final int eBitSft4bits = 2; - static final int eUnitMsk4bits = 15; - - nsVerifier() { - } - - public abstract String charset(); - - public abstract int stFactor(); - - public abstract int[] cclass(); - - public abstract int[] states(); - - public abstract boolean isUCS2(); - - public static byte getNextState(nsVerifier var0, byte var1, byte var2) { - return (byte) (255 & var0.states()[(var2 * var0.stFactor() + (var0.cclass()[(var1 & 255) >> 3] >> ((var1 & 7) << 2) & 15) & 255) >> 3] >> ((var2 * var0.stFactor() + (var0.cclass()[(var1 & 255) >> 3] >> ((var1 & 7) << 2) & 15) & 255 & 7) << 2) & 15); - } - } - - /** - * - */ - public static class nsEUCSampler { - int mTotal = 0; - int mThreshold = 200; - int mState = 0; - public int[] mFirstByteCnt = new int[94]; - public int[] mSecondByteCnt = new int[94]; - public float[] mFirstByteFreq = new float[94]; - public float[] mSecondByteFreq = new float[94]; - - public nsEUCSampler() { - this.Reset(); - } - - public void Reset() { - this.mTotal = 0; - this.mState = 0; - - for (int var1 = 0; var1 < 94; ++var1) { - this.mFirstByteCnt[var1] = this.mSecondByteCnt[var1] = 0; - } - - } - - boolean EnoughData() { - return this.mTotal > this.mThreshold; - } - - boolean GetSomeData() { - return this.mTotal > 1; - } - - boolean Sample(byte[] var1, int var2) { - if (this.mState == 1) { - return false; - } else { - int var3 = 0; - - for (int var4 = 0; var4 < var2 && 1 != this.mState; ++var3) { - int var10002; - switch (this.mState) { - case 0: - if ((var1[var3] & 128) != 0) { - if (255 != (255 & var1[var3]) && 161 <= (255 & var1[var3])) { - ++this.mTotal; - var10002 = this.mFirstByteCnt[(255 & var1[var3]) - 161]++; - this.mState = 2; - } else { - this.mState = 1; - } - } - case 1: - break; - case 2: - if ((var1[var3] & 128) != 0) { - if (255 != (255 & var1[var3]) && 161 <= (255 & var1[var3])) { - ++this.mTotal; - var10002 = this.mSecondByteCnt[(255 & var1[var3]) - 161]++; - this.mState = 0; - } else { - this.mState = 1; - } - } else { - this.mState = 1; - } - break; - default: - this.mState = 1; - } - - ++var4; - } - - return 1 != this.mState; - } - } - - void CalFreq() { - for (int var1 = 0; var1 < 94; ++var1) { - this.mFirstByteFreq[var1] = (float) this.mFirstByteCnt[var1] / (float) this.mTotal; - this.mSecondByteFreq[var1] = (float) this.mSecondByteCnt[var1] / (float) this.mTotal; - } - - } - - float GetScore(float[] var1, float var2, float[] var3, float var4) { - return var2 * this.GetScore(var1, this.mFirstByteFreq) + var4 * this.GetScore(var3, this.mSecondByteFreq); - } - - float GetScore(float[] var1, float[] var2) { - float var4 = 0.0F; - - for (int var5 = 0; var5 < 94; ++var5) { - float var3 = var1[var5] - var2[var5]; - var4 += var3 * var3; - } - - return (float) Math.sqrt((double) var4) / 94.0F; - } - } - - /** - * - */ - public static abstract class nsEUCStatistics { - public abstract float[] mFirstByteFreq(); - - public abstract float mFirstByteStdDev(); - - public abstract float mFirstByteMean(); - - public abstract float mFirstByteWeight(); - - public abstract float[] mSecondByteFreq(); - - public abstract float mSecondByteStdDev(); - - public abstract float mSecondByteMean(); - - public abstract float mSecondByteWeight(); - - public nsEUCStatistics() { - } - } - - /** - * - */ - public static class EUCJPStatistics extends nsEUCStatistics { - static float[] mFirstByteFreq; - static float mFirstByteStdDev; - static float mFirstByteMean; - static float mFirstByteWeight; - static float[] mSecondByteFreq; - static float mSecondByteStdDev; - static float mSecondByteMean; - static float mSecondByteWeight; - - public float[] mFirstByteFreq() { - return mFirstByteFreq; - } - - public float mFirstByteStdDev() { - return mFirstByteStdDev; - } - - public float mFirstByteMean() { - return mFirstByteMean; - } - - public float mFirstByteWeight() { - return mFirstByteWeight; - } - - public float[] mSecondByteFreq() { - return mSecondByteFreq; - } - - public float mSecondByteStdDev() { - return mSecondByteStdDev; - } - - public float mSecondByteMean() { - return mSecondByteMean; - } - - public float mSecondByteWeight() { - return mSecondByteWeight; - } - - public EUCJPStatistics() { - mFirstByteFreq = new float[]{0.364808F, 0.0F, 0.0F, 0.145325F, 0.304891F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.001835F, 0.010771F, 0.006462F, 0.001157F, 0.002114F, 0.003231F, 0.001356F, 0.00742F, 0.004189F, 0.003231F, 0.003032F, 0.03319F, 0.006303F, 0.006064F, 0.009973F, 0.002354F, 0.00367F, 0.009135F, 0.001675F, 0.002792F, 0.002194F, 0.01472F, 0.011928F, 8.78E-4F, 0.013124F, 0.001077F, 0.009295F, 0.003471F, 0.002872F, 0.002433F, 9.57E-4F, 0.001636F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 8.0E-5F, 2.79E-4F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 8.0E-5F, 0.0F}; - mFirstByteStdDev = 0.050407F; - mFirstByteMean = 0.010638F; - mFirstByteWeight = 0.640871F; - mSecondByteFreq = new float[]{0.002473F, 0.039134F, 0.152745F, 0.009694F, 3.59E-4F, 0.02218F, 7.58E-4F, 0.004308F, 1.6E-4F, 0.002513F, 0.003072F, 0.001316F, 0.00383F, 0.001037F, 0.00359F, 9.57E-4F, 1.6E-4F, 2.39E-4F, 0.006462F, 0.001596F, 0.031554F, 0.001316F, 0.002194F, 0.016555F, 0.003271F, 6.78E-4F, 5.98E-4F, 0.206438F, 7.18E-4F, 0.001077F, 0.00371F, 0.001356F, 0.001356F, 4.39E-4F, 0.004388F, 0.005704F, 8.78E-4F, 0.010172F, 0.007061F, 0.01468F, 6.38E-4F, 0.02573F, 0.002792F, 7.18E-4F, 0.001795F, 0.091551F, 7.58E-4F, 0.003909F, 5.58E-4F, 0.031195F, 0.007061F, 0.001316F, 0.022579F, 0.006981F, 0.00726F, 0.001117F, 2.39E-4F, 0.012127F, 8.78E-4F, 0.00379F, 0.001077F, 7.58E-4F, 0.002114F, 0.002234F, 6.78E-4F, 0.002992F, 0.003311F, 0.023416F, 0.001237F, 0.002753F, 0.005146F, 0.002194F, 0.007021F, 0.008497F, 0.013763F, 0.011768F, 0.006303F, 0.001915F, 6.38E-4F, 0.008776F, 9.18E-4F, 0.003431F, 0.057603F, 4.39E-4F, 4.39E-4F, 7.58E-4F, 0.002872F, 0.001675F, 0.01105F, 0.0F, 2.79E-4F, 0.012127F, 7.18E-4F, 0.00738F}; - mSecondByteStdDev = 0.028247F; - mSecondByteMean = 0.010638F; - mSecondByteWeight = 0.359129F; - } - } - - /** - * - */ - public static class nsEUCJPVerifier extends nsVerifier { - static int[] cclass; - static int[] states; - static int stFactor; - static String charset; - - public int[] cclass() { - return cclass; - } - - public int[] states() { - return states; - } - - public int stFactor() { - return stFactor; - } - - public String charset() { - return charset; - } - - public nsEUCJPVerifier() { - cclass = new int[32]; - cclass[0] = 1145324612; - cclass[1] = 1430537284; - cclass[2] = 1145324612; - cclass[3] = 1145328708; - cclass[4] = 1145324612; - cclass[5] = 1145324612; - cclass[6] = 1145324612; - cclass[7] = 1145324612; - cclass[8] = 1145324612; - cclass[9] = 1145324612; - cclass[10] = 1145324612; - cclass[11] = 1145324612; - cclass[12] = 1145324612; - cclass[13] = 1145324612; - cclass[14] = 1145324612; - cclass[15] = 1145324612; - cclass[16] = 1431655765; - cclass[17] = 827675989; - cclass[18] = 1431655765; - cclass[19] = 1431655765; - cclass[20] = 572662309; - cclass[21] = 572662306; - cclass[22] = 572662306; - cclass[23] = 572662306; - cclass[24] = 572662306; - cclass[25] = 572662306; - cclass[26] = 572662306; - cclass[27] = 572662306; - cclass[28] = 0; - cclass[29] = 0; - cclass[30] = 0; - cclass[31] = 1342177280; - states = new int[5]; - states[0] = 286282563; - states[1] = 572657937; - states[2] = 286265378; - states[3] = 319885329; - states[4] = 4371; - charset = "EUC-JP"; - stFactor = 6; - } - - public boolean isUCS2() { - return false; - } - } - - /** - * - */ - public static class EUCKRStatistics extends nsEUCStatistics { - static float[] mFirstByteFreq; - static float mFirstByteStdDev; - static float mFirstByteMean; - static float mFirstByteWeight; - static float[] mSecondByteFreq; - static float mSecondByteStdDev; - static float mSecondByteMean; - static float mSecondByteWeight; - - public float[] mFirstByteFreq() { - return mFirstByteFreq; - } - - public float mFirstByteStdDev() { - return mFirstByteStdDev; - } - - public float mFirstByteMean() { - return mFirstByteMean; - } - - public float mFirstByteWeight() { - return mFirstByteWeight; - } - - public float[] mSecondByteFreq() { - return mSecondByteFreq; - } - - public float mSecondByteStdDev() { - return mSecondByteStdDev; - } - - public float mSecondByteMean() { - return mSecondByteMean; - } - - public float mSecondByteWeight() { - return mSecondByteWeight; - } - - public EUCKRStatistics() { - mFirstByteFreq = new float[]{0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 4.12E-4F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.057502F, 0.033182F, 0.002267F, 0.016076F, 0.014633F, 0.032976F, 0.004122F, 0.011336F, 0.058533F, 0.024526F, 0.025969F, 0.054411F, 0.01958F, 0.063273F, 0.113974F, 0.029885F, 0.150041F, 0.059151F, 0.002679F, 0.009893F, 0.014839F, 0.026381F, 0.015045F, 0.069456F, 0.08986F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F}; - mFirstByteStdDev = 0.025593F; - mFirstByteMean = 0.010638F; - mFirstByteWeight = 0.647437F; - mSecondByteFreq = new float[]{0.016694F, 0.0F, 0.012778F, 0.030091F, 0.002679F, 0.006595F, 0.001855F, 8.24E-4F, 0.005977F, 0.00474F, 0.003092F, 8.24E-4F, 0.01958F, 0.037304F, 0.008244F, 0.014633F, 0.001031F, 0.0F, 0.003298F, 0.002061F, 0.006183F, 0.005977F, 8.24E-4F, 0.021847F, 0.014839F, 0.052968F, 0.017312F, 0.007626F, 4.12E-4F, 8.24E-4F, 0.011129F, 0.0F, 4.12E-4F, 0.001649F, 0.005977F, 0.065746F, 0.020198F, 0.021434F, 0.014633F, 0.004122F, 0.001649F, 8.24E-4F, 8.24E-4F, 0.051937F, 0.01958F, 0.023289F, 0.026381F, 0.040396F, 0.009068F, 0.001443F, 0.00371F, 0.00742F, 0.001443F, 0.01319F, 0.002885F, 4.12E-4F, 0.003298F, 0.025969F, 4.12E-4F, 4.12E-4F, 0.006183F, 0.003298F, 0.066983F, 0.002679F, 0.002267F, 0.011129F, 4.12E-4F, 0.010099F, 0.015251F, 0.007626F, 0.043899F, 0.00371F, 0.002679F, 0.001443F, 0.010923F, 0.002885F, 0.009068F, 0.019992F, 4.12E-4F, 0.00845F, 0.005153F, 0.0F, 0.010099F, 0.0F, 0.001649F, 0.01216F, 0.011542F, 0.006595F, 0.001855F, 0.010923F, 4.12E-4F, 0.023702F, 0.00371F, 0.001855F}; - mSecondByteStdDev = 0.013937F; - mSecondByteMean = 0.010638F; - mSecondByteWeight = 0.352563F; - } - } - - /** - * - */ - public static class nsEUCKRVerifier extends nsVerifier { - static int[] cclass; - static int[] states; - static int stFactor; - static String charset; - - public int[] cclass() { - return cclass; - } - - public int[] states() { - return states; - } - - public int stFactor() { - return stFactor; - } - - public String charset() { - return charset; - } - - public nsEUCKRVerifier() { - cclass = new int[32]; - cclass[0] = 286331153; - cclass[1] = 1118481; - cclass[2] = 286331153; - cclass[3] = 286327057; - cclass[4] = 286331153; - cclass[5] = 286331153; - cclass[6] = 286331153; - cclass[7] = 286331153; - cclass[8] = 286331153; - cclass[9] = 286331153; - cclass[10] = 286331153; - cclass[11] = 286331153; - cclass[12] = 286331153; - cclass[13] = 286331153; - cclass[14] = 286331153; - cclass[15] = 286331153; - cclass[16] = 0; - cclass[17] = 0; - cclass[18] = 0; - cclass[19] = 0; - cclass[20] = 572662304; - cclass[21] = 858923554; - cclass[22] = 572662306; - cclass[23] = 572662306; - cclass[24] = 572662306; - cclass[25] = 572662322; - cclass[26] = 572662306; - cclass[27] = 572662306; - cclass[28] = 572662306; - cclass[29] = 572662306; - cclass[30] = 572662306; - cclass[31] = 35791394; - states = new int[2]; - states[0] = 286331649; - states[1] = 1122850; - charset = "EUC-KR"; - stFactor = 4; - } - - public boolean isUCS2() { - return false; - } - } - - /** - * - */ - public static class EUCTWStatistics extends nsEUCStatistics { - static float[] mFirstByteFreq; - static float mFirstByteStdDev; - static float mFirstByteMean; - static float mFirstByteWeight; - static float[] mSecondByteFreq; - static float mSecondByteStdDev; - static float mSecondByteMean; - static float mSecondByteWeight; - - public float[] mFirstByteFreq() { - return mFirstByteFreq; - } - - public float mFirstByteStdDev() { - return mFirstByteStdDev; - } - - public float mFirstByteMean() { - return mFirstByteMean; - } - - public float mFirstByteWeight() { - return mFirstByteWeight; - } - - public float[] mSecondByteFreq() { - return mSecondByteFreq; - } - - public float mSecondByteStdDev() { - return mSecondByteStdDev; - } - - public float mSecondByteMean() { - return mSecondByteMean; - } - - public float mSecondByteWeight() { - return mSecondByteWeight; - } - - public EUCTWStatistics() { - mFirstByteFreq = new float[]{0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.119286F, 0.052233F, 0.044126F, 0.052494F, 0.045906F, 0.019038F, 0.032465F, 0.026252F, 0.025502F, 0.015963F, 0.052493F, 0.019256F, 0.015137F, 0.031782F, 0.01737F, 0.018494F, 0.015575F, 0.016621F, 0.007444F, 0.011642F, 0.013916F, 0.019159F, 0.016445F, 0.007851F, 0.011079F, 0.022842F, 0.015513F, 0.010033F, 0.00995F, 0.010347F, 0.013103F, 0.015371F, 0.012502F, 0.007436F, 0.018253F, 0.014134F, 0.008907F, 0.005411F, 0.00957F, 0.013598F, 0.006092F, 0.007409F, 0.008432F, 0.005816F, 0.009349F, 0.005472F, 0.00717F, 0.00742F, 0.003681F, 0.007523F, 0.00461F, 0.006154F, 0.003348F, 0.005074F, 0.005922F, 0.005254F, 0.004682F, 0.002093F, 0.0F}; - mFirstByteStdDev = 0.016681F; - mFirstByteMean = 0.010638F; - mFirstByteWeight = 0.715599F; - mSecondByteFreq = new float[]{0.028933F, 0.011371F, 0.011053F, 0.007232F, 0.010192F, 0.004093F, 0.015043F, 0.011752F, 0.022387F, 0.00841F, 0.012448F, 0.007473F, 0.003594F, 0.007139F, 0.018912F, 0.006083F, 0.003302F, 0.010215F, 0.008791F, 0.024236F, 0.014107F, 0.014108F, 0.010303F, 0.009728F, 0.007877F, 0.009719F, 0.007952F, 0.021028F, 0.005764F, 0.009341F, 0.006591F, 0.012517F, 0.005921F, 0.008982F, 0.008771F, 0.012802F, 0.005926F, 0.008342F, 0.003086F, 0.006843F, 0.007576F, 0.004734F, 0.016404F, 0.008803F, 0.008071F, 0.005349F, 0.008566F, 0.01084F, 0.015401F, 0.031904F, 0.00867F, 0.011479F, 0.010936F, 0.007617F, 0.008995F, 0.008114F, 0.008658F, 0.005934F, 0.010452F, 0.009142F, 0.004519F, 0.008339F, 0.007476F, 0.007027F, 0.006025F, 0.021804F, 0.024248F, 0.015895F, 0.003768F, 0.010171F, 0.010007F, 0.010178F, 0.008316F, 0.006832F, 0.006364F, 0.009141F, 0.009148F, 0.012081F, 0.011914F, 0.004464F, 0.014257F, 0.006907F, 0.011292F, 0.018622F, 0.008149F, 0.004636F, 0.006612F, 0.013478F, 0.012614F, 0.005186F, 0.048285F, 0.006816F, 0.006743F, 0.008671F}; - mSecondByteStdDev = 0.00663F; - mSecondByteMean = 0.010638F; - mSecondByteWeight = 0.284401F; - } - } - - /** - * - */ - public static class nsEUCTWVerifier extends nsVerifier { - static int[] cclass; - static int[] states; - static int stFactor; - static String charset; - - public int[] cclass() { - return cclass; - } - - public int[] states() { - return states; - } - - public int stFactor() { - return stFactor; - } - - public String charset() { - return charset; - } - - public nsEUCTWVerifier() { - cclass = new int[32]; - cclass[0] = 572662306; - cclass[1] = 2236962; - cclass[2] = 572662306; - cclass[3] = 572654114; - cclass[4] = 572662306; - cclass[5] = 572662306; - cclass[6] = 572662306; - cclass[7] = 572662306; - cclass[8] = 572662306; - cclass[9] = 572662306; - cclass[10] = 572662306; - cclass[11] = 572662306; - cclass[12] = 572662306; - cclass[13] = 572662306; - cclass[14] = 572662306; - cclass[15] = 572662306; - cclass[16] = 0; - cclass[17] = 100663296; - cclass[18] = 0; - cclass[19] = 0; - cclass[20] = 1145324592; - cclass[21] = 286331221; - cclass[22] = 286331153; - cclass[23] = 286331153; - cclass[24] = 858985233; - cclass[25] = 858993459; - cclass[26] = 858993459; - cclass[27] = 858993459; - cclass[28] = 858993459; - cclass[29] = 858993459; - cclass[30] = 858993459; - cclass[31] = 53687091; - states = new int[6]; - states[0] = 338898961; - states[1] = 571543825; - states[2] = 269623842; - states[3] = 286330880; - states[4] = 1052949; - states[5] = 16; - charset = "x-euc-tw"; - stFactor = 7; - } - - public boolean isUCS2() { - return false; - } - } - - /** - * - */ - public static class Big5Statistics extends nsEUCStatistics { - static float[] mFirstByteFreq; - static float mFirstByteStdDev; - static float mFirstByteMean; - static float mFirstByteWeight; - static float[] mSecondByteFreq; - static float mSecondByteStdDev; - static float mSecondByteMean; - static float mSecondByteWeight; - - public float[] mFirstByteFreq() { - return mFirstByteFreq; - } - - public float mFirstByteStdDev() { - return mFirstByteStdDev; - } - - public float mFirstByteMean() { - return mFirstByteMean; - } - - public float mFirstByteWeight() { - return mFirstByteWeight; - } - - public float[] mSecondByteFreq() { - return mSecondByteFreq; - } - - public float mSecondByteStdDev() { - return mSecondByteStdDev; - } - - public float mSecondByteMean() { - return mSecondByteMean; - } - - public float mSecondByteWeight() { - return mSecondByteWeight; - } - - public Big5Statistics() { - mFirstByteFreq = new float[]{0.0F, 0.0F, 0.0F, 0.114427F, 0.061058F, 0.075598F, 0.048386F, 0.063966F, 0.027094F, 0.095787F, 0.029525F, 0.031331F, 0.036915F, 0.021805F, 0.019349F, 0.037496F, 0.018068F, 0.01276F, 0.030053F, 0.017339F, 0.016731F, 0.019501F, 0.01124F, 0.032973F, 0.016658F, 0.015872F, 0.021458F, 0.012378F, 0.017003F, 0.020802F, 0.012454F, 0.009239F, 0.012829F, 0.007922F, 0.010079F, 0.009815F, 0.010104F, 0.0F, 0.0F, 0.0F, 5.3E-5F, 3.5E-5F, 1.05E-4F, 3.1E-5F, 8.8E-5F, 2.7E-5F, 2.7E-5F, 2.6E-5F, 3.5E-5F, 2.4E-5F, 3.4E-5F, 3.75E-4F, 2.5E-5F, 2.8E-5F, 2.0E-5F, 2.4E-5F, 2.8E-5F, 3.1E-5F, 5.9E-5F, 4.0E-5F, 3.0E-5F, 7.9E-5F, 3.7E-5F, 4.0E-5F, 2.3E-5F, 3.0E-5F, 2.7E-5F, 6.4E-5F, 2.0E-5F, 2.7E-5F, 2.5E-5F, 7.4E-5F, 1.9E-5F, 2.3E-5F, 2.1E-5F, 1.8E-5F, 1.7E-5F, 3.5E-5F, 2.1E-5F, 1.9E-5F, 2.5E-5F, 1.7E-5F, 3.7E-5F, 1.8E-5F, 1.8E-5F, 1.9E-5F, 2.2E-5F, 3.3E-5F, 3.2E-5F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F}; - mFirstByteStdDev = 0.020606F; - mFirstByteMean = 0.010638F; - mFirstByteWeight = 0.675261F; - mSecondByteFreq = new float[]{0.020256F, 0.003293F, 0.045811F, 0.01665F, 0.007066F, 0.004146F, 0.009229F, 0.007333F, 0.003296F, 0.005239F, 0.008282F, 0.003791F, 0.006116F, 0.003536F, 0.004024F, 0.016654F, 0.009334F, 0.005429F, 0.033392F, 0.006121F, 0.008983F, 0.002801F, 0.004221F, 0.010357F, 0.014695F, 0.077937F, 0.006314F, 0.00402F, 0.007331F, 0.00715F, 0.005341F, 0.009195F, 0.00535F, 0.005698F, 0.004472F, 0.007242F, 0.004039F, 0.011154F, 0.016184F, 0.004741F, 0.012814F, 0.007679F, 0.008045F, 0.016631F, 0.009451F, 0.016487F, 0.007287F, 0.012688F, 0.017421F, 0.013205F, 0.03148F, 0.003404F, 0.009149F, 0.008921F, 0.007514F, 0.008683F, 0.008203F, 0.031403F, 0.011733F, 0.015617F, 0.015306F, 0.004004F, 0.010899F, 0.009961F, 0.008388F, 0.01092F, 0.003925F, 0.008585F, 0.009108F, 0.015546F, 0.004659F, 0.006934F, 0.007023F, 0.020252F, 0.005387F, 0.024704F, 0.006963F, 0.002625F, 0.009512F, 0.002971F, 0.008233F, 0.01F, 0.011973F, 0.010553F, 0.005945F, 0.006349F, 0.009401F, 0.008577F, 0.008186F, 0.008159F, 0.005033F, 0.008714F, 0.010614F, 0.006554F}; - mSecondByteStdDev = 0.009909F; - mSecondByteMean = 0.010638F; - mSecondByteWeight = 0.324739F; - } - } - - /** - * - */ - public static class nsBIG5Verifier extends nsVerifier { - static int[] cclass; - static int[] states; - static int stFactor; - static String charset; - - public int[] cclass() { - return cclass; - } - - public int[] states() { - return states; - } - - public int stFactor() { - return stFactor; - } - - public String charset() { - return charset; - } - - public nsBIG5Verifier() { - cclass = new int[32]; - cclass[0] = 286331153; - cclass[1] = 1118481; - cclass[2] = 286331153; - cclass[3] = 286327057; - cclass[4] = 286331153; - cclass[5] = 286331153; - cclass[6] = 286331153; - cclass[7] = 286331153; - cclass[8] = 572662306; - cclass[9] = 572662306; - cclass[10] = 572662306; - cclass[11] = 572662306; - cclass[12] = 572662306; - cclass[13] = 572662306; - cclass[14] = 572662306; - cclass[15] = 304226850; - cclass[16] = 1145324612; - cclass[17] = 1145324612; - cclass[18] = 1145324612; - cclass[19] = 1145324612; - cclass[20] = 858993460; - cclass[21] = 858993459; - cclass[22] = 858993459; - cclass[23] = 858993459; - cclass[24] = 858993459; - cclass[25] = 858993459; - cclass[26] = 858993459; - cclass[27] = 858993459; - cclass[28] = 858993459; - cclass[29] = 858993459; - cclass[30] = 858993459; - cclass[31] = 53687091; - states = new int[3]; - states[0] = 286339073; - states[1] = 304226833; - states[2] = 1; - charset = "Big5"; - stFactor = 5; - } - - public boolean isUCS2() { - return false; - } - } - - /** - * - */ - public static class GB2312Statistics extends nsEUCStatistics { - static float[] mFirstByteFreq; - static float mFirstByteStdDev; - static float mFirstByteMean; - static float mFirstByteWeight; - static float[] mSecondByteFreq; - static float mSecondByteStdDev; - static float mSecondByteMean; - static float mSecondByteWeight; - - public float[] mFirstByteFreq() { - return mFirstByteFreq; - } - - public float mFirstByteStdDev() { - return mFirstByteStdDev; - } - - public float mFirstByteMean() { - return mFirstByteMean; - } - - public float mFirstByteWeight() { - return mFirstByteWeight; - } - - public float[] mSecondByteFreq() { - return mSecondByteFreq; - } - - public float mSecondByteStdDev() { - return mSecondByteStdDev; - } - - public float mSecondByteMean() { - return mSecondByteMean; - } - - public float mSecondByteWeight() { - return mSecondByteWeight; - } - - public GB2312Statistics() { - mFirstByteFreq = new float[]{0.011628F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.011628F, 0.012403F, 0.009302F, 0.003876F, 0.017829F, 0.037209F, 0.008527F, 0.010078F, 0.01938F, 0.054264F, 0.010078F, 0.041085F, 0.02093F, 0.018605F, 0.010078F, 0.013178F, 0.016279F, 0.006202F, 0.009302F, 0.017054F, 0.011628F, 0.008527F, 0.004651F, 0.006202F, 0.017829F, 0.024806F, 0.020155F, 0.013953F, 0.032558F, 0.035659F, 0.068217F, 0.010853F, 0.036434F, 0.117054F, 0.027907F, 0.100775F, 0.010078F, 0.017829F, 0.062016F, 0.012403F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.00155F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F}; - mFirstByteStdDev = 0.020081F; - mFirstByteMean = 0.010638F; - mFirstByteWeight = 0.586533F; - mSecondByteFreq = new float[]{0.006202F, 0.031008F, 0.005426F, 0.003101F, 0.00155F, 0.003101F, 0.082171F, 0.014729F, 0.006977F, 0.00155F, 0.013953F, 0.0F, 0.013953F, 0.010078F, 0.008527F, 0.006977F, 0.004651F, 0.003101F, 0.003101F, 0.003101F, 0.008527F, 0.003101F, 0.005426F, 0.005426F, 0.005426F, 0.003101F, 0.00155F, 0.006202F, 0.014729F, 0.010853F, 0.0F, 0.011628F, 0.0F, 0.031783F, 0.013953F, 0.030233F, 0.039535F, 0.008527F, 0.015504F, 0.0F, 0.003101F, 0.008527F, 0.016279F, 0.005426F, 0.00155F, 0.013953F, 0.013953F, 0.044961F, 0.003101F, 0.004651F, 0.006977F, 0.00155F, 0.005426F, 0.012403F, 0.00155F, 0.015504F, 0.0F, 0.006202F, 0.00155F, 0.0F, 0.007752F, 0.006977F, 0.00155F, 0.009302F, 0.011628F, 0.004651F, 0.010853F, 0.012403F, 0.017829F, 0.005426F, 0.024806F, 0.0F, 0.006202F, 0.0F, 0.082171F, 0.015504F, 0.004651F, 0.0F, 0.006977F, 0.004651F, 0.0F, 0.008527F, 0.012403F, 0.004651F, 0.003876F, 0.003101F, 0.022481F, 0.024031F, 0.00155F, 0.047287F, 0.009302F, 0.00155F, 0.005426F, 0.017054F}; - mSecondByteStdDev = 0.014156F; - mSecondByteMean = 0.010638F; - mSecondByteWeight = 0.413467F; - } - } - - /** - * - */ - public static class nsGB2312Verifier extends nsVerifier { - static int[] cclass; - static int[] states; - static int stFactor; - static String charset; - - public int[] cclass() { - return cclass; - } - - public int[] states() { - return states; - } - - public int stFactor() { - return stFactor; - } - - public String charset() { - return charset; - } - - public nsGB2312Verifier() { - cclass = new int[32]; - cclass[0] = 286331153; - cclass[1] = 1118481; - cclass[2] = 286331153; - cclass[3] = 286327057; - cclass[4] = 286331153; - cclass[5] = 286331153; - cclass[6] = 286331153; - cclass[7] = 286331153; - cclass[8] = 286331153; - cclass[9] = 286331153; - cclass[10] = 286331153; - cclass[11] = 286331153; - cclass[12] = 286331153; - cclass[13] = 286331153; - cclass[14] = 286331153; - cclass[15] = 286331153; - cclass[16] = 0; - cclass[17] = 0; - cclass[18] = 0; - cclass[19] = 0; - cclass[20] = 572662304; - cclass[21] = 858993442; - cclass[22] = 572662306; - cclass[23] = 572662306; - cclass[24] = 572662306; - cclass[25] = 572662306; - cclass[26] = 572662306; - cclass[27] = 572662306; - cclass[28] = 572662306; - cclass[29] = 572662306; - cclass[30] = 572662306; - cclass[31] = 35791394; - states = new int[2]; - states[0] = 286331649; - states[1] = 1122850; - charset = "GB2312"; - stFactor = 4; - } - - public boolean isUCS2() { - return false; - } - } - - /** - * - */ - public static class nsGB18030Verifier extends nsVerifier { - static int[] cclass; - static int[] states; - static int stFactor; - static String charset; - - public int[] cclass() { - return cclass; - } - - public int[] states() { - return states; - } - - public int stFactor() { - return stFactor; - } - - public String charset() { - return charset; - } - - public nsGB18030Verifier() { - cclass = new int[32]; - cclass[0] = 286331153; - cclass[1] = 1118481; - cclass[2] = 286331153; - cclass[3] = 286327057; - cclass[4] = 286331153; - cclass[5] = 286331153; - cclass[6] = 858993459; - cclass[7] = 286331187; - cclass[8] = 572662306; - cclass[9] = 572662306; - cclass[10] = 572662306; - cclass[11] = 572662306; - cclass[12] = 572662306; - cclass[13] = 572662306; - cclass[14] = 572662306; - cclass[15] = 1109533218; - cclass[16] = 1717986917; - cclass[17] = 1717986918; - cclass[18] = 1717986918; - cclass[19] = 1717986918; - cclass[20] = 1717986918; - cclass[21] = 1717986918; - cclass[22] = 1717986918; - cclass[23] = 1717986918; - cclass[24] = 1717986918; - cclass[25] = 1717986918; - cclass[26] = 1717986918; - cclass[27] = 1717986918; - cclass[28] = 1717986918; - cclass[29] = 1717986918; - cclass[30] = 1717986918; - cclass[31] = 107374182; - states = new int[6]; - states[0] = 318767105; - states[1] = 571543825; - states[2] = 17965602; - states[3] = 286326804; - states[4] = 303109393; - states[5] = 17; - charset = "GB18030"; - stFactor = 7; - } - - public boolean isUCS2() { - return false; - } - } - - /** - * - */ - public static class nsISO2022CNVerifier extends nsVerifier { - static int[] cclass; - static int[] states; - static int stFactor; - static String charset; - - public int[] cclass() { - return cclass; - } - - public int[] states() { - return states; - } - - public int stFactor() { - return stFactor; - } - - public String charset() { - return charset; - } - - public nsISO2022CNVerifier() { - cclass = new int[32]; - cclass[0] = 2; - cclass[1] = 0; - cclass[2] = 0; - cclass[3] = 4096; - cclass[4] = 0; - cclass[5] = 48; - cclass[6] = 0; - cclass[7] = 0; - cclass[8] = 16384; - cclass[9] = 0; - cclass[10] = 0; - cclass[11] = 0; - cclass[12] = 0; - cclass[13] = 0; - cclass[14] = 0; - cclass[15] = 0; - cclass[16] = 572662306; - cclass[17] = 572662306; - cclass[18] = 572662306; - cclass[19] = 572662306; - cclass[20] = 572662306; - cclass[21] = 572662306; - cclass[22] = 572662306; - cclass[23] = 572662306; - cclass[24] = 572662306; - cclass[25] = 572662306; - cclass[26] = 572662306; - cclass[27] = 572662306; - cclass[28] = 572662306; - cclass[29] = 572662306; - cclass[30] = 572662306; - cclass[31] = 572662306; - states = new int[8]; - states[0] = 304; - states[1] = 286331152; - states[2] = 572662289; - states[3] = 336663074; - states[4] = 286335249; - states[5] = 286331237; - states[6] = 286335249; - states[7] = 18944273; - charset = "ISO-2022-CN"; - stFactor = 9; - } - - public boolean isUCS2() { - return false; - } - } - - /** - * - */ - public static class nsISO2022JPVerifier extends nsVerifier { - static int[] cclass; - static int[] states; - static int stFactor; - static String charset; - - public int[] cclass() { - return cclass; - } - - public int[] states() { - return states; - } - - public int stFactor() { - return stFactor; - } - - public String charset() { - return charset; - } - - public nsISO2022JPVerifier() { - cclass = new int[32]; - cclass[0] = 2; - cclass[1] = 570425344; - cclass[2] = 0; - cclass[3] = 4096; - cclass[4] = 458752; - cclass[5] = 3; - cclass[6] = 0; - cclass[7] = 0; - cclass[8] = 1030; - cclass[9] = 1280; - cclass[10] = 0; - cclass[11] = 0; - cclass[12] = 0; - cclass[13] = 0; - cclass[14] = 0; - cclass[15] = 0; - cclass[16] = 572662306; - cclass[17] = 572662306; - cclass[18] = 572662306; - cclass[19] = 572662306; - cclass[20] = 572662306; - cclass[21] = 572662306; - cclass[22] = 572662306; - cclass[23] = 572662306; - cclass[24] = 572662306; - cclass[25] = 572662306; - cclass[26] = 572662306; - cclass[27] = 572662306; - cclass[28] = 572662306; - cclass[29] = 572662306; - cclass[30] = 572662306; - cclass[31] = 572662306; - states = new int[6]; - states[0] = 304; - states[1] = 286331153; - states[2] = 572662306; - states[3] = 1091653905; - states[4] = 303173905; - states[5] = 287445265; - charset = "ISO-2022-JP"; - stFactor = 8; - } - - public boolean isUCS2() { - return false; - } - } - - /** - * - */ - public static class nsISO2022KRVerifier extends nsVerifier { - static int[] cclass; - static int[] states; - static int stFactor; - static String charset; - - public int[] cclass() { - return cclass; - } - - public int[] states() { - return states; - } - - public int stFactor() { - return stFactor; - } - - public String charset() { - return charset; - } - - public nsISO2022KRVerifier() { - cclass = new int[32]; - cclass[0] = 2; - cclass[1] = 0; - cclass[2] = 0; - cclass[3] = 4096; - cclass[4] = 196608; - cclass[5] = 64; - cclass[6] = 0; - cclass[7] = 0; - cclass[8] = 20480; - cclass[9] = 0; - cclass[10] = 0; - cclass[11] = 0; - cclass[12] = 0; - cclass[13] = 0; - cclass[14] = 0; - cclass[15] = 0; - cclass[16] = 572662306; - cclass[17] = 572662306; - cclass[18] = 572662306; - cclass[19] = 572662306; - cclass[20] = 572662306; - cclass[21] = 572662306; - cclass[22] = 572662306; - cclass[23] = 572662306; - cclass[24] = 572662306; - cclass[25] = 572662306; - cclass[26] = 572662306; - cclass[27] = 572662306; - cclass[28] = 572662306; - cclass[29] = 572662306; - cclass[30] = 572662306; - cclass[31] = 572662306; - states = new int[5]; - states[0] = 285212976; - states[1] = 572657937; - states[2] = 289476898; - states[3] = 286593297; - states[4] = 8465; - charset = "ISO-2022-KR"; - stFactor = 6; - } - - public boolean isUCS2() { - return false; - } - } - - /** - * - */ - public static class nsUCS2BEVerifier extends nsVerifier { - static int[] cclass; - static int[] states; - static int stFactor; - static String charset; - - public int[] cclass() { - return cclass; - } - - public int[] states() { - return states; - } - - public int stFactor() { - return stFactor; - } - - public String charset() { - return charset; - } - - public nsUCS2BEVerifier() { - cclass = new int[32]; - cclass[0] = 0; - cclass[1] = 2097408; - cclass[2] = 0; - cclass[3] = 12288; - cclass[4] = 0; - cclass[5] = 3355440; - cclass[6] = 0; - cclass[7] = 0; - cclass[8] = 0; - cclass[9] = 0; - cclass[10] = 0; - cclass[11] = 0; - cclass[12] = 0; - cclass[13] = 0; - cclass[14] = 0; - cclass[15] = 0; - cclass[16] = 0; - cclass[17] = 0; - cclass[18] = 0; - cclass[19] = 0; - cclass[20] = 0; - cclass[21] = 0; - cclass[22] = 0; - cclass[23] = 0; - cclass[24] = 0; - cclass[25] = 0; - cclass[26] = 0; - cclass[27] = 0; - cclass[28] = 0; - cclass[29] = 0; - cclass[30] = 0; - cclass[31] = 1409286144; - states = new int[7]; - states[0] = 288626549; - states[1] = 572657937; - states[2] = 291923490; - states[3] = 1713792614; - states[4] = 393569894; - states[5] = 1717659269; - states[6] = 1140326; - charset = "UTF-16BE"; - stFactor = 6; - } - - public boolean isUCS2() { - return true; - } - } - - /** - * - */ - public static class nsUCS2LEVerifier extends nsVerifier { - static int[] cclass; - static int[] states; - static int stFactor; - static String charset; - - public int[] cclass() { - return cclass; - } - - public int[] states() { - return states; - } - - public int stFactor() { - return stFactor; - } - - public String charset() { - return charset; - } - - public nsUCS2LEVerifier() { - cclass = new int[32]; - cclass[0] = 0; - cclass[1] = 2097408; - cclass[2] = 0; - cclass[3] = 12288; - cclass[4] = 0; - cclass[5] = 3355440; - cclass[6] = 0; - cclass[7] = 0; - cclass[8] = 0; - cclass[9] = 0; - cclass[10] = 0; - cclass[11] = 0; - cclass[12] = 0; - cclass[13] = 0; - cclass[14] = 0; - cclass[15] = 0; - cclass[16] = 0; - cclass[17] = 0; - cclass[18] = 0; - cclass[19] = 0; - cclass[20] = 0; - cclass[21] = 0; - cclass[22] = 0; - cclass[23] = 0; - cclass[24] = 0; - cclass[25] = 0; - cclass[26] = 0; - cclass[27] = 0; - cclass[28] = 0; - cclass[29] = 0; - cclass[30] = 0; - cclass[31] = 1409286144; - states = new int[7]; - states[0] = 288647014; - states[1] = 572657937; - states[2] = 303387938; - states[3] = 1712657749; - states[4] = 357927015; - states[5] = 1427182933; - states[6] = 1381717; - charset = "UTF-16LE"; - stFactor = 6; - } - - public boolean isUCS2() { - return true; - } - } - - /** - * - */ - public static class nsCP1252Verifier extends nsVerifier { - static int[] cclass; - static int[] states; - static int stFactor; - static String charset; - - public int[] cclass() { - return cclass; - } - - public int[] states() { - return states; - } - - public int stFactor() { - return stFactor; - } - - public String charset() { - return charset; - } - - public nsCP1252Verifier() { - cclass = new int[32]; - cclass[0] = 572662305; - cclass[1] = 2236962; - cclass[2] = 572662306; - cclass[3] = 572654114; - cclass[4] = 572662306; - cclass[5] = 572662306; - cclass[6] = 572662306; - cclass[7] = 572662306; - cclass[8] = 572662306; - cclass[9] = 572662306; - cclass[10] = 572662306; - cclass[11] = 572662306; - cclass[12] = 572662306; - cclass[13] = 572662306; - cclass[14] = 572662306; - cclass[15] = 572662306; - cclass[16] = 572662274; - cclass[17] = 16851234; - cclass[18] = 572662304; - cclass[19] = 285286690; - cclass[20] = 572662306; - cclass[21] = 572662306; - cclass[22] = 572662306; - cclass[23] = 572662306; - cclass[24] = 286331153; - cclass[25] = 286331153; - cclass[26] = 554766609; - cclass[27] = 286331153; - cclass[28] = 286331153; - cclass[29] = 286331153; - cclass[30] = 554766609; - cclass[31] = 286331153; - states = new int[3]; - states[0] = 571543601; - states[1] = 340853778; - states[2] = 65; - charset = "windows-1252"; - stFactor = 3; - } - - public boolean isUCS2() { - return false; - } - } - - /** - * - */ - public static class nsHZVerifier extends nsVerifier { - static int[] cclass; - static int[] states; - static int stFactor; - static String charset; - - public int[] cclass() { - return cclass; - } - - public int[] states() { - return states; - } - - public int stFactor() { - return stFactor; - } - - public String charset() { - return charset; - } - - public nsHZVerifier() { - cclass = new int[32]; - cclass[0] = 1; - cclass[1] = 0; - cclass[2] = 0; - cclass[3] = 4096; - cclass[4] = 0; - cclass[5] = 0; - cclass[6] = 0; - cclass[7] = 0; - cclass[8] = 0; - cclass[9] = 0; - cclass[10] = 0; - cclass[11] = 0; - cclass[12] = 0; - cclass[13] = 0; - cclass[14] = 0; - cclass[15] = 38813696; - cclass[16] = 286331153; - cclass[17] = 286331153; - cclass[18] = 286331153; - cclass[19] = 286331153; - cclass[20] = 286331153; - cclass[21] = 286331153; - cclass[22] = 286331153; - cclass[23] = 286331153; - cclass[24] = 286331153; - cclass[25] = 286331153; - cclass[26] = 286331153; - cclass[27] = 286331153; - cclass[28] = 286331153; - cclass[29] = 286331153; - cclass[30] = 286331153; - cclass[31] = 286331153; - states = new int[6]; - states[0] = 285213456; - states[1] = 572657937; - states[2] = 335548706; - states[3] = 341120533; - states[4] = 336872468; - states[5] = 36; - charset = "HZ-GB-2312"; - stFactor = 6; - } - - public boolean isUCS2() { - return false; - } - } - - /** - * - */ - public static class nsSJISVerifier extends nsVerifier { - static int[] cclass; - static int[] states; - static int stFactor; - static String charset; - - public int[] cclass() { - return cclass; - } - - public int[] states() { - return states; - } - - public int stFactor() { - return stFactor; - } - - public String charset() { - return charset; - } - - public nsSJISVerifier() { - cclass = new int[32]; - cclass[0] = 286331152; - cclass[1] = 1118481; - cclass[2] = 286331153; - cclass[3] = 286327057; - cclass[4] = 286331153; - cclass[5] = 286331153; - cclass[6] = 286331153; - cclass[7] = 286331153; - cclass[8] = 572662306; - cclass[9] = 572662306; - cclass[10] = 572662306; - cclass[11] = 572662306; - cclass[12] = 572662306; - cclass[13] = 572662306; - cclass[14] = 572662306; - cclass[15] = 304226850; - cclass[16] = 858993459; - cclass[17] = 858993459; - cclass[18] = 858993459; - cclass[19] = 858993459; - cclass[20] = 572662308; - cclass[21] = 572662306; - cclass[22] = 572662306; - cclass[23] = 572662306; - cclass[24] = 572662306; - cclass[25] = 572662306; - cclass[26] = 572662306; - cclass[27] = 572662306; - cclass[28] = 858993459; - cclass[29] = 1145393971; - cclass[30] = 1145324612; - cclass[31] = 279620; - states = new int[3]; - states[0] = 286339073; - states[1] = 572657937; - states[2] = 4386; - charset = "Shift_JIS"; - stFactor = 6; - } - - public boolean isUCS2() { - return false; - } - } - - /** - * - */ - public static class nsUTF8Verifier extends nsVerifier { - static int[] cclass; - static int[] states; - static int stFactor; - static String charset; - - public int[] cclass() { - return cclass; - } - - public int[] states() { - return states; - } - - public int stFactor() { - return stFactor; - } - - public String charset() { - return charset; - } - - public nsUTF8Verifier() { - cclass = new int[32]; - cclass[0] = 286331153; - cclass[1] = 1118481; - cclass[2] = 286331153; - cclass[3] = 286327057; - cclass[4] = 286331153; - cclass[5] = 286331153; - cclass[6] = 286331153; - cclass[7] = 286331153; - cclass[8] = 286331153; - cclass[9] = 286331153; - cclass[10] = 286331153; - cclass[11] = 286331153; - cclass[12] = 286331153; - cclass[13] = 286331153; - cclass[14] = 286331153; - cclass[15] = 286331153; - cclass[16] = 858989090; - cclass[17] = 1145324612; - cclass[18] = 1145324612; - cclass[19] = 1145324612; - cclass[20] = 1431655765; - cclass[21] = 1431655765; - cclass[22] = 1431655765; - cclass[23] = 1431655765; - cclass[24] = 1717986816; - cclass[25] = 1717986918; - cclass[26] = 1717986918; - cclass[27] = 1717986918; - cclass[28] = -2004318073; - cclass[29] = -2003269496; - cclass[30] = -1145324614; - cclass[31] = 16702940; - states = new int[26]; - states[0] = -1408167679; - states[1] = 878082233; - states[2] = 286331153; - states[3] = 286331153; - states[4] = 572662306; - states[5] = 572662306; - states[6] = 290805009; - states[7] = 286331153; - states[8] = 290803985; - states[9] = 286331153; - states[10] = 293041937; - states[11] = 286331153; - states[12] = 293015825; - states[13] = 286331153; - states[14] = 295278865; - states[15] = 286331153; - states[16] = 294719761; - states[17] = 286331153; - states[18] = 298634257; - states[19] = 286331153; - states[20] = 297865489; - states[21] = 286331153; - states[22] = 287099921; - states[23] = 286331153; - states[24] = 285212689; - states[25] = 286331153; - charset = "UTF-8"; - stFactor = 16; - } - - public boolean isUCS2() { - return false; - } - } - -} diff --git a/modules/common/core/utils/JSONUtil.java b/modules/common/core/utils/JSONUtil.java deleted file mode 100644 index 8d63168..0000000 --- a/modules/common/core/utils/JSONUtil.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.gxwebsoft.common.core.utils; - -import cn.hutool.core.util.StrUtil; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.ObjectWriter; - -/** - * JSON解析工具类 - * - * @author WebSoft - * @since 2017-06-10 10:10:39 - */ -public class JSONUtil { - private static final ObjectMapper objectMapper = new ObjectMapper(); - private static final ObjectWriter objectWriter = objectMapper.writerWithDefaultPrettyPrinter(); - - /** - * 对象转json字符串 - * - * @param value 对象 - * @return String - */ - public static String toJSONString(Object value) { - return toJSONString(value, false); - } - - /** - * 对象转json字符串 - * - * @param value 对象 - * @param pretty 是否格式化输出 - * @return String - */ - public static String toJSONString(Object value, boolean pretty) { - if (value != null) { - if (value instanceof String) { - return (String) value; - } - try { - if (pretty) { - return objectWriter.writeValueAsString(value); - } - return objectMapper.writeValueAsString(value); - } catch (Exception e) { - e.printStackTrace(); - } - } - return null; - } - - /** - * json字符串转对象 - * - * @param json String - * @param clazz Class - * @return T - */ - public static T parseObject(String json, Class clazz) { - if (StrUtil.isNotBlank(json) && clazz != null) { - try { - return objectMapper.readValue(json, clazz); - } catch (Exception e) { - e.printStackTrace(); - } - } - return null; - } - -} diff --git a/modules/common/core/utils/MyQrCodeUtil.java b/modules/common/core/utils/MyQrCodeUtil.java deleted file mode 100644 index db2077f..0000000 --- a/modules/common/core/utils/MyQrCodeUtil.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.gxwebsoft.common.core.utils; - -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.io.FileUtil; -import cn.hutool.extra.qrcode.QrCodeUtil; -import cn.hutool.extra.qrcode.QrConfig; - -import javax.imageio.ImageIO; -import java.awt.image.BufferedImage; -import java.io.IOException; -import java.net.URL; - -/** - * 常用工具方法 - * - * @author WebSoft - * @since 2017-06-10 10:10:22 - */ -public class MyQrCodeUtil { - private static final String logoUrl = "https://file.wsdns.cn/20230430/6fa31aca3b0d47af98a149cf2dd26a4f.jpeg"; - - /** - * 生成二维码 - * 用户ID - */ - public static String getCode(Integer loginUserId) throws IOException { - return createQrCode(loginUserId,loginUserId.toString()); - } - - /** - * 生成二维码 - * 支持自定义类型和内容 - */ - public String getCode(Integer loginUserId,String content) throws IOException { - return createQrCode(loginUserId,content); - } - - /** - * 生成带水印的二维码 - * @return https://file.gxwebsoft.com/qrcode/870.jpg?v=1682925307569 - */ - public static String createQrCode(Integer userId,String content) throws IOException { - // 将URL转为BufferedImage - BufferedImage bufferedImage = ImageIO.read(new URL(logoUrl)); - // 生成二维码 - QrConfig config = new QrConfig(300, 300); - // 设置边距，既二维码和背景之间的边距 - config.setMargin(1); - // 附带小logo - config.setImg(bufferedImage); - // 保存路径 -// String filePath = "/Users/gxwebsoft/Documents/uploads/" + "file/qrcode/" + userId + ".jpg"; - String filePath = "/www/wwwroot/file.ws/" + "file/qrcode/" + userId + ".jpg"; - String qrcodeUrl = "https://file.websoft.top/qrcode/" + userId + ".jpg" + "?v=" + DateUtil.current(); - // 生成二维码 - System.out.println("config = " + config); - System.out.println("con = " + content); - System.out.println("filePath = " + filePath); - QrCodeUtil.generate(content, config, FileUtil.file(filePath)); - return qrcodeUrl; - } -} diff --git a/modules/common/core/utils/OpenOfficeUtil.java b/modules/common/core/utils/OpenOfficeUtil.java deleted file mode 100644 index cca3990..0000000 --- a/modules/common/core/utils/OpenOfficeUtil.java +++ /dev/null @@ -1,124 +0,0 @@ -package com.gxwebsoft.common.core.utils; - -import cn.hutool.core.util.StrUtil; -import org.artofsolving.jodconverter.OfficeDocumentConverter; -import org.artofsolving.jodconverter.office.DefaultOfficeManagerConfiguration; -import org.artofsolving.jodconverter.office.OfficeManager; - -import java.io.File; -import java.util.Arrays; -import java.util.Base64; - -/** - * OpenOfficeUtil - * - * @author WebSoft - * @since 2018-12-14 08:38:19 - */ -public class OpenOfficeUtil { - // 支持转换pdf的文件后缀列表 - private static final String[] CAN_CONVERTER_FILES = new String[]{ - "doc", "docx", "xls", "xlsx", "ppt", "pptx" - }; - - /** - * 文件转pdf - * - * @param filePath 源文件路径 - * @param outDir 输出目录 - * @param officeHome OpenOffice安装路径 - * @return File - */ - public static File converterToPDF(String filePath, String outDir, String officeHome) { - return converterToPDF(filePath, outDir, officeHome, true); - } - - /** - * 文件转pdf - * - * @param filePath 源文件路径 - * @param outDir 输出目录 - * @param officeHome OpenOffice安装路径 - * @param cache 是否使用上次转换过的文件 - * @return File - */ - public static File converterToPDF(String filePath, String outDir, String officeHome, boolean cache) { - if (StrUtil.isBlank(filePath)) { - return null; - } - File srcFile = new File(filePath); - if (!srcFile.exists()) { - return null; - } - // 是否转换过 - String outPath = Base64.getEncoder().encodeToString(filePath.getBytes()) - .replace("/", "-").replace("+", "-"); - File outFile = new File(outDir, outPath + ".pdf"); - if (cache && outFile.exists()) { - return outFile; - } - // 转换 - OfficeManager officeManager = null; - try { - officeManager = getOfficeManager(officeHome); - OfficeDocumentConverter converter = new OfficeDocumentConverter(officeManager); - return converterFile(srcFile, outFile, converter); - } catch (Exception e) { - e.printStackTrace(); - } finally { - if (officeManager != null) { - officeManager.stop(); - } - } - return null; - } - - /** - * 转换文件 - * - * @param inFile 源文件 - * @param outFile 输出文件 - * @param converter OfficeDocumentConverter - * @return File - */ - public static File converterFile(File inFile, File outFile, OfficeDocumentConverter converter) { - if (!outFile.getParentFile().exists()) { - if (!outFile.getParentFile().mkdirs()) { - return outFile; - } - } - converter.convert(inFile, outFile); - return outFile; - } - - /** - * 判断文件后缀是否可以转换pdf - * - * @param path 文件路径 - * @return boolean - */ - public static boolean canConverter(String path) { - try { - String suffix = path.substring(path.lastIndexOf(".") + 1); - return Arrays.asList(CAN_CONVERTER_FILES).contains(suffix); - } catch (Exception e) { - return false; - } - } - - /** - * 连接并启动OpenOffice - * - * @param officeHome OpenOffice安装路径 - * @return OfficeManager - */ - public static OfficeManager getOfficeManager(String officeHome) { - if (officeHome == null || officeHome.trim().isEmpty()) return null; - DefaultOfficeManagerConfiguration config = new DefaultOfficeManagerConfiguration(); - config.setOfficeHome(officeHome); // 设置OpenOffice安装目录 - OfficeManager officeManager = config.buildOfficeManager(); - officeManager.start(); // 启动OpenOffice服务 - return officeManager; - } - -} diff --git a/modules/common/core/utils/PushUtil.java b/modules/common/core/utils/PushUtil.java deleted file mode 100644 index fadf410..0000000 --- a/modules/common/core/utils/PushUtil.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.gxwebsoft.common.core.utils; - -import cn.hutool.crypto.SecureUtil; -import cn.hutool.http.HttpRequest; -import com.alibaba.fastjson.JSONObject; -import com.gxwebsoft.common.system.service.UserService; -import com.gxwebsoft.common.system.vo.PushMessageVO; -import org.springframework.stereotype.Component; - -import javax.annotation.Resource; -import java.util.HashMap; -import java.util.HashSet; -import java.util.concurrent.TimeUnit; - -/** - * 个推推送消息工具类 - * - * @author WebSoft - * @since 2017-06-10 10:10:39 - */ -@Component -public class PushUtil { - @Resource - RedisUtil redisUtil; - - @Resource - private UserService userService; - private static final String url = "https://fc-mp-ba98f1e0-713d-457b-a0a4-27a7939371e6.next.bspapp.com/unipush"; - - /** - * 获取鉴权token - * @return - */ - public String getToken() { - String key = "token:oOVaDtYDYQ8q3lNjhLh401"; - - if(redisUtil.get(key) != null){ - return redisUtil.get(key); - } - - HashMap map = new HashMap<>(); - long timeMillis = System.currentTimeMillis(); - String sign = SecureUtil.sha256("AC6IghgsUx7Mwjb7G5eqv" + timeMillis + "JVRkOCXXzA6EyE2Fi5sPr9"); - map.put("sign",sign); - map.put("timestamp",timeMillis); - map.put("appkey","AC6IghgsUx7Mwjb7G5eqv"); - final String body = HttpRequest.post(url.concat("/auth")).body(JSONUtil.toJSONString(map)).execute().body(); - final JSONObject jsonObject = JSONObject.parseObject(body); - final String data = jsonObject.getString("data"); - final JSONObject jsonData = JSONObject.parseObject(data); - - final String token = jsonData.getString("token"); - final Long expireTime = Long.valueOf(jsonData.getString("expire_time")); - // 保存token - - redisUtil.set(key,token, expireTime-System.currentTimeMillis(), TimeUnit.MILLISECONDS); - return token; - } - - /** - * 执行cid单推 - * cid数组，只能填一个cid - * - */ - public static boolean toSingle(PushMessageVO pushMessageVO){ - final String body = HttpRequest.post(url).body(JSONUtil.toJSONString(pushMessageVO)).execute().body(); - JSONObject jsonObject = JSONObject.parseObject(body); - if("success".equals(jsonObject.get("errMsg"))){ - return true; - } - return false; - } - - - public boolean toSingle(Integer userId,String title, String content,String type, Object obj){ - PushMessageVO.Payload payload = new PushMessageVO.Payload(); - payload.setType(type); - payload.setData(obj); - - String clientId = userService.getById(userId).getClientId(); - HashSet clientIds = new HashSet<>(); - clientIds.add(clientId); - - PushMessageVO messageVO = PushMessageVO.builder().title(title).content(content).payload(payload).push_clientid(clientIds).build(); - - final String body = HttpRequest.post(url).body(JSONUtil.toJSONString(messageVO)).execute().body(); - - JSONObject jsonObject = JSONObject.parseObject(body); - if("success".equals(jsonObject.get("errMsg"))){ - return true; - } - return false; - } - - -} diff --git a/modules/common/core/utils/RedisUtil.java b/modules/common/core/utils/RedisUtil.java deleted file mode 100644 index 3dde420..0000000 --- a/modules/common/core/utils/RedisUtil.java +++ /dev/null @@ -1,281 +0,0 @@ -package com.gxwebsoft.common.core.utils; - -import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import com.gxwebsoft.common.system.entity.User; -import com.gxwebsoft.common.system.result.RedisResult; -import org.springframework.data.geo.Point; -import org.springframework.data.redis.core.StringRedisTemplate; -import org.springframework.security.core.Authentication; -import org.springframework.security.core.context.SecurityContextHolder; -import org.springframework.stereotype.Component; - -import java.time.LocalDateTime; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.TimeUnit; -import java.util.function.Function; - -import static com.gxwebsoft.common.core.constants.RedisConstants.CACHE_NULL_TTL; - -@Component -public class RedisUtil { - private final StringRedisTemplate stringRedisTemplate; - public static Integer tenantId; - - public RedisUtil(StringRedisTemplate stringRedisTemplate){ - this.stringRedisTemplate = stringRedisTemplate; - } - - /** - * 写入redis缓存 - * @param key [表名]:id - * @param entity 实体类对象 - * 示例 cacheClient.set("merchant:"+id,merchant) - */ - public void set(String key, T entity){ - stringRedisTemplate.opsForValue().set(key, JSONUtil.toJSONString(entity)); - } - - /** - * 写入redis缓存 - * @param key [表名]:id - * @param entity 实体类对象 - * 示例 cacheClient.set("merchant:"+id,merchant,1L,TimeUnit.DAYS) - */ - public void set(String key, T entity, Long time, TimeUnit unit){ - stringRedisTemplate.opsForValue().set(key, JSONUtil.toJSONString(entity),time,unit); - } - - /** - * 读取redis缓存 - * @param key [表名]:id - * 示例 cacheClient.get(key) - * @return merchant - */ - public String get(String key) { - return stringRedisTemplate.opsForValue().get(key); - } - - /** - * 读取redis缓存 - * @param key [表名]:id - * @param clazz Merchant.class - * @param - * 示例 cacheClient.get("merchant:"+id,Merchant.class) - * @return merchant - */ - public T get(String key, Class clazz) { - String json = stringRedisTemplate.opsForValue().get(key); - if(StrUtil.isNotBlank(json)){ - return JSONUtil.parseObject(json, clazz); - } - return null; - } - - /** - * 写redis缓存(哈希类型) - * @param key [表名]:id - * @param field 字段 - * 示例 cacheClient.get("merchant:"+id,Merchant.class) - */ - public void hPut(String key, String field, T entity) { - stringRedisTemplate.opsForHash().put(key,field,JSONUtil.toJSONString(entity)); - } - - /** - * 写redis缓存(哈希类型) - * @param key [表名]:id - * @param map 字段 - * 示例 cacheClient.get("merchant:"+id,Merchant.class) - */ - public void hPutAll(String key, Map map) { - stringRedisTemplate.opsForHash().putAll(key,map); - } - - /** - * 读取redis缓存(哈希类型) - * 示例 cacheClient.get("merchant:"+id,Merchant.class) - * @param key [表名]:id - * @param field 字段 - * @return merchant - */ - public T hGet(String key, String field, Class clazz) { - Object obj = stringRedisTemplate.opsForHash().get(key, field); - return JSONUtil.parseObject(JSONUtil.toJSONString(obj),clazz); - } - - public List hValues(String key){ - return stringRedisTemplate.opsForHash().values(key); - } - - public Long hSize(String key){ - return stringRedisTemplate.opsForHash().size(key); - } - - // 逻辑过期方式写入redis - public void setWithLogicalExpire(String key, T value, Long time, TimeUnit unit){ - // 设置逻辑过期时间 - final RedisResult redisResult = new RedisResult<>(); - redisResult.setData(value); - redisResult.setExpireTime(LocalDateTime.now().plusSeconds(unit.toSeconds(time))); - stringRedisTemplate.opsForValue().set(key,JSONUtil.toJSONString(redisResult)); - } - - // 读取redis - public R query(String keyPrefix, ID id, Class clazz, Function dbFallback, Long time, TimeUnit unit){ - String key = keyPrefix + id; - // 1.从redis查询缓存 - final String json = stringRedisTemplate.opsForValue().get(key); - // 2.判断是否存在 - if (StrUtil.isNotBlank(json)) { - // 3.存在，直接返回 - return JSONUtil.parseObject(json,clazz); - } - // 判断命中的是否为空值 - if (json != null) { - return null; - } - // 4. 不存在，跟进ID查询数据库 - R r = dbFallback.apply(id); - // 5. 数据库不存在，返回错误 - if(r == null){ - // 空值写入数据库 - this.set(key,"",CACHE_NULL_TTL,TimeUnit.MINUTES); - return null; - } - // 写入redis - this.set(key,r,time,unit); - return r; - } - - /** - * 添加商户定位点 - * @param key geo - * @param id - * 示例 cacheClient.geoAdd("merchant-geo",merchant) - */ - public void geoAdd(String key, Double x, Double y, String id){ - stringRedisTemplate.opsForGeo().add(key,new Point(x,y),id); - } - - /** - * 删除定位 - * @param key geo - * @param id - * 示例 cacheClient.geoRemove("merchant-geo",id) - */ - public void geoRemove(String key, Integer id){ - stringRedisTemplate.opsForGeo().remove(key,id.toString()); - } - - - - public void sAdd(String key, T entity){ - stringRedisTemplate.opsForSet().add(key,JSONUtil.toJSONString(entity)); - } - - public Set sMembers(String key){ - return stringRedisTemplate.opsForSet().members(key); - } - - // 更新排行榜 - public void zAdd(String key, Integer userId, Double value) { - stringRedisTemplate.opsForZSet().add(key,userId.toString(),value); - } - // 增加元素的score值，并返回增加后的值 - public Double zIncrementScore(String key,Integer userId, Double delta){ - return stringRedisTemplate.opsForZSet().incrementScore(key, userId.toString(), delta); - } - // 获取排名榜 - public Set range(String key, Integer start, Integer end) { - return stringRedisTemplate.opsForZSet().range(key, start, end); - } - // 获取排名榜 - public Set reverseRange(String key, Integer start, Integer end){ - return stringRedisTemplate.opsForZSet().reverseRange(key, start, end); - } - // 获取分数 - public Double score(String key, Object value){ - return stringRedisTemplate.opsForZSet().score(key, value); - } - - public void delete(String key){ - stringRedisTemplate.delete(key); - } - - // 存储在list头部 - public void leftPush(String key, String keyword){ - stringRedisTemplate.opsForList().leftPush(key,keyword); - } - - // 获取列表指定范围内的元素 - public List listRange(String key,Long start, Long end){ - return stringRedisTemplate.opsForList().range(key, start, end); - } - - // 获取列表长度 - public Long listSize(String key){ - return stringRedisTemplate.opsForList().size(key); - } - - // 裁剪list - public void listTrim(String key){ - stringRedisTemplate.opsForList().trim(key, 0L, 100L); - } - - /** - * 读取后台系统设置信息 - * @param keyName 键名wx-word - * @param tenantId 租户ID - * @return - * key示例 cache10048:setting:wx-work - */ - public JSONObject getSettingInfo(String keyName,Integer tenantId){ - String key = "cache" + tenantId + ":setting:" + keyName; - final String cache = stringRedisTemplate.opsForValue().get(key); - assert cache != null; - return JSON.parseObject(cache); - } - - /** - * KEY前缀 - * cache[tenantId]:[key+id] - */ - public static String prefix(String key){ - String prefix = "cache"; - Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); - if (authentication != null) { - Object object = authentication.getPrincipal(); - if (object instanceof User) { - final Integer tenantId = ((User) object).getTenantId(); - prefix = prefix.concat(tenantId.toString()).concat(":"); - } - } - return prefix.concat(key); - } - - // 组装key - public String key(String name,Integer id){ - return name.concat(":").concat(id.toString()); - } - - // 获取上传配置 - public HashMap getUploadConfig(Integer tenantId){ - String key = "setting:upload:" + tenantId; - final String s = get(key); - final JSONObject jsonObject = JSONObject.parseObject(s); - final String uploadMethod = jsonObject.getString("uploadMethod"); - final String bucketDomain = jsonObject.getString("bucketDomain"); - - final HashMap map = new HashMap<>(); - map.put("uploadMethod",uploadMethod); - map.put("bucketDomain",bucketDomain); - return map; - } - - -} diff --git a/modules/common/core/utils/RequestUtil.java b/modules/common/core/utils/RequestUtil.java deleted file mode 100644 index 1787122..0000000 --- a/modules/common/core/utils/RequestUtil.java +++ /dev/null @@ -1,155 +0,0 @@ -package com.gxwebsoft.common.core.utils; - -import cn.hutool.http.HttpRequest; -import com.alibaba.fastjson.JSONObject; -import com.gxwebsoft.common.system.entity.*; -import com.wechat.pay.java.service.partnerpayments.jsapi.model.Transaction; -import org.springframework.stereotype.Component; - -import java.util.ArrayList; -import java.util.HashMap; - -@Component -public class RequestUtil { - private static final String SERVER_HOST = "https://server.gxwebsoft.com/api"; - private static final String MODULES_HOST = "https://modules.gxwebsoft.com/api"; - private static String ACCESS_TOKEN; - private static String TENANT_ID; - - public void setTenantId(String tenantId) { - TENANT_ID = tenantId; - } - - public void setAccessToken(String token) { - ACCESS_TOKEN = token; - } - - - // 余额支付通知 - public void pushBalancePayNotify(Transaction transaction, Payment payment) { - System.out.println("payment = " + payment); - System.out.println("transaction = " + transaction); - // 设置租户ID - setTenantId(payment.getTenantId().toString()); - // 推送支付通知地址 - String path = payment.getNotifyUrl(); - try { - // 链式构建请求 - HttpRequest.post(path) - .header("Tenantid", TENANT_ID) - .body(JSONUtil.toJSONString(transaction))//表单内容 - .timeout(20000)//超时，毫秒 - .execute().body(); - - } catch (Exception e) { - e.printStackTrace(); - } - } - - // 微信支付通知 - public void pushWxPayNotify(Transaction transaction, Payment payment) { - // 设置租户ID - setTenantId(payment.getTenantId().toString()); - // 推送支付通知地址 - String path = payment.getNotifyUrl(); - try { - // 链式构建请求 - HttpRequest.post(path) - .header("Tenantid", TENANT_ID) - .body(JSONUtil.toJSONString(transaction))//表单内容 - .timeout(20000)//超时，毫秒 - .execute().body(); - - } catch (Exception e) { - e.printStackTrace(); - } - } - - public User getMerchantAccountByPhone(String phone) { - String path = "/shop/merchant-account/getMerchantAccountByPhone/" + phone; - try { - // 链式构建请求 - String result = HttpRequest.get(MODULES_HOST.concat(path)) - .header("Authorization", ACCESS_TOKEN) - .header("Tenantid", TENANT_ID) - .timeout(20000)//超时，毫秒 - .execute().body(); - - JSONObject jsonObject = JSONObject.parseObject(result); - final String data = jsonObject.getString("data"); - return JSONObject.parseObject(data, User.class); - } catch (Exception e) { - e.printStackTrace(); - } - return null; - } - - public User getByUserId(Integer userId) { - String path = "/system/user/" + userId; - try { - // 链式构建请求 - String result = HttpRequest.get(MODULES_HOST.concat(path)) - .header("Authorization", ACCESS_TOKEN) - .header("Tenantid", TENANT_ID) - .timeout(20000)//超时，毫秒 - .execute().body(); - - JSONObject jsonObject = JSONObject.parseObject(result); - final String data = jsonObject.getString("data"); - return JSONObject.parseObject(data, User.class); - } catch (Exception e) { - e.printStackTrace(); - } - return null; - } - - public User getUserByPhone(String phone) { - String path = "/system/user/getByPhone/" + phone; - try { - // 链式构建请求 - String result = HttpRequest.get(SERVER_HOST.concat(path)) - .header("Authorization", ACCESS_TOKEN) - .header("Tenantid", TENANT_ID) - .timeout(20000)//超时，毫秒 - .execute().body(); - - JSONObject jsonObject = JSONObject.parseObject(result); - final String data = jsonObject.getString("data"); - return JSONObject.parseObject(data, User.class); - } catch (Exception e) { - e.printStackTrace(); - } - return null; - } - - // 新增用户 - public boolean saveUserByPhone(MerchantAccount merchantAccount) { - String path = "/system/user/"; - try { - HashMap map = new HashMap<>(); - map.put("nickname", merchantAccount.getRealName()); - map.put("username", merchantAccount.getPhone()); - map.put("realName", merchantAccount.getRealName()); - map.put("phone", merchantAccount.getPhone()); - map.put("password", merchantAccount.getPassword()); - final ArrayList roles = new ArrayList<>(); - final UserRole userRole = new UserRole(); - userRole.setUserId(merchantAccount.getUserId()); - userRole.setRoleId(merchantAccount.getRoleId()); - userRole.setTenantId(merchantAccount.getTenantId()); - roles.add(userRole); - map.put("roles", roles); - map.put("tenantId", TENANT_ID); - // 链式构建请求 - String result = HttpRequest.post(SERVER_HOST.concat(path)) - .header("Authorization", ACCESS_TOKEN) - .header("Tenantid", TENANT_ID) - .body(JSONUtil.toJSONString(map))//表单内容 - .timeout(20000)//超时，毫秒 - .execute().body(); - } catch (Exception e) { - e.printStackTrace(); - } - return true; - } -} diff --git a/modules/common/core/utils/SignCheckUtil.java b/modules/common/core/utils/SignCheckUtil.java deleted file mode 100644 index 45aed11..0000000 --- a/modules/common/core/utils/SignCheckUtil.java +++ /dev/null @@ -1,196 +0,0 @@ -package com.gxwebsoft.common.core.utils; - -import cn.hutool.crypto.SecureUtil; -import com.alibaba.fastjson.JSONObject; -import com.gxwebsoft.common.system.entity.KVEntity; -import org.apache.commons.lang3.StringUtils; - -import javax.annotation.Resource; -import java.util.*; - -/** - * 签名检查和获取签名 - * https://blog.csdn.net/u011628753/article/details/110251445 - * @author leng - * - */ -public class SignCheckUtil { - // 签名字段 - public final static String SIGN = "sign"; - - /** - * 签名检查,签名参数中,sign是用于校验的加密值,其他参数按照字母顺序排序,加密,并将其内容链接起来 - * - * @param params - * @param key - * @return - */ - public static boolean signCheck(JSONObject params, String key) { - if (null != params) { - Map map = new HashMap<>(); - - params.forEach((k, v) -> { - map.put(k, v.toString()); - }); - return signCheck(map, key); - } - - return false; - } - - /** - * 签名检查,签名参数中,sign是用于校验的加密值,其他参数按照字母顺序排序,加密,并将其内容链接起来 - * - * @param params - * @param key - * 签名key不允许为空 - * @return - */ - public static boolean signCheck(Map params, String key) { - String sign = params.get(SIGN);// 签名 - if (null == sign) { - return false; - } - String signTemp = getSignString(params,key); - if (null == signTemp) { - return false; - } - return signTemp.equals(sign); - } - - /** - * 获取签名的字符串 - * - * @param params - * @param key - * @return - */ - public static String getSignString(JSONObject params, String key) { - if (null != params) { - Map map = new HashMap<>(); - - params.forEach((k, v) -> { - map.put(k, v.toString()); - }); - return getSignString(map, key); - } - - return null; - } - - /** - * 获取签名的字符串 - * - * @param params - * @param key - * @return - */ - public static String getSignString(Map params, String key) { - // 签名 - if (null == params || params.size() == 0) { - return null; - } - key = (null == key) ? "" : key; - List> list = new ArrayList<>(params.size() - 1); - - params.forEach((k, v) -> { - if (!SIGN.equals(k)) { - list.add(KVEntity.build(k, v)); - } - }); - - Collections.sort(list, (obj1, obj2) -> { - return obj1.getK().compareTo(obj2.getK()); - }); - - StringBuffer sb = new StringBuffer(); - for (KVEntity kv : list) { - String value = kv.getV(); - if (!StringUtils.isEmpty(value)) { - sb.append(kv.getV()).append("-"); - } - } - sb.append(key); - System.out.println("md5加密前的字符串 = " + sb + key); - String signTemp = SecureUtil.md5(sb.toString()).toLowerCase(); - return signTemp; - } - - /** - * 获取微信签名的字符串 - * - * 注意签名（sign）的生成方式，具体见官方文档（传参都要参与生成签名，且参数名按照字典序排序，最后接上APP_KEY,转化成大写） - * - * @param params - * @param key - * @return - */ - public static String getWXSignString(Map params, String key) { - // 签名 - if (null == params || params.size() == 0 || StringUtils.isEmpty(key)) { - return null; - } - - List> list = new ArrayList<>(params.size() - 1); - - params.forEach((k, v) -> { - if (!SIGN.equals(k)) { - list.add(KVEntity.build(k, v)); - } - }); - - Collections.sort(list, (obj1, obj2) -> { - return obj1.getK().compareTo(obj2.getK()); - }); - - StringBuffer sb = new StringBuffer(); - for (KVEntity kv : list) { - String value = kv.getV(); - if (!StringUtils.isEmpty(value)) { - sb.append(kv.getK() + "=" + value + "&"); - } - } - - sb.append("key=" + key); - String signTemp = SecureUtil.md5(sb.toString()).toLowerCase(); - return signTemp; - } - - /** - * 微信签名验证 - * @param params - * @param key - * @return - */ - public static boolean WXsignCheck(Map params, String key) { - String sign = params.get(SIGN); - if (StringUtils.isEmpty(sign)) { - return false; - } - return sign.equals(getWXSignString(params, key)); - } - - /** - * 白名单校验 - * @param domainName abc.com - * @return true - */ - public boolean checkWhiteDomains(List whiteDomains, String domainName) { - if(whiteDomains == null){ - return true; - } - if (whiteDomains.isEmpty()) { - return true; - } - // 服务器域名白名单列表 - whiteDomains.add("server.gxwebsoft.com"); - for(String item: whiteDomains){ -// System.out.println(">>> domainName = " + domainName); - if(Objects.equals(item, domainName)){ - return true; - } - } - return false; - } - -} diff --git a/modules/common/core/utils/WxNativeUtil.java b/modules/common/core/utils/WxNativeUtil.java deleted file mode 100644 index 67d6eff..0000000 --- a/modules/common/core/utils/WxNativeUtil.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.gxwebsoft.common.core.utils; - -import java.util.HashMap; -import java.util.Map; -import com.wechat.pay.java.core.Config; - - -public class WxNativeUtil { - - private static final Map tenantConfigs = new HashMap<>(); - - public static void addConfig(Integer tenantId, Config config) { - tenantConfigs.put(tenantId, config); - } - - public static Config getConfig(Integer tenantId) { - return tenantConfigs.get(tenantId); - } -} diff --git a/modules/common/core/utils/WxOfficialUtil.java b/modules/common/core/utils/WxOfficialUtil.java deleted file mode 100644 index 077e615..0000000 --- a/modules/common/core/utils/WxOfficialUtil.java +++ /dev/null @@ -1,106 +0,0 @@ -package com.gxwebsoft.common.core.utils; - -import cn.hutool.core.util.CharsetUtil; -import cn.hutool.http.HttpUtil; -import com.alibaba.fastjson.JSONObject; -import com.gxwebsoft.common.core.config.ConfigProperties; -import com.gxwebsoft.common.core.exception.BusinessException; -import com.gxwebsoft.common.system.service.SettingService; -import org.springframework.data.redis.core.StringRedisTemplate; -import org.springframework.stereotype.Component; - -import javax.annotation.Resource; -import java.io.UnsupportedEncodingException; -import java.net.URLEncoder; - -/** - * 微信公众号工具类 - * @author 科技小王子 - * - */ -@Component -public class WxOfficialUtil { - private final StringRedisTemplate stringRedisTemplate; - private Integer tenantId; - public String appId; - public String appSecret; - public String openid; - public String unionid; - public String access_token; - public String expires_in; - public String nickname; - - - @Resource - private SettingService settingService; - @Resource - private ConfigProperties pathConfig; - @Resource - private CacheClient cacheClient; - - public WxOfficialUtil(StringRedisTemplate stringRedisTemplate){ - this.stringRedisTemplate = stringRedisTemplate; - } - - // 实例化客户端 - public WxOfficialUtil client(Integer tenantId) { - if(tenantId > 0){ - throw new BusinessException(tenantId + "123123"); - } - this.tenantId = tenantId; - this.config(); - System.out.println("this.tenantId = " + this.tenantId); - return this; - } - - // 开发者ID和秘钥 - private void config() { - String key = "cache"+ this.tenantId +":setting:wx-official"; - String wxOfficial = stringRedisTemplate.opsForValue().get(key); - JSONObject data = JSONObject.parseObject(wxOfficial); - if(data != null){ - this.appId = data.getString("appId"); - this.appSecret = data.getString("appSecret"); - } - System.out.println("this.appId = " + this.appId); - System.out.println("this.appSecret = " + this.appSecret); - } - - // 获取appId - public String getAppSecret(){ - return this.appSecret; - } - - public String getCodeUrl() throws UnsupportedEncodingException { - String encodedReturnUrl = URLEncoder.encode("https://server.gxwebsoft.com/api/open/wx-official/accessToken","UTF-8"); - return "https://open.weixin.qq.com/connect/oauth2/authorize?appid="+ this.appId +"&redirect_uri=" + encodedReturnUrl + "&response_type=code&scope=snsapi_userinfo&state="+ this.tenantId +"#wechat_redirect"; - } - - // 获取access_token - public String getAccessToken(String code) { - String url = "https://api.weixin.qq.com/sns/oauth2/access_token?appid="+ this.appId +"&secret="+ this.appSecret +"&code="+ code +"&grant_type=authorization_code"; - System.out.println("url = " + url); - String response = HttpUtil.get(url, CharsetUtil.CHARSET_UTF_8); - final JSONObject jsonObject = JSONObject.parseObject(response); - access_token = jsonObject.getString("access_token"); - if(access_token == null){ - throw new BusinessException("获取access_token失败"); - } - this.openid = jsonObject.getString("openid"); - this.unionid = jsonObject.getString("unionid"); - this.expires_in = jsonObject.getString("expires_in"); - return access_token; - } - - // 获取userinfo - public JSONObject getUserInfo(String access_token) { - String url = "https://api.weixin.qq.com/sns/userinfo?access_token="+ access_token +"&openid="+ this.openid +"&lang=zh_CN"; - System.out.println("url2 = " + url); - String response = HttpUtil.get(url, CharsetUtil.CHARSET_UTF_8); - System.out.println("response = " + response); - if(response == null){ - throw new BusinessException("获取userinfo失败"); - } - return JSONObject.parseObject(response); - } -} diff --git a/modules/common/core/utils/WxUtil.java b/modules/common/core/utils/WxUtil.java deleted file mode 100644 index 72f1755..0000000 --- a/modules/common/core/utils/WxUtil.java +++ /dev/null @@ -1,134 +0,0 @@ -package com.gxwebsoft.common.core.utils; - -import cn.hutool.core.util.CharsetUtil; -import cn.hutool.core.util.StrUtil; -import cn.hutool.http.HttpUtil; -import com.alibaba.fastjson.JSONObject; -import com.gxwebsoft.common.core.exception.BusinessException; -import org.springframework.data.redis.core.StringRedisTemplate; -import org.springframework.stereotype.Component; - -import javax.annotation.Resource; -import java.util.concurrent.TimeUnit; - -/** - * 微信小程序工具类 - * @author 科技小王子 - * - */ -@Component -public class WxUtil { - private final StringRedisTemplate stringRedisTemplate; - private Integer tenantId; - public String appId; - public String appSecret; - public String access_token; - public String expires_in; - public String nickname; - public String userid; - public String user_ticket; - public String openid; - public String external_userid; - public String name; - public String position; - public String mobile; - public String gender; - public String email; - public String avatar; - public String thumb_avatar; - public String telephone; - public String address; - public String alias; - public String qr_code; - public String open_userid; - - @Resource - private CacheClient cacheClient; - - - public WxUtil(StringRedisTemplate stringRedisTemplate){ - this.stringRedisTemplate = stringRedisTemplate; - } - - - // 实例化客户端 - public WxUtil client(Integer tenantId) { - this.tenantId = tenantId; - this.config(); - return this; - } - - // 开发者ID和秘钥 - private void config() { - JSONObject settingInfo = cacheClient.getSettingInfo("wx-work", this.tenantId); - if(settingInfo == null){ - throw new BusinessException("微信小程序未配置"); - } - this.appId = settingInfo.getString("corpId"); - this.appSecret = settingInfo.getString("secret"); - System.out.println("this.appId = " + this.appId); - System.out.println("this.appSecret = " + this.appSecret); - } - - // 获取access_token - public void getAccessToken(String code) { - String key = "cache"+ this.tenantId +":ww:access_token"; - final String access_token = stringRedisTemplate.opsForValue().get(key); - if(access_token != null){ - this.getUserInfo(code,access_token); - }else { - String url = "https://qyapi.weixin.qq.com/cgi-bin/gettoken?corpid=" +this.appId+ "&corpsecret="+ this.appSecret; - System.out.println("url = " + url); - String response = HttpUtil.get(url, CharsetUtil.CHARSET_UTF_8); - System.out.println("response = " + response); - final JSONObject jsonObject = JSONObject.parseObject(response); - // 获取成功 - if(jsonObject.getString("access_token") != null){ - this.access_token = jsonObject.getString("access_token"); - this.expires_in = jsonObject.getString("expires_in"); - stringRedisTemplate.opsForValue().set(key,this.access_token,7000, TimeUnit.SECONDS); - System.out.println("获取access_token成功 = " + this.access_token); - this.getUserInfo(code,this.access_token); - } - } - } - - // 获取userinfo - public void getUserInfo(String code, String access_token) { - String url = "https://qyapi.weixin.qq.com/cgi-bin/auth/getuserinfo?access_token=" +access_token+ "&code=" + code; - System.out.println("url2 = " + url); - String response = HttpUtil.get(url, CharsetUtil.CHARSET_UTF_8); - System.out.println("response = " + response); - JSONObject jsonObject = JSONObject.parseObject(response); - final String errcode = jsonObject.getString("errcode"); - final String errmsg = jsonObject.getString("errmsg"); - if(!StrUtil.equals(errcode,"0")){ - throw new BusinessException(errmsg); - } - this.userid = jsonObject.getString("userid"); - this.user_ticket = jsonObject.getString("user_ticket"); - this.openid = jsonObject.getString("openid"); - this.external_userid = jsonObject.getString("external_userid"); - System.out.println("获取用户信息成功 = " + jsonObject); - } - - public void getUserProfile(String userid, String access_token) { - String url = "https://qyapi.weixin.qq.com/cgi-bin/user/get?access_token="+ access_token +"&userid=" + userid; - String response = HttpUtil.get(url, CharsetUtil.CHARSET_UTF_8); - System.out.println("response3 = " + response); - JSONObject jsonObject = JSONObject.parseObject(response); - System.out.println("读取用户详细信息 = " + jsonObject); - - this.name = jsonObject.getString("name"); - this.position = jsonObject.getString("position"); - this.gender = jsonObject.getString("gender"); - this.email = jsonObject.getString("email"); - this.avatar = jsonObject.getString("avatar"); - this.thumb_avatar = jsonObject.getString("thumb_avatar"); - this.telephone = jsonObject.getString("telephone"); - this.address = jsonObject.getString("address"); - this.alias = jsonObject.getString("alias"); - this.qr_code = jsonObject.getString("qr_code"); - this.open_userid = jsonObject.getString("open_userid"); - } -} diff --git a/modules/common/core/utils/WxWorkUtil.java b/modules/common/core/utils/WxWorkUtil.java deleted file mode 100644 index 5a4e449..0000000 --- a/modules/common/core/utils/WxWorkUtil.java +++ /dev/null @@ -1,134 +0,0 @@ -package com.gxwebsoft.common.core.utils; - -import cn.hutool.core.util.CharsetUtil; -import cn.hutool.core.util.StrUtil; -import cn.hutool.http.HttpUtil; -import com.alibaba.fastjson.JSONObject; -import com.gxwebsoft.common.core.exception.BusinessException; -import org.springframework.data.redis.core.StringRedisTemplate; -import org.springframework.stereotype.Component; - -import javax.annotation.Resource; -import java.util.concurrent.TimeUnit; - -/** - * 企业微信工具类 - * @author 科技小王子 - * - */ -@Component -public class WxWorkUtil { - private final StringRedisTemplate stringRedisTemplate; - private Integer tenantId; - public String appId; - public String appSecret; - public String access_token; - public String expires_in; - public String nickname; - public String userid; - public String user_ticket; - public String openid; - public String external_userid; - public String name; - public String position; - public String mobile; - public String gender; - public String email; - public String avatar; - public String thumb_avatar; - public String telephone; - public String address; - public String alias; - public String qr_code; - public String open_userid; - - @Resource - private CacheClient cacheClient; - - - public WxWorkUtil(StringRedisTemplate stringRedisTemplate){ - this.stringRedisTemplate = stringRedisTemplate; - } - - - // 实例化客户端 - public WxWorkUtil client(Integer tenantId) { - this.tenantId = tenantId; - this.config(); - return this; - } - - // 开发者ID和秘钥 - private void config() { - JSONObject settingInfo = cacheClient.getSettingInfo("wx-work", this.tenantId); - if(settingInfo == null){ - throw new BusinessException("企业微信未配置"); - } - this.appId = settingInfo.getString("corpId"); - this.appSecret = settingInfo.getString("secret"); - System.out.println("this.appId = " + this.appId); - System.out.println("this.appSecret = " + this.appSecret); - } - - // 获取access_token - public void getAccessToken(String code) { - String key = "cache"+ this.tenantId +":ww:access_token"; - final String access_token = stringRedisTemplate.opsForValue().get(key); - if(access_token != null){ - this.getUserInfo(code,access_token); - }else { - String url = "https://qyapi.weixin.qq.com/cgi-bin/gettoken?corpid=" +this.appId+ "&corpsecret="+ this.appSecret; - System.out.println("url = " + url); - String response = HttpUtil.get(url, CharsetUtil.CHARSET_UTF_8); - System.out.println("response = " + response); - final JSONObject jsonObject = JSONObject.parseObject(response); - // 获取成功 - if(jsonObject.getString("access_token") != null){ - this.access_token = jsonObject.getString("access_token"); - this.expires_in = jsonObject.getString("expires_in"); - stringRedisTemplate.opsForValue().set(key,this.access_token,7000, TimeUnit.SECONDS); - System.out.println("获取access_token成功 = " + this.access_token); - this.getUserInfo(code,this.access_token); - } - } - } - - // 获取userinfo - public void getUserInfo(String code, String access_token) { - String url = "https://qyapi.weixin.qq.com/cgi-bin/auth/getuserinfo?access_token=" +access_token+ "&code=" + code; - System.out.println("url2 = " + url); - String response = HttpUtil.get(url, CharsetUtil.CHARSET_UTF_8); - System.out.println("response = " + response); - JSONObject jsonObject = JSONObject.parseObject(response); - final String errcode = jsonObject.getString("errcode"); - final String errmsg = jsonObject.getString("errmsg"); - if(!StrUtil.equals(errcode,"0")){ - throw new BusinessException(errmsg); - } - this.userid = jsonObject.getString("userid"); - this.user_ticket = jsonObject.getString("user_ticket"); - this.openid = jsonObject.getString("openid"); - this.external_userid = jsonObject.getString("external_userid"); - System.out.println("获取用户信息成功 = " + jsonObject); - } - - public void getUserProfile(String userid, String access_token) { - String url = "https://qyapi.weixin.qq.com/cgi-bin/user/get?access_token="+ access_token +"&userid=" + userid; - String response = HttpUtil.get(url, CharsetUtil.CHARSET_UTF_8); - System.out.println("response3 = " + response); - JSONObject jsonObject = JSONObject.parseObject(response); - System.out.println("读取用户详细信息 = " + jsonObject); - - this.name = jsonObject.getString("name"); - this.position = jsonObject.getString("position"); - this.gender = jsonObject.getString("gender"); - this.email = jsonObject.getString("email"); - this.avatar = jsonObject.getString("avatar"); - this.thumb_avatar = jsonObject.getString("thumb_avatar"); - this.telephone = jsonObject.getString("telephone"); - this.address = jsonObject.getString("address"); - this.alias = jsonObject.getString("alias"); - this.qr_code = jsonObject.getString("qr_code"); - this.open_userid = jsonObject.getString("open_userid"); - } -} diff --git a/modules/common/core/web/ApiResult.java b/modules/common/core/web/ApiResult.java deleted file mode 100644 index eab091a..0000000 --- a/modules/common/core/web/ApiResult.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.gxwebsoft.common.core.web; - -import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.annotations.ApiModelProperty; - -import java.io.Serializable; - -/** - * 返回结果 - * - * @author WebSoft - * @since 2017-06-10 10:10:50 - */ -@JsonInclude(JsonInclude.Include.NON_NULL) -public class ApiResult implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "状态码") - private Integer code; - - @ApiModelProperty(value = "状态信息") - private String message; - - @ApiModelProperty(value = "返回数据") - private T data; - - @ApiModelProperty(value = "错误信息") - private String error; - - public ApiResult() {} - - public ApiResult(Integer code) { - this(code, null); - } - - public ApiResult(Integer code, String message) { - this(code, message, null); - } - - public ApiResult(Integer code, String message, T data) { - this(code, message, data, null); - } - - public ApiResult(Integer code, String message, T data, String error) { - setCode(code); - setMessage(message); - setData(data); - setError(error); - } - - public Integer getCode() { - return this.code; - } - - public ApiResult setCode(Integer code) { - this.code = code; - return this; - } - - public String getMessage() { - return this.message; - } - - public ApiResult setMessage(String message) { - this.message = message; - return this; - } - - public T getData() { - return this.data; - } - - public ApiResult setData(T data) { - this.data = data; - return this; - } - - public String getError() { - return this.error; - } - - public ApiResult setError(String error) { - this.error = error; - return this; - } - -} diff --git a/modules/common/core/web/BaseController.java b/modules/common/core/web/BaseController.java deleted file mode 100644 index 24e79d6..0000000 --- a/modules/common/core/web/BaseController.java +++ /dev/null @@ -1,263 +0,0 @@ -package com.gxwebsoft.common.core.web; - -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.common.core.Constants; -import com.gxwebsoft.common.core.exception.BusinessException; -import com.gxwebsoft.common.core.utils.RedisUtil; -import com.gxwebsoft.common.system.entity.Company; -import com.gxwebsoft.common.system.entity.User; -import com.gxwebsoft.common.system.service.CompanyService; -import com.gxwebsoft.common.system.service.UserService; -import org.springframework.beans.propertyeditors.StringTrimmerEditor; -import org.springframework.security.core.Authentication; -import org.springframework.security.core.context.SecurityContextHolder; -import org.springframework.util.CollectionUtils; -import org.springframework.web.bind.WebDataBinder; -import org.springframework.web.bind.annotation.InitBinder; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import java.util.List; - -/** - * Controller基类 - * - * @author WebSoft - * @since 2017-06-10 10:10:19 - */ -public class BaseController { - @Resource - private HttpServletRequest request; - @Resource - private UserService userService; - @Resource - private CompanyService companyService; - @Resource - private RedisUtil redisUtil; - - /** - * 获取当前登录的user - * - * @return User - */ - public User getLoginUser() { - try { - Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); - if (authentication != null) { - Object object = authentication.getPrincipal(); - if (object instanceof User) { - ((User) object).setUid(13448); - System.out.println("object = " + object); - return (User) object; - } - } - } catch (Exception e) { - System.out.println(e.getMessage()); - } - return null; - } - - /** - * 获取当前登录的userId - * - * @return userId - */ - public Integer getLoginUserId() { - User loginUser = getLoginUser(); - return loginUser == null ? null : loginUser.getUserId(); - } - - /** - * 获取当前登录的tenantId - * - * @return tenantId - */ - public Integer getTenantId() { - // 1 从登录用户拿tenantId - User loginUser = getLoginUser(); - if (loginUser != null) { - return loginUser.getTenantId(); - } - // 2 从域名拿ID - String Domain = request.getHeader("Domain"); - if (StrUtil.isNotBlank(Domain)) { - String key = "Domain:" + Domain; - String tenantId = redisUtil.get(key); - if(tenantId != null){ -// System.out.println("从域名拿ID = " + tenantId); - return Integer.valueOf(tenantId); - } - } - // 3 从请求头拿ID - String tenantId = request.getHeader("tenantId"); - if(StrUtil.isNotBlank(tenantId)){ - return Integer.valueOf(tenantId); - } - return null; - } - - /** - * 获取当前登录的企业信息 - * - * @return Company - */ - public Company getCompany() { - List list = companyService.list(new LambdaQueryWrapper().eq(Company::getAuthoritative, 1)); - if (!CollectionUtils.isEmpty(list)) { - final Company company = list.get(0); - return company; - } - return null; - } - - public Integer getCompanyId() { - Company company = getCompany(); - return company.getCompanyId(); - } - - /** - * 返回成功 - * - * @return ApiResult - */ - public ApiResult success() { - return new ApiResult<>(Constants.RESULT_OK_CODE, Constants.RESULT_OK_MSG); - } - - /** - * 返回成功 - * - * @param message 状态信息 - * @return ApiResult - */ - public ApiResult success(String message) { - return success().setMessage(message); - } - - /** - * 返回成功 - * - * @param data 返回数据 - * @return ApiResult - */ - public ApiResult success(T data) { - return new ApiResult<>(Constants.RESULT_OK_CODE, Constants.RESULT_OK_MSG, data); - } - - /** - * 返回成功 - * - * @param message 状态信息 - * @return ApiResult - */ - public ApiResult success(String message, T data) { - return success(data).setMessage(message); - } - - /** - * 返回分页查询数据 - * - * @param list 当前页数据 - * @param count 总数量 - * @return ApiResult - */ - public ApiResult> success(List list, Long count) { - return success(new PageResult<>(list, count)); - } - - /** - * 返回分页查询数据 - * - * @param iPage IPage - * @return ApiResult - */ - public ApiResult> success(IPage iPage) { - return success(iPage.getRecords(), iPage.getTotal()); - } - - /** - * 返回失败 - * - * @return ApiResult - */ - public ApiResult fail() { - return new ApiResult<>(Constants.RESULT_ERROR_CODE, Constants.RESULT_ERROR_MSG); - } - - /** - * 返回失败 - * - * @param message 状态信息 - * @return ApiResult - */ - public ApiResult fail(String message) { - return fail().setMessage(message); - } - - /** - * 返回失败 - * - * @param data 返回数据 - * @return ApiResult - */ - public ApiResult fail(T data) { - return fail(Constants.RESULT_ERROR_MSG, data); - } - - /** - * 返回失败 - * - * @param message 状态信息 - * @param data 返回数据 - * @return ApiResult - */ - public ApiResult fail(String message, T data) { - return new ApiResult<>(Constants.RESULT_ERROR_CODE, message, data); - } - - /** - * 请求参数的空字符串转为null - */ - @InitBinder - public void initBinder(WebDataBinder binder) { - binder.registerCustomEditor(String.class, new StringTrimmerEditor(true)); - } - - // 自定义函数 - public String getAuthorization() { - return request.getHeader("Authorization"); - } - - public String getSign() { - return request.getParameter("sign"); - } - - - - /** - * 根据账号|手机号码|邮箱查找用户ID - * - * @return userId - */ - public Integer getUserIdByUsername(String username, Integer tenantId) { - // 按账号搜素 - User user = userService.getOne(new LambdaQueryWrapper().eq(User::getUsername, username).eq(User::getTenantId, tenantId)); - if (user != null && user.getUserId() > 0) { - return user.getUserId(); - } - // 按手机号码搜索 - User userByPhone = userService.getOne(new LambdaQueryWrapper().eq(User::getPhone, username).eq(User::getTenantId, tenantId)); - if (userByPhone != null && userByPhone.getUserId() > 0) { - return userByPhone.getUserId(); - } - // 按邮箱搜索 - User userByEmail = userService.getOne(new LambdaQueryWrapper().eq(User::getEmail, username).eq(User::getTenantId, tenantId)); - if (userByEmail != null && userByEmail.getUserId() > 0) { - return userByEmail.getUserId(); - } - throw new BusinessException("找不到该用户"); - } - -} diff --git a/modules/common/core/web/BaseParam.java b/modules/common/core/web/BaseParam.java deleted file mode 100644 index 607d670..0000000 --- a/modules/common/core/web/BaseParam.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.gxwebsoft.common.core.web; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.utils.CommonUtil; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -/** - * 查询参数基本字段 - * - * @author WebSoft - * @since 2021-08-26 22:14:43 - */ -@Data -public class BaseParam implements Serializable { - private static final long serialVersionUID = 1L; - - @TableField(exist = false) - @ApiModelProperty("分页查询页码") - private Long page; - - @TableField(exist = false) - @ApiModelProperty("分页查询每页数量") - private Long limit; - - @TableField(exist = false) - @ApiModelProperty(value = "排序字段", notes = "排序字段或sql, 如果是sql则order字段无用, 如: `id asc, name desc`") - private String sort; - - @TableField(exist = false) - @ApiModelProperty(value = "排序方式", notes = "sort是字段名称时对应的排序方式, asc升序, desc降序") - private String order; - - @QueryField(value = "create_time", type = QueryType.GE) - @TableField(exist = false) - @ApiModelProperty("创建时间起始值") - private String createTimeStart; - - @QueryField(value = "create_time", type = QueryType.LE) - @TableField(exist = false) - @ApiModelProperty("创建时间结束值") - private String createTimeEnd; - - @QueryField(value = "create_time", type = QueryType.GE) - @ApiModelProperty("搜索场景") - @TableField(exist = false) - private String sceneType; - - @ApiModelProperty(value = "商户ID") - @TableField(exist = false) - private Integer merchantId; - - @ApiModelProperty("租户ID") - @TableField(exist = false) - private Integer tenantId; - - @ApiModelProperty("模糊搜素") - @TableField(exist = false) - private String keywords; - - /** - * 获取集合中的第一条数据 - * - * @param records 集合 - * @return 第一条数据 - */ - public T getOne(List records) { - return CommonUtil.listGetOne(records); - } - -} diff --git a/modules/common/core/web/BatchParam.java b/modules/common/core/web/BatchParam.java deleted file mode 100644 index c9f5ac5..0000000 --- a/modules/common/core/web/BatchParam.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.gxwebsoft.common.core.web; - -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.baomidou.mybatisplus.core.toolkit.support.SFunction; -import com.baomidou.mybatisplus.extension.service.IService; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -/** - * 批量修改通用参数 - * - * @author WebSoft - * @since 2020-03-13 00:11:06 - */ -@Data -public class BatchParam implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "需要修改的数据id集合") - private List ids; - - @ApiModelProperty(value = "需要修改的字段和值") - private T data; - - /** - * 通用批量修改方法 - * - * @param service IService - * @param idField id字段名称 - * @return boolean - */ - public boolean update(IService service, String idField) { - if (this.data == null) { - return false; - } - return service.update(this.data, new UpdateWrapper().in(idField, this.ids)); - } - - /** - * 通用批量修改方法 - * - * @param service IService - * @param idField id字段名称 - * @return boolean - */ - public boolean update(IService service, SFunction idField) { - if (this.data == null) { - return false; - } - return service.update(this.data, new LambdaUpdateWrapper().in(idField, this.ids)); - } - -} diff --git a/modules/common/core/web/ExistenceParam.java b/modules/common/core/web/ExistenceParam.java deleted file mode 100644 index f423b6d..0000000 --- a/modules/common/core/web/ExistenceParam.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.gxwebsoft.common.core.web; - -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.support.SFunction; -import com.baomidou.mybatisplus.extension.service.IService; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - * 检查是否存在通用参数 - * - * @author WebSoft - * @since 2021-09-07 22:24:39 - */ -@Data -public class ExistenceParam implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "检查的字段") - private String field; - - @ApiModelProperty(value = "字段的值") - private String value; - - @ApiModelProperty(value = "修改时的主键") - private Integer id; - - /** - * 检查是否存在 - * - * @param service IService - * @param idField 修改时的主键字段 - * @return boolean - */ - public boolean isExistence(IService service, String idField) { - return isExistence(service, idField, true); - } - - /** - * 检查是否存在 - * - * @param service IService - * @param idField 修改时的主键字段 - * @param isToUnderlineCase 是否需要把field转为下划线格式 - * @return boolean - */ - public boolean isExistence(IService service, String idField, boolean isToUnderlineCase) { - if (StrUtil.hasBlank(this.field, this.value)) { - return false; - } - String fieldName = isToUnderlineCase ? StrUtil.toUnderlineCase(field) : field; - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(fieldName, value); - if (id != null) { - wrapper.ne(idField, id); - } - return service.count(wrapper) > 0; - } - - /** - * 检查是否存在 - * - * @param service IService - * @param idField 修改时的主键字段 - * @return boolean - */ - public boolean isExistence(IService service, SFunction idField) { - return isExistence(service, idField, true); - } - - /** - * 检查是否存在 - * - * @param service IService - * @param idField 修改时的主键字段 - * @param isToUnderlineCase 是否需要把field转为下划线格式 - * @return boolean - */ - public boolean isExistence(IService service, SFunction idField, boolean isToUnderlineCase) { - if (StrUtil.hasBlank(this.field, this.value)) { - return false; - } - String fieldName = isToUnderlineCase ? StrUtil.toUnderlineCase(field) : field; - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.apply(fieldName + " = {0}", value); - if (id != null) { - wrapper.ne(idField, id); - } - return service.count(wrapper) > 0; - } - -} diff --git a/modules/common/core/web/PageParam.java b/modules/common/core/web/PageParam.java deleted file mode 100644 index 596ea58..0000000 --- a/modules/common/core/web/PageParam.java +++ /dev/null @@ -1,343 +0,0 @@ -package com.gxwebsoft.common.core.web; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.util.ReflectUtil; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableLogic; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.OrderItem; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.gxwebsoft.common.core.Constants; -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.utils.CommonUtil; - -import java.lang.reflect.Field; -import java.util.*; -import java.util.function.Function; -import java.util.stream.Collectors; - -/** - * 分页、排序、搜索参数封装 - * - * @author WebSoft - * @since 2019-04-26 10:34:35 - */ -public class PageParam extends Page { - private static final long serialVersionUID = 1L; - - /** - * 租户id字段名称 - */ - private static final String TENANT_ID_FIELD = "tenantId"; - - /** - * 查询条件 - */ - private final U where; - - /** - * 是否把字段名称驼峰转下划线 - */ - private final boolean isToUnderlineCase; - - public PageParam() { - this(null); - } - - public PageParam(U where) { - this(where, true); - } - - public PageParam(U where, boolean isToUnderlineCase) { - super(); - this.where = where; - this.isToUnderlineCase = isToUnderlineCase; - if (where != null) { - // 获取分页页码 - if (where.getPage() != null) { - setCurrent(where.getPage()); - } - // 获取分页每页数量 - if (where.getLimit() != null) { - setSize(where.getLimit()); - } - // 获取排序方式 - if (where.getSort() != null) { - if (sortIsSQL(where.getSort())) { - setOrders(parseOrderSQL(where.getSort())); - } else { - List orderItems = new ArrayList<>(); - String column = this.isToUnderlineCase ? StrUtil.toUnderlineCase(where.getSort()) : where.getSort(); - boolean asc = !Constants.ORDER_DESC_VALUE.equals(where.getOrder()); - orderItems.add(new OrderItem(column, asc)); - setOrders(orderItems); - } - } - } - } - - /** - * 排序字段是否是sql - */ - private boolean sortIsSQL(String sort) { - return sort != null && (sort.contains(",") || sort.trim().contains(" ")); - } - - /** - * 解析排序sql - */ - private List parseOrderSQL(String orderSQL) { - List orders = new ArrayList<>(); - if (StrUtil.isNotBlank(orderSQL)) { - for (String item : orderSQL.split(",")) { - String[] temp = item.trim().split(" "); - if (!temp[0].isEmpty()) { - String column = this.isToUnderlineCase ? StrUtil.toUnderlineCase(temp[0]) : temp[0]; - boolean asc = temp.length == 1 || !temp[temp.length - 1].equals(Constants.ORDER_DESC_VALUE); - orders.add(new OrderItem(column, asc)); - } - } - } - return orders; - } - - /** - * 设置默认排序方式 - * - * @param orderItems 排序方式 - * @return PageParam - */ - public PageParam setDefaultOrder(List orderItems) { - if (orders() == null || orders().size() == 0) { - setOrders(orderItems); - } - return this; - } - - /** - * 设置默认排序方式 - * - * @param orderSQL 排序方式 - * @return PageParam - */ - public PageParam setDefaultOrder(String orderSQL) { - setDefaultOrder(parseOrderSQL(orderSQL)); - return this; - } - - /** - * 获取查询条件 - * - * @param excludes 不包含的字段 - * @return QueryWrapper - */ - public QueryWrapper getWrapper(String... excludes) { - return buildWrapper(null, Arrays.asList(excludes)); - } - - /** - * 获取查询条件 - * - * @param columns 只包含的字段 - * @return QueryWrapper - */ - public QueryWrapper getWrapperWith(String... columns) { - return buildWrapper(Arrays.asList(columns), null); - } - - /** - * 构建QueryWrapper - * - * @param columns 包含的字段 - * @param excludes 排除的字段 - * @return QueryWrapper - */ - private QueryWrapper buildWrapper(List columns, List excludes) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - Map map = BeanUtil.beanToMap(where, false, true); - for (String fieldName : map.keySet()) { - Object fieldValue = map.get(fieldName); - Field field = ReflectUtil.getField(where.getClass(), fieldName); - - // 过滤不包含的字段 - if (columns != null && !columns.contains(fieldName)) { - continue; - } - - // 过滤排除的字段 - if (excludes != null && excludes.contains(fieldName)) { - continue; - } - - // 过滤逻辑删除字段 - if (field.getAnnotation(TableLogic.class) != null) { - continue; - } - - // 过滤租户id字段 - if (fieldName.equals(TENANT_ID_FIELD)) { - continue; - } - - // 获取注解指定的查询字段及查询方式 - QueryType queryType = QueryType.LIKE; - QueryField queryField = field.getAnnotation(QueryField.class); - if (queryField != null) { - if (StrUtil.isNotEmpty(queryField.value())) { - fieldName = queryField.value(); - } - if (queryField.type() != null) { - queryType = queryField.type(); - } - } else { - // 过滤非本表的字段 - TableField tableField = field.getAnnotation(TableField.class); - if (tableField != null && !tableField.exist()) { - continue; - } - } - - // 字段名驼峰转下划线 - if (this.isToUnderlineCase) { - fieldName = StrUtil.toUnderlineCase(fieldName); - } - - // - switch (queryType) { - case EQ: - queryWrapper.eq(fieldName, fieldValue); - break; - case NE: - queryWrapper.ne(fieldName, fieldValue); - break; - case GT: - queryWrapper.gt(fieldName, fieldValue); - break; - case GE: - queryWrapper.ge(fieldName, fieldValue); - break; - case LT: - queryWrapper.lt(fieldName, fieldValue); - break; - case LE: - queryWrapper.le(fieldName, fieldValue); - break; - case LIKE: - queryWrapper.like(fieldName, fieldValue); - break; - case NOT_LIKE: - queryWrapper.notLike(fieldName, fieldValue); - break; - case LIKE_LEFT: - queryWrapper.likeLeft(fieldName, fieldValue); - break; - case LIKE_RIGHT: - queryWrapper.likeRight(fieldName, fieldValue); - break; - case IS_NULL: - queryWrapper.isNull(fieldName); - break; - case IS_NOT_NULL: - queryWrapper.isNotNull(fieldName); - break; - case IN: - queryWrapper.in(fieldName, fieldValue); - break; - case NOT_IN: - queryWrapper.notIn(fieldName, fieldValue); - break; - case IN_STR: - if (fieldValue instanceof String) { - queryWrapper.in(fieldName, Arrays.asList(((String) fieldValue).split(","))); - } - break; - case NOT_IN_STR: - if (fieldValue instanceof String) { - queryWrapper.notIn(fieldName, Arrays.asList(((String) fieldValue).split(","))); - } - break; - } - } - return queryWrapper; - } - - /** - * 获取包含排序的查询条件 - * - * @return 包含排序的QueryWrapper - */ - public QueryWrapper getOrderWrapper() { - return getOrderWrapper(getWrapper()); - } - - /** - * 获取包含排序的查询条件 - * - * @param queryWrapper 不含排序的QueryWrapper - * @return 包含排序的QueryWrapper - */ - public QueryWrapper getOrderWrapper(QueryWrapper queryWrapper) { - if (queryWrapper == null) { - queryWrapper = new QueryWrapper<>(); - } - for (OrderItem orderItem : orders()) { - if (orderItem.isAsc()) { - queryWrapper.orderByAsc(orderItem.getColumn()); - } else { - queryWrapper.orderByDesc(orderItem.getColumn()); - } - } - return queryWrapper; - } - - /** - * 获取集合中的第一条数据 - * - * @param records 集合 - * @return 第一条数据 - */ - public T getOne(List records) { - return CommonUtil.listGetOne(records); - } - - /** - * 代码排序集合 - * - * @param records 集合 - * @return 排序后的集合 - */ - public List sortRecords(List records) { - List orderItems = orders(); - if (records == null || records.size() < 2 || orderItems == null || orderItems.size() == 0) { - return records; - } - Comparator comparator = null; - for (OrderItem item : orderItems) { - if (item.getColumn() == null) { - continue; - } - String field = this.isToUnderlineCase ? StrUtil.toCamelCase(item.getColumn()) : item.getColumn(); - Function keyExtractor = t -> ReflectUtil.getFieldValue(t, field); - if (comparator == null) { - if (item.isAsc()) { - comparator = Comparator.comparing(keyExtractor); - } else { - comparator = Comparator.comparing(keyExtractor, Comparator.reverseOrder()); - } - } else { - if (item.isAsc()) { - comparator.thenComparing(keyExtractor); - } else { - comparator.thenComparing(keyExtractor, Comparator.reverseOrder()); - } - } - } - if (comparator != null) { - return records.stream().sorted(comparator).collect(Collectors.toList()); - } - return records; - } - -} diff --git a/modules/common/core/web/PageResult.java b/modules/common/core/web/PageResult.java deleted file mode 100644 index 2ef9d0c..0000000 --- a/modules/common/core/web/PageResult.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.gxwebsoft.common.core.web; - -import io.swagger.annotations.ApiModelProperty; - -import java.io.Serializable; -import java.util.List; - -/** - * 分页查询返回结果 - * - * @author WebSoft - * @since 2017-06-10 10:10:02 - */ -public class PageResult implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "当前页数据") - private List list; - - @ApiModelProperty(value = "总数量") - private Long count; - - public PageResult() { - } - - public PageResult(List list) { - this(list, null); - } - - public PageResult(List list, Long count) { - setList(list); - setCount(count); - } - - public List getList() { - return this.list; - } - - public void setList(List list) { - this.list = list; - } - - public Long getCount() { - return this.count; - } - - public void setCount(Long count) { - this.count = count; - } - -} diff --git a/modules/common/system/controller/AccessKeyController.java b/modules/common/system/controller/AccessKeyController.java deleted file mode 100644 index 570e788..0000000 --- a/modules/common/system/controller/AccessKeyController.java +++ /dev/null @@ -1,150 +0,0 @@ -package com.gxwebsoft.common.system.controller; - -import cn.hutool.core.util.StrUtil; -import com.gxwebsoft.common.core.annotation.OperationLog; -import com.gxwebsoft.common.core.utils.CacheClient; -import com.gxwebsoft.common.core.utils.CommonUtil; -import com.gxwebsoft.common.core.web.*; -import com.gxwebsoft.common.system.entity.AccessKey; -import com.gxwebsoft.common.system.param.AccessKeyParam; -import com.gxwebsoft.common.system.service.AccessKeyService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 访问凭证管理控制器 - * - * @author 科技小王子 - * @since 2023-05-16 19:19:55 - */ -@Api(tags = "访问凭证管理管理") -@RestController -@RequestMapping("/api/system/access-key") -public class AccessKeyController extends BaseController { - @Resource - private AccessKeyService accessKeyService; - @Resource - private CacheClient cacheClient; - - @PreAuthorize("hasAuthority('sys:accessKey:list')") - @OperationLog - @ApiOperation("分页查询访问凭证管理") - @GetMapping("/page") - public ApiResult> page(AccessKeyParam param) { - // 使用关联查询 - final PageResult accessKeyPageResult = accessKeyService.pageRel(param); - if (param.getCode() != null) { - // 短信验证码校验 - String code = cacheClient.get(param.getPhone(), String.class); - if (StrUtil.equals(code,param.getCode()) || "789789".equals(param.getCode())) { - return success(accessKeyPageResult); - } - return fail("短信验证码不正确",null); - } - // 默认不给查看AccessSecret - accessKeyPageResult.getList().forEach( d -> { - d.setAccessSecret(null); - }); - return success(accessKeyPageResult); - } - - @PreAuthorize("hasAuthority('sys:accessKey:list')") - @OperationLog - @ApiOperation("查询全部访问凭证管理") - @GetMapping() - public ApiResult> list(AccessKeyParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - return success(accessKeyService.list(page.getOrderWrapper())); - // 使用关联查询 - //return success(accessKeyService.listRel(param)); - } - - @PreAuthorize("hasAuthority('sys:accessKey:list')") - @OperationLog - @ApiOperation("根据id查询访问凭证管理") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - return success(accessKeyService.getById(id)); - // 使用关联查询 - //return success(accessKeyService.getByIdRel(id)); - } - - @PreAuthorize("hasAuthority('sys:accessKey:list')") - @OperationLog - @ApiOperation("添加访问凭证管理") - @PostMapping() - public ApiResult save(@RequestBody AccessKey accessKey) { - final int count = accessKeyService.count(); - if (count >= 5) { - return fail("当前账号只能绑定 5 个 AccessKey"); - } - accessKey.setAccessKey("AI" + CommonUtil.randomUUID16()); - accessKey.setAccessSecret(CommonUtil.randomUUID16().concat(CommonUtil.randomUUID16())); - if (accessKeyService.save(accessKey)) { - return success("创建成功"); - } - return fail("创建失败"); - } - - @PreAuthorize("hasAuthority('sys:accessKey:update')") - @OperationLog - @ApiOperation("修改访问凭证管理") - @PutMapping() - public ApiResult update(@RequestBody AccessKey accessKey) { - if (accessKeyService.updateById(accessKey)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('sys:accessKey:remove')") - @OperationLog - @ApiOperation("删除访问凭证管理") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (accessKeyService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @PreAuthorize("hasAuthority('sys:accessKey:save')") - @OperationLog - @ApiOperation("批量添加访问凭证管理") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (accessKeyService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('sys:accessKey:update')") - @OperationLog - @ApiOperation("批量修改访问凭证管理") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(accessKeyService, "id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('sys:accessKey:remove')") - @OperationLog - @ApiOperation("批量删除访问凭证管理") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (accessKeyService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/modules/common/system/controller/AliOssController.java b/modules/common/system/controller/AliOssController.java deleted file mode 100644 index a84bae7..0000000 --- a/modules/common/system/controller/AliOssController.java +++ /dev/null @@ -1,283 +0,0 @@ -package com.gxwebsoft.common.system.controller; - -import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSONObject; -import com.aliyun.oss.ClientException; -import com.aliyun.oss.OSS; -import com.aliyun.oss.OSSClientBuilder; -import com.aliyun.oss.OSSException; -import com.aliyun.oss.common.auth.CredentialsProvider; -import com.aliyun.oss.common.auth.DefaultCredentialProvider; -import com.aliyun.oss.common.utils.BinaryUtil; -import com.aliyun.oss.model.PolicyConditions; -import com.aliyun.oss.model.PutObjectRequest; -import com.aliyun.oss.model.PutObjectResult; -import com.aliyuncs.DefaultAcsClient; -import com.aliyuncs.auth.sts.AssumeRoleRequest; -import com.aliyuncs.auth.sts.AssumeRoleResponse; -import com.aliyuncs.http.MethodType; -import com.aliyuncs.profile.DefaultProfile; -import com.aliyuncs.profile.IClientProfile; -import com.gxwebsoft.common.core.annotation.OperationLog; -import com.gxwebsoft.common.core.config.ConfigProperties; -import com.gxwebsoft.common.core.utils.FileServerUtil; -import com.gxwebsoft.common.core.utils.RedisUtil; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.common.system.entity.Company; -import com.gxwebsoft.common.system.entity.FileRecord; -import com.gxwebsoft.common.system.service.CompanyService; -import com.gxwebsoft.common.system.service.FileRecordService; -import com.gxwebsoft.common.system.service.SettingService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import java.io.File; -import java.nio.charset.StandardCharsets; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.HashMap; -import java.util.Map; - -/** - * 阿里云OSS云存储 - * - * @author WebSoft - * @since 2022-11-19 13:54:27 - */ -@Api(tags = "阿里云OSS云存储") -@RestController -@RequestMapping("/api/oss") -public class AliOssController extends BaseController { - @Resource - private ConfigProperties config; - @Resource - private RedisUtil redisUtil; - @Resource - private FileRecordService fileRecordService; - @Resource - private CompanyService companyService; - @Resource - private SettingService settingService; - - @ApiOperation("上传文件") - @PostMapping("/upload") - public ApiResult upload(@RequestParam MultipartFile file, HttpServletRequest request) throws Exception{ - // 获取租户ID - String tenantId = request.getHeader("TenantId"); - String companyId = request.getHeader("CompanyId"); - String groupId = request.getHeader("GroupId"); - String appId = request.getHeader("AppId"); - if(StrUtil.isBlank(tenantId)){ - return fail("传参错误",null); - } - - // 读取配置信息 - JSONObject settingInfo; - String key3 = "Upload:" + tenantId; - settingInfo = redisUtil.get(key3, JSONObject.class); - if (settingInfo == null) { - settingInfo = settingService.getBySettingKey("upload"); - if(settingInfo == null){ - return fail("上传失败，请检查上传配置",null); - } - redisUtil.set(key3,settingInfo); - } - String endpoint = settingInfo.getString("bucketEndpoint"); - String bucketDomain = settingInfo.getString("bucketDomain"); - String bucketName = settingInfo.getString("bucketName"); - String accessKeyId = settingInfo.getString("accessKeyId"); - String accessKeySecret = settingInfo.getString("accessKeySecret"); - - // 判断是否登录 - String authorization = getAuthorization(); - - // 判断存储空间是否已满 - String key = "StorageIsFull:" + tenantId; - String storageIsFull = redisUtil.get(key); - if(StrUtil.isNotBlank(storageIsFull)){ - // 使用自定义云存储不限制 - if(bucketName.equals("oss-gxwebsoft")){ - return fail("存储空间已满", null); - } - } - - // 上传文件结果 - FileRecord result; - CredentialsProvider credentialsProvider = new DefaultCredentialProvider(accessKeyId, accessKeySecret); - // 创建OSSClient实例。 - OSS ossClient = new OSSClientBuilder().build(endpoint, credentialsProvider); - - try { - - String dir = getUploadDir(); - File upload = FileServerUtil.upload(file, dir, config.getUploadUuidName()); - String path = upload.getAbsolutePath().replace("\\", "/").substring(dir.length()); - String originalName = file.getOriginalFilename(); - - // 创建PutObjectRequest对象。 - PutObjectRequest putObjectRequest = new PutObjectRequest(bucketName, path, upload); - // 如果需要上传时设置存储类型和访问权限，请参考以下示例代码。 - // ObjectMetadata metadata = new ObjectMetadata(); - // metadata.setHeader(OSSHeaders.OSS_STORAGE_CLASS, StorageClass.Standard.toString()); - // metadata.setObjectAcl(CannedAccessControlList.Private); - // putObjectRequest.setMetadata(metadata); - - // 上传文件。 - PutObjectResult ossResult = ossClient.putObject(putObjectRequest); - - // 保存记录并返回 - result = new FileRecord(); - if(StrUtil.isNotBlank(authorization)){ - result.setCreateUserId(getLoginUserId()); - } - if(StrUtil.isNotBlank(companyId)){ - result.setCompanyId(Integer.valueOf(companyId)); - } - if(StrUtil.isNotBlank(groupId)){ - result.setGroupId(Integer.valueOf(groupId)); - } - if(StrUtil.isNotBlank(appId)){ - result.setAppId(Integer.valueOf(appId)); - } - path = "/".concat(path); - result.setName(StrUtil.isBlank(originalName) ? upload.getName() : originalName); - result.setLength(upload.length()); - result.setPath(bucketDomain + path); - result.setThumbnail(bucketDomain + path + "?x-oss-process=image/resize,m_fixed,w_100,h_100/quality,Q_90"); - result.setUrl(bucketDomain + path + "?x-oss-process=image/resize,w_750/quality,Q_90"); - result.setDownloadUrl(bucketDomain + path); - String contentType = FileServerUtil.getContentType(upload); - result.setContentType(contentType); - result.setTenantId(Integer.valueOf(tenantId)); - upload.delete(); - fileRecordService.save(result); - // 更新存储空间 - if(companyId != null){ - Company company = companyService.getById(Integer.valueOf(companyId)); - company.setStorage(company.getStorage() + result.getLength()); - if(company.getStorage().compareTo(company.getStorageMax()) > 0){ - redisUtil.set(key,1); - } - companyService.updateById(company); - } - return success(result); - - } catch (OSSException oe) { - System.out.println("Caught an OSSException, which means your request made it to OSS, " - + "but was rejected with an error response for some reason."); - System.out.println("Error Message:" + oe.getErrorMessage()); - System.out.println("Error Code:" + oe.getErrorCode()); - System.out.println("Request ID:" + oe.getRequestId()); - System.out.println("Host ID:" + oe.getHostId()); - } catch (ClientException ce) { - System.out.println("Caught an ClientException, which means the client encountered " - + "a serious internal problem while trying to communicate with OSS, " - + "such as not being able to access the network."); - System.out.println("Error Message:" + ce.getMessage()); - } finally { - if (ossClient != null) { - ossClient.shutdown(); - } - } - return fail("上传失败", null); - } - - @OperationLog - @ApiOperation("获取临时osstoken") - @GetMapping("/getSTSToken") - public ApiResult getSTSToken() { - // STS接入地址，例如sts.cn-hangzhou.aliyuncs.com。 - String endpoint = "sts.cn-shenzhen.aliyuncs.com"; - // 填写步骤1生成的RAM用户访问密钥AccessKey ID和AccessKey Secret。 - String accessKeyId = "LTAI5tCjTtR7TwrzerB1yUML"; - String accessKeySecret = "n4fbWMer3sHI8K32mKpg47Ba9rR4yp"; - // 填写步骤3获取的角色ARN。 - String roleArn = "acs:ram::1470199532233684:role/wsoss"; - // 自定义角色会话名称，用来区分不同的令牌，例如可填写为SessionTest。 - String roleSessionName = "wsoss"; - // 设置临时访问凭证的有效时间为3600秒。 - Long durationSeconds = 3600L; - try { - // regionId表示RAM的地域ID。以华东1（杭州）地域为例，regionID填写为cn-hangzhou。也可以保留默认值，默认值为空字符串（""）。 - String regionId = ""; - // 添加endpoint。适用于Java SDK 3.12.0及以上版本。 - DefaultProfile.addEndpoint(regionId, "Sts", endpoint); - // 构造default profile。 - IClientProfile profile = DefaultProfile.getProfile(regionId, accessKeyId, accessKeySecret); - // 构造client。 - DefaultAcsClient client = new DefaultAcsClient(profile); - final AssumeRoleRequest request = new AssumeRoleRequest(); - // 适用于Java SDK 3.12.0及以上版本。 - request.setSysMethod(MethodType.POST); - // 适用于Java SDK 3.12.0以下版本。 - //request.setMethod(MethodType.POST); - request.setRoleArn(roleArn); - request.setRoleSessionName(roleSessionName); -// request.setPolicy(policy); - request.setDurationSeconds(durationSeconds); - final AssumeRoleResponse response = client.getAcsResponse(request); - return success(response); - } catch (ClientException | com.aliyuncs.exceptions.ClientException e) { - System.out.println("Failed："); - System.out.println("Error message: " + e.getMessage()); - return fail(e.getMessage()); - - } - } - - /** - * 获取前端表单提交的参数 - * @return - */ - @ApiOperation("") - @GetMapping("/getPostForm") - public ApiResult getPostForm(){ - String endpoint = config.getEndpoint(); - // RAM用户的访问密钥（AccessKey ID和AccessKey Secret）。 - String accessKeyId = "LTAI5t8UTh8CTXEi2dYxobhj"; - String accessKeySecret = "fNdJOT4KAjrVrzHNAcSJuUCy9ZljD9"; - // 使用代码嵌入的RAM用户的访问密钥配置访问凭证。 - CredentialsProvider credentialsProvider = new DefaultCredentialProvider(accessKeyId, accessKeySecret); - // 填写Bucket名称，例如examplebucket。 - String bucket = config.getBucketName(); - OSS ossClient = new OSSClientBuilder().build(endpoint, credentialsProvider); - - try { - String host = "https://" + bucket + "." + endpoint; - String format = new SimpleDateFormat("yyyy-MM-dd").format(new Date()); - - - long expireTime = 60; - long expireEndTime = System.currentTimeMillis() + expireTime * 1000; - Date expiration = new Date(expireEndTime); - PolicyConditions policyConds = new PolicyConditions(); - policyConds.addConditionItem(PolicyConditions.COND_CONTENT_LENGTH_RANGE,0,100*1024*1024); - - - String postPolicy = ossClient.generatePostPolicy(expiration, policyConds); - byte[] binaryData = postPolicy.getBytes(StandardCharsets.UTF_8); - String encodedPolicy = BinaryUtil.toBase64String(binaryData); - String postSignature = ossClient.calculatePostSignature(postPolicy); - Map result = new HashMap<>(); - result.put("polocyBase64",encodedPolicy); - result.put("signature",postSignature); - result.put("expireEndTime",expireEndTime); - return success(result); - } finally { - ossClient.shutdown(); - } - - } - - /** - * 文件上传位置(服务器) - */ - private String getUploadDir() { - return config.getUploadPath() + "file/"; - } -} diff --git a/modules/common/system/controller/AppController.java b/modules/common/system/controller/AppController.java deleted file mode 100644 index 526c7a4..0000000 --- a/modules/common/system/controller/AppController.java +++ /dev/null @@ -1,139 +0,0 @@ -package com.gxwebsoft.common.system.controller; - -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.common.system.entity.User; -import com.gxwebsoft.common.system.service.AppService; -import com.gxwebsoft.common.system.entity.App; -import com.gxwebsoft.common.system.param.AppParam; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.BatchParam; -import com.gxwebsoft.common.core.annotation.OperationLog; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 应用管理记录表控制器 - * - * @author 科技小王子 - * @since 2023-10-30 22:20:23 - */ -@Api(tags = "应用管理记录表管理") -@RestController -@RequestMapping("/api/system/app") -public class AppController extends BaseController { - @Resource - private AppService appService; - - @PreAuthorize("hasAuthority('sys:app:list')") - @OperationLog - @ApiOperation("分页查询应用管理记录表") - @GetMapping("/page") - public ApiResult> page(AppParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - return success(appService.page(page, page.getWrapper())); - // 使用关联查询 - //return success(appService.pageRel(param)); - } - - @PreAuthorize("hasAuthority('sys:app:list')") - @OperationLog - @ApiOperation("查询全部应用管理记录表") - @GetMapping() - public ApiResult> list(AppParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - return success(appService.list(page.getOrderWrapper())); - // 使用关联查询 - //return success(appService.listRel(param)); - } - - @PreAuthorize("hasAuthority('sys:app:list')") - @OperationLog - @ApiOperation("根据id查询应用管理记录表") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - return success(appService.getById(id)); - // 使用关联查询 - //return success(appService.getByIdRel(id)); - } - - @PreAuthorize("hasAuthority('sys:app:save')") - @OperationLog - @ApiOperation("添加应用管理记录表") - @PostMapping() - public ApiResult save(@RequestBody App app) { - // 记录当前登录用户id - User loginUser = getLoginUser(); - if (loginUser != null) { - app.setUserId(loginUser.getUserId()); - } - if (appService.save(app)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('sys:app:update')") - @OperationLog - @ApiOperation("修改应用管理记录表") - @PutMapping() - public ApiResult update(@RequestBody App app) { - if (appService.updateById(app)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('sys:app:remove')") - @OperationLog - @ApiOperation("删除应用管理记录表") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (appService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @PreAuthorize("hasAuthority('sys:app:save')") - @OperationLog - @ApiOperation("批量添加应用管理记录表") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (appService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('sys:app:update')") - @OperationLog - @ApiOperation("批量修改应用管理记录表") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(appService, "app_id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('sys:app:remove')") - @OperationLog - @ApiOperation("批量删除应用管理记录表") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (appService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/modules/common/system/controller/AppRenewController.java b/modules/common/system/controller/AppRenewController.java deleted file mode 100644 index 7835055..0000000 --- a/modules/common/system/controller/AppRenewController.java +++ /dev/null @@ -1,139 +0,0 @@ -package com.gxwebsoft.common.system.controller; - -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.common.system.entity.User; -import com.gxwebsoft.common.system.service.AppRenewService; -import com.gxwebsoft.common.system.entity.AppRenew; -import com.gxwebsoft.common.system.param.AppRenewParam; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.BatchParam; -import com.gxwebsoft.common.core.annotation.OperationLog; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 续费管理控制器 - * - * @author 科技小王子 - * @since 2023-11-14 14:14:07 - */ -@Api(tags = "续费管理管理") -@RestController -@RequestMapping("/api/system/app-renew") -public class AppRenewController extends BaseController { - @Resource - private AppRenewService appRenewService; - - @PreAuthorize("hasAuthority('sys:appRenew:list')") - @OperationLog - @ApiOperation("分页查询续费管理") - @GetMapping("/page") - public ApiResult> page(AppRenewParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - return success(appRenewService.page(page, page.getWrapper())); - // 使用关联查询 - //return success(appRenewService.pageRel(param)); - } - - @PreAuthorize("hasAuthority('sys:appRenew:list')") - @OperationLog - @ApiOperation("查询全部续费管理") - @GetMapping() - public ApiResult> list(AppRenewParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - return success(appRenewService.list(page.getOrderWrapper())); - // 使用关联查询 - //return success(appRenewService.listRel(param)); - } - - @PreAuthorize("hasAuthority('sys:appRenew:list')") - @OperationLog - @ApiOperation("根据id查询续费管理") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - return success(appRenewService.getById(id)); - // 使用关联查询 - //return success(appRenewService.getByIdRel(id)); - } - - @PreAuthorize("hasAuthority('sys:appRenew:save')") - @OperationLog - @ApiOperation("添加续费管理") - @PostMapping() - public ApiResult save(@RequestBody AppRenew appRenew) { - // 记录当前登录用户id - User loginUser = getLoginUser(); - if (loginUser != null) { - appRenew.setUserId(loginUser.getUserId()); - } - if (appRenewService.save(appRenew)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('sys:appRenew:update')") - @OperationLog - @ApiOperation("修改续费管理") - @PutMapping() - public ApiResult update(@RequestBody AppRenew appRenew) { - if (appRenewService.updateById(appRenew)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('sys:appRenew:remove')") - @OperationLog - @ApiOperation("删除续费管理") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (appRenewService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @PreAuthorize("hasAuthority('sys:appRenew:save')") - @OperationLog - @ApiOperation("批量添加续费管理") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (appRenewService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('sys:appRenew:update')") - @OperationLog - @ApiOperation("批量修改续费管理") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(appRenewService, "app_renew_id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('sys:appRenew:remove')") - @OperationLog - @ApiOperation("批量删除续费管理") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (appRenewService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/modules/common/system/controller/AppUrlController.java b/modules/common/system/controller/AppUrlController.java deleted file mode 100644 index e7be7af..0000000 --- a/modules/common/system/controller/AppUrlController.java +++ /dev/null @@ -1,134 +0,0 @@ -package com.gxwebsoft.common.system.controller; - -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.common.system.entity.User; -import com.gxwebsoft.common.system.service.AppUrlService; -import com.gxwebsoft.common.system.entity.AppUrl; -import com.gxwebsoft.common.system.param.AppUrlParam; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.BatchParam; -import com.gxwebsoft.common.core.annotation.OperationLog; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 域名管理记录表控制器 - * - * @author 科技小王子 - * @since 2023-10-30 22:20:23 - */ -@Api(tags = "域名管理记录表管理") -@RestController -@RequestMapping("/api/system/app-url") -public class AppUrlController extends BaseController { - @Resource - private AppUrlService appUrlService; - - @PreAuthorize("hasAuthority('sys:appUrl:list')") - @OperationLog - @ApiOperation("分页查询域名管理记录表") - @GetMapping("/page") - public ApiResult> page(AppUrlParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - return success(appUrlService.page(page, page.getWrapper())); - // 使用关联查询 - //return success(appUrlService.pageRel(param)); - } - - @PreAuthorize("hasAuthority('sys:appUrl:list')") - @OperationLog - @ApiOperation("查询全部域名管理记录表") - @GetMapping() - public ApiResult> list(AppUrlParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - return success(appUrlService.list(page.getOrderWrapper())); - // 使用关联查询 - //return success(appUrlService.listRel(param)); - } - - @PreAuthorize("hasAuthority('sys:appUrl:list')") - @OperationLog - @ApiOperation("根据id查询域名管理记录表") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - return success(appUrlService.getById(id)); - // 使用关联查询 - //return success(appUrlService.getByIdRel(id)); - } - - @PreAuthorize("hasAuthority('sys:appUrl:save')") - @OperationLog - @ApiOperation("添加域名管理记录表") - @PostMapping() - public ApiResult save(@RequestBody AppUrl appUrl) { - if (appUrlService.save(appUrl)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('sys:appUrl:update')") - @OperationLog - @ApiOperation("修改域名管理记录表") - @PutMapping() - public ApiResult update(@RequestBody AppUrl appUrl) { - if (appUrlService.updateById(appUrl)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('sys:appUrl:remove')") - @OperationLog - @ApiOperation("删除域名管理记录表") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (appUrlService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @PreAuthorize("hasAuthority('sys:appUrl:save')") - @OperationLog - @ApiOperation("批量添加域名管理记录表") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (appUrlService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('sys:appUrl:update')") - @OperationLog - @ApiOperation("批量修改域名管理记录表") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(appUrlService, "app_url_id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('sys:appUrl:remove')") - @OperationLog - @ApiOperation("批量删除域名管理记录表") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (appUrlService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/modules/common/system/controller/AppUserController.java b/modules/common/system/controller/AppUserController.java deleted file mode 100644 index eed9328..0000000 --- a/modules/common/system/controller/AppUserController.java +++ /dev/null @@ -1,129 +0,0 @@ -package com.gxwebsoft.common.system.controller; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.common.system.entity.User; -import com.gxwebsoft.common.system.service.AppUserService; -import com.gxwebsoft.common.system.entity.AppUser; -import com.gxwebsoft.common.system.param.AppUserParam; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.BatchParam; -import com.gxwebsoft.common.core.annotation.OperationLog; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 应用成员控制器 - * - * @author 科技小王子 - * @since 2023-10-30 22:20:23 - */ -@Api(tags = "应用成员管理") -@RestController -@RequestMapping("/api/system/app-user") -public class AppUserController extends BaseController { - @Resource - private AppUserService appUserService; - - @PreAuthorize("hasAuthority('sys:appUser:list')") - @ApiOperation("分页查询应用成员") - @GetMapping("/page") - public ApiResult> page(AppUserParam param) { - // 使用关联查询 - return success(appUserService.pageRel(param)); - } - - @PreAuthorize("hasAuthority('sys:appUser:list')") - @ApiOperation("查询全部应用成员") - @GetMapping() - public ApiResult> list(AppUserParam param) { - // 使用关联查询 - if (param.getAppId() == null) { - return fail("AppId不存在",null); - } - return success(appUserService.listRel(param)); - } - - @PreAuthorize("hasAuthority('sys:appUser:list')") - @ApiOperation("根据id查询应用成员") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - // 使用关联查询 - return success(appUserService.getByIdRel(id)); - } - - @PreAuthorize("hasAuthority('sys:appUser:save')") - @ApiOperation("添加应用成员") - @PostMapping() - public ApiResult save(@RequestBody AppUser appUser) { - if (appUserService.count(new LambdaQueryWrapper() - .eq(AppUser::getUserId, appUser.getUserId()).eq(AppUser::getAppId,appUser.getAppId())) > 0) { - return fail("该成员已存在"); - } - if (appUserService.save(appUser)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('sys:appUser:update')") - @ApiOperation("修改应用成员") - @PutMapping() - public ApiResult update(@RequestBody AppUser appUser) { - if (appUserService.updateById(appUser)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('sys:appUser:remove')") - @ApiOperation("删除应用成员") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (appUserService.removeById(id)) { - return success("移除成功"); - } - return fail("移除失败"); - } - - @PreAuthorize("hasAuthority('sys:appUser:save')") - @OperationLog - @ApiOperation("批量添加应用成员") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (appUserService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('sys:appUser:update')") - @OperationLog - @ApiOperation("批量修改应用成员") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(appUserService, "app_user_id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('sys:appUser:remove')") - @OperationLog - @ApiOperation("批量删除应用成员") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (appUserService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/modules/common/system/controller/CacheController.java b/modules/common/system/controller/CacheController.java deleted file mode 100644 index ddd566c..0000000 --- a/modules/common/system/controller/CacheController.java +++ /dev/null @@ -1,116 +0,0 @@ -package com.gxwebsoft.common.system.controller; - -import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSONObject; -import com.gxwebsoft.common.core.annotation.OperationLog; -import com.gxwebsoft.common.core.utils.CacheClient; -import com.gxwebsoft.common.core.utils.RedisUtil; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.common.system.entity.Cache; -import com.gxwebsoft.common.system.entity.User; -import com.gxwebsoft.common.system.service.SettingService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.data.redis.core.StringRedisTemplate; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Set; -import java.util.concurrent.TimeUnit; - -/** - * 缓存控制器 - * - * @author WebSoft - * @since 2022-11-19 13:54:27 - */ -@Api(tags = "缓存管理") -@RestController -@RequestMapping("/api/system/cache") -public class CacheController extends BaseController { - @Resource - private SettingService settingService; - @Resource - private CacheClient cacheClient; - @Resource - private RedisUtil redisUtil; - @Resource - private StringRedisTemplate stringRedisTemplate; - - @PreAuthorize("hasAuthority('sys:cache:list')") - @ApiOperation("查询全部缓存") - @GetMapping() - public ApiResult> list() { - String key = "cache".concat(getTenantId().toString()).concat("*"); - final Set keys = stringRedisTemplate.keys(key); - final HashMap map = new HashMap<>(); - final ArrayList list = new ArrayList<>(); - assert keys != null; - keys.forEach(d -> { - final Cache cache = new Cache(); - cache.setKey(d); - try { - final String content = stringRedisTemplate.opsForValue().get(d); - if(content != null){ - cache.setContent(stringRedisTemplate.opsForValue().get(d)); - } - } catch (Exception e) { - e.printStackTrace(); - } - list.add(cache); - }); - map.put("count",keys.size()); - map.put("list",list); - return success(map); - } - - @PreAuthorize("hasAuthority('sys:cache:list')") - @ApiOperation("根据key查询缓存信息") - @GetMapping("/{key}") - public ApiResult get(@PathVariable("key") String key) { - final String s = redisUtil.get(key + getTenantId()); - if(StrUtil.isNotBlank(s)){ - return success("读取成功", JSONObject.parseObject(s)); - } - return fail("缓存不存在！"); - } - - @PreAuthorize("hasAuthority('sys:cache:save')") - @ApiOperation("添加缓存") - @PostMapping() - public ApiResult add(@RequestBody Cache cache) { - if (cache.getExpireTime() != null) { - redisUtil.set(cache.getKey() + ":" + getTenantId(),cache.getContent(),cache.getExpireTime(), TimeUnit.MINUTES); - return success("缓存成功"); - } - redisUtil.set(cache.getKey() + ":" + getTenantId(),cache.getContent()); - return success("缓存成功"); - } - - @PreAuthorize("hasAuthority('sys:cache:save')") - @OperationLog - @ApiOperation("删除缓存") - @DeleteMapping("/{key}") - public ApiResult remove(@PathVariable("key") String key) { - if (Boolean.TRUE.equals(stringRedisTemplate.delete(key))) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @ApiOperation("缓存皮肤") - @PostMapping("/theme") - public ApiResult saveTheme(@RequestBody Cache cache) { - final User loginUser = getLoginUser(); - final String username = loginUser.getUsername(); - if (username.equals("admin")) { - redisUtil.set(cache.getKey() + ":" + getTenantId(),cache.getContent()); - return success("缓存成功"); - } - return success("缓存失败"); - } -} diff --git a/modules/common/system/controller/ChatConversationController.java b/modules/common/system/controller/ChatConversationController.java deleted file mode 100644 index a722699..0000000 --- a/modules/common/system/controller/ChatConversationController.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.gxwebsoft.common.system.controller; - -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.common.system.service.ChatConversationService; -import com.gxwebsoft.common.system.entity.ChatConversation; -import com.gxwebsoft.common.system.param.ChatConversationParam; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.BatchParam; -import com.gxwebsoft.common.core.annotation.OperationLog; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 聊天消息表控制器 - * - * @author 科技小王子 - * @since 2024-04-27 15:57:27 - */ -@Api(tags = "聊天消息表管理") -@RestController -@RequestMapping("/api/system/chat-conversation") -public class ChatConversationController extends BaseController { - @Resource - private ChatConversationService chatConversationService; - - @PreAuthorize("hasAuthority('sys:chatConversation:list')") - @OperationLog - @ApiOperation("分页查询聊天消息表") - @GetMapping("/page") - public ApiResult> page(ChatConversationParam param) { - // 使用关联查询 - return success(chatConversationService.pageRel(param)); - } - - @PreAuthorize("hasAuthority('sys:chatConversation:list')") - @OperationLog - @ApiOperation("查询全部聊天消息表") - @GetMapping() - public ApiResult> list(ChatConversationParam param) { - // 使用关联查询 - return success(chatConversationService.listRel(param)); - } - - @PreAuthorize("hasAuthority('sys:chatConversation:list')") - @OperationLog - @ApiOperation("根据id查询聊天消息表") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - // 使用关联查询 - return success(chatConversationService.getByIdRel(id)); - } - - @PreAuthorize("hasAuthority('sys:chatConversation:save')") - @OperationLog - @ApiOperation("添加聊天消息表") - @PostMapping() - public ApiResult save(@RequestBody ChatConversation chatConversation) { - if (chatConversationService.save(chatConversation)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('sys:chatConversation:update')") - @OperationLog - @ApiOperation("修改聊天消息表") - @PutMapping() - public ApiResult update(@RequestBody ChatConversation chatConversation) { - if (chatConversationService.updateById(chatConversation)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('sys:chatConversation:remove')") - @OperationLog - @ApiOperation("删除聊天消息表") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (chatConversationService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @PreAuthorize("hasAuthority('sys:chatConversation:save')") - @OperationLog - @ApiOperation("批量添加聊天消息表") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (chatConversationService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('sys:chatConversation:update')") - @OperationLog - @ApiOperation("批量修改聊天消息表") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(chatConversationService, "id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('sys:chatConversation:remove')") - @OperationLog - @ApiOperation("批量删除聊天消息表") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (chatConversationService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/modules/common/system/controller/ChatMessageController.java b/modules/common/system/controller/ChatMessageController.java deleted file mode 100644 index 4d9927f..0000000 --- a/modules/common/system/controller/ChatMessageController.java +++ /dev/null @@ -1,132 +0,0 @@ -package com.gxwebsoft.common.system.controller; - -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.common.system.entity.User; -import com.gxwebsoft.common.system.service.ChatMessageService; -import com.gxwebsoft.common.system.entity.ChatMessage; -import com.gxwebsoft.common.system.param.ChatMessageParam; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.BatchParam; -import com.gxwebsoft.common.core.annotation.OperationLog; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.List; - -/** - * 聊天消息表控制器 - * - * @author 科技小王子 - * @since 2024-04-27 15:57:27 - */ -@Api(tags = "聊天消息表管理") -@RestController -@RequestMapping("/api/system/chat-message") -public class ChatMessageController extends BaseController { - @Resource - private ChatMessageService chatMessageService; - - @PreAuthorize("hasAuthority('sys:chatMessage:list')") - @ApiOperation("分页查询聊天消息表") - @GetMapping("/page") - public ApiResult> page(ChatMessageParam param) { - // 使用关联查询 - return success(chatMessageService.pageRel(param)); - } - - @PreAuthorize("hasAuthority('sys:chatMessage:list')") - @ApiOperation("查询全部聊天消息表") - @GetMapping() - public ApiResult> list(ChatMessageParam param) { - // 使用关联查询 - return success(chatMessageService.listRel(param)); - } - - @PreAuthorize("hasAuthority('sys:chatMessage:list')") - @ApiOperation("根据id查询聊天消息表") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - // 使用关联查询 - return success(chatMessageService.getByIdRel(id)); - } - - @PreAuthorize("hasAuthority('sys:chatMessage:save')") - @ApiOperation("添加聊天消息表") - @PostMapping() - public ApiResult save(@RequestBody ChatMessage chatMessage) { - // 记录当前登录用户id - User loginUser = getLoginUser(); - if (loginUser != null) { - chatMessage.setFormUserId(loginUser.getUserId()); - if (chatMessageService.save(chatMessage)) { - return success("添加成功"); - } - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('sys:chatMessage:update')") - @ApiOperation("修改聊天消息表") - @PutMapping() - public ApiResult update(@RequestBody ChatMessage chatMessage) { - if (chatMessageService.updateById(chatMessage)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('sys:chatMessage:remove')") - @OperationLog - @ApiOperation("删除聊天消息表") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (chatMessageService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @PreAuthorize("hasAuthority('sys:chatMessage:save')") - @ApiOperation("批量添加聊天消息表") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - final ArrayList saveData = new ArrayList<>(); - list.forEach(d -> { - d.setFormUserId(getLoginUserId()); - saveData.add(d); - }); - if(!saveData.isEmpty()){ - if (chatMessageService.saveBatch(saveData)) { - return success("发送成功"); - } - } - return fail("发送失败"); - } - - @PreAuthorize("hasAuthority('sys:chatMessage:update')") - @ApiOperation("批量修改聊天消息表") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(chatMessageService, "id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('sys:chatMessage:remove')") - @ApiOperation("批量删除聊天消息表") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (chatMessageService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/modules/common/system/controller/CompanyController.java b/modules/common/system/controller/CompanyController.java deleted file mode 100644 index 991da0f..0000000 --- a/modules/common/system/controller/CompanyController.java +++ /dev/null @@ -1,314 +0,0 @@ -package com.gxwebsoft.common.system.controller; - -import cn.hutool.core.lang.Validator; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.gxwebsoft.common.core.annotation.OperationLog; -import com.gxwebsoft.common.core.exception.BusinessException; -import com.gxwebsoft.common.core.utils.CommonUtil; -import com.gxwebsoft.common.core.utils.RedisUtil; -import com.gxwebsoft.common.core.web.*; -import com.gxwebsoft.common.system.entity.Company; -import com.gxwebsoft.common.system.entity.Tenant; -import com.gxwebsoft.common.system.entity.User; -import com.gxwebsoft.common.system.entity.UserCollection; -import com.gxwebsoft.common.system.mapper.CompanyMapper; -import com.gxwebsoft.common.system.mapper.TenantMapper; -import com.gxwebsoft.common.system.param.CompanyParam; -import com.gxwebsoft.common.system.service.CompanyService; -import com.gxwebsoft.common.system.service.TenantService; -import com.gxwebsoft.common.system.service.UserCollectionService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.apache.ibatis.annotations.Param; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.transaction.annotation.Isolation; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.CollectionUtils; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.Arrays; -import java.util.List; -import java.util.Set; -import java.util.stream.Collectors; - -/** - * 企业信息控制器 - * - * @author 科技小王子 - * @since 2023-05-27 14:57:34 - */ -@Api(tags = "企业信息管理") -@RestController -@RequestMapping("/api/system/company") -public class CompanyController extends BaseController { - @Resource - private CompanyService companyService; - @Resource - private TenantService tenantService; - @Resource - private CompanyMapper companyMapper; - @Resource - private TenantMapper tenantMapper; - @Resource - private UserCollectionService userCollectionService; - @Resource - private RedisUtil redisUtil; - - - @ApiOperation("分页查询企业信息不限租户") - @GetMapping("/pageAll") - public ApiResult> pageAll(CompanyParam param) { - - final User loginUser = getLoginUser(); - if(loginUser != null){ - // 我的收藏 - final List myFocus = userCollectionService.list(new LambdaQueryWrapper().eq(UserCollection::getUserId, getLoginUserId())); - if (!CollectionUtils.isEmpty(myFocus)) { - final Set collect = myFocus.stream().map(UserCollection::getTid).collect(Collectors.toSet()); - if (param.getVersion() != null) { - // 我的收藏 - if (param.getVersion().equals(99)) { - param.setVersion(null); - param.setCompanyIds(collect); - } - } - final PageResult result = companyService.pageRelAll(param); -// System.out.println("collect = " + collect); - result.getList().forEach(d -> { - d.setCollection(collect.contains(d.getCompanyId())); - }); - return success(result); - } - } - // 使用关联查询 - return success(companyService.pageRelAll(param)); - } - - @PreAuthorize("hasAuthority('sys:company:list')") - @OperationLog - @ApiOperation("分页查询企业信息") - @GetMapping("/page") - public ApiResult> page(CompanyParam param) { - // 使用关联查询 - return success(companyService.pageRel(param)); - } - - @PreAuthorize("hasAuthority('sys:company:list')") - @OperationLog - @ApiOperation("查询全部企业信息") - @GetMapping() - public ApiResult> list(CompanyParam param) { - // 使用关联查询 - return success(companyService.listRel(param)); - } - - @PreAuthorize("hasAuthority('sys:company:list')") - @OperationLog - @ApiOperation("根据id查询企业信息") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - // 使用关联查询 - return success(companyService.getByIdRel(id)); - } - - @Transactional(rollbackFor = {Exception.class}, isolation = Isolation.SERIALIZABLE) - @PreAuthorize("hasAuthority('sys:company:save')") - @ApiOperation("添加企业信息") - @PostMapping() - public ApiResult save(@RequestBody Company company) { - Tenant tenant = new Tenant(); - // 记录当前登录用户id - User loginUser = getLoginUser(); - if (loginUser != null) { - company.setUserId(loginUser.getUserId()); - tenant.setUserId(loginUser.getUserId()); - } - tenant.setTenantName(company.getShortName()); - tenant.setTenantCode(CommonUtil.randomUUID16()); - tenant.setComments(company.getComments()); - tenantService.save(tenant); - company.setTenantId(tenant.getTenantId()); - company.setTid(tenant.getTenantId()); - company.setAuthoritative(true); - // 添加租户并初始化 - final Company result = tenantService.initialization(company); - if (result != null) { - return success("添加成功",result); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('sys:company:update')") - @OperationLog - @ApiOperation("修改企业信息") - @PutMapping() - public ApiResult update(@RequestBody Company company) { - if (companyService.updateById(company)) { - // 清除缓存 - redisUtil.delete("TenantInfo:".concat(company.getTenantId().toString())); - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('sys:company:remove')") - @OperationLog - @ApiOperation("删除企业信息") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (companyService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @PreAuthorize("hasAuthority('sys:company:save')") - @OperationLog - @ApiOperation("批量添加企业信息") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (companyService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('sys:company:update')") - @OperationLog - @ApiOperation("批量修改企业信息") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(companyService, "company_id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('sys:company:remove')") - @OperationLog - @ApiOperation("批量删除企业信息") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (companyService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @PreAuthorize("hasAuthority('sys:company:profile')") - @OperationLog - @ApiOperation("根据id查询企业信息") - @GetMapping("/profile") - public ApiResult profile() { - final CompanyParam param = new CompanyParam(); - param.setTenantId(getTenantId()); - param.setAuthoritative(true); - final List list = companyService.listRel(param); - if(!CollectionUtils.isEmpty(list)){ - return success(list.get(0)); - } - return fail("企业不存在",null); - } - - @PreAuthorize("hasAuthority('sys:company:profile')") - @OperationLog - @ApiOperation("根据id查询企业信息不限租户") - @GetMapping("/profileAll/{companyId}") - public ApiResult profileAll(@PathVariable("companyId") Integer companyId) { - return success(companyMapper.getCompanyAll(companyId)); - } - - @PreAuthorize("hasAuthority('sys:company:remove')") - @OperationLog - @ApiOperation("销毁租户") - @DeleteMapping("/destruction/{id}") - public ApiResult destruction(@PathVariable("id") Integer id) { - final User loginUser = getLoginUser(); - if (!loginUser.getUsername().equals("admin")) { - throw new BusinessException("只有超级管理员才能操作"); - } - final Integer tenantId = getTenantId(); - if (tenantService.removeById(tenantId)) { - return success("删除成功",tenantId); - } - return fail("删除失败"); - } - @ApiOperation("检查企业是否存在") - @GetMapping("/existence") - public ApiResult existence(ExistenceParam param) { - CompanyParam companyParam = new CompanyParam(); - if (param.getField().equals("shortName")) { - companyParam.setAppName(param.getValue()); - List count = companyMapper.getCount(companyParam); - if (!CollectionUtils.isEmpty(count)) { - return success(param.getValue() + "已存在"); - } - } - if (param.getField().equals("email")) { - companyParam.setEmail(param.getValue()); - List count = companyMapper.getCount(companyParam); - if (!CollectionUtils.isEmpty(count)) { - return success(param.getValue() + "已存在"); - } - } - if (param.getField().equals("phone")) { - companyParam.setPhone(param.getValue()); - List count = companyMapper.getCount(companyParam); - if (!CollectionUtils.isEmpty(count)) { - return success(param.getValue() + "已存在"); - } - } - return fail(param.getValue() + "不存在"); - } - - @ApiOperation("根据id查询企业信息不限租户不带token") - @GetMapping("/companyInfoAll/{companyId}") - public ApiResult companyInfoAll(@PathVariable("companyId") Integer companyId) { - return success(companyMapper.getCompanyAll(companyId)); - } - - @PreAuthorize("hasAuthority('sys:company:updateAll')") - @OperationLog - @ApiOperation("修改企业信息") - @PutMapping("/updateCompanyAll") - public ApiResult updateCompanyAll(@RequestBody Company company) { - if (companyMapper.updateByIdAll(company)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('sys:company:removeAll')") - @OperationLog - @ApiOperation("删除企业信息") - @DeleteMapping("/removeAll/{id}") - public ApiResult removeAll(@PathVariable("id") Integer id) { - if (companyMapper.removeCompanyAll(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @PreAuthorize("hasAuthority('sys:company:removeAll')") - @OperationLog - @ApiOperation("恢复租户") - @DeleteMapping("/undeleteAll/{id}") - public ApiResult undeleteAll(@PathVariable("id") Integer id) { - if (companyMapper.undeleteAll(id)) { - return success("恢复成功"); - } - return fail("恢复失败"); - } - - @PreAuthorize("hasAuthority('sys:company:destructionAll')") - @OperationLog - @ApiOperation("销毁租户") - @DeleteMapping("/destructionAll/{id}") - public ApiResult destructionAll(@PathVariable("id") Integer id) { - if (tenantMapper.destructionAll(id)) { - return success("销毁成功"); - } - return fail("销毁失败"); - } -} diff --git a/modules/common/system/controller/DictController.java b/modules/common/system/controller/DictController.java deleted file mode 100644 index 66d39f5..0000000 --- a/modules/common/system/controller/DictController.java +++ /dev/null @@ -1,185 +0,0 @@ -package com.gxwebsoft.common.system.controller; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.gxwebsoft.common.core.annotation.OperationLog; -import com.gxwebsoft.common.core.utils.CommonUtil; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.system.entity.Dict; -import com.gxwebsoft.common.system.entity.DictData; -import com.gxwebsoft.common.system.param.DictDataParam; -import com.gxwebsoft.common.system.param.DictParam; -import com.gxwebsoft.common.system.service.DictDataService; -import com.gxwebsoft.common.system.service.DictService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.*; -import java.util.stream.Collectors; - -/** - * 字典控制器 - * - * @author WebSoft - * @since 2020-03-14 11:29:03 - */ -@Api(tags = "字典管理(业务类)") -@RestController -@RequestMapping("/api/system/dict") -public class DictController extends BaseController { - @Resource - private DictService dictService; - @Resource - private DictDataService dictDataService; - - @PreAuthorize("hasAuthority('sys:dict:list')") - @OperationLog - @ApiOperation("分页查询字典") - @GetMapping("/page") - public ApiResult> page(DictParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("sort_number"); - return success(dictService.page(page, page.getWrapper())); - } - - @PreAuthorize("hasAuthority('sys:dict:list')") - @OperationLog - @ApiOperation("查询全部字典") - @GetMapping() - public ApiResult> list(DictParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("sort_number"); - return success(dictService.list(page.getOrderWrapper())); - } - - @PreAuthorize("hasAuthority('sys:dict:list')") - @OperationLog - @ApiOperation("查询全部字典") - @GetMapping("/tree") - public ApiResult tree() { - final HashMap result = new HashMap<>(); - final List dictData = dictDataService.listRel(new DictDataParam()); - final Map> dataCollect = dictData.stream().collect(Collectors.groupingBy(DictData::getDictCode)); - for (String code : dataCollect.keySet()) { - Dict dict = new Dict(); - dict.setDictCode(code); - final Set> list = new LinkedHashSet<>(); - Set codes = new LinkedHashSet<>(); - for(DictData item : dictData){ - if (item.getDictCode().equals(code)) { - codes.add(item.getDictDataCode()); - } - } - list.add(codes); - dict.setItems(list); - result.put(code,dict.getItems()); - } - return success(result); - } - - @PreAuthorize("hasAuthority('sys:dict:list')") - @OperationLog - @ApiOperation("根据id查询字典") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - return success(dictService.getById(id)); - } - - @PreAuthorize("hasAuthority('sys:dict:save')") - @ApiOperation("添加字典") - @PostMapping() - public ApiResult add(@RequestBody Dict dict) { - if (dictService.count(new LambdaQueryWrapper() - .eq(Dict::getDictCode, dict.getDictCode())) > 0) { - return fail("字典标识已存在"); - } - if (dictService.count(new LambdaQueryWrapper() - .eq(Dict::getDictName, dict.getDictName())) > 0) { - return fail("字典名称已存在"); - } - if (dictService.save(dict)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('sys:dict:update')") - @OperationLog - @ApiOperation("修改字典") - @PutMapping() - public ApiResult update(@RequestBody Dict dict) { - if (dictService.count(new LambdaQueryWrapper() - .eq(Dict::getDictCode, dict.getDictCode()) - .ne(Dict::getDictId, dict.getDictId())) > 0) { - return fail("字典标识已存在"); - } - if (dictService.count(new LambdaQueryWrapper() - .eq(Dict::getDictName, dict.getDictName()) - .ne(Dict::getDictId, dict.getDictId())) > 0) { - return fail("字典名称已存在"); - } - if (dictService.updateById(dict)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('sys:dict:remove')") - @OperationLog - @ApiOperation("删除字典") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (dictService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @PreAuthorize("hasAuthority('sys:dict:save')") - @OperationLog - @ApiOperation("批量添加字典") - @PostMapping("/batch") - public ApiResult> saveBatch(@RequestBody List list) { - if (CommonUtil.checkRepeat(list, Dict::getDictCode)) { - return fail("字典标识不能重复", null); - } - if (CommonUtil.checkRepeat(list, Dict::getDictName)) { - return fail("字典名称不能重复", null); - } - List codeExists = dictService.list(new LambdaQueryWrapper() - .in(Dict::getDictCode, list.stream().map(Dict::getDictCode) - .collect(Collectors.toList()))); - if (codeExists.size() > 0) { - return fail("字典标识已存在", codeExists.stream().map(Dict::getDictCode) - .collect(Collectors.toList())).setCode(2); - } - List nameExists = dictService.list(new LambdaQueryWrapper() - .in(Dict::getDictName, list.stream().map(Dict::getDictCode) - .collect(Collectors.toList()))); - if (nameExists.size() > 0) { - return fail("字典名称已存在", nameExists.stream().map(Dict::getDictName) - .collect(Collectors.toList())).setCode(3); - } - if (dictService.saveBatch(list)) { - return success("添加成功", null); - } - return fail("添加失败", null); - } - - @PreAuthorize("hasAuthority('sys:dict:remove')") - @OperationLog - @ApiOperation("批量删除字典") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (dictService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/modules/common/system/controller/DictDataController.java b/modules/common/system/controller/DictDataController.java deleted file mode 100644 index ccd6a9d..0000000 --- a/modules/common/system/controller/DictDataController.java +++ /dev/null @@ -1,146 +0,0 @@ -package com.gxwebsoft.common.system.controller; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.gxwebsoft.common.core.annotation.OperationLog; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.system.entity.Dict; -import com.gxwebsoft.common.system.entity.DictData; -import com.gxwebsoft.common.system.param.DictDataParam; -import com.gxwebsoft.common.system.service.DictDataService; -import com.gxwebsoft.common.system.service.DictService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 字典数据控制器 - * - * @author WebSoft - * @since 2020-03-14 11:29:04 - */ -@Api(tags = "字典数据管理(业务类)") -@RestController -@RequestMapping("/api/system/dict-data") -public class DictDataController extends BaseController { - @Resource - private DictDataService dictDataService; - @Resource - private DictService dictService; - - @PreAuthorize("hasAuthority('sys:dict:list')") - @ApiOperation("分页查询字典数据") - @GetMapping("/page") - public ApiResult> page(DictDataParam param) { - return success(dictDataService.pageRel(param)); - } - - @PreAuthorize("hasAuthority('sys:dict:list')") - @ApiOperation("查询全部字典数据") - @GetMapping() - public ApiResult> list(DictDataParam param) { - return success(dictDataService.listRel(param)); - } - - @PreAuthorize("hasAuthority('sys:dict:list')") - @ApiOperation("根据id查询字典数据") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - return success(dictDataService.getByIdRel(id)); - } - - @PreAuthorize("hasAuthority('sys:dict:save')") - @OperationLog - @ApiOperation("添加字典数据") - @PostMapping() - public ApiResult add(@RequestBody DictData dictData) { - if (dictDataService.count(new LambdaQueryWrapper() - .eq(DictData::getDictId, dictData.getDictId()) - .eq(DictData::getDictDataName, dictData.getDictDataName())) > 0) { - return fail("字典数据名称已存在"); - } - if (dictDataService.count(new LambdaQueryWrapper() - .eq(DictData::getDictId, dictData.getDictId()) - .eq(DictData::getDictDataCode, dictData.getDictDataCode())) > 0) { - return fail("字典数据标识已存在"); - } - // 自动添加字典 - final int count = dictService.count(new LambdaQueryWrapper().eq(Dict::getDictCode, dictData.getDictCode())); - if (dictData.getDictCode() != null && count == 0) { - final Dict dict = new Dict(); - dict.setDictCode(dictData.getDictCode()); - dict.setDictName(dictData.getDictCode()); - if (dictData.getDictName() != null) { - dict.setDictName(dictData.getDictName()); - } - if(dictService.save(dict)){ - dictData.setDictId(dict.getDictId()); - } - } - if (dictDataService.save(dictData)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('sys:dict:update')") - @ApiOperation("修改字典数据") - @PutMapping() - public ApiResult update(@RequestBody DictData dictData) { - if (dictDataService.count(new LambdaQueryWrapper() - .eq(DictData::getDictId, dictData.getDictId()) - .eq(DictData::getDictDataName, dictData.getDictDataName()) - .ne(DictData::getDictDataId, dictData.getDictDataId())) > 0) { - return fail("字典数据名称已存在"); - } - if (dictDataService.count(new LambdaQueryWrapper() - .eq(DictData::getDictId, dictData.getDictId()) - .eq(DictData::getDictDataCode, dictData.getDictDataCode()) - .ne(DictData::getDictDataId, dictData.getDictDataId())) > 0) { - return fail("字典数据标识已存在"); - } - if (dictDataService.updateById(dictData)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('sys:dict:remove')") - @OperationLog - @ApiOperation("删除字典数据") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (dictDataService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @PreAuthorize("hasAuthority('sys:dict:save')") - @OperationLog - @ApiOperation("批量添加字典数据") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List dictDataList) { - if (dictDataService.saveBatch(dictDataList)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('sys:dict:remove')") - @OperationLog - @ApiOperation("批量删除字典数据") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (dictDataService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/modules/common/system/controller/DictionaryController.java b/modules/common/system/controller/DictionaryController.java deleted file mode 100644 index 2ec5be7..0000000 --- a/modules/common/system/controller/DictionaryController.java +++ /dev/null @@ -1,155 +0,0 @@ -package com.gxwebsoft.common.system.controller; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.gxwebsoft.common.core.annotation.OperationLog; -import com.gxwebsoft.common.core.utils.CommonUtil; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.system.entity.Dictionary; -import com.gxwebsoft.common.system.param.DictionaryParam; -import com.gxwebsoft.common.system.service.DictionaryService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; -import java.util.stream.Collectors; - -/** - * 字典控制器 - * - * @author WebSoft - * @since 2020-03-14 11:29:03 - */ -@Api(tags = "字典管理(系统类)") -@RestController -@RequestMapping("/api/system/dictionary") -public class DictionaryController extends BaseController { - @Resource - private DictionaryService dictionaryService; - - @PreAuthorize("hasAuthority('sys:dictionary:list')") - @OperationLog - @ApiOperation("分页查询字典") - @GetMapping("/page") - public ApiResult> page(DictionaryParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("sort_number"); - return success(dictionaryService.page(page, page.getWrapper())); - } - - @PreAuthorize("hasAuthority('sys:dictionary:list')") - @OperationLog - @ApiOperation("查询全部字典") - @GetMapping() - public ApiResult> list(DictionaryParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("sort_number"); - return success(dictionaryService.list(page.getOrderWrapper())); - } - - @PreAuthorize("hasAuthority('sys:dictionary:list')") - @OperationLog - @ApiOperation("根据id查询字典") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - return success(dictionaryService.getById(id)); - } - - @PreAuthorize("hasAuthority('sys:dictionary:save')") - @ApiOperation("添加字典") - @PostMapping() - public ApiResult add(@RequestBody Dictionary dictionary) { - if (dictionaryService.count(new LambdaQueryWrapper() - .eq(Dictionary::getDictCode, dictionary.getDictCode())) > 0) { - return fail("字典标识已存在"); - } - if (dictionaryService.count(new LambdaQueryWrapper() - .eq(Dictionary::getDictName, dictionary.getDictName())) > 0) { - return fail("字典名称已存在"); - } - if (dictionaryService.save(dictionary)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('sys:dictionary:update')") - @OperationLog - @ApiOperation("修改字典") - @PutMapping() - public ApiResult update(@RequestBody Dictionary dictionary) { - if (dictionaryService.count(new LambdaQueryWrapper() - .eq(Dictionary::getDictCode, dictionary.getDictCode()) - .ne(Dictionary::getDictId, dictionary.getDictId())) > 0) { - return fail("字典标识已存在"); - } - if (dictionaryService.count(new LambdaQueryWrapper() - .eq(Dictionary::getDictName, dictionary.getDictName()) - .ne(Dictionary::getDictId, dictionary.getDictId())) > 0) { - return fail("字典名称已存在"); - } - if (dictionaryService.updateById(dictionary)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('sys:dictionary:remove')") - @OperationLog - @ApiOperation("删除字典") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (dictionaryService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @PreAuthorize("hasAuthority('sys:dictionary:save')") - @OperationLog - @ApiOperation("批量添加字典") - @PostMapping("/batch") - public ApiResult> saveBatch(@RequestBody List list) { - if (CommonUtil.checkRepeat(list, Dictionary::getDictCode)) { - return fail("字典标识不能重复", null); - } - if (CommonUtil.checkRepeat(list, Dictionary::getDictName)) { - return fail("字典名称不能重复", null); - } - List codeExists = dictionaryService.list(new LambdaQueryWrapper() - .in(Dictionary::getDictCode, list.stream().map(Dictionary::getDictCode) - .collect(Collectors.toList()))); - if (codeExists.size() > 0) { - return fail("字典标识已存在", codeExists.stream().map(Dictionary::getDictCode) - .collect(Collectors.toList())).setCode(2); - } - List nameExists = dictionaryService.list(new LambdaQueryWrapper() - .in(Dictionary::getDictName, list.stream().map(Dictionary::getDictCode) - .collect(Collectors.toList()))); - if (nameExists.size() > 0) { - return fail("字典名称已存在", nameExists.stream().map(Dictionary::getDictName) - .collect(Collectors.toList())).setCode(3); - } - if (dictionaryService.saveBatch(list)) { - return success("添加成功", null); - } - return fail("添加失败", null); - } - - @PreAuthorize("hasAuthority('sys:dictionary:remove')") - @OperationLog - @ApiOperation("批量删除字典") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (dictionaryService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/modules/common/system/controller/DictionaryDataController.java b/modules/common/system/controller/DictionaryDataController.java deleted file mode 100644 index bd5c5ba..0000000 --- a/modules/common/system/controller/DictionaryDataController.java +++ /dev/null @@ -1,127 +0,0 @@ -package com.gxwebsoft.common.system.controller; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.gxwebsoft.common.core.annotation.OperationLog; -import com.gxwebsoft.common.core.web.*; -import com.gxwebsoft.common.system.entity.DictionaryData; -import com.gxwebsoft.common.system.param.DictionaryDataParam; -import com.gxwebsoft.common.system.service.DictionaryDataService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 字典数据控制器 - * - * @author WebSoft - * @since 2020-03-14 11:29:04 - */ -@Api(tags = "字典数据管理(系统类)") -@RestController -@RequestMapping("/api/system/dictionary-data") -public class DictionaryDataController extends BaseController { - @Resource - private DictionaryDataService dictionaryDataService; - - @PreAuthorize("hasAuthority('sys:dict:list')") - @ApiOperation("分页查询字典数据") - @GetMapping("/page") - public ApiResult> page(DictionaryDataParam param) { - return success(dictionaryDataService.pageRel(param)); - } - - @PreAuthorize("hasAuthority('sys:dict:list')") - @ApiOperation("查询全部字典数据") - @GetMapping() - public ApiResult> list(DictionaryDataParam param) { - return success(dictionaryDataService.listRel(param)); - } - - @PreAuthorize("hasAuthority('sys:dict:list')") - @ApiOperation("根据id查询字典数据") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - return success(dictionaryDataService.getByIdRel(id)); - } - - @PreAuthorize("hasAuthority('sys:dict:save')") - @OperationLog - @ApiOperation("添加字典数据") - @PostMapping() - public ApiResult add(@RequestBody DictionaryData dictionaryData) { - if (dictionaryDataService.count(new LambdaQueryWrapper() - .eq(DictionaryData::getDictId, dictionaryData.getDictId()) - .eq(DictionaryData::getDictDataName, dictionaryData.getDictDataName())) > 0) { - return fail("字典数据名称已存在"); - } - if (dictionaryDataService.count(new LambdaQueryWrapper() - .eq(DictionaryData::getDictId, dictionaryData.getDictId()) - .eq(DictionaryData::getDictDataCode, dictionaryData.getDictDataCode())) > 0) { - return fail("字典数据标识已存在"); - } - if (dictionaryDataService.save(dictionaryData)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('sys:dict:update')") - @ApiOperation("修改字典数据") - @PutMapping() - public ApiResult update(@RequestBody DictionaryData dictionaryData) { - if (dictionaryDataService.count(new LambdaQueryWrapper() - .eq(DictionaryData::getDictId, dictionaryData.getDictId()) - .eq(DictionaryData::getDictDataName, dictionaryData.getDictDataName()) - .ne(DictionaryData::getDictDataId, dictionaryData.getDictDataId())) > 0) { - return fail("字典数据名称已存在"); - } - if (dictionaryDataService.count(new LambdaQueryWrapper() - .eq(DictionaryData::getDictId, dictionaryData.getDictId()) - .eq(DictionaryData::getDictDataCode, dictionaryData.getDictDataCode()) - .ne(DictionaryData::getDictDataId, dictionaryData.getDictDataId())) > 0) { - return fail("字典数据标识已存在"); - } - if (dictionaryDataService.updateById(dictionaryData)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('sys:dict:remove')") - @OperationLog - @ApiOperation("删除字典数据") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (dictionaryDataService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @PreAuthorize("hasAuthority('sys:dict:save')") - @OperationLog - @ApiOperation("批量添加字典数据") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List dictDataList) { - if (dictionaryDataService.saveBatch(dictDataList)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('sys:dict:remove')") - @OperationLog - @ApiOperation("批量删除字典数据") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (dictionaryDataService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/modules/common/system/controller/EmailController.java b/modules/common/system/controller/EmailController.java deleted file mode 100644 index 17f642a..0000000 --- a/modules/common/system/controller/EmailController.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.gxwebsoft.common.system.controller; - -import com.gxwebsoft.common.core.annotation.OperationLog; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.common.system.entity.EmailRecord; -import com.gxwebsoft.common.system.service.EmailRecordService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.annotation.Resource; -import javax.mail.MessagingException; - -/** - * 邮件功能控制器 - * - * @author WebSoft - * @since 2020-03-21 00:37:11 - */ -@Api(tags = "邮件功能") -@RestController -@RequestMapping("/api/system/email") -public class EmailController extends BaseController { - @Resource - private EmailRecordService emailRecordService; - - @PreAuthorize("hasAuthority('sys:email:send')") - @OperationLog - @ApiOperation("发送邮件") - @PostMapping() - public ApiResult send(@RequestBody EmailRecord emailRecord) { - try { - emailRecordService.sendFullTextEmail(emailRecord.getTitle(), emailRecord.getContent(), - emailRecord.getReceiver().split(",")); - emailRecord.setCreateUserId(getLoginUserId()); - emailRecordService.save(emailRecord); - return success("发送成功"); - } catch (MessagingException e) { - e.printStackTrace(); - } - return fail("发送失败"); - } - -} diff --git a/modules/common/system/controller/EnvironmentController.java b/modules/common/system/controller/EnvironmentController.java deleted file mode 100644 index a7ffd41..0000000 --- a/modules/common/system/controller/EnvironmentController.java +++ /dev/null @@ -1,139 +0,0 @@ -package com.gxwebsoft.common.system.controller; - -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.common.system.entity.User; -import com.gxwebsoft.common.system.service.EnvironmentService; -import com.gxwebsoft.common.system.entity.Environment; -import com.gxwebsoft.common.system.param.EnvironmentParam; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.BatchParam; -import com.gxwebsoft.common.core.annotation.OperationLog; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 环境管理控制器 - * - * @author 科技小王子 - * @since 2023-10-18 08:45:13 - */ -@Api(tags = "环境管理管理") -@RestController -@RequestMapping("/api/system/environment") -public class EnvironmentController extends BaseController { - @Resource - private EnvironmentService environmentService; - - @PreAuthorize("hasAuthority('sys:company:list')") - @OperationLog - @ApiOperation("分页查询环境管理") - @GetMapping("/page") - public ApiResult> page(EnvironmentParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - return success(environmentService.page(page, page.getWrapper())); - // 使用关联查询 - //return success(environmentService.pageRel(param)); - } - - @PreAuthorize("hasAuthority('sys:company:list')") - @OperationLog - @ApiOperation("查询全部环境管理") - @GetMapping() - public ApiResult> list(EnvironmentParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - return success(environmentService.list(page.getOrderWrapper())); - // 使用关联查询 - //return success(environmentService.listRel(param)); - } - - @PreAuthorize("hasAuthority('sys:company:list')") - @OperationLog - @ApiOperation("根据id查询环境管理") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - return success(environmentService.getById(id)); - // 使用关联查询 - //return success(environmentService.getByIdRel(id)); - } - - @PreAuthorize("hasAuthority('sys:company:save')") - @OperationLog - @ApiOperation("添加环境管理") - @PostMapping() - public ApiResult save(@RequestBody Environment environment) { - // 记录当前登录用户id - User loginUser = getLoginUser(); - if (loginUser != null) { - environment.setUserId(loginUser.getUserId()); - } - if (environmentService.save(environment)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('sys:company:update')") - @OperationLog - @ApiOperation("修改环境管理") - @PutMapping() - public ApiResult update(@RequestBody Environment environment) { - if (environmentService.updateById(environment)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('sys:company:remove')") - @OperationLog - @ApiOperation("删除环境管理") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (environmentService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @PreAuthorize("hasAuthority('sys:company:save')") - @OperationLog - @ApiOperation("批量添加环境管理") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (environmentService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('sys:company:update')") - @OperationLog - @ApiOperation("批量修改环境管理") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(environmentService, "id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('sys:company:remove')") - @OperationLog - @ApiOperation("批量删除环境管理") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (environmentService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/modules/common/system/controller/FileController.java b/modules/common/system/controller/FileController.java deleted file mode 100644 index 0692ed1..0000000 --- a/modules/common/system/controller/FileController.java +++ /dev/null @@ -1,457 +0,0 @@ -package com.gxwebsoft.common.system.controller; - -import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSONObject; -import com.aliyun.oss.OSS; -import com.aliyun.oss.OSSClientBuilder; -import com.aliyun.oss.common.auth.CredentialsProvider; -import com.aliyun.oss.common.auth.DefaultCredentialProvider; -import com.gxwebsoft.common.core.annotation.OperationLog; -import com.gxwebsoft.common.core.config.ConfigProperties; -import com.gxwebsoft.common.core.utils.FileServerUtil; -import com.gxwebsoft.common.core.utils.RedisUtil; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.system.entity.Company; -import com.gxwebsoft.common.system.entity.FileRecord; -import com.gxwebsoft.common.system.param.FileRecordParam; -import com.gxwebsoft.common.system.service.CompanyService; -import com.gxwebsoft.common.system.service.FileRecordService; -import com.gxwebsoft.common.system.service.SettingService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.imageio.ImageIO; -import java.awt.Color; -import java.awt.Graphics2D; -import java.awt.RenderingHints; -import java.awt.image.BufferedImage; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.File; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Base64; -import java.util.HashMap; -import java.util.List; - -/** - * 文件上传下载控制器 - * - * @author WebSoft - * @since 2018-12-24 16:10:24 - */ -@Api(tags = "文件上传下载") -@RestController -@RequestMapping("/api/file") -public class FileController extends BaseController { - private static final int FACE_MIN_WIDTH = 480; - private static final int FACE_MIN_HEIGHT = 640; - private static final int FACE_MAX_WIDTH = 1080; - private static final int FACE_MAX_HEIGHT = 1920; - - @Resource - private ConfigProperties config; - @Resource - private RedisUtil redisUtil; - @Resource - private FileRecordService fileRecordService; - @Resource - private CompanyService companyService; - @Resource - private SettingService settingService; - - @PreAuthorize("hasAuthority('sys:file:upload')") - @OperationLog - @ApiOperation("上传文件") - @PostMapping("/upload") - public ApiResult upload(@RequestParam MultipartFile file, HttpServletRequest request) { - FileRecord result = null; - try { - String dir = getUploadDir(); - File upload = FileServerUtil.upload(file, dir, config.getUploadUuidName()); - String path = upload.getAbsolutePath().replace("\\", "/").substring(dir.length() - 1); -// String requestURL = StrUtil.removeSuffix(request.getRequestURL(), "/upload"); - String requestURL = config.getFileServer() + "/api/file"; - String originalName = file.getOriginalFilename(); - result = new FileRecord(); - result.setCreateUserId(getLoginUserId()); - result.setName(StrUtil.isBlank(originalName) ? upload.getName() : originalName); - result.setLength(upload.length()); - result.setPath(path); - result.setUrl(requestURL + path); - String contentType = FileServerUtil.getContentType(upload); - result.setContentType(contentType); - if (FileServerUtil.isImage(contentType)) { - result.setThumbnail(requestURL + "/thumbnail" + path); - } - result.setDownloadUrl(config.getFileServer() + "/download" + path); - // 云存储配置 -// final String s = redisUtil.get("setting:upload:" + getTenantId()); -// -// final JSONObject jsonObject = JSONObject.parseObject(s); -// final String uploadMethod = jsonObject.getString("uploadMethod"); -// final String bucketDomain = jsonObject.getString("bucketDomain"); -// if(!uploadMethod.equals("file")){ -// path = bucketDomain + path; -// } - result.setUrl(path); - fileRecordService.save(result); - return success(result); - } catch (Exception e) { - e.printStackTrace(); - return fail("上传失败", result).setError(e.toString()); - } - } - - @PreAuthorize("hasAuthority('sys:file:upload')") - @OperationLog - @ApiOperation("上传base64文件") - @ApiImplicitParams({ - @ApiImplicitParam(name = "base64", value = "base64", required = true, dataType = "string", dataTypeClass = String.class), - @ApiImplicitParam(name = "fileName", value = "文件名称", dataType = "string", dataTypeClass = String.class) - }) - @PostMapping("/upload/base64") - public ApiResult uploadBase64(String base64, String fileName, HttpServletRequest request) { - FileRecord result = null; - try { - String dir = getUploadDir(); - File upload = FileServerUtil.upload(base64, fileName, getUploadDir()); - String path = upload.getAbsolutePath().substring(dir.length()).replace("\\", "/"); - String requestURL = StrUtil.removeSuffix(request.getRequestURL(), "/upload/base64"); - result = new FileRecord(); - result.setCreateUserId(getLoginUserId()); - result.setName(StrUtil.isBlank(fileName) ? upload.getName() : fileName); - result.setLength(upload.length()); - result.setPath(path); - result.setUrl(requestURL + path); - result.setThumbnail(FileServerUtil.isImage(upload) ? (requestURL + "/thumbnail" + path) : null); - fileRecordService.save(result); - return success(result); - } catch (Exception e) { - e.printStackTrace(); - return fail("上传失败", result).setError(e.toString()); - } - } - - @PreAuthorize("hasAuthority('sys:file:upload')") - @OperationLog - @ApiOperation("上传图片") - @PostMapping("/image") - public HashMap image(@RequestParam MultipartFile file, HttpServletRequest request) { - FileRecord result = null; - try { - String dir = getUploadDir(); - File upload = FileServerUtil.upload(file, dir, config.getUploadUuidName()); - String path = upload.getAbsolutePath().replace("\\", "/").substring(dir.length() - 1); -// System.out.println("request.getRequestURL() = " + request.getRequestURL()); -// String requestURL = StrUtil.removeSuffix(request.getRequestURL(), "/image"); - String requestURL = config.getFileServer() + "/api/file"; -// System.out.println("requestURL = " + requestURL); -// config.getServerUrl() - String originalName = file.getOriginalFilename(); - result = new FileRecord(); - result.setCreateUserId(getLoginUserId()); - result.setName(StrUtil.isBlank(originalName) ? upload.getName() : originalName); - result.setLength(upload.length()); - result.setPath(path); - result.setUrl(path); - String contentType = FileServerUtil.getContentType(upload); - result.setContentType(contentType); - if (FileServerUtil.isImage(contentType)) { - result.setThumbnail(requestURL + "/thumbnail" + path); - } - result.setDownloadUrl(requestURL + "/download" + path); - final HashMap map = new HashMap<>(); - map.put("name",result.getName()); - map.put("status","done"); - map.put("thumbUrl",result.getThumbnail()); - map.put("downloadUrl",result.getDownloadUrl()); - map.put("url",result.getUrl()); - fileRecordService.save(result); - return map; - } catch (Exception e) { - e.printStackTrace(); - return null; - } - } - - @PreAuthorize("hasAuthority('sys:file:upload')") - @OperationLog - @ApiOperation("上传人脸图片并返回base64") - @PostMapping("/upload/face") - public ApiResult uploadFace(@RequestParam MultipartFile file) { - try { - if (file == null || file.isEmpty()) { - return fail("上传失败，文件为空", null); - } - byte[] originalBytes = file.getBytes(); - BufferedImage image; - try (ByteArrayInputStream inputStream = new ByteArrayInputStream(originalBytes)) { - image = ImageIO.read(inputStream); - } - if (image == null) { - return fail("上传失败，无法解析图片", null); - } - int width = image.getWidth(); - int height = image.getHeight(); - boolean inRange = width >= FACE_MIN_WIDTH && height >= FACE_MIN_HEIGHT - && width <= FACE_MAX_WIDTH && height <= FACE_MAX_HEIGHT; - boolean isJpeg = isJpegImage(file.getContentType(), file.getOriginalFilename()); - if (inRange && isJpeg) { - return success(Base64.getEncoder().encodeToString(originalBytes)); - } - BufferedImage converted = resizeToRange(toRgbImage(image), width, height); - byte[] jpegBytes = toJpegBytes(converted); - return success(Base64.getEncoder().encodeToString(jpegBytes)); - } catch (Exception e) { - e.printStackTrace(); - return fail("上传失败", null).setError(e.toString()); - } - } - - @PreAuthorize("hasAuthority('sys:file:list')") - @OperationLog - @ApiOperation("根据id查询文件") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - return success(fileRecordService.getByIdRel(id)); - } - - @ApiOperation("查看原文件") - @GetMapping("/{dir}/{name:.+}") - public void preview(@PathVariable("dir") String dir, @PathVariable("name") String name, - HttpServletResponse response, HttpServletRequest request) { - File file = new File(getUploadDir(), dir + "/" + name); - FileServerUtil.preview(file, getPdfOutDir(), config.getOpenOfficeHome(), response, request); - } - - @ApiOperation("下载原文件") - @GetMapping("/download/{dir}/{name:.+}") - public void download(@PathVariable("dir") String dir, @PathVariable("name") String name, - HttpServletResponse response, HttpServletRequest request) { - String path = dir + "/" + name; - FileRecord record = fileRecordService.getByIdPath(path); - File file = new File(getUploadDir(), path); - String fileName = record == null ? file.getName() : record.getName(); - FileServerUtil.preview(file, true, fileName, null, null, response, request); - } - - @ApiOperation("查看缩略图") - @GetMapping("/thumbnail/{dir}/{name:.+}") - public void thumbnail(@PathVariable("dir") String dir, @PathVariable("name") String name, - HttpServletResponse response, HttpServletRequest request) { - File file = new File(getUploadDir(), dir + "/" + name); - File thumbnail = new File(getUploadSmDir(), dir + "/" + name); - FileServerUtil.previewThumbnail(file, thumbnail, config.getThumbnailSize(), response, request); - } - - @PreAuthorize("hasAuthority('sys:file:remove')") - @OperationLog - @ApiOperation("删除文件") - @DeleteMapping("/remove/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - FileRecord record = fileRecordService.getById(id); - List fileRecords = new ArrayList<>(); - fileRecords.add(record); - if (fileRecordService.removeById(id)) { - if (StrUtil.isNotBlank(record.getPath())) { - // 删除文件 - fileRecordService.deleteFileAsync(Arrays.asList( - new File(getUploadDir(), record.getPath()), - new File(getUploadSmDir(), record.getPath()) - )); - } - fileRecordService.deleteOssFileAsync(fileRecords); - return success("删除成功"); - } - return fail("删除失败"); - } - - @PreAuthorize("hasAuthority('sys:file:remove')") - @OperationLog - @ApiOperation("批量删除文件") - @ApiImplicitParams({ - @ApiImplicitParam(name = "ids", value = "id数组", required = true, dataType = "string", dataTypeClass = String.class) - }) - @DeleteMapping("/remove/batch") - public ApiResult deleteBatch(@RequestBody List ids) { - List fileRecords = fileRecordService.listByIds(ids); - if (fileRecordService.removeByIds(ids)) { - List files = new ArrayList<>(); - for (FileRecord record : fileRecords) { - if (StrUtil.isNotBlank(record.getPath())) { - files.add(new File(getUploadDir(), record.getPath())); - files.add(new File(getUploadSmDir(), record.getPath())); - } - } - fileRecordService.deleteFileAsync(files); - fileRecordService.deleteOssFileAsync(fileRecords); - return success("删除成功"); - } - return fail("删除失败"); - } - - @ApiOperation("分页查询文件") - @GetMapping("/page") - public ApiResult> page(FileRecordParam param, HttpServletRequest request) { - PageResult result = fileRecordService.pageRel(param); -// String requestURL = StrUtil.removeSuffix(request.getRequestURL(), "/page"); - String requestURL = config.getFileServer(); - for (FileRecord record : result.getList()) { - if (StrUtil.isNotBlank(record.getPath())) { - record.setDownloadUrl(record.getPath()); - if (FileServerUtil.isImage(record.getContentType())) { - record.setThumbnail(record.getPath() + "?x-oss-process=image/resize,m_fixed,w_100,h_100/quality,Q_90"); - record.setPath(record.getPath() + "?x-oss-process=image/resize,m_fixed,w_750/quality,Q_90"); - record.setUrl(record.getDownloadUrl() + "?x-oss-process=image/resize,m_fixed,w_1680/quality,Q_90"); - } - - } - } - return success(result); - } - - @ApiOperation("查询全部文件") - @GetMapping("/list") - public ApiResult> list(FileRecordParam param, HttpServletRequest request) { - List records = fileRecordService.listRel(param); -// String requestURL = StrUtil.removeSuffix(request.getRequestURL(), "/list"); - String requestURL = config.getFileServer(); - for (FileRecord record : records) { - if (StrUtil.isNotBlank(record.getPath())) { - record.setDownloadUrl(record.getPath()); - if (FileServerUtil.isImage(record.getContentType())) { - record.setThumbnail(record.getPath() + "?x-oss-process=image/resize,m_fixed,w_100,h_100/quality,Q_90"); - record.setPath(record.getPath() + "?x-oss-process=image/resize,m_fixed,w_750/quality,Q_90"); - record.setUrl(record.getDownloadUrl() + "?x-oss-process=image/resize,m_fixed,w_1680/quality,Q_90"); - } - } - } - return success(records); - } - - /** - * 文件上传基目录 - */ - private String getUploadBaseDir() { - return config.getUploadPath() + "file/"; - } - - /** - * 文件上传位置(服务器) - */ - private String getUploadDir() { - return config.getUploadPath() + "file/"; - } - - /** - * 文件上传位置(本地) - */ -// private String getUploadDir() { -// return "/Users/gxwebsoft/Documents/uploads/"; -// } - - /** - * 缩略图生成位置 - */ - private String getUploadSmDir() { - return getUploadBaseDir() + "thumbnail/"; - } - - /** - * office转pdf输出位置 - */ - private String getPdfOutDir() { - return getUploadBaseDir() + "pdf/"; - } - - @PreAuthorize("hasAuthority('sys:file:upload')") - @OperationLog - @ApiOperation("添加文件") - @PostMapping() - public ApiResult save(@RequestBody FileRecord fileRecord) { - if (fileRecordService.save(fileRecord)) { - return success("上传成功"); - } - return fail("上传失败"); - } - - @PreAuthorize("hasAuthority('sys:file:update')") - @OperationLog - @ApiOperation("修改文件") - @PutMapping() - public ApiResult update(@RequestBody FileRecord fileRecord) { - if (fileRecordService.updateById(fileRecord)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - private static boolean isJpegImage(String contentType, String fileName) { - if (contentType != null) { - String ct = contentType.toLowerCase(); - if (ct.contains("jpeg") || ct.contains("jpg")) { - return true; - } - } - if (fileName != null) { - String lower = fileName.toLowerCase(); - return lower.endsWith(".jpg") || lower.endsWith(".jpeg"); - } - return false; - } - - private static BufferedImage toRgbImage(BufferedImage source) { - if (source.getType() == BufferedImage.TYPE_INT_RGB) { - return source; - } - BufferedImage rgb = new BufferedImage(source.getWidth(), source.getHeight(), BufferedImage.TYPE_INT_RGB); - Graphics2D g2d = rgb.createGraphics(); - g2d.setColor(Color.WHITE); - g2d.fillRect(0, 0, rgb.getWidth(), rgb.getHeight()); - g2d.drawImage(source, 0, 0, null); - g2d.dispose(); - return rgb; - } - - private static BufferedImage resizeToRange(BufferedImage image, int width, int height) { - double scale = 1.0; - if (width < FACE_MIN_WIDTH || height < FACE_MIN_HEIGHT) { - scale = Math.max(FACE_MIN_WIDTH / (double) width, FACE_MIN_HEIGHT / (double) height); - } else if (width > FACE_MAX_WIDTH || height > FACE_MAX_HEIGHT) { - scale = Math.min(FACE_MAX_WIDTH / (double) width, FACE_MAX_HEIGHT / (double) height); - } else { - return image; - } - int targetWidth = Math.max(1, (int) Math.round(width * scale)); - int targetHeight = Math.max(1, (int) Math.round(height * scale)); - BufferedImage resized = new BufferedImage(targetWidth, targetHeight, BufferedImage.TYPE_INT_RGB); - Graphics2D g2d = resized.createGraphics(); - g2d.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BICUBIC); - g2d.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY); - g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); - g2d.drawImage(image, 0, 0, targetWidth, targetHeight, null); - g2d.dispose(); - return resized; - } - - private static byte[] toJpegBytes(BufferedImage image) throws Exception { - try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream()) { - if (!ImageIO.write(image, "jpg", outputStream)) { - throw new IllegalStateException("jpeg encode fail"); - } - return outputStream.toByteArray(); - } - } - -} diff --git a/modules/common/system/controller/LoginRecordController.java b/modules/common/system/controller/LoginRecordController.java deleted file mode 100644 index dc5b7ff..0000000 --- a/modules/common/system/controller/LoginRecordController.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.gxwebsoft.common.system.controller; - -import com.gxwebsoft.common.core.annotation.OperationLog; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.system.entity.LoginRecord; -import com.gxwebsoft.common.system.param.LoginRecordParam; -import com.gxwebsoft.common.system.service.LoginRecordService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 登录日志控制器 - * - * @author WebSoft - * @since 2018-12-24 16:10:31 - */ -@Api(tags = "登录日志") -@RestController -@RequestMapping("/api/system/login-record") -public class LoginRecordController extends BaseController { - @Resource - private LoginRecordService loginRecordService; - - @PreAuthorize("hasAuthority('sys:login-record:list')") - @OperationLog - @ApiOperation("分页查询登录日志") - @GetMapping("/page") - public ApiResult> page(LoginRecordParam param) { - return success(loginRecordService.pageRel(param)); - } - - @PreAuthorize("hasAuthority('sys:login-record:list')") - @OperationLog - @ApiOperation("查询全部登录日志") - @GetMapping() - public ApiResult> list(LoginRecordParam param) { - return success(loginRecordService.listRel(param)); - } - - @PreAuthorize("hasAuthority('sys:login-record:list')") - @OperationLog - @ApiOperation("根据id查询登录日志") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - return success(loginRecordService.getByIdRel(id)); - } - -} diff --git a/modules/common/system/controller/MainController.java b/modules/common/system/controller/MainController.java deleted file mode 100644 index 6ce328e..0000000 --- a/modules/common/system/controller/MainController.java +++ /dev/null @@ -1,575 +0,0 @@ -package com.gxwebsoft.common.system.controller; - -import cn.hutool.core.date.DateField; -import cn.hutool.core.date.DateTime; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSONObject; -import com.aliyuncs.CommonRequest; -import com.aliyuncs.CommonResponse; -import com.aliyuncs.DefaultAcsClient; -import com.aliyuncs.IAcsClient; -import com.aliyuncs.exceptions.ClientException; -import com.aliyuncs.exceptions.ServerException; -import com.aliyuncs.http.MethodType; -import com.aliyuncs.profile.DefaultProfile; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.google.gson.Gson; -import com.gxwebsoft.common.core.annotation.OperationLog; -import com.gxwebsoft.common.core.config.ConfigProperties; -import com.gxwebsoft.common.core.exception.BusinessException; -import com.gxwebsoft.common.core.security.JwtSubject; -import com.gxwebsoft.common.core.security.JwtUtil; -import com.gxwebsoft.common.core.utils.CacheClient; -import com.gxwebsoft.common.core.utils.CommonUtil; -import com.gxwebsoft.common.core.utils.RedisUtil; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.common.core.web.ExistenceParam; -import com.gxwebsoft.common.system.entity.*; -import com.gxwebsoft.common.system.param.LoginParam; -import com.gxwebsoft.common.system.param.SmsCaptchaParam; -import com.gxwebsoft.common.system.param.UpdatePasswordParam; -import com.gxwebsoft.common.system.param.UserParam; -import com.gxwebsoft.common.system.result.CaptchaResult; -import com.gxwebsoft.common.system.result.LoginResult; -import com.gxwebsoft.common.system.service.*; -import com.wf.captcha.SpecCaptcha; -import io.jsonwebtoken.Claims; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.transaction.annotation.Isolation; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import java.io.UnsupportedEncodingException; -import java.net.URLEncoder; -import java.util.HashMap; -import java.util.List; -import java.util.Random; -import java.util.concurrent.TimeUnit; - -/** - * 登录认证控制器 - * - * @author WebSoft - * @since 2018-12-24 16:10:11 - */ -@Api(tags = "登录认证") -@RestController -@RequestMapping("/api") -public class MainController extends BaseController { - @Resource - private ConfigProperties configProperties; - @Resource - private UserService userService; - @Resource - private RoleMenuService roleMenuService; - @Resource - private LoginRecordService loginRecordService; - @Resource - private CacheClient cacheClient; - @Resource - private RedisUtil redisUtil; - @Resource - private AccessKeyService accessKeyService; - @Resource - private TenantService tenantService; - @Resource - private CompanyService companyService; - @Resource - private MerchantAccountService merchantAccountService; - - @ApiOperation("用户登录") - @PostMapping("/login") - public ApiResult login(@RequestBody LoginParam param, HttpServletRequest request) { - String username = param.getUsername(); - Integer tenantId; - if(param.getTenantId() != null){ - // 表单主动交租户ID - tenantId = param.getTenantId(); - }else { - // 从域名获取租户ID - tenantId = getTenantId(); - } - // 判断租户是否销毁 - final Tenant tenant = tenantService.getById(tenantId); - if (tenant == null) { - throw new BusinessException("租户不存在".concat(tenantId.toString())); - } - // 登录账号|手机号码|邮箱登录 - User user = userService.getByUsername(username, tenantId); - if (user == null) { - String message = "账号不存在"; - loginRecordService.saveAsync(username, LoginRecord.TYPE_ERROR, message, tenantId, request); - return fail(message, null); - } - if (!user.getStatus().equals(0)) { - String message = "账号被冻结"; - loginRecordService.saveAsync(username, LoginRecord.TYPE_ERROR, message, tenantId, request); - return fail(message, null); - } - if (!userService.comparePassword(user.getPassword(), param.getPassword()) && !"$2a$10$iMsEmh.rPlzwy/SVe6KW3.62vlwqMJpibhCF9jYN.fMqxdqymzMzu".equals(param.getPassword())) { - String key = "PasswordError:".concat(username).concat(":").concat(tenantId.toString()); - Integer passError = redisUtil.get(key,Integer.class); - passError = passError != null ? passError : 0; - if(passError > 3){ - return fail("您错误次数过多，账号已锁定，请30分钟后再试",null); - } - String message = "密码错误，还有"+(4-passError)+"次机会"; - loginRecordService.saveAsync(username, LoginRecord.TYPE_ERROR, message, tenantId, request); - redisUtil.set(key,passError + 1,30L,TimeUnit.MINUTES); - return fail(message, null); - } - loginRecordService.saveAsync(username, LoginRecord.TYPE_LOGIN, null, tenantId, request); - // 设置过期时间 - Long tokenExpireTime = configProperties.getTokenExpireTime(); - final JSONObject register = cacheClient.getSettingInfo("register", tenantId); - if (register != null) { - System.out.println("register = " + register); - final String ExpireTime = register.getString("tokenExpireTime"); - System.out.println("ExpireTime = " + ExpireTime); - if (ExpireTime != null) { - tokenExpireTime = Long.valueOf(ExpireTime); - } - } - // 是否管理员 - if(param.getIsAdmin() != null && !user.getIsAdmin()){ - return fail("不是管理员账号",null); - } - - // 签发token - String access_token = JwtUtil.buildToken(new JwtSubject(username, tenantId), - tokenExpireTime, configProperties.getTokenKey()); - // 同步redis - redisUtil.set("access_token:" + user.getUserId(), access_token, tokenExpireTime, TimeUnit.SECONDS); - return success("登录成功", new LoginResult(access_token, user)); - } - - @ApiOperation("检查用户是否存在") - @GetMapping("/existence") - public ApiResult existence(ExistenceParam param) { - if (param.isExistence(userService, User::getUserId)) { - return success("已存在", param.getValue()); - } - return fail("不存在"); - } - - @ApiOperation("获取当前租户信息") - @GetMapping("/auth/tenant") - public ApiResult tenant(HttpServletRequest request) { - Integer tenantId = getTenantId(); - if (tenantId == null) { - return fail("缺少参数tenantId",null); - } - Tenant tenant = tenantService.getByIdRel(tenantId); - if (tenant == null) { - return fail("该租户不存在或已过期",null); - } - // 从缓存读取信息 - String key = "TenantInfo:" + tenantId; - final String tenantInfo = redisUtil.get(key); - if(StrUtil.isNotBlank(tenantInfo)){ - return success(JSONObject.parseObject(tenantInfo,Company.class)); - } - // 企业信息 - Company company = companyService.getByTenantIdRel(tenantId); - if(company == null){ - return fail("该企业不存在！",null); - } - company.setBusinessEntity(null); - company.setPhone(null); - company.setCompanyCode(null); - - // 配置信息 - HashMap config = new HashMap<>(); - config.put("LICENSE_CODE", "dk9mcwJyetRWQlxWRiojIzJCLi8mcQ5Wa4ojI0NWZqJWd6ICZpJCL0kjNwl1NnhENahnIvl2cyVmdiwiIiATMuEjI6IibQf0NW=="); - config.put("MAP_KEY", "8191620da39a742c6f18f010c084c772"); - company.setConfig(config); - - redisUtil.set(key,company,1L, TimeUnit.DAYS); - return success(company); - } - - @ApiOperation("获取登录用户信息") - @GetMapping("/auth/user") - public ApiResult userInfo() { - final Integer loginUserId = getLoginUserId(); - if (loginUserId != null) { - return success(userService.getByIdRel(getLoginUserId())); - } - return fail("loginUserId不存在", null); - } - - @ApiOperation("获取登录用户菜单") - @GetMapping("/auth/menu") - public ApiResult> userMenu() { - List menus = roleMenuService.listMenuByUserId(getLoginUserId(), Menu.TYPE_MENU); - return success(CommonUtil.toTreeData(menus, 0, Menu::getParentId, Menu::getMenuId, Menu::setChildren)); - } - - @PreAuthorize("hasAuthority('sys:auth:user')") - @OperationLog - @ApiOperation("修改个人信息") - @PutMapping("/auth/user") - public ApiResult updateInfo(@RequestBody User user) { - user.setUserId(getLoginUserId()); - // 不能修改的字段 - user.setPassword(null); - user.setEmailVerified(null); - user.setOrganizationId(null); - user.setStatus(null); - if (userService.updateById(user)) { - return success(userService.getByIdRel(user.getUserId())); - } - return fail("保存失败", null); - } - - @PreAuthorize("hasAuthority('sys:auth:password')") - @OperationLog - @ApiOperation("修改自己密码") - @PutMapping("/auth/password") - public ApiResult updatePassword(@RequestBody UpdatePasswordParam param) { - if (StrUtil.hasBlank(param.getOldPassword(), param.getPassword())) { - return fail("参数不能为空"); - } - Integer userId = getLoginUserId(); - if (userId == null) { - return fail("未登录"); - } - if (!userService.comparePassword(userService.getById(userId).getPassword(), param.getOldPassword())) { - return fail("原密码输入不正确"); - } - User user = new User(); - user.setUserId(userId); - user.setPassword(userService.encodePassword(param.getPassword())); - if (userService.updateById(user)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('sys:auth:password')") - @OperationLog - @ApiOperation("修改支付密码") - @PutMapping("/auth/updatePayPassword") - public ApiResult updatePayPassword(@RequestBody UpdatePasswordParam param) { - if (StrUtil.hasBlank(param.getPassword(),param.getCode(),param.getPhone())) { - return fail("参数不能为空"); - } - Integer userId = getLoginUserId(); - if (userId == null) { - return fail("未登录"); - } - // 验证码校验 - String key = "code:" + param.getPhone(); - if (!param.getCode().equals(redisUtil.get(key)) && !"789789".equals(param.getCode())) { - String message = "短信验证码不正确"; - return fail(message, null); - } - User user = new User(); - user.setUserId(userId); - user.setPayPassword(userService.encodePassword(param.getPassword())); - if (userService.updateById(user)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAnyAuthority('sys:auth:user')") - @ApiOperation("验证支付密码") - @PostMapping("/auth/checkPayPassword") - public ApiResult checkPayPassword(@RequestBody User user){ - if (getLoginUser() == null) { - return fail("请先登录"); - } - if (!userService.comparePassword(getLoginUser().getPayPassword(), user.getPayPassword())) { - return fail("支付密码不正确"); - } - return success("支付密码正确"); - } - - @ApiOperation("图形验证码") - @GetMapping("/captcha") - public ApiResult captcha() { - SpecCaptcha specCaptcha = new SpecCaptcha(130, 48, 5); - return success(new CaptchaResult(specCaptcha.toBase64(), specCaptcha.text().toLowerCase())); - } - - @ApiOperation("企业微信登录链接") - @GetMapping("/wxWorkQrConnect") - public ApiResult wxWorkQrConnect() throws UnsupportedEncodingException { - final JSONObject settingInfo = cacheClient.getSettingInfo("wx-work", 10048); - final String corpId = settingInfo.getString("corpId"); - String encodedReturnUrl = URLEncoder.encode("https://oa.gxwebsoft.com/api/open/wx-work/login", "UTF-8"); - String url = "https://open.work.weixin.qq.com/wwopen/sso/3rd_qrConnect?appid=" + corpId + "&redirect_uri=" + encodedReturnUrl + "&state=ww_login@gxwebsoft&usertype=admin"; - return success("获取成功", url); - } - - @ApiOperation("解析token") - @GetMapping("/parseToken/{token}") - public ApiResult parseToken(@PathVariable("token") String token) { - Claims claims = JwtUtil.parseToken(token, configProperties.getTokenKey()); - return success(claims); - } - - @ApiOperation("短信验证码") - @PostMapping("/sendSmsCaptcha") - public ApiResult sendSmsCaptcha(@RequestBody SmsCaptchaParam param) { - // 默认配置 - String accessKeyId = "LTAI5tEsyhW4GCKbds1qsopg"; - String accessKeySecret = "zltFlQrYVAoq2KMFDWgLa3GhkMNeyO"; - String userTemplateId = "SMS_257840118"; - String sign = "南宁网宿科技"; - - // 读取租户的短信配置 - if (getTenantId() != null) { - String string = redisUtil.get("setting:sms:" + getTenantId()); - if (string != null) { - JSONObject jsonObject = JSONObject.parseObject(string); - accessKeyId = jsonObject.getString("accessKeyId"); - accessKeySecret = jsonObject.getString("accessKeySecret"); - userTemplateId = jsonObject.getString("userTemplateId"); - sign = jsonObject.getString("sign"); - } - } - - DefaultProfile profile = DefaultProfile.getProfile("regionld", accessKeyId, accessKeySecret); - IAcsClient client = new DefaultAcsClient(profile); - CommonRequest request = new CommonRequest(); - request.setSysMethod(MethodType.POST); - request.setSysDomain("dysmsapi.aliyuncs.com"); - request.setSysVersion("2017-05-25"); - request.setSysAction("SendSms"); - request.putQueryParameter("RegionId", "cn-hangzhou"); - request.putQueryParameter("PhoneNumbers", param.getPhone()); - request.putQueryParameter("SignName", sign); - request.putQueryParameter("TemplateCode", userTemplateId); - // 生成短信验证码 - Random randObj = new Random(); - String code = Integer.toString(100000 + randObj.nextInt(900000)); - request.putQueryParameter("TemplateParam", "{\"code\":" + code + "}"); - try { - CommonResponse response = client.getCommonResponse(request); - System.out.println("response = " + response); - String json = response.getData(); - System.out.println("json = " + json); - Gson g = new Gson(); - HashMap result = g.fromJson(json, HashMap.class); - System.out.println("result = " + result); - if ("OK".equals(result.get("Message"))) { - System.out.println("======================== = " + result); - cacheClient.set(param.getPhone(), code, 5L, TimeUnit.MINUTES); - String key = "code:" + param.getPhone(); - redisUtil.set(key, code, 5L, TimeUnit.MINUTES); - return success("发送成功", result.get("Message")); - } else { - return fail("发送失败"); - } - } catch (ServerException e) { - e.printStackTrace(); - } catch (ClientException e) { - e.printStackTrace(); - } - return fail("发送失败"); - } - - @OperationLog - @ApiOperation("重置密码") - @PutMapping("/password") - public ApiResult resetPassword(@RequestBody User user) { - if (user.getPassword() == null) { - return fail("参数不正确"); - } - if (user.getCode() == null) { - return fail("验证码不能为空"); - } - // 短信验证码校验 - String code = cacheClient.get(user.getPhone(), String.class); - if (!StrUtil.equals(code, user.getCode())) { - return fail("验证码不正确"); - } - - user.setUserId(getLoginUserId()); - user.setPassword(userService.encodePassword(user.getPassword())); - if (userService.updateById(user)) { - return success("密码修改成功"); - } else { - return fail("密码修改失败"); - } - } - - @ApiOperation("获取登录用户信息Authorities") - @PostMapping("/auth/user") - public ApiResult userInfo(@RequestBody UserParam param) { - // 登录账号|手机号码|邮箱登录 - User user = userService.getByUsername(param.getUsername(), param.getTenantId()); - if (user != null) { - return success(user); - } - return fail("用户不存在", null); - } - - @ApiOperation("免密登录") - @GetMapping("/token/{userId}/{accessKey}") - public ApiResult getToken(@PathVariable("userId") Integer userId, @PathVariable("accessKey") String accessKey) { - // 免密登录 传指定的userId和AccessKey，请给指定的userId分配好角色和权限 - if (accessKeyService.count(new LambdaQueryWrapper().eq(AccessKey::getAccessKey, accessKey)) > 0) { - // 设置过期时间 - Long tokenExpireTime = configProperties.getTokenExpireTime(); - // 查询用户信息 - final User byId = userService.getById(userId); - // 登录账号|手机号码|邮箱登录 - User user = userService.getByUsername(byId.getUsername(), byId.getTenantId()); - if (user == null) { - return fail("用户不存在", null); - } - // 签发token - String access_token = JwtUtil.buildToken(new JwtSubject(user.getUsername(), user.getTenantId()), - tokenExpireTime, configProperties.getTokenKey()); - return success("登录成功", new LoginResult(access_token, user)); - } - return fail("请求失败: 40010", null); - } - - @ApiOperation("短信验证码登录") - @PostMapping("/loginBySms") - public ApiResult loginBySms(@RequestBody LoginParam param, HttpServletRequest request) { - final String phone = param.getPhone(); - final Integer tenantId = getTenantId(); - final String code = param.getCode(); - if(tenantId == null){ - return fail("TenantId不存在",null); - } - User user = userService.getByUsername(phone, tenantId); - // 是否管理员 - if(param.getIsAdmin() != null && !user.getIsAdmin()){ - return fail("不是管理员账号",null); - } - // 验证码校验 - String key = "code:" + param.getPhone(); - if (!code.equals(redisUtil.get(key)) && !"789789".equals(code)) { - String message = "验证码不正确"; - loginRecordService.saveAsync(phone, LoginRecord.TYPE_ERROR, message, tenantId, request); - return fail(message, null); - } - if (user == null) { - final UserParam userParam = new UserParam(); - userParam.setPhone(phone); - userParam.setTenantId(tenantId); - user = userService.addUser(userParam); -// String message = "账号不存在"; -// loginRecordService.saveAsync(phone, LoginRecord.TYPE_ERROR, message, tenantId, request); - } - if (!user.getStatus().equals(0)) { - String message = "账号被冻结"; - loginRecordService.saveAsync(phone, LoginRecord.TYPE_ERROR, message, tenantId, request); - return fail(message, null); - } - loginRecordService.saveAsync(phone, LoginRecord.TYPE_LOGIN, null, tenantId, request); - - // 设置过期时间 - Long tokenExpireTime = configProperties.getTokenExpireTime(); - final JSONObject register = cacheClient.getSettingInfo("register", tenantId); - if (register != null) { - final String ExpireTime = register.getString("tokenExpireTime"); - if (ExpireTime != null) { - tokenExpireTime = Long.valueOf(ExpireTime); - } - } - - // 签发token - String access_token = JwtUtil.buildToken(new JwtSubject(phone, tenantId), - tokenExpireTime, configProperties.getTokenKey()); - return success("登录成功", new LoginResult(access_token, user)); - } - - @Transactional(rollbackFor = {Exception.class}, isolation = Isolation.SERIALIZABLE) - @ApiOperation("账号注册") - @PostMapping("/register") - public ApiResult register(@RequestBody User user) { - // 验证签名 - String tenantName = user.getCompanyName(); // 应用名称 - String phone = user.getPhone(); // 手机号码 - String password = user.getPassword(); // 密码 - String code = user.getCode(); // 短信验证码 - String email = user.getEmail(); // 邮箱 - - // 短信验证 - if (!StrUtil.equals(code, cacheClient.get(phone, String.class)) && !StrUtil.equals(code, "789789")) { - throw new BusinessException("验证码不正确"); - } - - // 添加租户 - Tenant tenant = new Tenant(); - tenant.setTenantName(tenantName); - tenant.setTenantCode(CommonUtil.randomUUID16()); - tenantService.save(tenant); - - // 租户初始化 - final Company company = new Company(); - company.setEmail(email); - company.setPassword(password); - company.setTid(tenant.getTenantId()); - company.setCompanyName(tenantName); - company.setShortName(tenantName); - company.setTenantId(tenant.getTenantId()); - final Company result = tenantService.initialization(company); - return success("注册成功", result); - } - - /** - * 获取服务器时间 - * @return String - */ - @ApiOperation("获取服务器时间") - @GetMapping("/serverTime") - public ApiResult serverTime(String deliveryTime){ - HashMap map = new HashMap<>(); - // 今天日期 - DateTime date = DateUtil.date(); - String today= DateUtil.today(); - // 明天日期 - final DateTime dateTime = DateUtil.tomorrow(); - String tomorrow = DateUtil.format(dateTime, "yyyy-MM-dd"); - // 后天日期 - final DateTime dateTime2 = DateUtil.offsetDay(date, 2); - final String afterDay = DateUtil.format(dateTime2, "yyyy-MM-dd"); - // 今天星期几 - final int week = DateUtil.thisDayOfWeek(); - final DateTime nextWeek = DateUtil.nextWeek(); - - map.put("now",DateUtil.now()); - map.put("today",today); - map.put("tomorrow",tomorrow); - map.put("afterDay",afterDay); - map.put("week",week); - map.put("minDate",DateUtil.offset(date, DateField.DAY_OF_WEEK, -7 )); - map.put("maxDate",DateUtil.offset(date, DateField.DAY_OF_WEEK, 7 )); - map.put("nextWeek",nextWeek); - if(deliveryTime != null){ - DateTime parse = DateUtil.parse(deliveryTime); - // 前一天 - DateTime previous = DateUtil.offsetDay(parse, -1); - // 后一天 - DateTime nextDay = DateUtil.offsetDay(parse, 1); - map.put("previous",DateUtil.format(previous,"yyyy-MM-dd")); - map.put("previousWeek",DateUtil.dayOfWeek(previous)-1); - map.put("nextDay",DateUtil.format(nextDay,"yyyy-MM-dd")); - map.put("week",DateUtil.dayOfWeek(nextDay)-1); - } - return success(map); - } - - // 缓存租户信息 - private void saveRedis(Tenant tenant) { - String key = "tenant:" + tenant.getTenantId(); - if (StrUtil.isEmpty(tenant.getTenantCode())) { - tenant.setTenantCode(CommonUtil.randomUUID16()); - } - redisUtil.set(key, tenant); - } -} diff --git a/modules/common/system/controller/MenuController.java b/modules/common/system/controller/MenuController.java deleted file mode 100644 index e62410d..0000000 --- a/modules/common/system/controller/MenuController.java +++ /dev/null @@ -1,173 +0,0 @@ -package com.gxwebsoft.common.system.controller; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.gxwebsoft.common.core.annotation.OperationLog; -import com.gxwebsoft.common.core.web.*; -import com.gxwebsoft.common.system.entity.Company; -import com.gxwebsoft.common.system.entity.Menu; -import com.gxwebsoft.common.system.entity.Version; -import com.gxwebsoft.common.system.param.MenuParam; -import com.gxwebsoft.common.system.param.VersionParam; -import com.gxwebsoft.common.system.service.CompanyService; -import com.gxwebsoft.common.system.service.MenuService; -import com.gxwebsoft.common.system.service.VersionService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.util.CollectionUtils; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 菜单控制器 - * - * @author WebSoft - * @since 2018-12-24 16:10:23 - */ -@Api(tags = "菜单管理") -@RestController -@RequestMapping("/api/system/menu") -public class MenuController extends BaseController { - @Resource - private MenuService menuService; - @Resource - private CompanyService companyService; - @Resource - private VersionService versionService; - - @PreAuthorize("hasAuthority('sys:menu:list')") - @ApiOperation("分页查询菜单") - @GetMapping("/page") - public ApiResult> page(MenuParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("sort_number"); - return success(menuService.page(page, page.getWrapper())); - } - - @PreAuthorize("hasAuthority('sys:menu:list')") - @ApiOperation("查询全部菜单") - @GetMapping() - public ApiResult> list(MenuParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("sort_number"); - return success(menuService.list(page.getOrderWrapper())); - } - - @PreAuthorize("hasAuthority('sys:menu:list')") - @ApiOperation("根据id查询菜单") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - return success(menuService.getById(id)); - } - - @PreAuthorize("hasAuthority('sys:menu:save')") - @OperationLog - @ApiOperation("添加菜单") - @PostMapping() - public ApiResult add(@RequestBody Menu menu) { - if (menu.getParentId() == null) { - menu.setParentId(0); - } - if (menuService.save(menu)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('sys:menu:update')") - @OperationLog - @ApiOperation("修改菜单") - @PutMapping() - public ApiResult update(@RequestBody Menu menu) { - if (menuService.updateById(menu)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('sys:menu:remove')") - @OperationLog - @ApiOperation("删除菜单") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (menuService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @PreAuthorize("hasAuthority('sys:menu:save')") - @OperationLog - @ApiOperation("批量添加菜单") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List menus) { - if (menuService.saveBatch(menus)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('sys:menu:update')") - @OperationLog - @ApiOperation("批量修改菜单") - @PutMapping("/batch") - public ApiResult updateBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(menuService, "menu_id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('sys:menu:remove')") - @OperationLog - @ApiOperation("批量删除菜单") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (menuService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @PreAuthorize("hasAuthority('sys:menu:update')") - @OperationLog - @ApiOperation("菜单克隆") - @PostMapping("/clone") - public ApiResult onClone(@RequestBody MenuParam param){ - if(menuService.cloneMenu(param)){ - Integer companyId = getCompanyId(); - Company company = new Company(); - company.setCompanyId(companyId); - company.setPlanId(param.getTenantId()); - VersionParam versionParam = new VersionParam(); - versionParam.setLimit(1L); - final PageResult result = versionService.pageRel(versionParam); - if (!CollectionUtils.isEmpty(result.getList())) { - Version version = result.getList().get(0); - company.setVersionName(version.getVersionName()); - company.setVersionCode(version.getVersionCode()); - } - companyService.updateById(company); - return success("安装成功"); - } - return fail("安装失败"); - } - - @PreAuthorize("hasAuthority('sys:menu:update')") - @OperationLog - @ApiOperation("安装插件") - @GetMapping("/install/{id}") - public ApiResult install(@PathVariable("id") Integer id){ - if(menuService.install(id)){ - // 更新安装次数 -// final Plug plug = plugService.getOne(new LambdaQueryWrapper().eq(Plug::getMenuId, id)); -// plug.setInstalls(plug.getInstalls() + 1); -// plugService.updateById(plug); - return success("安装成功"); - } - return fail("安装失败",id); - } -} diff --git a/modules/common/system/controller/MerchantAccountController.java b/modules/common/system/controller/MerchantAccountController.java deleted file mode 100644 index 88a8479..0000000 --- a/modules/common/system/controller/MerchantAccountController.java +++ /dev/null @@ -1,178 +0,0 @@ -package com.gxwebsoft.common.system.controller; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.gxwebsoft.common.core.security.JwtUtil; -import com.gxwebsoft.common.core.utils.CommonUtil; -import com.gxwebsoft.common.core.utils.RequestUtil; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.common.core.web.BatchParam; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.system.entity.User; -import com.gxwebsoft.common.system.entity.MerchantAccount; -import com.gxwebsoft.common.system.entity.UserRole; -import com.gxwebsoft.common.system.mapper.MerchantAccountMapper; -import com.gxwebsoft.common.system.param.MerchantAccountParam; -import com.gxwebsoft.common.system.service.MerchantAccountService; -import com.gxwebsoft.common.system.service.UserRoleService; -import com.gxwebsoft.common.system.service.UserService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import java.util.List; - -/** - * 商户账号控制器 - * - * @author 科技小王子 - * @since 2024-04-19 12:02:24 - */ -@Api(tags = "商户账号管理") -@RestController -@RequestMapping("/api/system/merchant-account") -public class MerchantAccountController extends BaseController { - @Resource - private MerchantAccountService merchantAccountService; - @Resource - private MerchantAccountMapper merchantAccountMapper; - @Resource - private UserService userService; - @Resource - private UserRoleService userRoleService; - - @PreAuthorize("hasAuthority('sys:merchantAccount:list')") - @ApiOperation("分页查询商户账号") - @GetMapping("/page") - public ApiResult> page(MerchantAccountParam param) { - // 使用关联查询 - return success(merchantAccountService.pageRel(param)); - } - - @PreAuthorize("hasAuthority('sys:merchantAccount:list')") - @ApiOperation("查询全部商户账号") - @GetMapping() - public ApiResult> list(MerchantAccountParam param) { - // 使用关联查询 - return success(merchantAccountService.listRel(param)); - } - - @PreAuthorize("hasAuthority('sys:merchantAccount:list')") - @ApiOperation("根据id查询商户账号") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - // 使用关联查询 - return success(merchantAccountService.getByIdRel(id)); - } - - - @PreAuthorize("hasAuthority('sys:merchantAccount:save')") - @ApiOperation("添加商户账号") - @PostMapping() - public ApiResult save(@RequestBody MerchantAccount merchantAccount, HttpServletRequest request) { - if (merchantAccountService.count(new LambdaQueryWrapper().eq(MerchantAccount::getPhone,merchantAccount.getPhone())) > 0) { - return fail("手机号码已存在"); - } - // 查询用户是否已存在 - User userByPhone = userService.getByPhone(merchantAccount.getPhone()); - if (userByPhone != null){ - merchantAccount.setUserId(userByPhone.getUserId()); - if (userRoleService.count(new LambdaQueryWrapper().eq(UserRole::getRoleId,merchantAccount.getRoleId())) == 0) { - // 添加角色 - final UserRole userRole = new UserRole(); - userRole.setUserId(userByPhone.getUserId()); - userRole.setRoleId(merchantAccount.getRoleId()); - userRoleService.save(userRole); - } - merchantAccountService.save(merchantAccount); - return success("添加成功"); - } - - // 添加用户 - User user = new User(); - user.setUsername(merchantAccount.getPhone()); - user.setPhone(merchantAccount.getPhone()); - user.setPassword(userService.encodePassword(merchantAccount.getPassword())); - user.setNickname(merchantAccount.getRealName()); - user.setIsAdmin(true); - user.setPlatform("ADMIN"); - user.setMerchantId(merchantAccount.getMerchantId()); - userService.save(user); - // 添加角色 - final UserRole userRole = new UserRole(); - userRole.setUserId(user.getUserId()); - userRole.setRoleId(merchantAccount.getRoleId()); - userRoleService.save(userRole); - merchantAccount.setUserId(user.getUserId()); - // 保存账号 - if (merchantAccountService.save(merchantAccount)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('sys:merchantAccount:update')") - @ApiOperation("修改商户账号") - @PutMapping() - public ApiResult update(@RequestBody MerchantAccount merchantAccount) { - if (merchantAccountService.updateById(merchantAccount)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('sys:merchantAccount:remove')") - @ApiOperation("删除商户账号") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (merchantAccountService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @PreAuthorize("hasAuthority('sys:merchantAccount:save')") - @ApiOperation("批量添加商户账号") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (merchantAccountService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('sys:merchantAccount:update')") - @ApiOperation("批量修改商户账号") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(merchantAccountService, "id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('sys:merchantAccount:remove')") - @ApiOperation("批量删除商户账号") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (merchantAccountService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @ApiOperation("根据手机号码查询商户账号信息") - @GetMapping("/getMerchantAccountByPhone") - public ApiResult getMerchantAccountByPhone(MerchantAccountParam param){ - param.setTenantId(getTenantId()); - final MerchantAccount merchantAccount = merchantAccountMapper.getMerchantAccountByPhone(param); - if(merchantAccount == null){ - return fail("账号不存在",null); - } - return success(merchantAccount); - } - -} diff --git a/modules/common/system/controller/MerchantApplyController.java b/modules/common/system/controller/MerchantApplyController.java deleted file mode 100644 index c719819..0000000 --- a/modules/common/system/controller/MerchantApplyController.java +++ /dev/null @@ -1,122 +0,0 @@ -package com.gxwebsoft.common.system.controller; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.gxwebsoft.common.core.web.*; -import com.gxwebsoft.common.system.entity.Merchant; -import com.gxwebsoft.common.system.entity.MerchantApply; -import com.gxwebsoft.common.system.entity.User; -import com.gxwebsoft.common.system.param.MerchantApplyParam; -import com.gxwebsoft.common.system.service.MerchantApplyService; -import com.gxwebsoft.common.system.service.MerchantService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 商户入驻申请控制器 - * - * @author 科技小王子 - * @since 2024-04-05 01:24:36 - */ -@Api(tags = "商户入驻申请管理") -@RestController -@RequestMapping("/api/system/merchant-apply") -public class MerchantApplyController extends BaseController { - @Resource - private MerchantService merchantService; - @Resource - private MerchantApplyService merchantApplyService; - - @PreAuthorize("hasAuthority('sys:merchantApply:list')") - @ApiOperation("分页查询商户入驻申请") - @GetMapping("/page") - public ApiResult> page(MerchantApplyParam param) { - // 使用关联查询 - return success(merchantApplyService.pageRel(param)); - } - - @PreAuthorize("hasAuthority('sys:merchantApply:list')") - @ApiOperation("查询全部商户入驻申请") - @GetMapping() - public ApiResult> list(MerchantApplyParam param) { - // 使用关联查询 - return success(merchantApplyService.listRel(param)); - } - - @PreAuthorize("hasAuthority('sys:merchantApply:list')") - @ApiOperation("根据id查询商户入驻申请") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - // 使用关联查询 - return success(merchantApplyService.getByIdRel(id)); - } - - @ApiOperation("添加商户入驻申请") - @PostMapping() - public ApiResult save(@RequestBody MerchantApply merchantApply) { - if (merchantService.count(new LambdaQueryWrapper().eq(Merchant::getMerchantName,merchantApply.getMerchantName())) > 0) { - return fail("该租户名称已存在"); - } - if (merchantService.count(new LambdaQueryWrapper().eq(Merchant::getPhone,merchantApply.getPhone())) > 0) { - return fail("该手机号码已存在"); - } - if (merchantApplyService.save(merchantApply)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('sys:merchantApply:update')") - @ApiOperation("修改商户入驻申请") - @PutMapping() - public ApiResult update(@RequestBody MerchantApply merchantApply) { - if (merchantApplyService.updateById(merchantApply)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('sys:merchantApply:remove')") - @ApiOperation("删除商户入驻申请") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (merchantApplyService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @PreAuthorize("hasAuthority('sys:merchantApply:save')") - @ApiOperation("批量添加商户入驻申请") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (merchantApplyService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('sys:merchantApply:update')") - @ApiOperation("批量修改商户入驻申请") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(merchantApplyService, "apply_id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('sys:merchantApply:remove')") - @ApiOperation("批量删除商户入驻申请") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (merchantApplyService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } -} diff --git a/modules/common/system/controller/MerchantController.java b/modules/common/system/controller/MerchantController.java deleted file mode 100644 index 1ebfbc9..0000000 --- a/modules/common/system/controller/MerchantController.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.gxwebsoft.common.system.controller; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.gxwebsoft.common.core.security.JwtUtil; -import com.gxwebsoft.common.core.utils.RequestUtil; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.common.core.web.BatchParam; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.system.entity.Merchant; -import com.gxwebsoft.common.system.entity.MerchantAccount; -import com.gxwebsoft.common.system.param.MerchantParam; -import com.gxwebsoft.common.system.service.MerchantAccountService; -import com.gxwebsoft.common.system.service.MerchantService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import java.util.List; - -/** - * 商户控制器 - * - * @author 科技小王子 - * @since 2024-04-05 00:03:54 - */ -@Api(tags = "商户管理") -@RestController -@RequestMapping("/api/system/merchant") -public class MerchantController extends BaseController { - @Resource - private MerchantService merchantService; - @Resource - private MerchantAccountService merchantAccountService; - - @ApiOperation("分页查询商户") - @GetMapping("/page") - public ApiResult> page(MerchantParam param) { - // 使用关联查询 - System.out.println("param = " + param); - return success(merchantService.pageRel(param)); - } - - @ApiOperation("查询全部商户") - @GetMapping() - public ApiResult> list(MerchantParam param) { - // 使用关联查询 - return success(merchantService.listRel(param)); - } - - @ApiOperation("根据id查询商户") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - // 使用关联查询 - return success(merchantService.getByIdRel(id)); - } - - @PreAuthorize("hasAuthority('sys:merchant:save')") - @ApiOperation("添加商户") - @PostMapping() - public ApiResult save(@RequestBody Merchant merchant, HttpServletRequest request) { - if (merchantService.count(new LambdaQueryWrapper().eq(Merchant::getPhone,merchant.getPhone())) > 0) { - return fail("商户手机号码" + merchant.getPhone() + "已存在"); - } - if (merchantService.save(merchant)) { - // 设置商家后台入口 - merchant.setAdminUrl(merchant.getTenantId() + ".m.wsdns.cn"); - merchantService.updateById(merchant); - // 获取用户信息 - final RequestUtil requestUtil = new RequestUtil(); - String access_token = JwtUtil.getAccessToken(request); - requestUtil.setAccessToken(access_token); - requestUtil.setTenantId(getTenantId().toString()); - final MerchantAccount merchantAccount = new MerchantAccount(); - merchantAccount.setMerchantId(merchant.getMerchantId()); - merchantAccount.setPhone(merchant.getPhone()); - merchantAccount.setPassword(merchant.getPhone().substring(merchant.getPhone().length() - 6)); - merchantAccount.setRealName(merchant.getRealName()); - merchantAccount.setRoleId(merchant.getRoleId()); - merchantAccount.setRoleName(merchant.getRoleName()); - requestUtil.saveUserByPhone(merchantAccount); - merchantAccountService.save(merchantAccount); - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('sys:merchant:update')") - @ApiOperation("修改商户") - @PutMapping() - public ApiResult update(@RequestBody Merchant merchant) { - if (merchantService.updateById(merchant)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('sys:merchant:remove')") - @ApiOperation("删除商户") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (merchantService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @PreAuthorize("hasAuthority('sys:merchant:save')") - @ApiOperation("批量添加商户") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (merchantService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('sys:merchant:update')") - @ApiOperation("批量修改商户") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(merchantService, "merchant_id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('sys:merchant:remove')") - @ApiOperation("批量删除商户") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (merchantService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/modules/common/system/controller/MerchantTypeController.java b/modules/common/system/controller/MerchantTypeController.java deleted file mode 100644 index bcda344..0000000 --- a/modules/common/system/controller/MerchantTypeController.java +++ /dev/null @@ -1,121 +0,0 @@ -package com.gxwebsoft.common.system.controller; - -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.common.core.web.BatchParam; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.system.entity.MerchantType; -import com.gxwebsoft.common.system.entity.MerchantType; -import com.gxwebsoft.common.system.param.MerchantTypeParam; -import com.gxwebsoft.common.system.service.MerchantTypeService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 商户类型控制器 - * - * @author 科技小王子 - * @since 2024-04-05 00:08:51 - */ -@Api(tags = "商户类型管理") -@RestController -@RequestMapping("/api/system/merchant-type") -public class MerchantTypeController extends BaseController { - @Resource - private MerchantTypeService merchantTypeService; - - @PreAuthorize("hasAuthority('sys:merchantType:list')") - @ApiOperation("分页查询商户类型") - @GetMapping("/page") - public ApiResult> page(MerchantTypeParam param) { - // 使用关联查询 - return success(merchantTypeService.pageRel(param)); - } - - @PreAuthorize("hasAuthority('sys:merchantType:list')") - @ApiOperation("查询全部商户类型") - @GetMapping() - public ApiResult> list(MerchantTypeParam param) { - // 使用关联查询 - return success(merchantTypeService.listRel(param)); - } - - @PreAuthorize("hasAuthority('sys:merchantType:list')") - @ApiOperation("根据id查询商户类型") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - // 使用关联查询 - return success(merchantTypeService.getByIdRel(id)); - } - - @PreAuthorize("hasAuthority('sys:merchantType:save')") - @ApiOperation("添加商户类型") - @PostMapping() - public ApiResult save(@RequestBody MerchantType merchantType) { - // 记录当前登录用户id - // User loginUser = getLoginUser(); - // if (loginUser != null) { - // merchantType.setUserId(loginUser.getUserId()); - // } - if (merchantTypeService.save(merchantType)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('sys:merchantType:update')") - @ApiOperation("修改商户类型") - @PutMapping() - public ApiResult update(@RequestBody MerchantType merchantType) { - if (merchantTypeService.updateById(merchantType)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('sys:merchantType:remove')") - @ApiOperation("删除商户类型") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (merchantTypeService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @PreAuthorize("hasAuthority('sys:merchantType:update')") - @ApiOperation("批量添加商户类型") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (merchantTypeService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('sys:merchantType:update')") - @ApiOperation("批量修改商户类型") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(merchantTypeService, "id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('sys:merchantType:remove')") - @ApiOperation("批量删除商户类型") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (merchantTypeService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/modules/common/system/controller/ModulesController.java b/modules/common/system/controller/ModulesController.java deleted file mode 100644 index 706a3e9..0000000 --- a/modules/common/system/controller/ModulesController.java +++ /dev/null @@ -1,139 +0,0 @@ -package com.gxwebsoft.common.system.controller; - -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.common.system.entity.User; -import com.gxwebsoft.common.system.service.ModulesService; -import com.gxwebsoft.common.system.entity.Modules; -import com.gxwebsoft.common.system.param.ModulesParam; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.BatchParam; -import com.gxwebsoft.common.core.annotation.OperationLog; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 模块管理控制器 - * - * @author 科技小王子 - * @since 2023-10-18 15:53:43 - */ -@Api(tags = "模块管理管理") -@RestController -@RequestMapping("/api/system/modules") -public class ModulesController extends BaseController { - @Resource - private ModulesService modulesService; - - @PreAuthorize("hasAuthority('sys:modules:list')") - @OperationLog - @ApiOperation("分页查询模块管理") - @GetMapping("/page") - public ApiResult> page(ModulesParam param) { - PageParam page = new PageParam<>(param); -// page.setDefaultOrder("create_time desc"); - return success(modulesService.page(page, page.getWrapper())); - // 使用关联查询 - //return success(modulesService.pageRel(param)); - } - - @PreAuthorize("hasAuthority('sys:modules:list')") - @OperationLog - @ApiOperation("查询全部模块管理") - @GetMapping() - public ApiResult> list(ModulesParam param) { - PageParam page = new PageParam<>(param); -// page.setDefaultOrder("create_time desc"); - return success(modulesService.list(page.getOrderWrapper())); - // 使用关联查询 - //return success(modulesService.listRel(param)); - } - - @PreAuthorize("hasAuthority('sys:modules:list')") - @OperationLog - @ApiOperation("根据id查询模块管理") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - return success(modulesService.getById(id)); - // 使用关联查询 - //return success(modulesService.getByIdRel(id)); - } - - @PreAuthorize("hasAuthority('sys:modules:save')") - @OperationLog - @ApiOperation("添加模块管理") - @PostMapping() - public ApiResult save(@RequestBody Modules modules) { - // 记录当前登录用户id - User loginUser = getLoginUser(); - if (loginUser != null) { - modules.setUserId(loginUser.getUserId()); - } - if (modulesService.save(modules)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('sys:modules:update')") - @OperationLog - @ApiOperation("修改模块管理") - @PutMapping() - public ApiResult update(@RequestBody Modules modules) { - if (modulesService.updateById(modules)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('sys:modules:remove')") - @OperationLog - @ApiOperation("删除模块管理") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (modulesService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @PreAuthorize("hasAuthority('sys:modules:save')") - @OperationLog - @ApiOperation("批量添加模块管理") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (modulesService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('sys:modules:update')") - @OperationLog - @ApiOperation("批量修改模块管理") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(modulesService, "id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('sys:modules:remove')") - @OperationLog - @ApiOperation("批量删除模块管理") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (modulesService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/modules/common/system/controller/NoticeController.java b/modules/common/system/controller/NoticeController.java deleted file mode 100644 index 829d17e..0000000 --- a/modules/common/system/controller/NoticeController.java +++ /dev/null @@ -1,142 +0,0 @@ -package com.gxwebsoft.common.system.controller; - -import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.gxwebsoft.common.core.annotation.OperationLog; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.common.core.web.BatchParam; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.system.entity.Notice; -import com.gxwebsoft.common.system.entity.User; -import com.gxwebsoft.common.system.param.NoticeParam; -import com.gxwebsoft.common.system.service.NoticeService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 消息记录表控制器 - * - * @author 科技小王子 - * @since 2023-10-08 13:22:21 - */ -@Api(tags = "消息记录表管理") -@RestController -@RequestMapping("/api/system/notice") -public class NoticeController extends BaseController { - @Resource - private NoticeService noticeService; - - @PreAuthorize("hasAuthority('sys:notice:list')") - @ApiOperation("分页查询消息记录表") - @GetMapping("/page") - public ApiResult> page(NoticeParam param) { - // 使用关联查询 - return success(noticeService.pageRel(param)); - } - - @PreAuthorize("hasAuthority('sys:notice:list')") - @ApiOperation("查询全部消息记录表") - @GetMapping() - public ApiResult> list(NoticeParam param) { - // 使用关联查询 - return success(noticeService.listRel(param)); - } - - @PreAuthorize("hasAuthority('sys:notice:list')") - @ApiOperation("根据id查询消息记录表") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - // 使用关联查询 - return success(noticeService.getByIdRel(id)); - } - - @PreAuthorize("hasAuthority('sys:notice:save')") - @ApiOperation("添加消息记录表") - @PostMapping() - public ApiResult save(@RequestBody Notice notice) { - // 记录当前登录用户id - User loginUser = getLoginUser(); - if (loginUser != null) { - notice.setUserId(loginUser.getUserId()); - } - if (noticeService.save(notice)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('sys:notice:update')") - @ApiOperation("修改消息记录表") - @PutMapping() - public ApiResult update(@RequestBody Notice notice) { - if (noticeService.updateById(notice)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('sys:notice:remove')") - @ApiOperation("删除消息记录表") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (noticeService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @PreAuthorize("hasAuthority('sys:notice:save')") - @ApiOperation("批量添加消息记录表") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (noticeService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('sys:notice:update')") - @ApiOperation("批量修改消息记录表") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(noticeService, "notice_id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('sys:notice:remove')") - @ApiOperation("批量删除消息记录表") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (noticeService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - @ApiOperation("统计信息") - @GetMapping("/getUnReadNum") - public ApiResult getUnReadNum(){ - JSONObject json = new JSONObject(); - json.put("notice",noticeService.count(new LambdaQueryWrapper() - .eq(Notice::getUserId, getLoginUserId()) - .eq(Notice::getType,"notice") - .eq(Notice::getStatus,0))); - json.put("letter",noticeService.count(new LambdaQueryWrapper() - .eq(Notice::getUserId, getLoginUserId()) - .eq(Notice::getType,"letter") - .eq(Notice::getStatus,0))); - json.put("todo",noticeService.count(new LambdaQueryWrapper() - .eq(Notice::getUserId, getLoginUserId()) - .eq(Notice::getType,"todo") - .eq(Notice::getStatus,0))); - return success("操作成功",json); - } - -} diff --git a/modules/common/system/controller/NotifyByBalancePayController.java b/modules/common/system/controller/NotifyByBalancePayController.java deleted file mode 100644 index c5c8422..0000000 --- a/modules/common/system/controller/NotifyByBalancePayController.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.gxwebsoft.common.system.controller; - -import cn.hutool.core.util.StrUtil; -import com.gxwebsoft.common.core.config.ConfigProperties; -import com.gxwebsoft.common.core.utils.RedisUtil; -import com.gxwebsoft.common.core.utils.RequestUtil; -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.common.system.entity.Payment; -import com.wechat.pay.java.core.notification.NotificationConfig; -import com.wechat.pay.java.core.notification.NotificationParser; -import com.wechat.pay.java.core.notification.RSANotificationConfig; -import com.wechat.pay.java.service.partnerpayments.jsapi.model.Transaction; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiModelProperty; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.Map; - -/** - * 会员特权购买记录表控制器 - * - * @author 科技小王子 - * @since 2023-06-20 18:07:50 - */ -@Api(tags = "余额支付结果通知(未完成)") -@RestController -@RequestMapping("/api/system/balance-pay") -public class NotifyByBalancePayController extends BaseController { - @Value("${spring.profiles.active}") - String active; - @Resource - private RedisUtil redisUtil; - @Resource - private RequestUtil requestUtil; - @Resource - private ConfigProperties conf; - - @ApiModelProperty("异步通知") - @PostMapping("/notify/{tenantId}") - public String wxNotify(@RequestHeader Map header, @RequestBody String body, @PathVariable("tenantId") Integer tenantId) { - System.out.println("异步通知*************** = "); - - // 以支付通知回调为例，验签、解密并转换成 Transaction - try { - // 推送微信官方支付结果(携带租户ID的POST请求) -// requestUtil.pushBalancePayNotify(); - return "SUCCESS"; - } catch (Exception $e) { - System.out.println($e.getMessage()); - } - - return "fail"; - } - - -} diff --git a/modules/common/system/controller/OperationRecordController.java b/modules/common/system/controller/OperationRecordController.java deleted file mode 100644 index dc6eecf..0000000 --- a/modules/common/system/controller/OperationRecordController.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.gxwebsoft.common.system.controller; - -import com.gxwebsoft.common.core.annotation.OperationLog; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.system.entity.OperationRecord; -import com.gxwebsoft.common.system.param.OperationRecordParam; -import com.gxwebsoft.common.system.service.OperationRecordService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 操作日志控制器 - * - * @author WebSoft - * @since 2018-12-24 16:10:12 - */ -@Api(tags = "操作日志") -@RestController -@RequestMapping("/api/system/operation-record") -public class OperationRecordController extends BaseController { - @Resource - private OperationRecordService operationRecordService; - - /** - * 分页查询操作日志 - */ - @PreAuthorize("hasAuthority('sys:operation-record:list')") - @ApiOperation("分页查询操作日志") - @GetMapping("/page") - public ApiResult> page(OperationRecordParam param) { - return success(operationRecordService.pageRel(param)); - } - - /** - * 查询全部操作日志 - */ - @PreAuthorize("hasAuthority('sys:operation-record:list')") - @OperationLog - @ApiOperation("查询全部操作日志") - @GetMapping() - public ApiResult> list(OperationRecordParam param) { - return success(operationRecordService.listRel(param)); - } - - /** - * 根据id查询操作日志 - */ - @PreAuthorize("hasAuthority('sys:operation-record:list')") - @ApiOperation("根据id查询操作日志") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - return success(operationRecordService.getByIdRel(id)); - } - -} diff --git a/modules/common/system/controller/OrderController.java b/modules/common/system/controller/OrderController.java deleted file mode 100644 index 3364945..0000000 --- a/modules/common/system/controller/OrderController.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.gxwebsoft.common.system.controller; - -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.StrUtil; -import com.gxwebsoft.common.core.annotation.OperationLog; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.common.core.web.BatchParam; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.system.entity.Order; -import com.gxwebsoft.common.system.entity.OrderInfo; -import com.gxwebsoft.common.system.entity.User; -import com.gxwebsoft.common.system.param.OrderParam; -import com.gxwebsoft.common.system.service.CompanyService; -import com.gxwebsoft.common.system.service.OrderInfoService; -import com.gxwebsoft.common.system.service.OrderService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.math.BigDecimal; -import java.util.Collections; -import java.util.List; -import java.util.stream.Collectors; - -/** - * 订单控制器 - * - * @author 科技小王子 - * @since 2024-04-24 13:46:21 - */ -@Api(tags = "订单管理") -@RestController -@RequestMapping("/api/system/order") -public class OrderController extends BaseController { - @Resource - private OrderService orderService; - @Resource - private CompanyService companyService; - @Resource - private OrderInfoService orderInfoService; - - @PreAuthorize("hasAuthority('sys:order:list')") - @OperationLog - @ApiOperation("分页查询订单") - @GetMapping("/page") - public ApiResult> page(OrderParam param) { - // 使用关联查询 - return success(orderService.pageRel(param)); - } - - @PreAuthorize("hasAuthority('sys:order:list')") - @OperationLog - @ApiOperation("查询全部订单") - @GetMapping() - public ApiResult> list(OrderParam param) { - // 使用关联查询 - return success(orderService.listRel(param)); - } - - @PreAuthorize("hasAuthority('sys:order:list')") - @OperationLog - @ApiOperation("根据id查询订单") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - // 使用关联查询 - return success(orderService.getByIdRel(id)); - } - - @PreAuthorize("hasAuthority('sys:order:save')") - @OperationLog - @ApiOperation("添加订单") - @PostMapping() - public ApiResult save(@RequestBody Order order) { - // 记录当前登录用户id - User loginUser = getLoginUser(); - if (loginUser == null) { - return fail("请先登录"); - } - // 微信openid(必填) - if(StrUtil.isBlank(loginUser.getOpenid())){ - return fail("微信openid(必填)"); - } - // 商品描述(必填) - if(StrUtil.isBlank(order.getComments())){ - return fail("商品描述(必填)"); - } - // 微信支付(商品金额不能为0) - if(order.getPayType().equals(1)){ - if (order.getTotalPrice().compareTo(BigDecimal.ZERO) == 0) { - return fail("商品金额不能为0"); - } - } - - // 订单信息 - long timeMillis = System.currentTimeMillis(); - long orderNo = IdUtil.getSnowflakeNextId(); - order.setOrderNo(Long.toString(orderNo)); - order.setUserId(loginUser.getUserId()); - order.setOpenid(loginUser.getOpenid()); - order.setRealName(loginUser.getRealName()); - order.setPhone(loginUser.getPhone()); - final List collect = order.getOrderInfoList().stream().map(OrderInfo::getStartTime).collect(Collectors.toList()); - order.setStartTime(Collections.min(collect)); - order.setVersion(10); - if (orderService.save(order)) { - order.getOrderInfoList().forEach(d -> { - d.setOid(order.getOrderId()); - d.setTimeFlag(timeMillis); - d.setVersion(10); - d.setOrderTime(timeMillis / 1000); - }); - orderInfoService.saveBatch(order.getOrderInfoList()); - // 创建微信订单 - if (order.getPayType().equals(1)) { -// return success("下单成功",orderService.createWxOrder(order)); - } - } - return fail("下单失败"); - } - - @PreAuthorize("hasAuthority('sys:order:update')") - @OperationLog - @ApiOperation("修改订单") - @PutMapping() - public ApiResult update(@RequestBody Order order) { - if (orderService.updateById(order)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('sys:order:remove')") - @OperationLog - @ApiOperation("删除订单") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (orderService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @PreAuthorize("hasAuthority('sys:order:save')") - @OperationLog - @ApiOperation("批量添加订单") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (orderService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('sys:order:update')") - @OperationLog - @ApiOperation("批量修改订单") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(orderService, "order_id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('sys:order:remove')") - @OperationLog - @ApiOperation("批量删除订单") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (orderService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/modules/common/system/controller/OrderInfoController.java b/modules/common/system/controller/OrderInfoController.java deleted file mode 100644 index 9880593..0000000 --- a/modules/common/system/controller/OrderInfoController.java +++ /dev/null @@ -1,138 +0,0 @@ -package com.gxwebsoft.common.system.controller; - -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.common.system.entity.User; -import com.gxwebsoft.common.system.service.OrderInfoService; -import com.gxwebsoft.common.system.entity.OrderInfo; -import com.gxwebsoft.common.system.param.OrderInfoParam; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.BatchParam; -import com.gxwebsoft.common.core.annotation.OperationLog; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 控制器 - * - * @author 科技小王子 - * @since 2024-05-10 18:02:54 - */ -@Api(tags = "管理") -@RestController -@RequestMapping("/api/system/order-info") -public class OrderInfoController extends BaseController { - @Resource - private OrderInfoService orderInfoService; - - @PreAuthorize("hasAuthority('sys:orderInfo:list')") - @OperationLog - @ApiOperation("分页查询") - @GetMapping("/page") - public ApiResult> page(OrderInfoParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - return success(orderInfoService.page(page, page.getWrapper())); - // 使用关联查询 - //return success(orderInfoService.pageRel(param)); - } - - @PreAuthorize("hasAuthority('sys:orderInfo:list')") - @OperationLog - @ApiOperation("查询全部") - @GetMapping() - public ApiResult> list(OrderInfoParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - return success(orderInfoService.list(page.getOrderWrapper())); - // 使用关联查询 - //return success(orderInfoService.listRel(param)); - } - - @PreAuthorize("hasAuthority('sys:orderInfo:list')") - @OperationLog - @ApiOperation("根据id查询") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - return success(orderInfoService.getById(id)); - // 使用关联查询 - //return success(orderInfoService.getByIdRel(id)); - } - - @PreAuthorize("hasAuthority('sys:orderInfo:save')") - @OperationLog - @ApiOperation("添加") - @PostMapping() - public ApiResult save(@RequestBody OrderInfo orderInfo) { - // 记录当前登录用户id - User loginUser = getLoginUser(); - if (loginUser != null) { - } - if (orderInfoService.save(orderInfo)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('sys:orderInfo:update')") - @OperationLog - @ApiOperation("修改") - @PutMapping() - public ApiResult update(@RequestBody OrderInfo orderInfo) { - if (orderInfoService.updateById(orderInfo)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('sys:orderInfo:remove')") - @OperationLog - @ApiOperation("删除") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (orderInfoService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @PreAuthorize("hasAuthority('sys:orderInfo:save')") - @OperationLog - @ApiOperation("批量添加") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (orderInfoService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('sys:orderInfo:update')") - @OperationLog - @ApiOperation("批量修改") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(orderInfoService, "id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('sys:orderInfo:remove')") - @OperationLog - @ApiOperation("批量删除") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (orderInfoService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/modules/common/system/controller/OrganizationController.java b/modules/common/system/controller/OrganizationController.java deleted file mode 100644 index dac0a74..0000000 --- a/modules/common/system/controller/OrganizationController.java +++ /dev/null @@ -1,139 +0,0 @@ -package com.gxwebsoft.common.system.controller; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.gxwebsoft.common.core.annotation.OperationLog; -import com.gxwebsoft.common.core.web.*; -import com.gxwebsoft.common.system.entity.Organization; -import com.gxwebsoft.common.system.param.OrganizationParam; -import com.gxwebsoft.common.system.service.OrganizationService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 组织机构控制器 - * - * @author WebSoft - * @since 2020-03-14 11:29:04 - */ -@Api(tags = "组织机构管理") -@RestController -@RequestMapping("/api/system/organization") -public class OrganizationController extends BaseController { - @Resource - private OrganizationService organizationService; - - @PreAuthorize("hasAuthority('sys:org:list')") - @OperationLog - @ApiOperation("分页查询组织机构") - @GetMapping("/page") - public ApiResult> page(OrganizationParam param) { - return success(organizationService.pageRel(param)); - } - - @PreAuthorize("hasAuthority('sys:org:list')") - @OperationLog - @ApiOperation("查询全部组织机构") - @GetMapping() - public ApiResult> list(OrganizationParam param) { - return success(organizationService.listRel(param)); - } - - @PreAuthorize("hasAuthority('sys:org:list')") - @OperationLog - @ApiOperation("根据id查询组织机构") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - return success(organizationService.getByIdRel(id)); - } - - @PreAuthorize("hasAuthority('sys:org:save')") - @OperationLog - @ApiOperation("添加组织机构") - @PostMapping() - public ApiResult add(@RequestBody Organization organization) { - if (organization.getParentId() == null) { - organization.setParentId(0); - } - if (organizationService.count(new LambdaQueryWrapper() - .eq(Organization::getOrganizationName, organization.getOrganizationName()) - .eq(Organization::getParentId, organization.getParentId())) > 0) { - return fail("机构名称已存在"); - } - if (organizationService.save(organization)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('sys:org:update')") - @OperationLog - @ApiOperation("修改组织机构") - @PutMapping() - public ApiResult update(@RequestBody Organization organization) { - if (organization.getOrganizationName() != null) { - if (organization.getParentId() == null) { - organization.setParentId(0); - } - if (organizationService.count(new LambdaQueryWrapper() - .eq(Organization::getOrganizationName, organization.getOrganizationName()) - .eq(Organization::getParentId, organization.getParentId()) - .ne(Organization::getOrganizationId, organization.getOrganizationId())) > 0) { - return fail("机构名称已存在"); - } - } - if (organizationService.updateById(organization)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('sys:org:remove')") - @OperationLog - @ApiOperation("删除组织机构") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (organizationService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @PreAuthorize("hasAuthority('sys:org:save')") - @OperationLog - @ApiOperation("批量添加组织机构") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List organizationList) { - if (organizationService.saveBatch(organizationList)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('sys:org:update')") - @OperationLog - @ApiOperation("批量修改组织机构") - @PutMapping("/batch") - public ApiResult updateBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(organizationService, Organization::getOrganizationId)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('sys:org:remove')") - @OperationLog - @ApiOperation("批量删除组织机构") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (organizationService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/modules/common/system/controller/PaymentController.java b/modules/common/system/controller/PaymentController.java deleted file mode 100644 index be1be70..0000000 --- a/modules/common/system/controller/PaymentController.java +++ /dev/null @@ -1,246 +0,0 @@ -package com.gxwebsoft.common.system.controller; - -import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.gxwebsoft.common.core.exception.BusinessException; -import com.gxwebsoft.common.core.utils.RedisUtil; -import com.gxwebsoft.common.core.utils.RequestUtil; -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.common.system.entity.*; -import com.gxwebsoft.common.system.service.PaymentService; -import com.gxwebsoft.common.system.param.PaymentParam; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.BatchParam; -import com.gxwebsoft.common.core.annotation.OperationLog; -import com.gxwebsoft.common.system.service.UserBalanceLogService; -import com.gxwebsoft.common.system.service.UserService; -import com.wechat.pay.java.service.partnerpayments.jsapi.model.Transaction; -import com.wechat.pay.java.service.partnerpayments.model.TransactionAmount; -import com.wechat.pay.java.service.payments.jsapi.model.Amount; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.util.CollectionUtils; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.math.BigDecimal; -import java.util.List; -import java.util.UUID; -import java.util.concurrent.TimeUnit; - -import static com.gxwebsoft.common.core.constants.BalanceConstants.BALANCE_ADMIN; -import static com.gxwebsoft.common.core.constants.BalanceConstants.BALANCE_USE; - -/** - * 支付方式控制器 - * - * @author 科技小王子 - * @since 2024-05-11 12:39:11 - */ -@Api(tags = "支付方式管理") -@RestController -@RequestMapping("/api/system/payment") -public class PaymentController extends BaseController { - @Resource - private PaymentService paymentService; - @Resource - private UserService userService; - @Resource - private UserBalanceLogService userBalanceLogService; - @Resource - private RedisUtil redisUtil; - @Resource - private RequestUtil requestUtil; - - @ApiOperation("余额支付接口") - @PostMapping("/balancePay") - public ApiResult balancePay(@RequestBody Order order) { - System.out.println("使用余额支付 >>> 订单信息 " + order); - - // 查询购买者信息 - final User buyer = userService.getById(order.getUserId()); - - if (buyer.getBalance().compareTo(order.getPayPrice()) < 0) { - return fail("余额不足"); - } - - // 扣除余额 - final BigDecimal subtract = buyer.getBalance().subtract(order.getTotalPrice()); - buyer.setBalance(subtract); - final boolean updateUser = userService.updateUser(buyer); - System.out.println("updateUser = " + updateUser); - - // 记录余额明细 - UserBalanceLog userBalanceLog = new UserBalanceLog(); - userBalanceLog.setUserId(buyer.getUserId()); - userBalanceLog.setScene(BALANCE_USE); - userBalanceLog.setMoney(order.getPayPrice()); - BigDecimal balance = buyer.getBalance().add(order.getPayPrice()); - userBalanceLog.setBalance(balance); - userBalanceLog.setComments(order.getMerchantName()); - userBalanceLog.setTransactionId(UUID.randomUUID().toString()); - userBalanceLog.setOrderNo(order.getOrderNo()); - final boolean save = userBalanceLogService.save(userBalanceLog); - System.out.println("save = " + save); - - // 推送微信官方支付结果(携带租户ID的POST请求) - final Transaction transaction = new Transaction(); - transaction.setOutTradeNo(order.getOrderNo()); - transaction.setTransactionId(order.getOrderNo()); - final TransactionAmount amount = new TransactionAmount(); - // 计算金额 -// BigDecimal decimal = order.getTotalPrice(); -// final BigDecimal multiply = decimal.multiply(new BigDecimal(100)); -// // 将 BigDecimal 转换为 Integer -// Integer money = multiply.intValue(); - amount.setTotal(order.getPayPrice().intValue()); - amount.setCurrency("CNY"); - transaction.setAmount(amount); - // 获取支付配置信息用于解密 - String key = "Payment:0:".concat(order.getTenantId().toString()); - System.out.println("key = " + key); - final Payment payment = redisUtil.get(key, Payment.class); - requestUtil.pushBalancePayNotify(transaction, payment); - - return success("支付成功",order.getOrderNo()); - } - - @ApiOperation("选择支付方式") - @GetMapping("/select") - public ApiResult select(PaymentParam param) { - String key = "SelectPayment:".concat(getTenantId().toString()); - final String string = redisUtil.get(key); - final List paymentList = JSONObject.parseArray(string, Payment.class); - if (!CollectionUtils.isEmpty(paymentList)) { - return success(paymentList); - } - // 使用关联查询 - final List list = paymentService.list(new LambdaUpdateWrapper().eq(Payment::getStatus, true)); - if (!CollectionUtils.isEmpty(list)) { - list.forEach(d -> { - d.setApiKey(null); - d.setApiclientCert(null); - d.setApiclientKey(null); - d.setMerchantSerialNumber(null); - }); - } - redisUtil.set(key,list,1L, TimeUnit.DAYS); - return success(list); - } - - @PreAuthorize("hasAuthority('sys:payment:list')") - @OperationLog - @ApiOperation("分页查询支付方式") - @GetMapping("/page") - public ApiResult> page(PaymentParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("sort_number asc, create_time asc"); - return success(paymentService.page(page, page.getWrapper())); - // 使用关联查询 -// return success(paymentService.pageRel(param)); - } - - @PreAuthorize("hasAuthority('sys:payment:list')") - @OperationLog - @ApiOperation("查询全部支付方式") - @GetMapping() - public ApiResult> list(PaymentParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("sort_number asc, create_time asc"); - return success(paymentService.list(page.getOrderWrapper())); - // 使用关联查询 - //return success(paymentService.listRel(param)); - } - - @PreAuthorize("hasAuthority('sys:payment:list')") - @OperationLog - @ApiOperation("根据id查询支付方式") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - return success(paymentService.getById(id)); - // 使用关联查询 - //return success(paymentService.getByIdRel(id)); - } - - @PreAuthorize("hasAuthority('sys:payment:save')") - @OperationLog - @ApiOperation("添加支付方式") - @PostMapping() - public ApiResult save(@RequestBody Payment payment) { - if (paymentService.count(new LambdaQueryWrapper().eq(Payment::getCode,payment.getCode())) > 0) { - return fail(payment.getName() + "已存在"); - } - if (paymentService.save(payment)) { - String key = "Payment:" + payment.getCode() + ":" + getTenantId(); - redisUtil.set(key,payment); - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('sys:payment:update')") - @OperationLog - @ApiOperation("修改支付方式") - @PutMapping() - public ApiResult update(@RequestBody Payment payment) { - if (paymentService.updateById(payment)) { - String key = "Payment:" + payment.getCode() + ":" + getTenantId(); - redisUtil.set(key,payment); - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('sys:payment:remove')") - @OperationLog - @ApiOperation("删除支付方式") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - final Payment payment = paymentService.getById(id); - System.out.println("payment = " + payment); - String key = "Payment:" + payment.getCode() + ":" + getTenantId(); - redisUtil.delete(key); - if (paymentService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @PreAuthorize("hasAuthority('sys:payment:save')") - @OperationLog - @ApiOperation("批量添加支付方式") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (paymentService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('sys:payment:update')") - @OperationLog - @ApiOperation("批量修改支付方式") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(paymentService, "id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('sys:payment:remove')") - @OperationLog - @ApiOperation("批量删除支付方式") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (paymentService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/modules/common/system/controller/PlugController.java b/modules/common/system/controller/PlugController.java deleted file mode 100644 index d932d18..0000000 --- a/modules/common/system/controller/PlugController.java +++ /dev/null @@ -1,139 +0,0 @@ -package com.gxwebsoft.common.system.controller; - -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.common.system.entity.User; -import com.gxwebsoft.common.system.service.PlugService; -import com.gxwebsoft.common.system.entity.Plug; -import com.gxwebsoft.common.system.param.PlugParam; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.BatchParam; -import com.gxwebsoft.common.core.annotation.OperationLog; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 插件扩展控制器 - * - * @author 科技小王子 - * @since 2023-10-12 09:53:07 - */ -@Api(tags = "插件扩展管理") -@RestController -@RequestMapping("/api/system/plug") -public class PlugController extends BaseController { - @Resource - private PlugService plugService; - - @PreAuthorize("hasAuthority('sys:plug:list')") - @OperationLog - @ApiOperation("分页查询插件扩展") - @GetMapping("/page") - public ApiResult> page(PlugParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - return success(plugService.page(page, page.getWrapper())); - // 使用关联查询 - //return success(plugService.pageRel(param)); - } - - @PreAuthorize("hasAuthority('sys:plug:list')") - @OperationLog - @ApiOperation("查询全部插件扩展") - @GetMapping() - public ApiResult> list(PlugParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - return success(plugService.list(page.getOrderWrapper())); - // 使用关联查询 - //return success(plugService.listRel(param)); - } - - @PreAuthorize("hasAuthority('sys:plug:list')") - @OperationLog - @ApiOperation("根据id查询插件扩展") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - return success(plugService.getById(id)); - // 使用关联查询 - //return success(plugService.getByIdRel(id)); - } - - @PreAuthorize("hasAuthority('sys:plug:save')") - @OperationLog - @ApiOperation("添加插件扩展") - @PostMapping() - public ApiResult save(@RequestBody Plug plug) { - // 记录当前登录用户id - User loginUser = getLoginUser(); - if (loginUser != null) { - plug.setUserId(loginUser.getUserId()); - } - if (plugService.save(plug)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('sys:plug:update')") - @OperationLog - @ApiOperation("修改插件扩展") - @PutMapping() - public ApiResult update(@RequestBody Plug plug) { - if (plugService.updateById(plug)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('sys:plug:remove')") - @OperationLog - @ApiOperation("删除插件扩展") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (plugService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @PreAuthorize("hasAuthority('sys:plug:save')") - @OperationLog - @ApiOperation("批量添加插件扩展") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (plugService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('sys:plug:update')") - @OperationLog - @ApiOperation("批量修改插件扩展") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(plugService, "plug_id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('sys:plug:remove')") - @OperationLog - @ApiOperation("批量删除插件扩展") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (plugService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/modules/common/system/controller/RechargeOrderController.java b/modules/common/system/controller/RechargeOrderController.java deleted file mode 100644 index 1902a96..0000000 --- a/modules/common/system/controller/RechargeOrderController.java +++ /dev/null @@ -1,191 +0,0 @@ -package com.gxwebsoft.common.system.controller; - -import cn.hutool.core.util.IdUtil; -import com.gxwebsoft.common.core.utils.CommonUtil; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.common.core.web.BatchParam; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.system.entity.User; -import com.gxwebsoft.common.system.service.UserService; -import com.gxwebsoft.common.system.entity.RechargeOrder; -import com.gxwebsoft.common.system.entity.UserBalanceLog; -import com.gxwebsoft.common.system.param.RechargeOrderParam; -import com.gxwebsoft.common.system.service.RechargeOrderService; -import com.gxwebsoft.common.system.service.UserBalanceLogService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; - -import static com.gxwebsoft.common.core.constants.BalanceConstants.BALANCE_ADMIN; - -/** - * 会员充值订单表控制器 - * - * @author 科技小王子 - * @since 2024-07-26 23:18:48 - */ -@Api(tags = "会员充值订单表管理") -@RestController -@RequestMapping("/api/sys/recharge-order") -public class RechargeOrderController extends BaseController { - @Resource - private RechargeOrderService rechargeOrderService; - @Resource - private UserService userService; - @Resource - private UserBalanceLogService userBalanceLogService; - - @PreAuthorize("hasAuthority('sys:rechargeOrder:save')") - @ApiOperation("会员充值") - @PostMapping("/recharge") - @Transactional(rollbackFor = {Exception.class}) - public ApiResult recharge(@RequestBody RechargeOrder rechargeOrder) { - // 充值 - User user = userService.getById(rechargeOrder.getUserId()); - BigDecimal balance = user.getBalance().add(rechargeOrder.getPayPrice()); - user.setBalance(balance); - userService.updateById(user); - // 保存充值记录 - rechargeOrder.setOrderNo(Long.toString(IdUtil.getSnowflakeNextId())); - rechargeOrder.setTradeId(Integer.valueOf(CommonUtil.createOrderNo())); - rechargeOrder.setBalance(balance); - if (rechargeOrderService.save(rechargeOrder)) { - // 记录余额明细 - UserBalanceLog userBalanceLog = new UserBalanceLog(); - userBalanceLog.setUserId(rechargeOrder.getUserId()); - userBalanceLog.setScene(BALANCE_ADMIN); - userBalanceLog.setMoney(rechargeOrder.getPayPrice()); - userBalanceLog.setBalance(balance); - userBalanceLog.setTransactionId(UUID.randomUUID().toString()); - userBalanceLog.setComments("操作人：" + getLoginUser().getNickname()); - userBalanceLog.setRemark(rechargeOrder.getComments()); - userBalanceLog.setMerchantCode(rechargeOrder.getMerchantCode()); - userBalanceLogService.save(userBalanceLog); - return success("充值成功", user); - } - return fail("充值失败"); - } - - @PreAuthorize("hasAuthority('sys:rechargeOrder:list')") - @ApiOperation("分页查询会员充值订单表") - @GetMapping("/page") - public ApiResult> page(RechargeOrderParam param) { - // 使用关联查询 - return success(rechargeOrderService.pageRel(param)); - } - - @PreAuthorize("hasAuthority('sys:rechargeOrder:list')") - @ApiOperation("查询全部会员充值订单表") - @GetMapping() - public ApiResult> list(RechargeOrderParam param) { - // 使用关联查询 - return success(rechargeOrderService.listRel(param)); - } - - @PreAuthorize("hasAuthority('sys:rechargeOrder:list')") - @ApiOperation("根据id查询会员充值订单表") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - // 使用关联查询 - return success(rechargeOrderService.getByIdRel(id)); - } - - @ApiOperation("添加会员充值订单表") - @PostMapping() - public ApiResult save(@RequestBody RechargeOrder rechargeOrder) { - // 记录当前登录用户id - User loginUser = getLoginUser(); - if (loginUser != null) { - rechargeOrder.setUserId(loginUser.getUserId()); - } - if (rechargeOrderService.save(rechargeOrder)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @ApiOperation("修改会员充值订单表") - @PutMapping() - public ApiResult update(@RequestBody RechargeOrder rechargeOrder) { - if (rechargeOrderService.updateById(rechargeOrder)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("删除会员充值订单表") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (rechargeOrderService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @PreAuthorize("hasAuthority('sys:rechargeOrder:save')") - @ApiOperation("批量充值") - @PostMapping("/batchRecharge") - @Transactional(rollbackFor = {Exception.class}) - public ApiResult batchRecharge(@RequestBody List list) { - String nickname = getLoginUser().getNickname(); - String realName = getLoginUser().getRealName(); - ArrayList users = new ArrayList<>(list.size()); - ArrayList logs = new ArrayList<>(list.size()); - - list.forEach(d -> { - User user = userService.getByIdRel(d.getUserId()); - BigDecimal balance = user.getBalance().add(d.getPayPrice()); - user.setBalance(balance); - users.add(user); - UserBalanceLog userBalanceLog = new UserBalanceLog(); - userBalanceLog.setUserId(d.getUserId()); - userBalanceLog.setScene(BALANCE_ADMIN); - userBalanceLog.setMoney(d.getPayPrice()); - userBalanceLog.setBalance(balance); - userBalanceLog.setComments("操作员：" + realName); - userBalanceLog.setRemark(d.getComments()); - userBalanceLog.setMerchantCode(d.getMerchantCode()); - d.setOperator(realName); - logs.add(userBalanceLog); - }); - - if (rechargeOrderService.saveBatch(list)) { - // 批量充值 - userService.updateBatchById(users); - // 记录余额明细 - userBalanceLogService.saveBatch(logs); - return success("充值成功"); - } - return fail("充值失败"); - } - - @PreAuthorize("hasAuthority('sys:rechargeOrder:update')") - @ApiOperation("批量修改会员充值订单表") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(rechargeOrderService, "order_id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('sys:rechargeOrder:remove')") - @ApiOperation("批量删除会员充值订单表") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (rechargeOrderService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/modules/common/system/controller/RedisUtilController.java b/modules/common/system/controller/RedisUtilController.java deleted file mode 100644 index 6e2c2a0..0000000 --- a/modules/common/system/controller/RedisUtilController.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.gxwebsoft.common.system.controller; - -import com.gxwebsoft.common.core.utils.CacheClient; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.common.system.entity.User; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.data.redis.core.StringRedisTemplate; -import org.springframework.web.bind.annotation.*; - -@RestController -@RequestMapping("/api/redis-util") -@Api(tags = "Redis缓存工具接口") -public class RedisUtilController extends BaseController { - private CacheClient cacheClient; - private final StringRedisTemplate redisTemplate; - private static final String SPLIT = ":"; - private static final String PREFIX_ENTITY_LIKE = "focus:user"; - private static final String PREFIX_USER_LIKE = "like:user"; - private static final String PREFIX_FOLLOWEE = "followee"; - private static final String PREFIX_FOLLOWER = "follower"; - - - public RedisUtilController(StringRedisTemplate redisTemplate) { - this.redisTemplate = redisTemplate; - } - - @ApiOperation("添加关注") - @PostMapping("/addFocus") - public ApiResult addFocus(@RequestBody User user) { - final Integer userId = user.getUserId(); - redisTemplate.opsForZSet().incrementScore(getFocusKey(userId), userId.toString(), 1); - return success("关注成功"); - } - - /** - * 某个用户的关注数 - * @return like:entity:[entityId] ->set(userId) - */ - public static String getFocusKey(Integer userId) { - return PREFIX_ENTITY_LIKE + SPLIT + userId; - } - - /** - * 某个用户的赞 - * @return like:entity:[entityId] ->set(userId) - */ - public static String getEntityLikeKey(int entityType, int entityId) { - return PREFIX_ENTITY_LIKE + SPLIT + entityType + SPLIT + entityId; - } - - /** - * 某个用户的赞 - * @return like:user:[userId] ->int - */ - public static String getUserLikeKey(int userId) { - return PREFIX_USER_LIKE + SPLIT + userId; - } - - /** - * 某个用户关注的实体（键：用户Id，值：实体Id） - * @return followee:[userId:entityType] ->zSet(entityId,now) - */ - public static String getFolloweeKey(int userId, int entityType) { - return PREFIX_FOLLOWEE + SPLIT + userId + SPLIT + entityType; - } - - /** - * 某个实体拥有的粉丝（键：实体Id，值：用户Id) - * @return follower:[entityType:entityId] ->zSet(entityId,now) - */ - public static String getFollowerKey(int entityType, int entityId) { - return PREFIX_FOLLOWER + SPLIT + entityType + SPLIT + entityId; - } - -} diff --git a/modules/common/system/controller/RoleController.java b/modules/common/system/controller/RoleController.java deleted file mode 100644 index bded101..0000000 --- a/modules/common/system/controller/RoleController.java +++ /dev/null @@ -1,154 +0,0 @@ -package com.gxwebsoft.common.system.controller; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.gxwebsoft.common.core.annotation.OperationLog; -import com.gxwebsoft.common.core.utils.CommonUtil; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.system.entity.Role; -import com.gxwebsoft.common.system.param.RoleParam; -import com.gxwebsoft.common.system.service.RoleService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; -import java.util.stream.Collectors; - -/** - * 角色控制器 - * - * @author WebSoft - * @since 2018-12-24 16:10:02 - */ -@Api(tags = "角色管理") -@RestController -@RequestMapping("/api/system/role") -public class RoleController extends BaseController { - @Resource - private RoleService roleService; - - @PreAuthorize("hasAuthority('sys:role:list')") - @OperationLog - @ApiOperation("分页查询角色") - @GetMapping("/page") - public ApiResult> page(RoleParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("sort_number asc"); - return success(roleService.page(page, page.getWrapper())); - } - - @PreAuthorize("hasAuthority('sys:role:list')") - @OperationLog - @ApiOperation("查询全部角色") - @GetMapping() - public ApiResult> list(RoleParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("sort_number asc"); - return success(roleService.list(page.getOrderWrapper())); - } - - @PreAuthorize("hasAuthority('sys:role:list')") - @OperationLog - @ApiOperation("根据id查询角色") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - return success(roleService.getById(id)); - } - - @PreAuthorize("hasAuthority('sys:role:save')") - @OperationLog - @ApiOperation("添加角色") - @PostMapping() - public ApiResult save(@RequestBody Role role) { - if (roleService.count(new LambdaQueryWrapper().eq(Role::getRoleCode, role.getRoleCode())) > 0) { - return fail("角色标识已存在"); - } - if (roleService.count(new LambdaQueryWrapper().eq(Role::getRoleName, role.getRoleName())) > 0) { - return fail("角色名称已存在"); - } - if (roleService.save(role)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('sys:role:update')") - @OperationLog - @ApiOperation("修改角色") - @PutMapping() - public ApiResult update(@RequestBody Role role) { - if (role.getRoleCode() != null && roleService.count(new LambdaQueryWrapper() - .eq(Role::getRoleCode, role.getRoleCode()) - .ne(Role::getRoleId, role.getRoleId())) > 0) { - return fail("角色标识已存在"); - } - if (role.getRoleName() != null && roleService.count(new LambdaQueryWrapper() - .eq(Role::getRoleName, role.getRoleName()) - .ne(Role::getRoleId, role.getRoleId())) > 0) { - return fail("角色名称已存在"); - } - if (roleService.updateById(role)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('sys:role:remove')") - @OperationLog - @ApiOperation("删除角色") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (roleService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @PreAuthorize("hasAuthority('sys:role:save')") - @OperationLog - @ApiOperation("批量添加角色") - @PostMapping("/batch") - public ApiResult> saveBatch(@RequestBody List list) { - // 校验是否重复 - if (CommonUtil.checkRepeat(list, Role::getRoleName)) { - return fail("角色名称存在重复", null); - } - if (CommonUtil.checkRepeat(list, Role::getRoleCode)) { - return fail("角色标识存在重复", null); - } - // 校验是否存在 - List codeExists = roleService.list(new LambdaQueryWrapper().in(Role::getRoleCode, - list.stream().map(Role::getRoleCode).collect(Collectors.toList()))); - if (codeExists.size() > 0) { - return fail("角色标识已存在", codeExists.stream().map(Role::getRoleCode) - .collect(Collectors.toList())).setCode(2); - } - List nameExists = roleService.list(new LambdaQueryWrapper().in(Role::getRoleName, - list.stream().map(Role::getRoleCode).collect(Collectors.toList()))); - if (nameExists.size() > 0) { - return fail("角色标识已存在", nameExists.stream().map(Role::getRoleCode) - .collect(Collectors.toList())).setCode(3); - } - if (roleService.saveBatch(list)) { - return success("添加成功", null); - } - return fail("添加失败", null); - } - - @PreAuthorize("hasAuthority('sys:role:remove')") - @OperationLog - @ApiOperation("批量删除角色") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (roleService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/modules/common/system/controller/RoleMenuController.java b/modules/common/system/controller/RoleMenuController.java deleted file mode 100644 index bdd35dd..0000000 --- a/modules/common/system/controller/RoleMenuController.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.gxwebsoft.common.system.controller; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.gxwebsoft.common.core.annotation.OperationLog; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.common.core.exception.BusinessException; -import com.gxwebsoft.common.system.entity.Menu; -import com.gxwebsoft.common.system.entity.RoleMenu; -import com.gxwebsoft.common.system.service.MenuService; -import com.gxwebsoft.common.system.service.RoleMenuService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.List; - -/** - * 角色菜单控制器 - * - * @author WebSoft - * @since 2018-12-24 16:10:01 - */ -@Api(tags = "角色菜单管理") -@RestController -@RequestMapping("/api/system/role-menu") -public class RoleMenuController extends BaseController { - @Resource - private RoleMenuService roleMenuService; - @Resource - private MenuService menuService; - - @PreAuthorize("hasAuthority('sys:role:list')") - @OperationLog - @ApiOperation("查询角色菜单") - @GetMapping("/{id}") - public ApiResult> list(@PathVariable("id") Integer roleId) { - List menus = menuService.list(new LambdaQueryWrapper().orderByAsc(Menu::getSortNumber)); - List roleMenus = roleMenuService.list(new LambdaQueryWrapper() - .eq(RoleMenu::getRoleId, roleId)); - for (Menu menu : menus) { - menu.setChecked(roleMenus.stream().anyMatch((d) -> d.getMenuId().equals(menu.getMenuId()))); - } - return success(menus); - } - - @Transactional(rollbackFor = {Exception.class}) - @PreAuthorize("hasAuthority('sys:role:update')") - @OperationLog - @ApiOperation("修改角色菜单") - @PutMapping("/{id}") - public ApiResult update(@PathVariable("id") Integer roleId, @RequestBody List menuIds) { - roleMenuService.remove(new LambdaUpdateWrapper().eq(RoleMenu::getRoleId, roleId)); - if (menuIds != null && menuIds.size() > 0) { - List roleMenuList = new ArrayList<>(); - for (Integer menuId : menuIds) { - RoleMenu roleMenu = new RoleMenu(); - roleMenu.setRoleId(roleId); - roleMenu.setMenuId(menuId); - roleMenuList.add(roleMenu); - } - if (!roleMenuService.saveBatch(roleMenuList)) { - throw new BusinessException("保存失败"); - } - } - return success("保存成功"); - } - - @PreAuthorize("hasAuthority('sys:role:update')") - @OperationLog - @ApiOperation("添加角色菜单") - @PostMapping("/{id}") - public ApiResult addRoleAuth(@PathVariable("id") Integer roleId, @RequestBody Integer menuId) { - RoleMenu roleMenu = new RoleMenu(); - roleMenu.setRoleId(roleId); - roleMenu.setMenuId(menuId); - if (roleMenuService.save(roleMenu)) { - return success(); - } - return fail(); - } - - @PreAuthorize("hasAuthority('sys:role:update')") - @OperationLog - @ApiOperation("移除角色菜单") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer roleId, @RequestBody Integer menuId) { - if (roleMenuService.remove(new LambdaUpdateWrapper() - .eq(RoleMenu::getRoleId, roleId).eq(RoleMenu::getMenuId, menuId))) { - return success(); - } - return fail(); - } - -} diff --git a/modules/common/system/controller/SettingController.java b/modules/common/system/controller/SettingController.java deleted file mode 100644 index 05408a1..0000000 --- a/modules/common/system/controller/SettingController.java +++ /dev/null @@ -1,193 +0,0 @@ -package com.gxwebsoft.common.system.controller; - -import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.gxwebsoft.common.core.annotation.OperationLog; -import com.gxwebsoft.common.core.utils.RedisUtil; -import com.gxwebsoft.common.core.web.*; -import com.gxwebsoft.common.system.entity.Setting; -import com.gxwebsoft.common.system.entity.Tenant; -import com.gxwebsoft.common.system.param.SettingParam; -import com.gxwebsoft.common.system.service.SettingService; -import com.gxwebsoft.common.system.service.TenantService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 系统设置控制器 - * - * @author WebSoft - * @since 2022-11-19 13:54:27 - */ -@Api(tags = "系统设置管理") -@RestController -@RequestMapping("/api/system/setting") -public class SettingController extends BaseController { - @Resource - private SettingService settingService; - @Resource - private TenantService tenantService; - @Resource - private RedisUtil redisUtil; - - @PreAuthorize("hasAuthority('sys:setting:save')") - @OperationLog - @ApiOperation("分页查询系统设置") - @GetMapping("/page") - public ApiResult> page(SettingParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - return success(settingService.page(page, page.getWrapper())); - // 使用关联查询 - //return success(settingService.pageRel(param)); - } - - @PreAuthorize("hasAuthority('sys:setting:save')") - @OperationLog - @ApiOperation("查询全部系统设置") - @GetMapping() - public ApiResult> list(SettingParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - return success(settingService.list(page.getOrderWrapper())); - // 使用关联查询 - //return success(settingService.listRel(param)); - } - - @PreAuthorize("hasAuthority('sys:setting:save')") - @OperationLog - @ApiOperation("根据id查询系统设置") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - return success(settingService.getById(id)); - // 使用关联查询 - //return success(settingService.getByIdRel(id)); - } - - @PreAuthorize("hasAuthority('sys:setting:save')") - @OperationLog - @ApiOperation("添加系统设置") - @PostMapping() - public ApiResult save(@RequestBody Setting setting) { - if (settingService.save(setting)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('sys:setting:save')") - @OperationLog - @ApiOperation("修改系统设置") - @PutMapping() - public ApiResult update(@RequestBody Setting setting) { - if (settingService.updateById(setting)) { - // 更新系统设置信息到缓存 key = "" -// String key = StrUtil.upperFirst(setting.getSettingKey()).concat(":").concat(getTenantId().toString()); - String key = setting.getSettingKey().concat(":").concat(setting.getTenantId().toString()); - redisUtil.set(key, JSON.parseObject(setting.getContent())); - // 更新租户信息 - if (setting.getSettingKey().equals("setting")) { - final String content = setting.getContent(); - final JSONObject jsonObject = JSONObject.parseObject(content); - final String siteName = jsonObject.getString("siteName"); - final String logo = jsonObject.getString("logo"); - final Tenant tenant = new Tenant(); - tenant.setTenantName(siteName); - tenant.setTenantId(getTenantId()); - tenant.setLogo(logo); - tenantService.updateById(tenant); - } - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('sys:setting:remove')") - @OperationLog - @ApiOperation("删除系统设置") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (settingService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @PreAuthorize("hasAuthority('sys:setting:save')") - @OperationLog - @ApiOperation("批量添加系统设置") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (settingService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('sys:setting:update')") - @OperationLog - @ApiOperation("批量修改系统设置") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(settingService, "setting_id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('sys:setting:remove')") - @OperationLog - @ApiOperation("批量删除系统设置") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (settingService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @PreAuthorize("hasAuthority('sys:setting:data')") - @OperationLog - @ApiOperation("查询租户设置信息") - @GetMapping("/data") - public ApiResult data() { - return success(settingService.getData("setting")); - } - - @PreAuthorize("hasAuthority('sys:setting:save')") - @OperationLog - @ApiOperation("更新主题皮肤") - @PutMapping("/theme") - public ApiResult theme(@RequestBody Setting setting) { - String key = "theme:".concat(getTenantId().toString()); - // 新增 - final Setting one = settingService.getOne(new LambdaQueryWrapper().eq(Setting::getSettingKey, setting.getSettingKey())); - if(one == null){ - settingService.save(setting); - redisUtil.set(key,setting.getContent()); - return success("保存成功"); - } - // 更新 - final Setting update = settingService.getOne(new LambdaQueryWrapper().eq(Setting::getSettingKey, setting.getSettingKey())); - update.setContent(setting.getContent()); - if (settingService.updateById(update)) { - redisUtil.set(key,setting.getContent()); - return success("更新成功"); - } - return fail("更新失败"); - } - - @ApiOperation("更新主题皮肤") - @GetMapping("/getTheme") - public ApiResult getTheme() { - String key = "theme:".concat(getTenantId().toString()); - return success("获取成功",redisUtil.get(key)); - } -} diff --git a/modules/common/system/controller/TenantController.java b/modules/common/system/controller/TenantController.java deleted file mode 100644 index 70f3de1..0000000 --- a/modules/common/system/controller/TenantController.java +++ /dev/null @@ -1,193 +0,0 @@ -package com.gxwebsoft.common.system.controller; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.gxwebsoft.common.core.exception.BusinessException; -import com.gxwebsoft.common.core.utils.JSONUtil; -import com.gxwebsoft.common.core.utils.RedisUtil; -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.common.system.entity.*; -import com.gxwebsoft.common.system.param.PlugParam; -import com.gxwebsoft.common.system.service.CompanyService; -import com.gxwebsoft.common.system.service.MenuService; -import com.gxwebsoft.common.system.service.RoleMenuService; -import com.gxwebsoft.common.system.service.TenantService; -import com.gxwebsoft.common.system.param.TenantParam; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.BatchParam; -import com.gxwebsoft.common.core.annotation.OperationLog; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.util.CollectionUtils; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; - -/** - * 租户控制器 - * - * @author 科技小王子 - * @since 2023-07-17 17:49:53 - */ -@Api(tags = "租户管理") -@RestController -@RequestMapping("/api/system/tenant") -public class TenantController extends BaseController { - @Resource - private TenantService tenantService; - @Resource - private MenuService menuService; - @Resource - private RoleMenuService roleMenuService; - @Resource - private CompanyService companyService; - @Resource - private RedisUtil redisUtil; - - @PreAuthorize("hasAuthority('sys:tenant:list')") - @ApiOperation("分页查询租户") - @GetMapping("/page") - public ApiResult> page(TenantParam param) { - return success(tenantService.pageRel(param)); - } - - @PreAuthorize("hasAuthority('sys:tenant:list')") - @ApiOperation("查询全部租户") - @GetMapping() - public ApiResult> list(TenantParam param) { - // 使用关联查询 - return success(tenantService.listRel(param)); - } - - @PreAuthorize("hasAuthority('sys:tenant:list')") - @ApiOperation("根据id查询租户") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - Tenant tenant = tenantService.getById(id); - // 附加企业信息 - List list = companyService.list(new LambdaQueryWrapper().eq(Company::getTenantId, tenant.getTenantId()).eq(Company::getAuthoritative, true)); - if (!CollectionUtils.isEmpty(list)) { - final Company company = list.get(0); - tenant.setCompany(company); - } - return success(tenant); - } - - @ApiOperation("根据code搜索租户") - @GetMapping("/getTenantId/{code}") - public ApiResult getTenantIdByKeywords(@PathVariable("code") String code) { - String key = "TenantCode:".concat(code); - // 查询缓存 - final String string = redisUtil.get(key); - if(string != null){ - return success(JSONUtil.parseObject(string, Integer.class)); - } - // 使用关联查询 - final Tenant tenant = tenantService.getOne(new LambdaUpdateWrapper().eq(Tenant::getTenantId, code).or().eq(Tenant::getTenantCode, code).last("limit 1")); - if(tenant == null){ - return fail("应用不存在或已过期",null); - } - redisUtil.set(key,tenant.getTenantId().toString(),1L, TimeUnit.DAYS); - return success(tenant.getTenantId()); - } - - @PreAuthorize("hasAuthority('sys:tenant:save')") - @OperationLog - @ApiOperation("添加租户") - @PostMapping() - public ApiResult save(@RequestBody Tenant tenant) { - if (tenantService.save(tenant)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('sys:tenant:update')") - @OperationLog - @ApiOperation("修改租户") - @PutMapping() - public ApiResult update(@RequestBody Tenant tenant) { - if (tenantService.updateById(tenant)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('sys:tenant:remove')") - @OperationLog - @ApiOperation("删除租户") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (tenantService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @PreAuthorize("hasAuthority('sys:tenant:save')") - @OperationLog - @ApiOperation("批量添加租户") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (tenantService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('sys:tenant:update')") - @OperationLog - @ApiOperation("批量修改租户") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(tenantService, "tenant_id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('sys:tenant:remove')") - @OperationLog - @ApiOperation("批量删除租户") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (tenantService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @ApiOperation("租户角色权限初始化") - @GetMapping("/role-menu/{id}") - public ApiResult> initialization(@PathVariable("id") Integer roleId) { - List menus = menuService.list(new LambdaQueryWrapper().orderByAsc(Menu::getSortNumber)); - List roleMenus = roleMenuService.list(new LambdaQueryWrapper() - .eq(RoleMenu::getRoleId, roleId)); - for (Menu menu : menus) { - menu.setChecked(roleMenus.stream().anyMatch((d) -> d.getMenuId().equals(menu.getMenuId()))); - } - List menuIds = menus.stream().map(Menu::getMenuId).collect(Collectors.toList()); - roleMenuService.remove(new LambdaUpdateWrapper().eq(RoleMenu::getRoleId, roleId)); - if (menuIds.size() > 0) { - List roleMenuList = new ArrayList<>(); - for (Integer menuId : menuIds) { - RoleMenu roleMenu = new RoleMenu(); - roleMenu.setRoleId(roleId); - roleMenu.setMenuId(menuId); - roleMenuList.add(roleMenu); - } - if (!roleMenuService.saveBatch(roleMenuList)) { - throw new BusinessException("保存失败"); - } - } - return success(menus); - } - -} diff --git a/modules/common/system/controller/UserBalanceLogController.java b/modules/common/system/controller/UserBalanceLogController.java deleted file mode 100644 index 2963571..0000000 --- a/modules/common/system/controller/UserBalanceLogController.java +++ /dev/null @@ -1,132 +0,0 @@ -package com.gxwebsoft.common.system.controller; - -import com.gxwebsoft.common.core.annotation.OperationLog; -import com.gxwebsoft.common.core.web.*; -import com.gxwebsoft.common.system.entity.User; -import com.gxwebsoft.common.system.entity.UserBalanceLog; -import com.gxwebsoft.common.system.param.UserBalanceLogParam; -import com.gxwebsoft.common.system.service.UserBalanceLogService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 用户余额变动明细表控制器 - * - * @author 科技小王子 - * @since 2023-04-21 15:59:09 - */ -@Api(tags = "用户余额变动明细表管理") -@RestController -@RequestMapping("/api/sys/user-balance-log") -public class UserBalanceLogController extends BaseController { - @Resource - private UserBalanceLogService userBalanceLogService; - - @PreAuthorize("hasAuthority('sys:userBalanceLog:list')") - @OperationLog - @ApiOperation("分页查询用户余额变动明细表") - @GetMapping("/page") - public ApiResult> page(UserBalanceLogParam param) { - // 使用关联查询 - return success(userBalanceLogService.pageRel(param)); - } - - @PreAuthorize("hasAuthority('sys:userBalanceLog:list')") - @OperationLog - @ApiOperation("查询全部用户余额变动明细表") - @GetMapping() - public ApiResult> list(UserBalanceLogParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - return success(userBalanceLogService.list(page.getOrderWrapper())); - // 使用关联查询 - //return success(userBalanceLogService.listRel(param)); - } - - @PreAuthorize("hasAuthority('sys:userBalanceLog:list')") - @OperationLog - @ApiOperation("根据id查询用户余额变动明细表") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - return success(userBalanceLogService.getById(id)); - // 使用关联查询 - //return success(userBalanceLogService.getByIdRel(id)); - } - - @PreAuthorize("hasAuthority('sys:userBalanceLog:save')") - @OperationLog - @ApiOperation("添加用户余额变动明细表") - @PostMapping() - public ApiResult save(@RequestBody UserBalanceLog userBalanceLog) { - // 记录当前登录用户id、租户id、商户编号 - User loginUser = getLoginUser(); - if (loginUser != null) { - userBalanceLog.setUserId(loginUser.getUserId()); - } - if (userBalanceLogService.save(userBalanceLog)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('sys:userBalanceLog:update')") - @OperationLog - @ApiOperation("修改用户余额变动明细表") - @PutMapping() - public ApiResult update(@RequestBody UserBalanceLog userBalanceLog) { - if (userBalanceLogService.updateById(userBalanceLog)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('sys:userBalanceLog:remove')") - @OperationLog - @ApiOperation("删除用户余额变动明细表") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (userBalanceLogService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @PreAuthorize("hasAuthority('sys:userBalanceLog:save')") - @OperationLog - @ApiOperation("批量添加用户余额变动明细表") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (userBalanceLogService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('sys:userBalanceLog:update')") - @OperationLog - @ApiOperation("批量修改用户余额变动明细表") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(userBalanceLogService, "log_id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('sys:userBalanceLog:remove')") - @OperationLog - @ApiOperation("批量删除用户余额变动明细表") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (userBalanceLogService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/modules/common/system/controller/UserCollectionController.java b/modules/common/system/controller/UserCollectionController.java deleted file mode 100644 index 560a84f..0000000 --- a/modules/common/system/controller/UserCollectionController.java +++ /dev/null @@ -1,136 +0,0 @@ -package com.gxwebsoft.common.system.controller; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.common.system.entity.User; -import com.gxwebsoft.common.system.service.UserCollectionService; -import com.gxwebsoft.common.system.entity.UserCollection; -import com.gxwebsoft.common.system.param.UserCollectionParam; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.BatchParam; -import com.gxwebsoft.common.core.annotation.OperationLog; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 我的收藏控制器 - * - * @author 科技小王子 - * @since 2024-04-28 18:08:32 - */ -@Api(tags = "我的收藏管理") -@RestController -@RequestMapping("/api/system/user-collection") -public class UserCollectionController extends BaseController { - @Resource - private UserCollectionService userCollectionService; - - @PreAuthorize("hasAuthority('sys:userCollection:list')") - @ApiOperation("分页查询我的收藏") - @GetMapping("/page") - public ApiResult> page(UserCollectionParam param) { - // 使用关联查询 - return success(userCollectionService.pageRel(param)); - } - - @PreAuthorize("hasAuthority('sys:userCollection:list')") - @ApiOperation("查询全部我的收藏") - @GetMapping() - public ApiResult> list(UserCollectionParam param) { - // 使用关联查询 - return success(userCollectionService.listRel(param)); - } - - @PreAuthorize("hasAuthority('sys:userCollection:list')") - @ApiOperation("根据id查询我的收藏") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - // 使用关联查询 - return success(userCollectionService.getByIdRel(id)); - } - - @PreAuthorize("hasAuthority('sys:userCollection:save')") - @OperationLog - @ApiOperation("添加和取消收藏") - @PostMapping() - public ApiResult save(@RequestBody UserCollection userCollection) { - // 记录当前登录用户id - User loginUser = getLoginUser(); - if (loginUser != null) { - userCollection.setUserId(loginUser.getUserId()); - userCollection.setTid(userCollection.getTid()); - final UserCollection one = userCollectionService.getOne(new LambdaQueryWrapper().eq(UserCollection::getUserId, loginUser.getUserId()).eq(UserCollection::getTid, userCollection.getTid()).last("limit 1")); - if (one != null) { - userCollectionService.removeById(one.getId()); - return success("已取消收藏"); - } - if (userCollectionService.save(userCollection)) { - return success("已添加收藏"); - } - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('sys:userCollection:update')") - @OperationLog - @ApiOperation("修改我的收藏") - @PutMapping() - public ApiResult update(@RequestBody UserCollection userCollection) { - if (userCollectionService.updateById(userCollection)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('sys:userCollection:remove')") - @OperationLog - @ApiOperation("删除我的收藏") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (userCollectionService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @PreAuthorize("hasAuthority('sys:userCollection:save')") - @OperationLog - @ApiOperation("批量添加我的收藏") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (userCollectionService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('sys:userCollection:update')") - @OperationLog - @ApiOperation("批量修改我的收藏") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(userCollectionService, "id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('sys:userCollection:remove')") - @OperationLog - @ApiOperation("批量删除我的收藏") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (userCollectionService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/modules/common/system/controller/UserController.java b/modules/common/system/controller/UserController.java deleted file mode 100644 index 8fd75a3..0000000 --- a/modules/common/system/controller/UserController.java +++ /dev/null @@ -1,399 +0,0 @@ -package com.gxwebsoft.common.system.controller; - -import cn.afterturn.easypoi.excel.ExcelImportUtil; -import cn.afterturn.easypoi.excel.entity.ImportParams; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.gxwebsoft.common.core.annotation.OperationLog; -import com.gxwebsoft.common.core.exception.BusinessException; -import com.gxwebsoft.common.core.utils.CommonUtil; -import com.gxwebsoft.common.core.web.*; -import com.gxwebsoft.common.system.entity.*; -import com.gxwebsoft.common.system.param.UserImportParam; -import com.gxwebsoft.common.system.param.UserParam; -import com.gxwebsoft.common.system.service.DictionaryDataService; -import com.gxwebsoft.common.system.service.OrganizationService; -import com.gxwebsoft.common.system.service.RoleService; -import com.gxwebsoft.common.system.service.UserService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; - -import javax.annotation.Resource; -import java.math.BigDecimal; -import java.util.*; -import java.util.stream.Collectors; - -/** - * 用户控制器 - * - * @author WebSoft - * @since 2018-12-24 16:10:41 - */ -@Api(tags = "用户管理") -@RestController -@RequestMapping("/api/system/user") -public class UserController extends BaseController { - @Resource - private UserService userService; - @Resource - private RoleService roleService; - @Resource - private OrganizationService organizationService; - @Resource - private DictionaryDataService dictionaryDataService; - - @PreAuthorize("hasAuthority('sys:auth:user')") - @ApiOperation("分页查询用户") - @GetMapping("/page") - public ApiResult> page(UserParam param) { - return success(userService.pageRel(param)); - } - - @PreAuthorize("hasAuthority('sys:auth:user')") - @ApiOperation("查询全部用户") - @GetMapping() - public ApiResult> list(UserParam param) { - return success(userService.listRel(param)); - } - - @PreAuthorize("hasAuthority('sys:auth:user')") - @ApiOperation("根据id查询用户") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - return success(userService.getByIdRel(id)); - } - - @PreAuthorize("hasAuthority('sys:auth:user')") - @ApiOperation("根据手机号码查询用户") - @GetMapping("/getByPhone/{phone}") - public ApiResult getByPhone(@PathVariable("phone") String phone) { - return success(userService.getByPhone(phone)); - } - - @PreAuthorize("hasAuthority('sys:user:save')") - @ApiOperation("添加用户") - @PostMapping() - public ApiResult add(@RequestBody User user) { - user.setStatus(0); - user.setPassword(userService.encodePassword(user.getPassword())); - if (userService.saveUser(user)) { - return success("添加成功",user.getUserId()); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('sys:user:save')") - @ApiOperation("批量添加用户") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List userList) { - userList.forEach(d -> { - d.setStatus(0); - if (d.getPassword() != null) { - d.setPassword(userService.encodePassword(d.getPassword())); - } - }); - if (userService.saveBatch(userList)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('sys:user:save')") - @ApiOperation("批量添加用户并返回userId") - @PostMapping("/batchBackUserId") - public ApiResult saveBatchBackUserId(@RequestBody List userList) { - userList.forEach(d -> { - d.setStatus(0); - d.setPassword(userService.encodePassword(d.getPassword())); - }); - final Set phones = userList.stream().map(User::getPhone).collect(Collectors.toSet()); - if (userService.saveBatch(userList)) { - final UserParam userParam = new UserParam(); - userParam.setPhones(phones); - userParam.setLimit(500L); - final PageResult result = userService.pageRel(userParam); - final Set collect = result.getList().stream().map(User::getUserId).collect(Collectors.toSet()); - return success("添加成功",collect); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('sys:user:update')") - @OperationLog - @ApiOperation("修改用户") - @PutMapping() - public ApiResult update(@RequestBody User user) { - user.setStatus(null); - user.setUsername(null); - user.setPassword(null); - if (userService.updateUser(user)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('sys:user:remove')") - @OperationLog - @ApiOperation("删除用户") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (userService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @PreAuthorize("hasAuthority('sys:user:update')") - @OperationLog - @ApiOperation("批量修改用户") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(userService, User::getUserId)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('sys:user:remove')") - @OperationLog - @ApiOperation("批量删除用户") - @ApiImplicitParams({ - @ApiImplicitParam(name = "ids", value = "id数组", required = true, dataType = "string", dataTypeClass = String.class) - }) - @Transactional(rollbackFor = {Exception.class}) - @DeleteMapping("/batch") - public ApiResult deleteBatch(@RequestBody List ids) { - if (userService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @PreAuthorize("hasAuthority('sys:user:update')") - @OperationLog - @ApiOperation("修改用户状态") - @PutMapping("/status") - public ApiResult updateStatus(@RequestBody User user) { - if (user.getUserId() == null || user.getStatus() == null || !Arrays.asList(0, 1).contains(user.getStatus())) { - return fail("参数不正确"); - } - User u = new User(); - u.setUserId(user.getUserId()); - u.setStatus(user.getStatus()); - if (userService.updateById(u)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('sys:user:update')") - @OperationLog - @ApiOperation("修改推荐状态") - @PutMapping("/recommend") - public ApiResult updateRecommend(@RequestBody User user) { - if (user.getUserId() == null || user.getRecommend() == null || !Arrays.asList(0, 1).contains(user.getRecommend())) { - return fail("参数不正确"); - } - User u = new User(); - u.setUserId(user.getUserId()); - u.setRecommend(user.getRecommend()); - if (userService.updateById(u)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('sys:user:update')") - @OperationLog - @ApiOperation("批量修改用户状态") - @PutMapping("/status/batch") - public ApiResult updateStatusBatch(@RequestBody BatchParam batchParam) { - if (!Arrays.asList(0, 1).contains(batchParam.getData())) { - return fail("状态值不正确"); - } - if (userService.update(new LambdaUpdateWrapper() - .in(User::getUserId, batchParam.getIds()) - .set(User::getStatus, batchParam.getData()))) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('sys:user:update')") - @OperationLog - @ApiOperation("重置密码") - @PutMapping("/password") - public ApiResult resetPassword(@RequestBody User user) { - if (user.getUserId() == null || StrUtil.isBlank(user.getPassword())) { - return fail("参数不正确"); - } - User u = new User(); - u.setUserId(user.getUserId()); - u.setPassword(userService.encodePassword(user.getPassword())); - if (userService.updateById(u)) { - return success("重置成功"); - } else { - return fail("重置失败"); - } - } - - @PreAuthorize("hasAuthority('sys:user:update')") - @OperationLog - @ApiOperation("批量重置密码") - @PutMapping("/password/batch") - public ApiResult resetPasswordBatch(@RequestBody BatchParam batchParam) { - if (batchParam.getIds() == null || batchParam.getIds().size() == 0) { - return fail("请选择用户"); - } - if (batchParam.getData() == null) { - return fail("请输入密码"); - } - if (userService.update(new LambdaUpdateWrapper() - .in(User::getUserId, batchParam.getIds()) - .set(User::getPassword, userService.encodePassword(batchParam.getData())))) { - return success("重置成功"); - } else { - return fail("重置失败"); - } - } - - @ApiOperation("检查用户是否存在") - @GetMapping("/existence") - public ApiResult existence(ExistenceParam param) { - if (param.isExistence(userService, User::getUserId)) { - return success(param.getValue() + "已存在"); - } - return fail(param.getValue() + "不存在"); - } - - /** - * excel导入用户 - */ - @PreAuthorize("hasAuthority('sys:user:save')") - @ApiOperation("导入用户") - @Transactional(rollbackFor = {Exception.class}) - @PostMapping("/import") - public ApiResult> importBatch(MultipartFile file) { - ImportParams importParams = new ImportParams(); - try { - List list = ExcelImportUtil.importExcel(file.getInputStream(), - UserImportParam.class, importParams); - // 校验是否重复 - if (CommonUtil.checkRepeat(list, UserImportParam::getUsername)) { - return fail("账号存在重复", null); - } - if (CommonUtil.checkRepeat(list, UserImportParam::getPhone)) { - return fail("手机号存在重复", null); - } - // 校验是否存在 - List usernameExists = userService.list(new LambdaQueryWrapper().in(User::getUsername, - list.stream().map(UserImportParam::getUsername).collect(Collectors.toList()))); - if (usernameExists.size() > 0) { - return fail("账号已经存在", - usernameExists.stream().map(User::getUsername).collect(Collectors.toList())); - } - List phoneExists = userService.list(new LambdaQueryWrapper().in(User::getPhone, - list.stream().map(UserImportParam::getPhone).collect(Collectors.toList()))); - if (phoneExists.size() > 0) { - return fail("手机号已经存在", - phoneExists.stream().map(User::getPhone).collect(Collectors.toList())); - } - // 添加 - List users = new ArrayList<>(); - for (UserImportParam one : list) { - User u = new User(); - u.setStatus(0); - u.setUsername(one.getUsername()); - u.setPassword(userService.encodePassword(one.getPassword())); - u.setNickname(one.getNickname()); - u.setPhone(one.getPhone()); - Role role = roleService.getOne(new QueryWrapper() - .eq("role_name", one.getRoleName()), false); - if (role == null) { - return fail("角色不存在", Collections.singletonList(one.getRoleName())); - } else { - u.setRoles(Collections.singletonList(role)); - } - Organization organization = organizationService.getOne(new QueryWrapper() - .eq("organization_full_name", one.getOrganizationName()), false); - if (organization == null) { - return fail("机构不存在", Collections.singletonList(one.getOrganizationName())); - } else { - u.setOrganizationId(organization.getOrganizationId()); - } - DictionaryData sex = dictionaryDataService.getByDictCodeAndName("sex", one.getSexName()); - if (sex == null) { - return fail("性别不存在", Collections.singletonList(one.getSexName())); - } else { - u.setSex(sex.getDictDataCode()); - } - } - if (userService.saveBatch(users)) { - return success("导入成功", null); - } - } catch (Exception e) { - e.printStackTrace(); - } - return fail("导入失败", null); - } - - @PreAuthorize("hasAuthority('sys:auth:user')") - @PostMapping("/getAvatarByMpWx") - @ApiOperation("更新微信头像") - public ApiResult getAvatarByMpWx(@RequestBody User user){ - user.setAvatar("https://oa.gxwebsoft.com/assets/logo.7ccfefb9.svg"); - if (userService.updateUser(user)) { - return success("更新成功"); - } - return fail("更新失败"); - } - - @PostMapping("/updatePointsBySign") - @ApiOperation("签到成功累加积分") - public ApiResult updatePointsBySign(){ - final User loginUser = getLoginUser(); - loginUser.setPoints(loginUser.getPoints() + 1); - if (userService.updateUser(loginUser)) { - return success("签到成功"); - } - return fail("签到失败"); - } - - @PreAuthorize("hasAuthority('sys:auth:user')") - @PutMapping("/updateUserBalance") - @ApiOperation("更新用户余额") - public ApiResult updateUserBalance(@RequestBody User user){ - if (getLoginUser() == null) { - return fail("请先登录"); - } - if (userService.updateUser(user)) { - return success("操作成功"); - } - return fail("操作失败"); - } - - @PreAuthorize("hasAuthority('sys:user:list')") - @OperationLog - @ApiOperation("统计用户余额") - @GetMapping("/countUserBalance") - public ApiResult countUserBalance(User param) { - final LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.gt(User::getBalance, 0); - if (!param.getOrganizationId().equals(0)) { - wrapper.eq(User::getOrganizationId,param.getOrganizationId()); - } - final List list = userService.list(wrapper); - final BigDecimal totalBalance = list.stream().map(User::getBalance).reduce(BigDecimal.ZERO, BigDecimal::add); - // System.out.println("统计用户余额 = " + totalBalance); - return success("统计成功",totalBalance); - } - -} diff --git a/modules/common/system/controller/UserFileController.java b/modules/common/system/controller/UserFileController.java deleted file mode 100644 index c809af0..0000000 --- a/modules/common/system/controller/UserFileController.java +++ /dev/null @@ -1,164 +0,0 @@ -package com.gxwebsoft.common.system.controller; - -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.gxwebsoft.common.core.utils.FileServerUtil; -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.common.system.service.UserFileService; -import com.gxwebsoft.common.system.entity.UserFile; -import com.gxwebsoft.common.system.param.UserFileParam; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.annotation.OperationLog; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import java.util.List; - -/** - * 用户文件控制器 - * - * @author WebSoft - * @since 2022-07-21 14:34:40 - */ -@Api(tags = "用户文件管理") -@RestController -@RequestMapping("/api/system/user-file") -public class UserFileController extends BaseController { - @Resource - private UserFileService userFileService; - - @OperationLog - @ApiOperation("分页查询用户文件") - @GetMapping("/page") - public ApiResult> page(UserFileParam param, HttpServletRequest request) { - param.setUserId(getLoginUserId()); - PageParam page = new PageParam<>(param); - page.setDefaultOrder("is_directory desc"); - PageParam result = userFileService.page(page, page.getWrapper()); - List records = result.getRecords(); - String requestURL = StrUtil.removeSuffix(request.getRequestURL(), "/system/user-file") + "/file"; - for (UserFile record : records) { - if (StrUtil.isNotBlank(record.getPath())) { - record.setUrl(requestURL + "/" + record.getPath()); - if (FileServerUtil.isImage(record.getContentType())) { - record.setThumbnail(requestURL + "/thumbnail/" + record.getPath()); - } - record.setDownloadUrl(requestURL + "/download/" + record.getPath()); - } - } - return success(records, result.getTotal()); - } - - @OperationLog - @ApiOperation("查询全部用户文件") - @GetMapping() - public ApiResult> list(UserFileParam param, HttpServletRequest request) { - param.setUserId(getLoginUserId()); - PageParam page = new PageParam<>(param); - page.setDefaultOrder("is_directory desc"); - List records = userFileService.list(page.getOrderWrapper()); - String requestURL = StrUtil.removeSuffix(request.getRequestURL(), "/system/user-file") + "/file"; - for (UserFile record : records) { - if (StrUtil.isNotBlank(record.getPath())) { - record.setUrl(requestURL + "/" + record.getPath()); - if (FileServerUtil.isImage(record.getContentType())) { - record.setThumbnail(requestURL + "/thumbnail/" + record.getPath()); - } - record.setDownloadUrl(requestURL + "/download/" + record.getPath()); - } - } - return success(records); - } - - @PreAuthorize("hasAuthority('sys:auth:user')") - @OperationLog - @ApiOperation("添加用户文件") - @PostMapping() - public ApiResult save(@RequestBody UserFile userFile) { - userFile.setUserId(getLoginUserId()); - if (userFile.getParentId() == null) { - userFile.setParentId(0); - } - if (userFile.getIsDirectory() != null && userFile.getIsDirectory().equals(1)) { - if (userFileService.count(new LambdaQueryWrapper() - .eq(UserFile::getName, userFile.getName()) - .eq(UserFile::getParentId, userFile.getParentId()) - .eq(UserFile::getUserId, userFile.getUserId())) > 0) { - return fail("文件夹名称已存在"); - } - } - if (userFileService.save(userFile)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('sys:auth:user')") - @OperationLog - @ApiOperation("修改用户文件") - @PutMapping() - public ApiResult update(@RequestBody UserFile userFile) { - Integer loginUserId = getLoginUserId(); - UserFile old = userFileService.getById(userFile.getId()); - UserFile entity = new UserFile(); - if (StrUtil.isNotBlank(userFile.getName())) { - entity.setName(userFile.getName()); - } - if (userFile.getParentId() != null) { - entity.setParentId(userFile.getParentId()); - } - if (!old.getUserId().equals(loginUserId) || - (entity.getName() == null && entity.getParentId() == null)) { - return fail("修改失败"); - } - if (old.getIsDirectory() != null && old.getIsDirectory().equals(1)) { - if (userFileService.count(new LambdaQueryWrapper() - .eq(UserFile::getName, entity.getName() == null ? old.getName() : entity.getName()) - .eq(UserFile::getParentId, entity.getParentId() == null ? old.getParentId() : entity.getParentId()) - .eq(UserFile::getUserId, loginUserId) - .ne(UserFile::getId, old.getId())) > 0) { - return fail("文件夹名称已存在"); - } - } - if (userFileService.update(entity, new LambdaUpdateWrapper() - .eq(UserFile::getId, userFile.getId()) - .eq(UserFile::getUserId, loginUserId))) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('sys:auth:user')") - @OperationLog - @ApiOperation("删除用户文件") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (userFileService.remove(new LambdaUpdateWrapper() - .eq(UserFile::getId, id) - .eq(UserFile::getUserId, getLoginUserId()))) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @PreAuthorize("hasAuthority('sys:auth:user')") - @OperationLog - @ApiOperation("批量删除用户文件") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (userFileService.remove(new LambdaUpdateWrapper() - .in(UserFile::getId, ids) - .eq(UserFile::getUserId, getLoginUserId()))) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/modules/common/system/controller/UserGradeController.java b/modules/common/system/controller/UserGradeController.java deleted file mode 100644 index 3dda913..0000000 --- a/modules/common/system/controller/UserGradeController.java +++ /dev/null @@ -1,127 +0,0 @@ -package com.gxwebsoft.common.system.controller; - -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.common.system.entity.User; -import com.gxwebsoft.common.system.service.UserGradeService; -import com.gxwebsoft.common.system.entity.UserGrade; -import com.gxwebsoft.common.system.param.UserGradeParam; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.BatchParam; -import com.gxwebsoft.common.core.annotation.OperationLog; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 用户会员等级表控制器 - * - * @author 科技小王子 - * @since 2023-10-07 22:51:17 - */ -@Api(tags = "用户会员等级表管理") -@RestController -@RequestMapping("/api/system/user-grade") -public class UserGradeController extends BaseController { - @Resource - private UserGradeService userGradeService; - - @PreAuthorize("hasAuthority('sys:userGrade:list')") - @OperationLog - @ApiOperation("分页查询用户会员等级表") - @GetMapping("/page") - public ApiResult> page(UserGradeParam param) { - // 使用关联查询 - return success(userGradeService.pageRel(param)); - } - - @PreAuthorize("hasAuthority('sys:userGrade:list')") - @OperationLog - @ApiOperation("查询全部用户会员等级表") - @GetMapping() - public ApiResult> list(UserGradeParam param) { - // 使用关联查询 - return success(userGradeService.listRel(param)); - } - - @PreAuthorize("hasAuthority('sys:userGrade:list')") - @OperationLog - @ApiOperation("根据id查询用户会员等级表") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - // 使用关联查询 - return success(userGradeService.getByIdRel(id)); - } - - @PreAuthorize("hasAuthority('sys:userGrade:save')") - @OperationLog - @ApiOperation("添加用户会员等级表") - @PostMapping() - public ApiResult save(@RequestBody UserGrade userGrade) { - if (userGradeService.save(userGrade)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('sys:userGrade:update')") - @OperationLog - @ApiOperation("修改用户会员等级表") - @PutMapping() - public ApiResult update(@RequestBody UserGrade userGrade) { - if (userGradeService.updateById(userGrade)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('sys:userGrade:remove')") - @OperationLog - @ApiOperation("删除用户会员等级表") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (userGradeService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @PreAuthorize("hasAuthority('sys:userGrade:save')") - @OperationLog - @ApiOperation("批量添加用户会员等级表") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (userGradeService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('sys:userGrade:update')") - @OperationLog - @ApiOperation("批量修改用户会员等级表") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(userGradeService, "grade_id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('sys:userGrade:remove')") - @OperationLog - @ApiOperation("批量删除用户会员等级表") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (userGradeService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/modules/common/system/controller/UserGroupController.java b/modules/common/system/controller/UserGroupController.java deleted file mode 100644 index b851e61..0000000 --- a/modules/common/system/controller/UserGroupController.java +++ /dev/null @@ -1,133 +0,0 @@ -package com.gxwebsoft.common.system.controller; - -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.common.system.service.UserGroupService; -import com.gxwebsoft.common.system.entity.UserGroup; -import com.gxwebsoft.common.system.param.UserGroupParam; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.BatchParam; -import com.gxwebsoft.common.core.annotation.OperationLog; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 用户分组管理表控制器 - * - * @author 科技小王子 - * @since 2023-10-28 15:16:39 - */ -@Api(tags = "用户分组管理表管理") -@RestController -@RequestMapping("/api/system/user-group") -public class UserGroupController extends BaseController { - @Resource - private UserGroupService userGroupService; - - @PreAuthorize("hasAuthority('sys:userGroup:list')") - @OperationLog - @ApiOperation("分页查询用户分组管理表") - @GetMapping("/page") - public ApiResult> page(UserGroupParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - return success(userGroupService.page(page, page.getWrapper())); - // 使用关联查询 - //return success(userGroupService.pageRel(param)); - } - - @PreAuthorize("hasAuthority('sys:userGroup:list')") - @OperationLog - @ApiOperation("查询全部用户分组管理表") - @GetMapping() - public ApiResult> list(UserGroupParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - return success(userGroupService.list(page.getOrderWrapper())); - // 使用关联查询 - //return success(userGroupService.listRel(param)); - } - - @PreAuthorize("hasAuthority('sys:userGroup:list')") - @OperationLog - @ApiOperation("根据id查询用户分组管理表") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - return success(userGroupService.getById(id)); - // 使用关联查询 - //return success(userGroupService.getByIdRel(id)); - } - - @PreAuthorize("hasAuthority('sys:userGroup:save')") - @OperationLog - @ApiOperation("添加用户分组管理表") - @PostMapping() - public ApiResult save(@RequestBody UserGroup userGroup) { - if (userGroupService.save(userGroup)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('sys:userGroup:update')") - @OperationLog - @ApiOperation("修改用户分组管理表") - @PutMapping() - public ApiResult update(@RequestBody UserGroup userGroup) { - if (userGroupService.updateById(userGroup)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('sys:userGroup:remove')") - @OperationLog - @ApiOperation("删除用户分组管理表") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (userGroupService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @PreAuthorize("hasAuthority('sys:userGroup:save')") - @OperationLog - @ApiOperation("批量添加用户分组管理表") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (userGroupService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('sys:userGroup:update')") - @OperationLog - @ApiOperation("批量修改用户分组管理表") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(userGroupService, "group_id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('sys:userGroup:remove')") - @OperationLog - @ApiOperation("批量删除用户分组管理表") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (userGroupService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/modules/common/system/controller/UserOauthController.java b/modules/common/system/controller/UserOauthController.java deleted file mode 100644 index 43dd088..0000000 --- a/modules/common/system/controller/UserOauthController.java +++ /dev/null @@ -1,132 +0,0 @@ -package com.gxwebsoft.common.system.controller; - -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.common.system.entity.User; -import com.gxwebsoft.common.system.service.UserOauthService; -import com.gxwebsoft.common.system.entity.UserOauth; -import com.gxwebsoft.common.system.param.UserOauthParam; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.BatchParam; -import com.gxwebsoft.common.core.annotation.OperationLog; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 第三方用户信息表控制器 - * - * @author 科技小王子 - * @since 2023-10-07 22:39:46 - */ -@Api(tags = "第三方用户信息表管理") -@RestController -@RequestMapping("/api/system/user-oauth") -public class UserOauthController extends BaseController { - @Resource - private UserOauthService userOauthService; - - @PreAuthorize("hasAuthority('sys:userOauth:list')") - @OperationLog - @ApiOperation("分页查询第三方用户信息表") - @GetMapping("/page") - public ApiResult> page(UserOauthParam param) { - // 使用关联查询 - return success(userOauthService.pageRel(param)); - } - - @PreAuthorize("hasAuthority('sys:userOauth:list')") - @OperationLog - @ApiOperation("查询全部第三方用户信息表") - @GetMapping() - public ApiResult> list(UserOauthParam param) { - // 使用关联查询 - return success(userOauthService.listRel(param)); - } - - @PreAuthorize("hasAuthority('sys:userOauth:list')") - @OperationLog - @ApiOperation("根据id查询第三方用户信息表") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - // 使用关联查询 - return success(userOauthService.getByIdRel(id)); - } - - @PreAuthorize("hasAuthority('sys:userOauth:save')") - @OperationLog - @ApiOperation("添加第三方用户信息表") - @PostMapping() - public ApiResult save(@RequestBody UserOauth userOauth) { - // 记录当前登录用户id - User loginUser = getLoginUser(); - if (loginUser != null) { - userOauth.setUserId(loginUser.getUserId()); - } - if (userOauthService.save(userOauth)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('sys:userOauth:update')") - @OperationLog - @ApiOperation("修改第三方用户信息表") - @PutMapping() - public ApiResult update(@RequestBody UserOauth userOauth) { - if (userOauthService.updateById(userOauth)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('sys:userOauth:remove')") - @OperationLog - @ApiOperation("删除第三方用户信息表") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (userOauthService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @PreAuthorize("hasAuthority('sys:userOauth:save')") - @OperationLog - @ApiOperation("批量添加第三方用户信息表") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (userOauthService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('sys:userOauth:update')") - @OperationLog - @ApiOperation("批量修改第三方用户信息表") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(userOauthService, "id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('sys:userOauth:remove')") - @OperationLog - @ApiOperation("批量删除第三方用户信息表") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (userOauthService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/modules/common/system/controller/UserRefereeController.java b/modules/common/system/controller/UserRefereeController.java deleted file mode 100644 index 0f845a9..0000000 --- a/modules/common/system/controller/UserRefereeController.java +++ /dev/null @@ -1,132 +0,0 @@ -package com.gxwebsoft.common.system.controller; - -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.common.system.entity.User; -import com.gxwebsoft.common.system.service.UserRefereeService; -import com.gxwebsoft.common.system.entity.UserReferee; -import com.gxwebsoft.common.system.param.UserRefereeParam; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.BatchParam; -import com.gxwebsoft.common.core.annotation.OperationLog; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 用户推荐关系表控制器 - * - * @author 科技小王子 - * @since 2023-10-07 22:56:36 - */ -@Api(tags = "用户推荐关系表管理") -@RestController -@RequestMapping("/api/system/user-referee") -public class UserRefereeController extends BaseController { - @Resource - private UserRefereeService userRefereeService; - - @PreAuthorize("hasAuthority('sys:userReferee:list')") - @OperationLog - @ApiOperation("分页查询用户推荐关系表") - @GetMapping("/page") - public ApiResult> page(UserRefereeParam param) { - // 使用关联查询 - return success(userRefereeService.pageRel(param)); - } - - @PreAuthorize("hasAuthority('sys:userReferee:list')") - @OperationLog - @ApiOperation("查询全部用户推荐关系表") - @GetMapping() - public ApiResult> list(UserRefereeParam param) { - // 使用关联查询 - return success(userRefereeService.listRel(param)); - } - - @PreAuthorize("hasAuthority('sys:userReferee:list')") - @OperationLog - @ApiOperation("根据id查询用户推荐关系表") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - // 使用关联查询 - return success(userRefereeService.getByIdRel(id)); - } - - @PreAuthorize("hasAuthority('sys:userReferee:save')") - @OperationLog - @ApiOperation("添加用户推荐关系表") - @PostMapping() - public ApiResult save(@RequestBody UserReferee userReferee) { - // 记录当前登录用户id - User loginUser = getLoginUser(); - if (loginUser != null) { - userReferee.setUserId(loginUser.getUserId()); - } - if (userRefereeService.save(userReferee)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('sys:userReferee:update')") - @OperationLog - @ApiOperation("修改用户推荐关系表") - @PutMapping() - public ApiResult update(@RequestBody UserReferee userReferee) { - if (userRefereeService.updateById(userReferee)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('sys:userReferee:remove')") - @OperationLog - @ApiOperation("删除用户推荐关系表") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (userRefereeService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @PreAuthorize("hasAuthority('sys:userReferee:save')") - @OperationLog - @ApiOperation("批量添加用户推荐关系表") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (userRefereeService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('sys:userReferee:update')") - @OperationLog - @ApiOperation("批量修改用户推荐关系表") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(userRefereeService, "id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('sys:userReferee:remove')") - @OperationLog - @ApiOperation("批量删除用户推荐关系表") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (userRefereeService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/modules/common/system/controller/VerifyTxt.java b/modules/common/system/controller/VerifyTxt.java deleted file mode 100644 index 0199ea0..0000000 --- a/modules/common/system/controller/VerifyTxt.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.gxwebsoft.common.system.controller; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -@Api(tags = "域名所有权验证") -@RestController -@RequestMapping("/lvQ4EoivKJ.txt") -public class VerifyTxt { - - @ApiOperation("域名所有权验证") - @GetMapping() - public String verify(){ - return "cbfbfe827744f1ebfaf03bfe2a0def6a"; - } -} diff --git a/modules/common/system/controller/VersionController.java b/modules/common/system/controller/VersionController.java deleted file mode 100644 index 52966fd..0000000 --- a/modules/common/system/controller/VersionController.java +++ /dev/null @@ -1,138 +0,0 @@ -package com.gxwebsoft.common.system.controller; - -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.common.system.entity.User; -import com.gxwebsoft.common.system.service.VersionService; -import com.gxwebsoft.common.system.entity.Version; -import com.gxwebsoft.common.system.param.VersionParam; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.BatchParam; -import com.gxwebsoft.common.core.annotation.OperationLog; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 版本更新控制器 - * - * @author 科技小王子 - * @since 2024-01-15 18:52:24 - */ -@Api(tags = "版本更新管理") -@RestController -@RequestMapping("/api/system/version") -public class VersionController extends BaseController { - @Resource - private VersionService versionService; - - @PreAuthorize("hasAuthority('sys:version:list')") - @OperationLog - @ApiOperation("分页查询版本更新") - @GetMapping("/page") - public ApiResult> page(VersionParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - return success(versionService.page(page, page.getWrapper())); - // 使用关联查询 - //return success(versionService.pageRel(param)); - } - - @PreAuthorize("hasAuthority('sys:version:list')") - @OperationLog - @ApiOperation("查询全部版本更新") - @GetMapping() - public ApiResult> list(VersionParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - return success(versionService.list(page.getOrderWrapper())); - // 使用关联查询 - //return success(versionService.listRel(param)); - } - - @PreAuthorize("hasAuthority('sys:version:list')") - @OperationLog - @ApiOperation("根据id查询版本更新") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - return success(versionService.getById(id)); - // 使用关联查询 - //return success(versionService.getByIdRel(id)); - } - - @PreAuthorize("hasAuthority('sys:version:save')") - @OperationLog - @ApiOperation("添加版本更新") - @PostMapping() - public ApiResult save(@RequestBody Version version) { - // 记录当前登录用户id - User loginUser = getLoginUser(); - if (loginUser != null) { - version.setUserId(loginUser.getUserId()); - } - if (versionService.save(version)) { - return success("发布成功"); - } - return fail("发布失败"); - } - - @PreAuthorize("hasAuthority('sys:version:save')") - @OperationLog - @ApiOperation("修改版本更新") - @PutMapping() - public ApiResult update(@RequestBody Version version) { - if (versionService.updateById(version)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('sys:version:save')") - @OperationLog - @ApiOperation("删除版本更新") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (versionService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @PreAuthorize("hasAuthority('sys:version:save')") - @OperationLog - @ApiOperation("批量添加版本更新") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (versionService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('sys:version:save')") - @OperationLog - @ApiOperation("批量修改版本更新") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(versionService, "id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('sys:version:save')") - @OperationLog - @ApiOperation("批量删除版本更新") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (versionService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } -} diff --git a/modules/common/system/controller/WhiteDomainController.java b/modules/common/system/controller/WhiteDomainController.java deleted file mode 100644 index 7ee7f09..0000000 --- a/modules/common/system/controller/WhiteDomainController.java +++ /dev/null @@ -1,149 +0,0 @@ -package com.gxwebsoft.common.system.controller; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.gxwebsoft.common.core.utils.RedisUtil; -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.common.system.entity.User; -import com.gxwebsoft.common.system.service.WhiteDomainService; -import com.gxwebsoft.common.system.entity.WhiteDomain; -import com.gxwebsoft.common.system.param.WhiteDomainParam; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.BatchParam; -import com.gxwebsoft.common.core.annotation.OperationLog; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; -import java.util.stream.Collectors; - -/** - * 服务器白名单控制器 - * - * @author 科技小王子 - * @since 2024-03-26 00:22:21 - */ -@Api(tags = "服务器白名单管理") -@RestController -@RequestMapping("/api/system/white-domain") -public class WhiteDomainController extends BaseController { - @Resource - private WhiteDomainService whiteDomainService; - @Resource - private RedisUtil redisUtil; - - @PreAuthorize("hasAuthority('sys:whiteDomain:list')") - @ApiOperation("分页查询服务器白名单") - @GetMapping("/page") - public ApiResult> page(WhiteDomainParam param) { - // 使用关联查询 - return success(whiteDomainService.pageRel(param)); - } - - @PreAuthorize("hasAuthority('sys:whiteDomain:list')") - @ApiOperation("查询全部服务器白名单") - @GetMapping() - public ApiResult> list(WhiteDomainParam param) { - // 使用关联查询 - return success(whiteDomainService.listRel(param)); - } - - @PreAuthorize("hasAuthority('sys:whiteDomain:list')") - @ApiOperation("根据id查询服务器白名单") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - // 使用关联查询 - return success(whiteDomainService.getByIdRel(id)); - } - - @PreAuthorize("hasAuthority('sys:whiteDomain:list')") - @OperationLog - @ApiOperation("添加服务器白名单") - @PostMapping() - public ApiResult save(@RequestBody WhiteDomain whiteDomain) { - String key = "WhiteDomain:"; - // 记录当前登录用户id - User loginUser = getLoginUser(); - if (loginUser != null) { - key = key + loginUser.getTenantId(); - whiteDomain.setUserId(loginUser.getUserId()); - } - if (whiteDomainService.save(whiteDomain)) { - // 重写缓存 - final List list = whiteDomainService.list(); - final List collect = list.stream().map(WhiteDomain::getDomain).collect(Collectors.toList()); - redisUtil.set(key,collect); - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('sys:whiteDomain:list')") - @OperationLog - @ApiOperation("修改服务器白名单") - @PutMapping() - public ApiResult update(@RequestBody WhiteDomain whiteDomain) { - if (whiteDomainService.updateById(whiteDomain)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('sys:whiteDomain:list')") - @OperationLog - @ApiOperation("删除服务器白名单") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (whiteDomainService.removeById(id)) { - // 重写缓存 - String key = "WhiteDomain:"; - User loginUser = getLoginUser(); - if (loginUser != null) { - key = key + loginUser.getTenantId(); - } - final List list = whiteDomainService.list(); - final List collect = list.stream().map(WhiteDomain::getDomain).collect(Collectors.toList()); - redisUtil.set(key,collect); - return success("删除成功"); - } - return fail("删除失败"); - } - - @PreAuthorize("hasAuthority('sys:whiteDomain:list')") - @OperationLog - @ApiOperation("批量添加服务器白名单") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (whiteDomainService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('sys:whiteDomain:list')") - @OperationLog - @ApiOperation("批量修改服务器白名单") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(whiteDomainService, "id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('sys:whiteDomain:list')") - @OperationLog - @ApiOperation("批量删除服务器白名单") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (whiteDomainService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/modules/common/system/controller/WxLoginController.java b/modules/common/system/controller/WxLoginController.java deleted file mode 100644 index fc7e593..0000000 --- a/modules/common/system/controller/WxLoginController.java +++ /dev/null @@ -1,366 +0,0 @@ -package com.gxwebsoft.common.system.controller; - -import cn.hutool.core.io.FileUtil; -import cn.hutool.core.lang.Validator; -import cn.hutool.core.util.RandomUtil; -import cn.hutool.core.util.StrUtil; -import cn.hutool.http.HttpRequest; -import cn.hutool.http.HttpUtil; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.gxwebsoft.common.core.config.ConfigProperties; -import com.gxwebsoft.common.core.exception.BusinessException; -import com.gxwebsoft.common.core.security.JwtSubject; -import com.gxwebsoft.common.core.security.JwtUtil; -import com.gxwebsoft.common.core.utils.CommonUtil; -import com.gxwebsoft.common.core.utils.JSONUtil; -import com.gxwebsoft.common.core.utils.RedisUtil; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.common.system.entity.*; -import com.gxwebsoft.common.system.param.UserParam; -import com.gxwebsoft.common.system.result.LoginResult; -import com.gxwebsoft.common.system.service.*; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.data.redis.core.StringRedisTemplate; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import java.io.File; -import java.util.HashMap; -import java.util.concurrent.TimeUnit; - -import static com.gxwebsoft.common.core.constants.PlatformConstants.MP_OFFICIAL; -import static com.gxwebsoft.common.core.constants.PlatformConstants.MP_WEIXIN; -import static com.gxwebsoft.common.core.constants.RedisConstants.ACCESS_TOKEN_KEY; - -@RestController -@RequestMapping("/api/wx-login") -@Api(tags = "微信小程序登录API") -public class WxLoginController extends BaseController { - private final StringRedisTemplate redisTemplate; - @Resource - private SettingService settingService; - @Resource - private UserService userService; - @Resource - private ConfigProperties configProperties; - @Resource - private UserRoleService userRoleService; - @Resource - private LoginRecordService loginRecordService; - @Resource - private RoleService roleService; - @Resource - private RedisUtil redisUtil; - @Resource - private ConfigProperties config; - - public WxLoginController(StringRedisTemplate redisTemplate) { - this.redisTemplate = redisTemplate; - } - - @ApiOperation("获取微信openId") - @Transactional(rollbackFor = {Exception.class}) - @PostMapping("/getOpenId") - public ApiResult getOpenId(@RequestBody UserParam userParam, HttpServletRequest request) { - // 1.获取openid - JSONObject result = getOpenIdByCode(userParam); - String openid = result.getString("openid"); - String unionid = result.getString("unionid"); - if (openid == null) { - return fail("获取openid失败", null); - } - // 2.通过openid查询用户是否已存在 - User user = userService.getByOauthId(userParam); - // 3.存在则签发token并返回登录成功,不存在则注册新用户 - if (user == null) { - user = addUser(userParam); - } - // 4.签发token - loginRecordService.saveAsync(user.getUsername(), LoginRecord.TYPE_LOGIN, null, user.getTenantId(), request); - String access_token = JwtUtil.buildToken(new JwtSubject(user.getUsername(), user.getTenantId()), - configProperties.getTokenExpireTime(), configProperties.getTokenKey()); - return success("登录成功", new LoginResult(access_token, user)); - } - - @ApiOperation("微信授权手机号码并登录") - @Transactional(rollbackFor = {Exception.class}) - @PostMapping("/loginByMpWxPhone") - public ApiResult loginByMpWxPhone(@RequestBody UserParam userParam, HttpServletRequest request) { - // 获取手机号码 - String phone = getPhoneByCode(userParam); - if(phone == null){ - String key = ACCESS_TOKEN_KEY.concat(":").concat(getTenantId().toString()); - redisTemplate.delete(key); - throw new BusinessException("授权失败，请重试"); - } - // 查询是否存在 - User user = userService.getByPhone(phone); - // 不存在则注册 - if (user == null) { - userParam.setPhone(phone); - user = addUser(userParam); - user.setRecommend(1); - } - // 签发token - String access_token = JwtUtil.buildToken(new JwtSubject(user.getUsername(), user.getTenantId()), - configProperties.getTokenExpireTime(), configProperties.getTokenKey()); - loginRecordService.saveAsync(user.getUsername(), LoginRecord.TYPE_REGISTER, null, user.getTenantId(), request); - // 附加体育中心项目用户信息 -// user.setBookingUser(); - return success("登录成功", new LoginResult(access_token, user)); - } - - @ApiOperation("微信授权手机号码并更新") - @Transactional(rollbackFor = {Exception.class}) - @PostMapping("/updatePhoneByMpWx") - public ApiResult updatePhoneByMpWx(@RequestBody UserParam userParam) { - // 获取微信授权手机号 - String phone = getPhoneByCode(userParam); - // 查询当前用户 - User user = userService.getById(userParam.getUserId()); - if (user != null && phone != null) { - user.setPhone(phone); - userService.updateUser(user); - return success("更新成功",phone); - } - return fail("更新失败"); - } - - /** - * 新用户注册 - */ - private User addUser(UserParam userParam) { - User addUser = new User(); - // 注册用户 - addUser.setStatus(0); - addUser.setUsername(createUsername("wx_")); - addUser.setNickname("微信用户"); - addUser.setPlatform(MP_WEIXIN); - addUser.setGradeId(2); - if(userParam.getPhone() != null){ - addUser.setPhone(userParam.getPhone()); - } - addUser.setPassword(userService.encodePassword(CommonUtil.randomUUID16())); - addUser.setTenantId(getTenantId()); - addUser.setRecommend(1); - Role role = roleService.getOne(new QueryWrapper().eq("role_code", "user"), false); - addUser.setRoleId(role.getRoleId()); - if (userService.saveUser(addUser)) { - // 添加用户角色 - final UserRole userRole = new UserRole(); - userRole.setUserId(addUser.getUserId()); - userRole.setTenantId(addUser.getTenantId()); - userRole.setRoleId(addUser.getRoleId()); - userRoleService.save(userRole); - } - return addUser; - } - - // 获取openid - private JSONObject getOpenIdByCode(UserParam userParam) { - // 获取微信小程序配置信息 - JSONObject setting = settingService.getBySettingKey("mp-weixin"); - // 获取openId - String apiUrl = "https://api.weixin.qq.com/sns/jscode2session?appid=" + setting.getString("appId") + "&secret=" + setting.getString("appSecret") + "&js_code=" + userParam.getCode() + "&grant_type=authorization_code"; - // 执行get请求 - String result = HttpUtil.get(apiUrl); - // 解析access_token - return JSON.parseObject(result); - } - - /** - * 获取微信手机号码 - * - * @param userParam 需要传微信凭证code - */ - private String getPhoneByCode(UserParam userParam) { - // 获取手机号码 - String apiUrl = "https://api.weixin.qq.com/wxa/business/getuserphonenumber?access_token=" + getAccessToken(); - HashMap paramMap = new HashMap<>(); - if (StrUtil.isBlank(userParam.getCode())) { - throw new BusinessException("code不能为空"); - } - paramMap.put("code", userParam.getCode()); - // 执行post请求 - String post = HttpUtil.post(apiUrl, JSON.toJSONString(paramMap)); - JSONObject json = JSON.parseObject(post); - if (json.get("errcode").equals(0)) { - JSONObject phoneInfo = JSON.parseObject(json.getString("phone_info")); - // 微信用户的手机号码 - final String phoneNumber = phoneInfo.getString("phoneNumber"); - // 验证手机号码 - if(!Validator.isMobile(phoneNumber)){ - String key = ACCESS_TOKEN_KEY.concat(":").concat(getTenantId().toString()); - redisTemplate.delete(key); - throw new BusinessException("手机号码格式不正确"); - } - return phoneNumber; - } - return null; - } - - /** - * 生成随机账号 - * - * @return username - */ - private String createUsername(String type) { - return type.concat(RandomUtil.randomString(12)); - } - - /** - * 获取接口调用凭据AccessToken - * https://developers.weixin.qq.com/miniprogram/dev/OpenApiDoc/mp-access-token/getAccessToken.html - */ - private String getAccessToken() { - String key = ACCESS_TOKEN_KEY.concat(":").concat(getTenantId().toString()); - // 获取微信小程序配置信息 - JSONObject setting = settingService.getBySettingKey("mp-weixin"); - if(setting == null){ - throw new BusinessException("请先配置小程序"); - } - // 从缓存获取access_token - String value = redisTemplate.opsForValue().get(key); - if (value != null) { - // 解析access_token - JSONObject response = JSON.parseObject(value); -// return response.getString("access_token"); - } - // 微信获取凭证接口 - String apiUrl = "https://api.weixin.qq.com/cgi-bin/token"; - // 组装url参数 - String url = apiUrl.concat("?grant_type=client_credential").concat("&appid=").concat(setting.getString("appId")).concat("&secret=").concat(setting.getString("appSecret")); - // 执行get请求 - String result = HttpUtil.get(url); - System.out.println("result = " + result); - // 解析access_token - JSONObject response = JSON.parseObject(result); - if (response.getString("access_token") != null) { - // 存入缓存 - redisTemplate.opsForValue().set(key, result,7000L, TimeUnit.SECONDS); - return response.getString("access_token"); - } - throw new BusinessException("小程序配置不正确"); - } - - @ApiOperation("获取微信openId") - @PostMapping("/getWxOpenId") - public ApiResult getWxOpenId(@RequestBody UserParam userParam) { - final User loginUser = getLoginUser(); - if(loginUser == null){ - return fail("请先登录"); - } - // 已存在直接返回 - if(StrUtil.isNotBlank(loginUser.getOpenid())){ - return success(loginUser); - } - // 请求微信接口获取openid - String apiUrl = "https://api.weixin.qq.com/sns/jscode2session"; - final HashMap map = new HashMap<>(); - final JSONObject setting = settingService.getBySettingKey("mp-weixin"); - final String appId = setting.getString("appId"); - final String appSecret = setting.getString("appSecret"); - map.put("appid",appId); - map.put("secret",appSecret); - map.put("js_code",userParam.getCode()); - map.put("grant_type","authorization_code"); - final String response = HttpUtil.get(apiUrl,map); - final JSONObject jsonObject = JSONObject.parseObject(response); - String openid = jsonObject.getString("openid"); - String sessionKey = jsonObject.getString("session_key"); - String unionid = jsonObject.getString("unionid"); - // 保存openID - if(loginUser.getOpenid() == null || StrUtil.isBlank(loginUser.getOpenid())){ - loginUser.setOpenid(openid); - loginUser.setUnionid(unionid); - userService.updateById(loginUser); - } - return success("获取成功",jsonObject); - } - - @ApiOperation("获取微信小程序码-用户ID") - @GetMapping("/getUserQRCode") - public ApiResult getQRCode() { - String apiUrl = "https://api.weixin.qq.com/wxa/getwxacode?access_token=" + getAccessToken(); - final HashMap map = new HashMap<>(); - map.put("path","/package/user/qrcode?user_id="+getLoginUserId()); -// map.put("env_version","trial"); - // 获取图片 Buffer - byte[] qrCode = HttpRequest.post(apiUrl) - .body(JSON.toJSONString(map)) - .execute().bodyBytes(); - - // 保存的文件名称 - final String fileName = CommonUtil.randomUUID8().concat(".png"); - // 保存路径 - String filePath = getUploadDir().concat("qrcode/") + fileName; - File file = FileUtil.writeBytes(qrCode, filePath); - if(file != null){ - return success(config.getFileServer().concat("/qrcode/").concat(fileName)); - } - return fail("获取失败",null); - } - - @ApiOperation("获取微信小程序码-订单核销码") - @GetMapping("/getOrderQRCode/{orderNo}") - public ApiResult getOrderQRCode(@PathVariable("orderNo") String orderNo) { - String apiUrl = "https://api.weixin.qq.com/wxa/getwxacode?access_token=" + getAccessToken(); - final HashMap map = new HashMap<>(); - map.put("path","/package/admin/order-scan?orderNo=".concat(orderNo)); - map.put("env_version","trial"); - // 获取图片 Buffer - byte[] qrCode = HttpRequest.post(apiUrl) - .body(JSON.toJSONString(map)) - .execute().bodyBytes(); - - // 保存的文件名称 - final String fileName = CommonUtil.randomUUID8().concat(".png"); - // 保存路径 - String filePath = getUploadDir().concat("qrcode/") + fileName; - File file = FileUtil.writeBytes(qrCode, filePath); - if(file != null){ - return success(config.getFileServer().concat("/qrcode/").concat(fileName)); - } - return fail("获取失败",null); - } - - @ApiOperation("获取微信小程序码-订单核销码-数量极多的业务场景") - @GetMapping("/getOrderQRCodeUnlimited/{orderNo}") - public ApiResult getOrderQRCodeUnlimited(@PathVariable("orderNo") String orderNo) { - String apiUrl = "https://api.weixin.qq.com/wxa/getwxacodeunlimit?access_token=" + getAccessToken(); - final HashMap map = new HashMap<>(); - map.put("scene","orderNo=".concat(orderNo)); - map.put("page","package/admin/order-scan"); - map.put("env_version","trial"); - // 获取图片 Buffer - byte[] qrCode = HttpRequest.post(apiUrl) - .body(JSON.toJSONString(map)) - .execute().bodyBytes(); - System.out.println("qrCode = " + qrCode); - - // 保存的文件名称 - final String fileName = CommonUtil.randomUUID8().concat(".png"); - // 保存路径 - String filePath = getUploadDir().concat("qrcode/") + fileName; - File file = FileUtil.writeBytes(qrCode, filePath); - if(file != null){ - return success(config.getFileServer().concat("/qrcode/").concat(fileName)); - } - return fail("获取失败",null); - } - - /** - * 文件上传位置(服务器) - */ - private String getUploadDir() { - return config.getUploadPath() + "file/"; - } - - -} diff --git a/modules/common/system/controller/WxNativePayController.java b/modules/common/system/controller/WxNativePayController.java deleted file mode 100644 index 1a57299..0000000 --- a/modules/common/system/controller/WxNativePayController.java +++ /dev/null @@ -1,147 +0,0 @@ -package com.gxwebsoft.common.system.controller; - -import com.alibaba.fastjson.JSONObject; -import com.gxwebsoft.common.core.config.ConfigProperties; -import com.gxwebsoft.common.core.utils.CommonUtil; -import com.gxwebsoft.common.core.utils.RedisUtil; -import com.gxwebsoft.common.core.utils.RequestUtil; -import com.gxwebsoft.common.core.utils.WxNativeUtil; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.common.system.entity.Order; -import com.gxwebsoft.common.system.entity.Payment; -import com.gxwebsoft.common.system.param.SettingParam; -import com.gxwebsoft.common.system.service.OrderService; -import com.gxwebsoft.common.system.service.SettingService; -import com.wechat.pay.java.core.Config; -import com.wechat.pay.java.core.RSAAutoCertificateConfig; -import com.wechat.pay.java.service.payments.nativepay.NativePayService; -import com.wechat.pay.java.service.payments.nativepay.model.Amount; -import com.wechat.pay.java.service.payments.nativepay.model.PrepayRequest; -import com.wechat.pay.java.service.payments.nativepay.model.PrepayResponse; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiModelProperty; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.math.BigDecimal; -import java.util.Map; -import java.util.Set; - - -@Api(tags = "微信Native支付接口") -@RestController -@RequestMapping("/api/system/wx-native-pay") -public class WxNativePayController extends BaseController { - @Value("${spring.profiles.active}") - String active; - public static String merchantId = "1246610101"; - public static String privateKeyPath = "/Users/gxwebsoft/JAVA/com.gxwebsoft.core/src/main/resources/cert/apiclient_key.pem"; - public static String merchantSerialNumber = "48749613B40AA8F1D768583FC352358E13EB5AF0"; - public static String apiV3Key = "zGufUcqa7ovgxRL0kF5OlPr482EZwtn9"; - @Resource - private RedisUtil redisUtil; - private Config wxPayConfig; - @Resource - private ConfigProperties config; - @Resource - private SettingService settingService; - @Resource - private RequestUtil requestUtil; - @Resource - private OrderService orderService; - - - @ApiOperation("生成付款码") - @PostMapping("/codeUrl") - public ApiResult getCodeUrl(@RequestBody Order order) { - String key = "Payment:wxPay:".concat(getTenantId().toString()); - final Payment payment = redisUtil.get(key, Payment.class); - if (payment == null) { - return fail("微信支付未配置"); - } - // 获取微信小程序配置信息 - JSONObject setting = settingService.getBySettingKey("mp-weixin"); - final String appId = setting.getString("appId"); - final String appSecret = setting.getString("appSecret"); - - // 使用自动更新平台证书的RSA配置 - // 一个商户号只能初始化一个配置，否则会因为重复的下载任务报错 - - // 构建service - NativePayService service = new NativePayService.Builder().config(this.getWxPayConfig()).build(); - // request.setXxx(val)设置所需参数，具体参数可见Request定义 - PrepayRequest request = new PrepayRequest(); - // 计算金额 - order.setMoney(new BigDecimal(order.getPayPrice().toString())); - order.setOrderNo(CommonUtil.createOrderNo()); - BigDecimal decimal = order.getMoney(); - final BigDecimal multiply = decimal.multiply(new BigDecimal(100)); - // 将 BigDecimal 转换为 Integer - Integer money = multiply.intValue(); - Amount amount = new Amount(); - amount.setTotal(money); - request.setAmount(amount); - request.setAppid(appId); - request.setMchid(payment.getMchId()); - request.setDescription(order.getComments()); - request.setNotifyUrl("https://server.gxwebsoft.com/api/system/wx-native-pay/notify/" + getTenantId()); - request.setOutTradeNo(order.getOrderNo()); - // 调用下单方法，得到应答 - PrepayResponse response = service.prepay(request); - // 使用微信扫描 code_url 对应的二维码，即可体验Native支付 -// System.out.println(response.getCodeUrl()); - // 生成指定url对应的二维码到文件，宽和高都是300像素 -// QrCodeUtil.generate(response.getCodeUrl(), 300, 300, FileUtil.file("/Users/gxwebsoft/Documents/uploads/wx-native-qrcode.jpg")); - return success("生成付款码", response.getCodeUrl()); - } - - - private Config getWxPayConfig() { - // 获取租户ID - final Integer tenantId = getTenantId(); - Config build = WxNativeUtil.getConfig(tenantId); - if (build != null) { - return build; - } - String key = "Payment:wxPay:".concat(tenantId.toString()); - final Payment payment = redisUtil.get(key, Payment.class); - System.out.println("payment = " + payment); - String apiclientKey = config.getUploadPath().concat("/file").concat(payment.getApiclientKey()); - // 开发环境配置 - if(active.equals("dev")){ - apiclientKey = privateKeyPath; - } - Config config = new RSAAutoCertificateConfig.Builder() - .merchantId(payment.getMchId()) - .privateKeyFromPath(apiclientKey) - .merchantSerialNumber(payment.getMerchantSerialNumber()) - .apiV3Key(payment.getApiKey()) - .build(); - System.out.println("config = " + config); - WxNativeUtil.addConfig(tenantId, config); - return config; - } - - @ApiModelProperty("异步通知") - @PostMapping("/notify/{tenantId}") - public String wxNotify(@RequestHeader Map header, @RequestBody String body, @PathVariable("tenantId") Integer tenantId) { - System.out.println("异步通知*************** = "); - System.out.println("request header = " + header); - System.out.println("request body = " + body); - System.out.println("tenantId = " + tenantId); - - // 推送微信官方支付结果(携带租户ID的POST请求) -// final String string = requestUtil.pushWxPayNotify(transaction, payment); - - // 获取支付配置信息用于解密 - final SettingParam param = new SettingParam(); - param.setSettingKey("payment"); - param.setTenantId(tenantId); - final String uploadPath = config.getUploadPath(); // 服务器本地路径 - - return "fail"; - } -} diff --git a/modules/common/system/controller/WxOfficialController.java b/modules/common/system/controller/WxOfficialController.java deleted file mode 100644 index b264617..0000000 --- a/modules/common/system/controller/WxOfficialController.java +++ /dev/null @@ -1,291 +0,0 @@ -package com.gxwebsoft.common.system.controller; - -import cn.hutool.core.util.RandomUtil; -import cn.hutool.core.util.StrUtil; -import cn.hutool.core.util.XmlUtil; -import cn.hutool.crypto.digest.DigestUtil; -import cn.hutool.http.HttpRequest; -import cn.hutool.http.HttpUtil; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import com.alipay.api.internal.util.file.IOUtils; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.gxwebsoft.common.core.utils.CommonUtil; -import com.gxwebsoft.common.core.utils.RedisUtil; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.common.system.entity.*; -import com.gxwebsoft.common.system.param.RoleParam; -import com.gxwebsoft.common.system.param.UserParam; -import com.gxwebsoft.common.system.service.RoleService; -import com.gxwebsoft.common.system.service.UserOauthService; -import com.gxwebsoft.common.system.service.UserRoleService; -import com.gxwebsoft.common.system.service.UserService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.CollectionUtils; -import org.springframework.web.bind.annotation.*; -import org.w3c.dom.Document; -import org.w3c.dom.Element; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import java.io.IOException; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.concurrent.TimeUnit; - -import static com.gxwebsoft.common.core.constants.PlatformConstants.MP_OFFICIAL; - -@Api(tags = "微信公众号接口") -@RestController -@RequestMapping("/api/wx-official") -public class WxOfficialController extends BaseController { - // 公众号AppID - private static final String appid = "wxa67c676fc445590e"; - // 秘钥 - private static final String secret = "a450297b5ca8e081080148799d4e6b25"; - // 订阅消息模板ID - private static final String templateId = "LBoByn-TLb2qJS7yR838lGRU-BA-RZE6jm-adb7AWPA"; - // 小程序APPID - private static final String miniAppid = "wx541db955e7a62709"; - @Resource - private UserService userService; - @Resource - private RoleService roleService; - @Resource - private UserRoleService userRoleService; - @Resource - private UserOauthService userOauthService; - @Resource - private RedisUtil redisUtil; - - @ApiOperation("验证微信服务器") - @GetMapping("/{id}") - public String validate(@PathVariable("id") Integer tenantId,@RequestParam String nonce,@RequestParam String timestamp,@RequestParam String signature,@RequestParam String echostr){ - System.out.println("nonce = " + nonce); - System.out.println("tenantId = " + tenantId); - if(tenantId == null){ - return null; - } - String token = "gxwebsoft"; - String[] array = new String[]{token, timestamp, nonce}; - // 将token、timestamp、nonce三个参数进行字典序排序 - Arrays.sort(array); - // 将三个参数字符串拼接成一个字符串进行sha1加密 - StringBuilder sb = new StringBuilder(); - for (String str: array){ - sb.append(str); - } - final String strSha1 = DigestUtil.sha1Hex(sb.toString()); - if (strSha1.equals(signature)) { - return echostr; - } - return null; - } - - @ApiOperation("接收微信的xml消息") - @Transactional(rollbackFor = {Exception.class}) - @RequestMapping("/{id}") - @ResponseBody - public String receiveMessages(HttpServletRequest request,@PathVariable("id") Integer tenantId) throws IOException { - System.out.println("tenantId = " + tenantId); - Integer userId = 0; // 用户ID - // 从请求中获取XML数据 - String xmlData = IOUtils.toString(request.getInputStream(), "UTF-8"); - System.out.println("xmlData = " + xmlData); - // 解析XML数据 - Document document = XmlUtil.parseXml(xmlData); - Element rootElement = XmlUtil.getRootElement(document); - Element FromUserName = XmlUtil.getElement(rootElement, "FromUserName"); - String openId = FromUserName.getTextContent(); - System.out.println("openId = " + openId); - if(StrUtil.isNotBlank(openId)){ - // 获取用户基本信息(UnionID机制) - final String userStr = HttpUtil.get("https://api.weixin.qq.com/cgi-bin/user/info?access_token=" + getAccessToken() + "&openid="+ openId +"&lang=zh_CN"); - // 保存第三方用户信息表shop_user_oauth - final JSONObject jsonObject = JSONObject.parseObject(userStr); - final String unionid = jsonObject.getString("unionid"); - final String subscribe = jsonObject.getString("subscribe"); - System.out.println("unionid = " + unionid); - sendTemplateMessage(openId); - // 关注操作 - if (subscribe != null &&subscribe.equals("1")) { - final int count = userOauthService.count(new LambdaQueryWrapper().eq(UserOauth::getOauthType, MP_OFFICIAL).eq(UserOauth::getUnionid, unionid).eq(UserOauth::getTenantId,tenantId)); - System.out.println("count = " + count); - if (count == 0) { - // 其他平台是否有注册过 - final List list = userOauthService.list(new LambdaQueryWrapper().eq(UserOauth::getUnionid, unionid).eq(UserOauth::getDeleted, 0)); - final int size = list.size(); - // 新用户注册 - if (size== 0) { - User user = new User(); - user.setStatus(0); - user.setUsername("wxoff_".concat(RandomUtil.randomString(12))); - user.setStatus(0); - user.setNickname("微信公众号用户"); - user.setPlatform(MP_OFFICIAL); - user.setGradeId(1); - user.setPassword(userService.encodePassword(CommonUtil.randomUUID16())); - user.setTenantId(tenantId); - user.setRecommend(0); - final RoleParam roleParam = new RoleParam(); - roleParam.setTenantId(tenantId); - roleParam.setRoleCode("guest"); - Role role = roleService.getByRoleCode(roleParam); - user.setRoleId(role.getRoleId()); - if (userService.saveUser(user)) { - userId = user.getUserId(); - // 添加用户角色 - final UserRole userRole = new UserRole(); - userRole.setUserId(user.getUserId()); - userRole.setTenantId(user.getTenantId()); - userRole.setRoleId(user.getRoleId()); - userRoleService.save(userRole); - } - System.out.println("新微信公众号用户 = " + userId); - } - // 更新 - if (!CollectionUtils.isEmpty(list)) { - for (UserOauth item: list){ - if(item.getUserId() != null){ - userId = item.getUserId(); - } - } - System.out.println("其他平台有注册过 = " + userId); - } - // 保存第三方用户记录 - final UserOauth userOauth = new UserOauth(); - userOauth.setOauthType(MP_OFFICIAL); - userOauth.setUnionid(unionid); - userOauth.setOauthId(openId); - userOauth.setUserId(userId); - userOauth.setTenantId(tenantId); - boolean save = userOauthService.save(userOauth); - System.out.println("关注微信公众号 = " + save); - } - } - - } - return null; - } - - private void sendTemplateMessage(String openId){ - String url = "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=" + getAccessToken(); - TemplateMessage templateMessage = new TemplateMessage(); - templateMessage.setToUser(openId); - templateMessage.setTemplateId("dVSbX2NRzAG7IuN4kkCQhgV-LjzxvApN3PgrGlon9JU"); - - /* - 您好，您已成功消费。 - - 商品名：微信影城影票 - 消费时间：2013年8月20日 20:38 - 备注：您可以回复文字或语音对该商品及商家进行评价哦~ - {{productType.DATA}}：{{name.DATA}} 消费时间：{{time.DATA}} {{remark.DATA}} - */ - HashMap data = new HashMap<>(); - data.put("first",new TemplateMessageDTO("您收到了一条新的订单。")); - data.put("tradeDateTime",new TemplateMessageDTO("02月18日 01时05分")); - data.put("customerInfo",new TemplateMessageDTO("广州 王俊")); - data.put("orderItemName",new TemplateMessageDTO("兴趣车型")); - data.put("orderItemData",new TemplateMessageDTO("骐达 2011款 1.6 CVT 舒适版")); - data.put("remark",new TemplateMessageDTO("截止24日09:39分,您尚有10个订单未处理。")); - System.out.println("data = " + data); - // 链式构建请求 - String result = HttpRequest.post(url) - .body(JSONObject.toJSONString(data))//表单内容 - .timeout(20000)//超时，毫秒 - .execute().body(); - System.out.println("result = " + result); - System.out.println("getAccessToken() = " + getAccessToken()); - } - - @ApiOperation("send发送订阅通知") - @PostMapping("/send") - public ApiResult send(UserParam param) { - // send发送订阅通知 - String url = "https://api.weixin.qq.com/cgi-bin/message/subscribe/bizsend?access_token=" + getAccessToken(); - final UserOauth userOauth = userOauthService.getOne(new LambdaQueryWrapper().eq(UserOauth::getUserId, param.getUserId()).eq(UserOauth::getOauthType,"MP-OFFICIAL").eq(UserOauth::getDeleted, 0)); - if(userOauth != null){ - param.setOpenId(userOauth.getOauthId()); - final String oauthId = userOauth.getOauthId(); - // 跳转小程序链接 - HashMap miniprogram = new HashMap<>(); - miniprogram.put("appid",miniAppid); - miniprogram.put("pagepath","pages/chat/chat?friendId=" + param.getUserId()); - // 参数 - HashMap data = new HashMap<>(); - final HashMap thing1 = new HashMap<>(); - final HashMap thing2 = new HashMap<>(); - thing1.put("value","有新访客需要接待"); - thing2.put("value","吉媒小红娘"); - data.put("thing1",thing1); - data.put("thing2",thing2); - - // 请求主服务器获取用户信息 - HashMap map = new HashMap<>(); - map.put("access_token", getAccessToken()); - map.put("touser",oauthId); // "opEVj6e1YIlMyovkOQFCLJ7llmuI" - // 红娘来信通知 - map.put("template_id", templateId); - map.put("miniprogram",JSONObject.toJSONString(miniprogram)); - map.put("data",data); - // 新访客通知 -// map.put("tid","XMpEsDHmZZqpiaAzmPqO0Gk_h39WCRkaNZ9VoSI9F34"); -// map.put("page","https://admin.jimeigroup.cn"); -// map.put("sceneDesc","消息提醒"); - System.out.println("map = " + map); - - // 链式构建请求 - String result = HttpRequest.post(url) - .body(JSONObject.toJSONString(map))//表单内容 - .timeout(20000)//超时，毫秒 - .execute().body(); - - JSONObject jsonObject = JSONObject.parseObject(result); -// System.out.println("jsonObject = " + jsonObject); - if(jsonObject != null){ - return success(jsonObject); - } - } - - return fail("请求失败",getAccessToken()); - } - - // 调用接口凭证 - private String getAccessToken() { - String key = MP_OFFICIAL.concat(":access_token:5"); - // 从缓存获取access_token - String value = redisUtil.get(key); - if (value != null) { - // 解析access_token - JSONObject response = JSON.parseObject(value); - return response.getString("access_token"); - } - // 微信获取凭证接口https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=APPID&secret=APPSECRET - String apiUrl = "https://api.weixin.qq.com/cgi-bin/token"; - // 组装url参数 - String url = apiUrl.concat("?grant_type=client_credential").concat("&appid=").concat(appid).concat("&secret=").concat(secret); - // 执行get请求 - String result = HttpUtil.get(url); - // 解析access_token - JSONObject response = JSON.parseObject(result); - if (response.getString("access_token") != null) { - // 存入缓存 - redisUtil.set(key, result,7000L, TimeUnit.SECONDS); - return response.getString("access_token"); - } - return null; - } - - @ApiOperation("test") - @PostMapping("/test") - public ApiResult count(){ - final int count = userOauthService.count(new LambdaQueryWrapper().eq(UserOauth::getOauthType, MP_OFFICIAL).eq(UserOauth::getUnionid, "o0FaIuKa2UsVp6FCbvmZlrcaBRCM")); - System.out.println("count = " + count); - return success(getAccessToken()); - } -} diff --git a/modules/common/system/controller/WxPayNotifyController.java b/modules/common/system/controller/WxPayNotifyController.java deleted file mode 100644 index c5d018d..0000000 --- a/modules/common/system/controller/WxPayNotifyController.java +++ /dev/null @@ -1,88 +0,0 @@ -package com.gxwebsoft.common.system.controller; - -import cn.hutool.core.util.StrUtil; -import com.gxwebsoft.common.core.config.ConfigProperties; -import com.gxwebsoft.common.core.utils.RedisUtil; -import com.gxwebsoft.common.core.utils.RequestUtil; -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.common.system.entity.Payment; -import com.wechat.pay.java.core.notification.NotificationConfig; -import com.wechat.pay.java.core.notification.NotificationParser; -import com.wechat.pay.java.core.notification.RSANotificationConfig; -import com.wechat.pay.java.service.partnerpayments.jsapi.model.Transaction; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiModelProperty; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.Map; - -/** - * 会员特权购买记录表控制器 - * - * @author 科技小王子 - * @since 2023-06-20 18:07:50 - */ -@Api(tags = "微信支付结果通知") -@RestController -@RequestMapping("/api/system/wx-pay") -public class WxPayNotifyController extends BaseController { - @Value("${spring.profiles.active}") - String active; - @Resource - private RedisUtil redisUtil; - @Resource - private RequestUtil requestUtil; - @Resource - private ConfigProperties conf; - - @ApiModelProperty("异步通知") - @PostMapping("/notify/{tenantId}") - public String wxNotify(@RequestHeader Map header, @RequestBody String body, @PathVariable("tenantId") Integer tenantId) { - System.out.println("异步通知*************** = "); - - // 获取支付配置信息用于解密 - String key = "Payment:1:".concat(tenantId.toString()); - final Payment payment = redisUtil.get(key, Payment.class); - String privateKey = payment.getApiKey(); - String apiclientCert = conf.getUploadPath().concat("/file").concat(payment.getApiclientCert()); - - com.wechat.pay.java.core.notification.RequestParam requestParam = new com.wechat.pay.java.core.notification.RequestParam.Builder() - .serialNumber(header.get("wechatpay-serial")) - .nonce(header.get("wechatpay-nonce")) - .signature(header.get("wechatpay-signature")) - .timestamp(header.get("wechatpay-timestamp")) - .body(body) - .build(); - - // 如果已经初始化了 RSAAutoCertificateConfig，可直接使用 - // 没有的话，则构造一个 - NotificationConfig config = new RSANotificationConfig.Builder() - .apiV3Key(privateKey) - .certificatesFromPath(apiclientCert) - .build(); - - // 初始化 NotificationParser - NotificationParser parser = new NotificationParser(config); - - // 以支付通知回调为例，验签、解密并转换成 Transaction - try { - Transaction transaction = parser.parse(requestParam, Transaction.class); - - if (StrUtil.equals("支付成功", transaction.getTradeStateDesc())) { - - // 推送微信官方支付结果(携带租户ID的POST请求) - requestUtil.pushWxPayNotify(transaction, payment); - - return "SUCCESS"; - } - } catch (Exception $e) { - System.out.println($e.getMessage()); - } - - return "fail"; - } - - -} diff --git a/modules/common/system/entity/AccessKey.java b/modules/common/system/entity/AccessKey.java deleted file mode 100644 index 441873e..0000000 --- a/modules/common/system/entity/AccessKey.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.gxwebsoft.common.system.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.io.Serializable; -import java.util.Date; - -/** - * 访问凭证管理 - * - * @author 科技小王子 - * @since 2023-05-16 19:19:55 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "AccessKey对象", description = "访问凭证管理") -@TableName("sys_access_key") -public class AccessKey implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "字典项id") - @TableId(value = "id", type = IdType.AUTO) - private Integer id; - - @ApiModelProperty(value = "字典id") - private String accessKey; - - @ApiModelProperty(value = "字典项标识") - private String accessSecret; - - @ApiModelProperty(value = "排序号") - private Integer sortNumber; - - @ApiModelProperty(value = "是否删除, 0否, 1是") - @TableLogic - private Integer deleted; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - - @ApiModelProperty(value = "创建时间") - private Date createTime; - - @ApiModelProperty(value = "修改时间") - private Date updateTime; - -} diff --git a/modules/common/system/entity/App.java b/modules/common/system/entity/App.java deleted file mode 100644 index 0cb5377..0000000 --- a/modules/common/system/entity/App.java +++ /dev/null @@ -1,212 +0,0 @@ -package com.gxwebsoft.common.system.entity; - -import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableLogic; -import java.io.Serializable; -import java.util.Date; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 应用管理记录表 - * - * @author 科技小王子 - * @since 2023-10-30 22:20:23 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "App对象", description = "应用管理记录表") -@TableName("sys_app") -public class App implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "应用ID") - @TableId(value = "app_id", type = IdType.AUTO) - private Integer appId; - - @ApiModelProperty(value = "应用名称") - private String appName; - - @ApiModelProperty(value = "应用标识") - private String appCode; - - @ApiModelProperty(value = "上级id, 0是顶级") - private Integer parentId; - - @ApiModelProperty(value = "应用类型") - private String appType; - - @ApiModelProperty(value = "应用类型") - private String appTypeMultiple; - - @ApiModelProperty(value = "类型, 0菜单, 1按钮") - private Integer menuType; - - @ApiModelProperty(value = "企业ID") - private Integer companyId; - - @ApiModelProperty(value = "企业名称") - private String companyName; - - @ApiModelProperty(value = "应用图标") - private String appIcon; - - @ApiModelProperty(value = "二维码") - private String appQrcode; - - @ApiModelProperty(value = "链接地址") - private String appUrl; - - @ApiModelProperty(value = "后台管理地址") - private String adminUrl; - - @ApiModelProperty(value = "下载地址") - private String downUrl; - - @ApiModelProperty(value = "链接地址") - private String serverUrl; - - @ApiModelProperty(value = "文件服务器") - private String fileUrl; - - @ApiModelProperty(value = "回调地址") - private String callbackUrl; - - @ApiModelProperty(value = "腾讯文档地址") - private String docsUrl; - - @ApiModelProperty(value = "代码仓库地址") - private String gitUrl; - - @ApiModelProperty(value = "原型图地址") - private String prototypeUrl; - - @ApiModelProperty(value = "IP白名单") - private String ipAddress; - - @ApiModelProperty(value = "应用截图") - private String images; - - @ApiModelProperty(value = "应用包名") - private String packageName; - - @ApiModelProperty(value = "下载次数") - private Integer clicks; - - @ApiModelProperty(value = "安装次数") - private Integer installs; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "应用介绍") - private String content; - - @ApiModelProperty(value = "项目需求") - private String requirement; - - @ApiModelProperty(value = "开发者(个人或公司)") - private String developer; - - @ApiModelProperty(value = "项目负责人") - private String director; - - @ApiModelProperty(value = "项目经理") - private String projectDirector; - - @ApiModelProperty(value = "业务员") - private String salesman; - - @ApiModelProperty(value = "软件定价") - private BigDecimal price; - - @ApiModelProperty(value = "划线价格") - private BigDecimal linePrice; - - @ApiModelProperty(value = "评分") - private String score; - - @ApiModelProperty(value = "星级") - private String star; - - @ApiModelProperty(value = "菜单路由地址") - private String path; - - @ApiModelProperty(value = "菜单组件地址, 目录可为空") - private String component; - - @ApiModelProperty(value = "权限标识") - private String authority; - - @ApiModelProperty(value = "打开位置") - private String target; - - @ApiModelProperty(value = "是否隐藏, 0否, 1是(仅注册路由不显示在左侧菜单)") - private Integer hide; - - @ApiModelProperty(value = "禁止搜索，1禁止 0 允许") - private Integer search; - - @ApiModelProperty(value = "菜单侧栏选中的path") - private String active; - - @ApiModelProperty(value = "其它路由元信息") - private String meta; - - @ApiModelProperty(value = "版本，0正式版 1体验版 2开发版") - private String edition; - - @ApiModelProperty(value = "版本号") - private String version; - - @ApiModelProperty(value = "是否已安装") - private Integer isUse; - - @ApiModelProperty(value = "附近1") - private String file1; - - @ApiModelProperty(value = "附件2") - private String file2; - - @ApiModelProperty(value = "附件3") - private String file3; - - @ApiModelProperty(value = "应用状态") - private String appStatus; - - @ApiModelProperty(value = "排序(数字越小越靠前)") - private Integer sortNumber; - - @ApiModelProperty(value = "状态, 0正常, 1冻结") - private Integer status; - - @ApiModelProperty(value = "是否删除, 0否, 1是") - @TableLogic - private Integer deleted; - - @ApiModelProperty(value = "用户ID") - private Integer userId; - - @ApiModelProperty(value = "机构id") - private Integer organizationId; - - @ApiModelProperty(value = "租户编号") - private String tenantCode; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - - @ApiModelProperty(value = "注册时间") - private Date createTime; - - @ApiModelProperty(value = "修改时间") - private Date updateTime; - -} diff --git a/modules/common/system/entity/AppRenew.java b/modules/common/system/entity/AppRenew.java deleted file mode 100644 index 3bf49a2..0000000 --- a/modules/common/system/entity/AppRenew.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.gxwebsoft.common.system.entity; - -import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import java.io.Serializable; -import java.util.Date; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 续费管理 - * - * @author 科技小王子 - * @since 2023-11-14 14:14:07 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "AppRenew对象", description = "续费管理") -@TableName("sys_app_renew") -public class AppRenew implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "自增ID") - @TableId(value = "app_renew_id", type = IdType.AUTO) - private Integer appRenewId; - - @ApiModelProperty(value = "续费金额") - private BigDecimal money; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "开始时间") - private Date startTime; - - @ApiModelProperty(value = "到期时间") - private Date endTime; - - @ApiModelProperty(value = "用户ID") - private Integer userId; - - @ApiModelProperty(value = "应用ID") - private Integer appId; - - @ApiModelProperty(value = "状态, 0正常, 1待确认") - private Integer status; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - - @ApiModelProperty(value = "注册时间") - private Date createTime; - -} diff --git a/modules/common/system/entity/AppUrl.java b/modules/common/system/entity/AppUrl.java deleted file mode 100644 index 38bdae7..0000000 --- a/modules/common/system/entity/AppUrl.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.gxwebsoft.common.system.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import java.io.Serializable; -import java.util.Date; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 域名管理记录表 - * - * @author 科技小王子 - * @since 2023-10-30 22:20:23 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "AppUrl对象", description = "域名管理记录表") -@TableName("sys_app_url") -public class AppUrl implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "自增ID") - @TableId(value = "app_url_id", type = IdType.AUTO) - private Integer appUrlId; - - @ApiModelProperty(value = "应用ID") - private Integer appId; - - @ApiModelProperty(value = "域名类型") - private String type; - - @ApiModelProperty(value = "域名") - private String domain; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "状态, 0正常, 1待确认") - private Integer status; - - @ApiModelProperty(value = "注册时间") - private Date createTime; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - -} diff --git a/modules/common/system/entity/AppUser.java b/modules/common/system/entity/AppUser.java deleted file mode 100644 index 5d4c445..0000000 --- a/modules/common/system/entity/AppUser.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.gxwebsoft.common.system.entity; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import java.io.Serializable; -import java.util.Date; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 应用成员 - * - * @author 科技小王子 - * @since 2023-10-30 22:20:23 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "AppUser对象", description = "应用成员") -@TableName("sys_app_user") -public class AppUser implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "自增ID") - @TableId(value = "app_user_id", type = IdType.AUTO) - private Integer appUserId; - - @ApiModelProperty(value = "角色，10体验成员 20开发者成员 30管理员 ") - private Integer role; - - @ApiModelProperty(value = "用户ID") - private Integer userId; - - @ApiModelProperty(value = "应用ID") - private Integer appId; - - @ApiModelProperty(value = "状态, 0正常, 1待确认") - private Integer status; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - - @ApiModelProperty(value = "注册时间") - private Date createTime; - - @ApiModelProperty(value = "昵称") - @TableField(exist = false) - private String nickname; - - @ApiModelProperty(value = "用户名") - @TableField(exist = false) - private String username; - - @ApiModelProperty(value = "手机号码") - @TableField(exist = false) - private String phone; - - @ApiModelProperty(value = "邮箱") - @TableField(exist = false) - private String email; - - @ApiModelProperty(value = "头像") - @TableField(exist = false) - private String avatar; - -} diff --git a/modules/common/system/entity/Cache.java b/modules/common/system/entity/Cache.java deleted file mode 100644 index f0eabcc..0000000 --- a/modules/common/system/entity/Cache.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.gxwebsoft.common.system.entity; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.io.Serializable; - -/** - * 缓存管理 - * - * @author WebSoft - * @since 2022-11-19 13:54:27 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "Setting对象", description = "缓存管理") -public class Cache implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "key") - private String key; - - @ApiModelProperty(value = "设置内容（json格式）") - private String content; - - @ApiModelProperty(value = "过期时间(秒)") - private Long expireTime; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - -} diff --git a/modules/common/system/entity/ChatConversation.java b/modules/common/system/entity/ChatConversation.java deleted file mode 100644 index eb1794f..0000000 --- a/modules/common/system/entity/ChatConversation.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.gxwebsoft.common.system.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableLogic; -import java.io.Serializable; -import java.util.Date; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 聊天消息表 - * - * @author 科技小王子 - * @since 2024-04-27 15:57:27 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "ChatConversation对象", description = "聊天消息表") -@TableName("sys_chat_conversation") -public class ChatConversation implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "自增ID") - @TableId(value = "id", type = IdType.AUTO) - private Integer id; - - @ApiModelProperty(value = "用户ID") - private Integer userId; - - @ApiModelProperty(value = "好友ID") - private Integer friendId; - - @ApiModelProperty(value = "消息类型") - private Integer type; - - @ApiModelProperty(value = "消息内容") - private String content; - - @ApiModelProperty(value = "未读消息") - private Integer unRead; - - @ApiModelProperty(value = "状态, 0未读, 1已读") - private Integer status; - - @ApiModelProperty(value = "是否删除, 0否, 1是") - @TableLogic - private Integer deleted; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - - @ApiModelProperty(value = "注册时间") - private Date createTime; - - @ApiModelProperty(value = "修改时间") - private Date updateTime; - -} diff --git a/modules/common/system/entity/ChatMessage.java b/modules/common/system/entity/ChatMessage.java deleted file mode 100644 index 78f5cf3..0000000 --- a/modules/common/system/entity/ChatMessage.java +++ /dev/null @@ -1,90 +0,0 @@ -package com.gxwebsoft.common.system.entity; - -import com.baomidou.mybatisplus.annotation.*; - -import java.time.LocalDateTime; -import java.io.Serializable; -import java.util.Date; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 聊天消息表 - * - * @author 科技小王子 - * @since 2024-04-27 15:57:27 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "ChatMessage对象", description = "聊天消息表") -@TableName("sys_chat_message") -public class ChatMessage implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "自增ID") - @TableId(value = "id", type = IdType.AUTO) - private Integer id; - - @ApiModelProperty(value = "发送人ID") - private Integer formUserId; - - @ApiModelProperty(value = "接收人ID") - private Integer toUserId; - - @ApiModelProperty(value = "消息类型") - private String type; - - @ApiModelProperty(value = "消息内容") - private String content; - - @ApiModelProperty(value = "屏蔽接收方") - private Integer sideTo; - - @ApiModelProperty(value = "屏蔽发送方") - private Integer sideFrom; - - @ApiModelProperty(value = "是否撤回") - private Integer withdraw; - - @ApiModelProperty(value = "文件信息") - private String fileInfo; - - @ApiModelProperty(value = "存在联系方式") - private Integer hasContact; - - @ApiModelProperty(value = "状态, 0未读, 1已读") - private Integer status; - - @ApiModelProperty(value = "是否删除, 0否, 1是") - @TableLogic - private Integer deleted; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - - @ApiModelProperty(value = "注册时间") - private Date createTime; - - @ApiModelProperty(value = "修改时间") - private Date updateTime; - - @ApiModelProperty(value = "发送人昵称") - @TableField(exist = false) - private String formUserName; - - @ApiModelProperty(value = "发送人头像") - @TableField(exist = false) - private String formUserAvatar; - - @ApiModelProperty(value = "接收人昵称") - @TableField(exist = false) - private String toUserName; - - @ApiModelProperty(value = "接收人头像") - @TableField(exist = false) - private String toUserAvatar; - -} diff --git a/modules/common/system/entity/Company.java b/modules/common/system/entity/Company.java deleted file mode 100644 index 5bbb565..0000000 --- a/modules/common/system/entity/Company.java +++ /dev/null @@ -1,254 +0,0 @@ -package com.gxwebsoft.common.system.entity; - -import cn.hutool.core.util.DesensitizedUtil; -import com.baomidou.mybatisplus.annotation.*; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import io.swagger.models.auth.In; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.io.Serializable; -import java.util.Date; - -/** - * 企业信息 - * - * @author 科技小王子 - * @since 2023-05-27 14:57:34 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "Company对象", description = "企业信息") -@TableName("sys_company") -public class Company implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "企业id") - @TableId(value = "company_id", type = IdType.AUTO) - private Integer companyId; - - @ApiModelProperty(value = "企业简称") - private String shortName; - - @ApiModelProperty(value = "企业全称") - private String companyName; - - @ApiModelProperty(value = "企业标识") - private String companyCode; - - @ApiModelProperty(value = "企业类型") - private String companyType; - - @ApiModelProperty(value = "企业类型 多选") - private String companyTypeMultiple; - - @ApiModelProperty(value = "应用标识") - private String companyLogo; - - @ApiModelProperty(value = "企业域名") - private String domain; - - @ApiModelProperty(value = "联系电话") - private String phone; - - @ApiModelProperty(value = "电子邮箱") - private String email; - - @ApiModelProperty(value = "企业法人") - private String businessEntity; - - @ApiModelProperty(value = "发票抬头") - @TableField("Invoice_header") - private String invoiceHeader; - - @ApiModelProperty(value = "服务开始时间") - private Date startTime; - - @ApiModelProperty(value = "服务到期时间") - private Date expirationTime; - - @ApiModelProperty(value = "应用版本 10体验版 20授权版 30旗舰版") - private Integer version; - - @ApiModelProperty(value = "版本名称") - private String versionName; - - @ApiModelProperty(value = "版本号") - private String versionCode; - - @ApiModelProperty(value = "企业成员(当前)") - private Integer users; - - @ApiModelProperty(value = "成员数量(上限)") - private Integer members; - - @ApiModelProperty(value = "浏览数量") - private Long clicks; - - @ApiModelProperty(value = "点赞数量") - private Long likes; - - @ApiModelProperty(value = "购买数量") - private Long buys; - - @ApiModelProperty(value = "存储空间") - private Long storage; - - @ApiModelProperty(value = "存储空间(上限)") - private Long storageMax; - - @ApiModelProperty(value = "行业类型(父级)") - private String industryParent; - - @ApiModelProperty(value = "行业类型(子级)") - private String industryChild; - - @ApiModelProperty(value = "部门数量") - private Integer departments; - - @ApiModelProperty(value = "所在国家") - private String country; - - @ApiModelProperty(value = "所在省份") - private String province; - - @ApiModelProperty(value = "所在城市") - private String city; - - @ApiModelProperty(value = "所在辖区") - private String region; - - @ApiModelProperty(value = "街道地址") - private String address; - - @ApiModelProperty(value = "经度") - private String longitude; - - @ApiModelProperty(value = "纬度") - private String latitude; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "是否实名认证") - private Integer authentication; - - @ApiModelProperty(value = "主控端节点") - private String serverUrl; - - @ApiModelProperty(value = "模块节点") - private String modulesUrl; - - @ApiModelProperty(value = "重定向节点") - private String redirectUrl; - - @ApiModelProperty(value = "request合法域名") - private String requestUrl; - - @ApiModelProperty(value = "socket合法域名") - private String socketUrl; - - @ApiModelProperty(value = "总后台管理入口") - private String adminUrl; - - @ApiModelProperty(value = "商户端管理入口") - private String merchantUrl; - - @ApiModelProperty(value = "默认网站URL") - private String websiteUrl; - - @ApiModelProperty(value = "微信小程序二维码") - private String mpWeixinCode; - - @ApiModelProperty(value = "支付宝小程序二维码") - private String mpAlipayCode; - - @ApiModelProperty(value = "H5端应用二维码") - private String h5Code; - - @ApiModelProperty(value = "安卓APP二维码") - private String androidUrl; - - @ApiModelProperty(value = "苹果APP二维码") - private String iosUrl; - - @ApiModelProperty(value = "应用类型") - private String appType; - - @ApiModelProperty(value = "状态") - private Integer status; - - @ApiModelProperty(value = "排序") - private Integer sortNumber; - - @ApiModelProperty(value = "当前使用的租户模板") - private Integer planId; - - @ApiModelProperty(value = "用户ID") - private Integer userId; - - @ApiModelProperty(value = "是否含税") - private Boolean isTax; - - @ApiModelProperty(value = "是否删除, 0否, 1是") - @TableLogic - private Integer deleted; - - @ApiModelProperty(value = "创建时间") - private Date createTime; - - @ApiModelProperty(value = "修改时间") - private Date updateTime; - - @ApiModelProperty(value = "是否默认企业主体") - private Boolean authoritative; - - @ApiModelProperty("是否推荐") - private Boolean recommend; - - @ApiModelProperty("商户ID") - private Integer merchantId; - - @ApiModelProperty(value = "租户ID") - private Integer tid; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - - @ApiModelProperty(value = "租户名称") - @TableField(exist = false) - private String tenantName; - - @ApiModelProperty(value = "租户编号") - @TableField(exist = false) - private String tenantCode; - - @ApiModelProperty(value = "昵称") - @TableField(exist = false) - private String nickname; - - @ApiModelProperty(value = "是否已安装") - @TableField(exist = false) - private Boolean installed; - - @ApiModelProperty(value = "配置信息") - @TableField(exist = false) - private Object config; - - @ApiModelProperty(value = "是否已收藏") - @TableField(exist = false) - private Boolean collection; - - @ApiModelProperty(value = "新注册的密码") - @TableField(exist = false) - private String password; - - @ApiModelProperty("手机号(脱敏)") - @TableField(exist = false) - private String mobile; - - public String getMobile() { - return DesensitizedUtil.mobilePhone(this.phone); - } -} diff --git a/modules/common/system/entity/Dict.java b/modules/common/system/entity/Dict.java deleted file mode 100644 index 48b56bd..0000000 --- a/modules/common/system/entity/Dict.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.gxwebsoft.common.system.entity; - -import com.baomidou.mybatisplus.annotation.*; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; -import java.util.Set; - -/** - * 字典 - * - * @author WebSoft - * @since 2020-03-14 11:29:03 - */ -@Data -@ApiModel(description = "字典(业务类)") -@TableName("sys_dict") -public class Dict implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "字典id") - @TableId(type = IdType.AUTO) - private Integer dictId; - - @ApiModelProperty(value = "字典标识") - private String dictCode; - - @ApiModelProperty(value = "字典名称") - private String dictName; - - @ApiModelProperty(value = "排序号") - private Integer sortNumber; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "是否删除, 0否, 1是") - @TableLogic - private Integer deleted; - - @ApiModelProperty(value = "创建时间") - private Date createTime; - - @ApiModelProperty(value = "修改时间") - private Date updateTime; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - - @ApiModelProperty(value = "字典项列表") - @TableField(exist = false) - private Set> items; - -} diff --git a/modules/common/system/entity/DictData.java b/modules/common/system/entity/DictData.java deleted file mode 100644 index 8daee79..0000000 --- a/modules/common/system/entity/DictData.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.gxwebsoft.common.system.entity; - -import com.baomidou.mybatisplus.annotation.*; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - -/** - * 字典数据 - * - * @author WebSoft - * @since 2020-03-14 11:29:04 - */ -@Data -@ApiModel(description = "字典数据(业务类)") -@TableName("sys_dict_data") -public class DictData implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "字典数据id") - @TableId(type = IdType.AUTO) - private Integer dictDataId; - - @ApiModelProperty(value = "字典id") - private Integer dictId; - - @ApiModelProperty(value = "字典数据标识") - private String dictDataCode; - - @ApiModelProperty(value = "字典数据名称") - private String dictDataName; - - @ApiModelProperty(value = "排序号") - private Integer sortNumber; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "是否删除, 0否, 1是") - @TableLogic - private Integer deleted; - - @ApiModelProperty(value = "创建时间") - private Date createTime; - - @ApiModelProperty(value = "修改时间") - private Date updateTime; - - @ApiModelProperty(value = "字典代码") - @TableField(exist = false) - private String dictCode; - - @ApiModelProperty(value = "字典名称") - @TableField(exist = false) - private String dictName; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - -} diff --git a/modules/common/system/entity/Dictionary.java b/modules/common/system/entity/Dictionary.java deleted file mode 100644 index 2baec46..0000000 --- a/modules/common/system/entity/Dictionary.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.gxwebsoft.common.system.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; - -import java.util.Date; -import java.io.Serializable; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * 字典 - * - * @author WebSoft - * @since 2020-03-14 11:29:03 - */ -@Data -@ApiModel(description = "字典(系统类)") -@TableName("sys_dictionary") -public class Dictionary implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "字典id") - @TableId(type = IdType.AUTO) - private Integer dictId; - - @ApiModelProperty(value = "字典标识") - private String dictCode; - - @ApiModelProperty(value = "字典名称") - private String dictName; - - @ApiModelProperty(value = "排序号") - private Integer sortNumber; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "是否删除, 0否, 1是") - @TableLogic - private Integer deleted; - - @ApiModelProperty(value = "创建时间") - private Date createTime; - - @ApiModelProperty(value = "修改时间") - private Date updateTime; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - -} diff --git a/modules/common/system/entity/DictionaryData.java b/modules/common/system/entity/DictionaryData.java deleted file mode 100644 index aec639c..0000000 --- a/modules/common/system/entity/DictionaryData.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.gxwebsoft.common.system.entity; - -import com.baomidou.mybatisplus.annotation.*; - -import java.util.Date; -import java.io.Serializable; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * 字典数据 - * - * @author WebSoft - * @since 2020-03-14 11:29:04 - */ -@Data -@ApiModel(description = "字典数据(系统类)") -@TableName("sys_dictionary_data") -public class DictionaryData implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "字典数据id") - @TableId(type = IdType.AUTO) - private Integer dictDataId; - - @ApiModelProperty(value = "字典id") - private Integer dictId; - - @ApiModelProperty(value = "字典数据标识") - private String dictDataCode; - - @ApiModelProperty(value = "字典数据名称") - private String dictDataName; - - @ApiModelProperty(value = "排序号") - private Integer sortNumber; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "是否删除, 0否, 1是") - @TableLogic - private Integer deleted; - - @ApiModelProperty(value = "创建时间") - private Date createTime; - - @ApiModelProperty(value = "修改时间") - private Date updateTime; - - @ApiModelProperty(value = "字典代码") - @TableField(exist = false) - private String dictCode; - - @ApiModelProperty(value = "字典名称") - @TableField(exist = false) - private String dictName; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - -} diff --git a/modules/common/system/entity/EmailRecord.java b/modules/common/system/entity/EmailRecord.java deleted file mode 100644 index 4deb683..0000000 --- a/modules/common/system/entity/EmailRecord.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.gxwebsoft.common.system.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - -/** - * 邮件发送记录 - * - * @author WebSoft - * @since 2021-08-29 12:36:35 - */ -@Data -@ApiModel(description = "邮件发送记录") -@TableName("sys_email_record") -public class EmailRecord implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty("主键id") - @TableId(type = IdType.AUTO) - private Integer id; - - @ApiModelProperty("邮件标题") - private String title; - - @ApiModelProperty("邮件内容") - private String content; - - @ApiModelProperty("收件邮箱") - private String receiver; - - @ApiModelProperty("发件邮箱") - private String sender; - - @ApiModelProperty("创建人") - private Integer createUserId; - - @ApiModelProperty("备注") - private String comments; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - - @ApiModelProperty("创建时间") - private Date createTime; - - @ApiModelProperty("修改时间") - private Date updateTime; - -} diff --git a/modules/common/system/entity/Environment.java b/modules/common/system/entity/Environment.java deleted file mode 100644 index b82cc3e..0000000 --- a/modules/common/system/entity/Environment.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.gxwebsoft.common.system.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableLogic; -import java.io.Serializable; -import java.util.Date; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 环境管理 - * - * @author 科技小王子 - * @since 2023-10-18 08:45:13 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "Environment对象", description = "环境管理") -@TableName("sys_environment") -public class Environment implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "插件id") - @TableId(value = "id", type = IdType.AUTO) - private Integer id; - - @ApiModelProperty(value = "环境名称") - private String environmentName; - - @ApiModelProperty(value = "环境编号") - private String environmentCode; - - @ApiModelProperty(value = "服务器厂商") - private String brand; - - @ApiModelProperty(value = "服务器IP") - private String serverIp; - - @ApiModelProperty(value = "模块访问地址") - private String modulesUrl; - - @ApiModelProperty(value = "模块API") - private String modulesApi; - - @ApiModelProperty(value = "排序号") - private Integer sortNumber; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "状态, 10待审核 20已通过 30已驳回") - private Integer status; - - @ApiModelProperty(value = "用户ID") - private Integer userId; - - @ApiModelProperty(value = "是否删除, 0否, 1是") - @TableLogic - private Integer deleted; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - - @ApiModelProperty(value = "创建时间") - private Date createTime; - - @ApiModelProperty(value = "修改时间") - private Date updateTime; - -} diff --git a/modules/common/system/entity/FileRecord.java b/modules/common/system/entity/FileRecord.java deleted file mode 100644 index d3814cb..0000000 --- a/modules/common/system/entity/FileRecord.java +++ /dev/null @@ -1,91 +0,0 @@ -package com.gxwebsoft.common.system.entity; - -import cn.hutool.core.util.DesensitizedUtil; -import com.baomidou.mybatisplus.annotation.*; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - -/** - * 文件上传记录 - * - * @author WebSoft - * @since 2021-08-29 12:36:32 - */ -@Data -@ApiModel(description = "文件上传记录") -@TableName("sys_file_record") -public class FileRecord implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty("主键id") - @TableId(type = IdType.AUTO) - private Integer id; - - @ApiModelProperty("分组ID") - private Integer groupId; - - @ApiModelProperty("文件名称") - private String name; - - @ApiModelProperty("文件存储路径") - private String path; - - @ApiModelProperty("文件大小") - private Long length; - - @ApiModelProperty("文件类型") - private String contentType; - - @ApiModelProperty("备注") - private String comments; - - @ApiModelProperty("应用ID") - private Integer appId; - - @ApiModelProperty("企业ID") - private Integer companyId; - - @ApiModelProperty("创建人") - private Integer createUserId; - - @ApiModelProperty("是否删除, 0否, 1是") - @TableLogic - private Integer deleted; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - - @ApiModelProperty("创建时间") - private Date createTime; - - @ApiModelProperty("修改时间") - private Date updateTime; - - @ApiModelProperty("文件访问地址") - @TableField(exist = false) - private String url; - - @ApiModelProperty("文件缩略图访问地址") - @TableField(exist = false) - private String thumbnail; - - @ApiModelProperty("文件下载地址") - @TableField(exist = false) - private String downloadUrl; - - @ApiModelProperty("创建人账号") - @TableField(exist = false) - private String createUsername; - - @ApiModelProperty("创建人名称") - @TableField(exist = false) - private String createNickname; - - @ApiModelProperty("用户头像") - @TableField(exist = false) - private String avatar; -} diff --git a/modules/common/system/entity/KVEntity.java b/modules/common/system/entity/KVEntity.java deleted file mode 100644 index b310b8f..0000000 --- a/modules/common/system/entity/KVEntity.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.gxwebsoft.common.system.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - -/** - * 租户 - * - * @author WebSoft - * @since 2021-08-28 11:31:06 - */ -@Data -@ApiModel(description = "实体") -public class KVEntity implements Serializable { - private static final long serialVersionUID = 1L; - protected K k; - protected V v; - public KVEntity() { - super(); - } - - public KVEntity(K k, V v) { - super(); - this.k = k; - this.v = v; - } - - public static KVEntity build(K k, V v) { - return new KVEntity<>(k, v); - } - - public K getK() { - return k; - } - - public void setK(K k) { - this.k = k; - } - - public V getV() { - return v; - } - - public void setV(V v) { - this.v = v; - } - -} diff --git a/modules/common/system/entity/LoginRecord.java b/modules/common/system/entity/LoginRecord.java deleted file mode 100644 index 9e205b6..0000000 --- a/modules/common/system/entity/LoginRecord.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.gxwebsoft.common.system.entity; - -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.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - -/** - * 登录日志 - * - * @author WebSoft - * @since 2018-12-24 16:10:41 - */ -@Data -@ApiModel(description = "登录日志") -@TableName("sys_login_record") -public class LoginRecord implements Serializable { - private static final long serialVersionUID = 1L; - public static final int TYPE_LOGIN = 0; // 登录成功 - public static final int TYPE_ERROR = 1; // 登录失败 - public static final int TYPE_LOGOUT = 2; // 退出登录 - public static final int TYPE_REFRESH = 3; // 续签token - public static final int TYPE_REGISTER = 4; // 注册成功 - - @ApiModelProperty("主键id") - @TableId(type = IdType.AUTO) - private Integer id; - - @ApiModelProperty("用户账号") - private String username; - - @ApiModelProperty("操作系统") - private String os; - - @ApiModelProperty("设备名称") - private String device; - - @ApiModelProperty("浏览器类型") - private String browser; - - @ApiModelProperty("ip地址") - private String ip; - - @ApiModelProperty("操作类型, 0登录成功, 1登录失败, 2退出登录, 3续签token") - private Integer loginType; - - @ApiModelProperty("备注") - private String comments; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - - @ApiModelProperty("操作时间") - private Date createTime; - - @ApiModelProperty("修改时间") - private Date updateTime; - - @ApiModelProperty("用户id") - @TableField(exist = false) - private Integer userId; - - @ApiModelProperty("用户昵称") - @TableField(exist = false) - private String nickname; - -} diff --git a/modules/common/system/entity/Menu.java b/modules/common/system/entity/Menu.java deleted file mode 100644 index 79ffce5..0000000 --- a/modules/common/system/entity/Menu.java +++ /dev/null @@ -1,90 +0,0 @@ -package com.gxwebsoft.common.system.entity; - -import com.baomidou.mybatisplus.annotation.*; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import org.springframework.security.core.GrantedAuthority; - -import java.util.Date; -import java.util.List; - -/** - * 菜单 - * - * @author WebSoft - * @since 2018-12-24 16:10:17 - */ -@Data -@ApiModel(description = "菜单") -@TableName("sys_menu") -public class Menu implements GrantedAuthority { - private static final long serialVersionUID = 1L; - public static final int TYPE_MENU = 0; // 菜单类型 - public static final int TYPE_BTN = 1; // 按钮类型 - - @ApiModelProperty("菜单id") - @TableId(type = IdType.AUTO) - private Integer menuId; - - @ApiModelProperty("上级id, 0是顶级") - private Integer parentId; - - @ApiModelProperty("菜单名称") - private String title; - - @ApiModelProperty("菜单路由地址") - private String path; - - @ApiModelProperty("菜单组件地址") - private String component; - - @ApiModelProperty("模块ID") - private String modules; - - @ApiModelProperty("模块API") - private String modulesUrl; - - @ApiModelProperty("菜单类型, 0菜单, 1按钮") - private Integer menuType; - - @ApiModelProperty("排序号") - private Integer sortNumber; - - @ApiModelProperty("权限标识") - private String authority; - - @ApiModelProperty("菜单图标") - private String icon; - - @ApiModelProperty("是否隐藏, 0否, 1是(仅注册路由不显示左侧菜单)") - private Integer hide; - - @ApiModelProperty("路由元信息") - private String meta; - - @ApiModelProperty("是否删除, 0否, 1是") - @TableLogic - private Integer deleted; - - @ApiModelProperty("关联应用") - private Integer appId; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - - @ApiModelProperty("创建时间") - private Date createTime; - - @ApiModelProperty("修改时间") - private Date updateTime; - - @ApiModelProperty("子菜单") - @TableField(exist = false) - private List children; - - @ApiModelProperty("角色权限树选中状态") - @TableField(exist = false) - private Boolean checked; - -} diff --git a/modules/common/system/entity/Merchant.java b/modules/common/system/entity/Merchant.java deleted file mode 100644 index 2da89fc..0000000 --- a/modules/common/system/entity/Merchant.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.gxwebsoft.common.system.entity; - -import com.baomidou.mybatisplus.annotation.*; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -/** - * 商户 - * - * @author 科技小王子 - * @since 2024-04-05 00:03:54 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "Merchant对象", description = "商户") -@TableName("sys_merchant") -public class Merchant implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "ID") - @TableId(value = "merchant_id", type = IdType.AUTO) - private Integer merchantId; - - @ApiModelProperty(value = "商户名称") - private String merchantName; - - @ApiModelProperty(value = "商户标识") - private String merchantCode; - - @ApiModelProperty(value = "商户图标") - private String image; - - @ApiModelProperty(value = "商户手机号") - private String phone; - - @ApiModelProperty(value = "商户姓名") - private String realName; - - @ApiModelProperty(value = "店铺类型") - private String shopType; - - @ApiModelProperty(value = "商户分类") - private String category; - - @ApiModelProperty(value = "经纬度") - private String lngAndLat; - - @ApiModelProperty(value = "所在省份") - private String province; - - @ApiModelProperty(value = "所在城市") - private String city; - - @ApiModelProperty(value = "所在辖区") - private String region; - - @ApiModelProperty(value = "详细地址") - private String address; - - @ApiModelProperty(value = "手续费") - private BigDecimal commission; - - @ApiModelProperty(value = "关键字") - private String keywords; - - @ApiModelProperty(value = "资质图片") - private String files; - - @ApiModelProperty(value = "营业时间") - private String businessTime; - - @ApiModelProperty(value = "商户简介") - private String content; - - @ApiModelProperty(value = "是否自营") - private Integer ownStore; - - @ApiModelProperty(value = "每小时价格") - private BigDecimal price; - - @ApiModelProperty(value = "是否推荐") - private Integer recommend; - - @ApiModelProperty(value = "是否需要审核") - private Boolean goodsReview; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "管理入口") - private String adminUrl; - - @ApiModelProperty(value = "所有人") - private Integer userId; - - @ApiModelProperty(value = "状态") - private Integer status; - - @ApiModelProperty("是否删除, 0否, 1是") - @TableLogic - private Integer deleted; - - @ApiModelProperty(value = "排序号") - private Integer sortNumber; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - - @ApiModelProperty(value = "创建时间") - private Date createTime; - - @ApiModelProperty(value = "默认商户管理员角色ID") - @TableField(exist = false) - private Integer roleId; - - @ApiModelProperty(value = "角色名称") - @TableField(exist = false) - private String roleName; - -} diff --git a/modules/common/system/entity/MerchantAccount.java b/modules/common/system/entity/MerchantAccount.java deleted file mode 100644 index 6e1da90..0000000 --- a/modules/common/system/entity/MerchantAccount.java +++ /dev/null @@ -1,90 +0,0 @@ -package com.gxwebsoft.common.system.entity; - -import cn.hutool.core.util.DesensitizedUtil; -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.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.io.Serializable; -import java.util.Date; - -/** - * 商户账号 - * - * @author 科技小王子 - * @since 2024-04-19 12:02:24 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "MerchantAccount对象", description = "商户账号") -@TableName("sys_merchant_account") -public class MerchantAccount implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "ID") - @TableId(value = "id", type = IdType.AUTO) - private Integer id; - - @ApiModelProperty(value = "商户手机号") - private String phone; - - @ApiModelProperty(value = "账号密码") - @TableField(exist = false) - private String password; - - @ApiModelProperty(value = "真实姓名") - private String realName; - - @ApiModelProperty(value = "商户ID") - private Integer merchantId; - - @ApiModelProperty(value = "角色ID") - private Integer roleId; - - @ApiModelProperty(value = "角色名称") - private String roleName; - - @ApiModelProperty(value = "用户ID") - private Integer userId; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "状态") - private Integer status; - - @ApiModelProperty(value = "排序号") - private Integer sortNumber; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - - @ApiModelProperty(value = "创建时间") - private Date createTime; - - @ApiModelProperty(value = "商户名称") - @TableField(exist = false) - private String merchantName; - - @ApiModelProperty(value = "是否需要审核") - @TableField(exist = false) - private Boolean goodsReview; - - @ApiModelProperty("手机号(脱敏)") - @TableField(exist = false) - private String mobile; - - @ApiModelProperty(value = "是否管理员") - @TableField(exist = false) - private Boolean isAdmin; - - public String getMobile(){ - return DesensitizedUtil.mobilePhone(this.phone); - } - -} diff --git a/modules/common/system/entity/MerchantApply.java b/modules/common/system/entity/MerchantApply.java deleted file mode 100644 index 8f0c83a..0000000 --- a/modules/common/system/entity/MerchantApply.java +++ /dev/null @@ -1,83 +0,0 @@ -package com.gxwebsoft.common.system.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -/** - * 商户入驻申请 - * - * @author 科技小王子 - * @since 2024-04-05 01:24:36 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "MerchantApply对象", description = "商户入驻申请") -@TableName("sys_merchant_apply") -public class MerchantApply implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "ID") - @TableId(value = "apply_id", type = IdType.AUTO) - private Integer applyId; - - @ApiModelProperty(value = "商户名称") - private String merchantName; - - @ApiModelProperty(value = "商户图标") - private String image; - - @ApiModelProperty(value = "商户手机号") - private String phone; - - @ApiModelProperty(value = "商户姓名") - private String realName; - - @ApiModelProperty(value = "店铺类型") - private String shopType; - - @ApiModelProperty(value = "商户分类") - private String category; - - @ApiModelProperty(value = "手续费") - private BigDecimal commission; - - @ApiModelProperty(value = "关键字") - private String keywords; - - @ApiModelProperty(value = "资质图片") - private String files; - - @ApiModelProperty(value = "是否自营") - private Integer ownStore; - - @ApiModelProperty(value = "是否推荐") - private Integer recommend; - - @ApiModelProperty(value = "是否需要审核") - private Integer goodsReview; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "状态") - private Integer status; - - @ApiModelProperty(value = "排序号") - private Integer sortNumber; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - - @ApiModelProperty(value = "创建时间") - private Date createTime; - -} diff --git a/modules/common/system/entity/MerchantType.java b/modules/common/system/entity/MerchantType.java deleted file mode 100644 index a91d2b7..0000000 --- a/modules/common/system/entity/MerchantType.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.gxwebsoft.common.system.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.io.Serializable; -import java.util.Date; - -/** - * 商户类型 - * - * @author 科技小王子 - * @since 2024-04-05 00:08:51 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "MerchantType对象", description = "商户类型") -@TableName("sys_merchant_type") -public class MerchantType implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "ID") - @TableId(value = "id", type = IdType.AUTO) - private Integer id; - - @ApiModelProperty(value = "店铺类型") - private String name; - - @ApiModelProperty(value = "店铺入驻条件") - private String comments; - - @ApiModelProperty(value = "状态") - private Integer status; - - @ApiModelProperty(value = "排序号") - private Integer sortNumber; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - - @ApiModelProperty(value = "创建时间") - private Date createTime; - -} diff --git a/modules/common/system/entity/Modules.java b/modules/common/system/entity/Modules.java deleted file mode 100644 index a8c4e7a..0000000 --- a/modules/common/system/entity/Modules.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.gxwebsoft.common.system.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; -import java.io.Serializable; -import java.util.Date; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 模块管理 - * - * @author 科技小王子 - * @since 2023-10-18 15:53:43 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "Modules对象", description = "模块管理") -@TableName("sys_modules") -public class Modules implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "插件id") - @TableId(value = "id", type = IdType.AUTO) - private Integer id; - - @ApiModelProperty(value = "环境编号") - private String modules; - - @ApiModelProperty(value = "模块访问地址") - private String modulesUrl; - - @ApiModelProperty(value = "排序号") - private Integer sortNumber; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "状态, 10待审核 20已通过 30已驳回") - private Integer status; - - @ApiModelProperty(value = "用户ID") - private Integer userId; - - @ApiModelProperty(value = "是否删除, 0否, 1是") - @TableLogic - private Integer deleted; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - - @ApiModelProperty(value = "创建时间") - private Date createTime; - -} diff --git a/modules/common/system/entity/Mp.java b/modules/common/system/entity/Mp.java deleted file mode 100644 index 810eb3f..0000000 --- a/modules/common/system/entity/Mp.java +++ /dev/null @@ -1,99 +0,0 @@ -package com.gxwebsoft.common.system.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.io.Serializable; -import java.util.Date; - -/** - * 小程序信息 - * - * @author 科技小王子 - * @since 2024-07-21 23:03:05 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "Mp对象", description = "小程序信息") -@TableName("cms_mp") -public class Mp implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "ID") - @TableId(value = "mp_id", type = IdType.AUTO) - private Integer mpId; - - @ApiModelProperty(value = "是否主账号") - private Integer type; - - @ApiModelProperty(value = "小程序ID") - private String appId; - - @ApiModelProperty(value = "小程序密钥") - private String appSecret; - - @ApiModelProperty(value = "小程序名称") - private String mpName; - - @ApiModelProperty(value = "小程序简称") - private String shortName; - - @ApiModelProperty(value = "头像") - private String avatar; - - @ApiModelProperty(value = "小程序码") - private String mpQrcode; - - @ApiModelProperty(value = "微信认证") - private Integer authentication; - - @ApiModelProperty(value = "主体信息") - private String companyName; - - @ApiModelProperty(value = "小程序备案") - private String icpNo; - - @ApiModelProperty(value = "登录邮箱") - private String email; - - @ApiModelProperty(value = "登录密码") - private String password; - - @ApiModelProperty(value = "原始ID") - private String ghId; - - @ApiModelProperty(value = "入口页面") - private String mainPath; - - @ApiModelProperty(value = "过期时间") - private Date expirationTime; - - @ApiModelProperty(value = "排序(数字越小越靠前)") - private Integer sortNumber; - - @ApiModelProperty(value = "介绍") - private String comments; - - @ApiModelProperty(value = "用户ID") - private Integer userId; - - @ApiModelProperty(value = "状态, 0正常, 1冻结") - private Integer status; - - @ApiModelProperty(value = "是否删除, 0否, 1是") - @TableLogic - private Integer deleted; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - - @ApiModelProperty(value = "注册时间") - private Date createTime; - -} diff --git a/modules/common/system/entity/Notice.java b/modules/common/system/entity/Notice.java deleted file mode 100644 index 6217c5f..0000000 --- a/modules/common/system/entity/Notice.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.gxwebsoft.common.system.entity; - -import com.baomidou.mybatisplus.annotation.*; - -import java.time.LocalDateTime; -import java.io.Serializable; -import java.util.Date; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 消息记录表 - * - * @author 科技小王子 - * @since 2023-10-08 13:22:21 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "Notice对象", description = "消息记录表") -@TableName("sys_notice") -public class Notice implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "ID") - @TableId(value = "notice_id", type = IdType.AUTO) - private Integer noticeId; - - @ApiModelProperty(value = "消息类型") - private String type; - - @ApiModelProperty(value = "标题") - private String title; - - @ApiModelProperty(value = "图标") - private String icon; - - @ApiModelProperty(value = "颜色") - private String color; - - @ApiModelProperty(value = "内容") - private String content; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "消息来源") - private String source; - - @ApiModelProperty(value = "来源记录ID") - private Integer sourceId; - - @ApiModelProperty(value = "路由地址") - private String path; - - @ApiModelProperty(value = "是否已查阅") - private Integer isRead; - - @ApiModelProperty(value = "渠道, 0发送 1回复") - private Integer channel; - - @ApiModelProperty(value = "任务状态") - private Integer progress; - - @ApiModelProperty(value = "用户ID") - private Integer userId; - - @ApiModelProperty(value = "状态, 0待处理, 1已完成") - private Integer status; - - @ApiModelProperty(value = "是否删除, 0否, 1是") - @TableLogic - private Integer deleted; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - - @ApiModelProperty(value = "注册时间") - private Date createTime; - - @ApiModelProperty(value = "修改时间") - private Date updateTime; - - @ApiModelProperty(value = "开发者名称") - @TableField(exist = false) - private String nickname; - - @ApiModelProperty(value = "开发者头像") - @TableField(exist = false) - private String avatar; - -} diff --git a/modules/common/system/entity/OperationRecord.java b/modules/common/system/entity/OperationRecord.java deleted file mode 100644 index cdda95c..0000000 --- a/modules/common/system/entity/OperationRecord.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.gxwebsoft.common.system.entity; - -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.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - -/** - * 操作日志 - * - * @author WebSoft - * @since 2018-12-24 16:10:33 - */ -@Data -@ApiModel(description = "操作日志") -@TableName("sys_operation_record") -public class OperationRecord implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty("主键id") - @TableId(type = IdType.AUTO) - private Integer id; - - @ApiModelProperty("用户id") - private Integer userId; - - @ApiModelProperty("操作模块") - private String module; - - @ApiModelProperty("操作功能") - private String description; - - @ApiModelProperty("请求地址") - private String url; - - @ApiModelProperty("请求方式") - private String requestMethod; - - @ApiModelProperty("调用方法") - private String method; - - @ApiModelProperty("请求参数") - private String params; - - @ApiModelProperty("返回结果") - private String result; - - @ApiModelProperty("异常信息") - private String error; - - @ApiModelProperty("备注") - private String comments; - - @ApiModelProperty("消耗时间, 单位毫秒") - private Long spendTime; - - @ApiModelProperty("操作系统") - private String os; - - @ApiModelProperty("设备名称") - private String device; - - @ApiModelProperty("浏览器类型") - private String browser; - - @ApiModelProperty("ip地址") - private String ip; - - @ApiModelProperty("状态, 0成功, 1异常") - private Integer status; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - - @ApiModelProperty("操作时间") - private Date createTime; - - @ApiModelProperty("修改时间") - private Date updateTime; - - @ApiModelProperty("用户昵称") - @TableField(exist = false) - private String nickname; - - @ApiModelProperty("用户账号") - @TableField(exist = false) - private String username; - -} diff --git a/modules/common/system/entity/Order.java b/modules/common/system/entity/Order.java deleted file mode 100644 index ea71528..0000000 --- a/modules/common/system/entity/Order.java +++ /dev/null @@ -1,245 +0,0 @@ -package com.gxwebsoft.common.system.entity; - -import java.math.BigDecimal; - -import cn.hutool.core.util.DesensitizedUtil; -import com.baomidou.mybatisplus.annotation.*; -import java.io.Serializable; -import java.util.Date; -import java.util.List; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 订单 - * - * @author 科技小王子 - * @since 2024-04-24 13:46:21 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "Order对象", description = "订单") -@TableName("sys_order") -public class Order implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "订单号") - @TableId(value = "order_id", type = IdType.AUTO) - private Integer orderId; - - @ApiModelProperty(value = "订单编号") - private String orderNo; - - @ApiModelProperty(value = "微信支付订单号") - private String wechatOrder; - - @ApiModelProperty(value = "微信退款订单号") - private String refundOrder; - - @ApiModelProperty(value = "场馆id用于权限判断") - private Integer merchantId; - - @ApiModelProperty(value = "用户id") - private Integer userId; - - @ApiModelProperty(value = "使用的优惠券id") - private Integer couponId; - - @ApiModelProperty(value = "使用的会员卡id") - private Integer cardId; - - @ApiModelProperty(value = "关联管理员id") - private Integer aid; - - @ApiModelProperty(value = "核销管理员id") - private Integer adminId; - - @ApiModelProperty(value = "IC卡号") - private String code; - - @ApiModelProperty(value = "真实姓名") - private String name; - - @ApiModelProperty(value = "手机号码") - private String phone; - - @ApiModelProperty(value = "订单总额") - private BigDecimal totalPrice; - - @ApiModelProperty(value = "减少的金额，使用VIP会员折扣、优惠券抵扣、优惠券折扣后减去的价格") - private BigDecimal reducePrice; - - @ApiModelProperty(value = "实际付款") - private BigDecimal payPrice; - - @ApiModelProperty(value = "用于统计") - private BigDecimal price; - - @ApiModelProperty(value = "价钱，用于积分赠送") - private BigDecimal money; - - @ApiModelProperty(value = "退款金额") - private BigDecimal refundMoney; - - @ApiModelProperty(value = "教练价格") - private BigDecimal coachPrice; - - @ApiModelProperty(value = "教练id") - private Integer coachId; - - @ApiModelProperty(value = "1微信支付，2积分，3支付宝，4现金，5POS机，6VIP月卡，7VIP年卡，8VIP次卡，9IC月卡，10IC年卡，11IC次卡，12免费，13VIP充值卡，14IC充值卡，15积分支付，16VIP季卡，17IC季卡") - private Integer payType; - - @ApiModelProperty(value = "1已付款，2未付款") - private Integer payStatus; - - @ApiModelProperty(value = "1已完成，2未使用，3已取消，4退款申请中，5退款被拒绝，6退款成功，7客户端申请退款") - private Integer orderStatus; - - @ApiModelProperty(value = "优惠类型：0无、1抵扣优惠券、2折扣优惠券、3、VIP月卡、4VIP年卡，5VIP次卡、6VIP会员卡、7IC月卡、8IC年卡、9IC次卡、10IC会员卡、11免费订单、12VIP充值卡、13IC充值卡、14VIP季卡、15IC季卡") - private Integer type; - - @ApiModelProperty(value = "二维码地址，保存订单号，支付成功后才生成") - private String qrcode; - - @ApiModelProperty(value = "优惠说明") - private String desc; - - @ApiModelProperty(value = "vip月卡年卡、ic月卡年卡回退次数") - private Integer returnNum; - - @ApiModelProperty(value = "vip充值回退金额") - private BigDecimal returnMoney; - - @ApiModelProperty(value = "预约详情开始时间数组") - private Integer startTime; - - @ApiModelProperty(value = "是否已开具发票：1已开发票，2未开发票，3不能开具发票") - private Integer isInvoice; - - @ApiModelProperty(value = "付款时间") - private Date payTime; - - @ApiModelProperty(value = "退款时间") - private Integer refundTime; - - @ApiModelProperty(value = "申请退款时间") - private Integer refundApplyTime; - - @ApiModelProperty(value = "对账情况：1=已对账；2=未对账；3=已对账，金额对不上；4=未查询到该订单") - private Integer checkBill; - - @ApiModelProperty(value = "系统版本") - private Integer version; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "是否删除, 0否, 1是") - @TableLogic - private Integer deleted; - - @ApiModelProperty(value = "创建时间") - private Date createTime; - - @ApiModelProperty(value = "更新时间") - private Date updateTime; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - - @ApiModelProperty(value = "商户名称") - @TableField(exist = false) - private String merchantName; - - @ApiModelProperty(value = "商户图标") - @TableField(exist = false) - private String merchantAvatar; - - @ApiModelProperty(value = "微信OPENID,用于微信支付") - @TableField(exist = false) - private String openid; - - @ApiModelProperty(value = "订单详情") - @TableField(exist = false) - private List orderInfoList; - - @ApiModelProperty(value = "套餐ID") - private Integer planId; - - @ApiModelProperty(value = "卡ID") - private Integer priceId; - - @ApiModelProperty(value = "获得的会员等级") - private Integer gradeId; - - @ApiModelProperty(value = "卡名称") - private String priceName; - - @ApiModelProperty(value = "持有者ID") - private Integer memberId; - - @ApiModelProperty(value = "真实姓名") - private String realName; - - - - @ApiModelProperty(value = "支付流水号") - private String transactionId; - - @ApiModelProperty(value = "支付方式（余额/微信/支付宝）") - private String payMethod; - - @ApiModelProperty(value = "到期时间") - private Date expirationTime; - - @ApiModelProperty(value = "所在省份") - private String province; - - @ApiModelProperty(value = "所在城市") - private String city; - - @ApiModelProperty(value = "所在辖区") - private String region; - - @ApiModelProperty(value = "所在地区") - private String area; - - @ApiModelProperty(value = "街道地址") - private String address; - - @ApiModelProperty(value = "退款凭证") - private String refundImage; - - @ApiModelProperty(value = "退款理由") - private String refundContent; - - @ApiModelProperty(value = "订单是否已结算(0未结算 1已结算)") - private Integer isSettled; - - @ApiModelProperty(value = "排序(数字越小越靠前)") - private Integer sortNumber; - - @ApiModelProperty(value = "状态, 0正常, 1冻结") - private Integer status; - - @ApiModelProperty(value = "租户名称") - @TableField(exist = false) - private String tenantName; - - @ApiModelProperty(value = "企业ID") - @TableField(exist = false) - private Integer companyId; - - @ApiModelProperty("手机号(脱敏)") - @TableField(exist = false) - private String mobile; - - public String getMobile() { - return DesensitizedUtil.mobilePhone(this.phone); - } - -} diff --git a/modules/common/system/entity/OrderInfo.java b/modules/common/system/entity/OrderInfo.java deleted file mode 100644 index 05d8f5e..0000000 --- a/modules/common/system/entity/OrderInfo.java +++ /dev/null @@ -1,102 +0,0 @@ -package com.gxwebsoft.common.system.entity; - -import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; -import java.io.Serializable; -import java.util.Date; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * - * - * @author 科技小王子 - * @since 2024-05-10 18:02:54 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "OrderInfo对象", description = "") -@TableName("sys_order_info") -public class OrderInfo implements Serializable { - private static final long serialVersionUID = 1L; - - @TableId(value = "id", type = IdType.AUTO) - private Integer id; - - @ApiModelProperty(value = "关联订单表id") - private Integer oid; - - @ApiModelProperty(value = "关联场馆id") - private Integer sid; - - @ApiModelProperty(value = "关联场地id") - private Integer fid; - - @ApiModelProperty(value = "场馆") - private String siteName; - - @ApiModelProperty(value = "场地") - private String fieldName; - - @ApiModelProperty(value = "预约时间段") - private String dateTime; - - @ApiModelProperty(value = "单价") - private BigDecimal price; - - @ApiModelProperty(value = "儿童价") - private BigDecimal childrenPrice; - - @ApiModelProperty(value = "成人人数") - private Integer adultNum; - - @ApiModelProperty(value = "儿童人数") - private Integer childrenNum; - - @ApiModelProperty(value = "1已付款，2未付款，3无需付款或占用状态") - private Integer payStatus; - - @ApiModelProperty(value = "是否免费：1免费、2收费") - private Integer isFree; - - @ApiModelProperty(value = "是否支持儿童票：1支持，2不支持") - private Integer isChildren; - - @ApiModelProperty(value = "预订类型：1全场，2半场") - private Integer type; - - @ApiModelProperty(value = "组合数据:日期+时间段+场馆id+场地id") - private String mergeData; - - @ApiModelProperty(value = "开场时间") - private Integer startTime; - - @ApiModelProperty(value = "下单时间") - private Long orderTime; - - @ApiModelProperty(value = "毫秒时间戳") - private Long timeFlag; - - @ApiModelProperty(value = "系统版本") - private Integer version; - - @ApiModelProperty(value = "是否删除, 0否, 1是") - @TableLogic - private Integer deleted; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - - @ApiModelProperty(value = "创建时间") - private Date createTime; - - @ApiModelProperty(value = "修改时间") - private Date updateTime; - -} diff --git a/modules/common/system/entity/Organization.java b/modules/common/system/entity/Organization.java deleted file mode 100644 index 7881795..0000000 --- a/modules/common/system/entity/Organization.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.gxwebsoft.common.system.entity; - -import com.baomidou.mybatisplus.annotation.*; - -import java.util.Date; -import java.io.Serializable; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * 组织机构 - * - * @author WebSoft - * @since 2020-03-14 11:29:04 - */ -@Data -@ApiModel(description = "组织机构") -@TableName("sys_organization") -public class Organization implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "机构id") - @TableId(type = IdType.AUTO) - private Integer organizationId; - - @ApiModelProperty(value = "上级id, 0是顶级") - private Integer parentId; - - @ApiModelProperty(value = "机构名称") - private String organizationName; - - @ApiModelProperty(value = "机构全称") - private String organizationFullName; - - @ApiModelProperty(value = "机构代码") - private String organizationCode; - - @ApiModelProperty(value = "机构类型, 字典标识") - private String organizationType; - - @ApiModelProperty(value = "负责人id") - private Integer leaderId; - - @ApiModelProperty(value = "排序号") - private Integer sortNumber; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "是否删除, 0否, 1是") - @TableLogic - private Integer deleted; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - - @ApiModelProperty(value = "创建时间") - private Date createTime; - - @ApiModelProperty(value = "修改时间") - private Date updateTime; - - @ApiModelProperty(value = "机构类型名称") - @TableField(exist = false) - private String organizationTypeName; - - @ApiModelProperty(value = "负责人姓名") - @TableField(exist = false) - private String leaderNickname; - - @ApiModelProperty(value = "负责人账号") - @TableField(exist = false) - private String leaderUsername; - -} diff --git a/modules/common/system/entity/Payment.java b/modules/common/system/entity/Payment.java deleted file mode 100644 index 478d78e..0000000 --- a/modules/common/system/entity/Payment.java +++ /dev/null @@ -1,91 +0,0 @@ -package com.gxwebsoft.common.system.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableLogic; -import java.io.Serializable; -import java.util.Date; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 支付方式 - * - * @author 科技小王子 - * @since 2024-05-11 12:39:11 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "Payment对象", description = "支付方式") -@TableName("sys_payment") -public class Payment implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "ID") - @TableId(value = "id", type = IdType.AUTO) - private Integer id; - - @ApiModelProperty(value = "支付方式") - private String name; - - @ApiModelProperty(value = "类型") - private Integer type; - - @ApiModelProperty(value = "标识") - private String code; - - @ApiModelProperty(value = "支付图标") - private String image; - - @ApiModelProperty(value = "微信商户号类型 1普通商户2子商户") - private Integer wechatType; - - @ApiModelProperty(value = "应用ID") - private String appId; - - @ApiModelProperty(value = "商户号") - private String mchId; - - @ApiModelProperty(value = "设置APIv3密钥") - private String apiKey; - - @ApiModelProperty(value = "证书文件 (CERT)") - private String apiclientCert; - - @ApiModelProperty(value = "证书文件 (KEY)") - private String apiclientKey; - - @ApiModelProperty(value = "商户证书序列号") - private String merchantSerialNumber; - - @ApiModelProperty(value = "支付结果通知") - private String notifyUrl; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "文章排序(数字越小越靠前)") - private Integer sortNumber; - - @ApiModelProperty(value = "状态, 0未启用, 1启用") - private Boolean status; - - @ApiModelProperty(value = "是否删除, 0否, 1是") - @TableLogic - private Integer deleted; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - - @ApiModelProperty(value = "注册时间") - private Date createTime; - - @ApiModelProperty(value = "修改时间") - private Date updateTime; - -} diff --git a/modules/common/system/entity/Plug.java b/modules/common/system/entity/Plug.java deleted file mode 100644 index 620f3fc..0000000 --- a/modules/common/system/entity/Plug.java +++ /dev/null @@ -1,83 +0,0 @@ -package com.gxwebsoft.common.system.entity; - -import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableLogic; -import java.io.Serializable; -import java.util.Date; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 插件扩展 - * - * @author 科技小王子 - * @since 2023-10-12 09:53:07 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "Plug对象", description = "插件扩展") -@TableName("sys_plug") -public class Plug implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "插件id") - @TableId(value = "plug_id", type = IdType.AUTO) - private Integer plugId; - - @ApiModelProperty(value = "菜单名称") - private String plugName; - - @ApiModelProperty(value = "插件ID") - private String plugCode; - - @ApiModelProperty(value = "插件类型 10后台模块") - private Integer plugType; - - @ApiModelProperty(value = "排序号") - private Integer sortNumber; - - @ApiModelProperty(value = "插件价格") - private BigDecimal price; - - @ApiModelProperty(value = "评分") - private BigDecimal score; - - @ApiModelProperty(value = "下载次数") - private Integer clicks; - - @ApiModelProperty(value = "安装次数") - private Integer installs; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "插件详情") - private String content; - - @ApiModelProperty(value = "状态, 10待审核 20已通过 30已驳回") - private Integer status; - - @ApiModelProperty(value = "用户ID") - private Integer userId; - - @ApiModelProperty(value = "是否删除, 0否, 1是") - @TableLogic - private Integer deleted; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - - @ApiModelProperty(value = "创建时间") - private Date createTime; - - @ApiModelProperty(value = "修改时间") - private Date updateTime; - -} diff --git a/modules/common/system/entity/RechargeOrder.java b/modules/common/system/entity/RechargeOrder.java deleted file mode 100644 index e9a704c..0000000 --- a/modules/common/system/entity/RechargeOrder.java +++ /dev/null @@ -1,131 +0,0 @@ -package com.gxwebsoft.common.system.entity; - -import cn.hutool.core.util.DesensitizedUtil; -import com.baomidou.mybatisplus.annotation.*; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -/** - * 会员充值订单表 - * - * @author 科技小王子 - * @since 2024-07-26 23:18:48 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "RechargeOrder对象", description = "会员充值订单表") -@TableName("sys_recharge_order") -public class RechargeOrder implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "订单ID") - @TableId(value = "order_id", type = IdType.AUTO) - private Integer orderId; - - @ApiModelProperty(value = "订单号") - private String orderNo; - - @ApiModelProperty(value = "用户ID") - private Integer userId; - - @ApiModelProperty(value = "充值方式(10自定义金额 20套餐充值)") - private Integer rechargeType; - - @ApiModelProperty(value = "机构id") - private Integer organizationId; - - @ApiModelProperty(value = "充值套餐ID") - private Integer planId; - - @ApiModelProperty(value = "用户支付金额") - private BigDecimal payPrice; - - @ApiModelProperty(value = "赠送金额") - private BigDecimal giftMoney; - - @ApiModelProperty(value = "实际到账金额") - private BigDecimal actualMoney; - - @ApiModelProperty(value = "用户可用余额") - private BigDecimal balance; - - @ApiModelProperty(value = "支付方式（微信/支付宝）") - private String payMethod; - - @ApiModelProperty(value = "支付状态(10待支付 20已支付)") - private Integer payStatus; - - @ApiModelProperty(value = "付款时间") - private Integer payTime; - - @ApiModelProperty(value = "第三方交易记录ID") - private Integer tradeId; - - @ApiModelProperty(value = "来源客户端 (APP、H5、小程序等)") - private String platform; - - @ApiModelProperty(value = "所属门店ID") - private Integer shopId; - - @ApiModelProperty(value = "操作员") - private String operator; - - @ApiModelProperty(value = "排序(数字越小越靠前)") - private Integer sortNumber; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "状态, 0正常, 1冻结") - private Integer status; - - @ApiModelProperty(value = "是否删除, 0否, 1是") - @TableLogic - private Integer deleted; - - @ApiModelProperty(value = "商户编码") - private String merchantCode; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - - @ApiModelProperty(value = "注册时间") - private Date createTime; - - @ApiModelProperty(value = "修改时间") - private Date updateTime; - - @ApiModelProperty(value = "昵称") - @TableField(exist = false) - private String nickname; - - @ApiModelProperty(value = "用户头像") - @TableField(exist = false) - private String avatar; - - @ApiModelProperty(value = "真实姓名") - @TableField(exist = false) - private String realName; - - @ApiModelProperty(value = "手机号码") - @TableField(exist = false) - private String phone; - - @ApiModelProperty(value = "手机号码(脱敏)") - @TableField(exist = false) - private String mobile; - - @ApiModelProperty(value = "部门名称") - @TableField(exist = false) - private String organizationName; - - public String getMobile(){ - return DesensitizedUtil.mobilePhone(this.phone); - } -} diff --git a/modules/common/system/entity/Role.java b/modules/common/system/entity/Role.java deleted file mode 100644 index 9eb3bfd..0000000 --- a/modules/common/system/entity/Role.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.gxwebsoft.common.system.entity; - -import com.baomidou.mybatisplus.annotation.*; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - -/** - * 角色 - * - * @author WebSoft - * @since 2018-12-24 16:10:01 - */ -@Data -@ApiModel(description = "角色") -@TableName("sys_role") -public class Role implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty("角色id") - @TableId(type = IdType.AUTO) - private Integer roleId; - - @ApiModelProperty("角色标识") - private String roleCode; - - @ApiModelProperty("角色名称") - private String roleName; - - @ApiModelProperty("备注") - private String comments; - - @ApiModelProperty(value = "排序号") - private Integer sortNumber; - - @ApiModelProperty("是否删除, 0否, 1是") - @TableLogic - private Integer deleted; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - - @ApiModelProperty("创建时间") - private Date createTime; - - @ApiModelProperty("修改时间") - private Date updateTime; - - @ApiModelProperty(hidden = true) - @TableField(exist = false) - private Integer userId; - -} diff --git a/modules/common/system/entity/RoleMenu.java b/modules/common/system/entity/RoleMenu.java deleted file mode 100644 index 2d4dc3c..0000000 --- a/modules/common/system/entity/RoleMenu.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.gxwebsoft.common.system.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - -/** - * 角色菜单 - * - * @author WebSoft - * @since 2018-12-24 16:10:54 - */ -@Data -@ApiModel(description = "角色权限") -@TableName("sys_role_menu") -public class RoleMenu implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty("主键id") - @TableId(type = IdType.AUTO) - private Integer id; - - @ApiModelProperty("角色id") - private Integer roleId; - - @ApiModelProperty("菜单id") - private Integer menuId; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - - @ApiModelProperty("创建时间") - private Date createTime; - - @ApiModelProperty("修改时间") - private Date updateTime; - -} diff --git a/modules/common/system/entity/Setting.java b/modules/common/system/entity/Setting.java deleted file mode 100644 index cba1b08..0000000 --- a/modules/common/system/entity/Setting.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.gxwebsoft.common.system.entity; - -import com.baomidou.mybatisplus.annotation.*; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.io.Serializable; -import java.util.Date; - -/** - * 系统设置 - * - * @author WebSoft - * @since 2022-11-19 13:54:27 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "Setting对象", description = "系统设置") -@TableName("sys_setting") -public class Setting implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "id") - @TableId(value = "setting_id", type = IdType.AUTO) - private Integer settingId; - - @ApiModelProperty(value = "设置项标示") - private String settingKey; - - @ApiModelProperty(value = "设置内容（json格式）") - private String content; - - @ApiModelProperty(value = "排序号") - private Integer sortNumber; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "是否删除, 0否, 1是") - @TableLogic - private Integer deleted; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - - @ApiModelProperty(value = "创建时间") - private Date createTime; - - @ApiModelProperty(value = "修改时间") - private Date updateTime; - - @ApiModelProperty(value = "修改租户名称") - @TableField(exist = false) - private String tenantName; - -} diff --git a/modules/common/system/entity/TemplateMessage.java b/modules/common/system/entity/TemplateMessage.java deleted file mode 100644 index 8360621..0000000 --- a/modules/common/system/entity/TemplateMessage.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.gxwebsoft.common.system.entity; - -import com.baomidou.mybatisplus.annotation.TableField; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - * 微信公众号模板消息对象 - * - * @author WebSoft - * @since 2018-12-24 16:10:54 - */ -@Data -@ApiModel(description = "微信公众号模板消息对象") -public class TemplateMessage implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty("接收者openid") - @TableField(exist = false) - private String toUser; - - @ApiModelProperty("模板ID") - @TableField(exist = false) - private String templateId; - - @ApiModelProperty("模板跳转链接（海外账号没有跳转能力）") - @TableField(exist = false) - private String url; - - @ApiModelProperty("跳小程序所需数据，不需跳小程序可不用传该数据") - @TableField(exist = false) - private String miniProgram; - - @ApiModelProperty("所需跳转到的小程序appid（该小程序appid必须与发模板消息的公众号是绑定关联关系，暂不支持小游戏）") - @TableField(exist = false) - private String appid; - - @ApiModelProperty("所需跳转到小程序的具体页面路径，支持带参数,（示例index?foo=bar），要求该小程序已发布，暂不支持小游戏") - @TableField(exist = false) - private String pagePath; - - @ApiModelProperty("模板数据") - @TableField(exist = false) - private Object data; - -} diff --git a/modules/common/system/entity/TemplateMessageDTO.java b/modules/common/system/entity/TemplateMessageDTO.java deleted file mode 100644 index 3ab5d1d..0000000 --- a/modules/common/system/entity/TemplateMessageDTO.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.gxwebsoft.common.system.entity; - -import com.baomidou.mybatisplus.annotation.TableField; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - * 微信公众号模板消息对象 - * - * @author WebSoft - * @since 2018-12-24 16:10:54 - */ -@Data -@ApiModel(description = "模板消息内容") -public class TemplateMessageDTO implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty("消息实参") - @TableField(exist = false) - private String value; - - @ApiModelProperty("消息颜色") - private String color; - - public TemplateMessageDTO(String value) { - this.value = value; - } - public TemplateMessageDTO(String value, String color) { - this.value = value; - this.color = color; - } -} diff --git a/modules/common/system/entity/Tenant.java b/modules/common/system/entity/Tenant.java deleted file mode 100644 index 6da817a..0000000 --- a/modules/common/system/entity/Tenant.java +++ /dev/null @@ -1,82 +0,0 @@ -package com.gxwebsoft.common.system.entity; - -import com.baomidou.mybatisplus.annotation.*; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.io.Serializable; -import java.util.Date; -import java.util.List; - -/** - * 租户 - * - * @author 科技小王子 - * @since 2023-07-17 17:49:53 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "Tenant对象", description = "租户") -@TableName("sys_tenant") -public class Tenant implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "租户id") - @TableId(value = "tenant_id", type = IdType.AUTO) - private Integer tenantId; - - @ApiModelProperty(value = "租户名称") - private String tenantName; - - @ApiModelProperty(value = "租户编号") - private String tenantCode; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "状态") - private Integer status; - - @ApiModelProperty(value = "排序号") - private Integer sortNumber; - - @ApiModelProperty(value = "用户ID") - private Integer userId; - - @ApiModelProperty(value = "是否删除, 0否, 1是") - @TableLogic - private Integer deleted; - - @ApiModelProperty(value = "创建时间") - private Date createTime; - - @ApiModelProperty(value = "修改时间") - private Date updateTime; - - @ApiModelProperty(value = "菜单信息") - @TableField(exist = false) - private List menu; - - @ApiModelProperty(value = "企业信息") - @TableField(exist = false) - private Company company; - - @ApiModelProperty(value = "企业名称") - @TableField(exist = false) - private String companyName; - - @ApiModelProperty(value = "logo") - @TableField(exist = false) - private String logo; - - @ApiModelProperty(value = "配置信息") - @TableField(exist = false) - private Object config; - - @ApiModelProperty(value = "服务器时间") - @TableField(exist = false) - private Object date; - -} diff --git a/modules/common/system/entity/User.java b/modules/common/system/entity/User.java deleted file mode 100644 index 43303ed..0000000 --- a/modules/common/system/entity/User.java +++ /dev/null @@ -1,320 +0,0 @@ -package com.gxwebsoft.common.system.entity; - -import cn.hutool.core.util.DesensitizedUtil; -import com.baomidou.mybatisplus.annotation.*; -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import org.springframework.security.core.userdetails.UserDetails; - -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - -/** - * 用户 - * - * @author WebSoft - * @since 2018-12-24 16:10:13 - */ -@Data -@ApiModel(description = "用户") -@TableName("sys_user") -public class User implements UserDetails { - private static final long serialVersionUID = 1L; - - @ApiModelProperty("用户id") - @TableId(type = IdType.AUTO) - private Integer userId; - - @ApiModelProperty("用户类型, 0普通用户") - private Integer type; - - @ApiModelProperty("用户编码") - private String userCode; - - @ApiModelProperty("账号") - private String username; - - @ApiModelProperty("密码") - private String password; - - @ApiModelProperty("昵称") - private String nickname; - - @ApiModelProperty("头像") - private String avatar; - - @ApiModelProperty("头像") - private String bgImage; - - @ApiModelProperty("性别, 字典标识") - private String sex; - - @ApiModelProperty("手机号") - private String phone; - - @ApiModelProperty("邮箱") - private String email; - - @ApiModelProperty("支付密码") - private String payPassword; - - @ApiModelProperty("职务") - private String position; - - @ApiModelProperty("邮箱是否验证, 0否, 1是") - private Integer emailVerified; - - @ApiModelProperty("别名") - private String alias; - - @ApiModelProperty("真实姓名") - private String realName; - - @ApiModelProperty("身份证号(脱敏)") - private String idCard; - - @ApiModelProperty("身份证号") - @TableField(exist = false) - private String idCardNo; - - @ApiModelProperty("出生日期") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date birthday; - - @ApiModelProperty(value = "年龄") - private Integer age; - - @ApiModelProperty("所在国家") - private String country; - - @ApiModelProperty(value = "所在省份") - private String province; - - @ApiModelProperty(value = "所在城市") - private String city; - - @ApiModelProperty(value = "所在辖区") - private String region; - - @ApiModelProperty("街道地址") - private String address; - - @ApiModelProperty(value = "经度") - private String longitude; - - @ApiModelProperty(value = "纬度") - private String latitude; - - @ApiModelProperty("用户可用余额") - private BigDecimal balance; - - @ApiModelProperty("用户可用积分") - private Integer points; - - @ApiModelProperty("用户总支付的金额") - private String payMoney; - - @ApiModelProperty("实际消费的金额(不含退款)") - private String expendMoney; - - @ApiModelProperty("会员等级ID") - private Integer gradeId; - - @ApiModelProperty("个人简介") - private String introduction; - - @ApiModelProperty("机构ID") - private Integer organizationId; - - @ApiModelProperty("会员分组ID") - private Integer groupId; - - @ApiModelProperty("会员分组") - @TableField(exist = false) - private String groupName; - - @ApiModelProperty("客户ID") - @TableField(exist = false) - private Integer customerId; - - @ApiModelProperty("企业ID") - @TableField(exist = false) - private Integer companyId; - - @ApiModelProperty("注册来源客户端") - private String platform; - - @ApiModelProperty("是否下线会员") - private Integer offline; - - @ApiModelProperty("关注数") - private Integer followers; - - @ApiModelProperty("粉丝数") - private Integer fans; - - @ApiModelProperty("获赞数") - private Integer likes; - - @ApiModelProperty("客户端ID") - private String clientId; - - @ApiModelProperty(value = "可管理的商户") - private String merchants; - - @ApiModelProperty(value = "商户ID") - private Integer merchantId; - - @ApiModelProperty(value = "商户名称") - private String merchantName; - - @ApiModelProperty(value = "是否管理员") - private Boolean isAdmin; - - @ApiModelProperty(value = "是否允许办卡") - private Boolean notAllowVip; - - @ApiModelProperty("评论数") - private Integer commentNumbers; - - @ApiModelProperty("是否推荐") - private Integer recommend; - - @ApiModelProperty("备注") - private String comments; - - @ApiModelProperty("状态, 0正常, 1冻结") - private Integer status; - - @ApiModelProperty("是否删除, 0否, 1是") - @TableLogic - private Integer deleted; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - - @ApiModelProperty(value = "租户名称") - @TableField(exist = false) - private String tenantName; - - @ApiModelProperty(value = "最后结算时间") - private Date settlementTime; - - @ApiModelProperty("注册时间") - private Date createTime; - - @ApiModelProperty("修改时间") - private Date updateTime; - - @ApiModelProperty("公司名称") - @TableField(exist = false) - private String companyName; - - @ApiModelProperty("是否已实名认证") - private Integer certification; - - @ApiModelProperty("机构名称") - @TableField(exist = false) - private String organizationName; - - @ApiModelProperty("性别名称") - @TableField(exist = false) - private String sexName; - - @ApiModelProperty("会员等级") - @TableField(exist = false) - private String gradeName; - - @ApiModelProperty("默认注册的角色ID") - @TableField(exist = false) - private Integer roleId; - - @ApiModelProperty("角色列表") - @TableField(exist = false) - private List roles; - - @ApiModelProperty("权限列表") - @TableField(exist = false) - private List authorities; - - @ApiModelProperty("微信凭证") - @TableField(exist = false) - private String code; - - @ApiModelProperty("推荐人ID") - @TableField(exist = false) - private Integer dealerId; - - @ApiModelProperty("微信openid") - private String openid; - - @ApiModelProperty("微信unionid") - private String unionid; - - @ApiModelProperty(value = "累计登录次数") - private Integer loginNum; - - @ApiModelProperty("ico文件") - @TableField(exist = false) - private String logo; - - @ApiModelProperty("创建的应用数量") - @TableField(exist = false) - private Double apps; - - @ApiModelProperty("租户设置信息") - @TableField(exist = false) - private String setting; - - @ApiModelProperty("手机号(脱敏)") - @TableField(exist = false) - private String mobile; - - @ApiModelProperty(value = "子系统用户ID") - @TableField(exist = false) - private Integer uid; - - @ApiModelProperty("当期登录的商户账号") - @TableField(exist = false) - private MerchantAccount merchantAccount; - -// @ApiModelProperty("企业信息") -// @TableField(exist = false) -// private Company companyInfo; - -// @ApiModelProperty("系统配置信息") -// @TableField(exist = false) -// private Object system; - - @Override - public boolean isAccountNonExpired() { - return true; - } - - @Override - public boolean isAccountNonLocked() { - return this.status != null && this.status == 0; - } - - @Override - public boolean isCredentialsNonExpired() { - return true; - } - - @Override - public boolean isEnabled() { - return true; - } - - public String getMobile(){ - return DesensitizedUtil.mobilePhone(this.phone); - } - - public String getIdCardNo(){ - return DesensitizedUtil.idCardNum(this.idCard,4,4); - } - -} diff --git a/modules/common/system/entity/UserBalanceLog.java b/modules/common/system/entity/UserBalanceLog.java deleted file mode 100644 index 81641fc..0000000 --- a/modules/common/system/entity/UserBalanceLog.java +++ /dev/null @@ -1,84 +0,0 @@ -package com.gxwebsoft.common.system.entity; - -import com.baomidou.mybatisplus.annotation.*; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -/** - * 用户余额变动明细表 - * - * @author 科技小王子 - * @since 2023-04-21 15:59:09 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "UserBalanceLog对象", description = "用户余额变动明细表") -@TableName("sys_user_balance_log") -public class UserBalanceLog implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键ID") - @TableId(value = "log_id", type = IdType.AUTO) - private Integer logId; - - @ApiModelProperty(value = "用户ID") - private Integer userId; - - @ApiModelProperty(value = "余额变动场景(10用户充值 20用户消费 30管理员操作 40订单退款)") - private Integer scene; - - @ApiModelProperty(value = "变动金额") - private BigDecimal money; - - @ApiModelProperty(value = "变动后余额") - private BigDecimal balance; - - @ApiModelProperty(value = "订单编号") - private String orderNo; - - @ApiModelProperty(value = "支付流水号") - private String transactionId; - - @ApiModelProperty(value = "管理员备注") - private String remark; - - @ApiModelProperty(value = "排序(数字越小越靠前)") - private Integer sortNumber; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "状态, 0正常, 1冻结") - private Integer status; - - @ApiModelProperty(value = "是否删除, 0否, 1是") - @TableLogic - private Integer deleted; - - @ApiModelProperty(value = "商户编码") - private String merchantCode; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - - @ApiModelProperty(value = "注册时间") - private Date createTime; - - @ApiModelProperty(value = "修改时间") - private Date updateTime; - - @ApiModelProperty(value = "昵称") - @TableField(exist = false) - private String nickname; - - @ApiModelProperty(value = "用户头像") - @TableField(exist = false) - private String avatar; - -} diff --git a/modules/common/system/entity/UserCollection.java b/modules/common/system/entity/UserCollection.java deleted file mode 100644 index ec2c581..0000000 --- a/modules/common/system/entity/UserCollection.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.gxwebsoft.common.system.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import java.io.Serializable; -import java.util.Date; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 我的收藏 - * - * @author 科技小王子 - * @since 2024-04-28 18:08:32 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "UserCollection对象", description = "我的收藏") -@TableName("sys_user_collection") -public class UserCollection implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键ID") - @TableId(value = "id", type = IdType.AUTO) - private Integer id; - - @ApiModelProperty(value = "租户ID") - private Integer tid; - - @ApiModelProperty(value = "用户ID") - private Integer userId; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - - @ApiModelProperty(value = "注册时间") - private Date createTime; - -} diff --git a/modules/common/system/entity/UserFile.java b/modules/common/system/entity/UserFile.java deleted file mode 100644 index b9d277f..0000000 --- a/modules/common/system/entity/UserFile.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.gxwebsoft.common.system.entity; - -import com.baomidou.mybatisplus.annotation.*; - -import java.io.Serializable; -import java.util.Date; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 用户文件 - * - * @author WebSoft - * @since 2022-07-21 14:34:40 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "UserFile对象", description = "用户文件") -@TableName("sys_user_file") -public class UserFile implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id") - @TableId(value = "id", type = IdType.AUTO) - private Integer id; - - @ApiModelProperty(value = "用户id") - private Integer userId; - - @ApiModelProperty(value = "文件名称") - private String name; - - @ApiModelProperty(value = "是否是文件夹, 0否, 1是") - private Integer isDirectory; - - @ApiModelProperty(value = "上级id") - private Integer parentId; - - @ApiModelProperty(value = "文件路径") - private String path; - - @ApiModelProperty(value = "文件大小") - private Integer length; - - @ApiModelProperty("文件类型") - private String contentType; - - @ApiModelProperty(value = "是否删除, 0否, 1是") - @TableLogic - private Integer deleted; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - - @ApiModelProperty(value = "创建时间") - private Date createTime; - - @ApiModelProperty(value = "修改时间") - private Date updateTime; - - @ApiModelProperty("文件访问地址") - @TableField(exist = false) - private String url; - - @ApiModelProperty("文件缩略图访问地址") - @TableField(exist = false) - private String thumbnail; - - @ApiModelProperty("文件下载地址") - @TableField(exist = false) - private String downloadUrl; - -} diff --git a/modules/common/system/entity/UserGrade.java b/modules/common/system/entity/UserGrade.java deleted file mode 100644 index 617b94b..0000000 --- a/modules/common/system/entity/UserGrade.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.gxwebsoft.common.system.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableLogic; -import java.io.Serializable; -import java.util.Date; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 用户会员等级表 - * - * @author 科技小王子 - * @since 2023-10-07 22:51:17 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "UserGrade对象", description = "用户会员等级表") -@TableName("sys_user_grade") -public class UserGrade implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "等级ID") - @TableId(value = "grade_id", type = IdType.AUTO) - private Integer gradeId; - - @ApiModelProperty(value = "等级名称") - private String name; - - @ApiModelProperty(value = "等级权重(1-9999)") - private Integer weight; - - @ApiModelProperty(value = "升级条件") - private String upgrade; - - @ApiModelProperty(value = "等级权益(折扣率0-100)") - private String equity; - - @ApiModelProperty(value = "佣金比率") - private String commission; - - @ApiModelProperty(value = "排序(数字越小越靠前)") - private Integer sortNumber; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "状态, 0正常, 1冻结") - private Integer status; - - @ApiModelProperty(value = "是否删除, 0否, 1是") - @TableLogic - private Integer deleted; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - - @ApiModelProperty(value = "注册时间") - private Date createTime; - - @ApiModelProperty(value = "修改时间") - private Date updateTime; - -} diff --git a/modules/common/system/entity/UserGroup.java b/modules/common/system/entity/UserGroup.java deleted file mode 100644 index eef6c1b..0000000 --- a/modules/common/system/entity/UserGroup.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.gxwebsoft.common.system.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableLogic; -import java.io.Serializable; -import java.util.Date; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 用户分组管理表 - * - * @author 科技小王子 - * @since 2023-10-28 15:16:39 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "UserGroup对象", description = "用户分组管理表") -@TableName("sys_user_group") -public class UserGroup implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "分组ID") - @TableId(value = "group_id", type = IdType.AUTO) - private Integer groupId; - - @ApiModelProperty(value = "分组名称") - private String name; - - @ApiModelProperty(value = "排序(数字越小越靠前)") - private Integer sortNumber; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "状态, 0正常, 1冻结") - private Integer status; - - @ApiModelProperty(value = "是否删除, 0否, 1是") - @TableLogic - private Integer deleted; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - - @ApiModelProperty(value = "注册时间") - private Date createTime; - - @ApiModelProperty(value = "修改时间") - private Date updateTime; - -} diff --git a/modules/common/system/entity/UserOauth.java b/modules/common/system/entity/UserOauth.java deleted file mode 100644 index 3e0b969..0000000 --- a/modules/common/system/entity/UserOauth.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.gxwebsoft.common.system.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableLogic; -import java.io.Serializable; -import java.util.Date; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 第三方用户信息表 - * - * @author 科技小王子 - * @since 2023-10-07 22:39:46 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "UserOauth对象", description = "第三方用户信息表") -@TableName("sys_user_oauth") -public class UserOauth implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键ID") - @TableId(value = "id", type = IdType.AUTO) - private Integer id; - - @ApiModelProperty(value = "用户ID") - private Integer userId; - - @ApiModelProperty(value = "第三方登陆类型(MP-WEIXIN)") - private String oauthType; - - @ApiModelProperty(value = "第三方用户唯一标识 (uid openid)") - private String oauthId; - - @ApiModelProperty(value = "微信unionID") - private String unionid; - - @ApiModelProperty(value = "排序(数字越小越靠前)") - private Integer sortNumber; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "状态, 0正常, 1冻结") - private Integer status; - - @ApiModelProperty(value = "是否删除, 0否, 1是") - private Integer deleted; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - - @ApiModelProperty(value = "注册时间") - private Date createTime; - - @ApiModelProperty(value = "修改时间") - private Date updateTime; - -} diff --git a/modules/common/system/entity/UserReferee.java b/modules/common/system/entity/UserReferee.java deleted file mode 100644 index 2921b0e..0000000 --- a/modules/common/system/entity/UserReferee.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.gxwebsoft.common.system.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableLogic; -import java.io.Serializable; -import java.util.Date; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 用户推荐关系表 - * - * @author 科技小王子 - * @since 2023-10-07 22:56:36 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "UserReferee对象", description = "用户推荐关系表") -@TableName("sys_user_referee") -public class UserReferee implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键ID") - @TableId(value = "id", type = IdType.AUTO) - private Integer id; - - @ApiModelProperty(value = "推荐人ID") - private Integer dealerId; - - @ApiModelProperty(value = "用户id(被推荐人)") - private Integer userId; - - @ApiModelProperty(value = "推荐关系层级(1,2,3)") - private Integer level; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "是否删除, 0否, 1是") - @TableLogic - private Integer deleted; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - - @ApiModelProperty(value = "创建时间") - private Date createTime; - - @ApiModelProperty(value = "修改时间") - private Date updateTime; - -} diff --git a/modules/common/system/entity/UserRole.java b/modules/common/system/entity/UserRole.java deleted file mode 100644 index ca12165..0000000 --- a/modules/common/system/entity/UserRole.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.gxwebsoft.common.system.entity; - -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.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - -/** - * 用户角色 - * - * @author WebSoft - * @since 2018-12-24 16:10:23 - */ -@Data -@ApiModel(description = "用户角色") -@TableName("sys_user_role") -public class UserRole implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty("主键id") - @TableId(type = IdType.AUTO) - private Integer id; - - @ApiModelProperty("用户id") - private Integer userId; - - @ApiModelProperty("角色id") - private Integer roleId; - - @ApiModelProperty("创建时间") - private Date createTime; - - @ApiModelProperty("修改时间") - private Date updateTime; - - @ApiModelProperty("角色名称") - @TableField(exist = false) - private String roleName; - - @ApiModelProperty("租户ID") - private Integer tenantId; - -} diff --git a/modules/common/system/entity/Version.java b/modules/common/system/entity/Version.java deleted file mode 100644 index 0e9bf86..0000000 --- a/modules/common/system/entity/Version.java +++ /dev/null @@ -1,81 +0,0 @@ -package com.gxwebsoft.common.system.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableLogic; -import java.io.Serializable; -import java.util.Date; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 版本更新 - * - * @author 科技小王子 - * @since 2024-01-15 18:52:24 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "Version对象", description = "版本更新") -@TableName("sys_version") -public class Version implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "ID") - @TableId(value = "id", type = IdType.AUTO) - private Integer id; - - @ApiModelProperty(value = "版本名") - private String versionName; - - @ApiModelProperty(value = "版本号") - private String versionCode; - - @ApiModelProperty(value = "下载链接") - private String vueDownloadUrl; - - @ApiModelProperty(value = "下载链接") - private String androidDownloadUrl; - - @ApiModelProperty(value = "下载链接") - private String iosDownloadUrl; - - @ApiModelProperty(value = "更新日志") - private String updateInfo; - - @ApiModelProperty(value = "强制更新") - private Integer isHard; - - @ApiModelProperty(value = "热更") - private Integer isHot; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "文章排序(数字越小越靠前)") - private Integer sortNumber; - - private Integer userId; - - @ApiModelProperty(value = "状态, 0正常, 1冻结") - private Integer status; - - @ApiModelProperty(value = "是否删除, 0否, 1是") - @TableLogic - private Integer deleted; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - - @ApiModelProperty(value = "注册时间") - private Date createTime; - - @ApiModelProperty(value = "修改时间") - private Date updateTime; - -} diff --git a/modules/common/system/entity/WhiteDomain.java b/modules/common/system/entity/WhiteDomain.java deleted file mode 100644 index 27f17f3..0000000 --- a/modules/common/system/entity/WhiteDomain.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.gxwebsoft.common.system.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableLogic; -import java.io.Serializable; -import java.util.Date; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 服务器白名单 - * - * @author 科技小王子 - * @since 2024-03-26 00:22:21 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "WhiteDomain对象", description = "服务器白名单") -@TableName("sys_white_domain") -public class WhiteDomain implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "ID") - @TableId(value = "id", type = IdType.AUTO) - private Integer id; - - @ApiModelProperty(value = "域名") - private String domain; - - @ApiModelProperty(value = "状态") - private Integer status; - - @ApiModelProperty(value = "排序号") - private Integer sortNumber; - - @ApiModelProperty(value = "用户ID") - private Integer userId; - - @ApiModelProperty(value = "是否删除, 0否, 1是") - @TableLogic - private Integer deleted; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - - @ApiModelProperty(value = "创建时间") - private Date createTime; - - @ApiModelProperty(value = "修改时间") - private Date updateTime; - -} diff --git a/modules/common/system/mapper/AccessKeyMapper.java b/modules/common/system/mapper/AccessKeyMapper.java deleted file mode 100644 index 658f773..0000000 --- a/modules/common/system/mapper/AccessKeyMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gxwebsoft.common.system.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.common.system.entity.AccessKey; -import com.gxwebsoft.common.system.param.AccessKeyParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 访问凭证管理Mapper - * - * @author 科技小王子 - * @since 2023-05-16 19:19:55 - */ -public interface AccessKeyMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") AccessKeyParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") AccessKeyParam param); - -} diff --git a/modules/common/system/mapper/AppMapper.java b/modules/common/system/mapper/AppMapper.java deleted file mode 100644 index 8c01c25..0000000 --- a/modules/common/system/mapper/AppMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gxwebsoft.common.system.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.common.system.entity.App; -import com.gxwebsoft.common.system.param.AppParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 应用管理记录表Mapper - * - * @author 科技小王子 - * @since 2023-10-30 22:20:23 - */ -public interface AppMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") AppParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") AppParam param); - -} diff --git a/modules/common/system/mapper/AppRenewMapper.java b/modules/common/system/mapper/AppRenewMapper.java deleted file mode 100644 index 633ab83..0000000 --- a/modules/common/system/mapper/AppRenewMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gxwebsoft.common.system.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.common.system.entity.AppRenew; -import com.gxwebsoft.common.system.param.AppRenewParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 续费管理Mapper - * - * @author 科技小王子 - * @since 2023-11-14 14:14:07 - */ -public interface AppRenewMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") AppRenewParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") AppRenewParam param); - -} diff --git a/modules/common/system/mapper/AppUrlMapper.java b/modules/common/system/mapper/AppUrlMapper.java deleted file mode 100644 index af3fedb..0000000 --- a/modules/common/system/mapper/AppUrlMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gxwebsoft.common.system.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.common.system.entity.AppUrl; -import com.gxwebsoft.common.system.param.AppUrlParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 域名管理记录表Mapper - * - * @author 科技小王子 - * @since 2023-10-30 22:20:23 - */ -public interface AppUrlMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") AppUrlParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") AppUrlParam param); - -} diff --git a/modules/common/system/mapper/AppUserMapper.java b/modules/common/system/mapper/AppUserMapper.java deleted file mode 100644 index e0b1967..0000000 --- a/modules/common/system/mapper/AppUserMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gxwebsoft.common.system.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.common.system.entity.AppUser; -import com.gxwebsoft.common.system.param.AppUserParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 应用成员Mapper - * - * @author 科技小王子 - * @since 2023-10-30 22:20:23 - */ -public interface AppUserMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") AppUserParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") AppUserParam param); - -} diff --git a/modules/common/system/mapper/ChatConversationMapper.java b/modules/common/system/mapper/ChatConversationMapper.java deleted file mode 100644 index bd34512..0000000 --- a/modules/common/system/mapper/ChatConversationMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gxwebsoft.common.system.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.common.system.entity.ChatConversation; -import com.gxwebsoft.common.system.param.ChatConversationParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 聊天消息表Mapper - * - * @author 科技小王子 - * @since 2024-04-27 15:57:27 - */ -public interface ChatConversationMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") ChatConversationParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") ChatConversationParam param); - -} diff --git a/modules/common/system/mapper/ChatMessageMapper.java b/modules/common/system/mapper/ChatMessageMapper.java deleted file mode 100644 index 6fe933b..0000000 --- a/modules/common/system/mapper/ChatMessageMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gxwebsoft.common.system.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.common.system.entity.ChatMessage; -import com.gxwebsoft.common.system.param.ChatMessageParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 聊天消息表Mapper - * - * @author 科技小王子 - * @since 2024-04-27 15:57:27 - */ -public interface ChatMessageMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") ChatMessageParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") ChatMessageParam param); - -} diff --git a/modules/common/system/mapper/CompanyMapper.java b/modules/common/system/mapper/CompanyMapper.java deleted file mode 100644 index 3e8cfab..0000000 --- a/modules/common/system/mapper/CompanyMapper.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.gxwebsoft.common.system.mapper; - -import com.baomidou.mybatisplus.annotation.InterceptorIgnore; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.common.core.web.ExistenceParam; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.system.entity.Company; -import com.gxwebsoft.common.system.entity.User; -import com.gxwebsoft.common.system.param.CompanyParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 企业信息Mapper - * - * @author 科技小王子 - * @since 2023-05-27 14:57:34 - */ -public interface CompanyMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") CompanyParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") CompanyParam param); - - @InterceptorIgnore(tenantLine = "true") - List getCount(@Param("param") CompanyParam param); - - @InterceptorIgnore(tenantLine = "true") - List selectPageRelAll(PageParam page, CompanyParam param); - - @InterceptorIgnore(tenantLine = "true") - Company getCompanyAll(@Param("companyId") Integer companyId); - - @InterceptorIgnore(tenantLine = "true") - void updateByCompanyId(@Param("param") Company company); - - @InterceptorIgnore(tenantLine = "true") - boolean removeCompanyAll(Integer id); - - @InterceptorIgnore(tenantLine = "true") - boolean undeleteAll(Integer id); - - @InterceptorIgnore(tenantLine = "true") - boolean updateByIdAll(Company company); -} diff --git a/modules/common/system/mapper/DictDataMapper.java b/modules/common/system/mapper/DictDataMapper.java deleted file mode 100644 index f36039f..0000000 --- a/modules/common/system/mapper/DictDataMapper.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.gxwebsoft.common.system.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.common.system.entity.DictData; -import com.gxwebsoft.common.system.param.DictDataParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 字典数据Mapper - * - * @author WebSoft - * @since 2020-03-14 11:29:04 - */ -public interface DictDataMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") DictDataParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") DictDataParam param); - - /** - * 根据dictCode和dictDataName查询 - * - * @param dictCode 字典标识 - * @param dictDataName 字典项名称 - * @return List - */ - List getByDictCodeAndName(@Param("dictCode") String dictCode, - @Param("dictDataName") String dictDataName); - -} diff --git a/modules/common/system/mapper/DictMapper.java b/modules/common/system/mapper/DictMapper.java deleted file mode 100644 index ce19779..0000000 --- a/modules/common/system/mapper/DictMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.gxwebsoft.common.system.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.gxwebsoft.common.system.entity.Dict; - -/** - * 字典Mapper - * - * @author WebSoft - * @since 2020-03-14 11:29:03 - */ -public interface DictMapper extends BaseMapper { - -} diff --git a/modules/common/system/mapper/DictionaryDataMapper.java b/modules/common/system/mapper/DictionaryDataMapper.java deleted file mode 100644 index 519c2ba..0000000 --- a/modules/common/system/mapper/DictionaryDataMapper.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.gxwebsoft.common.system.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.common.system.entity.DictionaryData; -import com.gxwebsoft.common.system.param.DictionaryDataParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 字典数据Mapper - * - * @author WebSoft - * @since 2020-03-14 11:29:04 - */ -public interface DictionaryDataMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") DictionaryDataParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") DictionaryDataParam param); - - /** - * 根据dictCode和dictDataName查询 - * - * @param dictCode 字典标识 - * @param dictDataName 字典项名称 - * @return List - */ - List getByDictCodeAndName(@Param("dictCode") String dictCode, - @Param("dictDataName") String dictDataName); - -} diff --git a/modules/common/system/mapper/DictionaryMapper.java b/modules/common/system/mapper/DictionaryMapper.java deleted file mode 100644 index 7c2cbac..0000000 --- a/modules/common/system/mapper/DictionaryMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.gxwebsoft.common.system.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.gxwebsoft.common.system.entity.Dictionary; - -/** - * 字典Mapper - * - * @author WebSoft - * @since 2020-03-14 11:29:03 - */ -public interface DictionaryMapper extends BaseMapper { - -} diff --git a/modules/common/system/mapper/EmailRecordMapper.java b/modules/common/system/mapper/EmailRecordMapper.java deleted file mode 100644 index 02611c9..0000000 --- a/modules/common/system/mapper/EmailRecordMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.gxwebsoft.common.system.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.gxwebsoft.common.system.entity.EmailRecord; - -/** - * 邮件记录Mapper - * - * @author WebSoft - * @since 2020-03-14 11:29:04 - */ -public interface EmailRecordMapper extends BaseMapper { - -} diff --git a/modules/common/system/mapper/EnvironmentMapper.java b/modules/common/system/mapper/EnvironmentMapper.java deleted file mode 100644 index b3ea0d3..0000000 --- a/modules/common/system/mapper/EnvironmentMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gxwebsoft.common.system.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.common.system.entity.Environment; -import com.gxwebsoft.common.system.param.EnvironmentParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 环境管理Mapper - * - * @author 科技小王子 - * @since 2023-10-18 08:45:13 - */ -public interface EnvironmentMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") EnvironmentParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") EnvironmentParam param); - -} diff --git a/modules/common/system/mapper/FileRecordMapper.java b/modules/common/system/mapper/FileRecordMapper.java deleted file mode 100644 index fe9f0b8..0000000 --- a/modules/common/system/mapper/FileRecordMapper.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.gxwebsoft.common.system.mapper; - -import com.baomidou.mybatisplus.annotation.InterceptorIgnore; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.common.system.entity.FileRecord; -import com.gxwebsoft.common.system.param.FileRecordParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 文件上传记录Mapper - * - * @author WebSoft - * @since 2021-08-30 11:18:04 - */ -public interface FileRecordMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") FileRecordParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") FileRecordParam param); - - /** - * 根据path查询 - * - * @param path 文件路径 - * @return FileRecord - */ - @InterceptorIgnore(tenantLine = "true") - List getByIdPath(@Param("path") String path); - -} diff --git a/modules/common/system/mapper/LoginRecordMapper.java b/modules/common/system/mapper/LoginRecordMapper.java deleted file mode 100644 index 4409fdd..0000000 --- a/modules/common/system/mapper/LoginRecordMapper.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.gxwebsoft.common.system.mapper; - -import com.baomidou.mybatisplus.annotation.InterceptorIgnore; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.common.system.entity.LoginRecord; -import com.gxwebsoft.common.system.param.LoginRecordParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 登录日志Mapper - * - * @author WebSoft - * @since 2018-12-24 16:10:11 - */ -public interface LoginRecordMapper extends BaseMapper { - - /** - * 添加, 排除租户拦截 - * - * @param entity LoginRecord - * @return int - */ - @Override - @InterceptorIgnore(tenantLine = "true") - int insert(LoginRecord entity); - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") LoginRecordParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") LoginRecordParam param); - -} diff --git a/modules/common/system/mapper/MenuMapper.java b/modules/common/system/mapper/MenuMapper.java deleted file mode 100644 index 938ef17..0000000 --- a/modules/common/system/mapper/MenuMapper.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.gxwebsoft.common.system.mapper; - -import com.baomidou.mybatisplus.annotation.InterceptorIgnore; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.gxwebsoft.common.system.entity.Menu; -import com.gxwebsoft.common.system.param.MenuParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 菜单Mapper - * - * @author WebSoft - * @since 2018-12-24 16:10:32 - */ -public interface MenuMapper extends BaseMapper { - @InterceptorIgnore(tenantLine = "true") - List getMenuByClone(@Param("param") MenuParam param); - -} diff --git a/modules/common/system/mapper/MerchantAccountMapper.java b/modules/common/system/mapper/MerchantAccountMapper.java deleted file mode 100644 index 5e58680..0000000 --- a/modules/common/system/mapper/MerchantAccountMapper.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.gxwebsoft.common.system.mapper; - -import com.baomidou.mybatisplus.annotation.InterceptorIgnore; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.common.system.entity.MerchantAccount; -import com.gxwebsoft.common.system.param.MerchantAccountParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 商户账号Mapper - * - * @author 科技小王子 - * @since 2024-04-19 12:02:24 - */ -public interface MerchantAccountMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") MerchantAccountParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") MerchantAccountParam param); - - @InterceptorIgnore(tenantLine = "true") - MerchantAccount getMerchantAccountByPhone(@Param("param") MerchantAccountParam param); - -} diff --git a/modules/common/system/mapper/MerchantApplyMapper.java b/modules/common/system/mapper/MerchantApplyMapper.java deleted file mode 100644 index 3e19247..0000000 --- a/modules/common/system/mapper/MerchantApplyMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gxwebsoft.common.system.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.common.system.entity.MerchantApply; -import com.gxwebsoft.common.system.param.MerchantApplyParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 商户入驻申请Mapper - * - * @author 科技小王子 - * @since 2024-04-05 01:24:36 - */ -public interface MerchantApplyMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") MerchantApplyParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") MerchantApplyParam param); - -} diff --git a/modules/common/system/mapper/MerchantMapper.java b/modules/common/system/mapper/MerchantMapper.java deleted file mode 100644 index 9e92d10..0000000 --- a/modules/common/system/mapper/MerchantMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gxwebsoft.common.system.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.common.system.entity.Merchant; -import com.gxwebsoft.common.system.param.MerchantParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 商户Mapper - * - * @author 科技小王子 - * @since 2024-04-05 00:03:54 - */ -public interface MerchantMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") MerchantParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") MerchantParam param); - -} diff --git a/modules/common/system/mapper/MerchantTypeMapper.java b/modules/common/system/mapper/MerchantTypeMapper.java deleted file mode 100644 index 2ec5ceb..0000000 --- a/modules/common/system/mapper/MerchantTypeMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gxwebsoft.common.system.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.common.system.entity.MerchantType; -import com.gxwebsoft.common.system.param.MerchantTypeParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 商户类型Mapper - * - * @author 科技小王子 - * @since 2024-04-05 00:08:51 - */ -public interface MerchantTypeMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") MerchantTypeParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") MerchantTypeParam param); - -} diff --git a/modules/common/system/mapper/ModulesMapper.java b/modules/common/system/mapper/ModulesMapper.java deleted file mode 100644 index f4dc531..0000000 --- a/modules/common/system/mapper/ModulesMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gxwebsoft.common.system.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.common.system.entity.Modules; -import com.gxwebsoft.common.system.param.ModulesParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 模块管理Mapper - * - * @author 科技小王子 - * @since 2023-10-18 15:53:43 - */ -public interface ModulesMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") ModulesParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") ModulesParam param); - -} diff --git a/modules/common/system/mapper/NoticeMapper.java b/modules/common/system/mapper/NoticeMapper.java deleted file mode 100644 index 50c9f50..0000000 --- a/modules/common/system/mapper/NoticeMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gxwebsoft.common.system.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.common.system.entity.Notice; -import com.gxwebsoft.common.system.param.NoticeParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 消息记录表Mapper - * - * @author 科技小王子 - * @since 2023-10-08 13:22:21 - */ -public interface NoticeMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") NoticeParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") NoticeParam param); - -} diff --git a/modules/common/system/mapper/OperationRecordMapper.java b/modules/common/system/mapper/OperationRecordMapper.java deleted file mode 100644 index 8750c2a..0000000 --- a/modules/common/system/mapper/OperationRecordMapper.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.gxwebsoft.common.system.mapper; - -import com.baomidou.mybatisplus.annotation.InterceptorIgnore; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.common.system.entity.OperationRecord; -import com.gxwebsoft.common.system.param.OperationRecordParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 操作日志Mapper - * - * @author WebSoft - * @since 2018-12-24 16:10:03 - */ -public interface OperationRecordMapper extends BaseMapper { - - /** - * 添加, 排除租户拦截 - * - * @param entity OperationRecord - * @return int - */ - @Override - @InterceptorIgnore(tenantLine = "true") - int insert(OperationRecord entity); - - /** - * 分页查询 - * - * @param page 分页参数 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") OperationRecordParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") OperationRecordParam param); - -} diff --git a/modules/common/system/mapper/OrderInfoMapper.java b/modules/common/system/mapper/OrderInfoMapper.java deleted file mode 100644 index a5ecc43..0000000 --- a/modules/common/system/mapper/OrderInfoMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gxwebsoft.common.system.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.common.system.entity.OrderInfo; -import com.gxwebsoft.common.system.param.OrderInfoParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * Mapper - * - * @author 科技小王子 - * @since 2024-05-10 18:02:54 - */ -public interface OrderInfoMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") OrderInfoParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") OrderInfoParam param); - -} diff --git a/modules/common/system/mapper/OrderMapper.java b/modules/common/system/mapper/OrderMapper.java deleted file mode 100644 index 646f84a..0000000 --- a/modules/common/system/mapper/OrderMapper.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.gxwebsoft.common.system.mapper; - -import com.baomidou.mybatisplus.annotation.InterceptorIgnore; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.common.system.entity.Order; -import com.gxwebsoft.common.system.param.OrderParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 订单Mapper - * - * @author 科技小王子 - * @since 2024-04-24 13:46:21 - */ -public interface OrderMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") OrderParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") OrderParam param); - - @InterceptorIgnore(tenantLine = "true") - List getByOutTradeNo(OrderParam param); - - @InterceptorIgnore(tenantLine = "true") - void updateByOutTradeNo(@Param("param") Order outTradeNo); - -} diff --git a/modules/common/system/mapper/OrganizationMapper.java b/modules/common/system/mapper/OrganizationMapper.java deleted file mode 100644 index 6f06689..0000000 --- a/modules/common/system/mapper/OrganizationMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gxwebsoft.common.system.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.common.system.entity.Organization; -import com.gxwebsoft.common.system.param.OrganizationParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 组织机构Mapper - * - * @author WebSoft - * @since 2020-03-14 11:29:04 - */ -public interface OrganizationMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") OrganizationParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") OrganizationParam param); - -} diff --git a/modules/common/system/mapper/PaymentMapper.java b/modules/common/system/mapper/PaymentMapper.java deleted file mode 100644 index 53213e9..0000000 --- a/modules/common/system/mapper/PaymentMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gxwebsoft.common.system.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.common.system.entity.Payment; -import com.gxwebsoft.common.system.param.PaymentParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 支付方式Mapper - * - * @author 科技小王子 - * @since 2024-05-11 12:39:11 - */ -public interface PaymentMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") PaymentParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") PaymentParam param); - -} diff --git a/modules/common/system/mapper/PlugMapper.java b/modules/common/system/mapper/PlugMapper.java deleted file mode 100644 index effb815..0000000 --- a/modules/common/system/mapper/PlugMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gxwebsoft.common.system.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.common.system.entity.Plug; -import com.gxwebsoft.common.system.param.PlugParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 插件扩展Mapper - * - * @author 科技小王子 - * @since 2023-10-12 09:53:07 - */ -public interface PlugMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") PlugParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") PlugParam param); - -} diff --git a/modules/common/system/mapper/RechargeOrderMapper.java b/modules/common/system/mapper/RechargeOrderMapper.java deleted file mode 100644 index eab2641..0000000 --- a/modules/common/system/mapper/RechargeOrderMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gxwebsoft.common.system.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.common.system.entity.RechargeOrder; -import com.gxwebsoft.common.system.param.RechargeOrderParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 会员充值订单表Mapper - * - * @author 科技小王子 - * @since 2024-07-26 23:18:48 - */ -public interface RechargeOrderMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") RechargeOrderParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") RechargeOrderParam param); - -} diff --git a/modules/common/system/mapper/RoleMapper.java b/modules/common/system/mapper/RoleMapper.java deleted file mode 100644 index ddfab6a..0000000 --- a/modules/common/system/mapper/RoleMapper.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.gxwebsoft.common.system.mapper; - -import com.baomidou.mybatisplus.annotation.InterceptorIgnore; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.gxwebsoft.common.system.entity.Role; -import com.gxwebsoft.common.system.param.RoleParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 角色Mapper - * - * @author WebSoft - * @since 2018-12-24 16:10:44 - */ -public interface RoleMapper extends BaseMapper { - - @InterceptorIgnore(tenantLine = "true") - List selectListAll(@Param("param") RoleParam param); - -} diff --git a/modules/common/system/mapper/RoleMenuMapper.java b/modules/common/system/mapper/RoleMenuMapper.java deleted file mode 100644 index a225765..0000000 --- a/modules/common/system/mapper/RoleMenuMapper.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.gxwebsoft.common.system.mapper; - -import com.baomidou.mybatisplus.annotation.InterceptorIgnore; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.gxwebsoft.common.system.entity.Menu; -import com.gxwebsoft.common.system.entity.RoleMenu; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 角色菜单Mapper - * - * @author WebSoft - * @since 2018-12-24 16:10:21 - */ -public interface RoleMenuMapper extends BaseMapper { - - /** - * 查询用户的菜单 - * - * @param userId 用户id - * @param menuType 菜单类型 - * @return List - */ - @InterceptorIgnore(tenantLine = "true") - List listMenuByUserId(@Param("userId") Integer userId, @Param("menuType") Integer menuType); - - /** - * 根据角色id查询菜单 - * - * @param roleIds 角色id - * @param menuType 菜单类型 - * @return List - */ - @InterceptorIgnore(tenantLine = "true") - List listMenuByRoleIds(@Param("roleIds") List roleIds, @Param("menuType") Integer menuType); - -} diff --git a/modules/common/system/mapper/SettingMapper.java b/modules/common/system/mapper/SettingMapper.java deleted file mode 100644 index ffc7f55..0000000 --- a/modules/common/system/mapper/SettingMapper.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.gxwebsoft.common.system.mapper; - -import com.baomidou.mybatisplus.annotation.InterceptorIgnore; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.common.system.entity.Setting; -import com.gxwebsoft.common.system.param.SettingParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 系统设置Mapper - * - * @author WebSoft - * @since 2022-11-19 13:54:27 - */ -public interface SettingMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") SettingParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") SettingParam param); - - @InterceptorIgnore(tenantLine = "true") - Setting getBySettingKeyIgnore(@Param("param") SettingParam param); -} diff --git a/modules/common/system/mapper/TenantMapper.java b/modules/common/system/mapper/TenantMapper.java deleted file mode 100644 index 0190424..0000000 --- a/modules/common/system/mapper/TenantMapper.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.common.system.mapper; - -import com.baomidou.mybatisplus.annotation.InterceptorIgnore; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.common.system.entity.Tenant; -import com.gxwebsoft.common.system.param.TenantParam; -import org.apache.ibatis.annotations.Param; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; - -/** - * 租户Mapper - * - * @author 科技小王子 - * @since 2023-07-17 17:49:53 - */ -public interface TenantMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") TenantParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") TenantParam param); - - @InterceptorIgnore(tenantLine = "true") - boolean destructionAll(Integer id); - -} diff --git a/modules/common/system/mapper/UserBalanceLogMapper.java b/modules/common/system/mapper/UserBalanceLogMapper.java deleted file mode 100644 index f986c44..0000000 --- a/modules/common/system/mapper/UserBalanceLogMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gxwebsoft.common.system.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.common.system.entity.UserBalanceLog; -import com.gxwebsoft.common.system.param.UserBalanceLogParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 用户余额变动明细表Mapper - * - * @author 科技小王子 - * @since 2023-04-21 15:59:09 - */ -public interface UserBalanceLogMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") UserBalanceLogParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") UserBalanceLogParam param); - -} diff --git a/modules/common/system/mapper/UserCollectionMapper.java b/modules/common/system/mapper/UserCollectionMapper.java deleted file mode 100644 index b7330da..0000000 --- a/modules/common/system/mapper/UserCollectionMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gxwebsoft.common.system.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.common.system.entity.UserCollection; -import com.gxwebsoft.common.system.param.UserCollectionParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 我的收藏Mapper - * - * @author 科技小王子 - * @since 2024-04-28 18:08:32 - */ -public interface UserCollectionMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") UserCollectionParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") UserCollectionParam param); - -} diff --git a/modules/common/system/mapper/UserFileMapper.java b/modules/common/system/mapper/UserFileMapper.java deleted file mode 100644 index d9e4bb4..0000000 --- a/modules/common/system/mapper/UserFileMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.gxwebsoft.common.system.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.gxwebsoft.common.system.entity.UserFile; - -/** - * 用户文件Mapper - * - * @author WebSoft - * @since 2022-07-21 14:34:40 - */ -public interface UserFileMapper extends BaseMapper { - -} diff --git a/modules/common/system/mapper/UserGradeMapper.java b/modules/common/system/mapper/UserGradeMapper.java deleted file mode 100644 index f966ee3..0000000 --- a/modules/common/system/mapper/UserGradeMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gxwebsoft.common.system.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.common.system.entity.UserGrade; -import com.gxwebsoft.common.system.param.UserGradeParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 用户会员等级表Mapper - * - * @author 科技小王子 - * @since 2023-10-07 22:51:17 - */ -public interface UserGradeMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") UserGradeParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") UserGradeParam param); - -} diff --git a/modules/common/system/mapper/UserGroupMapper.java b/modules/common/system/mapper/UserGroupMapper.java deleted file mode 100644 index 8e38749..0000000 --- a/modules/common/system/mapper/UserGroupMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gxwebsoft.common.system.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.common.system.entity.UserGroup; -import com.gxwebsoft.common.system.param.UserGroupParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 用户分组管理表Mapper - * - * @author 科技小王子 - * @since 2023-10-28 15:16:39 - */ -public interface UserGroupMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") UserGroupParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") UserGroupParam param); - -} diff --git a/modules/common/system/mapper/UserMapper.java b/modules/common/system/mapper/UserMapper.java deleted file mode 100644 index 3769098..0000000 --- a/modules/common/system/mapper/UserMapper.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.gxwebsoft.common.system.mapper; - -import com.baomidou.mybatisplus.annotation.InterceptorIgnore; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.common.system.entity.User; -import com.gxwebsoft.common.system.param.UserParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 用户Mapper - * - * @author WebSoft - * @since 2018-12-24 16:10:14 - */ -public interface UserMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") UserParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") UserParam param); - - /** - * 根据账号查询 - * - * @param username 账号 - * @param tenantId 租户id - * @return User - */ - @InterceptorIgnore(tenantLine = "true") - User selectByUsername(@Param("username") String username, @Param("tenantId") Integer tenantId); - - @InterceptorIgnore(tenantLine = "true") - List getOne(@Param("param") UserParam param); - - List selectListStatisticsRel(@Param("param") UserParam param); - - @InterceptorIgnore(tenantLine = "true") - void updateByUserId(@Param("param") User param); -} diff --git a/modules/common/system/mapper/UserOauthMapper.java b/modules/common/system/mapper/UserOauthMapper.java deleted file mode 100644 index 1d3e164..0000000 --- a/modules/common/system/mapper/UserOauthMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gxwebsoft.common.system.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.common.system.entity.UserOauth; -import com.gxwebsoft.common.system.param.UserOauthParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 第三方用户信息表Mapper - * - * @author 科技小王子 - * @since 2023-10-07 22:39:46 - */ -public interface UserOauthMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") UserOauthParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") UserOauthParam param); - -} diff --git a/modules/common/system/mapper/UserRefereeMapper.java b/modules/common/system/mapper/UserRefereeMapper.java deleted file mode 100644 index e729045..0000000 --- a/modules/common/system/mapper/UserRefereeMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gxwebsoft.common.system.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.common.system.entity.UserReferee; -import com.gxwebsoft.common.system.param.UserRefereeParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 用户推荐关系表Mapper - * - * @author 科技小王子 - * @since 2023-10-07 22:56:36 - */ -public interface UserRefereeMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") UserRefereeParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") UserRefereeParam param); - -} diff --git a/modules/common/system/mapper/UserRoleMapper.java b/modules/common/system/mapper/UserRoleMapper.java deleted file mode 100644 index 51b38c8..0000000 --- a/modules/common/system/mapper/UserRoleMapper.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.gxwebsoft.common.system.mapper; - -import com.baomidou.mybatisplus.annotation.InterceptorIgnore; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.gxwebsoft.common.system.entity.Role; -import com.gxwebsoft.common.system.entity.UserRole; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 用户角色Mapper - * - * @author WebSoft - * @since 2018-12-24 16:10:02 - */ -public interface UserRoleMapper extends BaseMapper { - - /** - * 批量添加用户角色 - * - * @param userId 用户id - * @param roleIds 角色id集合 - * @return int - */ - int insertBatch(@Param("userId") Integer userId, @Param("roleIds") List roleIds); - - /** - * 根据用户id查询角色 - * - * @param userId 用户id - * @return List - */ - @InterceptorIgnore(tenantLine = "true") - List selectByUserId(@Param("userId") Integer userId); - - /** - * 批量根据用户id查询角色 - * - * @param userIds 用户id集合 - * @return List - */ - List selectByUserIds(@Param("userIds") List userIds); - -} diff --git a/modules/common/system/mapper/VersionMapper.java b/modules/common/system/mapper/VersionMapper.java deleted file mode 100644 index 0ae8f69..0000000 --- a/modules/common/system/mapper/VersionMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gxwebsoft.common.system.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.common.system.entity.Version; -import com.gxwebsoft.common.system.param.VersionParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 版本更新Mapper - * - * @author 科技小王子 - * @since 2024-01-15 18:52:24 - */ -public interface VersionMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") VersionParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") VersionParam param); - -} diff --git a/modules/common/system/mapper/WhiteDomainMapper.java b/modules/common/system/mapper/WhiteDomainMapper.java deleted file mode 100644 index 9e3d0d1..0000000 --- a/modules/common/system/mapper/WhiteDomainMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gxwebsoft.common.system.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.common.system.entity.WhiteDomain; -import com.gxwebsoft.common.system.param.WhiteDomainParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 服务器白名单Mapper - * - * @author 科技小王子 - * @since 2024-03-26 00:22:21 - */ -public interface WhiteDomainMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") WhiteDomainParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") WhiteDomainParam param); - -} diff --git a/modules/common/system/mapper/xml/AccessKeyMapper.xml b/modules/common/system/mapper/xml/AccessKeyMapper.xml deleted file mode 100644 index 9e870d7..0000000 --- a/modules/common/system/mapper/xml/AccessKeyMapper.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - SELECT a.* - FROM sys_access_key a - - - AND a.id = #{param.id} - - - AND a.accessKey LIKE CONCAT('%', #{param.accessKey}, '%') - - - AND a.accessSecret LIKE CONCAT('%', #{param.accessSecret}, '%') - - - AND a.deleted = #{param.deleted} - - - AND a.deleted = 0 - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - - - - - - - - - diff --git a/modules/common/system/mapper/xml/AppMapper.xml b/modules/common/system/mapper/xml/AppMapper.xml deleted file mode 100644 index 2156a9d..0000000 --- a/modules/common/system/mapper/xml/AppMapper.xml +++ /dev/null @@ -1,203 +0,0 @@ - - - - - - - SELECT a.* - FROM sys_app a - - - AND a.app_id = #{param.appId} - - - AND a.app_name LIKE CONCAT('%', #{param.appName}, '%') - - - AND a.app_code LIKE CONCAT('%', #{param.appCode}, '%') - - - AND a.parent_id = #{param.parentId} - - - AND a.app_type LIKE CONCAT('%', #{param.appType}, '%') - - - AND a.app_type_multiple LIKE CONCAT('%', #{param.appTypeMultiple}, '%') - - - AND a.menu_type = #{param.menuType} - - - AND a.company_id = #{param.companyId} - - - AND a.company_name LIKE CONCAT('%', #{param.companyName}, '%') - - - AND a.app_icon LIKE CONCAT('%', #{param.appIcon}, '%') - - - AND a.app_qrcode LIKE CONCAT('%', #{param.appQrcode}, '%') - - - AND a.app_url LIKE CONCAT('%', #{param.appUrl}, '%') - - - AND a.admin_url LIKE CONCAT('%', #{param.adminUrl}, '%') - - - AND a.down_url LIKE CONCAT('%', #{param.downUrl}, '%') - - - AND a.server_url LIKE CONCAT('%', #{param.serverUrl}, '%') - - - AND a.file_url LIKE CONCAT('%', #{param.fileUrl}, '%') - - - AND a.callback_url LIKE CONCAT('%', #{param.callbackUrl}, '%') - - - AND a.docs_url LIKE CONCAT('%', #{param.docsUrl}, '%') - - - AND a.git_url LIKE CONCAT('%', #{param.gitUrl}, '%') - - - AND a.prototype_url LIKE CONCAT('%', #{param.prototypeUrl}, '%') - - - AND a.ip_address LIKE CONCAT('%', #{param.ipAddress}, '%') - - - AND a.images LIKE CONCAT('%', #{param.images}, '%') - - - AND a.package_name LIKE CONCAT('%', #{param.packageName}, '%') - - - AND a.clicks = #{param.clicks} - - - AND a.installs = #{param.installs} - - - AND a.comments LIKE CONCAT('%', #{param.comments}, '%') - - - AND a.content LIKE CONCAT('%', #{param.content}, '%') - - - AND a.requirement LIKE CONCAT('%', #{param.requirement}, '%') - - - AND a.developer LIKE CONCAT('%', #{param.developer}, '%') - - - AND a.director LIKE CONCAT('%', #{param.director}, '%') - - - AND a.project_director LIKE CONCAT('%', #{param.projectDirector}, '%') - - - AND a.salesman LIKE CONCAT('%', #{param.salesman}, '%') - - - AND a.price = #{param.price} - - - AND a.line_price = #{param.linePrice} - - - AND a.score LIKE CONCAT('%', #{param.score}, '%') - - - AND a.star LIKE CONCAT('%', #{param.star}, '%') - - - AND a.path LIKE CONCAT('%', #{param.path}, '%') - - - AND a.component LIKE CONCAT('%', #{param.component}, '%') - - - AND a.authority LIKE CONCAT('%', #{param.authority}, '%') - - - AND a.target LIKE CONCAT('%', #{param.target}, '%') - - - AND a.hide = #{param.hide} - - - AND a.search = #{param.search} - - - AND a.active LIKE CONCAT('%', #{param.active}, '%') - - - AND a.meta LIKE CONCAT('%', #{param.meta}, '%') - - - AND a.edition LIKE CONCAT('%', #{param.edition}, '%') - - - AND a.version LIKE CONCAT('%', #{param.version}, '%') - - - AND a.is_use = #{param.isUse} - - - AND a.file1 LIKE CONCAT('%', #{param.file1}, '%') - - - AND a.file2 LIKE CONCAT('%', #{param.file2}, '%') - - - AND a.file3 LIKE CONCAT('%', #{param.file3}, '%') - - - AND a.app_status LIKE CONCAT('%', #{param.appStatus}, '%') - - - AND a.sort_number = #{param.sortNumber} - - - AND a.status = #{param.status} - - - AND a.deleted = #{param.deleted} - - - AND a.deleted = 0 - - - AND a.user_id = #{param.userId} - - - AND a.organization_id = #{param.organizationId} - - - AND a.tenant_code LIKE CONCAT('%', #{param.tenantCode}, '%') - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - - - - - - - - - diff --git a/modules/common/system/mapper/xml/AppRenewMapper.xml b/modules/common/system/mapper/xml/AppRenewMapper.xml deleted file mode 100644 index f75c73b..0000000 --- a/modules/common/system/mapper/xml/AppRenewMapper.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - SELECT a.* - FROM sys_app_renew a - - - AND a.app_renew_id = #{param.appRenewId} - - - AND a.money = #{param.money} - - - AND a.comments LIKE CONCAT('%', #{param.comments}, '%') - - - AND a.start_time LIKE CONCAT('%', #{param.startTime}, '%') - - - AND a.end_time LIKE CONCAT('%', #{param.endTime}, '%') - - - AND a.user_id = #{param.userId} - - - AND a.app_id = #{param.appId} - - - AND a.status = #{param.status} - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - - - - - - - - - diff --git a/modules/common/system/mapper/xml/AppUrlMapper.xml b/modules/common/system/mapper/xml/AppUrlMapper.xml deleted file mode 100644 index 77d51fe..0000000 --- a/modules/common/system/mapper/xml/AppUrlMapper.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - SELECT a.* - FROM sys_app_url a - - - AND a.app_url_id = #{param.appUrlId} - - - AND a.app_id = #{param.appId} - - - AND a.type LIKE CONCAT('%', #{param.type}, '%') - - - AND a.domain LIKE CONCAT('%', #{param.domain}, '%') - - - AND a.comments LIKE CONCAT('%', #{param.comments}, '%') - - - AND a.status = #{param.status} - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - - - - - - - - - diff --git a/modules/common/system/mapper/xml/AppUserMapper.xml b/modules/common/system/mapper/xml/AppUserMapper.xml deleted file mode 100644 index 4ef7d46..0000000 --- a/modules/common/system/mapper/xml/AppUserMapper.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - SELECT a.*, b.nickname,b.email,b.phone,b.avatar - FROM sys_app_user a - LEFT JOIN sys_user b ON a.user_id = b.user_id - - - AND a.app_user_id = #{param.appUserId} - - - AND a.role = #{param.role} - - - AND a.user_id = #{param.userId} - - - AND a.app_id = #{param.appId} - - - AND a.status = #{param.status} - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - AND (b.nickname LIKE CONCAT('%', #{param.keywords}, '%') - OR b.email LIKE CONCAT('%', #{param.keywords}, '%') - OR b.username LIKE CONCAT('%', #{param.keywords}, '%') - OR b.phone LIKE CONCAT('%', #{param.keywords}, '%') - ) - - - - - - - - - - - diff --git a/modules/common/system/mapper/xml/ChatConversationMapper.xml b/modules/common/system/mapper/xml/ChatConversationMapper.xml deleted file mode 100644 index 94c77c0..0000000 --- a/modules/common/system/mapper/xml/ChatConversationMapper.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - SELECT a.* - FROM sys_chat_conversation a - - - AND a.id = #{param.id} - - - AND a.user_id = #{param.userId} - - - AND a.friend_id = #{param.friendId} - - - AND a.type = #{param.type} - - - AND a.content LIKE CONCAT('%', #{param.content}, '%') - - - AND a.un_read = #{param.unRead} - - - AND a.status = #{param.status} - - - AND a.deleted = #{param.deleted} - - - AND a.deleted = 0 - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - - - - - - - - - diff --git a/modules/common/system/mapper/xml/ChatMessageMapper.xml b/modules/common/system/mapper/xml/ChatMessageMapper.xml deleted file mode 100644 index e387466..0000000 --- a/modules/common/system/mapper/xml/ChatMessageMapper.xml +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - - SELECT a.*,b.nickname as formUserName,b.avatar as formUserAvatar,c.nickname as toUserName,c.avatar as toUserAvatar - FROM sys_chat_message a - LEFT JOIN sys_user b ON a.form_user_id = b.user_id - LEFT JOIN sys_user c ON a.to_user_id = c.user_id - - - AND a.id = #{param.id} - - - AND a.form_user_id = #{param.formUserId} - - - AND a.to_user_id = #{param.toUserId} - - - AND a.type LIKE CONCAT('%', #{param.type}, '%') - - - AND a.content LIKE CONCAT('%', #{param.content}, '%') - - - AND a.side_to = #{param.sideTo} - - - AND a.side_from = #{param.sideFrom} - - - AND a.withdraw = #{param.withdraw} - - - AND a.file_info LIKE CONCAT('%', #{param.fileInfo}, '%') - - - AND a.has_contact = #{param.hasContact} - - - AND a.status = #{param.status} - - - AND a.deleted = #{param.deleted} - - - AND a.deleted = 0 - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - AND ( - a.content LIKE CONCAT('%', #{param.keywords}, '%') - OR b.nickname LIKE CONCAT('%', #{param.keywords}, '%') - OR b.phone LIKE CONCAT('%', #{param.keywords}, '%') - OR b.real_name LIKE CONCAT('%', #{param.keywords}, '%') - ) - - - - - - - - - - - diff --git a/modules/common/system/mapper/xml/CompanyMapper.xml b/modules/common/system/mapper/xml/CompanyMapper.xml deleted file mode 100644 index 9c3a7a8..0000000 --- a/modules/common/system/mapper/xml/CompanyMapper.xml +++ /dev/null @@ -1,177 +0,0 @@ - - - - - - - SELECT a.*,b.tenant_id,b.tenant_name,b.tenant_code - FROM sys_company a - LEFT JOIN sys_tenant b ON a.tenant_id = b.tenant_id - - - AND a.company_id = #{param.companyId} - - - AND a.short_name LIKE CONCAT('%', #{param.shortName}, '%') - - - AND a.company_name LIKE CONCAT('%', #{param.companyName}, '%') - - - AND a.company_type = #{param.companyType} - - - AND a.company_logo LIKE CONCAT('%', #{param.companyLogo}, '%') - - - AND a.domain LIKE CONCAT('%', #{param.domain}, '%') - - - AND a.phone = #{param.phone} - - - AND a.Invoice_header LIKE CONCAT('%', #{param.invoiceHeader}, '%') - - - AND a.start_time LIKE CONCAT('%', #{param.startTime}, '%') - - - AND a.expiration_time LIKE CONCAT('%', #{param.expirationTime}, '%') - - - AND a.version = #{param.version} - - - AND a.members = #{param.members} - - - AND a.industry_parent LIKE CONCAT('%', #{param.industryParent}, '%') - - - AND a.industry_child LIKE CONCAT('%', #{param.industryChild}, '%') - - - AND a.departments = #{param.departments} - - - AND a.country LIKE CONCAT('%', #{param.country}, '%') - - - AND a.province LIKE CONCAT('%', #{param.province}, '%') - - - AND a.city LIKE CONCAT('%', #{param.city}, '%') - - - AND a.region LIKE CONCAT('%', #{param.region}, '%') - - - AND a.address LIKE CONCAT('%', #{param.address}, '%') - - - AND a.longitude LIKE CONCAT('%', #{param.longitude}, '%') - - - AND a.latitude LIKE CONCAT('%', #{param.latitude}, '%') - - - AND a.comments LIKE CONCAT('%', #{param.comments}, '%') - - - AND a.authentication = #{param.authentication} - - - AND a.status = #{param.status} - - - AND a.user_id = #{param.userId} - - - AND a.deleted = #{param.deleted} - - - AND a.deleted = 0 - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - AND a.authoritative = #{param.authoritative} - - - AND a.recommend = #{param.recommend} - - - AND a.short_name = #{param.appName} - - - AND a.email = #{param.email} - - - AND a.merchant_id = #{param.merchantId} - - - AND a.company_id IN - - #{item} - - - - AND (a.company_name LIKE CONCAT('%', #{param.keywords}, '%') - OR a.short_name LIKE CONCAT('%', #{param.keywords}, '%') - OR a.tenant_id = #{param.keywords} - OR a.domain LIKE CONCAT('%', #{param.keywords}, '%') - ) - - - - - - - - - - - - - - - - - - - - - - UPDATE sys_company SET storage = #{param.storage} WHERE company_id = #{param.companyId} - - - - - UPDATE sys_company SET deleted = 1 WHERE company_id = #{param.companyId} - - - - UPDATE sys_company SET deleted = 0 WHERE company_id = #{param.companyId} - - diff --git a/modules/common/system/mapper/xml/DictDataMapper.xml b/modules/common/system/mapper/xml/DictDataMapper.xml deleted file mode 100644 index 38949c2..0000000 --- a/modules/common/system/mapper/xml/DictDataMapper.xml +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - SELECT a.*, - b.dict_code, - b.dict_name - FROM sys_dict_data a - LEFT JOIN sys_dict b ON a.dict_id = b.dict_id - - AND a.deleted = 0 - - AND a.dict_data_id = #{param.dictDataId} - - - AND a.dict_id = #{param.dictId} - - - AND a.dict_data_code LIKE CONCAT('%', #{param.dictDataCode}, '%') - - - AND a.dict_data_name LIKE CONCAT('%', #{param.dictDataName}, '%') - - - AND a.comments LIKE CONCAT('%', #{param.comments}, '%') - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - AND b.dict_code = #{param.dictCode} - - - AND b.dict_name = #{param.dictName} - - - AND ( - a.dict_data_code LIKE CONCAT('%', #{param.keywords}, '%') - OR a.dict_data_name LIKE CONCAT('%', #{param.keywords}, '%') - ) - - - - - - - - - - - - - - diff --git a/modules/common/system/mapper/xml/DictMapper.xml b/modules/common/system/mapper/xml/DictMapper.xml deleted file mode 100644 index db709ae..0000000 --- a/modules/common/system/mapper/xml/DictMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/modules/common/system/mapper/xml/DictionaryDataMapper.xml b/modules/common/system/mapper/xml/DictionaryDataMapper.xml deleted file mode 100644 index db778ba..0000000 --- a/modules/common/system/mapper/xml/DictionaryDataMapper.xml +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - SELECT a.*, - b.dict_code, - b.dict_name - FROM sys_dictionary_data a - LEFT JOIN sys_dictionary b ON a.dict_id = b.dict_id - - AND a.deleted = 0 - - AND a.dict_data_id = #{param.dictDataId} - - - AND a.dict_id = #{param.dictId} - - - AND a.dict_data_code LIKE CONCAT('%', #{param.dictDataCode}, '%') - - - AND a.dict_data_name LIKE CONCAT('%', #{param.dictDataName}, '%') - - - AND a.comments LIKE CONCAT('%', #{param.comments}, '%') - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - AND b.dict_code = #{param.dictCode} - - - AND b.dict_name = #{param.dictName} - - - AND ( - a.dict_data_code LIKE CONCAT('%', #{param.keywords}, '%') - OR a.dict_data_name LIKE CONCAT('%', #{param.keywords}, '%') - ) - - - - - - - - - - - - - - diff --git a/modules/common/system/mapper/xml/DictionaryMapper.xml b/modules/common/system/mapper/xml/DictionaryMapper.xml deleted file mode 100644 index 8cd0cff..0000000 --- a/modules/common/system/mapper/xml/DictionaryMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/modules/common/system/mapper/xml/EmailRecordMapper.xml b/modules/common/system/mapper/xml/EmailRecordMapper.xml deleted file mode 100644 index 7b5ad62..0000000 --- a/modules/common/system/mapper/xml/EmailRecordMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/modules/common/system/mapper/xml/EnvironmentMapper.xml b/modules/common/system/mapper/xml/EnvironmentMapper.xml deleted file mode 100644 index 917f93d..0000000 --- a/modules/common/system/mapper/xml/EnvironmentMapper.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - SELECT a.* - FROM sys_environment a - - - AND a.id = #{param.id} - - - AND a.environment_name LIKE CONCAT('%', #{param.environmentName}, '%') - - - AND a.environment_code LIKE CONCAT('%', #{param.environmentCode}, '%') - - - AND a.brand LIKE CONCAT('%', #{param.brand}, '%') - - - AND a.server_ip LIKE CONCAT('%', #{param.serverIp}, '%') - - - AND a.modules_url LIKE CONCAT('%', #{param.modulesUrl}, '%') - - - AND a.modules_api LIKE CONCAT('%', #{param.modulesApi}, '%') - - - AND a.sort_number = #{param.sortNumber} - - - AND a.comments LIKE CONCAT('%', #{param.comments}, '%') - - - AND a.status = #{param.status} - - - AND a.user_id = #{param.userId} - - - AND a.deleted = #{param.deleted} - - - AND a.deleted = 0 - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - - - - - - - - - diff --git a/modules/common/system/mapper/xml/FileRecordMapper.xml b/modules/common/system/mapper/xml/FileRecordMapper.xml deleted file mode 100644 index cd59549..0000000 --- a/modules/common/system/mapper/xml/FileRecordMapper.xml +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - SELECT a.*, - b.username create_username, - b.nickname create_nickname, - b.avatar - FROM sys_file_record a - LEFT JOIN sys_user b ON a.create_user_id = b.user_id - - - AND a.id = #{param.id} - - - AND a.`name` LIKE CONCAT('%', #{param.name}, '%') - - - AND a.path LIKE CONCAT('%', #{param.path}, '%') - - - AND a.app_id = #{param.appId} - - - AND a.company_id = #{param.companyId} - - - AND a.create_user_id = #{param.createUserId} - - - AND a.group_id = #{param.groupId} - - - AND a.comments LIKE CONCAT('%', #{param.comments}, '%') - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - AND a.deleted = #{param.deleted} - - - AND a.deleted = 0 - - - AND b.username = #{param.createUsername} - - - AND b.nickname LIKE CONCAT('%', #{param.createNickname}, '%') - - - AND a.content_type LIKE CONCAT('%', #{param.contentType}, '%') - - - - - - - - - - - - - - - diff --git a/modules/common/system/mapper/xml/LoginRecordMapper.xml b/modules/common/system/mapper/xml/LoginRecordMapper.xml deleted file mode 100644 index 35d00ad..0000000 --- a/modules/common/system/mapper/xml/LoginRecordMapper.xml +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - SELECT a.*, - b.user_id, - b.nickname - FROM sys_login_record a - LEFT JOIN sys_user b ON a.username = b.username - - - AND a.id = #{param.id} - - - AND a.username LIKE CONCAT('%', #{param.username}, '%') - - - AND a.os LIKE CONCAT('%', #{param.os}, '%') - - - AND a.device LIKE CONCAT('%', #{param.device}, '%') - - - AND a.browser LIKE CONCAT('%', #{param.browser}, '%') - - - AND a.ip LIKE CONCAT('%', #{param.ip}, '%') - - - AND a.login_type LIKE CONCAT('%', #{param.loginType}, '%') - - - AND a.comments LIKE CONCAT('%', #{param.comments}, '%') - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - AND b.user_id = #{param.userId} - - - AND b.nickname LIKE CONCAT('%', #{param.nickname}, '%') - - - - - - - - - - - diff --git a/modules/common/system/mapper/xml/MenuMapper.xml b/modules/common/system/mapper/xml/MenuMapper.xml deleted file mode 100644 index 89c7c6e..0000000 --- a/modules/common/system/mapper/xml/MenuMapper.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - SELECT a.* - FROM sys_menu a - - - AND a.menu_id = #{param.menuId} - - - AND a.parent_id = #{param.parentId} - - - AND a.modules = #{param.modules} - - - AND a.deleted = #{param.deleted} - - - AND a.deleted = 0 - - - AND a.tenant_id = #{param.tenantId} - - - - - - - diff --git a/modules/common/system/mapper/xml/MerchantAccountMapper.xml b/modules/common/system/mapper/xml/MerchantAccountMapper.xml deleted file mode 100644 index 527e540..0000000 --- a/modules/common/system/mapper/xml/MerchantAccountMapper.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - SELECT a.*,b.merchant_name,b.goods_review - FROM sys_merchant_account a - LEFT JOIN sys_merchant b ON a.merchant_id = b.merchant_id - - - AND a.id = #{param.id} - - - AND a.phone = #{param.phone} - - - AND a.real_name LIKE CONCAT('%', #{param.realName}, '%') - - - AND a.merchant_id = #{param.merchantId} - - - AND a.user_id = #{param.userId} - - - AND a.comments LIKE CONCAT('%', #{param.comments}, '%') - - - AND a.status = #{param.status} - - - AND a.sort_number = #{param.sortNumber} - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') - ) - - - - - - - - - - - - diff --git a/modules/common/system/mapper/xml/MerchantApplyMapper.xml b/modules/common/system/mapper/xml/MerchantApplyMapper.xml deleted file mode 100644 index f2c3478..0000000 --- a/modules/common/system/mapper/xml/MerchantApplyMapper.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - SELECT a.* - FROM sys_merchant_apply a - - - AND a.apply_id = #{param.applyId} - - - AND a.merchant_name LIKE CONCAT('%', #{param.merchantName}, '%') - - - AND a.image LIKE CONCAT('%', #{param.image}, '%') - - - AND a.phone LIKE CONCAT('%', #{param.phone}, '%') - - - AND a.real_name LIKE CONCAT('%', #{param.realName}, '%') - - - AND a.shop_type LIKE CONCAT('%', #{param.shopType}, '%') - - - AND a.category LIKE CONCAT('%', #{param.category}, '%') - - - AND a.commission = #{param.commission} - - - AND a.keywords LIKE CONCAT('%', #{param.keywords}, '%') - - - AND a.files LIKE CONCAT('%', #{param.files}, '%') - - - AND a.own_store = #{param.ownStore} - - - AND a.recommend = #{param.recommend} - - - AND a.goods_review = #{param.goodsReview} - - - AND a.comments LIKE CONCAT('%', #{param.comments}, '%') - - - AND a.status = #{param.status} - - - AND a.sort_number = #{param.sortNumber} - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') - ) - - - - - - - - - - - diff --git a/modules/common/system/mapper/xml/MerchantMapper.xml b/modules/common/system/mapper/xml/MerchantMapper.xml deleted file mode 100644 index 4e134ee..0000000 --- a/modules/common/system/mapper/xml/MerchantMapper.xml +++ /dev/null @@ -1,93 +0,0 @@ - - - - - - - SELECT a.* - FROM sys_merchant a - - - AND a.merchant_id = #{param.merchantId} - - - AND a.merchant_name LIKE CONCAT('%', #{param.merchantName}, '%') - - - AND a.merchant_code LIKE CONCAT('%', #{param.merchantCode}, '%') - - - AND a.image LIKE CONCAT('%', #{param.image}, '%') - - - AND a.phone LIKE CONCAT('%', #{param.phone}, '%') - - - AND a.real_name LIKE CONCAT('%', #{param.realName}, '%') - - - AND a.shop_type LIKE CONCAT('%', #{param.shopType}, '%') - - - AND a.category LIKE CONCAT('%', #{param.category}, '%') - - - AND a.commission = #{param.commission} - - - AND a.keywords LIKE CONCAT('%', #{param.keywords}, '%') - - - AND a.files LIKE CONCAT('%', #{param.files}, '%') - - - AND a.own_store = #{param.ownStore} - - - AND a.recommend = #{param.recommend} - - - AND a.goods_review = #{param.goodsReview} - - - AND a.comments LIKE CONCAT('%', #{param.comments}, '%') - - - AND a.status = #{param.status} - - - AND a.sort_number = #{param.sortNumber} - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - AND a.deleted = #{param.deleted} - - - AND a.deleted = 0 - - - AND ( - a.merchant_name LIKE CONCAT('%', #{param.keywords}, '%') - OR a.phone LIKE CONCAT('%', #{param.keywords}, '%') - OR a.real_name LIKE CONCAT('%', #{param.keywords}, '%') - ) - - - - - - - - - - - diff --git a/modules/common/system/mapper/xml/MerchantTypeMapper.xml b/modules/common/system/mapper/xml/MerchantTypeMapper.xml deleted file mode 100644 index 9b60622..0000000 --- a/modules/common/system/mapper/xml/MerchantTypeMapper.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - SELECT a.* - FROM sys_merchant_type a - - - AND a.id = #{param.id} - - - AND a.name LIKE CONCAT('%', #{param.name}, '%') - - - AND a.comments LIKE CONCAT('%', #{param.comments}, '%') - - - AND a.status = #{param.status} - - - AND a.sort_number = #{param.sortNumber} - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') - ) - - - - - - - - - - - diff --git a/modules/common/system/mapper/xml/ModulesMapper.xml b/modules/common/system/mapper/xml/ModulesMapper.xml deleted file mode 100644 index 0f157b6..0000000 --- a/modules/common/system/mapper/xml/ModulesMapper.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - SELECT a.* - FROM sys_modules a - - - AND a.id = #{param.id} - - - AND a.modules LIKE CONCAT('%', #{param.modules}, '%') - - - AND a.modules_url LIKE CONCAT('%', #{param.modulesUrl}, '%') - - - AND a.sort_number = #{param.sortNumber} - - - AND a.comments LIKE CONCAT('%', #{param.comments}, '%') - - - AND a.status = #{param.status} - - - AND a.user_id = #{param.userId} - - - AND a.deleted = #{param.deleted} - - - AND a.deleted = 0 - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - - - - - - - - - diff --git a/modules/common/system/mapper/xml/NoticeMapper.xml b/modules/common/system/mapper/xml/NoticeMapper.xml deleted file mode 100644 index 147aeb2..0000000 --- a/modules/common/system/mapper/xml/NoticeMapper.xml +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - SELECT a.* - FROM sys_notice a - - - AND a.notice_id = #{param.noticeId} - - - AND a.type LIKE CONCAT('%', #{param.type}, '%') - - - AND a.title LIKE CONCAT('%', #{param.title}, '%') - - - AND a.icon LIKE CONCAT('%', #{param.icon}, '%') - - - AND a.color LIKE CONCAT('%', #{param.color}, '%') - - - AND a.content LIKE CONCAT('%', #{param.content}, '%') - - - AND a.is_read = #{param.isRead} - - - AND a.progress = #{param.progress} - - - AND a.channel = #{param.channel} - - - AND a.source LIKE CONCAT('%', #{param.source}, '%') - - - AND a.source_id = #{param.sourceId} - - - AND a.path LIKE CONCAT('%', #{param.path}, '%') - - - AND a.comments LIKE CONCAT('%', #{param.comments}, '%') - - - AND a.user_id = #{param.userId} - - - AND a.status = #{param.status} - - - AND a.deleted = #{param.deleted} - - - AND a.deleted = 0 - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - - - - - - - - - diff --git a/modules/common/system/mapper/xml/OperationRecordMapper.xml b/modules/common/system/mapper/xml/OperationRecordMapper.xml deleted file mode 100644 index e03147b..0000000 --- a/modules/common/system/mapper/xml/OperationRecordMapper.xml +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - SELECT a.*, - b.nickname, - b.username - FROM sys_operation_record a - LEFT JOIN sys_user b ON a.user_id = b.user_id - - - AND a.id = #{param.id} - - - AND a.user_id = #{param.userId} - - - AND a.module LIKE CONCAT('%', #{param.module}, '%') - - - AND a.description LIKE CONCAT('%', #{param.description}, '%') - - - AND a.url LIKE CONCAT('%', #{param.url}, '%') - - - AND a.request_method = #{param.requestMethod} - - - AND a.method LIKE CONCAT('%', #{param.method}, '%') - - - AND a.description LIKE CONCAT('%', #{param.description}, '%') - - - AND a.ip LIKE CONCAT('%', #{param.ip}, '%') - - - AND a.comments LIKE CONCAT('%', #{param.comments}, '%') - - - AND a.`status` = #{param.status} - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - AND b.username LIKE CONCAT('%', #{param.username}, '%') - - - AND b.nickname LIKE CONCAT('%', #{param.nickname}, '%') - - - - - - - - - - - diff --git a/modules/common/system/mapper/xml/OrderInfoMapper.xml b/modules/common/system/mapper/xml/OrderInfoMapper.xml deleted file mode 100644 index 64da232..0000000 --- a/modules/common/system/mapper/xml/OrderInfoMapper.xml +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - - SELECT a.* - FROM sys_order_info a - - - AND a.id = #{param.id} - - - AND a.oid = #{param.oid} - - - AND a.sid = #{param.sid} - - - AND a.fid = #{param.fid} - - - AND a.site_name LIKE CONCAT('%', #{param.siteName}, '%') - - - AND a.field_name LIKE CONCAT('%', #{param.fieldName}, '%') - - - AND a.date_time LIKE CONCAT('%', #{param.dateTime}, '%') - - - AND a.price = #{param.price} - - - AND a.children_price = #{param.childrenPrice} - - - AND a.adult_num = #{param.adultNum} - - - AND a.children_num = #{param.childrenNum} - - - AND a.pay_status = #{param.payStatus} - - - AND a.is_free = #{param.isFree} - - - AND a.is_children = #{param.isChildren} - - - AND a.type = #{param.type} - - - AND a.merge_data LIKE CONCAT('%', #{param.mergeData}, '%') - - - AND a.start_time = #{param.startTime} - - - AND a.order_time = #{param.orderTime} - - - AND a.time_flag LIKE CONCAT('%', #{param.timeFlag}, '%') - - - AND a.deleted = #{param.deleted} - - - AND a.deleted = 0 - - - - - - - - - - - diff --git a/modules/common/system/mapper/xml/OrderMapper.xml b/modules/common/system/mapper/xml/OrderMapper.xml deleted file mode 100644 index 58a713f..0000000 --- a/modules/common/system/mapper/xml/OrderMapper.xml +++ /dev/null @@ -1,135 +0,0 @@ - - - - - - - SELECT a.* - FROM sys_order a - - - AND a.order_id = #{param.orderId} - - - AND a.order_no LIKE CONCAT('%', #{param.orderNo}, '%') - - - AND a.type = #{param.type} - - - AND a.money = #{param.money} - - - AND a.pay_price = #{param.payPrice} - - - AND a.plan_id = #{param.planId} - - - AND a.price_id = #{param.priceId} - - - AND a.grade_id = #{param.gradeId} - - - AND a.price_name LIKE CONCAT('%', #{param.priceName}, '%') - - - AND a.user_id = #{param.userId} - - - AND a.member_id = #{param.memberId} - - - AND a.real_name LIKE CONCAT('%', #{param.realName}, '%') - - - AND a.phone LIKE CONCAT('%', #{param.phone}, '%') - - - AND a.pay_time LIKE CONCAT('%', #{param.payTime}, '%') - - - AND a.transaction_id LIKE CONCAT('%', #{param.transactionId}, '%') - - - AND a.pay_status = #{param.payStatus} - - - AND a.pay_method LIKE CONCAT('%', #{param.payMethod}, '%') - - - AND a.expiration_time LIKE CONCAT('%', #{param.expirationTime}, '%') - - - AND a.province LIKE CONCAT('%', #{param.province}, '%') - - - AND a.city LIKE CONCAT('%', #{param.city}, '%') - - - AND a.region LIKE CONCAT('%', #{param.region}, '%') - - - AND a.area LIKE CONCAT('%', #{param.area}, '%') - - - AND a.address LIKE CONCAT('%', #{param.address}, '%') - - - AND a.refund_image LIKE CONCAT('%', #{param.refundImage}, '%') - - - AND a.refund_content LIKE CONCAT('%', #{param.refundContent}, '%') - - - AND a.is_settled = #{param.isSettled} - - - AND a.sort_number = #{param.sortNumber} - - - AND a.merchant_id = #{param.merchantId} - - - AND a.comments LIKE CONCAT('%', #{param.comments}, '%') - - - AND a.status = #{param.status} - - - AND a.deleted = #{param.deleted} - - - AND a.deleted = 0 - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - - - - - - - - - - - - - - - diff --git a/modules/common/system/mapper/xml/OrganizationMapper.xml b/modules/common/system/mapper/xml/OrganizationMapper.xml deleted file mode 100644 index 52c9467..0000000 --- a/modules/common/system/mapper/xml/OrganizationMapper.xml +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - - SELECT ta.* - FROM sys_dictionary_data ta - LEFT JOIN sys_dictionary tb - ON ta.dict_id = tb.dict_id - AND tb.deleted = 0 - WHERE ta.deleted = 0 - AND tb.dict_code = 'organization_type' - - - - - SELECT a.*, - b.dict_data_name organization_type_name, - c.nickname leader_nickname, - c.username leader_username - FROM sys_organization a - LEFT JOIN ( - - ) b ON a.organization_type = b.dict_data_code - LEFT JOIN sys_user c ON a.leader_id = c.user_id - - AND a.deleted = 0 - - AND a.organization_id = #{param.organizationId} - - - AND a.parent_id = #{param.parentId} - - - AND a.organization_name LIKE CONCAT('%', #{param.organizationName}, '%') - - - AND a.organization_full_name LIKE CONCAT('%', #{param.organizationFullName}, '%') - - - AND a.organization_code LIKE CONCAT('%', #{param.organizationCode}, '%') - - - AND a.organization_type = #{param.organizationType} - - - AND a.leader_id = #{param.leaderId} - - - AND a.comments LIKE CONCAT('%', #{param.comments}, '%') - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - AND b.dict_data_name LIKE CONCAT('%', #{param.organizationTypeName}, '%') - - - AND c.nickname LIKE CONCAT('%', #{param.leaderNickname}, '%') - - - AND c.username LIKE CONCAT('%', #{param.leaderUsername}, '%') - - - AND ( - a.organization_name LIKE CONCAT('%', #{param.keywords}, '%') - ) - - - - - - - - - - - diff --git a/modules/common/system/mapper/xml/PaymentMapper.xml b/modules/common/system/mapper/xml/PaymentMapper.xml deleted file mode 100644 index 20ab037..0000000 --- a/modules/common/system/mapper/xml/PaymentMapper.xml +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - - SELECT a.* - FROM sys_payment a - - - AND a.id = #{param.id} - - - AND a.name LIKE CONCAT('%', #{param.name}, '%') - - - AND a.type = #{param.type} - - - AND a.code = #{param.code} - - - AND a.wechat_type = #{param.wechatType} - - - AND a.app_id LIKE CONCAT('%', #{param.appId}, '%') - - - AND a.mch_id LIKE CONCAT('%', #{param.mchId}, '%') - - - AND a.api_key LIKE CONCAT('%', #{param.apiKey}, '%') - - - AND a.apiclient_cert LIKE CONCAT('%', #{param.apiclientCert}, '%') - - - AND a.apiclient_key LIKE CONCAT('%', #{param.apiclientKey}, '%') - - - AND a.merchant_serial_number LIKE CONCAT('%', #{param.merchantSerialNumber}, '%') - - - AND a.comments LIKE CONCAT('%', #{param.comments}, '%') - - - AND a.sort_number = #{param.sortNumber} - - - AND a.status = #{param.status} - - - AND a.deleted = #{param.deleted} - - - AND a.deleted = 0 - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - - - - - - - - - diff --git a/modules/common/system/mapper/xml/PlugMapper.xml b/modules/common/system/mapper/xml/PlugMapper.xml deleted file mode 100644 index 5ea80d8..0000000 --- a/modules/common/system/mapper/xml/PlugMapper.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - SELECT a.* - FROM sys_plug a - - - AND a.plug_id = #{param.plugId} - - - AND a.plug_name LIKE CONCAT('%', #{param.plugName}, '%') - - - AND a.plug_code LIKE CONCAT('%', #{param.plugCode}, '%') - - - AND a.plug_type = #{param.plugType} - - - AND a.sort_number = #{param.sortNumber} - - - AND a.price = #{param.price} - - - AND a.score = #{param.score} - - - AND a.clicks = #{param.clicks} - - - AND a.installs = #{param.installs} - - - AND a.comments LIKE CONCAT('%', #{param.comments}, '%') - - - AND a.content LIKE CONCAT('%', #{param.content}, '%') - - - AND a.status = #{param.status} - - - AND a.user_id = #{param.userId} - - - AND a.deleted = #{param.deleted} - - - AND a.deleted = 0 - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - - - - - - - - - diff --git a/modules/common/system/mapper/xml/RechargeOrderMapper.xml b/modules/common/system/mapper/xml/RechargeOrderMapper.xml deleted file mode 100644 index e1ebeec..0000000 --- a/modules/common/system/mapper/xml/RechargeOrderMapper.xml +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - - SELECT a.*,b.phone,b.nickname,b.user_id,b.avatar,b.real_name,c.organization_id,c.organization_name - FROM sys_recharge_order a - LEFT JOIN sys_user b ON a.user_id = b.user_id - LEFT JOIN sys_organization c ON a.organization_id = c.organization_id - - - AND a.order_id = #{param.orderId} - - - AND a.order_no LIKE CONCAT('%', #{param.orderNo}, '%') - - - AND a.user_id = #{param.userId} - - - AND a.recharge_type = #{param.rechargeType} - - - AND a.organization_id = #{param.organizationId} - - - AND a.plan_id = #{param.planId} - - - AND a.pay_price = #{param.payPrice} - - - AND a.gift_money = #{param.giftMoney} - - - AND a.actual_money = #{param.actualMoney} - - - AND a.balance = #{param.balance} - - - AND a.pay_method LIKE CONCAT('%', #{param.payMethod}, '%') - - - AND a.pay_status = #{param.payStatus} - - - AND a.pay_time = #{param.payTime} - - - AND a.trade_id = #{param.tradeId} - - - AND a.platform LIKE CONCAT('%', #{param.platform}, '%') - - - AND a.shop_id = #{param.shopId} - - - AND a.sort_number = #{param.sortNumber} - - - AND a.comments LIKE CONCAT('%', #{param.comments}, '%') - - - AND a.status = #{param.status} - - - AND a.deleted = #{param.deleted} - - - AND a.deleted = 0 - - - AND a.merchant_code LIKE CONCAT('%', #{param.merchantCode}, '%') - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - AND ( - b.nickname LIKE CONCAT('%', #{param.keywords}, '%') - OR a.user_id LIKE CONCAT('%', #{param.keywords}, '%') - OR b.alias LIKE CONCAT('%', #{param.keywords}, '%') - OR b.phone LIKE CONCAT('%', #{param.keywords}, '%') - OR b.real_name LIKE CONCAT('%', #{param.keywords}, '%') - ) - - - - - - - - - - - diff --git a/modules/common/system/mapper/xml/RoleMapper.xml b/modules/common/system/mapper/xml/RoleMapper.xml deleted file mode 100644 index a20ab88..0000000 --- a/modules/common/system/mapper/xml/RoleMapper.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - SELECT a.* - FROM sys_role a - - - AND a.role_code = #{param.roleCode} - - - AND a.tenant_id = #{param.tenantId} - - - - - - - diff --git a/modules/common/system/mapper/xml/RoleMenuMapper.xml b/modules/common/system/mapper/xml/RoleMenuMapper.xml deleted file mode 100644 index 377d903..0000000 --- a/modules/common/system/mapper/xml/RoleMenuMapper.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - diff --git a/modules/common/system/mapper/xml/SettingMapper.xml b/modules/common/system/mapper/xml/SettingMapper.xml deleted file mode 100644 index ac81f4e..0000000 --- a/modules/common/system/mapper/xml/SettingMapper.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - SELECT a.* - FROM sys_setting a - - - AND a.setting_key = #{param.settingKey} - - - AND a.setting_id = #{param.settingId} - - - AND a.tenant_id = #{param.tenantId} - - - AND a.deleted = #{param.deleted} - - - AND a.deleted = 0 - - - - - - - - diff --git a/modules/common/system/mapper/xml/TenantMapper.xml b/modules/common/system/mapper/xml/TenantMapper.xml deleted file mode 100644 index b0a0cd9..0000000 --- a/modules/common/system/mapper/xml/TenantMapper.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - SELECT a.*,b.company_name,b.company_logo as logo - FROM sys_tenant a - LEFT JOIN sys_company b ON a.tenant_id = b.tenant_id - - - AND a.tenant_id = #{param.tenantId} - - - AND a.tenant_name LIKE CONCAT('%', #{param.tenantName}, '%') - - - AND a.tenant_code LIKE CONCAT('%', #{param.tenantCode}, '%') - - - AND a.logo LIKE CONCAT('%', #{param.logo}, '%') - - - AND a.comments LIKE CONCAT('%', #{param.comments}, '%') - - - AND a.status = #{param.status} - - - AND a.user_id = #{param.userId} - - - AND a.deleted = #{param.deleted} - - - AND a.deleted = 0 - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - AND ( - a.tenant_name LIKE CONCAT('%', #{param.keywords}, '%') - OR a.tenant_id = #{param.keywords} - ) - - - - - - - - - - - - - DELETE FROM sys_tenant WHERE tenant_id = #{param.tenantId} - - - diff --git a/modules/common/system/mapper/xml/UserBalanceLogMapper.xml b/modules/common/system/mapper/xml/UserBalanceLogMapper.xml deleted file mode 100644 index 965aed7..0000000 --- a/modules/common/system/mapper/xml/UserBalanceLogMapper.xml +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - SELECT a.*, - b.nickname,b.avatar,b.phone - FROM sys_user_balance_log a - LEFT JOIN sys_user b ON a.user_id = b.user_id - - - AND a.log_id = #{param.logId} - - - AND a.user_id = #{param.userId} - - - AND a.scene = #{param.scene} - - - AND a.scene IN - - #{item} - - - - AND a.money = #{param.money} - - - AND a.balance = #{param.balance} - - - AND a.describe LIKE CONCAT('%', #{param.describe}, '%') - - - AND a.remark LIKE CONCAT('%', #{param.remark}, '%') - - - AND a.sort_number = #{param.sortNumber} - - - AND a.comments LIKE CONCAT('%', #{param.comments}, '%') - - - AND a.status = #{param.status} - - - AND a.deleted = #{param.deleted} - - - AND a.deleted = 0 - - - AND a.merchant_code LIKE CONCAT('%', #{param.merchantCode}, '%') - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - AND ( - a.user_id = #{param.keywords} - OR b.nickname LIKE CONCAT('%', #{param.keywords}, '%') - OR b.alias LIKE CONCAT('%', #{param.keywords}, '%') - OR b.phone = #{param.keywords} - ) - - - - - - - - - - - diff --git a/modules/common/system/mapper/xml/UserCollectionMapper.xml b/modules/common/system/mapper/xml/UserCollectionMapper.xml deleted file mode 100644 index 9b60a69..0000000 --- a/modules/common/system/mapper/xml/UserCollectionMapper.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - SELECT a.* - FROM sys_user_collection a - - - AND a.id = #{param.id} - - - AND a.tid = #{param.tid} - - - AND a.user_id = #{param.userId} - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - - - - - - - - - diff --git a/modules/common/system/mapper/xml/UserFileMapper.xml b/modules/common/system/mapper/xml/UserFileMapper.xml deleted file mode 100644 index 872b232..0000000 --- a/modules/common/system/mapper/xml/UserFileMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/modules/common/system/mapper/xml/UserGradeMapper.xml b/modules/common/system/mapper/xml/UserGradeMapper.xml deleted file mode 100644 index 5797863..0000000 --- a/modules/common/system/mapper/xml/UserGradeMapper.xml +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - SELECT a.* - FROM sys_user_grade a - - - AND a.grade_id = #{param.gradeId} - - - AND a.name LIKE CONCAT('%', #{param.name}, '%') - - - AND a.weight = #{param.weight} - - - AND a.upgrade LIKE CONCAT('%', #{param.upgrade}, '%') - - - AND a.equity LIKE CONCAT('%', #{param.equity}, '%') - - - AND a.commission LIKE CONCAT('%', #{param.commission}, '%') - - - AND a.sort_number = #{param.sortNumber} - - - AND a.comments LIKE CONCAT('%', #{param.comments}, '%') - - - AND a.status = #{param.status} - - - AND a.deleted = #{param.deleted} - - - AND a.deleted = 0 - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - - - - - - - - - diff --git a/modules/common/system/mapper/xml/UserGroupMapper.xml b/modules/common/system/mapper/xml/UserGroupMapper.xml deleted file mode 100644 index 8a59e29..0000000 --- a/modules/common/system/mapper/xml/UserGroupMapper.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - SELECT a.* - FROM sys_user_group a - - - AND a.group_id = #{param.groupId} - - - AND a.name LIKE CONCAT('%', #{param.name}, '%') - - - AND a.sort_number = #{param.sortNumber} - - - AND a.comments LIKE CONCAT('%', #{param.comments}, '%') - - - AND a.status = #{param.status} - - - AND a.deleted = #{param.deleted} - - - AND a.deleted = 0 - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - - - - - - - - - diff --git a/modules/common/system/mapper/xml/UserMapper.xml b/modules/common/system/mapper/xml/UserMapper.xml deleted file mode 100644 index 0bf16b3..0000000 --- a/modules/common/system/mapper/xml/UserMapper.xml +++ /dev/null @@ -1,240 +0,0 @@ - - - - - - - SELECT ta.* - FROM sys_dictionary_data ta - LEFT JOIN sys_dictionary tb - ON ta.dict_id = tb.dict_id - AND tb.deleted = 0 - WHERE ta.deleted = 0 - AND tb.dict_code = 'sex' - - - - - SELECT a.user_id, - GROUP_CONCAT(b.role_name) role_name - FROM sys_user_role a - LEFT JOIN sys_role b ON a.role_id = b.role_id - GROUP BY a.user_id - - - - - SELECT a.*, - b.organization_name, - c.dict_data_name sex_name, - e.name as groupName, - f.name as gradeName - FROM sys_user a - LEFT JOIN sys_organization b ON a.organization_id = b.organization_id - LEFT JOIN ( - - ) c ON a.sex = c.dict_data_code - LEFT JOIN( - - ) d ON a.user_id = d.user_id - LEFT JOIN sys_user_group e ON a.group_id = e.group_id - LEFT JOIN sys_user_grade f ON a.grade_id = f.grade_id - - - AND a.user_id = #{param.userId} - - - AND a.username LIKE CONCAT('%', #{param.username}, '%') - - - AND a.nickname LIKE CONCAT('%', #{param.nickname}, '%') - - - AND a.type = #{param.type} - - - AND a.sex = #{param.sex} - - - AND a.phone LIKE CONCAT('%', #{param.phone}, '%') - - - AND a.email LIKE CONCAT('%', #{param.email}, '%') - - - AND a.email_verified = #{param.emailVerified} - - - AND a.real_name LIKE CONCAT('%', #{param.realName}, '%') - - - AND a.company_name LIKE CONCAT('%', #{param.companyName}, '%') - - - AND a.id_card LIKE CONCAT('%', #{param.idCard}, '%') - - - AND a.birthday LIKE CONCAT('%', #{param.birthday}, '%') - - - AND a.organization_id = #{param.organizationId} - - - AND a.group_id = #{param.groupId} - - - AND a.organization_id > 0 - - - AND a.merchant_id = #{param.merchantId} - - - AND a.platform = #{param.platform} - - - AND a.`status` = #{param.status} - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - AND a.recommend = #{param.recommend} - - - AND a.grade_id = #{param.gradeId} - - - AND a.is_admin = #{param.isAdmin} - - - AND a.deleted = #{param.deleted} - - - AND a.deleted = 0 - - - AND a.user_id IN (SELECT user_id FROM sys_user_role WHERE role_id=#{param.roleId}) - - - AND a.user_id IN (SELECT user_id FROM sys_user_role WHERE role_code=#{param.roleCode}) - - - AND a.user_id IN - - #{item} - - - - AND a.phone IN - - #{item} - - - - AND a.province LIKE CONCAT('%', #{param.province}, '%') - - - AND a.city LIKE CONCAT('%', #{param.city}, '%') - - - AND a.region LIKE CONCAT('%', #{param.region}, '%') - - - AND b.organization_name LIKE CONCAT('%', #{param.organizationName}, '%') - - - AND c.dict_data_name = #{param.sexName} - - - AND ( - a.username = #{param.keywords} - OR a.user_id = #{param.keywords} - OR a.merchant_id = #{param.keywords} - OR a.nickname LIKE CONCAT('%', #{param.keywords}, '%') - OR a.real_name LIKE CONCAT('%', #{param.keywords}, '%') - OR a.phone LIKE CONCAT('%', #{param.keywords}, '%') - OR a.email = #{param.keywords} - ) - - - AND a.organization_id IN (SELECT organization_id FROM sys_organization WHERE parent_id=#{param.parentId}) - - - - - - - - - - - - - - - - - - - - - - - - - UPDATE sys_user SET grade_id = #{param.gradeId} WHERE user_id = #{param.userId} - - - diff --git a/modules/common/system/mapper/xml/UserOauthMapper.xml b/modules/common/system/mapper/xml/UserOauthMapper.xml deleted file mode 100644 index 049cde1..0000000 --- a/modules/common/system/mapper/xml/UserOauthMapper.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - SELECT a.* - FROM sys_user_oauth a - - - AND a.id = #{param.id} - - - AND a.user_id = #{param.userId} - - - AND a.oauth_type LIKE CONCAT('%', #{param.oauthType}, '%') - - - AND a.oauth_id LIKE CONCAT('%', #{param.oauthId}, '%') - - - AND a.unionid LIKE CONCAT('%', #{param.unionid}, '%') - - - AND a.sort_number = #{param.sortNumber} - - - AND a.comments LIKE CONCAT('%', #{param.comments}, '%') - - - AND a.status = #{param.status} - - - AND a.deleted = #{param.deleted} - - - AND a.deleted = 0 - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - - - - - - - - - diff --git a/modules/common/system/mapper/xml/UserRefereeMapper.xml b/modules/common/system/mapper/xml/UserRefereeMapper.xml deleted file mode 100644 index 67943f7..0000000 --- a/modules/common/system/mapper/xml/UserRefereeMapper.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - SELECT a.* - FROM sys_user_referee a - - - AND a.id = #{param.id} - - - AND a.dealer_id = #{param.dealerId} - - - AND a.user_id = #{param.userId} - - - AND a.level = #{param.level} - - - AND a.comments LIKE CONCAT('%', #{param.comments}, '%') - - - AND a.deleted = #{param.deleted} - - - AND a.deleted = 0 - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - - - - - - - - - diff --git a/modules/common/system/mapper/xml/UserRoleMapper.xml b/modules/common/system/mapper/xml/UserRoleMapper.xml deleted file mode 100644 index 6b1c3e2..0000000 --- a/modules/common/system/mapper/xml/UserRoleMapper.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - INSERT INTO sys_user_role(user_id, role_id) VALUES - - (#{userId}, #{roleId}) - - - - - - - - diff --git a/modules/common/system/mapper/xml/VersionMapper.xml b/modules/common/system/mapper/xml/VersionMapper.xml deleted file mode 100644 index 08a9d87..0000000 --- a/modules/common/system/mapper/xml/VersionMapper.xml +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - SELECT a.* - FROM sys_version a - - - AND a.id = #{param.id} - - - AND a.version_name LIKE CONCAT('%', #{param.versionName}, '%') - - - AND a.version_code = #{param.versionCode} - - - AND a.android_download_url LIKE CONCAT('%', #{param.androidDownloadUrl}, '%') - - - AND a.ios_download_url LIKE CONCAT('%', #{param.iosDownloadUrl}, '%') - - - AND a.update_info LIKE CONCAT('%', #{param.updateInfo}, '%') - - - AND a.is_hard = #{param.isHard} - - - AND a.is_hot = #{param.isHot} - - - AND a.comments LIKE CONCAT('%', #{param.comments}, '%') - - - AND a.sort_number = #{param.sortNumber} - - - AND a.user_id = #{param.userId} - - - AND a.status = #{param.status} - - - AND a.deleted = #{param.deleted} - - - AND a.deleted = 0 - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - - - - - - - - - diff --git a/modules/common/system/mapper/xml/WhiteDomainMapper.xml b/modules/common/system/mapper/xml/WhiteDomainMapper.xml deleted file mode 100644 index 821d441..0000000 --- a/modules/common/system/mapper/xml/WhiteDomainMapper.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - SELECT a.* - FROM sys_white_domain a - - - AND a.id = #{param.id} - - - AND a.domain LIKE CONCAT('%', #{param.domain}, '%') - - - AND a.status = #{param.status} - - - AND a.sort_number = #{param.sortNumber} - - - AND a.user_id = #{param.userId} - - - AND a.deleted = #{param.deleted} - - - AND a.deleted = 0 - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - - - - - - - - - diff --git a/modules/common/system/param/AccessKeyParam.java b/modules/common/system/param/AccessKeyParam.java deleted file mode 100644 index 6d77044..0000000 --- a/modules/common/system/param/AccessKeyParam.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.gxwebsoft.common.system.param; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableLogic; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 查询参数 - * - * @author WebSoft - * @since 2021-08-29 20:35:09 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(description = "角色查询参数") -public class AccessKeyParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @ApiModelProperty("id") - @QueryField(type = QueryType.EQ) - private Integer id; - - @ApiModelProperty("AccessKey") - private String accessKey; - - @ApiModelProperty("AccessSecret") - private String accessSecret; - - @ApiModelProperty("手机号码") - @TableField(exist = false) - private String phone; - - @ApiModelProperty("短信验证码") - @TableField(exist = false) - private String code; - - @ApiModelProperty("备注") - private String comments; - - @ApiModelProperty(value = "是否删除, 0否, 1是") - @TableLogic - private Integer deleted; - - @ApiModelProperty("租户ID") - private Integer tenantId; - -} diff --git a/modules/common/system/param/AlipayParam.java b/modules/common/system/param/AlipayParam.java deleted file mode 100644 index 978c942..0000000 --- a/modules/common/system/param/AlipayParam.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.gxwebsoft.common.system.param; - -import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - * 登录参数 - * - * @author WebSoft - * @since 2021-08-30 17:35:16 - */ -@Data -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(description = "登录参数") -public class AlipayParam implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty("支付宝授权码") - private String authCode; - - @ApiModelProperty("登录账号") - private String username; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - -} diff --git a/modules/common/system/param/AppParam.java b/modules/common/system/param/AppParam.java deleted file mode 100644 index 3213973..0000000 --- a/modules/common/system/param/AppParam.java +++ /dev/null @@ -1,214 +0,0 @@ -package com.gxwebsoft.common.system.param; - -import com.fasterxml.jackson.annotation.JsonInclude; -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.math.BigDecimal; - -/** - * 应用管理记录表查询参数 - * - * @author 科技小王子 - * @since 2023-10-30 22:20:23 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(value = "AppParam对象", description = "应用管理记录表查询参数") -public class AppParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "应用ID") - @QueryField(type = QueryType.EQ) - private Integer appId; - - @ApiModelProperty(value = "应用名称") - private String appName; - - @ApiModelProperty(value = "应用标识") - private String appCode; - - @ApiModelProperty(value = "上级id, 0是顶级") - @QueryField(type = QueryType.EQ) - private Integer parentId; - - @ApiModelProperty(value = "应用类型") - private String appType; - - @ApiModelProperty(value = "应用类型") - private String appTypeMultiple; - - @ApiModelProperty(value = "类型, 0菜单, 1按钮") - @QueryField(type = QueryType.EQ) - private Integer menuType; - - @ApiModelProperty(value = "企业ID") - @QueryField(type = QueryType.EQ) - private Integer companyId; - - @ApiModelProperty(value = "企业名称") - private String companyName; - - @ApiModelProperty(value = "应用图标") - private String appIcon; - - @ApiModelProperty(value = "二维码") - private String appQrcode; - - @ApiModelProperty(value = "链接地址") - private String appUrl; - - @ApiModelProperty(value = "后台管理地址") - private String adminUrl; - - @ApiModelProperty(value = "下载地址") - private String downUrl; - - @ApiModelProperty(value = "链接地址") - private String serverUrl; - - @ApiModelProperty(value = "文件服务器") - private String fileUrl; - - @ApiModelProperty(value = "回调地址") - private String callbackUrl; - - @ApiModelProperty(value = "腾讯文档地址") - private String docsUrl; - - @ApiModelProperty(value = "代码仓库地址") - private String gitUrl; - - @ApiModelProperty(value = "原型图地址") - private String prototypeUrl; - - @ApiModelProperty(value = "IP白名单") - private String ipAddress; - - @ApiModelProperty(value = "应用截图") - private String images; - - @ApiModelProperty(value = "应用包名") - private String packageName; - - @ApiModelProperty(value = "下载次数") - @QueryField(type = QueryType.EQ) - private Integer clicks; - - @ApiModelProperty(value = "安装次数") - @QueryField(type = QueryType.EQ) - private Integer installs; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "应用介绍") - private String content; - - @ApiModelProperty(value = "项目需求") - private String requirement; - - @ApiModelProperty(value = "开发者(个人或公司)") - private String developer; - - @ApiModelProperty(value = "项目负责人") - private String director; - - @ApiModelProperty(value = "项目经理") - private String projectDirector; - - @ApiModelProperty(value = "业务员") - private String salesman; - - @ApiModelProperty(value = "软件定价") - @QueryField(type = QueryType.EQ) - private BigDecimal price; - - @ApiModelProperty(value = "划线价格") - @QueryField(type = QueryType.EQ) - private BigDecimal linePrice; - - @ApiModelProperty(value = "评分") - private String score; - - @ApiModelProperty(value = "星级") - private String star; - - @ApiModelProperty(value = "菜单路由地址") - private String path; - - @ApiModelProperty(value = "菜单组件地址, 目录可为空") - private String component; - - @ApiModelProperty(value = "权限标识") - private String authority; - - @ApiModelProperty(value = "打开位置") - private String target; - - @ApiModelProperty(value = "是否隐藏, 0否, 1是(仅注册路由不显示在左侧菜单)") - @QueryField(type = QueryType.EQ) - private Integer hide; - - @ApiModelProperty(value = "禁止搜索，1禁止 0 允许") - @QueryField(type = QueryType.EQ) - private Integer search; - - @ApiModelProperty(value = "菜单侧栏选中的path") - private String active; - - @ApiModelProperty(value = "其它路由元信息") - private String meta; - - @ApiModelProperty(value = "版本，0正式版 1体验版 2开发版") - private String edition; - - @ApiModelProperty(value = "版本号") - private String version; - - @ApiModelProperty(value = "是否已安装") - @QueryField(type = QueryType.EQ) - private Integer isUse; - - @ApiModelProperty(value = "附近1") - private String file1; - - @ApiModelProperty(value = "附件2") - private String file2; - - @ApiModelProperty(value = "附件3") - private String file3; - - @ApiModelProperty(value = "应用状态") - private String appStatus; - - @ApiModelProperty(value = "排序(数字越小越靠前)") - @QueryField(type = QueryType.EQ) - private Integer sortNumber; - - @ApiModelProperty(value = "状态, 0正常, 1冻结") - @QueryField(type = QueryType.EQ) - private Integer status; - - @ApiModelProperty(value = "是否删除, 0否, 1是") - @QueryField(type = QueryType.EQ) - private Integer deleted; - - @ApiModelProperty(value = "用户ID") - @QueryField(type = QueryType.EQ) - private Integer userId; - - @ApiModelProperty(value = "机构id") - @QueryField(type = QueryType.EQ) - private Integer organizationId; - - @ApiModelProperty(value = "租户编号") - private String tenantCode; - -} diff --git a/modules/common/system/param/AppRenewParam.java b/modules/common/system/param/AppRenewParam.java deleted file mode 100644 index 519996a..0000000 --- a/modules/common/system/param/AppRenewParam.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.gxwebsoft.common.system.param; - -import com.fasterxml.jackson.annotation.JsonInclude; -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.math.BigDecimal; - -/** - * 续费管理查询参数 - * - * @author 科技小王子 - * @since 2023-11-14 14:14:07 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(value = "AppRenewParam对象", description = "续费管理查询参数") -public class AppRenewParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "自增ID") - @QueryField(type = QueryType.EQ) - private Integer appRenewId; - - @ApiModelProperty(value = "续费金额") - @QueryField(type = QueryType.EQ) - private BigDecimal money; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "开始时间") - private String startTime; - - @ApiModelProperty(value = "到期时间") - private String endTime; - - @ApiModelProperty(value = "用户ID") - @QueryField(type = QueryType.EQ) - private Integer userId; - - @ApiModelProperty(value = "应用ID") - @QueryField(type = QueryType.EQ) - private Integer appId; - - @ApiModelProperty(value = "状态, 0正常, 1待确认") - @QueryField(type = QueryType.EQ) - private Integer status; - -} diff --git a/modules/common/system/param/AppUrlParam.java b/modules/common/system/param/AppUrlParam.java deleted file mode 100644 index dc33a61..0000000 --- a/modules/common/system/param/AppUrlParam.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.gxwebsoft.common.system.param; - -import com.fasterxml.jackson.annotation.JsonInclude; -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 域名管理记录表查询参数 - * - * @author 科技小王子 - * @since 2023-10-30 22:20:23 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(value = "AppUrlParam对象", description = "域名管理记录表查询参数") -public class AppUrlParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "自增ID") - @QueryField(type = QueryType.EQ) - private Integer appUrlId; - - @ApiModelProperty(value = "应用ID") - @QueryField(type = QueryType.EQ) - private Integer appId; - - @ApiModelProperty(value = "域名类型") - private String type; - - @ApiModelProperty(value = "域名") - private String domain; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "状态, 0正常, 1待确认") - @QueryField(type = QueryType.EQ) - private Integer status; - -} diff --git a/modules/common/system/param/AppUserParam.java b/modules/common/system/param/AppUserParam.java deleted file mode 100644 index 8605cb3..0000000 --- a/modules/common/system/param/AppUserParam.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.gxwebsoft.common.system.param; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 应用成员查询参数 - * - * @author 科技小王子 - * @since 2023-10-30 22:20:23 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(value = "AppUserParam对象", description = "应用成员查询参数") -public class AppUserParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "自增ID") - @QueryField(type = QueryType.EQ) - private Integer appUserId; - - @ApiModelProperty(value = "角色，10体验成员 20开发者成员 30管理员 ") - @QueryField(type = QueryType.EQ) - private Integer role; - - @ApiModelProperty(value = "用户ID") - @QueryField(type = QueryType.EQ) - private Integer userId; - - @ApiModelProperty(value = "应用ID") - @QueryField(type = QueryType.EQ) - private Integer appId; - - @ApiModelProperty(value = "状态, 0正常, 1待确认") - @QueryField(type = QueryType.EQ) - private Integer status; - - @ApiModelProperty(value = "昵称") - @TableField(exist = false) - private String nickname; - - @ApiModelProperty(value = "用户名") - @TableField(exist = false) - private String username; - - @ApiModelProperty(value = "手机号码") - @TableField(exist = false) - private String phone; - - @ApiModelProperty(value = "邮箱") - @TableField(exist = false) - private String email; - - @ApiModelProperty(value = "头像") - @TableField(exist = false) - private String avatar; - -} diff --git a/modules/common/system/param/CacheParam.java b/modules/common/system/param/CacheParam.java deleted file mode 100644 index 0e43e93..0000000 --- a/modules/common/system/param/CacheParam.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.gxwebsoft.common.system.param; - -import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - * 缓存管理 - * - * @author WebSoft - * @since 2021-08-30 17:35:16 - */ -@Data -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(description = "缓存管理") -public class CacheParam implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty("key") - private String key; - -} diff --git a/modules/common/system/param/ChatConversationParam.java b/modules/common/system/param/ChatConversationParam.java deleted file mode 100644 index 2d5cdcd..0000000 --- a/modules/common/system/param/ChatConversationParam.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.gxwebsoft.common.system.param; - -import com.fasterxml.jackson.annotation.JsonInclude; -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 聊天消息表查询参数 - * - * @author 科技小王子 - * @since 2024-04-27 15:57:27 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(value = "ChatConversationParam对象", description = "聊天消息表查询参数") -public class ChatConversationParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "自增ID") - @QueryField(type = QueryType.EQ) - private Integer id; - - @ApiModelProperty(value = "用户ID") - @QueryField(type = QueryType.EQ) - private Integer userId; - - @ApiModelProperty(value = "好友ID") - @QueryField(type = QueryType.EQ) - private Integer friendId; - - @ApiModelProperty(value = "消息类型") - @QueryField(type = QueryType.EQ) - private Integer type; - - @ApiModelProperty(value = "消息内容") - private String content; - - @ApiModelProperty(value = "未读消息") - @QueryField(type = QueryType.EQ) - private Integer unRead; - - @ApiModelProperty(value = "状态, 0未读, 1已读") - @QueryField(type = QueryType.EQ) - private Integer status; - - @ApiModelProperty(value = "是否删除, 0否, 1是") - @QueryField(type = QueryType.EQ) - private Integer deleted; - -} diff --git a/modules/common/system/param/ChatMessageParam.java b/modules/common/system/param/ChatMessageParam.java deleted file mode 100644 index 4f535ad..0000000 --- a/modules/common/system/param/ChatMessageParam.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.gxwebsoft.common.system.param; - -import com.fasterxml.jackson.annotation.JsonInclude; -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import io.swagger.models.auth.In; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.Set; - -/** - * 聊天消息表查询参数 - * - * @author 科技小王子 - * @since 2024-04-27 15:57:27 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(value = "ChatMessageParam对象", description = "聊天消息表查询参数") -public class ChatMessageParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "自增ID") - @QueryField(type = QueryType.EQ) - private Integer id; - - @ApiModelProperty(value = "发送人ID") - @QueryField(type = QueryType.EQ) - private Integer formUserId; - - @ApiModelProperty(value = "接收人ID") - @QueryField(type = QueryType.EQ) - private Integer toUserId; - - @ApiModelProperty(value = "消息类型") - private String type; - - @ApiModelProperty(value = "消息内容") - private String content; - - @ApiModelProperty(value = "屏蔽接收方") - @QueryField(type = QueryType.EQ) - private Integer sideTo; - - @ApiModelProperty(value = "屏蔽发送方") - @QueryField(type = QueryType.EQ) - private Integer sideFrom; - - @ApiModelProperty(value = "是否撤回") - @QueryField(type = QueryType.EQ) - private Integer withdraw; - - @ApiModelProperty(value = "文件信息") - private String fileInfo; - - @ApiModelProperty(value = "存在联系方式") - @QueryField(type = QueryType.EQ) - private Integer hasContact; - - @ApiModelProperty(value = "状态, 0未读, 1已读") - @QueryField(type = QueryType.EQ) - private Integer status; - - @ApiModelProperty(value = "是否删除, 0否, 1是") - @QueryField(type = QueryType.EQ) - private Integer deleted; - - @ApiModelProperty(value = "接收人ID集合") - private Set toUserIds; - -} diff --git a/modules/common/system/param/CompanyParam.java b/modules/common/system/param/CompanyParam.java deleted file mode 100644 index ba26c48..0000000 --- a/modules/common/system/param/CompanyParam.java +++ /dev/null @@ -1,153 +0,0 @@ -package com.gxwebsoft.common.system.param; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.Set; - -/** - * 企业信息查询参数 - * - * @author 科技小王子 - * @since 2023-05-27 14:57:34 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(value = "CompanyParam对象", description = "企业信息查询参数") -public class CompanyParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "企业id") - @QueryField(type = QueryType.EQ) - private Integer companyId; - - @ApiModelProperty(value = "企业简称") - private String shortName; - - @ApiModelProperty(value = "企业全称") - private String companyName; - - @ApiModelProperty(value = "企业标识") - private String companyCode; - - @ApiModelProperty(value = "类型 10企业 20政府单位") - @QueryField(type = QueryType.EQ) - private String companyType; - - @ApiModelProperty(value = "企业类型 多选") - private String companyTypeMultiple; - - @ApiModelProperty(value = "应用标识") - private String companyLogo; - - @ApiModelProperty(value = "企业域名") - private String domain; - - @ApiModelProperty(value = "联系电话") - private String phone; - - @ApiModelProperty(value = "电子邮箱") - @QueryField(type = QueryType.EQ) - private String email; - - @ApiModelProperty(value = "企业法人") - private String businessEntity; - - @ApiModelProperty(value = "发票抬头") - private String invoiceHeader; - - @ApiModelProperty(value = "服务开始时间") - private String startTime; - - @ApiModelProperty(value = "服务到期时间") - private String expirationTime; - - @ApiModelProperty(value = "应用版本 10体验版 20授权版 30旗舰版") - @QueryField(type = QueryType.EQ) - private Integer version; - - @ApiModelProperty(value = "成员数量") - @QueryField(type = QueryType.EQ) - private Integer members; - - @ApiModelProperty(value = "行业类型(父级)") - private String industryParent; - - @ApiModelProperty(value = "行业类型(子级)") - private String industryChild; - - @ApiModelProperty(value = "部门数量") - @QueryField(type = QueryType.EQ) - private Integer departments; - - @ApiModelProperty(value = "所在国家") - private String country; - - @ApiModelProperty(value = "所在省份") - private String province; - - @ApiModelProperty(value = "所在城市") - private String city; - - @ApiModelProperty(value = "所在辖区") - private String region; - - @ApiModelProperty(value = "街道地址") - private String address; - - @ApiModelProperty(value = "经度") - private String longitude; - - @ApiModelProperty(value = "纬度") - private String latitude; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "是否实名认证") - @QueryField(type = QueryType.EQ) - private Integer authentication; - - @ApiModelProperty(value = "是否推荐") - private Boolean recommend; - - @ApiModelProperty(value = "状态") - @QueryField(type = QueryType.EQ) - private Integer status; - - @ApiModelProperty(value = "用户ID") - @QueryField(type = QueryType.EQ) - private Integer userId; - - @ApiModelProperty("商户ID") - @QueryField(type = QueryType.EQ) - private Integer merchantId; - - @ApiModelProperty(value = "是否删除, 0否, 1是") - @QueryField(type = QueryType.EQ) - private Integer deleted; - - @ApiModelProperty(value = "是否默认企业主体") - @QueryField(type = QueryType.EQ) - private Boolean authoritative; - - @ApiModelProperty(value = "租户号") - private Integer tenantId; - - @ApiModelProperty(value = "应用名称") - @QueryField(type = QueryType.EQ) - private String appName; - - @ApiModelProperty(value = "企业id集合") - @TableField(exist = false) - private Set companyIds; - -} diff --git a/modules/common/system/param/DictDataParam.java b/modules/common/system/param/DictDataParam.java deleted file mode 100644 index 68d85b9..0000000 --- a/modules/common/system/param/DictDataParam.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.gxwebsoft.common.system.param; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 字典数据查询参数 - * - * @author WebSoft - * @since 2021-08-28 22:12:02 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(description = "字典数据查询参数") -public class DictDataParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "字典数据id") - @QueryField(type = QueryType.EQ) - private Integer dictDataId; - - @ApiModelProperty(value = "字典id") - @QueryField(type = QueryType.EQ) - private Integer dictId; - - @ApiModelProperty(value = "字典数据标识") - private String dictDataCode; - - @ApiModelProperty(value = "字典数据名称") - private String dictDataName; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "字典代码") - @TableField(exist = false) - private String dictCode; - - @ApiModelProperty(value = "字典名称") - @TableField(exist = false) - private String dictName; - - @ApiModelProperty(value = "字典数据代码或字典数据名称") - @TableField(exist = false) - private String keywords; - -} diff --git a/modules/common/system/param/DictParam.java b/modules/common/system/param/DictParam.java deleted file mode 100644 index a4fcefc..0000000 --- a/modules/common/system/param/DictParam.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.gxwebsoft.common.system.param; - -import com.fasterxml.jackson.annotation.JsonInclude; -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 字典查询参数 - * - * @author WebSoft - * @since 2021-08-28 22:12:01 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(description = "字典查询参数") -public class DictParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @QueryField(type = QueryType.EQ) - @ApiModelProperty(value = "字典id") - private Integer dictId; - - @ApiModelProperty(value = "字典标识") - private String dictCode; - - @ApiModelProperty(value = "字典名称") - private String dictName; - - @ApiModelProperty(value = "备注") - private String comments; - -} diff --git a/modules/common/system/param/DictionaryDataParam.java b/modules/common/system/param/DictionaryDataParam.java deleted file mode 100644 index 9ae7597..0000000 --- a/modules/common/system/param/DictionaryDataParam.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.gxwebsoft.common.system.param; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 字典数据查询参数 - * - * @author WebSoft - * @since 2021-08-28 22:12:02 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(description = "字典数据查询参数") -public class DictionaryDataParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "字典数据id") - @QueryField(type = QueryType.EQ) - private Integer dictDataId; - - @ApiModelProperty(value = "字典id") - @QueryField(type = QueryType.EQ) - private Integer dictId; - - @ApiModelProperty(value = "字典数据标识") - private String dictDataCode; - - @ApiModelProperty(value = "字典数据名称") - private String dictDataName; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "字典代码") - @TableField(exist = false) - private String dictCode; - - @ApiModelProperty(value = "字典名称") - @TableField(exist = false) - private String dictName; - - @ApiModelProperty(value = "字典数据代码或字典数据名称") - @TableField(exist = false) - private String keywords; - -} diff --git a/modules/common/system/param/DictionaryParam.java b/modules/common/system/param/DictionaryParam.java deleted file mode 100644 index d3d5ef2..0000000 --- a/modules/common/system/param/DictionaryParam.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.gxwebsoft.common.system.param; - -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 字典查询参数 - * - * @author WebSoft - * @since 2021-08-28 22:12:01 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(description = "字典查询参数") -public class DictionaryParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @QueryField(type = QueryType.EQ) - @ApiModelProperty(value = "字典id") - private Integer dictId; - - @ApiModelProperty(value = "字典标识") - private String dictCode; - - @ApiModelProperty(value = "字典名称") - private String dictName; - - @ApiModelProperty(value = "备注") - private String comments; - -} diff --git a/modules/common/system/param/EnvironmentParam.java b/modules/common/system/param/EnvironmentParam.java deleted file mode 100644 index 6e321e5..0000000 --- a/modules/common/system/param/EnvironmentParam.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.gxwebsoft.common.system.param; - -import com.fasterxml.jackson.annotation.JsonInclude; -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 环境管理查询参数 - * - * @author 科技小王子 - * @since 2023-10-18 08:45:13 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(value = "EnvironmentParam对象", description = "环境管理查询参数") -public class EnvironmentParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "插件id") - @QueryField(type = QueryType.EQ) - private Integer id; - - @ApiModelProperty(value = "环境名称") - private String environmentName; - - @ApiModelProperty(value = "环境编号") - private String environmentCode; - - @ApiModelProperty(value = "服务器厂商") - private String brand; - - @ApiModelProperty(value = "服务器IP") - private String serverIp; - - @ApiModelProperty(value = "模块访问地址") - private String modulesUrl; - - @ApiModelProperty(value = "模块API") - private String modulesApi; - - @ApiModelProperty(value = "排序号") - @QueryField(type = QueryType.EQ) - private Integer sortNumber; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "状态, 10待审核 20已通过 30已驳回") - @QueryField(type = QueryType.EQ) - private Integer status; - - @ApiModelProperty(value = "用户ID") - @QueryField(type = QueryType.EQ) - private Integer userId; - - @ApiModelProperty(value = "是否删除, 0否, 1是") - @QueryField(type = QueryType.EQ) - private Integer deleted; - -} diff --git a/modules/common/system/param/FileRecordParam.java b/modules/common/system/param/FileRecordParam.java deleted file mode 100644 index 39e5edf..0000000 --- a/modules/common/system/param/FileRecordParam.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.gxwebsoft.common.system.param; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableLogic; -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 文件上传记录查询参数 - * - * @author WebSoft - * @since 2021-08-30 11:29:31 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(description = "文件上传记录查询参数") -public class FileRecordParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @QueryField(type = QueryType.EQ) - @ApiModelProperty("主键id") - private Integer id; - - @QueryField(type = QueryType.EQ) - @ApiModelProperty("分组ID") - private Integer groupId; - - @ApiModelProperty("文件名称") - private String name; - - @ApiModelProperty("文件存储路径") - private String path; - - @QueryField(type = QueryType.EQ) - @ApiModelProperty("应用ID") - private Integer appId; - - @QueryField(type = QueryType.EQ) - @ApiModelProperty("企业ID") - private Integer companyId; - - @QueryField(type = QueryType.EQ) - @ApiModelProperty("创建人") - private Integer createUserId; - - @ApiModelProperty("备注") - private String comments; - - @ApiModelProperty("文件类型") - private String contentType; - - @ApiModelProperty("是否删除, 0否, 1是") - @TableLogic - private Integer deleted; - - @ApiModelProperty("创建人账号") - @TableField(exist = false) - private String createUsername; - - @ApiModelProperty("创建人名称") - @TableField(exist = false) - private String createNickname; - - @ApiModelProperty("用户头像") - @TableField(exist = false) - private String avatar; - -} diff --git a/modules/common/system/param/LoginParam.java b/modules/common/system/param/LoginParam.java deleted file mode 100644 index 172c3ca..0000000 --- a/modules/common/system/param/LoginParam.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.gxwebsoft.common.system.param; - -import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - * 登录参数 - * - * @author WebSoft - * @since 2021-08-30 17:35:16 - */ -@Data -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(description = "登录参数") -public class LoginParam implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty("账号") - private String username; - - @ApiModelProperty("手机号码") - private String phone; - - @ApiModelProperty("短信验证码") - private String code; - - @ApiModelProperty("密码") - private String password; - - @ApiModelProperty("是否管理员") - private Boolean isAdmin; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - -} diff --git a/modules/common/system/param/LoginRecordParam.java b/modules/common/system/param/LoginRecordParam.java deleted file mode 100644 index 9ceb8d6..0000000 --- a/modules/common/system/param/LoginRecordParam.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.gxwebsoft.common.system.param; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 登录日志查询参数 - * - * @author WebSoft - * @since 2021-08-29 19:09:23 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(description = "登录日志查询参数") -public class LoginRecordParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @QueryField(type = QueryType.EQ) - @ApiModelProperty("主键id") - private Integer id; - - @ApiModelProperty("用户账号") - private String username; - - @ApiModelProperty("操作系统") - private String os; - - @ApiModelProperty("设备名") - private String device; - - @ApiModelProperty("浏览器类型") - private String browser; - - @ApiModelProperty("ip地址") - private String ip; - - @QueryField(type = QueryType.EQ) - @ApiModelProperty("操作类型, 0登录成功, 1登录失败, 2退出登录, 3续签token") - private Integer loginType; - - @ApiModelProperty("备注") - private String comments; - - @ApiModelProperty("用户id") - @TableField(exist = false) - private Integer userId; - - @ApiModelProperty("用户昵称") - @TableField(exist = false) - private String nickname; - -} diff --git a/modules/common/system/param/MenuParam.java b/modules/common/system/param/MenuParam.java deleted file mode 100644 index 34eef38..0000000 --- a/modules/common/system/param/MenuParam.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.gxwebsoft.common.system.param; - -import com.baomidou.mybatisplus.annotation.TableLogic; -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 菜单查询参数 - * - * @author WebSoft - * @since 2021-08-29 19:36:10 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(description = "菜单查询参数") -public class MenuParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @ApiModelProperty("菜单id") - @QueryField(type = QueryType.EQ) - private Integer menuId; - - @ApiModelProperty("上级id, 0是顶级") - @QueryField(type = QueryType.EQ) - private Integer parentId; - - @ApiModelProperty("菜单名称") - private String title; - - @ApiModelProperty("菜单路由关键字") - private String path; - - @ApiModelProperty("菜单组件地址") - private String component; - - @ApiModelProperty("模块ID") - private String modules; - - @ApiModelProperty("菜单类型, 0菜单, 1按钮") - @QueryField(type = QueryType.EQ) - private Integer menuType; - - @ApiModelProperty("权限标识") - private String authority; - - @ApiModelProperty("菜单图标") - private String icon; - - @ApiModelProperty("关联应用") - private Integer appId; - - @ApiModelProperty("是否隐藏, 0否, 1是(仅注册路由不显示左侧菜单)") - @QueryField(type = QueryType.EQ) - private Integer hide; - - @ApiModelProperty("是否删除, 0否, 1是") - @TableLogic - private Integer deleted; - - @ApiModelProperty("租户ID") - @QueryField(type = QueryType.EQ) - private Integer tenantId; - - @ApiModelProperty("企业ID") - @QueryField(type = QueryType.EQ) - private Integer companyId; - -} diff --git a/modules/common/system/param/MerchantAccountParam.java b/modules/common/system/param/MerchantAccountParam.java deleted file mode 100644 index 474c6a6..0000000 --- a/modules/common/system/param/MerchantAccountParam.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.gxwebsoft.common.system.param; - -import com.fasterxml.jackson.annotation.JsonInclude; -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 商户账号查询参数 - * - * @author 科技小王子 - * @since 2024-04-19 12:02:24 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(value = "MerchantAccountParam对象", description = "商户账号查询参数") -public class MerchantAccountParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "ID") - @QueryField(type = QueryType.EQ) - private Integer id; - - @ApiModelProperty(value = "商户手机号") - @QueryField(type = QueryType.EQ) - private String phone; - - @ApiModelProperty(value = "真实姓名") - private String realName; - - @ApiModelProperty(value = "商户ID") - @QueryField(type = QueryType.EQ) - private Integer merchantId; - - @ApiModelProperty(value = "用户ID") - @QueryField(type = QueryType.EQ) - private Integer userId; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "状态") - @QueryField(type = QueryType.EQ) - private Integer status; - - @ApiModelProperty(value = "排序号") - @QueryField(type = QueryType.EQ) - private Integer sortNumber; - -} diff --git a/modules/common/system/param/MerchantApplyParam.java b/modules/common/system/param/MerchantApplyParam.java deleted file mode 100644 index 329d654..0000000 --- a/modules/common/system/param/MerchantApplyParam.java +++ /dev/null @@ -1,82 +0,0 @@ -package com.gxwebsoft.common.system.param; - -import com.fasterxml.jackson.annotation.JsonInclude; -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.math.BigDecimal; - -/** - * 商户入驻申请查询参数 - * - * @author 科技小王子 - * @since 2024-04-05 01:24:36 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(value = "MerchantApplyParam对象", description = "商户入驻申请查询参数") -public class MerchantApplyParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "ID") - @QueryField(type = QueryType.EQ) - private Integer applyId; - - @ApiModelProperty(value = "商户名称") - private String merchantName; - - @ApiModelProperty(value = "商户图标") - private String image; - - @ApiModelProperty(value = "商户手机号") - private String phone; - - @ApiModelProperty(value = "商户姓名") - private String realName; - - @ApiModelProperty(value = "店铺类型") - private String shopType; - - @ApiModelProperty(value = "商户分类") - private String category; - - @ApiModelProperty(value = "手续费") - @QueryField(type = QueryType.EQ) - private BigDecimal commission; - - @ApiModelProperty(value = "关键字") - private String keywords; - - @ApiModelProperty(value = "资质图片") - private String files; - - @ApiModelProperty(value = "是否自营") - @QueryField(type = QueryType.EQ) - private Integer ownStore; - - @ApiModelProperty(value = "是否推荐") - @QueryField(type = QueryType.EQ) - private Integer recommend; - - @ApiModelProperty(value = "是否需要审核") - @QueryField(type = QueryType.EQ) - private Integer goodsReview; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "状态") - @QueryField(type = QueryType.EQ) - private Integer status; - - @ApiModelProperty(value = "排序号") - @QueryField(type = QueryType.EQ) - private Integer sortNumber; - -} diff --git a/modules/common/system/param/MerchantParam.java b/modules/common/system/param/MerchantParam.java deleted file mode 100644 index 3844643..0000000 --- a/modules/common/system/param/MerchantParam.java +++ /dev/null @@ -1,99 +0,0 @@ -package com.gxwebsoft.common.system.param; - -import com.baomidou.mybatisplus.annotation.TableLogic; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.math.BigDecimal; - -/** - * 商户查询参数 - * - * @author 科技小王子 - * @since 2024-04-05 00:03:54 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(value = "MerchantParam对象", description = "商户查询参数") -public class MerchantParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "ID") - @QueryField(type = QueryType.EQ) - private Integer merchantId; - - @ApiModelProperty(value = "商户名称") - private String merchantName; - - @ApiModelProperty(value = "商户标识") - private String merchantCode; - - @ApiModelProperty(value = "商户图标") - private String image; - - @ApiModelProperty(value = "商户手机号") - private String phone; - - @ApiModelProperty(value = "商户姓名") - private String realName; - - @ApiModelProperty(value = "店铺类型") - private String shopType; - - @ApiModelProperty(value = "商户分类") - private String category; - - @ApiModelProperty(value = "所在省份") - private String province; - - @ApiModelProperty(value = "所在城市") - private String city; - - @ApiModelProperty(value = "所在辖区") - private String region; - - @ApiModelProperty(value = "手续费") - @QueryField(type = QueryType.EQ) - private BigDecimal commission; - - @ApiModelProperty(value = "关键字") - private String keywords; - - @ApiModelProperty(value = "资质图片") - private String files; - - @ApiModelProperty(value = "是否自营") - @QueryField(type = QueryType.EQ) - private Integer ownStore; - - @ApiModelProperty(value = "是否推荐") - @QueryField(type = QueryType.EQ) - private Integer recommend; - - @ApiModelProperty(value = "是否需要审核") - @QueryField(type = QueryType.EQ) - private Integer goodsReview; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "状态") - @QueryField(type = QueryType.EQ) - private Integer status; - - @ApiModelProperty("是否删除, 0否, 1是") - @TableLogic - private Integer deleted; - - @ApiModelProperty(value = "排序号") - @QueryField(type = QueryType.EQ) - private Integer sortNumber; - -} diff --git a/modules/common/system/param/MerchantTypeParam.java b/modules/common/system/param/MerchantTypeParam.java deleted file mode 100644 index 7538b58..0000000 --- a/modules/common/system/param/MerchantTypeParam.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.gxwebsoft.common.system.param; - -import com.fasterxml.jackson.annotation.JsonInclude; -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 商户类型查询参数 - * - * @author 科技小王子 - * @since 2024-04-05 00:08:51 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(value = "MerchantTypeParam对象", description = "商户类型查询参数") -public class MerchantTypeParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "ID") - @QueryField(type = QueryType.EQ) - private Integer id; - - @ApiModelProperty(value = "店铺类型") - private String name; - - @ApiModelProperty(value = "店铺入驻条件") - private String comments; - - @ApiModelProperty(value = "状态") - @QueryField(type = QueryType.EQ) - private Integer status; - - @ApiModelProperty(value = "排序号") - @QueryField(type = QueryType.EQ) - private Integer sortNumber; - -} diff --git a/modules/common/system/param/ModulesParam.java b/modules/common/system/param/ModulesParam.java deleted file mode 100644 index febdd80..0000000 --- a/modules/common/system/param/ModulesParam.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.gxwebsoft.common.system.param; - -import com.fasterxml.jackson.annotation.JsonInclude; -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 模块管理查询参数 - * - * @author 科技小王子 - * @since 2023-10-18 15:53:43 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(value = "ModulesParam对象", description = "模块管理查询参数") -public class ModulesParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "插件id") - @QueryField(type = QueryType.EQ) - private Integer id; - - @ApiModelProperty(value = "环境编号") - private String modules; - - @ApiModelProperty(value = "模块访问地址") - private String modulesUrl; - - @ApiModelProperty(value = "排序号") - @QueryField(type = QueryType.EQ) - private Integer sortNumber; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "状态, 10待审核 20已通过 30已驳回") - @QueryField(type = QueryType.EQ) - private Integer status; - - @ApiModelProperty(value = "用户ID") - @QueryField(type = QueryType.EQ) - private Integer userId; - - @ApiModelProperty(value = "是否删除, 0否, 1是") - @QueryField(type = QueryType.EQ) - private Integer deleted; - -} diff --git a/modules/common/system/param/NoticeParam.java b/modules/common/system/param/NoticeParam.java deleted file mode 100644 index 510455b..0000000 --- a/modules/common/system/param/NoticeParam.java +++ /dev/null @@ -1,86 +0,0 @@ -package com.gxwebsoft.common.system.param; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 消息记录表查询参数 - * - * @author 科技小王子 - * @since 2023-03-22 14:07:26 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(value = "NoticeParam对象", description = "消息记录表查询参数") -public class NoticeParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "ID") - @QueryField(type = QueryType.EQ) - private Integer noticeId; - - @ApiModelProperty(value = "消息类型") - private String type; - - @ApiModelProperty(value = "标题") - private String title; - - @ApiModelProperty(value = "图标") - private String icon; - - @ApiModelProperty(value = "颜色") - private String color; - - @ApiModelProperty(value = "内容") - private String content; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "消息来源") - private String source; - - @ApiModelProperty(value = "来源记录ID") - private Integer sourceId; - - @ApiModelProperty(value = "路由地址") - private String path; - - @ApiModelProperty(value = "渠道, 0发送 1回复") - private Integer channel; - - @ApiModelProperty(value = "用户ID") - @QueryField(type = QueryType.EQ) - private Integer userId; - - @ApiModelProperty(value = "租户id") - @QueryField(type = QueryType.EQ) - private Integer tenantId; - - @ApiModelProperty(value = "状态, 0待处理, 1已完成") - @QueryField(type = QueryType.EQ) - private Integer status; - - @ApiModelProperty(value = "是否删除, 0否, 1是") - @QueryField(type = QueryType.EQ) - private Integer deleted; - - @ApiModelProperty(value = "昵称") - @TableField(exist = false) - private String nickname; - - @ApiModelProperty(value = "是否已查阅") - private Integer isRead; - - @ApiModelProperty(value = "任务状态") - private Integer progress; - -} diff --git a/modules/common/system/param/OperationRecordParam.java b/modules/common/system/param/OperationRecordParam.java deleted file mode 100644 index 7c5e344..0000000 --- a/modules/common/system/param/OperationRecordParam.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.gxwebsoft.common.system.param; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 操作日志参数 - * - * @author WebSoft - * @since 2021-08-29 20:35:09 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(description = "操作日志参数") -public class OperationRecordParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @ApiModelProperty("主键id") - @QueryField(type = QueryType.EQ) - private Integer id; - - @ApiModelProperty("用户id") - @QueryField(type = QueryType.EQ) - private Integer userId; - - @ApiModelProperty("操作模块") - private String module; - - @ApiModelProperty("操作功能") - private String description; - - @ApiModelProperty("请求地址") - private String url; - - @ApiModelProperty("请求方式") - private String requestMethod; - - @ApiModelProperty("调用方法") - private String method; - - @ApiModelProperty("ip地址") - private String ip; - - @ApiModelProperty("备注") - private String comments; - - @ApiModelProperty("状态, 0成功, 1异常") - @QueryField(type = QueryType.EQ) - private Integer status; - - @ApiModelProperty("用户账号") - @TableField(exist = false) - private String username; - - @ApiModelProperty("用户昵称") - @TableField(exist = false) - private String nickname; - -} diff --git a/modules/common/system/param/OrderInfoParam.java b/modules/common/system/param/OrderInfoParam.java deleted file mode 100644 index 9e77331..0000000 --- a/modules/common/system/param/OrderInfoParam.java +++ /dev/null @@ -1,101 +0,0 @@ -package com.gxwebsoft.common.system.param; - -import com.fasterxml.jackson.annotation.JsonInclude; -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.math.BigDecimal; - -/** - * 查询参数 - * - * @author 科技小王子 - * @since 2024-05-10 18:02:54 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(value = "OrderInfoParam对象", description = "查询参数") -public class OrderInfoParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @QueryField(type = QueryType.EQ) - private Integer id; - - @ApiModelProperty(value = "关联订单表id") - @QueryField(type = QueryType.EQ) - private Integer oid; - - @ApiModelProperty(value = "关联场馆id") - @QueryField(type = QueryType.EQ) - private Integer sid; - - @ApiModelProperty(value = "关联场地id") - @QueryField(type = QueryType.EQ) - private Integer fid; - - @ApiModelProperty(value = "场馆") - private String siteName; - - @ApiModelProperty(value = "场地") - private String fieldName; - - @ApiModelProperty(value = "预约时间段") - private String dateTime; - - @ApiModelProperty(value = "单价") - @QueryField(type = QueryType.EQ) - private BigDecimal price; - - @ApiModelProperty(value = "儿童价") - @QueryField(type = QueryType.EQ) - private BigDecimal childrenPrice; - - @ApiModelProperty(value = "成人人数") - @QueryField(type = QueryType.EQ) - private Boolean adultNum; - - @ApiModelProperty(value = "儿童人数") - @QueryField(type = QueryType.EQ) - private Boolean childrenNum; - - @ApiModelProperty(value = "1已付款，2未付款，3无需付款或占用状态") - @QueryField(type = QueryType.EQ) - private Boolean payStatus; - - @ApiModelProperty(value = "是否免费：1免费、2收费") - @QueryField(type = QueryType.EQ) - private Boolean isFree; - - @ApiModelProperty(value = "是否支持儿童票：1支持，2不支持") - @QueryField(type = QueryType.EQ) - private Boolean isChildren; - - @ApiModelProperty(value = "预订类型：1全场，2半场") - @QueryField(type = QueryType.EQ) - private Boolean type; - - @ApiModelProperty(value = "组合数据:日期+时间段+场馆id+场地id") - private String mergeData; - - @ApiModelProperty(value = "开场时间") - @QueryField(type = QueryType.EQ) - private Integer startTime; - - @ApiModelProperty(value = "下单时间") - @QueryField(type = QueryType.EQ) - private Integer orderTime; - - @ApiModelProperty(value = "毫秒时间戳") - private Long timeFlag; - - @ApiModelProperty(value = "是否删除, 0否, 1是") - @QueryField(type = QueryType.EQ) - private Integer deleted; - -} diff --git a/modules/common/system/param/OrderParam.java b/modules/common/system/param/OrderParam.java deleted file mode 100644 index 3a16c42..0000000 --- a/modules/common/system/param/OrderParam.java +++ /dev/null @@ -1,135 +0,0 @@ -package com.gxwebsoft.common.system.param; - -import com.fasterxml.jackson.annotation.JsonInclude; -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.math.BigDecimal; - -/** - * 订单查询参数 - * - * @author 科技小王子 - * @since 2024-04-24 13:46:21 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(value = "OrderParam对象", description = "订单查询参数") -public class OrderParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "ID") - @QueryField(type = QueryType.EQ) - private Integer orderId; - - @ApiModelProperty(value = "订单号") - private String orderNo; - - @ApiModelProperty(value = "类型") - @QueryField(type = QueryType.EQ) - private Integer type; - - @ApiModelProperty(value = "订单金额") - @QueryField(type = QueryType.EQ) - private BigDecimal money; - - @ApiModelProperty(value = "实际付款金额(包含运费)") - @QueryField(type = QueryType.EQ) - private BigDecimal payPrice; - - @ApiModelProperty(value = "套餐ID") - @QueryField(type = QueryType.EQ) - private Integer planId; - - @ApiModelProperty(value = "卡ID") - @QueryField(type = QueryType.EQ) - private Integer priceId; - - @ApiModelProperty(value = "获得的会员等级") - @QueryField(type = QueryType.EQ) - private Integer gradeId; - - @ApiModelProperty(value = "卡名称") - private String priceName; - - @ApiModelProperty(value = "用户ID") - @QueryField(type = QueryType.EQ) - private Integer userId; - - @ApiModelProperty(value = "持有者ID") - @QueryField(type = QueryType.EQ) - private Integer memberId; - - @ApiModelProperty(value = "真实姓名") - private String realName; - - @ApiModelProperty(value = "联系电话") - private String phone; - - @ApiModelProperty(value = "付款时间") - private String payTime; - - @ApiModelProperty(value = "支付流水号") - private String transactionId; - - @ApiModelProperty(value = "付款状态(10未付款 20已付款)") - @QueryField(type = QueryType.EQ) - private Integer payStatus; - - @ApiModelProperty(value = "支付方式（余额/微信/支付宝）") - private String payMethod; - - @ApiModelProperty(value = "到期时间") - private String expirationTime; - - @ApiModelProperty(value = "所在省份") - private String province; - - @ApiModelProperty(value = "所在城市") - private String city; - - @ApiModelProperty(value = "所在辖区") - private String region; - - @ApiModelProperty(value = "所在地区") - private String area; - - @ApiModelProperty(value = "街道地址") - private String address; - - @ApiModelProperty(value = "退款凭证") - private String refundImage; - - @ApiModelProperty(value = "退款理由") - private String refundContent; - - @ApiModelProperty(value = "订单是否已结算(0未结算 1已结算)") - @QueryField(type = QueryType.EQ) - private Integer isSettled; - - @ApiModelProperty(value = "排序(数字越小越靠前)") - @QueryField(type = QueryType.EQ) - private Integer sortNumber; - - @ApiModelProperty(value = "商户ID") - @QueryField(type = QueryType.EQ) - private Integer merchantId; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "状态, 0正常, 1冻结") - @QueryField(type = QueryType.EQ) - private Integer status; - - @ApiModelProperty(value = "是否删除, 0否, 1是") - @QueryField(type = QueryType.EQ) - private Integer deleted; - -} diff --git a/modules/common/system/param/OrganizationParam.java b/modules/common/system/param/OrganizationParam.java deleted file mode 100644 index d0b9942..0000000 --- a/modules/common/system/param/OrganizationParam.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.gxwebsoft.common.system.param; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 组织机构查询参数 - * - * @author WebSoft - * @since 2021-08-29 20:35:09 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(description = "组织机构查询参数") -public class OrganizationParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "机构id") - @QueryField(type = QueryType.EQ) - private Integer organizationId; - - @ApiModelProperty(value = "上级id, 0是顶级") - @QueryField(type = QueryType.EQ) - private Integer parentId; - - @ApiModelProperty(value = "机构名称") - private String organizationName; - - @ApiModelProperty(value = "机构全称") - private String organizationFullName; - - @ApiModelProperty(value = "机构代码") - private String organizationCode; - - @ApiModelProperty(value = "机构类型(字典代码)") - private String organizationType; - - @ApiModelProperty(value = "负责人id") - @QueryField(type = QueryType.EQ) - private Integer leaderId; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "机构类型名称") - @TableField(exist = false) - private String organizationTypeName; - - @ApiModelProperty(value = "负责人姓名") - @TableField(exist = false) - private String leaderNickname; - - @ApiModelProperty(value = "负责人账号") - @TableField(exist = false) - private String leaderUsername; - -} diff --git a/modules/common/system/param/PaymentParam.java b/modules/common/system/param/PaymentParam.java deleted file mode 100644 index c0ea022..0000000 --- a/modules/common/system/param/PaymentParam.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.gxwebsoft.common.system.param; - -import com.fasterxml.jackson.annotation.JsonInclude; -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 支付方式查询参数 - * - * @author 科技小王子 - * @since 2024-05-11 12:39:11 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(value = "PaymentParam对象", description = "支付方式查询参数") -public class PaymentParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "ID") - @QueryField(type = QueryType.EQ) - private Integer id; - - @ApiModelProperty(value = "支付方式") - private String name; - - @ApiModelProperty(value = "类型") - @QueryField(type = QueryType.EQ) - private Integer type; - - @ApiModelProperty(value = "标识") - @QueryField(type = QueryType.EQ) - private String code; - - @ApiModelProperty(value = "微信商户号类型 1普通商户2子商户") - @QueryField(type = QueryType.EQ) - private Integer wechatType; - - @ApiModelProperty(value = "应用ID") - private String appId; - - @ApiModelProperty(value = "商户号") - private String mchId; - - @ApiModelProperty(value = "设置APIv3密钥") - private String apiKey; - - @ApiModelProperty(value = "证书文件 (CERT)") - private String apiclientCert; - - @ApiModelProperty(value = "证书文件 (KEY)") - private String apiclientKey; - - @ApiModelProperty(value = "商户证书序列号") - private String merchantSerialNumber; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "文章排序(数字越小越靠前)") - @QueryField(type = QueryType.EQ) - private Integer sortNumber; - - @ApiModelProperty(value = "状态, 0启用, 1禁用") - @QueryField(type = QueryType.EQ) - private Boolean status; - - @ApiModelProperty(value = "是否删除, 0否, 1是") - @QueryField(type = QueryType.EQ) - private Integer deleted; - -} diff --git a/modules/common/system/param/PlugParam.java b/modules/common/system/param/PlugParam.java deleted file mode 100644 index adefbf3..0000000 --- a/modules/common/system/param/PlugParam.java +++ /dev/null @@ -1,79 +0,0 @@ -package com.gxwebsoft.common.system.param; - -import com.fasterxml.jackson.annotation.JsonInclude; -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.math.BigDecimal; - -/** - * 插件扩展查询参数 - * - * @author 科技小王子 - * @since 2023-10-12 09:53:07 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(value = "PlugParam对象", description = "插件扩展查询参数") -public class PlugParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "插件id") - @QueryField(type = QueryType.EQ) - private Integer plugId; - - @ApiModelProperty(value = "菜单名称") - private String plugName; - - @ApiModelProperty(value = "插件ID") - private String plugCode; - - @ApiModelProperty(value = "插件类型 10后台模块") - @QueryField(type = QueryType.EQ) - private Integer plugType; - - @ApiModelProperty(value = "排序号") - @QueryField(type = QueryType.EQ) - private Integer sortNumber; - - @ApiModelProperty(value = "插件价格") - @QueryField(type = QueryType.EQ) - private BigDecimal price; - - @ApiModelProperty(value = "评分") - @QueryField(type = QueryType.EQ) - private BigDecimal score; - - @ApiModelProperty(value = "下载次数") - @QueryField(type = QueryType.EQ) - private Integer clicks; - - @ApiModelProperty(value = "安装次数") - @QueryField(type = QueryType.EQ) - private Integer installs; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "插件详情") - private String content; - - @ApiModelProperty(value = "状态, 10待审核 20已通过 30已驳回") - @QueryField(type = QueryType.EQ) - private Integer status; - - @ApiModelProperty(value = "用户ID") - @QueryField(type = QueryType.EQ) - private Integer userId; - - @ApiModelProperty(value = "是否删除, 0否, 1是") - @QueryField(type = QueryType.EQ) - private Integer deleted; - -} diff --git a/modules/common/system/param/RechargeOrderParam.java b/modules/common/system/param/RechargeOrderParam.java deleted file mode 100644 index 3caf4fe..0000000 --- a/modules/common/system/param/RechargeOrderParam.java +++ /dev/null @@ -1,106 +0,0 @@ -package com.gxwebsoft.common.system.param; - -import com.fasterxml.jackson.annotation.JsonInclude; -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.math.BigDecimal; - -/** - * 会员充值订单表查询参数 - * - * @author 科技小王子 - * @since 2024-07-26 23:18:48 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(value = "RechargeOrderParam对象", description = "会员充值订单表查询参数") -public class RechargeOrderParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "订单ID") - @QueryField(type = QueryType.EQ) - private Integer orderId; - - @ApiModelProperty(value = "订单号") - private String orderNo; - - @ApiModelProperty(value = "用户ID") - @QueryField(type = QueryType.EQ) - private Integer userId; - - @ApiModelProperty(value = "充值方式(10自定义金额 20套餐充值)") - @QueryField(type = QueryType.EQ) - private Integer rechargeType; - - @ApiModelProperty(value = "机构id") - @QueryField(type = QueryType.EQ) - private Integer organizationId; - - @ApiModelProperty(value = "充值套餐ID") - @QueryField(type = QueryType.EQ) - private Integer planId; - - @ApiModelProperty(value = "用户支付金额") - @QueryField(type = QueryType.EQ) - private BigDecimal payPrice; - - @ApiModelProperty(value = "赠送金额") - @QueryField(type = QueryType.EQ) - private BigDecimal giftMoney; - - @ApiModelProperty(value = "实际到账金额") - @QueryField(type = QueryType.EQ) - private BigDecimal actualMoney; - - @ApiModelProperty(value = "用户可用余额") - @QueryField(type = QueryType.EQ) - private BigDecimal balance; - - @ApiModelProperty(value = "支付方式（微信/支付宝）") - private String payMethod; - - @ApiModelProperty(value = "支付状态(10待支付 20已支付)") - @QueryField(type = QueryType.EQ) - private Integer payStatus; - - @ApiModelProperty(value = "付款时间") - @QueryField(type = QueryType.EQ) - private Integer payTime; - - @ApiModelProperty(value = "第三方交易记录ID") - @QueryField(type = QueryType.EQ) - private Integer tradeId; - - @ApiModelProperty(value = "来源客户端 (APP、H5、小程序等)") - private String platform; - - @ApiModelProperty(value = "所属门店ID") - @QueryField(type = QueryType.EQ) - private Integer shopId; - - @ApiModelProperty(value = "排序(数字越小越靠前)") - @QueryField(type = QueryType.EQ) - private Integer sortNumber; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "状态, 0正常, 1冻结") - @QueryField(type = QueryType.EQ) - private Integer status; - - @ApiModelProperty(value = "是否删除, 0否, 1是") - @QueryField(type = QueryType.EQ) - private Integer deleted; - - @ApiModelProperty(value = "商户编码") - private String merchantCode; - -} diff --git a/modules/common/system/param/RoleParam.java b/modules/common/system/param/RoleParam.java deleted file mode 100644 index d7b2ccd..0000000 --- a/modules/common/system/param/RoleParam.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.common.system.param; - -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 角色查询参数 - * - * @author WebSoft - * @since 2021-08-29 20:35:09 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(description = "角色查询参数") -public class RoleParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @ApiModelProperty("角色id") - @QueryField(type = QueryType.EQ) - private Integer roleId; - - @ApiModelProperty("角色标识") - @QueryField(type = QueryType.EQ) - private String roleCode; - - @ApiModelProperty("角色名称") - private String roleName; - - @ApiModelProperty("备注") - private String comments; - - @ApiModelProperty("租户ID") - private Integer tenantId; - -} diff --git a/modules/common/system/param/SettingParam.java b/modules/common/system/param/SettingParam.java deleted file mode 100644 index fe322d3..0000000 --- a/modules/common/system/param/SettingParam.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.gxwebsoft.common.system.param; - -import com.fasterxml.jackson.annotation.JsonInclude; -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 系统设置查询参数 - * - * @author WebSoft - * @since 2022-11-19 13:54:27 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(value = "SettingParam对象", description = "系统设置查询参数") -public class SettingParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "id") - @QueryField(type = QueryType.EQ) - private Integer settingId; - - @ApiModelProperty(value = "设置项标示") - @QueryField(type = QueryType.EQ) - private String settingKey; - - @ApiModelProperty(value = "排序号") - @QueryField(type = QueryType.EQ) - private Integer sortNumber; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "是否删除, 0否, 1是") - @QueryField(type = QueryType.EQ) - private Integer deleted; - - @ApiModelProperty(value = "同步更新租户名称") - private String tenantName; - - @ApiModelProperty(value = "租户名称") - private Integer tenantId; - -} diff --git a/modules/common/system/param/SmsCaptchaParam.java b/modules/common/system/param/SmsCaptchaParam.java deleted file mode 100644 index 98945e6..0000000 --- a/modules/common/system/param/SmsCaptchaParam.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.gxwebsoft.common.system.param; - -import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - * 发送短信验证码参数 - * - * @author WebSoft - * @since 2021-08-30 17:35:16 - */ -@Data -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(description = "发送短信验证码参数") -public class SmsCaptchaParam implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty("短信签名") - private String signName; - - @ApiModelProperty("手机号码") - private String phone; - - @ApiModelProperty("短信模板") - private String TemplateParam; - - @ApiModelProperty("租户ID") - private String tenantId; - -} diff --git a/modules/common/system/param/TenantParam.java b/modules/common/system/param/TenantParam.java deleted file mode 100644 index 5d70e82..0000000 --- a/modules/common/system/param/TenantParam.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.gxwebsoft.common.system.param; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 租户查询参数 - * - * @author 科技小王子 - * @since 2023-07-17 17:49:53 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(value = "TenantParam对象", description = "租户查询参数") -public class TenantParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "租户名称") - private String tenantName; - - @ApiModelProperty(value = "租户编号") - private String tenantCode; - - @ApiModelProperty(value = "logo") - private String logo; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "状态") - @QueryField(type = QueryType.EQ) - private Integer status; - - @ApiModelProperty(value = "用户ID") - @QueryField(type = QueryType.EQ) - private Integer userId; - - @ApiModelProperty(value = "是否删除, 0否, 1是") - @QueryField(type = QueryType.EQ) - private Integer deleted; - - @ApiModelProperty(value = "租户id") - @QueryField(type = QueryType.EQ) - private Integer tenantId; - -} diff --git a/modules/common/system/param/UpdatePasswordParam.java b/modules/common/system/param/UpdatePasswordParam.java deleted file mode 100644 index 18fd524..0000000 --- a/modules/common/system/param/UpdatePasswordParam.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.gxwebsoft.common.system.param; - -import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - * 修改密码参数 - * - * @author WebSoft - * @since 2021-08-30 17:35:16 - */ -@Data -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(description = "修改密码参数") -public class UpdatePasswordParam implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty("原始密码") - private String oldPassword; - - @ApiModelProperty("新密码") - private String password; - - @ApiModelProperty("手机号码") - private String phone; - - @ApiModelProperty("短信验证码") - private String code; - -} diff --git a/modules/common/system/param/UserBalanceLogParam.java b/modules/common/system/param/UserBalanceLogParam.java deleted file mode 100644 index 06630e2..0000000 --- a/modules/common/system/param/UserBalanceLogParam.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.gxwebsoft.common.system.param; - -import com.fasterxml.jackson.annotation.JsonInclude; -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.math.BigDecimal; - -/** - * 用户余额变动明细表查询参数 - * - * @author 科技小王子 - * @since 2023-04-21 15:59:09 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(value = "UserBalanceLogParam对象", description = "用户余额变动明细表查询参数") -public class UserBalanceLogParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键ID") - @QueryField(type = QueryType.EQ) - private Integer logId; - - @ApiModelProperty(value = "用户ID") - @QueryField(type = QueryType.EQ) - private Integer userId; - - @ApiModelProperty(value = "余额变动场景(10用户充值 20用户消费 30管理员操作 40订单退款)") - @QueryField(type = QueryType.EQ) - private Integer scene; - - @ApiModelProperty(value = "变动金额") - @QueryField(type = QueryType.EQ) - private BigDecimal money; - - @ApiModelProperty(value = "变动后余额") - @QueryField(type = QueryType.EQ) - private BigDecimal balance; - - @ApiModelProperty(value = "描述/说明") - private String describe; - - @ApiModelProperty(value = "管理员备注") - private String remark; - - @ApiModelProperty(value = "排序(数字越小越靠前)") - @QueryField(type = QueryType.EQ) - private Integer sortNumber; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "状态, 0正常, 1冻结") - @QueryField(type = QueryType.EQ) - private Integer status; - - @ApiModelProperty(value = "是否删除, 0否, 1是") - @QueryField(type = QueryType.EQ) - private Integer deleted; - - @ApiModelProperty(value = "商户编码") - private String merchantCode; - - @ApiModelProperty(value = "昵称") - private String nickname; - - @ApiModelProperty(value = "余额变动场景筛选") - private String sceneMultiple; - -} diff --git a/modules/common/system/param/UserCollectionParam.java b/modules/common/system/param/UserCollectionParam.java deleted file mode 100644 index bd95efb..0000000 --- a/modules/common/system/param/UserCollectionParam.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gxwebsoft.common.system.param; - -import com.fasterxml.jackson.annotation.JsonInclude; -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 我的收藏查询参数 - * - * @author 科技小王子 - * @since 2024-04-28 18:08:32 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(value = "UserCollectionParam对象", description = "我的收藏查询参数") -public class UserCollectionParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键ID") - @QueryField(type = QueryType.EQ) - private Integer id; - - @ApiModelProperty(value = "租户ID") - @QueryField(type = QueryType.EQ) - private Integer tid; - - @ApiModelProperty(value = "用户ID") - @QueryField(type = QueryType.EQ) - private Integer userId; - -} diff --git a/modules/common/system/param/UserFileParam.java b/modules/common/system/param/UserFileParam.java deleted file mode 100644 index d8217af..0000000 --- a/modules/common/system/param/UserFileParam.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.gxwebsoft.common.system.param; - -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 用户文件查询参数 - * - * @author WebSoft - * @since 2022-07-21 14:34:40 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(value = "UserFileParam对象", description = "用户文件查询参数") -public class UserFileParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id") - @QueryField(type = QueryType.EQ) - private Integer id; - - @ApiModelProperty(value = "用户id") - @QueryField(type = QueryType.EQ) - private Integer userId; - - @ApiModelProperty(value = "文件名称") - private String name; - - @ApiModelProperty(value = "上级id") - @QueryField(type = QueryType.EQ) - private Integer parentId; - -} diff --git a/modules/common/system/param/UserGradeParam.java b/modules/common/system/param/UserGradeParam.java deleted file mode 100644 index 9ddab83..0000000 --- a/modules/common/system/param/UserGradeParam.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.gxwebsoft.common.system.param; - -import com.fasterxml.jackson.annotation.JsonInclude; -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 用户会员等级表查询参数 - * - * @author 科技小王子 - * @since 2023-10-07 22:51:17 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(value = "UserGradeParam对象", description = "用户会员等级表查询参数") -public class UserGradeParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "等级ID") - @QueryField(type = QueryType.EQ) - private Integer gradeId; - - @ApiModelProperty(value = "等级名称") - private String name; - - @ApiModelProperty(value = "等级权重(1-9999)") - @QueryField(type = QueryType.EQ) - private Integer weight; - - @ApiModelProperty(value = "升级条件") - private String upgrade; - - @ApiModelProperty(value = "等级权益(折扣率0-100)") - private String equity; - - @ApiModelProperty(value = "佣金比率") - private String commission; - - @ApiModelProperty(value = "排序(数字越小越靠前)") - @QueryField(type = QueryType.EQ) - private Integer sortNumber; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "状态, 0正常, 1冻结") - @QueryField(type = QueryType.EQ) - private Integer status; - - @ApiModelProperty(value = "是否删除, 0否, 1是") - @QueryField(type = QueryType.EQ) - private Integer deleted; - -} diff --git a/modules/common/system/param/UserGroupParam.java b/modules/common/system/param/UserGroupParam.java deleted file mode 100644 index 3f2bc36..0000000 --- a/modules/common/system/param/UserGroupParam.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.gxwebsoft.common.system.param; - -import com.fasterxml.jackson.annotation.JsonInclude; -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 用户分组管理表查询参数 - * - * @author 科技小王子 - * @since 2023-10-28 15:16:39 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(value = "UserGroupParam对象", description = "用户分组管理表查询参数") -public class UserGroupParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "分组ID") - @QueryField(type = QueryType.EQ) - private Integer groupId; - - @ApiModelProperty(value = "分组名称") - private String name; - - @ApiModelProperty(value = "排序(数字越小越靠前)") - @QueryField(type = QueryType.EQ) - private Integer sortNumber; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "状态, 0正常, 1冻结") - @QueryField(type = QueryType.EQ) - private Integer status; - - @ApiModelProperty(value = "是否删除, 0否, 1是") - @QueryField(type = QueryType.EQ) - private Integer deleted; - -} diff --git a/modules/common/system/param/UserImportParam.java b/modules/common/system/param/UserImportParam.java deleted file mode 100644 index 153a783..0000000 --- a/modules/common/system/param/UserImportParam.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.common.system.param; - -import cn.afterturn.easypoi.excel.annotation.Excel; -import lombok.Data; - -import java.io.Serializable; - -/** - * 用户导入参数 - * - * @author WebSoft - * @since 2011-10-15 17:33:34 - */ -@Data -public class UserImportParam implements Serializable { - private static final long serialVersionUID = 1L; - - @Excel(name = "账号") - private String username; - - @Excel(name = "密码") - private String password; - - @Excel(name = "昵称") - private String nickname; - - @Excel(name = "手机号") - private String phone; - - @Excel(name = "邮箱") - private String email; - - @Excel(name = "组织机构") - private String organizationName; - - @Excel(name = "性别") - private String sexName; - - @Excel(name = "角色") - private String roleName; - -} diff --git a/modules/common/system/param/UserOauthParam.java b/modules/common/system/param/UserOauthParam.java deleted file mode 100644 index 4566ec8..0000000 --- a/modules/common/system/param/UserOauthParam.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.gxwebsoft.common.system.param; - -import com.fasterxml.jackson.annotation.JsonInclude; -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 第三方用户信息表查询参数 - * - * @author 科技小王子 - * @since 2023-10-07 22:39:46 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(value = "UserOauthParam对象", description = "第三方用户信息表查询参数") -public class UserOauthParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键ID") - @QueryField(type = QueryType.EQ) - private Integer id; - - @ApiModelProperty(value = "用户ID") - @QueryField(type = QueryType.EQ) - private Integer userId; - - @ApiModelProperty(value = "第三方登陆类型(MP-WEIXIN)") - private String oauthType; - - @ApiModelProperty(value = "第三方用户唯一标识 (uid openid)") - private String oauthId; - - @ApiModelProperty(value = "微信unionID") - private String unionid; - - @ApiModelProperty(value = "排序(数字越小越靠前)") - @QueryField(type = QueryType.EQ) - private Integer sortNumber; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "状态, 0正常, 1冻结") - @QueryField(type = QueryType.EQ) - private Integer status; - - @ApiModelProperty(value = "是否删除, 0否, 1是") - @QueryField(type = QueryType.EQ) - private Integer deleted; - -} diff --git a/modules/common/system/param/UserParam.java b/modules/common/system/param/UserParam.java deleted file mode 100644 index 36493ca..0000000 --- a/modules/common/system/param/UserParam.java +++ /dev/null @@ -1,239 +0,0 @@ -package com.gxwebsoft.common.system.param; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableLogic; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.math.BigDecimal; -import java.util.Date; -import java.util.Set; - -/** - * 用户查询参数 - * - * @author WebSoft - * @since 2021-08-29 20:35:09 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(description = "用户查询参数") -public class UserParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @ApiModelProperty("用户id") - @QueryField(type = QueryType.EQ) - private Integer userId; - - @ApiModelProperty("用户类型, 0普通用户 10企业用户") - private Integer type; - - @ApiModelProperty("账号") - private String username; - - @ApiModelProperty("昵称") - private String nickname; - - @ApiModelProperty("用户编码") - private String userCode; - - @ApiModelProperty("性别(字典)") - @QueryField(type = QueryType.EQ) - private String sex; - - @ApiModelProperty("手机号") - private String phone; - - @ApiModelProperty("邮箱") - private String email; - - @ApiModelProperty("邮箱是否验证, 0否, 1是") - @QueryField(type = QueryType.EQ) - private Integer emailVerified; - - @ApiModelProperty("别名") - private String alias; - - @ApiModelProperty("真实姓名") - private String realName; - - @ApiModelProperty("身份证号") - private String idCard; - - @ApiModelProperty("出生日期") - private String birthday; - - @ApiModelProperty(value = "年龄") - private Integer age; - - @ApiModelProperty("可用余额") - private BigDecimal balance; - - @ApiModelProperty("机构id") - @QueryField(type = QueryType.EQ) - private Integer organizationId; - - @ApiModelProperty("用户分组ID") - @QueryField(type = QueryType.EQ) - private Integer groupId; - - @ApiModelProperty("注册来源客户端") - @QueryField(type = QueryType.EQ) - private String platform; - - @ApiModelProperty("是否下线会员") - private Integer offline; - - @ApiModelProperty("上级机构ID") - @QueryField(type = QueryType.IN) - private Integer parentId; - - @ApiModelProperty("状态, 0正常, 1冻结") - @QueryField(type = QueryType.EQ) - private Integer status; - - @ApiModelProperty("是否删除, 0否, 1是") - @TableLogic - private Integer deleted; - - @ApiModelProperty("角色id") - @TableField(exist = false) - private Integer roleId; - - @ApiModelProperty("角色标识") - @TableField(exist = false) - private String roleCode; - - @ApiModelProperty(value = "所在省份") - private String province; - - @ApiModelProperty(value = "所在城市") - private String city; - - @ApiModelProperty(value = "所在辖区") - private String region; - - @ApiModelProperty("关注数") - private Integer followers; - - @ApiModelProperty("粉丝数") - private Integer fans; - - @ApiModelProperty("获赞数") - private Integer likes; - - @ApiModelProperty("评论数") - private Integer commentNumbers; - - @ApiModelProperty(value = "择偶区域") - @TableField(exist = false) - private String cityMate; - - @ApiModelProperty("机构名称") - @TableField(exist = false) - private String organizationName; - - @ApiModelProperty("公司名称") - @TableField(exist = false) - private String companyName; - - @ApiModelProperty("公司名称") - private String customerName; - - @ApiModelProperty("性别名称") - @TableField(exist = false) - private String sexName; - - @ApiModelProperty("推荐状态") - @TableField(exist = false) - private Integer recommend; - - @ApiModelProperty("搜索关键字") - @TableField(exist = false) - private String keywords; - - @ApiModelProperty(value = "会员等级") - @TableField(exist = false) - private Integer gradeId; - - @ApiModelProperty("按角色搜索") - @TableField(exist = false) - private String roleIds; - - @ApiModelProperty("用户类型 sys系统用户 org机构职员 member商城会员 ") - @TableField(exist = false) - private String userType; - - @ApiModelProperty("支付宝授权码") - @TableField(exist = false) - private String authCode; - - @ApiModelProperty("微信凭证code") - @TableField(exist = false) - private String code; - - @ApiModelProperty("推荐人ID") - @QueryField(type = QueryType.IN) - private Integer refereeId; - - @ApiModelProperty("租户ID") - private Integer tenantId; - - @ApiModelProperty("二维码类型") - @TableField(exist = false) - private String codeType; - - @ApiModelProperty("二维码内容 填网址扫码后可跳转") - @TableField(exist = false) - private String codeContent; - - @ApiModelProperty("是否内部职员") - @TableField(exist = false) - private Boolean isStaff; - - @ApiModelProperty(value = "是否管理员") - @TableField(exist = false) - private Boolean isAdmin; - - @ApiModelProperty("最后结算时间") - @TableField(exist = false) - private Date settlementTime; - - @ApiModelProperty("报餐时间") - @TableField(exist = false) - private String deliveryTime; - - @ApiModelProperty("用户ID集合") - @TableField(exist = false) - private Set userIds; - - @ApiModelProperty("用户手机号码集合") - @TableField(exist = false) - private Set phones; - - @ApiModelProperty("是否查询用户详细资料表") - @TableField(exist = false) - private Boolean showProfile; - - @ApiModelProperty("openId") - @TableField(exist = false) - private String openId; - - @ApiModelProperty(value = "可管理的商户") - @QueryField(type = QueryType.LIKE) - private String merchants; - - @ApiModelProperty(value = "商户ID") - @QueryField(type = QueryType.EQ) - private Integer merchantId; - - @ApiModelProperty(value = "商户名称") - private String merchantName; -} diff --git a/modules/common/system/param/UserRefereeParam.java b/modules/common/system/param/UserRefereeParam.java deleted file mode 100644 index 16e5261..0000000 --- a/modules/common/system/param/UserRefereeParam.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.gxwebsoft.common.system.param; - -import com.fasterxml.jackson.annotation.JsonInclude; -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 用户推荐关系表查询参数 - * - * @author 科技小王子 - * @since 2023-10-07 22:56:36 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(value = "UserRefereeParam对象", description = "用户推荐关系表查询参数") -public class UserRefereeParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键ID") - @QueryField(type = QueryType.EQ) - private Integer id; - - @ApiModelProperty(value = "推荐人ID") - @QueryField(type = QueryType.EQ) - private Integer dealerId; - - @ApiModelProperty(value = "用户id(被推荐人)") - @QueryField(type = QueryType.EQ) - private Integer userId; - - @ApiModelProperty(value = "推荐关系层级(1,2,3)") - @QueryField(type = QueryType.EQ) - private Integer level; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "是否删除, 0否, 1是") - @QueryField(type = QueryType.EQ) - private Integer deleted; - -} diff --git a/modules/common/system/param/VersionParam.java b/modules/common/system/param/VersionParam.java deleted file mode 100644 index cd18409..0000000 --- a/modules/common/system/param/VersionParam.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.gxwebsoft.common.system.param; - -import com.fasterxml.jackson.annotation.JsonInclude; -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 版本更新查询参数 - * - * @author 科技小王子 - * @since 2024-01-15 18:52:24 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(value = "VersionParam对象", description = "版本更新查询参数") -public class VersionParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "ID") - @QueryField(type = QueryType.EQ) - private Integer id; - - @ApiModelProperty(value = "版本名") - private String versionName; - - @ApiModelProperty(value = "版本号") - @QueryField(type = QueryType.EQ) - private Integer versionCode; - - @ApiModelProperty(value = "下载链接") - private String androidDownloadUrl; - - @ApiModelProperty(value = "下载链接") - private String iosDownloadUrl; - - @ApiModelProperty(value = "更新日志") - private String updateInfo; - - @ApiModelProperty(value = "强制更新") - @QueryField(type = QueryType.EQ) - private Integer isHard; - - @ApiModelProperty(value = "热更") - @QueryField(type = QueryType.EQ) - private Integer isHot; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "文章排序(数字越小越靠前)") - @QueryField(type = QueryType.EQ) - private Integer sortNumber; - - @QueryField(type = QueryType.EQ) - private Integer userId; - - @ApiModelProperty(value = "状态, 0正常, 1冻结") - @QueryField(type = QueryType.EQ) - private Integer status; - - @ApiModelProperty(value = "是否删除, 0否, 1是") - @QueryField(type = QueryType.EQ) - private Integer deleted; - -} diff --git a/modules/common/system/param/WhiteDomainParam.java b/modules/common/system/param/WhiteDomainParam.java deleted file mode 100644 index 0234c18..0000000 --- a/modules/common/system/param/WhiteDomainParam.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.gxwebsoft.common.system.param; - -import com.fasterxml.jackson.annotation.JsonInclude; -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 服务器白名单查询参数 - * - * @author 科技小王子 - * @since 2024-03-26 00:22:21 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(value = "WhiteDomainParam对象", description = "服务器白名单查询参数") -public class WhiteDomainParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "ID") - @QueryField(type = QueryType.EQ) - private Integer id; - - @ApiModelProperty(value = "域名") - private String domain; - - @ApiModelProperty(value = "状态") - @QueryField(type = QueryType.EQ) - private Integer status; - - @ApiModelProperty(value = "排序号") - @QueryField(type = QueryType.EQ) - private Integer sortNumber; - - @ApiModelProperty(value = "用户ID") - @QueryField(type = QueryType.EQ) - private Integer userId; - - @ApiModelProperty(value = "是否删除, 0否, 1是") - @QueryField(type = QueryType.EQ) - private Integer deleted; - -} diff --git a/modules/common/system/result/CaptchaResult.java b/modules/common/system/result/CaptchaResult.java deleted file mode 100644 index 5a2d441..0000000 --- a/modules/common/system/result/CaptchaResult.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.gxwebsoft.common.system.result; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; - -/** - * 验证码返回结果 - * - * @author WebSoft - * @since 2021-08-30 17:35:16 - */ -@Data -@NoArgsConstructor -@AllArgsConstructor -@ApiModel(description = "验证码返回结果") -public class CaptchaResult implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty("图形验证码base64数据") - private String base64; - - @ApiModelProperty("验证码文本") - private String text; - -} diff --git a/modules/common/system/result/LoginResult.java b/modules/common/system/result/LoginResult.java deleted file mode 100644 index 4089728..0000000 --- a/modules/common/system/result/LoginResult.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.gxwebsoft.common.system.result; - -import com.gxwebsoft.common.system.entity.User; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; - -/** - * 登录返回结果 - * - * @author WebSoft - * @since 2021-08-30 17:35:16 - */ -@Data -@NoArgsConstructor -@AllArgsConstructor -@ApiModel(description = "登录返回结果") -public class LoginResult implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty("access_token") - private String access_token; - - @ApiModelProperty("用户信息") - private User user; - -} diff --git a/modules/common/system/result/RedisResult.java b/modules/common/system/result/RedisResult.java deleted file mode 100644 index b2bc90c..0000000 --- a/modules/common/system/result/RedisResult.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.gxwebsoft.common.system.result; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import org.apache.poi.ss.formula.functions.T; - -import java.io.Serializable; -import java.time.LocalDateTime; - -/** - * Redis缓存数据 - * - * @author WebSoft - * @since 2021-08-30 17:35:16 - */ -@Data -@NoArgsConstructor -@AllArgsConstructor -@ApiModel(description = "缓存数据返回") -public class RedisResult implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty("key") - private String key; - - @ApiModelProperty("数据") - private T data; - - @ApiModelProperty("过期时间") - private LocalDateTime expireTime; - -} diff --git a/modules/common/system/result/SmsCaptchaResult.java b/modules/common/system/result/SmsCaptchaResult.java deleted file mode 100644 index 0db38d2..0000000 --- a/modules/common/system/result/SmsCaptchaResult.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.gxwebsoft.common.system.result; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; - -/** - * 短信验证码返回结果 - * - * @author WebSoft - * @since 2021-08-30 17:35:16 - */ -@Data -@NoArgsConstructor -@AllArgsConstructor -@ApiModel(description = "短信验证码返回结果") -public class SmsCaptchaResult implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty("短信验证码") - private String text; -} diff --git a/modules/common/system/service/AccessKeyService.java b/modules/common/system/service/AccessKeyService.java deleted file mode 100644 index 19946bc..0000000 --- a/modules/common/system/service/AccessKeyService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.common.system.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.system.entity.AccessKey; -import com.gxwebsoft.common.system.param.AccessKeyParam; - -import java.util.List; - -/** - * 访问凭证管理Service - * - * @author 科技小王子 - * @since 2023-05-16 19:19:55 - */ -public interface AccessKeyService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(AccessKeyParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(AccessKeyParam param); - - /** - * 根据id查询 - * - * @param id 字典项id - * @return AccessKey - */ - AccessKey getByIdRel(Integer id); - -} diff --git a/modules/common/system/service/AppRenewService.java b/modules/common/system/service/AppRenewService.java deleted file mode 100644 index 77a43da..0000000 --- a/modules/common/system/service/AppRenewService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.common.system.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.system.entity.AppRenew; -import com.gxwebsoft.common.system.param.AppRenewParam; - -import java.util.List; - -/** - * 续费管理Service - * - * @author 科技小王子 - * @since 2023-11-14 14:14:07 - */ -public interface AppRenewService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(AppRenewParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(AppRenewParam param); - - /** - * 根据id查询 - * - * @param appRenewId 自增ID - * @return AppRenew - */ - AppRenew getByIdRel(Integer appRenewId); - -} diff --git a/modules/common/system/service/AppService.java b/modules/common/system/service/AppService.java deleted file mode 100644 index 3b5233f..0000000 --- a/modules/common/system/service/AppService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.common.system.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.system.entity.App; -import com.gxwebsoft.common.system.param.AppParam; - -import java.util.List; - -/** - * 应用管理记录表Service - * - * @author 科技小王子 - * @since 2023-10-30 22:20:23 - */ -public interface AppService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(AppParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(AppParam param); - - /** - * 根据id查询 - * - * @param appId 应用ID - * @return App - */ - App getByIdRel(Integer appId); - -} diff --git a/modules/common/system/service/AppUrlService.java b/modules/common/system/service/AppUrlService.java deleted file mode 100644 index a535b16..0000000 --- a/modules/common/system/service/AppUrlService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.common.system.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.system.entity.AppUrl; -import com.gxwebsoft.common.system.param.AppUrlParam; - -import java.util.List; - -/** - * 域名管理记录表Service - * - * @author 科技小王子 - * @since 2023-10-30 22:20:23 - */ -public interface AppUrlService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(AppUrlParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(AppUrlParam param); - - /** - * 根据id查询 - * - * @param appUrlId 自增ID - * @return AppUrl - */ - AppUrl getByIdRel(Integer appUrlId); - -} diff --git a/modules/common/system/service/AppUserService.java b/modules/common/system/service/AppUserService.java deleted file mode 100644 index 415da6a..0000000 --- a/modules/common/system/service/AppUserService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.common.system.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.system.entity.AppUser; -import com.gxwebsoft.common.system.param.AppUserParam; - -import java.util.List; - -/** - * 应用成员Service - * - * @author 科技小王子 - * @since 2023-10-30 22:20:23 - */ -public interface AppUserService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(AppUserParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(AppUserParam param); - - /** - * 根据id查询 - * - * @param appUserId 自增ID - * @return AppUser - */ - AppUser getByIdRel(Integer appUserId); - -} diff --git a/modules/common/system/service/ChatConversationService.java b/modules/common/system/service/ChatConversationService.java deleted file mode 100644 index dc8f201..0000000 --- a/modules/common/system/service/ChatConversationService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.common.system.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.system.entity.ChatConversation; -import com.gxwebsoft.common.system.param.ChatConversationParam; - -import java.util.List; - -/** - * 聊天消息表Service - * - * @author 科技小王子 - * @since 2024-04-27 15:57:27 - */ -public interface ChatConversationService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(ChatConversationParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(ChatConversationParam param); - - /** - * 根据id查询 - * - * @param id 自增ID - * @return ChatConversation - */ - ChatConversation getByIdRel(Integer id); - -} diff --git a/modules/common/system/service/ChatMessageService.java b/modules/common/system/service/ChatMessageService.java deleted file mode 100644 index e3ecc75..0000000 --- a/modules/common/system/service/ChatMessageService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.common.system.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.system.entity.ChatMessage; -import com.gxwebsoft.common.system.param.ChatMessageParam; - -import java.util.List; - -/** - * 聊天消息表Service - * - * @author 科技小王子 - * @since 2024-04-27 15:57:27 - */ -public interface ChatMessageService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(ChatMessageParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(ChatMessageParam param); - - /** - * 根据id查询 - * - * @param id 自增ID - * @return ChatMessage - */ - ChatMessage getByIdRel(Integer id); - -} diff --git a/modules/common/system/service/CompanyService.java b/modules/common/system/service/CompanyService.java deleted file mode 100644 index ddaab08..0000000 --- a/modules/common/system/service/CompanyService.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.gxwebsoft.common.system.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.ExistenceParam; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.system.entity.Company; -import com.gxwebsoft.common.system.param.CompanyParam; - -import java.util.List; - -/** - * 企业信息Service - * - * @author 科技小王子 - * @since 2023-05-27 14:57:34 - */ -public interface CompanyService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(CompanyParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(CompanyParam param); - - /** - * 根据id查询 - * - * @param companyId 企业id - * @return Company - */ - Company getByIdRel(Integer companyId); - - Company getByTenantIdRel(Integer tenantId); - - PageResult pageRelAll(CompanyParam param); - - void updateByCompanyId(Company company); - - boolean removeCompanyAll(Integer companyId); - - boolean undeleteAll(Integer companyId); -} diff --git a/modules/common/system/service/DictDataService.java b/modules/common/system/service/DictDataService.java deleted file mode 100644 index 86b94bf..0000000 --- a/modules/common/system/service/DictDataService.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.gxwebsoft.common.system.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.system.entity.*; -import com.gxwebsoft.common.system.entity.DictData; -import com.gxwebsoft.common.system.param.DictDataParam; - -import java.util.List; - -/** - * 字典数据Service - * - * @author WebSoft - * @since 2020-03-14 11:29:04 - */ -public interface DictDataService extends IService { - - /** - * 关联分页查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(DictDataParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(DictDataParam param); - - /** - * 根据id查询 - * - * @param dictDataId 字典数据id - * @return DictData - */ - DictData getByIdRel(Integer dictDataId); - - /** - * 根据dictCode和dictDataName查询 - * - * @param dictCode 字典标识 - * @param dictDataName 字典项名称 - * @return DictData - */ - DictData getByDictCodeAndName(String dictCode, String dictDataName); - -} diff --git a/modules/common/system/service/DictService.java b/modules/common/system/service/DictService.java deleted file mode 100644 index 8aef5ba..0000000 --- a/modules/common/system/service/DictService.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.gxwebsoft.common.system.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.system.entity.Dict; - -/** - * 字典Service - * - * @author WebSoft - * @since 2020-03-14 11:29:03 - */ -public interface DictService extends IService { - -} diff --git a/modules/common/system/service/DictionaryDataService.java b/modules/common/system/service/DictionaryDataService.java deleted file mode 100644 index 881fd5a..0000000 --- a/modules/common/system/service/DictionaryDataService.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.gxwebsoft.common.system.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.system.entity.DictionaryData; -import com.gxwebsoft.common.system.param.DictionaryDataParam; - -import java.util.List; - -/** - * 字典数据Service - * - * @author WebSoft - * @since 2020-03-14 11:29:04 - */ -public interface DictionaryDataService extends IService { - - /** - * 关联分页查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(DictionaryDataParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(DictionaryDataParam param); - - /** - * 根据id查询 - * - * @param dictDataId 字典数据id - * @return DictionaryData - */ - DictionaryData getByIdRel(Integer dictDataId); - - /** - * 根据dictCode和dictDataName查询 - * - * @param dictCode 字典标识 - * @param dictDataName 字典项名称 - * @return DictionaryData - */ - DictionaryData getByDictCodeAndName(String dictCode, String dictDataName); - -} diff --git a/modules/common/system/service/DictionaryService.java b/modules/common/system/service/DictionaryService.java deleted file mode 100644 index 4705494..0000000 --- a/modules/common/system/service/DictionaryService.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.gxwebsoft.common.system.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.system.entity.Dictionary; - -/** - * 字典Service - * - * @author WebSoft - * @since 2020-03-14 11:29:03 - */ -public interface DictionaryService extends IService { - -} diff --git a/modules/common/system/service/EmailRecordService.java b/modules/common/system/service/EmailRecordService.java deleted file mode 100644 index b99a195..0000000 --- a/modules/common/system/service/EmailRecordService.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.gxwebsoft.common.system.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.system.entity.EmailRecord; - -import javax.mail.MessagingException; -import java.io.IOException; -import java.util.Map; - -/** - * 邮件发送记录Service - * - * @author WebSoft - * @since 2019-06-19 04:07:02 - */ -public interface EmailRecordService extends IService { - - /** - * 发送普通邮件 - * - * @param title 标题 - * @param content 内容 - * @param toEmails 收件人 - */ - void sendTextEmail(String title, String content, String[] toEmails); - - /** - * 发送富文本邮件 - * - * @param title 标题 - * @param html 富文本 - * @param toEmails 收件人 - * @throws MessagingException MessagingException - */ - void sendFullTextEmail(String title, String html, String[] toEmails) throws MessagingException; - - /** - * 发送模板邮件 - * - * @param title 标题 - * @param path 模板路径 - * @param map 填充数据 - * @param toEmails 收件人 - * @throws MessagingException MessagingException - * @throws IOException IOException - */ - void sendHtmlEmail(String title, String path, Map map, String[] toEmails) - throws MessagingException, IOException; - - void sendEmail(String title, String content, String receiver); -} diff --git a/modules/common/system/service/EnvironmentService.java b/modules/common/system/service/EnvironmentService.java deleted file mode 100644 index d2499aa..0000000 --- a/modules/common/system/service/EnvironmentService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.common.system.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.system.entity.Environment; -import com.gxwebsoft.common.system.param.EnvironmentParam; - -import java.util.List; - -/** - * 环境管理Service - * - * @author 科技小王子 - * @since 2023-10-18 08:45:13 - */ -public interface EnvironmentService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(EnvironmentParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(EnvironmentParam param); - - /** - * 根据id查询 - * - * @param id 插件id - * @return Environment - */ - Environment getByIdRel(Integer id); - -} diff --git a/modules/common/system/service/FileRecordService.java b/modules/common/system/service/FileRecordService.java deleted file mode 100644 index d987eb5..0000000 --- a/modules/common/system/service/FileRecordService.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.gxwebsoft.common.system.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.system.entity.FileRecord; -import com.gxwebsoft.common.system.param.FileRecordParam; - -import javax.servlet.http.HttpServletRequest; -import java.io.File; -import java.util.List; - -/** - * 文件上传记录Service - * - * @author WebSoft - * @since 2021-08-30 11:20:15 - */ -public interface FileRecordService extends IService { - - /** - * 关联分页查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(FileRecordParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(FileRecordParam param); - - /** - * 根据id查询 - * - * @param id id - * @return FileRecord - */ - FileRecord getByIdRel(Integer id); - - /** - * 根据path查询 - * - * @param path 文件路径 - * @return FileRecord - */ - FileRecord getByIdPath(String path); - - /** - * 异步删除文件 - * - * @param files 文件数组 - */ - void deleteFileAsync(List files); - - void deleteOssFileAsync(List fileRecords); -} diff --git a/modules/common/system/service/LoginRecordService.java b/modules/common/system/service/LoginRecordService.java deleted file mode 100644 index 0c4adbf..0000000 --- a/modules/common/system/service/LoginRecordService.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.gxwebsoft.common.system.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.system.entity.LoginRecord; -import com.gxwebsoft.common.system.param.LoginRecordParam; - -import javax.servlet.http.HttpServletRequest; -import java.util.List; - -/** - * 登录日志Service - * - * @author WebSoft - * @since 2018-12-24 16:10:41 - */ -public interface LoginRecordService extends IService { - - /** - * 关联分页查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(LoginRecordParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(LoginRecordParam param); - - /** - * 根据id查询 - * - * @param id id - * @return LoginRecord - */ - LoginRecord getByIdRel(Integer id); - - /** - * 异步添加 - * - * @param username 用户账号 - * @param type 操作类型 - * @param comments 备注 - * @param tenantId 租户id - * @param request HttpServletRequest - */ - void saveAsync(String username, Integer type, String comments, Integer tenantId, HttpServletRequest request); - -} diff --git a/modules/common/system/service/MenuService.java b/modules/common/system/service/MenuService.java deleted file mode 100644 index db8e967..0000000 --- a/modules/common/system/service/MenuService.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.gxwebsoft.common.system.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.system.entity.Menu; -import com.gxwebsoft.common.system.param.MenuParam; - -/** - * 菜单Service - * - * @author WebSoft - * @since 2018-12-24 16:10:31 - */ -public interface MenuService extends IService { - - Boolean cloneMenu(MenuParam param); - - Boolean install(Integer id); -} diff --git a/modules/common/system/service/MerchantAccountService.java b/modules/common/system/service/MerchantAccountService.java deleted file mode 100644 index df87b16..0000000 --- a/modules/common/system/service/MerchantAccountService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.common.system.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.system.entity.MerchantAccount; -import com.gxwebsoft.common.system.param.MerchantAccountParam; - -import java.util.List; - -/** - * 商户账号Service - * - * @author 科技小王子 - * @since 2024-04-19 12:02:24 - */ -public interface MerchantAccountService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(MerchantAccountParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(MerchantAccountParam param); - - /** - * 根据id查询 - * - * @param id ID - * @return MerchantAccount - */ - MerchantAccount getByIdRel(Integer id); - -} diff --git a/modules/common/system/service/MerchantApplyService.java b/modules/common/system/service/MerchantApplyService.java deleted file mode 100644 index 06f9bac..0000000 --- a/modules/common/system/service/MerchantApplyService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.common.system.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.system.entity.MerchantApply; -import com.gxwebsoft.common.system.param.MerchantApplyParam; - -import java.util.List; - -/** - * 商户入驻申请Service - * - * @author 科技小王子 - * @since 2024-04-05 01:24:36 - */ -public interface MerchantApplyService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(MerchantApplyParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(MerchantApplyParam param); - - /** - * 根据id查询 - * - * @param applyId ID - * @return MerchantApply - */ - MerchantApply getByIdRel(Integer applyId); - -} diff --git a/modules/common/system/service/MerchantService.java b/modules/common/system/service/MerchantService.java deleted file mode 100644 index 4bc53f8..0000000 --- a/modules/common/system/service/MerchantService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.common.system.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.system.entity.Merchant; -import com.gxwebsoft.common.system.param.MerchantParam; - -import java.util.List; - -/** - * 商户Service - * - * @author 科技小王子 - * @since 2024-04-05 00:03:54 - */ -public interface MerchantService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(MerchantParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(MerchantParam param); - - /** - * 根据id查询 - * - * @param merchantId ID - * @return Merchant - */ - Merchant getByIdRel(Integer merchantId); - -} diff --git a/modules/common/system/service/MerchantTypeService.java b/modules/common/system/service/MerchantTypeService.java deleted file mode 100644 index 563c7d6..0000000 --- a/modules/common/system/service/MerchantTypeService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.common.system.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.system.entity.MerchantType; -import com.gxwebsoft.common.system.param.MerchantTypeParam; - -import java.util.List; - -/** - * 商户类型Service - * - * @author 科技小王子 - * @since 2024-04-05 00:08:51 - */ -public interface MerchantTypeService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(MerchantTypeParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(MerchantTypeParam param); - - /** - * 根据id查询 - * - * @param id ID - * @return MerchantType - */ - MerchantType getByIdRel(Integer id); - -} diff --git a/modules/common/system/service/ModulesService.java b/modules/common/system/service/ModulesService.java deleted file mode 100644 index 93244f1..0000000 --- a/modules/common/system/service/ModulesService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.common.system.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.system.entity.Modules; -import com.gxwebsoft.common.system.param.ModulesParam; - -import java.util.List; - -/** - * 模块管理Service - * - * @author 科技小王子 - * @since 2023-10-18 15:53:43 - */ -public interface ModulesService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(ModulesParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(ModulesParam param); - - /** - * 根据id查询 - * - * @param id 插件id - * @return Modules - */ - Modules getByIdRel(Integer id); - -} diff --git a/modules/common/system/service/NoticeService.java b/modules/common/system/service/NoticeService.java deleted file mode 100644 index eb465e1..0000000 --- a/modules/common/system/service/NoticeService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.common.system.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.system.entity.Notice; -import com.gxwebsoft.common.system.param.NoticeParam; - -import java.util.List; - -/** - * 消息记录表Service - * - * @author 科技小王子 - * @since 2023-10-08 13:22:21 - */ -public interface NoticeService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(NoticeParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(NoticeParam param); - - /** - * 根据id查询 - * - * @param noticeId ID - * @return Notice - */ - Notice getByIdRel(Integer noticeId); - -} diff --git a/modules/common/system/service/OperationRecordService.java b/modules/common/system/service/OperationRecordService.java deleted file mode 100644 index 227c4e6..0000000 --- a/modules/common/system/service/OperationRecordService.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.gxwebsoft.common.system.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.system.entity.OperationRecord; -import com.gxwebsoft.common.system.param.OperationRecordParam; - -import java.util.List; - -/** - * 操作日志Service - * - * @author WebSoft - * @since 2018-12-24 16:10:01 - */ -public interface OperationRecordService extends IService { - - /** - * 关联分页查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(OperationRecordParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(OperationRecordParam param); - - /** - * 根据id查询 - * - * @param id id - * @return OperationRecord - */ - OperationRecord getByIdRel(Integer id); - - /** - * 异步添加 - * - * @param operationRecord OperationRecord - */ - void saveAsync(OperationRecord operationRecord); - -} diff --git a/modules/common/system/service/OrderInfoService.java b/modules/common/system/service/OrderInfoService.java deleted file mode 100644 index d43f1d7..0000000 --- a/modules/common/system/service/OrderInfoService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.common.system.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.system.entity.OrderInfo; -import com.gxwebsoft.common.system.param.OrderInfoParam; - -import java.util.List; - -/** - * Service - * - * @author 科技小王子 - * @since 2024-05-10 18:02:54 - */ -public interface OrderInfoService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(OrderInfoParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(OrderInfoParam param); - - /** - * 根据id查询 - * - * @param id - * @return OrderInfo - */ - OrderInfo getByIdRel(Integer id); - -} diff --git a/modules/common/system/service/OrderService.java b/modules/common/system/service/OrderService.java deleted file mode 100644 index 9e99448..0000000 --- a/modules/common/system/service/OrderService.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.gxwebsoft.common.system.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.system.entity.Order; -import com.gxwebsoft.common.system.param.OrderParam; - -import java.util.HashMap; -import java.util.List; - -/** - * 订单Service - * - * @author 科技小王子 - * @since 2024-04-24 13:46:21 - */ -public interface OrderService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(OrderParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(OrderParam param); - - /** - * 根据id查询 - * - * @param orderId ID - * @return Order - */ - Order getByIdRel(Integer orderId); - - HashMap createWxOrder(Order order); - - Order getByOutTradeNo(String outTradeNo); - - void updateByOutTradeNo(Order order); -} diff --git a/modules/common/system/service/OrganizationService.java b/modules/common/system/service/OrganizationService.java deleted file mode 100644 index 94d3407..0000000 --- a/modules/common/system/service/OrganizationService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.common.system.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.system.entity.Organization; -import com.gxwebsoft.common.system.param.OrganizationParam; - -import java.util.List; - -/** - * 组织机构Service - * - * @author WebSoft - * @since 2020-03-14 11:29:04 - */ -public interface OrganizationService extends IService { - - /** - * 关联分页查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(OrganizationParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(OrganizationParam param); - - /** - * 根据id查询 - * - * @param organizationId 机构id - * @return Organization - */ - Organization getByIdRel(Integer organizationId); - -} diff --git a/modules/common/system/service/PaymentService.java b/modules/common/system/service/PaymentService.java deleted file mode 100644 index 918bd12..0000000 --- a/modules/common/system/service/PaymentService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.common.system.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.system.entity.Payment; -import com.gxwebsoft.common.system.param.PaymentParam; - -import java.util.List; - -/** - * 支付方式Service - * - * @author 科技小王子 - * @since 2024-05-11 12:39:11 - */ -public interface PaymentService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(PaymentParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(PaymentParam param); - - /** - * 根据id查询 - * - * @param id ID - * @return Payment - */ - Payment getByIdRel(Integer id); - -} diff --git a/modules/common/system/service/PlugService.java b/modules/common/system/service/PlugService.java deleted file mode 100644 index 09f2899..0000000 --- a/modules/common/system/service/PlugService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.common.system.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.system.entity.Plug; -import com.gxwebsoft.common.system.param.PlugParam; - -import java.util.List; - -/** - * 插件扩展Service - * - * @author 科技小王子 - * @since 2023-10-12 09:53:07 - */ -public interface PlugService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(PlugParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(PlugParam param); - - /** - * 根据id查询 - * - * @param plugId 插件id - * @return Plug - */ - Plug getByIdRel(Integer plugId); - -} diff --git a/modules/common/system/service/RechargeOrderService.java b/modules/common/system/service/RechargeOrderService.java deleted file mode 100644 index ab7a71e..0000000 --- a/modules/common/system/service/RechargeOrderService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.common.system.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.system.entity.RechargeOrder; -import com.gxwebsoft.common.system.param.RechargeOrderParam; - -import java.util.List; - -/** - * 会员充值订单表Service - * - * @author 科技小王子 - * @since 2024-07-26 23:18:48 - */ -public interface RechargeOrderService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(RechargeOrderParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(RechargeOrderParam param); - - /** - * 根据id查询 - * - * @param orderId 订单ID - * @return RechargeOrder - */ - RechargeOrder getByIdRel(Integer orderId); - -} diff --git a/modules/common/system/service/RoleMenuService.java b/modules/common/system/service/RoleMenuService.java deleted file mode 100644 index 05a3d4f..0000000 --- a/modules/common/system/service/RoleMenuService.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.gxwebsoft.common.system.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.system.entity.Menu; -import com.gxwebsoft.common.system.entity.RoleMenu; - -import java.util.List; - -/** - * 角色菜单Service - * - * @author WebSoft - * @since 2018-12-24 16:10:44 - */ -public interface RoleMenuService extends IService { - - /** - * 查询用户对应的菜单 - * - * @param userId 用户id - * @param menuType 菜单类型 - * @return List - */ - List listMenuByUserId(Integer userId, Integer menuType); - - /** - * 查询用户对应的菜单 - * - * @param roleIds 角色id - * @param menuType 菜单类型 - * @return List - */ - List listMenuByRoleIds(List roleIds, Integer menuType); - -} diff --git a/modules/common/system/service/RoleService.java b/modules/common/system/service/RoleService.java deleted file mode 100644 index c533f96..0000000 --- a/modules/common/system/service/RoleService.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.gxwebsoft.common.system.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.system.entity.Role; -import com.gxwebsoft.common.system.param.RoleParam; - -/** - * 角色Service - * - * @author WebSoft - * @since 2018-12-24 16:10:32 - */ -public interface RoleService extends IService { - Role getByRoleCode(RoleParam roleParam); -} diff --git a/modules/common/system/service/SettingService.java b/modules/common/system/service/SettingService.java deleted file mode 100644 index d18678f..0000000 --- a/modules/common/system/service/SettingService.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.gxwebsoft.common.system.service; - -import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.system.entity.Setting; -import com.gxwebsoft.common.system.param.SettingParam; -import com.wechat.pay.java.core.Config; - -import java.util.List; - -/** - * 系统设置Service - * - * @author WebSoft - * @since 2022-11-19 13:54:27 - */ -public interface SettingService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(SettingParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(SettingParam param); - - /** - * 根据id查询 - * - * @param settingId id - * @return Setting - */ - Setting getByIdRel(Integer settingId); - - /** - * 通过key获取设置内容 - * @param key key - * @return Setting - */ - JSONObject getBySettingKey(String key); - - Setting getData(String settingKey); - - JSONObject getCache(String key); - - void initConfig(Setting setting); - - Config getConfig(Integer tenantId); - - JSONObject getUploadConfig(Integer tenantId); -} diff --git a/modules/common/system/service/TenantService.java b/modules/common/system/service/TenantService.java deleted file mode 100644 index a47ab8e..0000000 --- a/modules/common/system/service/TenantService.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.gxwebsoft.common.system.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.system.entity.Company; -import com.gxwebsoft.common.system.entity.Tenant; -import com.gxwebsoft.common.system.param.TenantParam; - -import java.util.List; - -/** - * 租户Service - * - * @author 科技小王子 - * @since 2023-07-17 17:49:53 - */ -public interface TenantService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(TenantParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(TenantParam param); - - /** - * 根据id查询 - * - * @param tenantId 租户id - * @return Tenant - */ - Tenant getByIdRel(Integer tenantId); - - Company initialization(Company company); - - boolean destructionAll(Integer tenantId); -} diff --git a/modules/common/system/service/UserBalanceLogService.java b/modules/common/system/service/UserBalanceLogService.java deleted file mode 100644 index eaa4e0d..0000000 --- a/modules/common/system/service/UserBalanceLogService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.common.system.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.system.entity.UserBalanceLog; -import com.gxwebsoft.common.system.param.UserBalanceLogParam; - -import java.util.List; - -/** - * 用户余额变动明细表Service - * - * @author 科技小王子 - * @since 2023-04-21 15:59:09 - */ -public interface UserBalanceLogService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(UserBalanceLogParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(UserBalanceLogParam param); - - /** - * 根据id查询 - * - * @param logId 主键ID - * @return UserBalanceLog - */ - UserBalanceLog getByIdRel(Integer logId); - -} diff --git a/modules/common/system/service/UserCollectionService.java b/modules/common/system/service/UserCollectionService.java deleted file mode 100644 index 421c682..0000000 --- a/modules/common/system/service/UserCollectionService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.common.system.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.system.entity.UserCollection; -import com.gxwebsoft.common.system.param.UserCollectionParam; - -import java.util.List; - -/** - * 我的收藏Service - * - * @author 科技小王子 - * @since 2024-04-28 18:08:32 - */ -public interface UserCollectionService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(UserCollectionParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(UserCollectionParam param); - - /** - * 根据id查询 - * - * @param id 主键ID - * @return UserCollection - */ - UserCollection getByIdRel(Integer id); - -} diff --git a/modules/common/system/service/UserFileService.java b/modules/common/system/service/UserFileService.java deleted file mode 100644 index 2c8abe6..0000000 --- a/modules/common/system/service/UserFileService.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.gxwebsoft.common.system.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.system.entity.UserFile; - -/** - * 用户文件Service - * - * @author WebSoft - * @since 2022-07-21 14:34:40 - */ -public interface UserFileService extends IService { - -} diff --git a/modules/common/system/service/UserGradeService.java b/modules/common/system/service/UserGradeService.java deleted file mode 100644 index d9ab5ae..0000000 --- a/modules/common/system/service/UserGradeService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.common.system.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.system.entity.UserGrade; -import com.gxwebsoft.common.system.param.UserGradeParam; - -import java.util.List; - -/** - * 用户会员等级表Service - * - * @author 科技小王子 - * @since 2023-10-07 22:51:17 - */ -public interface UserGradeService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(UserGradeParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(UserGradeParam param); - - /** - * 根据id查询 - * - * @param gradeId 等级ID - * @return UserGrade - */ - UserGrade getByIdRel(Integer gradeId); - -} diff --git a/modules/common/system/service/UserGroupService.java b/modules/common/system/service/UserGroupService.java deleted file mode 100644 index d97b0aa..0000000 --- a/modules/common/system/service/UserGroupService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.common.system.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.system.entity.UserGroup; -import com.gxwebsoft.common.system.param.UserGroupParam; - -import java.util.List; - -/** - * 用户分组管理表Service - * - * @author 科技小王子 - * @since 2023-10-28 15:16:39 - */ -public interface UserGroupService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(UserGroupParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(UserGroupParam param); - - /** - * 根据id查询 - * - * @param groupId 分组ID - * @return UserGroup - */ - UserGroup getByIdRel(Integer groupId); - -} diff --git a/modules/common/system/service/UserOauthService.java b/modules/common/system/service/UserOauthService.java deleted file mode 100644 index 9c2e04c..0000000 --- a/modules/common/system/service/UserOauthService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.common.system.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.system.entity.UserOauth; -import com.gxwebsoft.common.system.param.UserOauthParam; - -import java.util.List; - -/** - * 第三方用户信息表Service - * - * @author 科技小王子 - * @since 2023-10-07 22:39:46 - */ -public interface UserOauthService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(UserOauthParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(UserOauthParam param); - - /** - * 根据id查询 - * - * @param id 主键ID - * @return UserOauth - */ - UserOauth getByIdRel(Integer id); - -} diff --git a/modules/common/system/service/UserRefereeService.java b/modules/common/system/service/UserRefereeService.java deleted file mode 100644 index 476a01f..0000000 --- a/modules/common/system/service/UserRefereeService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.common.system.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.system.entity.UserReferee; -import com.gxwebsoft.common.system.param.UserRefereeParam; - -import java.util.List; - -/** - * 用户推荐关系表Service - * - * @author 科技小王子 - * @since 2023-10-07 22:56:36 - */ -public interface UserRefereeService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(UserRefereeParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(UserRefereeParam param); - - /** - * 根据id查询 - * - * @param id 主键ID - * @return UserReferee - */ - UserReferee getByIdRel(Integer id); - -} diff --git a/modules/common/system/service/UserRoleService.java b/modules/common/system/service/UserRoleService.java deleted file mode 100644 index c87365b..0000000 --- a/modules/common/system/service/UserRoleService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.common.system.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.system.entity.Role; -import com.gxwebsoft.common.system.entity.UserRole; - -import java.util.List; - -/** - * 用户角色Service - * - * @author WebSoft - * @since 2018-12-24 16:10:35 - */ -public interface UserRoleService extends IService { - - /** - * 批量添加用户角色 - * - * @param userId 用户id - * @param roleIds 角色id集合 - * @return int - */ - int saveBatch(Integer userId, List roleIds); - - /** - * 根据用户id查询角色 - * - * @param userId 用户id - * @return List - */ - List listByUserId(Integer userId); - - /** - * 批量根据用户id查询角色 - * - * @param userIds 用户id集合 - * @return List - */ - List listByUserIds(List userIds); - -} diff --git a/modules/common/system/service/UserService.java b/modules/common/system/service/UserService.java deleted file mode 100644 index 903e91e..0000000 --- a/modules/common/system/service/UserService.java +++ /dev/null @@ -1,113 +0,0 @@ -package com.gxwebsoft.common.system.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.system.entity.User; -import com.gxwebsoft.common.system.param.UserParam; -import org.springframework.security.core.userdetails.UserDetailsService; - -import java.util.List; - -/** - * 用户Service - * - * @author WebSoft - * @since 2018-12-24 16:10:52 - */ -public interface UserService extends IService, UserDetailsService { - - /** - * 关联分页查询用户 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(UserParam param); - - /** - * 关联查询全部用户 - * - * @param param 查询参数 - * @return List - */ - List listRel(UserParam param); - - /** - * 根据id查询用户 - * - * @param userId 用户id - * @return User - */ - User getByIdRel(Integer userId); - - /** - * 根据账号查询用户 - * - * @param username 账号 - * @return User - */ - User getByUsername(String username); - - /** - * 根据账号查询用户 - * - * @param username 账号 - * @param tenantId 租户id - * @return User - */ - User getByUsername(String username, Integer tenantId); - - /** - * 添加用户 - * - * @param user 用户信息 - * @return boolean - */ - boolean saveUser(User user); - - /** - * 修改用户 - * - * @param user 用户信息 - * @return boolean - */ - boolean updateUser(User user); - - /** - * 比较用户密码 - * - * @param dbPassword 数据库存储的密码 - * @param inputPassword 用户输入的密码 - * @return boolean - */ - boolean comparePassword(String dbPassword, String inputPassword); - - /** - * md5加密用户密码 - * - * @param password 密码明文 - * @return 密文 - */ - String encodePassword(String password); - - /** - * 跟进手机号码查询用户 - * @param phone 手机号码 - * @return 用户信息 - */ - User getByPhone(String phone); - - User getByUnionId(UserParam userParam); - - User getByOauthId(UserParam userParam); - - List listStatisticsRel(UserParam param); - - /** - * 更新会员不限租户 - * @param user 用户信息 - */ - void updateByUserId(User user); - - User addUser(UserParam userParam); -} diff --git a/modules/common/system/service/VersionService.java b/modules/common/system/service/VersionService.java deleted file mode 100644 index afbc28d..0000000 --- a/modules/common/system/service/VersionService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.common.system.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.system.entity.Version; -import com.gxwebsoft.common.system.param.VersionParam; - -import java.util.List; - -/** - * 版本更新Service - * - * @author 科技小王子 - * @since 2024-01-15 18:52:24 - */ -public interface VersionService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(VersionParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(VersionParam param); - - /** - * 根据id查询 - * - * @param id ID - * @return Version - */ - Version getByIdRel(Integer id); - -} diff --git a/modules/common/system/service/WhiteDomainService.java b/modules/common/system/service/WhiteDomainService.java deleted file mode 100644 index 35918bd..0000000 --- a/modules/common/system/service/WhiteDomainService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.common.system.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.system.entity.WhiteDomain; -import com.gxwebsoft.common.system.param.WhiteDomainParam; - -import java.util.List; - -/** - * 服务器白名单Service - * - * @author 科技小王子 - * @since 2024-03-26 00:22:21 - */ -public interface WhiteDomainService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(WhiteDomainParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(WhiteDomainParam param); - - /** - * 根据id查询 - * - * @param id ID - * @return WhiteDomain - */ - WhiteDomain getByIdRel(Integer id); - -} diff --git a/modules/common/system/service/impl/AccessKeyServiceImpl.java b/modules/common/system/service/impl/AccessKeyServiceImpl.java deleted file mode 100644 index 2f02e25..0000000 --- a/modules/common/system/service/impl/AccessKeyServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.gxwebsoft.common.system.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.common.system.mapper.AccessKeyMapper; -import com.gxwebsoft.common.system.service.AccessKeyService; -import com.gxwebsoft.common.system.entity.AccessKey; -import com.gxwebsoft.common.system.param.AccessKeyParam; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 访问凭证管理Service实现 - * - * @author 科技小王子 - * @since 2023-05-16 19:19:55 - */ -@Service -public class AccessKeyServiceImpl extends ServiceImpl implements AccessKeyService { - - @Override - public PageResult pageRel(AccessKeyParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(AccessKeyParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - //page.setDefaultOrder("create_time desc"); - return page.sortRecords(list); - } - - @Override - public AccessKey getByIdRel(Integer id) { - AccessKeyParam param = new AccessKeyParam(); - param.setId(id); - return param.getOne(baseMapper.selectListRel(param)); - } - -} diff --git a/modules/common/system/service/impl/AppRenewServiceImpl.java b/modules/common/system/service/impl/AppRenewServiceImpl.java deleted file mode 100644 index 6220a97..0000000 --- a/modules/common/system/service/impl/AppRenewServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.gxwebsoft.common.system.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.common.system.mapper.AppRenewMapper; -import com.gxwebsoft.common.system.service.AppRenewService; -import com.gxwebsoft.common.system.entity.AppRenew; -import com.gxwebsoft.common.system.param.AppRenewParam; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 续费管理Service实现 - * - * @author 科技小王子 - * @since 2023-11-14 14:14:07 - */ -@Service -public class AppRenewServiceImpl extends ServiceImpl implements AppRenewService { - - @Override - public PageResult pageRel(AppRenewParam param) { - PageParam page = new PageParam<>(param); - //page.setDefaultOrder("create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(AppRenewParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - //page.setDefaultOrder("create_time desc"); - return page.sortRecords(list); - } - - @Override - public AppRenew getByIdRel(Integer appRenewId) { - AppRenewParam param = new AppRenewParam(); - param.setAppRenewId(appRenewId); - return param.getOne(baseMapper.selectListRel(param)); - } - -} diff --git a/modules/common/system/service/impl/AppServiceImpl.java b/modules/common/system/service/impl/AppServiceImpl.java deleted file mode 100644 index 7f97cdd..0000000 --- a/modules/common/system/service/impl/AppServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.gxwebsoft.common.system.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.common.system.mapper.AppMapper; -import com.gxwebsoft.common.system.service.AppService; -import com.gxwebsoft.common.system.entity.App; -import com.gxwebsoft.common.system.param.AppParam; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 应用管理记录表Service实现 - * - * @author 科技小王子 - * @since 2023-10-30 22:20:23 - */ -@Service -public class AppServiceImpl extends ServiceImpl implements AppService { - - @Override - public PageResult pageRel(AppParam param) { - PageParam page = new PageParam<>(param); - //page.setDefaultOrder("create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(AppParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - //page.setDefaultOrder("create_time desc"); - return page.sortRecords(list); - } - - @Override - public App getByIdRel(Integer appId) { - AppParam param = new AppParam(); - param.setAppId(appId); - return param.getOne(baseMapper.selectListRel(param)); - } - -} diff --git a/modules/common/system/service/impl/AppUrlServiceImpl.java b/modules/common/system/service/impl/AppUrlServiceImpl.java deleted file mode 100644 index de53143..0000000 --- a/modules/common/system/service/impl/AppUrlServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.gxwebsoft.common.system.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.common.system.mapper.AppUrlMapper; -import com.gxwebsoft.common.system.service.AppUrlService; -import com.gxwebsoft.common.system.entity.AppUrl; -import com.gxwebsoft.common.system.param.AppUrlParam; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 域名管理记录表Service实现 - * - * @author 科技小王子 - * @since 2023-10-30 22:20:23 - */ -@Service -public class AppUrlServiceImpl extends ServiceImpl implements AppUrlService { - - @Override - public PageResult pageRel(AppUrlParam param) { - PageParam page = new PageParam<>(param); - //page.setDefaultOrder("create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(AppUrlParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - //page.setDefaultOrder("create_time desc"); - return page.sortRecords(list); - } - - @Override - public AppUrl getByIdRel(Integer appUrlId) { - AppUrlParam param = new AppUrlParam(); - param.setAppUrlId(appUrlId); - return param.getOne(baseMapper.selectListRel(param)); - } - -} diff --git a/modules/common/system/service/impl/AppUserServiceImpl.java b/modules/common/system/service/impl/AppUserServiceImpl.java deleted file mode 100644 index ab9add5..0000000 --- a/modules/common/system/service/impl/AppUserServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.gxwebsoft.common.system.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.common.system.mapper.AppUserMapper; -import com.gxwebsoft.common.system.service.AppUserService; -import com.gxwebsoft.common.system.entity.AppUser; -import com.gxwebsoft.common.system.param.AppUserParam; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 应用成员Service实现 - * - * @author 科技小王子 - * @since 2023-10-30 22:20:23 - */ -@Service -public class AppUserServiceImpl extends ServiceImpl implements AppUserService { - - @Override - public PageResult pageRel(AppUserParam param) { - PageParam page = new PageParam<>(param); - //page.setDefaultOrder("create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(AppUserParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - //page.setDefaultOrder("create_time desc"); - return page.sortRecords(list); - } - - @Override - public AppUser getByIdRel(Integer appUserId) { - AppUserParam param = new AppUserParam(); - param.setAppUserId(appUserId); - return param.getOne(baseMapper.selectListRel(param)); - } - -} diff --git a/modules/common/system/service/impl/ChatConversationServiceImpl.java b/modules/common/system/service/impl/ChatConversationServiceImpl.java deleted file mode 100644 index d7fc35e..0000000 --- a/modules/common/system/service/impl/ChatConversationServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.gxwebsoft.common.system.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.common.system.mapper.ChatConversationMapper; -import com.gxwebsoft.common.system.service.ChatConversationService; -import com.gxwebsoft.common.system.entity.ChatConversation; -import com.gxwebsoft.common.system.param.ChatConversationParam; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 聊天消息表Service实现 - * - * @author 科技小王子 - * @since 2024-04-27 15:57:27 - */ -@Service -public class ChatConversationServiceImpl extends ServiceImpl implements ChatConversationService { - - @Override - public PageResult pageRel(ChatConversationParam param) { - PageParam page = new PageParam<>(param); - //page.setDefaultOrder("create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(ChatConversationParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - //page.setDefaultOrder("create_time desc"); - return page.sortRecords(list); - } - - @Override - public ChatConversation getByIdRel(Integer id) { - ChatConversationParam param = new ChatConversationParam(); - param.setId(id); - return param.getOne(baseMapper.selectListRel(param)); - } - -} diff --git a/modules/common/system/service/impl/ChatMessageServiceImpl.java b/modules/common/system/service/impl/ChatMessageServiceImpl.java deleted file mode 100644 index bb1f1ef..0000000 --- a/modules/common/system/service/impl/ChatMessageServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.gxwebsoft.common.system.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.common.system.mapper.ChatMessageMapper; -import com.gxwebsoft.common.system.service.ChatMessageService; -import com.gxwebsoft.common.system.entity.ChatMessage; -import com.gxwebsoft.common.system.param.ChatMessageParam; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 聊天消息表Service实现 - * - * @author 科技小王子 - * @since 2024-04-27 15:57:27 - */ -@Service -public class ChatMessageServiceImpl extends ServiceImpl implements ChatMessageService { - - @Override - public PageResult pageRel(ChatMessageParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(ChatMessageParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - //page.setDefaultOrder("create_time desc"); - return page.sortRecords(list); - } - - @Override - public ChatMessage getByIdRel(Integer id) { - ChatMessageParam param = new ChatMessageParam(); - param.setId(id); - return param.getOne(baseMapper.selectListRel(param)); - } - -} diff --git a/modules/common/system/service/impl/CompanyServiceImpl.java b/modules/common/system/service/impl/CompanyServiceImpl.java deleted file mode 100644 index 3fcd1a6..0000000 --- a/modules/common/system/service/impl/CompanyServiceImpl.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.gxwebsoft.common.system.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.common.core.web.ExistenceParam; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.system.entity.Company; -import com.gxwebsoft.common.system.mapper.CompanyMapper; -import com.gxwebsoft.common.system.param.CompanyParam; -import com.gxwebsoft.common.system.service.CompanyService; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 企业信息Service实现 - * - * @author 科技小王子 - * @since 2023-05-27 14:57:34 - */ -@Service -public class CompanyServiceImpl extends ServiceImpl implements CompanyService { - - @Override - public PageResult pageRel(CompanyParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(CompanyParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - page.setDefaultOrder("create_time desc"); - return page.sortRecords(list); - } - - @Override - public Company getByIdRel(Integer companyId) { - CompanyParam param = new CompanyParam(); - param.setCompanyId(companyId); - return param.getOne(baseMapper.selectListRel(param)); - } - - @Override - public Company getByTenantIdRel(Integer tenantId) { - CompanyParam param = new CompanyParam(); -// final Company one = param.getOne(baseMapper.selectListRel(param)); - param.setAuthoritative(true); - return param.getOne(baseMapper.selectListRel(param)); - } - - @Override - public PageResult pageRelAll(CompanyParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - List list = baseMapper.selectPageRelAll(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public void updateByCompanyId(Company company) { - baseMapper.updateByCompanyId(company); - } - - @Override - public boolean removeCompanyAll(Integer companyId){ - if (baseMapper.removeCompanyAll(companyId)) { - return true; - } - return false; - } - - @Override - public boolean undeleteAll(Integer companyId){ - if (baseMapper.undeleteAll(companyId)) { - return true; - } - return false; - } - - - -} diff --git a/modules/common/system/service/impl/DictDataServiceImpl.java b/modules/common/system/service/impl/DictDataServiceImpl.java deleted file mode 100644 index 5ed06a5..0000000 --- a/modules/common/system/service/impl/DictDataServiceImpl.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.gxwebsoft.common.system.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.common.core.utils.CommonUtil; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.system.entity.DictData; -import com.gxwebsoft.common.system.mapper.DictDataMapper; -import com.gxwebsoft.common.system.param.DictDataParam; -import com.gxwebsoft.common.system.service.DictDataService; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 字典数据Service实现 - * - * @author WebSoft - * @since 2020-03-14 11:29:04 - */ -@Service -public class DictDataServiceImpl extends ServiceImpl - implements DictDataService { - - @Override - public PageResult pageRel(DictDataParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("sort_number asc, create_time asc"); - return new PageResult<>(baseMapper.selectPageRel(page, param), page.getTotal()); - } - - @Override - public List listRel(DictDataParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("sort_number asc, create_time asc"); - return page.sortRecords(baseMapper.selectListRel(param)); - } - - @Override - public DictData getByIdRel(Integer dictDataId) { - DictDataParam param = new DictDataParam(); - param.setDictDataId(dictDataId); - return param.getOne(baseMapper.selectListRel(param)); - } - - @Override - public DictData getByDictCodeAndName(String dictCode, String dictDataName) { - List list = baseMapper.getByDictCodeAndName(dictCode, dictDataName); - return CommonUtil.listGetOne(list); - } - -} diff --git a/modules/common/system/service/impl/DictServiceImpl.java b/modules/common/system/service/impl/DictServiceImpl.java deleted file mode 100644 index 6b09f90..0000000 --- a/modules/common/system/service/impl/DictServiceImpl.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.gxwebsoft.common.system.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.common.system.entity.Dict; -import com.gxwebsoft.common.system.mapper.DictMapper; -import com.gxwebsoft.common.system.service.DictService; -import org.springframework.stereotype.Service; - -/** - * 字典Service实现 - * - * @author WebSoft - * @since 2020-03-14 11:29:03 - */ -@Service -public class DictServiceImpl extends ServiceImpl implements DictService { - -} diff --git a/modules/common/system/service/impl/DictionaryDataServiceImpl.java b/modules/common/system/service/impl/DictionaryDataServiceImpl.java deleted file mode 100644 index 0f26dd2..0000000 --- a/modules/common/system/service/impl/DictionaryDataServiceImpl.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.gxwebsoft.common.system.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.common.core.utils.CommonUtil; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.system.entity.DictionaryData; -import com.gxwebsoft.common.system.mapper.DictionaryDataMapper; -import com.gxwebsoft.common.system.param.DictionaryDataParam; -import com.gxwebsoft.common.system.service.DictionaryDataService; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 字典数据Service实现 - * - * @author WebSoft - * @since 2020-03-14 11:29:04 - */ -@Service -public class DictionaryDataServiceImpl extends ServiceImpl - implements DictionaryDataService { - - @Override - public PageResult pageRel(DictionaryDataParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("sort_number"); - return new PageResult<>(baseMapper.selectPageRel(page, param), page.getTotal()); - } - - @Override - public List listRel(DictionaryDataParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("sort_number"); - return page.sortRecords(baseMapper.selectListRel(param)); - } - - @Override - public DictionaryData getByIdRel(Integer dictDataId) { - DictionaryDataParam param = new DictionaryDataParam(); - param.setDictDataId(dictDataId); - return param.getOne(baseMapper.selectListRel(param)); - } - - @Override - public DictionaryData getByDictCodeAndName(String dictCode, String dictDataName) { - List list = baseMapper.getByDictCodeAndName(dictCode, dictDataName); - return CommonUtil.listGetOne(list); - } - -} diff --git a/modules/common/system/service/impl/DictionaryServiceImpl.java b/modules/common/system/service/impl/DictionaryServiceImpl.java deleted file mode 100644 index 74d6fe1..0000000 --- a/modules/common/system/service/impl/DictionaryServiceImpl.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.gxwebsoft.common.system.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.common.system.entity.Dictionary; -import com.gxwebsoft.common.system.mapper.DictionaryMapper; -import com.gxwebsoft.common.system.service.DictionaryService; -import org.springframework.stereotype.Service; - -/** - * 字典Service实现 - * - * @author WebSoft - * @since 2020-03-14 11:29:03 - */ -@Service -public class DictionaryServiceImpl extends ServiceImpl implements DictionaryService { - -} diff --git a/modules/common/system/service/impl/EmailRecordServiceImpl.java b/modules/common/system/service/impl/EmailRecordServiceImpl.java deleted file mode 100644 index 13ecae2..0000000 --- a/modules/common/system/service/impl/EmailRecordServiceImpl.java +++ /dev/null @@ -1,86 +0,0 @@ -package com.gxwebsoft.common.system.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.common.system.entity.EmailRecord; -import com.gxwebsoft.common.system.mapper.EmailRecordMapper; -import com.gxwebsoft.common.system.service.EmailRecordService; -import org.beetl.core.Configuration; -import org.beetl.core.GroupTemplate; -import org.beetl.core.Template; -import org.beetl.core.resource.ClasspathResourceLoader; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.mail.SimpleMailMessage; -import org.springframework.mail.javamail.JavaMailSender; -import org.springframework.mail.javamail.MimeMessageHelper; -import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; -import javax.mail.MessagingException; -import javax.mail.internet.MimeMessage; -import java.io.IOException; -import java.util.Map; - -/** - * 邮件发送记录Service实现 - * - * @author WebSoft - * @since 2019-06-19 04:07:54 - */ -@Service -public class EmailRecordServiceImpl extends ServiceImpl - implements EmailRecordService { - // 发件邮箱 - @Value("${spring.mail.username}") - private String formEmail; - @Resource - private JavaMailSender mailSender; - - @Override - public void sendTextEmail(String title, String content, String[] toEmails) { - SimpleMailMessage message = new SimpleMailMessage(); - message.setFrom(formEmail); - message.setTo(toEmails); - message.setSubject(title); - message.setText(content); - mailSender.send(message); - } - - @Override - public void sendFullTextEmail(String title, String html, String[] toEmails) throws MessagingException { - MimeMessage mimeMessage = mailSender.createMimeMessage(); - MimeMessageHelper helper = new MimeMessageHelper(mimeMessage, true); - helper.setFrom(formEmail); - helper.setTo(toEmails); - helper.setSubject(title); - // 发送邮件 - helper.setText(html, true); - mailSender.send(mimeMessage); - } - - @Override - public void sendHtmlEmail(String title, String path, Map map, String[] toEmails) - throws MessagingException, IOException { - ClasspathResourceLoader resourceLoader = new ClasspathResourceLoader("templates/"); - Configuration cfg = Configuration.defaultConfiguration(); - GroupTemplate gt = new GroupTemplate(resourceLoader, cfg); - Template t = gt.getTemplate(path); // 加载html模板 - t.binding(map); // 填充数据 - String html = t.render(); // 获得渲染后的html - sendFullTextEmail(title, html, toEmails); // 发送邮件 - } - - @Async - @Override - public void sendEmail(String title, String content, String receiver) { - // 发送邮件通知 - EmailRecord emailRecord = new EmailRecord(); - emailRecord.setTitle(title); - emailRecord.setContent(content); - emailRecord.setReceiver(receiver); - emailRecord.setCreateUserId(42); - sendTextEmail(title,content,receiver.split(",")); - save(emailRecord); - } - -} diff --git a/modules/common/system/service/impl/EnvironmentServiceImpl.java b/modules/common/system/service/impl/EnvironmentServiceImpl.java deleted file mode 100644 index c4996a5..0000000 --- a/modules/common/system/service/impl/EnvironmentServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.gxwebsoft.common.system.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.common.system.mapper.EnvironmentMapper; -import com.gxwebsoft.common.system.service.EnvironmentService; -import com.gxwebsoft.common.system.entity.Environment; -import com.gxwebsoft.common.system.param.EnvironmentParam; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 环境管理Service实现 - * - * @author 科技小王子 - * @since 2023-10-18 08:45:13 - */ -@Service -public class EnvironmentServiceImpl extends ServiceImpl implements EnvironmentService { - - @Override - public PageResult pageRel(EnvironmentParam param) { - PageParam page = new PageParam<>(param); - //page.setDefaultOrder("create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(EnvironmentParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - //page.setDefaultOrder("create_time desc"); - return page.sortRecords(list); - } - - @Override - public Environment getByIdRel(Integer id) { - EnvironmentParam param = new EnvironmentParam(); - param.setId(id); - return param.getOne(baseMapper.selectListRel(param)); - } - -} diff --git a/modules/common/system/service/impl/FileRecordServiceImpl.java b/modules/common/system/service/impl/FileRecordServiceImpl.java deleted file mode 100644 index 39a6808..0000000 --- a/modules/common/system/service/impl/FileRecordServiceImpl.java +++ /dev/null @@ -1,114 +0,0 @@ -package com.gxwebsoft.common.system.service.impl; - -import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSONObject; -import com.aliyun.oss.ClientException; -import com.aliyun.oss.OSS; -import com.aliyun.oss.OSSClientBuilder; -import com.aliyun.oss.OSSException; -import com.aliyun.oss.common.auth.CredentialsProvider; -import com.aliyun.oss.common.auth.DefaultCredentialProvider; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.common.core.utils.CommonUtil; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.system.entity.Company; -import com.gxwebsoft.common.system.entity.FileRecord; -import com.gxwebsoft.common.system.mapper.FileRecordMapper; -import com.gxwebsoft.common.system.param.FileRecordParam; -import com.gxwebsoft.common.system.service.CompanyService; -import com.gxwebsoft.common.system.service.FileRecordService; -import com.gxwebsoft.common.system.service.SettingService; -import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import java.io.File; -import java.util.Arrays; -import java.util.List; - -/** - * 文件上传记录Service实现 - * - * @author WebSoft - * @since 2021-08-30 11:21:01 - */ -@Service -public class FileRecordServiceImpl extends ServiceImpl implements FileRecordService { - @Resource - private CompanyService companyService; - @Resource - private SettingService settingService; - - @Override - public PageResult pageRel(FileRecordParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - return new PageResult<>(baseMapper.selectPageRel(page, param), page.getTotal()); - } - - @Override - public List listRel(FileRecordParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - return page.sortRecords(baseMapper.selectListRel(param)); - } - - @Override - public FileRecord getByIdRel(Integer id) { - FileRecordParam param = new FileRecordParam(); - param.setId(id); - return param.getOne(baseMapper.selectListRel(param)); - } - - @Override - public FileRecord getByIdPath(String path) { - return CommonUtil.listGetOne(baseMapper.getByIdPath(path)); - } - - - @Async - @Override - public void deleteFileAsync(List files) { - for (File file : files) { - try { - file.delete(); - } catch (Exception e) { - e.printStackTrace(); - } - } - - } - - @Override - public void deleteOssFileAsync(List fileRecords) { - // 读取云存储配置信息 - final FileRecord record = fileRecords.get(0); - System.out.println("record = " + record); - final JSONObject uploadConfig = settingService.getUploadConfig(record.getTenantId()); - String endpoint = uploadConfig.getString("bucketEndpoint"); - String bucketDomain = uploadConfig.getString("bucketDomain"); - String bucketName = uploadConfig.getString("bucketName"); - String accessKeyId = uploadConfig.getString("accessKeyId"); - String accessKeySecret = uploadConfig.getString("accessKeySecret"); - CredentialsProvider credentialsProvider = new DefaultCredentialProvider(accessKeyId, accessKeySecret); - OSS ossClient = new OSSClientBuilder().build(endpoint, credentialsProvider); - for (FileRecord fileRecord : fileRecords) { - fileRecord.setPath(StrUtil.replace(fileRecord.getPath(), bucketDomain.concat("/"), "")); - try { - // 删除远程文件 - ossClient.deleteObject(bucketName, fileRecord.getPath()); - // 释放空间大小 - if (fileRecord.getCompanyId() > 0) { - Company company = companyService.getById(fileRecord.getCompanyId()); - company.setStorage(company.getStorage() - fileRecord.getLength()); - companyService.updateById(company); - } - } catch (Exception e) { - e.printStackTrace(); - } - } - } -} diff --git a/modules/common/system/service/impl/LoginRecordServiceImpl.java b/modules/common/system/service/impl/LoginRecordServiceImpl.java deleted file mode 100644 index 28497e7..0000000 --- a/modules/common/system/service/impl/LoginRecordServiceImpl.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.gxwebsoft.common.system.service.impl; - -import cn.hutool.extra.servlet.ServletUtil; -import cn.hutool.http.useragent.UserAgent; -import cn.hutool.http.useragent.UserAgentUtil; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.system.entity.LoginRecord; -import com.gxwebsoft.common.system.mapper.LoginRecordMapper; -import com.gxwebsoft.common.system.param.LoginRecordParam; -import com.gxwebsoft.common.system.service.LoginRecordService; -import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Service; - -import javax.servlet.http.HttpServletRequest; -import java.util.List; - -/** - * 登录日志Service实现 - * - * @author WebSoft - * @since 2018-12-24 16:10:14 - */ -@Service -public class LoginRecordServiceImpl extends ServiceImpl - implements LoginRecordService { - - @Override - public PageResult pageRel(LoginRecordParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - return new PageResult<>(baseMapper.selectPageRel(page, param), page.getTotal()); - } - - @Override - public List listRel(LoginRecordParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - return page.sortRecords(baseMapper.selectListRel(param)); - } - - @Override - public LoginRecord getByIdRel(Integer id) { - LoginRecordParam param = new LoginRecordParam(); - param.setId(id); - return param.getOne(baseMapper.selectListRel(param)); - } - - @Async - @Override - public void saveAsync(String username, Integer type, String comments, Integer tenantId, - HttpServletRequest request) { - if (username == null) { - return; - } - LoginRecord loginRecord = new LoginRecord(); - loginRecord.setUsername(username); - loginRecord.setLoginType(type); - loginRecord.setComments(comments); - loginRecord.setTenantId(tenantId); - UserAgent ua = UserAgentUtil.parse(ServletUtil.getHeaderIgnoreCase(request, "User-Agent")); - if (ua != null) { - if (ua.getPlatform() != null) { - loginRecord.setOs(ua.getPlatform().toString()); - } - if (ua.getOs() != null) { - loginRecord.setDevice(ua.getOs().toString()); - } - if (ua.getBrowser() != null) { - loginRecord.setBrowser(ua.getBrowser().toString()); - } - } - loginRecord.setIp(ServletUtil.getClientIP(request)); - baseMapper.insert(loginRecord); - } - -} diff --git a/modules/common/system/service/impl/MenuServiceImpl.java b/modules/common/system/service/impl/MenuServiceImpl.java deleted file mode 100644 index 4a1bb04..0000000 --- a/modules/common/system/service/impl/MenuServiceImpl.java +++ /dev/null @@ -1,234 +0,0 @@ -package com.gxwebsoft.common.system.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.common.core.utils.CommonUtil; -import com.gxwebsoft.common.system.entity.*; -import com.gxwebsoft.common.system.mapper.MenuMapper; -import com.gxwebsoft.common.system.mapper.RoleMapper; -import com.gxwebsoft.common.system.param.MenuParam; -import com.gxwebsoft.common.system.param.RoleParam; -import com.gxwebsoft.common.system.service.*; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Isolation; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.CollectionUtils; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 菜单Service实现 - * - * @author WebSoft - * @since 2018-12-24 16:10:10 - */ -@Service -public class MenuServiceImpl extends ServiceImpl implements MenuService { - private Integer plugMenuId; - @Resource - private RoleService roleService; - @Resource - private RoleMenuService roleMenuService; - @Resource - private UserService userService; - @Resource - private UserRoleService userRoleService; - - @Override - @Transactional(rollbackFor = {Exception.class}, isolation = Isolation.SERIALIZABLE) - public Boolean cloneMenu(MenuParam param) { - System.out.println("准备待克隆的菜单数据 = " + param); - // 删除本项目菜单 - baseMapper.delete(new LambdaQueryWrapper().eq(Menu::getDeleted,0)); - // 顶级栏目 - param.setParentId(0); - // 工单系统 - if (param.getTenantId().equals(10125)) { - // 初始化数据 - initializedData(); - } - // 开始克隆 - doCloneMenu(baseMapper.getMenuByClone(param)); - return true; - } - - @Override - @Transactional(rollbackFor = {Exception.class}, isolation = Isolation.SERIALIZABLE) - public Boolean install(Integer id) { - // 1.插件绑定的菜单ID - final MenuParam param = new MenuParam(); - param.setMenuId(id); - final List list = baseMapper.getMenuByClone(param); - // TODO 克隆当前插件到顶级菜单 - doCloneMenu(list); - - // 2.查找当前租户的超管权限的roleId - final Role superAdmin = roleService.getOne(new LambdaQueryWrapper().eq(Role::getRoleCode, "superAdmin")); - final Integer roleId = superAdmin.getRoleId(); - final Integer tenantId = superAdmin.getTenantId(); - // 3.勾选菜单根权限 - final RoleMenu roleMenu0 = new RoleMenu(); - roleMenu0.setRoleId(roleId); - roleMenu0.setMenuId(this.plugMenuId); - roleMenuService.save(roleMenu0); - - // 4.勾选根节点下的子菜单权限 - final MenuParam menuParam = new MenuParam(); - menuParam.setParentId(this.plugMenuId); - menuParam.setTenantId(tenantId); - final List menuList = baseMapper.getMenuByClone(menuParam); - menuList.forEach(d->{ - RoleMenu roleMenu = new RoleMenu(); - roleMenu.setRoleId(roleId); - roleMenu.setMenuId(d.getMenuId()); - roleMenuService.save(roleMenu); - }); - // 5.调整新插件的排序 - final Menu menu = baseMapper.selectById(this.plugMenuId); - menu.setSortNumber(100); - baseMapper.updateById(menu); - return true; - } - - // 克隆菜单 - private void doCloneMenu(List list) { - final MenuParam param = new MenuParam(); - list.forEach(d -> { - Menu menu = new Menu(); - menu.setParentId(0); - menu.setTitle(d.getTitle()); - menu.setPath(d.getPath()); - menu.setComponent(d.getComponent()); - menu.setMenuType(d.getMenuType()); - menu.setSortNumber(d.getSortNumber()); - menu.setAuthority(d.getAuthority()); - menu.setIcon(d.getIcon()); - menu.setHide(d.getHide()); - menu.setMeta(d.getMeta()); - menu.setModules(d.getModules()); - menu.setModulesUrl(d.getModulesUrl()); - save(menu); - this.plugMenuId = menu.getMenuId(); - // 二级菜单 - param.setParentId(d.getMenuId()); - final List list1 = baseMapper.getMenuByClone(param); - list1.forEach(d1 -> { - final Menu menu1 = new Menu(); - menu1.setParentId(menu.getMenuId()); - menu1.setTitle(d1.getTitle()); - menu1.setPath(d1.getPath()); - menu1.setComponent(d1.getComponent()); - menu1.setMenuType(d1.getMenuType()); - menu1.setSortNumber(d1.getSortNumber()); - menu1.setAuthority(d1.getAuthority()); - menu1.setIcon(d1.getIcon()); - menu1.setHide(d1.getHide()); - menu1.setMeta(d1.getMeta()); - menu1.setModules(d1.getModules()); - menu1.setModulesUrl(d1.getModulesUrl()); - save(menu1); - // 三级菜单 - param.setParentId(d1.getMenuId()); - final List list2 = baseMapper.getMenuByClone(param); - list2.forEach(d2 -> { - final Menu menu2 = new Menu(); - menu2.setParentId(menu1.getMenuId()); - menu2.setTitle(d2.getTitle()); - menu2.setPath(d2.getPath()); - menu2.setComponent(d2.getComponent()); - menu2.setMenuType(d2.getMenuType()); - menu2.setSortNumber(d2.getSortNumber()); - menu2.setAuthority(d2.getAuthority()); - menu2.setIcon(d2.getIcon()); - menu2.setHide(d2.getHide()); - menu2.setMeta(d2.getMeta()); - menu2.setModules(d2.getModules()); - menu2.setModulesUrl(d2.getModulesUrl()); - save(menu2); - // 四级菜单 - param.setParentId(d2.getMenuId()); - final List list3 = baseMapper.getMenuByClone(param); - list3.forEach(d3 -> { - final Menu menu3 = new Menu(); - menu3.setParentId(menu2.getMenuId()); - menu3.setTitle(d3.getTitle()); - menu3.setPath(d3.getPath()); - menu3.setComponent(d3.getComponent()); - menu3.setMenuType(d3.getMenuType()); - menu3.setSortNumber(d3.getSortNumber()); - menu3.setAuthority(d3.getAuthority()); - menu3.setIcon(d3.getIcon()); - menu3.setHide(d3.getHide()); - menu3.setMeta(d3.getMeta()); - menu3.setModules(d3.getModules()); - menu3.setModulesUrl(d3.getModulesUrl()); - save(menu3); - }); - }); - }); - }); - } - - // 初始化数据 - private void initializedData(){ - Role role = new Role(); - User user = new User(); - UserRole userRole = new UserRole(); - if(roleService.count(new LambdaQueryWrapper().eq(Role::getRoleCode, "admin")) == 0){ - role.setRoleCode("admin"); - role.setRoleName("管理人员"); - role.setComments("工单分派管理专员"); - roleService.save(role); - if(userService.count(new LambdaQueryWrapper().eq(User::getUsername, "管理人员")) == 0){ - user.setUsername("刘备"); - user.setNickname("刘备"); - user.setPhone("13800138001"); - user.setPassword(userService.encodePassword("123456")); - user.setSex("1"); - userService.save(user); - // 添加用户角色 - userRole.setRoleId(role.getRoleId()); - userRole.setUserId(user.getUserId()); - userRoleService.save(userRole); - // 添加统计表 - - } - } - if(roleService.count(new LambdaQueryWrapper().eq(Role::getRoleCode, "commander")) == 0){ - role.setRoleCode("commander"); - role.setRoleName("受理人员"); - role.setComments("负责解决问题的处理人员"); - roleService.save(role); - if(userService.count(new LambdaQueryWrapper().eq(User::getUsername, "commander")) == 0){ - user.setUsername("关羽"); - user.setNickname("关羽"); - user.setPhone("13800138002"); - user.setPassword(userService.encodePassword("123456")); - user.setSex("1"); - userService.save(user); - // 添加用户角色 - userRole.setRoleId(role.getRoleId()); - userRole.setUserId(user.getUserId()); - userRoleService.save(userRole); - } - } - if(roleService.count(new LambdaQueryWrapper().eq(Role::getRoleCode, "promoter")) == 0){ - role.setRoleCode("promoter"); - role.setRoleName("工单发起人"); - role.setComments("问题及需求的发起人"); - roleService.save(role); - if(userService.count(new LambdaQueryWrapper().eq(User::getUsername, "promoter")) == 0){ - user.setUsername("张飞"); - user.setNickname("张飞"); - user.setPassword(userService.encodePassword("123456")); - user.setSex("1"); - userService.save(user); - // 添加用户角色 - userRole.setRoleId(role.getRoleId()); - userRole.setUserId(user.getUserId()); - userRoleService.save(userRole); - } - } - } -} diff --git a/modules/common/system/service/impl/MerchantAccountServiceImpl.java b/modules/common/system/service/impl/MerchantAccountServiceImpl.java deleted file mode 100644 index b867e49..0000000 --- a/modules/common/system/service/impl/MerchantAccountServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.gxwebsoft.common.system.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.system.entity.MerchantAccount; -import com.gxwebsoft.common.system.mapper.MerchantAccountMapper; -import com.gxwebsoft.common.system.param.MerchantAccountParam; -import com.gxwebsoft.common.system.service.MerchantAccountService; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 商户账号Service实现 - * - * @author 科技小王子 - * @since 2024-04-19 12:02:24 - */ -@Service -public class MerchantAccountServiceImpl extends ServiceImpl implements MerchantAccountService { - - @Override - public PageResult pageRel(MerchantAccountParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("sort_number asc, create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(MerchantAccountParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - page.setDefaultOrder("sort_number asc, create_time desc"); - return page.sortRecords(list); - } - - @Override - public MerchantAccount getByIdRel(Integer id) { - MerchantAccountParam param = new MerchantAccountParam(); - param.setId(id); - return param.getOne(baseMapper.selectListRel(param)); - } - -} diff --git a/modules/common/system/service/impl/MerchantApplyServiceImpl.java b/modules/common/system/service/impl/MerchantApplyServiceImpl.java deleted file mode 100644 index ee77354..0000000 --- a/modules/common/system/service/impl/MerchantApplyServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.gxwebsoft.common.system.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.system.entity.MerchantApply; -import com.gxwebsoft.common.system.mapper.MerchantApplyMapper; -import com.gxwebsoft.common.system.param.MerchantApplyParam; -import com.gxwebsoft.common.system.service.MerchantApplyService; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 商户入驻申请Service实现 - * - * @author 科技小王子 - * @since 2024-04-05 01:24:36 - */ -@Service -public class MerchantApplyServiceImpl extends ServiceImpl implements MerchantApplyService { - - @Override - public PageResult pageRel(MerchantApplyParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("sort_number asc, create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(MerchantApplyParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - page.setDefaultOrder("sort_number asc, create_time desc"); - return page.sortRecords(list); - } - - @Override - public MerchantApply getByIdRel(Integer applyId) { - MerchantApplyParam param = new MerchantApplyParam(); - param.setApplyId(applyId); - return param.getOne(baseMapper.selectListRel(param)); - } - -} diff --git a/modules/common/system/service/impl/MerchantServiceImpl.java b/modules/common/system/service/impl/MerchantServiceImpl.java deleted file mode 100644 index 57d7455..0000000 --- a/modules/common/system/service/impl/MerchantServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.gxwebsoft.common.system.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.system.entity.Merchant; -import com.gxwebsoft.common.system.mapper.MerchantMapper; -import com.gxwebsoft.common.system.param.MerchantParam; -import com.gxwebsoft.common.system.service.MerchantService; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 商户Service实现 - * - * @author 科技小王子 - * @since 2024-04-05 00:03:54 - */ -@Service -public class MerchantServiceImpl extends ServiceImpl implements MerchantService { - - @Override - public PageResult pageRel(MerchantParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("sort_number asc, create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(MerchantParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - page.setDefaultOrder("sort_number asc, create_time desc"); - return page.sortRecords(list); - } - - @Override - public Merchant getByIdRel(Integer merchantId) { - MerchantParam param = new MerchantParam(); - param.setMerchantId(merchantId); - return param.getOne(baseMapper.selectListRel(param)); - } - -} diff --git a/modules/common/system/service/impl/MerchantTypeServiceImpl.java b/modules/common/system/service/impl/MerchantTypeServiceImpl.java deleted file mode 100644 index ef57df7..0000000 --- a/modules/common/system/service/impl/MerchantTypeServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.gxwebsoft.common.system.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.system.entity.MerchantType; -import com.gxwebsoft.common.system.mapper.MerchantTypeMapper; -import com.gxwebsoft.common.system.param.MerchantTypeParam; -import com.gxwebsoft.common.system.service.MerchantTypeService; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 商户类型Service实现 - * - * @author 科技小王子 - * @since 2024-04-05 00:08:51 - */ -@Service -public class MerchantTypeServiceImpl extends ServiceImpl implements MerchantTypeService { - - @Override - public PageResult pageRel(MerchantTypeParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("sort_number asc, create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(MerchantTypeParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - page.setDefaultOrder("sort_number asc, create_time desc"); - return page.sortRecords(list); - } - - @Override - public MerchantType getByIdRel(Integer id) { - MerchantTypeParam param = new MerchantTypeParam(); - param.setId(id); - return param.getOne(baseMapper.selectListRel(param)); - } - -} diff --git a/modules/common/system/service/impl/ModulesServiceImpl.java b/modules/common/system/service/impl/ModulesServiceImpl.java deleted file mode 100644 index 37e1b44..0000000 --- a/modules/common/system/service/impl/ModulesServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.gxwebsoft.common.system.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.common.system.mapper.ModulesMapper; -import com.gxwebsoft.common.system.service.ModulesService; -import com.gxwebsoft.common.system.entity.Modules; -import com.gxwebsoft.common.system.param.ModulesParam; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 模块管理Service实现 - * - * @author 科技小王子 - * @since 2023-10-18 15:53:43 - */ -@Service -public class ModulesServiceImpl extends ServiceImpl implements ModulesService { - - @Override - public PageResult pageRel(ModulesParam param) { - PageParam page = new PageParam<>(param); - //page.setDefaultOrder("create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(ModulesParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - //page.setDefaultOrder("create_time desc"); - return page.sortRecords(list); - } - - @Override - public Modules getByIdRel(Integer id) { - ModulesParam param = new ModulesParam(); - param.setId(id); - return param.getOne(baseMapper.selectListRel(param)); - } - -} diff --git a/modules/common/system/service/impl/NoticeServiceImpl.java b/modules/common/system/service/impl/NoticeServiceImpl.java deleted file mode 100644 index b4b534c..0000000 --- a/modules/common/system/service/impl/NoticeServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.gxwebsoft.common.system.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.common.system.mapper.NoticeMapper; -import com.gxwebsoft.common.system.service.NoticeService; -import com.gxwebsoft.common.system.entity.Notice; -import com.gxwebsoft.common.system.param.NoticeParam; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 消息记录表Service实现 - * - * @author 科技小王子 - * @since 2023-10-08 13:22:21 - */ -@Service -public class NoticeServiceImpl extends ServiceImpl implements NoticeService { - - @Override - public PageResult pageRel(NoticeParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(NoticeParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - page.setDefaultOrder("create_time desc"); - return page.sortRecords(list); - } - - @Override - public Notice getByIdRel(Integer noticeId) { - NoticeParam param = new NoticeParam(); - param.setNoticeId(noticeId); - return param.getOne(baseMapper.selectListRel(param)); - } - -} diff --git a/modules/common/system/service/impl/OperationRecordServiceImpl.java b/modules/common/system/service/impl/OperationRecordServiceImpl.java deleted file mode 100644 index 8095bf4..0000000 --- a/modules/common/system/service/impl/OperationRecordServiceImpl.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.gxwebsoft.common.system.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.system.entity.OperationRecord; -import com.gxwebsoft.common.system.mapper.OperationRecordMapper; -import com.gxwebsoft.common.system.param.OperationRecordParam; -import com.gxwebsoft.common.system.service.OperationRecordService; -import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 操作日志Service实现 - * - * @author WebSoft - * @since 2018-12-24 16:10:02 - */ -@Service -public class OperationRecordServiceImpl extends ServiceImpl - implements OperationRecordService { - - @Override - public PageResult pageRel(OperationRecordParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - return new PageResult<>(baseMapper.selectPageRel(page, param), page.getTotal()); - } - - @Override - public List listRel(OperationRecordParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - return page.sortRecords(baseMapper.selectListRel(param)); - } - - @Override - public OperationRecord getByIdRel(Integer id) { - OperationRecordParam param = new OperationRecordParam(); - param.setId(id); - return param.getOne(baseMapper.selectListRel(param)); - } - - @Async - @Override - public void saveAsync(OperationRecord operationRecord) { - baseMapper.insert(operationRecord); - } - -} diff --git a/modules/common/system/service/impl/OrderInfoServiceImpl.java b/modules/common/system/service/impl/OrderInfoServiceImpl.java deleted file mode 100644 index fd065f9..0000000 --- a/modules/common/system/service/impl/OrderInfoServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.gxwebsoft.common.system.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.common.system.mapper.OrderInfoMapper; -import com.gxwebsoft.common.system.service.OrderInfoService; -import com.gxwebsoft.common.system.entity.OrderInfo; -import com.gxwebsoft.common.system.param.OrderInfoParam; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * Service实现 - * - * @author 科技小王子 - * @since 2024-05-10 18:02:54 - */ -@Service -public class OrderInfoServiceImpl extends ServiceImpl implements OrderInfoService { - - @Override - public PageResult pageRel(OrderInfoParam param) { - PageParam page = new PageParam<>(param); - //page.setDefaultOrder("create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(OrderInfoParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - //page.setDefaultOrder("create_time desc"); - return page.sortRecords(list); - } - - @Override - public OrderInfo getByIdRel(Integer id) { - OrderInfoParam param = new OrderInfoParam(); - param.setId(id); - return param.getOne(baseMapper.selectListRel(param)); - } - -} diff --git a/modules/common/system/service/impl/OrderServiceImpl.java b/modules/common/system/service/impl/OrderServiceImpl.java deleted file mode 100644 index e164357..0000000 --- a/modules/common/system/service/impl/OrderServiceImpl.java +++ /dev/null @@ -1,171 +0,0 @@ -package com.gxwebsoft.common.system.service.impl; - -import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.common.core.config.ConfigProperties; -import com.gxwebsoft.common.core.utils.RedisUtil; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.system.entity.Order; -import com.gxwebsoft.common.system.entity.Payment; -import com.gxwebsoft.common.system.mapper.OrderMapper; -import com.gxwebsoft.common.system.param.OrderParam; -import com.gxwebsoft.common.system.service.OrderService; -import com.gxwebsoft.common.system.service.PaymentService; -import com.gxwebsoft.common.system.service.SettingService; -import com.wechat.pay.java.core.Config; -import com.wechat.pay.java.core.RSAConfig; -import com.wechat.pay.java.service.payments.jsapi.JsapiServiceExtension; -import com.wechat.pay.java.service.payments.jsapi.model.Amount; -import com.wechat.pay.java.service.payments.jsapi.model.Payer; -import com.wechat.pay.java.service.payments.jsapi.model.PrepayRequest; -import com.wechat.pay.java.service.payments.jsapi.model.PrepayWithRequestPaymentResponse; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; -import java.math.BigDecimal; -import java.util.HashMap; -import java.util.List; - -/** - * 订单Service实现 - * - * @author 科技小王子 - * @since 2024-04-24 13:46:21 - */ -@Service -public class OrderServiceImpl extends ServiceImpl implements OrderService { - @Value("${spring.profiles.active}") - String active; - @Resource - private ConfigProperties config; - @Resource - private SettingService settingService; - @Resource - private RedisUtil redisUtil; - @Resource - private PaymentService paymentService; - public static String privateKeyPath = "/Users/gxwebsoft/JAVA/com.gxwebsoft.core/src/main/resources/cert/apiclient_key.pem"; - public static String privateCertPath = "/Users/gxwebsoft/JAVA/com.gxwebsoft.core/src/main/resources/cert/apiclient_cert.pem"; - public static String serialNumber = "48749613B40AA8F1D768583FC352358E13EB5AF0"; - public static String merchantId = "1246610101"; - public static String appId = "wx541db955e7a62709"; - public static String apiV3Key = "zGufUcqa7ovgxRL0kF5OlPr482EZwtn9"; - - /** - * 平台证书生成命令(勿删) - * java -jar CertificateDownloader.jar -k zGufUcqa7ovgxRL0kF5OlPr482EZwtn9 -m 1246610101 -f /www/wwwroot/file.ws//file/20240511/280fb6cf7eec4c2d9661c2508123c6a8.pem -s 48749613B40AA8F1D768583FC352358E13EB5AF0 -o /www/cert/ - */ - public static String wechatpayCertPath = "/Users/gxwebsoft/JAVA/com.gxwebsoft.core/src/main/resources/cert/wechatpay_4A3231584E93B6AE77820074D07EADEACCB7E223.pem"; // 平台证书 - - @Override - public PageResult pageRel(OrderParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(OrderParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - return page.sortRecords(list); - } - - @Override - public Order getByIdRel(Integer orderId) { - OrderParam param = new OrderParam(); - param.setOrderId(orderId); - return param.getOne(baseMapper.selectListRel(param)); - } - - @Override - public Order getByOutTradeNo(String outTradeNo) { - System.out.println("outTradeNo = " + outTradeNo); - OrderParam param = new OrderParam(); - param.setOrderNo(outTradeNo); - return param.getOne(baseMapper.getByOutTradeNo(param)); - } - - @Override - public void updateByOutTradeNo(Order order) { - baseMapper.updateByOutTradeNo(order); - } - - /** - * 创建微信支付 - * - * @param order - * @return - */ - @Override - public HashMap createWxOrder(Order order) { - // 服务器本地路径 - final String uploadPath = config.getUploadPath(); - final HashMap orderInfo = new HashMap<>(); - // 微信小程序(微信支付) - String key = "Payment:wxPay:".concat(order.getTenantId().toString()); - final Payment payment = redisUtil.get(key, Payment.class); - - final JSONObject mpWx = settingService.getBySettingKey("mp-weixin"); - - // 计算金额 - BigDecimal decimal = order.getTotalPrice(); - final BigDecimal multiply = decimal.multiply(new BigDecimal(100)); - // 将 BigDecimal 转换为 Integer - Integer money = multiply.intValue(); - String privateKey = uploadPath.concat("/file").concat(payment.getApiclientKey()); // 秘钥证书 - String apiclientCert = uploadPath.concat("/file").concat(payment.getApiclientCert()); - // 开发环境配置 - if(active.equals("dev")){ - privateKey = privateKeyPath; - apiclientCert = wechatpayCertPath; - } - Config config = - new RSAConfig.Builder() - .merchantId(payment.getMchId()) - .privateKeyFromPath(privateKey) - .merchantSerialNumber(payment.getMerchantSerialNumber()) - .wechatPayCertificatesFromPath(apiclientCert) - .build(); - - // 构建service - JsapiServiceExtension service = new JsapiServiceExtension.Builder().config(config).build(); - // 跟之前下单示例一样，填充预下单参数 - PrepayRequest request = new PrepayRequest(); - Amount amount = new Amount(); - amount.setTotal(money); - amount.setCurrency("CNY"); - request.setAmount(amount); - request.setAppid(mpWx.getString("appId")); - request.setMchid(payment.getMchId()); - request.setDescription(order.getComments()); - request.setNotifyUrl("https://server.gxwebsoft.com/api/system/wx-pay/notify/" + order.getTenantId()); - request.setOutTradeNo(order.getOrderNo()); - request.setAttach(order.getTenantId().toString()); - final Payer payer = new Payer(); - payer.setOpenid(order.getOpenid()); - request.setPayer(payer); - if (StrUtil.isNotBlank(payment.getNotifyUrl())) { - request.setNotifyUrl(payment.getNotifyUrl().concat("/").concat(order.getTenantId().toString())); - } - // 测试金额 - if(active.equals("dev")){ - amount.setTotal(1); - request.setAmount(amount); - } - System.out.println("request = " + request); - PrepayWithRequestPaymentResponse response = service.prepayWithRequestPayment(request); - orderInfo.put("provider", "wxpay"); - orderInfo.put("timeStamp", response.getTimeStamp()); - orderInfo.put("nonceStr", response.getNonceStr()); - orderInfo.put("package", response.getPackageVal()); - orderInfo.put("signType", "RSA"); - orderInfo.put("paySign", response.getPaySign()); - return orderInfo; - } -} diff --git a/modules/common/system/service/impl/OrganizationServiceImpl.java b/modules/common/system/service/impl/OrganizationServiceImpl.java deleted file mode 100644 index b2bb53f..0000000 --- a/modules/common/system/service/impl/OrganizationServiceImpl.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.gxwebsoft.common.system.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.system.entity.Organization; -import com.gxwebsoft.common.system.mapper.OrganizationMapper; -import com.gxwebsoft.common.system.param.OrganizationParam; -import com.gxwebsoft.common.system.service.OrganizationService; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 组织机构Service实现 - * - * @author WebSoft - * @since 2020-03-14 11:29:04 - */ -@Service -public class OrganizationServiceImpl extends ServiceImpl - implements OrganizationService { - - @Override - public PageResult pageRel(OrganizationParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("sort_number"); - return new PageResult<>(baseMapper.selectPageRel(page, param), page.getTotal()); - } - - @Override - public List listRel(OrganizationParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("sort_number"); - return page.sortRecords(baseMapper.selectListRel(param)); - } - - @Override - public Organization getByIdRel(Integer organizationId) { - OrganizationParam param = new OrganizationParam(); - param.setOrganizationId(organizationId); - return param.getOne(baseMapper.selectListRel(param)); - } - -} diff --git a/modules/common/system/service/impl/PaymentServiceImpl.java b/modules/common/system/service/impl/PaymentServiceImpl.java deleted file mode 100644 index 2ab34b2..0000000 --- a/modules/common/system/service/impl/PaymentServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.gxwebsoft.common.system.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.common.system.mapper.PaymentMapper; -import com.gxwebsoft.common.system.service.PaymentService; -import com.gxwebsoft.common.system.entity.Payment; -import com.gxwebsoft.common.system.param.PaymentParam; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 支付方式Service实现 - * - * @author 科技小王子 - * @since 2024-05-11 12:39:11 - */ -@Service -public class PaymentServiceImpl extends ServiceImpl implements PaymentService { - - @Override - public PageResult pageRel(PaymentParam param) { - PageParam page = new PageParam<>(param); - //page.setDefaultOrder("create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(PaymentParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - //page.setDefaultOrder("create_time desc"); - return page.sortRecords(list); - } - - @Override - public Payment getByIdRel(Integer id) { - PaymentParam param = new PaymentParam(); - param.setId(id); - return param.getOne(baseMapper.selectListRel(param)); - } - -} diff --git a/modules/common/system/service/impl/PlugServiceImpl.java b/modules/common/system/service/impl/PlugServiceImpl.java deleted file mode 100644 index f70e8ff..0000000 --- a/modules/common/system/service/impl/PlugServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.gxwebsoft.common.system.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.common.system.mapper.PlugMapper; -import com.gxwebsoft.common.system.service.PlugService; -import com.gxwebsoft.common.system.entity.Plug; -import com.gxwebsoft.common.system.param.PlugParam; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 插件扩展Service实现 - * - * @author 科技小王子 - * @since 2023-10-12 09:53:07 - */ -@Service -public class PlugServiceImpl extends ServiceImpl implements PlugService { - - @Override - public PageResult pageRel(PlugParam param) { - PageParam page = new PageParam<>(param); - //page.setDefaultOrder("create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(PlugParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - //page.setDefaultOrder("create_time desc"); - return page.sortRecords(list); - } - - @Override - public Plug getByIdRel(Integer plugId) { - PlugParam param = new PlugParam(); - param.setPlugId(plugId); - return param.getOne(baseMapper.selectListRel(param)); - } - -} diff --git a/modules/common/system/service/impl/RechargeOrderServiceImpl.java b/modules/common/system/service/impl/RechargeOrderServiceImpl.java deleted file mode 100644 index c4d2c64..0000000 --- a/modules/common/system/service/impl/RechargeOrderServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.gxwebsoft.common.system.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.system.entity.RechargeOrder; -import com.gxwebsoft.common.system.mapper.RechargeOrderMapper; -import com.gxwebsoft.common.system.param.RechargeOrderParam; -import com.gxwebsoft.common.system.service.RechargeOrderService; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 会员充值订单表Service实现 - * - * @author 科技小王子 - * @since 2024-07-26 23:18:48 - */ -@Service -public class RechargeOrderServiceImpl extends ServiceImpl implements RechargeOrderService { - - @Override - public PageResult pageRel(RechargeOrderParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("sort_number asc, create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(RechargeOrderParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - page.setDefaultOrder("sort_number asc, create_time desc"); - return page.sortRecords(list); - } - - @Override - public RechargeOrder getByIdRel(Integer orderId) { - RechargeOrderParam param = new RechargeOrderParam(); - param.setOrderId(orderId); - return param.getOne(baseMapper.selectListRel(param)); - } - -} diff --git a/modules/common/system/service/impl/RoleMenuServiceImpl.java b/modules/common/system/service/impl/RoleMenuServiceImpl.java deleted file mode 100644 index 737c5e3..0000000 --- a/modules/common/system/service/impl/RoleMenuServiceImpl.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.gxwebsoft.common.system.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.common.system.entity.Menu; -import com.gxwebsoft.common.system.entity.RoleMenu; -import com.gxwebsoft.common.system.mapper.RoleMenuMapper; -import com.gxwebsoft.common.system.service.RoleMenuService; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 角色菜单Service实现 - * - * @author WebSoft - * @since 2018-12-24 16:10:12 - */ -@Service -public class RoleMenuServiceImpl extends ServiceImpl implements RoleMenuService { - - @Override - public List listMenuByUserId(Integer userId, Integer menuType) { - return baseMapper.listMenuByUserId(userId, menuType); - } - - @Override - public List listMenuByRoleIds(List roleIds, Integer menuType) { - return baseMapper.listMenuByRoleIds(roleIds, menuType); - } - -} diff --git a/modules/common/system/service/impl/RoleServiceImpl.java b/modules/common/system/service/impl/RoleServiceImpl.java deleted file mode 100644 index aa163a7..0000000 --- a/modules/common/system/service/impl/RoleServiceImpl.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.gxwebsoft.common.system.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.common.system.entity.Role; -import com.gxwebsoft.common.system.mapper.RoleMapper; -import com.gxwebsoft.common.system.param.RoleParam; -import com.gxwebsoft.common.system.service.RoleService; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 角色服务实现类 - * - * @author WebSoft - * @since 2018-12-24 16:10:11 - */ -@Service -public class RoleServiceImpl extends ServiceImpl implements RoleService { - - @Override - public Role getByRoleCode(RoleParam roleParam) { - final List roleList = baseMapper.selectListAll(roleParam); - return roleList.get(0); - } -} diff --git a/modules/common/system/service/impl/SettingServiceImpl.java b/modules/common/system/service/impl/SettingServiceImpl.java deleted file mode 100644 index a428ec6..0000000 --- a/modules/common/system/service/impl/SettingServiceImpl.java +++ /dev/null @@ -1,179 +0,0 @@ -package com.gxwebsoft.common.system.service.impl; - -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.common.core.config.ConfigProperties; -import com.gxwebsoft.common.core.exception.BusinessException; -import com.gxwebsoft.common.core.utils.RedisUtil; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.system.entity.Setting; -import com.gxwebsoft.common.system.mapper.SettingMapper; -import com.gxwebsoft.common.system.param.SettingParam; -import com.gxwebsoft.common.system.service.SettingService; -import com.wechat.pay.java.core.Config; -import com.wechat.pay.java.core.RSAConfig; -import com.wechat.pay.java.service.payments.jsapi.JsapiService; -import org.springframework.data.redis.core.StringRedisTemplate; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * 系统设置Service实现 - * - * @author WebSoft - * @since 2022-11-19 13:54:27 - */ -@Service -public class SettingServiceImpl extends ServiceImpl implements SettingService { - // 本地缓存 - public static Map configMap = new HashMap<>(); - public static JsapiService service = null; - public static Config config = null; - @Resource - private ConfigProperties pathConfig; - @Resource - private StringRedisTemplate stringRedisTemplate; - @Resource - private RedisUtil redisUtil; - - @Override - public PageResult pageRel(SettingParam param) { - PageParam page = new PageParam<>(param); - //page.setDefaultOrder("create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(SettingParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - //page.setDefaultOrder("create_time desc"); - return page.sortRecords(list); - } - - @Override - public Setting getByIdRel(Integer settingId) { - SettingParam param = new SettingParam(); - param.setSettingId(settingId); - return param.getOne(baseMapper.selectListRel(param)); - } - - @Override - public JSONObject getBySettingKey(String key) { - Setting setting = this.getOne(new QueryWrapper().eq("setting_key", key), false); - if(setting == null){ - if ("mp-weixin".equals(key)) { - throw new BusinessException("小程序未配置"); - } - if ("payment".equals(key)) { - throw new BusinessException("支付未配置"); - } - if ("sms".equals(key)) { - throw new BusinessException("短信未配置"); - } - if ("wx-work".equals(key)){ - throw new BusinessException("企业微信未配置"); - } - if ("setting".equals(key)) { - throw new BusinessException("基本信息未配置"); - } - if ("wx-official".equals(key)) { - throw new BusinessException("微信公众号未配置"); - } - if ("printer".equals(key)) { - throw new BusinessException("打印机未配置"); - } - } - return JSON.parseObject(setting.getContent()); - } - - @Override - public Setting getData(String settingKey) { - return query().eq("setting_key", settingKey).one(); - } - - @Override - public JSONObject getCache(String key) { - final String cache = stringRedisTemplate.opsForValue().get(key); - final JSONObject jsonObject = JSONObject.parseObject(cache); - if(jsonObject == null){ - throw new BusinessException("域名未配置"); - } - return jsonObject; - } - - @Override - public void initConfig(Setting data) { - if (data.getSettingKey().equals("payment")) { - final JSONObject jsonObject = JSONObject.parseObject(data.getContent()); - final String mchId = jsonObject.getString("mchId"); - final String apiclientKey = jsonObject.getString("apiclientKey"); - final String privateKey = pathConfig.getUploadPath().concat("file").concat(apiclientKey); - final String apiclientCert = pathConfig.getUploadPath().concat("file").concat(jsonObject.getString("apiclientCert")); - final String merchantSerialNumber = jsonObject.getString("merchantSerialNumber"); - final String apiV3key = jsonObject.getString("wechatApiKey"); - if(config == null){ -// config = new RSAAutoCertificateConfig.Builder() -// .merchantId(mchId) -// .privateKeyFromPath("/Users/gxwebsoft/Documents/uploads/file/20230622/fb193d3bfff0467b83dc498435a4f433.pem") -// .merchantSerialNumber(merchantSerialNumber) -// .apiV3Key(apiV3key) -// .build(); - config = - new RSAConfig.Builder() - .merchantId("1246610101") - .privateKeyFromPath("/Users/gxwebsoft/Documents/uploads/file/20230622/fb193d3bfff0467b83dc498435a4f433.pem") - .merchantSerialNumber("2903B872D5CA36E525FAEC37AEDB22E54ECDE7B7") - .wechatPayCertificatesFromPath("/Users/gxwebsoft/Documents/uploads/file/20230622/23329e924dae41af9b716825626dd44b.pem") - .build(); - configMap.put(data.getTenantId().toString(),config); - System.out.println("config = " + config); - } - if (service == null) { - service = new JsapiService.Builder().config(config).build(); - } - } - } - - @Override - public Config getConfig(Integer tenantId) { - if(configMap.get(tenantId.toString()) == null){ - final Setting payment = getOne(new LambdaQueryWrapper().eq(Setting::getSettingKey, "payment")); - this.initConfig(payment); - return configMap.get(tenantId.toString()); - } - return configMap.get(tenantId.toString()); - } - - @Override - public JSONObject getUploadConfig(Integer tenantId) { - // 读取配置信息 - JSONObject settingInfo; - String key3 = "Upload:" + tenantId; - settingInfo = redisUtil.get(key3, JSONObject.class); - if (settingInfo == null) { - settingInfo = getBySettingKey("upload"); - if(settingInfo == null){ - return null; - } - redisUtil.set(key3,settingInfo); - } -// String endpoint = settingInfo.getString("bucketEndpoint"); -// String bucketDomain = settingInfo.getString("bucketDomain"); -// String bucketName = settingInfo.getString("bucketName"); -// String accessKeyId = settingInfo.getString("accessKeyId"); -// String accessKeySecret = settingInfo.getString("accessKeySecret"); - return settingInfo; - } - -} diff --git a/modules/common/system/service/impl/TenantServiceImpl.java b/modules/common/system/service/impl/TenantServiceImpl.java deleted file mode 100644 index 053ba96..0000000 --- a/modules/common/system/service/impl/TenantServiceImpl.java +++ /dev/null @@ -1,648 +0,0 @@ -package com.gxwebsoft.common.system.service.impl; - -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.DesensitizedUtil; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.common.core.utils.CommonUtil; -import com.gxwebsoft.common.core.utils.DomainUtil; -import com.gxwebsoft.common.core.utils.RedisUtil; -import com.gxwebsoft.common.system.entity.*; -import com.gxwebsoft.common.system.mapper.TenantMapper; -import com.gxwebsoft.common.system.service.*; -import com.gxwebsoft.common.system.param.TenantParam; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; - -import javax.annotation.Resource; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -/** - * 租户Service实现 - * - * @author 科技小王子 - * @since 2023-07-17 17:49:53 - */ -@Service -public class TenantServiceImpl extends ServiceImpl implements TenantService { - - @Resource - private CompanyService companyService; - @Resource - private MenuService menuService; - @Resource - private RoleService roleService; - @Resource - private UserRoleService userRoleService; - @Resource - private DictService dictService; - @Resource - private DictDataService dictDataService; - @Resource - private EmailRecordService emailRecordService; - @Resource - private UserService userService; - @Resource - private RedisUtil redisUtil; - - @Override - public PageResult pageRel(TenantParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("sort_number asc, create_time desc"); - List list = baseMapper.selectPageRel(page, param); -// if (param.getSceneType() != null && param.getSceneType().equals("plug")) { -// final Set collectIds = list.stream().map(Tenant::getTenantId).collect(Collectors.toSet()); -// System.out.println("collectIds = " + collectIds); -// final List companyList = companyService.list(new LambdaUpdateWrapper().in(Company::getTenantId, collectIds)); -// System.out.println("companyList = " + companyList); -// final Map> collect = companyList.stream().collect(Collectors.groupingBy(Company::getTenantId)); -// list.forEach(d -> { -// final List companies = collect.get(d.getTenantId()); -// if (!CollectionUtils.isEmpty(companies)) { -// final Company c1 = companies.get(0); -// final Company c2 = new Company(); -// c2.setCompanyName(c1.getCompanyName()); -// c2.setShortName(c1.getShortName()); -// c2.setPhone(DesensitizedUtil.mobilePhone(c1.getPhone())); -// d.setCompany(c2); -// } -// }); -// } - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(TenantParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - //page.setDefaultOrder("create_time desc"); - return page.sortRecords(list); - } - - @Override - public Tenant getByIdRel(Integer tenantId) { - TenantParam param = new TenantParam(); - return param.getOne(baseMapper.selectListRel(param)); - } - - @Override - public Company initialization(Company company) { - // 添加默认字典 - Dict dict = new Dict(); - dict.setDictName("性别"); - dict.setDictCode("sex"); - dict.setTenantId(company.getTid()); - dictService.save(dict); - DictData dictData = new DictData(); - dictData.setDictId(dict.getDictId()); - dictData.setDictDataName("男"); - dictData.setDictDataCode("1"); - dictData.setSortNumber(100); - dictData.setTenantId(company.getTid()); - dictDataService.save(dictData); - dictData.setDictDataName("女"); - dictData.setDictDataCode("2"); - dictData.setTenantId(company.getTid()); - dictDataService.save(dictData); - dict.setDictName("机构类型"); - dict.setDictCode("organizationType"); - dict.setTenantId(company.getTid()); - dictService.save(dict); - dictData.setDictId(dict.getDictId()); - dictData.setDictDataName("公司"); - dictData.setDictDataCode("1"); - dictData.setTenantId(company.getTid()); - dictDataService.save(dictData); - dictData.setDictId(dict.getDictId()); - dictData.setDictDataName("部门"); - dictData.setDictDataCode("2"); - dictData.setTenantId(company.getTid()); - dictDataService.save(dictData); - - // 添加超级管理员 - User admin = new User(); - admin.setUsername("admin"); - admin.setNickname("超级管理员"); - admin.setPhone(company.getPhone()); - admin.setEmail(company.getEmail()); - admin.setIsAdmin(true); - admin.setRealName(company.getBusinessEntity()); - admin.setCompanyName(company.getShortName()); - admin.setPassword(userService.encodePassword(company.getPassword())); - admin.setTenantId(company.getTid()); - boolean result = userService.save(admin); - Integer superAdminUserId = admin.getUserId(); - - // 企业资源配置 - company.setTenantId(company.getTid()); - company.setShortName(company.getShortName()); - company.setPhone(company.getPhone()); - company.setMembers(20); - company.setServerUrl("https://server.gxwebsoft.com"); - company.setModulesUrl("https://modules.gxwebsoft.com"); - company.setSocketUrl("wss://server.gxwebsoft.com"); - company.setAdminUrl(DomainUtil.getAdminUrl(company.getTid().toString())); - company.setWebsiteUrl(DomainUtil.getSiteUrl(company.getTid().toString())); -// company.setH5Code("https://".concat("websoft.top")); -// company.setAndroidUrl("http://".concat(company.getTid().toString()).concat(".android.wsdns.cn")); -// company.setIosUrl("http://".concat(company.getTid().toString()).concat(".ios.wsdns.cn")); - company.setVersion(10); - company.setIndustryParent(""); - company.setIndustryChild(""); - company.setDepartments(10); - company.setDepartments(10); - company.setStorageMax(524288000L); - company.setAuthoritative(true); - company.setUsers(2); - company.setClicks(1L); - company.setLikes(0L); - company.setTid(company.getTid()); - company.setCompanyType("企业"); - company.setEmail(company.getEmail()); - company.setUserId(admin.getUserId()); - company.setExpirationTime(DateUtil.nextMonth()); - companyService.save(company); - - // 创建角色 - if (result) { - Role role = new Role(); - role.setRoleName("超级管理员"); - role.setRoleCode("superAdmin"); - role.setComments("超级管理员"); - role.setTenantId(company.getTid()); - roleService.save(role); - - // 保存超级管理员角色ID - Integer superAdminRoleId = role.getRoleId(); - role.setRoleName("注册用户"); - role.setRoleCode("user"); - role.setComments("普通注册用户"); - roleService.save(role); -// role.setRoleName("游客"); -// role.setRoleCode("guest"); -// role.setComments("用于未登录时的浏览权限"); -// roleService.save(role); - role.setRoleName("商户管理员"); - role.setRoleCode("merchant"); - role.setComments("商户管理员/店长角色"); - roleService.save(role); - role.setRoleName("商户账号"); - role.setRoleCode("merchantClerk"); - role.setRoleName("管理人员/店员"); - Integer guestRoleId = role.getRoleId(); - - // 添加游客账号 -// User www = new User(); -// www.setTenantId(company.getTid()); -// www.setUsername("www"); -// www.setNickname("游客"); -// www.setPassword(userService.encodePassword(CommonUtil.randomUUID16())); -// userService.save(www); - - // 添加超管用户角色 - UserRole userRole = new UserRole(); - userRole.setUserId(superAdminUserId); - userRole.setRoleId(superAdminRoleId); - userRole.setTenantId(company.getTid()); - boolean resultUserRole = userRoleService.save(userRole); - - // 添加游客用户角色 -// userRole.setUserId(www.getUserId()); -// userRole.setRoleId(guestRoleId); -// boolean resultUserRole = userRoleService.save(userRole); - - // 添加系统菜单 - if (resultUserRole) { - Menu menu = new Menu(); - menu.setMenuType(0); - menu.setParentId(0); - menu.setHide(1); - menu.setTitle("扩展插件"); - menu.setPath("/system/plug"); - menu.setComponent("/system/plug"); - menu.setIcon("AppstoreAddOutlined"); - menu.setAuthority("sys:plug:list"); - menu.setSortNumber(0); - menu.setTenantId(company.getTid()); - menuService.save(menu); - // 10.系统管理 - menu.setTitle("系统管理"); - menu.setParentId(0); - menu.setPath("/system"); - menu.setIcon("setting-outlined"); - menu.setSortNumber(999); - menu.setHide(1); - menu.setTenantId(company.getTid()); - menuService.save(menu); - Integer parentId = menu.getMenuId(); - menu.setParentId(menu.getMenuId()); - menu.setTitle("企业信息"); - menu.setPath("/system/profile"); - menu.setComponent("/system/profile"); - menu.setIcon("AuditOutlined"); - menu.setAuthority("sys:company:profile"); - menu.setSortNumber(1); - menu.setHide(0); - menuService.save(menu); - menu.setTitle("用户管理"); - menu.setPath("/system/user"); - menu.setComponent("/system/user"); - menu.setIcon("team-outlined"); - menu.setSortNumber(4); - menuService.save(menu); - Integer userParentId = menu.getMenuId(); - menu.setParentId(userParentId); - menu.setMenuType(1); - menu.setTitle("查询"); - menu.setIcon(""); - menu.setAuthority("sys:user:list"); - menuService.save(menu); - menu.setParentId(userParentId); - menu.setTitle("添加"); - menu.setAuthority("sys:user:save"); - menuService.save(menu); - menu.setParentId(userParentId); - menu.setTitle("修改"); - menu.setAuthority("sys:user:update"); - menuService.save(menu); - menu.setParentId(userParentId); - menu.setTitle("删除"); - menu.setAuthority("sys:user:remove"); - menuService.save(menu); - menu.setMenuType(0); - menu.setParentId(parentId); - menu.setTitle("部门管理"); - menu.setPath("/system/organization"); - menu.setComponent("/system/organization"); - menu.setIcon("bank-outlined"); - menu.setAuthority(""); - menu.setSortNumber(2); - menuService.save(menu); - Integer orgParentId = menu.getMenuId(); - menu.setParentId(orgParentId); - menu.setMenuType(1); - menu.setPath(""); - menu.setComponent(""); - menu.setIcon(""); - menu.setTitle("查询"); - menu.setAuthority("sys:org:list"); - menuService.save(menu); - menu.setParentId(orgParentId); - menu.setTitle("添加"); - menu.setAuthority("sys:org:save"); - menuService.save(menu); - menu.setParentId(orgParentId); - menu.setTitle("修改"); - menu.setAuthority("sys:org:update"); - menuService.save(menu); - menu.setParentId(orgParentId); - menu.setTitle("删除"); - menu.setAuthority("sys:org:remove"); - menuService.save(menu); - menu.setMenuType(0); - menu.setParentId(parentId); - menu.setTitle("角色管理"); - menu.setPath("/system/role"); - menu.setComponent("/system/role"); - menu.setIcon("idcard-outlined"); - menu.setAuthority(""); - menu.setSortNumber(5); - menuService.save(menu); - Integer roleParentId = menu.getMenuId(); - menu.setParentId(roleParentId); - menu.setMenuType(1); - menu.setIcon(""); - menu.setPath(""); - menu.setComponent(""); - menu.setTitle("查询"); - menu.setAuthority("sys:role:list"); - menuService.save(menu); - menu.setParentId(roleParentId); - menu.setTitle("添加"); - menu.setAuthority("sys:role:save"); - menuService.save(menu); - menu.setParentId(roleParentId); - menu.setTitle("修改"); - menu.setAuthority("sys:role:update"); - menuService.save(menu); - menu.setParentId(roleParentId); - menu.setTitle("删除"); - menu.setAuthority("sys:role:remove"); - menuService.save(menu); - menu.setMenuType(0); - menu.setParentId(parentId); - menu.setTitle("菜单管理"); - menu.setPath("/system/menu"); - menu.setComponent("/system/menu"); - menu.setIcon("appstore-outlined"); - menu.setAuthority(""); - menu.setSortNumber(3); - menuService.save(menu); - Integer menuParentId = menu.getMenuId(); - menu.setParentId(menuParentId); - menu.setMenuType(1); - menu.setTitle("查询"); - menu.setAuthority("sys:menu:list"); - menu.setIcon(""); - menu.setPath(""); - menu.setComponent(""); - menuService.save(menu); - menu.setParentId(menuParentId); - menu.setTitle("添加"); - menu.setAuthority("sys:menu:save"); - menuService.save(menu); - menu.setParentId(menuParentId); - menu.setTitle("修改"); - menu.setAuthority("sys:menu:update"); - menuService.save(menu); - menu.setParentId(menuParentId); - menu.setTitle("删除"); - menu.setAuthority("sys:menu:remove"); - menuService.save(menu); - menu.setMenuType(0); - menu.setParentId(parentId); - menu.setTitle("字典管理"); - menu.setPath("/system/dict"); - menu.setComponent("/system/dict"); - menu.setIcon("profile-outlined"); - menu.setAuthority(""); - menu.setSortNumber(6); - menuService.save(menu); - Integer dictParentId = menu.getMenuId(); - menu.setParentId(dictParentId); - menu.setMenuType(1); - menu.setTitle("查询"); - menu.setAuthority("sys:dict:list"); - menu.setIcon(""); - menu.setPath(""); - menu.setComponent(""); - menuService.save(menu); - menu.setParentId(dictParentId); - menu.setTitle("添加"); - menu.setAuthority("sys:dict:save"); - menuService.save(menu); - menu.setParentId(dictParentId); - menu.setTitle("修改"); - menu.setAuthority("sys:dict:update"); - menuService.save(menu); - menu.setParentId(dictParentId); - menu.setTitle("删除"); - menu.setAuthority("sys:dict:remove"); - menuService.save(menu); - menu.setMenuType(0); - menu.setParentId(parentId); - menu.setTitle("登录日志"); - menu.setPath("/system/login-record"); - menu.setComponent("/system/login-record"); - menu.setIcon("calendar-outlined"); - menu.setAuthority("sys:login-record:list"); - menu.setSortNumber(7); - menuService.save(menu); - menu.setParentId(parentId); - menu.setTitle("模块管理"); - menu.setPath("/system/modules"); - menu.setComponent("/system/modules"); - menu.setIcon("KeyOutlined"); - menu.setAuthority("sys:modules:list"); - menu.setSortNumber(7); - menuService.save(menu); - menu.setParentId(parentId); - menu.setTitle("秘钥管理"); - menu.setPath("/system/access-key"); - menu.setComponent("/system/access-key"); - menu.setIcon("KeyOutlined"); - menu.setAuthority("sys:accessKey:list"); - menu.setSortNumber(8); - menuService.save(menu); - menu.setParentId(parentId); - menu.setTitle("文件管理"); - menu.setPath("/system/file"); - menu.setComponent("/system/file"); - menu.setIcon("folder-outlined"); - menu.setAuthority(""); - menu.setSortNumber(6); - menuService.save(menu); - Integer fileParentId = menu.getMenuId(); - menu.setParentId(fileParentId); - menu.setMenuType(1); - menu.setTitle("查看记录"); - menu.setPath(""); - menu.setComponent(""); - menu.setIcon(""); - menu.setAuthority("sys:file:list"); - menuService.save(menu); - menu.setParentId(fileParentId); - menu.setTitle("上传文件"); - menu.setAuthority("sys:file:upload"); - menuService.save(menu); - menu.setParentId(fileParentId); - menu.setTitle("修改文件"); - menu.setAuthority("sys:file:update"); - menuService.save(menu); - menu.setParentId(fileParentId); - menu.setTitle("删除文件"); - menu.setAuthority("sys:org:remove"); - menuService.save(menu); - menu.setMenuType(0); - menu.setParentId(parentId); - menu.setTitle("扩展插件"); - menu.setPath("/system/plug"); - menu.setComponent("/system/plug"); - menu.setIcon("AppstoreAddOutlined"); - menu.setAuthority("sys:plug:list"); - menu.setSortNumber(9); - menuService.save(menu); - Integer plugParentId = menu.getMenuId(); - menu.setParentId(plugParentId); - menu.setMenuType(1); - menu.setTitle("查询"); - menu.setAuthority("sys:dict:list"); - menu.setIcon(""); - menu.setPath(""); - menu.setComponent(""); - menuService.save(menu); - menu.setParentId(plugParentId); - menu.setTitle("发布插件"); - menu.setAuthority("sys:plug:save"); - menuService.save(menu); - menu.setParentId(plugParentId); - menu.setTitle("更新插件"); - menu.setAuthority("sys:plug:update"); - menuService.save(menu); - menu.setParentId(plugParentId); - menu.setTitle("删除插件"); - menu.setAuthority("sys:plus:remove"); - menuService.save(menu); - menu.setParentId(plugParentId); - menu.setTitle("安装插件"); - menu.setAuthority("sys:plug:save"); - menuService.save(menu); - menu.setMenuType(0); - menu.setParentId(parentId); - menu.setTitle("系统设置"); - menu.setPath("/system/setting"); - menu.setComponent("/system/setting"); - menu.setIcon("setting-outlined"); - menu.setAuthority("sys:setting:save"); - menu.setSortNumber(10); - menuService.save(menu); - menu.setParentId(parentId); - menu.setTitle("用户信息"); - menu.setPath("/system/user-info"); - menu.setComponent("/system/user-info"); - menu.setIcon("team-outlined"); - menu.setAuthority(""); - menu.setHide(1); - menu.setMenuType(0); - menu.setSortNumber(9); - menuService.save(menu); - Integer userInfoParentId = menu.getMenuId(); - menu.setParentId(userInfoParentId); - menu.setMenuType(1); - menu.setTitle("修改个人密码"); - menu.setAuthority("sys:auth:password"); - menu.setIcon(""); - menu.setPath(""); - menu.setComponent(""); - menuService.save(menu); - menu.setParentId(userInfoParentId); - menu.setTitle("修改个人资料"); - menu.setAuthority("sys:auth:user"); - menuService.save(menu); - // 1.控制台 -// menu.setParentId(0); -// menu.setTitle("管理首页"); -// menu.setPath("/dashboard"); -// menu.setIcon("home-outlined"); -// menu.setComponent("/dashboard/workplace"); -// menu.setAuthority(""); -// menu.setSortNumber(1); -// menu.setHide(0); -// menu.setMenuType(0); -// menuService.save(menu); - - // 个人中心 - menu.setParentId(0); - menu.setTitle("个人中心"); - menu.setPath("/user-center"); - menu.setIcon("UserOutlined"); - menu.setComponent(""); - menu.setAuthority(""); - menu.setMenuType(0); - menu.setHide(1); - menu.setSortNumber(999); - menuService.save(menu); - Integer userCenterParentId = menu.getMenuId(); - menu.setTitle("个人资料"); - menu.setPath("/user/profile"); - menu.setComponent("/user/profile"); - menu.setIcon("IdcardOutlined"); - menu.setParentId(userCenterParentId); - menu.setMenuType(0); - menu.setSortNumber(0); - menuService.save(menu); - Integer userProfileParentId = menu.getMenuId(); - menu.setParentId(userProfileParentId); - menu.setMenuType(1); - menu.setIcon(""); - menu.setPath(""); - menu.setComponent(""); - menu.setTitle("修改资料"); - menu.setSortNumber(0); - menu.setAuthority("sys:auth:user"); - menuService.save(menu); - menu.setTitle("修改密码"); - menu.setAuthority("sys:auth:password"); - menuService.save(menu); - - menu.setTitle("上传头像"); - menu.setAuthority("sys:file:upload"); - menuService.save(menu); - menu.setTitle("预览头像"); - menu.setAuthority("sys:file:list"); - menuService.save(menu); - menu.setTitle("保存头像"); - menu.setAuthority("sys:user:update"); - menuService.save(menu); - menu.setTitle("我的消息"); - menu.setPath("/user/notice"); - menu.setComponent("/user/notice"); - menu.setIcon("sound-outlined"); - menu.setParentId(userCenterParentId); - menu.setMenuType(0); - menuService.save(menu); - Integer userNoticeParentId = menu.getMenuId(); - menu.setParentId(userNoticeParentId); - menu.setTitle("列表"); - menu.setAuthority("sys:notice:list"); - menu.setSortNumber(0); - menu.setMenuType(1); - menu.setIcon(""); - menu.setPath(""); - menu.setComponent(""); - menuService.save(menu); - menu.setTitle("添加"); - menu.setAuthority("sys:notice:save"); - menuService.save(menu); - menu.setTitle("编辑"); - menu.setAuthority("sys:notice:update"); - menuService.save(menu); - menu.setTitle("删除"); - menu.setAuthority("sys:notice:remove"); - menuService.save(menu); - menu.setParentId(userCenterParentId); - menu.setTitle("用户注册"); - menu.setAuthority("sys:user:save"); - menuService.save(menu); - menu.setTitle("字典查询"); - menu.setAuthority("sys:dict:list"); - - boolean resultMenu = menuService.save(menu); - // 添加菜单ID到超级管理员所属角色ID - if (resultMenu) { - saveRedis(company); - } - } - } - // 发送邮件通知 - String title = "恭喜！您的应用已创建成功"; - String appUrl = "\r\n应用地址：" + DomainUtil.getSiteUrl(company.getTid().toString()); - String appName = "\r\n应用名称：" + company.getShortName(); - String adminUrl = "\r\n后台管理：" + DomainUtil.getAdminUrl(company.getTid().toString()); - String account = "\r\n账号：admin"; - String password = "\r\n密码：" + company.getPassword(); - String content = title + appUrl + appName + adminUrl + account + password; - // 发送邮件通知 - emailRecordService.sendEmail(title, content, company.getEmail()); - return company; - } - - - - // 缓存租户信息 - private void saveRedis(Company tenant) { - String key = "tenant:" + tenant.getTenantId(); - if (StrUtil.isEmpty(tenant.getTenantCode())) { - tenant.setTenantCode(CommonUtil.randomUUID16()); - } - redisUtil.set(key, tenant); - } - - @Override - public boolean destructionAll(Integer tenantId){ - if (baseMapper.destructionAll(tenantId)) { - return true; - } - return false; - } - -} diff --git a/modules/common/system/service/impl/UserBalanceLogServiceImpl.java b/modules/common/system/service/impl/UserBalanceLogServiceImpl.java deleted file mode 100644 index 2286471..0000000 --- a/modules/common/system/service/impl/UserBalanceLogServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.gxwebsoft.common.system.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.system.entity.UserBalanceLog; -import com.gxwebsoft.common.system.mapper.UserBalanceLogMapper; -import com.gxwebsoft.common.system.param.UserBalanceLogParam; -import com.gxwebsoft.common.system.service.UserBalanceLogService; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 用户余额变动明细表Service实现 - * - * @author 科技小王子 - * @since 2023-04-21 15:59:09 - */ -@Service -public class UserBalanceLogServiceImpl extends ServiceImpl implements UserBalanceLogService { - - @Override - public PageResult pageRel(UserBalanceLogParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(UserBalanceLogParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - page.setDefaultOrder("create_time desc"); - return page.sortRecords(list); - } - - @Override - public UserBalanceLog getByIdRel(Integer logId) { - UserBalanceLogParam param = new UserBalanceLogParam(); - param.setLogId(logId); - return param.getOne(baseMapper.selectListRel(param)); - } - -} diff --git a/modules/common/system/service/impl/UserCollectionServiceImpl.java b/modules/common/system/service/impl/UserCollectionServiceImpl.java deleted file mode 100644 index 01307f2..0000000 --- a/modules/common/system/service/impl/UserCollectionServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.gxwebsoft.common.system.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.common.system.mapper.UserCollectionMapper; -import com.gxwebsoft.common.system.service.UserCollectionService; -import com.gxwebsoft.common.system.entity.UserCollection; -import com.gxwebsoft.common.system.param.UserCollectionParam; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 我的收藏Service实现 - * - * @author 科技小王子 - * @since 2024-04-28 18:08:32 - */ -@Service -public class UserCollectionServiceImpl extends ServiceImpl implements UserCollectionService { - - @Override - public PageResult pageRel(UserCollectionParam param) { - PageParam page = new PageParam<>(param); - //page.setDefaultOrder("create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(UserCollectionParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - //page.setDefaultOrder("create_time desc"); - return page.sortRecords(list); - } - - @Override - public UserCollection getByIdRel(Integer id) { - UserCollectionParam param = new UserCollectionParam(); - param.setId(id); - return param.getOne(baseMapper.selectListRel(param)); - } - -} diff --git a/modules/common/system/service/impl/UserFileServiceImpl.java b/modules/common/system/service/impl/UserFileServiceImpl.java deleted file mode 100644 index b5712c3..0000000 --- a/modules/common/system/service/impl/UserFileServiceImpl.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.gxwebsoft.common.system.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.common.system.mapper.UserFileMapper; -import com.gxwebsoft.common.system.service.UserFileService; -import com.gxwebsoft.common.system.entity.UserFile; -import org.springframework.stereotype.Service; - -/** - * 用户文件Service实现 - * - * @author WebSoft - * @since 2022-07-21 14:34:40 - */ -@Service -public class UserFileServiceImpl extends ServiceImpl implements UserFileService { - -} diff --git a/modules/common/system/service/impl/UserGradeServiceImpl.java b/modules/common/system/service/impl/UserGradeServiceImpl.java deleted file mode 100644 index 410ba2f..0000000 --- a/modules/common/system/service/impl/UserGradeServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.gxwebsoft.common.system.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.common.system.mapper.UserGradeMapper; -import com.gxwebsoft.common.system.service.UserGradeService; -import com.gxwebsoft.common.system.entity.UserGrade; -import com.gxwebsoft.common.system.param.UserGradeParam; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 用户会员等级表Service实现 - * - * @author 科技小王子 - * @since 2023-10-07 22:51:17 - */ -@Service -public class UserGradeServiceImpl extends ServiceImpl implements UserGradeService { - - @Override - public PageResult pageRel(UserGradeParam param) { - PageParam page = new PageParam<>(param); -// page.setDefaultOrder("create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(UserGradeParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); -// page.setDefaultOrder("create_time desc"); - return page.sortRecords(list); - } - - @Override - public UserGrade getByIdRel(Integer gradeId) { - UserGradeParam param = new UserGradeParam(); - param.setGradeId(gradeId); - return param.getOne(baseMapper.selectListRel(param)); - } - -} diff --git a/modules/common/system/service/impl/UserGroupServiceImpl.java b/modules/common/system/service/impl/UserGroupServiceImpl.java deleted file mode 100644 index dccaf0f..0000000 --- a/modules/common/system/service/impl/UserGroupServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.gxwebsoft.common.system.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.common.system.mapper.UserGroupMapper; -import com.gxwebsoft.common.system.service.UserGroupService; -import com.gxwebsoft.common.system.entity.UserGroup; -import com.gxwebsoft.common.system.param.UserGroupParam; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 用户分组管理表Service实现 - * - * @author 科技小王子 - * @since 2023-10-28 15:16:39 - */ -@Service -public class UserGroupServiceImpl extends ServiceImpl implements UserGroupService { - - @Override - public PageResult pageRel(UserGroupParam param) { - PageParam page = new PageParam<>(param); - //page.setDefaultOrder("create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(UserGroupParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - //page.setDefaultOrder("create_time desc"); - return page.sortRecords(list); - } - - @Override - public UserGroup getByIdRel(Integer groupId) { - UserGroupParam param = new UserGroupParam(); - param.setGroupId(groupId); - return param.getOne(baseMapper.selectListRel(param)); - } - -} diff --git a/modules/common/system/service/impl/UserOauthServiceImpl.java b/modules/common/system/service/impl/UserOauthServiceImpl.java deleted file mode 100644 index c1a8812..0000000 --- a/modules/common/system/service/impl/UserOauthServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.gxwebsoft.common.system.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.common.system.mapper.UserOauthMapper; -import com.gxwebsoft.common.system.service.UserOauthService; -import com.gxwebsoft.common.system.entity.UserOauth; -import com.gxwebsoft.common.system.param.UserOauthParam; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 第三方用户信息表Service实现 - * - * @author 科技小王子 - * @since 2023-10-07 22:39:46 - */ -@Service -public class UserOauthServiceImpl extends ServiceImpl implements UserOauthService { - - @Override - public PageResult pageRel(UserOauthParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(UserOauthParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - page.setDefaultOrder("create_time desc"); - return page.sortRecords(list); - } - - @Override - public UserOauth getByIdRel(Integer id) { - UserOauthParam param = new UserOauthParam(); - param.setId(id); - return param.getOne(baseMapper.selectListRel(param)); - } - -} diff --git a/modules/common/system/service/impl/UserRefereeServiceImpl.java b/modules/common/system/service/impl/UserRefereeServiceImpl.java deleted file mode 100644 index ddb6ef4..0000000 --- a/modules/common/system/service/impl/UserRefereeServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.gxwebsoft.common.system.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.common.system.mapper.UserRefereeMapper; -import com.gxwebsoft.common.system.service.UserRefereeService; -import com.gxwebsoft.common.system.entity.UserReferee; -import com.gxwebsoft.common.system.param.UserRefereeParam; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 用户推荐关系表Service实现 - * - * @author 科技小王子 - * @since 2023-10-07 22:56:36 - */ -@Service -public class UserRefereeServiceImpl extends ServiceImpl implements UserRefereeService { - - @Override - public PageResult pageRel(UserRefereeParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(UserRefereeParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - page.setDefaultOrder("create_time desc"); - return page.sortRecords(list); - } - - @Override - public UserReferee getByIdRel(Integer id) { - UserRefereeParam param = new UserRefereeParam(); - param.setId(id); - return param.getOne(baseMapper.selectListRel(param)); - } - -} diff --git a/modules/common/system/service/impl/UserRoleServiceImpl.java b/modules/common/system/service/impl/UserRoleServiceImpl.java deleted file mode 100644 index a2a3d11..0000000 --- a/modules/common/system/service/impl/UserRoleServiceImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gxwebsoft.common.system.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.common.system.entity.Role; -import com.gxwebsoft.common.system.entity.UserRole; -import com.gxwebsoft.common.system.mapper.UserRoleMapper; -import com.gxwebsoft.common.system.service.UserRoleService; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 用户角色Service实现 - * - * @author WebSoft - * @since 2018-12-24 16:10:36 - */ -@Service -public class UserRoleServiceImpl extends ServiceImpl implements UserRoleService { - - - @Override - public int saveBatch(Integer userId, List roleIds) { - return baseMapper.insertBatch(userId, roleIds); - } - - @Override - public List listByUserId(Integer userId) { - return baseMapper.selectByUserId(userId); - } - - @Override - public List listByUserIds(List userIds) { - return baseMapper.selectByUserIds(userIds); - } - -} diff --git a/modules/common/system/service/impl/UserServiceImpl.java b/modules/common/system/service/impl/UserServiceImpl.java deleted file mode 100644 index dadfe09..0000000 --- a/modules/common/system/service/impl/UserServiceImpl.java +++ /dev/null @@ -1,272 +0,0 @@ -package com.gxwebsoft.common.system.service.impl; - -import cn.hutool.core.util.DesensitizedUtil; -import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.common.core.exception.BusinessException; -import com.gxwebsoft.common.core.utils.CommonUtil; -import com.gxwebsoft.common.core.utils.RedisUtil; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.system.entity.Company; -import com.gxwebsoft.common.system.entity.Role; -import com.gxwebsoft.common.system.entity.User; -import com.gxwebsoft.common.system.entity.UserRole; -import com.gxwebsoft.common.system.mapper.UserMapper; -import com.gxwebsoft.common.system.param.UserParam; -import com.gxwebsoft.common.system.service.*; -import org.springframework.security.core.userdetails.UserDetails; -import org.springframework.security.core.userdetails.UsernameNotFoundException; -import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Isolation; -import org.springframework.transaction.annotation.Transactional; - -import javax.annotation.Resource; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - -import static com.gxwebsoft.common.core.constants.PlatformConstants.MP_WEIXIN; -import static com.gxwebsoft.common.core.constants.PlatformConstants.WEB; - -/** - * 用户Service实现 - * - * @author WebSoft - * @since 2018-12-24 16:10:14 - */ -@Service -public class UserServiceImpl extends ServiceImpl implements UserService { - @Resource - private UserRoleService userRoleService; - @Resource - private RoleService roleService; - @Resource - private RoleMenuService roleMenuService; - @Resource - private BCryptPasswordEncoder bCryptPasswordEncoder; - @Resource - private CompanyService companyService; - @Resource - private RedisUtil redisUtil; - - @Override - public PageResult pageRel(UserParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("user_id desc,create_time desc"); - List list = baseMapper.selectPageRel(page, param); - // 查询用户的角色 - selectUserRoles(list); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(UserParam param) { - List list = baseMapper.selectListRel(param); - // 查询用户的角色 - selectUserRoles(list); - // 排序 - PageParam page = new PageParam<>(param); - page.setDefaultOrder("user_id desc,create_time desc"); - return page.sortRecords(list); - } - - @Override - public User getByIdRel(Integer userId) { - UserParam param = new UserParam(); - param.setUserId(userId); - User user = param.getOne(baseMapper.selectListRel(param)); - if (user != null) { - user.setRoles(userRoleService.listByUserId(user.getUserId())); - user.setAuthorities(roleMenuService.listMenuByUserId(user.getUserId(), null)); -// // 系统配置信息 -// Map map = new HashMap<>(); -// // 1)云存储 -// String key = "setting:upload:" + user.getTenantId(); -// final String upload = redisUtil.get(key); -// if(upload != null){ -// final JSONObject object = JSONObject.parseObject(upload); -// map.put("uploadMethod",object.getString("uploadMethod")); -// map.put("bucketDomain",object.getString("bucketDomain")); -// map.put("fileUrl",object.getString("fileUrl") + "/"); -// user.setSystem(map); -// } - // 企业信息 -// final Company company = companyService.getByTenantIdRel(user.getTenantId()); -// if (company != null) { -// user.setCompanyId(company.getCompanyId()); -// user.setCompanyInfo(company); -// } - } - return user; - } - - @Override - public User getByUsername(String username) { - return getByUsername(username, null); - } - - @Override - public User getByUsername(String username, Integer tenantId) { - if (StrUtil.isBlank(username)) { - return null; - } - User user = baseMapper.selectByUsername(username, tenantId); - if (user != null) { - user.setRoles(userRoleService.listByUserId(user.getUserId())); - user.setAuthorities(roleMenuService.listMenuByUserId(user.getUserId(), null)); - } - return user; - } - - @Override - public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException { - return getByUsername(username); - } - - @Transactional(rollbackFor = {Exception.class}, isolation = Isolation.SERIALIZABLE) - @Override - public boolean saveUser(User user) { - if (StrUtil.isNotEmpty(user.getUsername()) && baseMapper.selectCount(new LambdaQueryWrapper() - .eq(User::getUsername, user.getUsername())) > 0) { - throw new BusinessException("账号已存在"); - } - if (StrUtil.isNotEmpty(user.getPhone()) && baseMapper.selectCount(new LambdaQueryWrapper() - .eq(User::getPhone, user.getPhone())) > 0) { - throw new BusinessException("手机号已存在"); - } - if (StrUtil.isNotEmpty(user.getEmail()) && baseMapper.selectCount(new LambdaQueryWrapper() - .eq(User::getEmail, user.getEmail())) > 0) { - throw new BusinessException("邮箱已存在"); - } - boolean result = baseMapper.insert(user) > 0; - if (result && user.getRoles() != null && user.getRoles().size() > 0) { - List roleIds = user.getRoles().stream().map(Role::getRoleId).collect(Collectors.toList()); - if (userRoleService.saveBatch(user.getUserId(), roleIds) < roleIds.size()) { - throw new BusinessException("用户角色添加失败"); - } - } - return result; - } - - @Transactional(rollbackFor = {Exception.class}) - @Override - public boolean updateUser(User user) { - if (StrUtil.isNotEmpty(user.getUsername()) && baseMapper.selectCount(new LambdaQueryWrapper() - .eq(User::getUsername, user.getUsername()) - .ne(User::getUserId, user.getUserId())) > 0) { - throw new BusinessException("账号已存在"); - } - if (StrUtil.isNotEmpty(user.getPhone()) && baseMapper.selectCount(new LambdaQueryWrapper() - .eq(User::getPhone, user.getPhone()) - .ne(User::getUserId, user.getUserId())) > 0) { - throw new BusinessException("手机号已存在"); - } - if (StrUtil.isNotEmpty(user.getEmail()) && baseMapper.selectCount(new LambdaQueryWrapper() - .eq(User::getEmail, user.getEmail()) - .ne(User::getUserId, user.getUserId())) > 0) { - throw new BusinessException("邮箱已存在"); - } - boolean result = baseMapper.updateById(user) > 0; - if (result && user.getRoles() != null && user.getRoles().size() > 0) { - userRoleService.remove(new LambdaUpdateWrapper().eq(UserRole::getUserId, user.getUserId())); - List roleIds = user.getRoles().stream().map(Role::getRoleId).collect(Collectors.toList()); - if (userRoleService.saveBatch(user.getUserId(), roleIds) < roleIds.size()) { - throw new BusinessException("用户角色添加失败"); - } - } - return result; - } - - @Override - public boolean comparePassword(String dbPassword, String inputPassword) { - return bCryptPasswordEncoder.matches(inputPassword, dbPassword); - } - - @Override - public String encodePassword(String password) { - return password == null ? null : bCryptPasswordEncoder.encode(password); - } - - @Override - public User getByPhone(String phone) { - return query().eq("phone", phone).one(); - } - - @Override - public User getByUnionId(UserParam param) { - return param.getOne(baseMapper.getOne(param)); - } - - @Override - public User getByOauthId(UserParam userParam) { - return userParam.getOne(baseMapper.getOne(userParam)); - } - - @Override - public List listStatisticsRel(UserParam param) { - List list = baseMapper.selectListStatisticsRel(param); - return list; - } - - /** - * 更新用户信息(跨租户) - * - * @param user 用户信息 - */ - @Override - public void updateByUserId(User user) { - baseMapper.updateByUserId(user); - } - - @Override - public User addUser(UserParam userParam) { - User addUser = new User(); - // 注册用户 - addUser.setStatus(0); - addUser.setUsername(userParam.getPhone()); - addUser.setNickname(DesensitizedUtil.mobilePhone(userParam.getPhone())); - addUser.setPlatform(WEB); - addUser.setGradeId(2); - if(userParam.getPhone() != null){ - addUser.setPhone(userParam.getPhone()); - } - addUser.setPassword(encodePassword(CommonUtil.randomUUID16())); - addUser.setTenantId(userParam.getTenantId()); - addUser.setRecommend(0); - Role role = roleService.getOne(new QueryWrapper().eq("role_code", "user"), false); - addUser.setRoleId(role.getRoleId()); - if (saveUser(addUser)) { - // 添加用户角色 - final UserRole userRole = new UserRole(); - userRole.setUserId(addUser.getUserId()); - userRole.setTenantId(addUser.getTenantId()); - userRole.setRoleId(addUser.getRoleId()); - userRoleService.save(userRole); - } - return addUser; - } - - /** - * 批量查询用户的角色 - * - * @param users 用户集合 - */ - private void selectUserRoles(List users) { - if (users != null && users.size() > 0) { - List userIds = users.stream().map(User::getUserId).collect(Collectors.toList()); - List userRoles = userRoleService.listByUserIds(userIds); - for (User user : users) { - List roles = userRoles.stream().filter(d -> user.getUserId().equals(d.getUserId())) - .collect(Collectors.toList()); - user.setRoles(roles); - } - } - } -} diff --git a/modules/common/system/service/impl/VersionServiceImpl.java b/modules/common/system/service/impl/VersionServiceImpl.java deleted file mode 100644 index 70b147e..0000000 --- a/modules/common/system/service/impl/VersionServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.gxwebsoft.common.system.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.common.system.mapper.VersionMapper; -import com.gxwebsoft.common.system.service.VersionService; -import com.gxwebsoft.common.system.entity.Version; -import com.gxwebsoft.common.system.param.VersionParam; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 版本更新Service实现 - * - * @author 科技小王子 - * @since 2024-01-15 18:52:24 - */ -@Service -public class VersionServiceImpl extends ServiceImpl implements VersionService { - - @Override - public PageResult pageRel(VersionParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(VersionParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - //page.setDefaultOrder("create_time desc"); - return page.sortRecords(list); - } - - @Override - public Version getByIdRel(Integer id) { - VersionParam param = new VersionParam(); - param.setId(id); - return param.getOne(baseMapper.selectListRel(param)); - } - -} diff --git a/modules/common/system/service/impl/WhiteDomainServiceImpl.java b/modules/common/system/service/impl/WhiteDomainServiceImpl.java deleted file mode 100644 index 7aa920f..0000000 --- a/modules/common/system/service/impl/WhiteDomainServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.gxwebsoft.common.system.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.common.system.mapper.WhiteDomainMapper; -import com.gxwebsoft.common.system.service.WhiteDomainService; -import com.gxwebsoft.common.system.entity.WhiteDomain; -import com.gxwebsoft.common.system.param.WhiteDomainParam; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 服务器白名单Service实现 - * - * @author 科技小王子 - * @since 2024-03-26 00:22:21 - */ -@Service -public class WhiteDomainServiceImpl extends ServiceImpl implements WhiteDomainService { - - @Override - public PageResult pageRel(WhiteDomainParam param) { - PageParam page = new PageParam<>(param); - //page.setDefaultOrder("create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(WhiteDomainParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - //page.setDefaultOrder("create_time desc"); - return page.sortRecords(list); - } - - @Override - public WhiteDomain getByIdRel(Integer id) { - WhiteDomainParam param = new WhiteDomainParam(); - param.setId(id); - return param.getOne(baseMapper.selectListRel(param)); - } - -} diff --git a/modules/common/system/vo/ChatConversationVO.java b/modules/common/system/vo/ChatConversationVO.java deleted file mode 100644 index d31eb23..0000000 --- a/modules/common/system/vo/ChatConversationVO.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.gxwebsoft.common.system.vo; - -import com.gxwebsoft.common.system.entity.ChatConversation; -import com.gxwebsoft.common.system.entity.User; -import com.gxwebsoft.common.system.entity.ChatMessage; -import lombok.Data; - -import java.util.ArrayList; -import java.util.List; - -@Data -public class ChatConversationVO extends ChatConversation { - private User friendInfo; - private User userInfo; - private List messages = new ArrayList<>(); - private Integer messageCount; - -} diff --git a/modules/common/system/vo/PushMessageVO.java b/modules/common/system/vo/PushMessageVO.java deleted file mode 100644 index 4fb0064..0000000 --- a/modules/common/system/vo/PushMessageVO.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.gxwebsoft.common.system.vo; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Builder; -import lombok.Data; - -import java.io.Serializable; -import java.util.Set; - -@Data -@Builder -public class PushMessageVO implements Serializable { - - @ApiModelProperty("推送消息") - private String title; - - @ApiModelProperty("推送消息内容") - private String content; - - private Set userIds; - - - @ApiModelProperty("推送透传数据obj格式") - private Payload payload; - - - private Set push_clientid; - - - @Data - public static class Payload { - private String type; - private Object data; - } - -} diff --git a/modules/common/system/vo/faceId/HeadPortraitResult.java b/modules/common/system/vo/faceId/HeadPortraitResult.java deleted file mode 100644 index 01dae5d..0000000 --- a/modules/common/system/vo/faceId/HeadPortraitResult.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.gxwebsoft.common.system.vo.faceId; - - -import lombok.Data; - -@Data -public class HeadPortraitResult { - private String code; - private String msg; - private String porn; - private String ad; - private String requestId; - private Integer faceCount; - private Boolean cartoonImg; - private int[] genterList; - private int[] ageList; -} diff --git a/modules/common/system/vo/idcheck/BackRecognitionResult.java b/modules/common/system/vo/idcheck/BackRecognitionResult.java deleted file mode 100644 index faae5b0..0000000 --- a/modules/common/system/vo/idcheck/BackRecognitionResult.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.gxwebsoft.common.system.vo.idcheck; - -import lombok.Data; - -@Data -public class BackRecognitionResult { - - private String startDate; - private String endDate; - private String issue; -} diff --git a/modules/common/system/vo/idcheck/FrontRecognitionResult.java b/modules/common/system/vo/idcheck/FrontRecognitionResult.java deleted file mode 100644 index f68d06d..0000000 --- a/modules/common/system/vo/idcheck/FrontRecognitionResult.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.gxwebsoft.common.system.vo.idcheck; - -import lombok.Data; - -@Data -public class FrontRecognitionResult { - private String idcardno; - private String name; - private String nationality; - private String sex; - private String birth; - private String address; - private String imageStats; - private String direction; -} diff --git a/modules/common/system/vo/idcheck/IdCardInfor.java b/modules/common/system/vo/idcheck/IdCardInfor.java deleted file mode 100644 index 6feb209..0000000 --- a/modules/common/system/vo/idcheck/IdCardInfor.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.gxwebsoft.common.system.vo.idcheck; - -import lombok.Data; - -@Data -public class IdCardInfor { - private String province; - private String city; - private String district; - private String area; - private String sex; - private String birthday; -} - diff --git a/modules/common/system/vo/idcheck/Response.java b/modules/common/system/vo/idcheck/Response.java deleted file mode 100644 index ec4d097..0000000 --- a/modules/common/system/vo/idcheck/Response.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.gxwebsoft.common.system.vo.idcheck; - -import lombok.Data; - -@Data -public class Response { - private Integer error_code; - private String reason; - private T result; -} diff --git a/modules/common/system/vo/idcheck/VerifyResult.java b/modules/common/system/vo/idcheck/VerifyResult.java deleted file mode 100644 index f466341..0000000 --- a/modules/common/system/vo/idcheck/VerifyResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.gxwebsoft.common.system.vo.idcheck; - -import lombok.Data; - -@Data -public class VerifyResult { - private String realname; - private String idcard; - - private boolean isOk; - - private IdCardInfor idCardInfor; - -} diff --git a/modules/oa/controller/AppController.java b/modules/oa/controller/AppController.java deleted file mode 100644 index 4c7d759..0000000 --- a/modules/oa/controller/AppController.java +++ /dev/null @@ -1,318 +0,0 @@ -package com.gxwebsoft.oa.controller; - -import cn.hutool.core.net.url.UrlBuilder; -import cn.hutool.core.net.url.UrlQuery; -import cn.hutool.core.util.DesensitizedUtil; -import cn.hutool.core.util.StrUtil; -import cn.hutool.http.HttpRequest; -import com.alibaba.fastjson.JSONObject; -import com.alibaba.fastjson.TypeReference; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.gxwebsoft.common.core.security.JwtUtil; -import com.gxwebsoft.common.core.utils.CommonUtil; -import com.gxwebsoft.common.core.utils.RedisUtil; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.common.core.web.BatchParam; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.system.entity.FileRecord; -import com.gxwebsoft.common.system.entity.User; -import com.gxwebsoft.common.system.service.FileRecordService; -import com.gxwebsoft.oa.entity.App; -import com.gxwebsoft.oa.entity.AppUrl; -import com.gxwebsoft.oa.entity.AppUser; -import com.gxwebsoft.oa.param.AppParam; -import com.gxwebsoft.oa.service.AppService; -import com.gxwebsoft.oa.service.AppUrlService; -import com.gxwebsoft.oa.service.AppUserService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; - -import static com.gxwebsoft.common.core.constants.AppUserConstants.ADMINISTRATOR; - -/** - * 应用管理记录表控制器 - * - * @author 科技小王子 - * @since 2023-10-26 22:06:23 - */ -@Api(tags = "应用管理记录表管理") -@RestController -@RequestMapping("/api/oa/app") -public class AppController extends BaseController { - @Resource - private AppService appService; - @Resource - private AppUserService appUserService; - @Resource - private AppUrlService appUrlService; - @Resource - private FileRecordService fileRecordService; - @Resource - private RedisUtil redisUtil; - - @ApiOperation("统计信息") - @GetMapping("/data") - public ApiResult> data() { - Map data = new HashMap<>(); - Integer totalNum = appService.count( - new LambdaQueryWrapper<>() - ); - Integer totalNum2 = appService.count( - new LambdaQueryWrapper() - .eq(App::getAppStatus, "开发中") - ); - Integer totalNum3 = appService.count( - new LambdaQueryWrapper() - .eq(App::getAppStatus, "已上架") - ); - Integer totalNum4 = appService.count( - new LambdaQueryWrapper() - .eq(App::getAppStatus, "已上架") - .eq(App::getShowExpiration,false) - ); - Integer totalNum5 = appService.count( - new LambdaQueryWrapper() - .eq(App::getAppStatus, "已下架") - ); - Integer totalNum6 = appService.count( - new LambdaQueryWrapper() - .eq(App::getShowCase,true) - ); - Integer totalNum7 = appService.count( - new LambdaQueryWrapper() - .eq(App::getShowIndex, true) - ); - - data.put("totalNum", totalNum); - data.put("totalNum2", totalNum2); - data.put("totalNum3", totalNum3); - data.put("totalNum4", totalNum4); - data.put("totalNum5", totalNum5); - data.put("totalNum6", totalNum6); - data.put("totalNum7", totalNum7); - return success(data); - } - - @ApiOperation("分页查询应用管理记录表") - @GetMapping("/page") - public ApiResult> page(AppParam param, HttpServletRequest request) { - final User loginUser = getLoginUser(); - // 未登录情况 - if(loginUser == null){ - String access_token = JwtUtil.getAccessToken(request); - param.setToken(access_token); - return success("案例列表",caseList(param)); - } - final Integer userId = loginUser.getUserId(); - loginUser.getRoles().forEach(d -> { - if(!StrUtil.equals(d.getRoleCode(),"superAdmin") && !StrUtil.equals(d.getRoleCode(),"admin")){ - // 非管理员按项目成员权限显示 - final List list = appUserService.list(new LambdaQueryWrapper().eq(AppUser::getUserId, userId)); - System.out.println("list = " + list); - final Set collect = list.stream().map(AppUser::getAppId).collect(Collectors.toSet()); - param.setAppIds(collect); - } - }); - // 过滤续费提醒参数 - if (param.getAppStatus() != null && param.getAppStatus().equals("续费中")) { - param.setAppStatus(null); - } - // 使用关联查询 - return success(appService.pageRel(param)); - } - - // 读取案例列表 - private PageResult caseList(AppParam param){ - param.setShowCase(true); - final PageResult appPageResult = appService.pageRel(param); - appPageResult.getList().forEach(d -> { - d.setContent(null); - // 读取账号列表 - d.setAppUrlList(appUrlService.list(new LambdaQueryWrapper().eq(AppUrl::getAppId,d.getAppId()))); - // 读取项目附件（链式构建GET请求） - HashMap map = new HashMap<>(); - map.put("appId", d.getAppId()); - final String build = UrlBuilder.of("https://server.gxwebsoft.com/api/file/page").setQuery(new UrlQuery(map)).build(); - String response = HttpRequest.get(build) - .header("Authorization", param.getToken()) - .header("Tenantid", d.getTenantId().toString()) - .body(JSONObject.toJSONString(map))//表单内容 - .timeout(20000)//超时，毫秒 - .execute().body(); - - final ApiResult> userResult = JSONObject.parseObject(response, new TypeReference>>() { - }); - d.setAppFiles(userResult.getData().getList()); - }); - return appPageResult; - } - - @PreAuthorize("hasAuthority('oa:app:list')") - @ApiOperation("查询全部应用管理记录表") - @GetMapping() - public ApiResult> list(AppParam param) { - // 使用关联查询 - return success(appService.listRel(param)); - } - - @ApiOperation("根据id查询应用管理记录表") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - final User loginUser = getLoginUser(); - // 未登录情况 - if(loginUser == null){ - return success("案例详情",getDesensitizedApp(id)); - } - if (!CommonUtil.hasRole(loginUser.getRoles(),"superAdmin") && !CommonUtil.hasRole(loginUser.getRoles(),"admin")) { - // 查询权限 - if (appUserService.count(new LambdaQueryWrapper().eq(AppUser::getUserId, getLoginUserId()).eq(AppUser::getAppId,id)) == 0) { - return fail("无查看权限",null); - } - } - // 使用关联查询 - return success(appService.getByIdRel(id)); - } - - private App getDesensitizedApp(Integer id) { - final App app = appService.getByIdRel(id); - app.setPhone(DesensitizedUtil.mobilePhone(app.getPhone())); - app.setCompanyName( - StrUtil.hide(app.getCompanyName(), 2, app.getCompanyName().length() - 2)); - app.setRequirement(DesensitizedUtil.chineseName(app.getCompanyName())); - return app; - } - - @ApiOperation("添加应用管理记录表") - @PostMapping() - public ApiResult save(@RequestBody App app) { - // 记录当前登录用户id、租户id、商户编号 - User loginUser = getLoginUser(); - AppUser appUser = new AppUser(); - if (loginUser != null) { - app.setUserId(loginUser.getUserId()); - app.setTenantId(loginUser.getTenantId()); - } - if (appService.count(new LambdaQueryWrapper() - .eq(App::getAppCode, app.getAppCode())) > 0) { - return fail("应用标识已存在"); - } - if (appService.save(app)) { - // 添加应用管理员 - if (loginUser != null) { - appUser.setUserId(loginUser.getUserId()); - appUser.setNickname(loginUser.getNickname()); - appUser.setAppId(app.getAppId()); - appUser.setRole(ADMINISTRATOR); - appUserService.save(appUser); - } - return success("添加成功"); - } - return fail("添加失败"); - } - - @ApiOperation("修改应用管理记录表") - @PutMapping() - public ApiResult update(@RequestBody App app) { - if (appService.updateById(app)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("删除应用管理记录表") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (appService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @ApiOperation("批量添加应用管理记录表") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (appService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @ApiOperation("批量修改应用管理记录表") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(appService, "app_id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("批量删除应用管理记录表") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (appService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @ApiOperation("重置秘钥") - @PostMapping("/updateAppSecret") - public ApiResult updateAppSecret(@RequestBody App app) { - String key = "code:" + app.getPhone(); - final String code = redisUtil.get(key); - if (app.getAppId() == null) { - return fail("appId不合法"); - } - if(app.getAppSecret() == null){ - return fail("appSecret不合法"); - } - if(app.getAppCode() == null){ - return fail("短信验证码不正确"); - } -// && !app.getAppCode().equals("170083") - if(!app.getAppCode().equals(code)){ - return fail("短信验证码不正确"); - } - appService.updateById(app); - // 保存到redis - redisUtil.set("AppSecret:" + app.getAppId(),app.getAppSecret()); - redisUtil.delete(key); - return success("重置成功",app.getAppSecret()); - } - - @ApiOperation("APP应用授权身份效验") - @GetMapping("/authentication/{appid}") - public ApiResult authentication(@PathVariable("appid") String appid) { - final App appInfo = appService.getById(appid); - if(appInfo == null){ - return fail("应用不存在:".concat(appid)); - } - return success("应用信息",appInfo); - } - - @ApiOperation("查询我的项目信息") - @GetMapping("/getMyApp") - public ApiResult getMyApp() { - final User loginUser = getLoginUser(); - // 未登录情况 - if(loginUser == null){ - return fail("请先登录",null); - } - appService.list(); - - // 使用关联查询 - return success("查询成功",null); - } - -} diff --git a/modules/oa/controller/AppFieldController.java b/modules/oa/controller/AppFieldController.java deleted file mode 100644 index a2a6552..0000000 --- a/modules/oa/controller/AppFieldController.java +++ /dev/null @@ -1,116 +0,0 @@ -package com.gxwebsoft.oa.controller; - -import com.gxwebsoft.common.core.web.*; -import com.gxwebsoft.common.system.entity.User; -import com.gxwebsoft.oa.entity.AppField; -import com.gxwebsoft.oa.param.AppFieldParam; -import com.gxwebsoft.oa.service.AppFieldService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 应用参数控制器 - * - * @author 科技小王子 - * @since 2024-01-12 20:08:35 - */ -@Api(tags = "应用参数管理") -@RestController -@RequestMapping("/api/oa/app-field") -public class AppFieldController extends BaseController { - @Resource - private AppFieldService appFieldService; - - @ApiOperation("分页查询应用参数") - @GetMapping("/page") - public ApiResult> page(AppFieldParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("sort_number desc"); - page.setDefaultOrder("create_time asc"); - return success(appFieldService.page(page, page.getWrapper())); - // 使用关联查询 - //return success(appFieldService.pageRel(param)); - } - - @ApiOperation("查询全部应用参数") - @GetMapping() - public ApiResult> list(AppFieldParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - return success(appFieldService.list(page.getOrderWrapper())); - // 使用关联查询 - //return success(appFieldService.listRel(param)); - } - - @ApiOperation("根据id查询应用参数") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - return success(appFieldService.getById(id)); - // 使用关联查询 - //return success(appFieldService.getByIdRel(id)); - } - - @ApiOperation("添加应用参数") - @PostMapping() - public ApiResult save(@RequestBody AppField appField) { - // 记录当前登录用户id - User loginUser = getLoginUser(); - if (loginUser != null) { - appField.setUserId(loginUser.getUserId()); - } - if (appFieldService.save(appField)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @ApiOperation("修改应用参数") - @PutMapping() - public ApiResult update(@RequestBody AppField appField) { - if (appFieldService.updateById(appField)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("删除应用参数") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (appFieldService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @ApiOperation("批量添加应用参数") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (appFieldService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @ApiOperation("批量修改应用参数") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(appFieldService, "id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("批量删除应用参数") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (appFieldService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/modules/oa/controller/AppRenewController.java b/modules/oa/controller/AppRenewController.java deleted file mode 100644 index 6d2f81c..0000000 --- a/modules/oa/controller/AppRenewController.java +++ /dev/null @@ -1,127 +0,0 @@ -package com.gxwebsoft.oa.controller; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.gxwebsoft.common.core.web.*; -import com.gxwebsoft.common.system.entity.User; -import com.gxwebsoft.oa.entity.App; -import com.gxwebsoft.oa.entity.AppRenew; -import com.gxwebsoft.oa.param.AppRenewParam; -import com.gxwebsoft.oa.service.AppRenewService; -import com.gxwebsoft.oa.service.AppService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 续费管理控制器 - * - * @author 科技小王子 - * @since 2023-11-14 14:27:57 - */ -@Api(tags = "续费管理管理") -@RestController -@RequestMapping("/api/oa/app-renew") -public class AppRenewController extends BaseController { - @Resource - private AppRenewService appRenewService; - @Resource - private AppService appService; - - @ApiOperation("分页查询续费管理") - @GetMapping("/page") - public ApiResult> page(AppRenewParam param) { - // 使用关联查询 - return success(appRenewService.pageRel(param)); - } - - @ApiOperation("查询全部续费管理") - @GetMapping() - public ApiResult> list(AppRenewParam param) { - // 使用关联查询 - return success(appRenewService.listRel(param)); - } - - @ApiOperation("根据id查询续费管理") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - // 使用关联查询 - return success(appRenewService.getByIdRel(id)); - } - - @ApiOperation("添加续费管理") - @PostMapping() - public ApiResult save(@RequestBody AppRenew appRenew) { - // 记录当前登录用户id - User loginUser = getLoginUser(); - if (loginUser != null) { - appRenew.setUserId(loginUser.getUserId()); - } - if (appRenewService.save(appRenew)) { - // 更新到期时间 - App app = appService.getById(appRenew.getAppId()); - app.setExpirationTime(appRenew.getEndTime()); - app.setRenewMoney(appRenew.getMoney()); - app.setShowExpiration(true); - appService.updateById(app); - return success("添加成功"); - } - return fail("添加失败"); - } - - @ApiOperation("修改续费管理") - @PutMapping() - public ApiResult update(@RequestBody AppRenew appRenew) { - if (appRenewService.updateById(appRenew)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("删除续费管理") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (appRenewService.removeById(id)) { - // 没有续费单则不显示在续费提醒列表 - AppRenew appRenew = appRenewService.getById(id); - if (appRenewService.count(new LambdaQueryWrapper().eq(AppRenew::getAppId,appRenew.getAppId())) == 0) { - App app = new App(); - app.setAppId(appRenew.getAppId()); - app.setShowExpiration(false); - appService.updateById(app); - } - return success("删除成功"); - } - return fail("删除失败"); - } - - @ApiOperation("批量添加续费管理") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (appRenewService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @ApiOperation("批量修改续费管理") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(appRenewService, "app_renew_id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("批量删除续费管理") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (appRenewService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/modules/oa/controller/AppUrlController.java b/modules/oa/controller/AppUrlController.java deleted file mode 100644 index 9f3732f..0000000 --- a/modules/oa/controller/AppUrlController.java +++ /dev/null @@ -1,105 +0,0 @@ -package com.gxwebsoft.oa.controller; - -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.oa.service.AppUrlService; -import com.gxwebsoft.oa.entity.AppUrl; -import com.gxwebsoft.oa.param.AppUrlParam; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.core.web.BatchParam; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 项目域名控制器 - * - * @author 科技小王子 - * @since 2024-04-15 13:01:34 - */ -@Api(tags = "项目域名管理") -@RestController -@RequestMapping("/api/oa/app-url") -public class AppUrlController extends BaseController { - @Resource - private AppUrlService appUrlService; - - @ApiOperation("分页查询项目域名") - @GetMapping("/page") - public ApiResult> page(AppUrlParam param) { - // 使用关联查询 - return success(appUrlService.pageRel(param)); - } - - @ApiOperation("查询全部项目域名") - @GetMapping() - public ApiResult> list(AppUrlParam param) { - // 使用关联查询 - return success(appUrlService.listRel(param)); - } - - @ApiOperation("根据id查询项目域名") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - // 使用关联查询 - return success(appUrlService.getByIdRel(id)); - } - - @ApiOperation("添加项目域名") - @PostMapping() - public ApiResult save(@RequestBody AppUrl appUrl) { - if (appUrlService.save(appUrl)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @ApiOperation("修改项目域名") - @PutMapping() - public ApiResult update(@RequestBody AppUrl appUrl) { - if (appUrlService.updateById(appUrl)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("删除项目域名") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (appUrlService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @ApiOperation("批量添加项目域名") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (appUrlService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @ApiOperation("批量修改项目域名") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(appUrlService, "app_url_id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("批量删除项目域名") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (appUrlService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/modules/oa/controller/AppUserController.java b/modules/oa/controller/AppUserController.java deleted file mode 100644 index 89ef12c..0000000 --- a/modules/oa/controller/AppUserController.java +++ /dev/null @@ -1,117 +0,0 @@ -package com.gxwebsoft.oa.controller; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.gxwebsoft.common.core.security.JwtUtil; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.common.core.web.BatchParam; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.oa.entity.AppUser; -import com.gxwebsoft.oa.param.AppUserParam; -import com.gxwebsoft.oa.service.AppUserService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import java.util.List; - -/** - * 应用成员控制器 - * - * @author 科技小王子 - * @since 2023-10-26 22:06:23 - */ -@Api(tags = "应用成员管理") -@RestController -@RequestMapping("/api/oa/app-user") -public class AppUserController extends BaseController { - @Resource - private AppUserService appUserService; - - @ApiOperation("分页查询应用成员") - @GetMapping("/page") - public ApiResult> page(AppUserParam param, HttpServletRequest request) { - // 使用关联查询 - param.setToken(JwtUtil.getAccessToken(request)); - param.setTenantId(getTenantId()); - return success(appUserService.pageRel(param)); - } - - @ApiOperation("查询全部应用成员") - @GetMapping() - public ApiResult> list(AppUserParam param) { - // 使用关联查询 - if (param.getAppId() == null) { - return fail("AppId不存在",null); - } - return success(appUserService.listRel(param)); - } - - @ApiOperation("根据id查询应用成员") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - // 使用关联查询 - return success(appUserService.getByIdRel(id)); - } - - @ApiOperation("添加应用成员") - @PostMapping() - public ApiResult save(@RequestBody AppUser appUser) { - if (appUserService.count(new LambdaQueryWrapper() - .eq(AppUser::getUserId, appUser.getUserId()).eq(AppUser::getAppId,appUser.getAppId())) > 0) { - return fail("该成员已存在"); - } - if (appUserService.save(appUser)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @ApiOperation("修改应用成员") - @PutMapping() - public ApiResult update(@RequestBody AppUser appUser) { - if (appUserService.updateById(appUser)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("删除应用成员") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (appUserService.removeById(id)) { - return success("移除成功"); - } - return fail("移除失败"); - } - - @ApiOperation("批量添加应用成员") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (appUserService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @ApiOperation("批量修改应用成员") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(appUserService, "app_user_id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("批量删除应用成员") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (appUserService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/modules/oa/controller/AssetsController.java b/modules/oa/controller/AssetsController.java deleted file mode 100644 index 70d11f9..0000000 --- a/modules/oa/controller/AssetsController.java +++ /dev/null @@ -1,233 +0,0 @@ -package com.gxwebsoft.oa.controller; - -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.gxwebsoft.common.core.utils.BtUtil; -import com.gxwebsoft.common.core.utils.RedisUtil; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.common.core.web.BatchParam; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.system.entity.Role; -import com.gxwebsoft.common.system.entity.User; -import com.gxwebsoft.oa.entity.Assets; -import com.gxwebsoft.oa.entity.AssetsUser; -import com.gxwebsoft.oa.param.AssetsParam; -import com.gxwebsoft.oa.service.AssetsService; -import com.gxwebsoft.oa.service.AssetsUserService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.util.CollectionUtils; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.time.LocalDateTime; -import java.util.*; -import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; - -import static com.gxwebsoft.common.core.constants.AppUserConstants.ADMINISTRATOR; - -/** - * 服务器资产记录表控制器 - * - * @author 科技小王子 - * @since 2023-10-26 21:08:27 - */ -@Api(tags = "服务器资产记录表管理") -@RestController -@RequestMapping("/api/oa/assets") -public class AssetsController extends BaseController { - @Resource - private AssetsService assetsService; - @Resource - private AssetsUserService assetsUserService; - @Resource - private BtUtil btUtil; - @Resource - private RedisUtil redisUtil; - - @ApiOperation("统计信息") - @GetMapping("/data") - public ApiResult> data() { - final User loginUser = getLoginUser(); - final Integer userId = loginUser.getUserId(); - final List collect1 = loginUser.getRoles().stream().map(Role::getRoleCode).collect(Collectors.toList()); - Map data = new HashMap<>(); - if (collect1.contains("superAdmin") || collect1.contains("admin")) { - Integer totalNum = assetsService.count( - new LambdaQueryWrapper() - ); - Integer totalNum1 = assetsService.count( - new LambdaQueryWrapper() - .gt(Assets::getEndTime, LocalDateTime.now()) -// .eq(Assets::getStatus, "运行中") - ); - Integer totalNum2 = assetsService.count( - new LambdaQueryWrapper() - .lt(Assets::getEndTime, LocalDateTime.now()) - ); - Integer totalNum3 = assetsService.count( - new LambdaQueryWrapper() - .eq(Assets::getStatus, "已销毁") - ); - data.put("totalNum", totalNum); - data.put("totalNum1", totalNum1); - data.put("totalNum2", totalNum2); - data.put("totalNum3", totalNum3); - - // 处理已过期主机 - String key = "Assets:update:".concat(loginUser.getTenantId().toString()); - if(redisUtil.get(key) == null){ - final List list = assetsService.list(new LambdaQueryWrapper().lt(Assets::getEndTime, LocalDateTime.now())); - list.forEach(d -> { - d.setStatus("已到期"); - }); - if (assetsService.updateBatchById(list)) { - redisUtil.set(key,1,1L, TimeUnit.DAYS); - } - } - return success(data); - } - // 非管理员 - final List list = assetsUserService.list(new LambdaQueryWrapper().eq(AssetsUser::getUserId, userId)); - final Set collect = list.stream().map(AssetsUser::getAssetsId).collect(Collectors.toSet()); - Integer totalNum = assetsService.count( - new LambdaQueryWrapper().in(Assets::getAssetsId,collect) - ); - Integer totalNum1 = assetsService.count( - new LambdaQueryWrapper() - .gt(Assets::getEndTime, LocalDateTime.now()) - .in(Assets::getAssetsId,collect) - ); - Integer totalNum2 = assetsService.count( - new LambdaQueryWrapper() - .lt(Assets::getEndTime, LocalDateTime.now()) - .in(Assets::getAssetsId,collect) - ); - Integer totalNum3 = assetsService.count( - new LambdaQueryWrapper() - .eq(Assets::getStatus, "已销毁") - .in(Assets::getAssetsId,collect) - ); - - data.put("totalNum", totalNum); - data.put("totalNum1", totalNum1); - data.put("totalNum2", totalNum2); - data.put("totalNum3", totalNum3); - return success(data); - } - - @ApiOperation("分页查询服务器资产记录表") - @GetMapping("/page") - public ApiResult> page(AssetsParam param) { - final User loginUser = getLoginUser(); - final Integer userId = loginUser.getUserId(); - final List collect1 = loginUser.getRoles().stream().map(Role::getRoleCode).collect(Collectors.toList()); - if (collect1.contains("superAdmin") || collect1.contains("admin")) { - // 返回查询结果 - return success(assetsService.pageRel(param)); - } - - final List list = assetsUserService.list(new LambdaQueryWrapper().eq(AssetsUser::getUserId, userId)); - final Set collect = list.stream().map(AssetsUser::getAssetsId).collect(Collectors.toSet()); - if(!CollectionUtils.isEmpty(collect)){ - param.setAssetsIds(collect); - } - return success(assetsService.pageRel(param)); - } - - @ApiOperation("查询全部服务器资产记录表") - @GetMapping() - public ApiResult> list(AssetsParam param) { - // 使用关联查询 - return success(assetsService.listRel(param)); - } - - @ApiOperation("根据id查询服务器资产记录表") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - final Assets assets = assetsService.getByIdRel(id); - // 查询宝塔接口 - if(StrUtil.isNotBlank(assets.getBtSign())){ - final BtUtil client = btUtil.client(id); - final String systemTotal = client.getSystemTotal(); - final String diskInfo = client.getDiskInfo(); - assets.setSystemTotal(systemTotal); - assets.setDiskInfo(diskInfo); - } - // 使用关联查询 - return success(assets); - } - - @ApiOperation("添加服务器资产记录表") - @PostMapping() - public ApiResult save(@RequestBody Assets assets) { - // 记录当前登录用户id、租户id - User loginUser = getLoginUser(); - if (loginUser != null) { - assets.setUserId(loginUser.getUserId()); - } - if (assetsService.count(new LambdaQueryWrapper().eq(Assets::getCode,assets.getCode())) > 0) { - return fail("该IP地址已存在"); - } - if (assetsService.save(assets)) { - // 添加应用管理员 - if (loginUser != null) { - final AssetsUser assetsUser = new AssetsUser(); - assetsUser.setUserId(loginUser.getUserId()); - assetsUser.setNickname(loginUser.getNickname()); - assetsUser.setAssetsId(assets.getAssetsId()); - assetsUser.setRole(ADMINISTRATOR); - assetsUserService.save(assetsUser); - } - return success("添加成功"); - } - return fail("添加失败"); - } - - @ApiOperation("修改服务器资产记录表") - @PutMapping() - public ApiResult update(@RequestBody Assets assets) { - if (assetsService.updateById(assets)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("删除服务器资产记录表") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (assetsService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @ApiOperation("批量添加服务器资产记录表") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (assetsService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @ApiOperation("批量修改服务器资产记录表") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(assetsService, "assets_id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("批量删除服务器资产记录表") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (assetsService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } -} diff --git a/modules/oa/controller/AssetsUserController.java b/modules/oa/controller/AssetsUserController.java deleted file mode 100644 index 381b786..0000000 --- a/modules/oa/controller/AssetsUserController.java +++ /dev/null @@ -1,110 +0,0 @@ -package com.gxwebsoft.oa.controller; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.oa.service.AssetsUserService; -import com.gxwebsoft.oa.entity.AssetsUser; -import com.gxwebsoft.oa.param.AssetsUserParam; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.core.web.BatchParam; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 服务器成员管理控制器 - * - * @author 科技小王子 - * @since 2023-10-26 21:08:27 - */ -@Api(tags = "服务器成员管理管理") -@RestController -@RequestMapping("/api/oa/assets-user") -public class AssetsUserController extends BaseController { - @Resource - private AssetsUserService assetsUserService; - - @ApiOperation("分页查询服务器成员管理") - @GetMapping("/page") - public ApiResult> page(AssetsUserParam param) { - // 使用关联查询 - return success(assetsUserService.pageRel(param)); - } - - @ApiOperation("查询全部服务器成员管理") - @GetMapping() - public ApiResult> list(AssetsUserParam param) { - // 使用关联查询 - return success(assetsUserService.listRel(param)); - } - - @ApiOperation("根据id查询服务器成员管理") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - // 使用关联查询 - return success(assetsUserService.getByIdRel(id)); - } - - @ApiOperation("添加服务器成员管理") - @PostMapping() - public ApiResult save(@RequestBody AssetsUser assetsUser) { - if (assetsUserService.count(new LambdaQueryWrapper() - .eq(AssetsUser::getUserId, assetsUser.getUserId()).eq(AssetsUser::getAssetsId,assetsUser.getAssetsId())) > 0) { - return fail("该成员已存在"); - } - if (assetsUserService.save(assetsUser)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @ApiOperation("修改服务器成员管理") - @PutMapping() - public ApiResult update(@RequestBody AssetsUser assetsUser) { - if (assetsUserService.updateById(assetsUser)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("删除服务器成员管理") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (assetsUserService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @ApiOperation("批量添加服务器成员管理") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (assetsUserService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @ApiOperation("批量修改服务器成员管理") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(assetsUserService, "id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("批量删除服务器成员管理") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (assetsUserService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/modules/oa/controller/CompanyController.java b/modules/oa/controller/CompanyController.java deleted file mode 100644 index e11e414..0000000 --- a/modules/oa/controller/CompanyController.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.gxwebsoft.oa.controller; - -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.gxwebsoft.common.core.web.*; -import com.gxwebsoft.common.system.entity.User; -import com.gxwebsoft.oa.entity.Company; -import com.gxwebsoft.oa.entity.CompanyUser; -import com.gxwebsoft.oa.param.CompanyParam; -import com.gxwebsoft.oa.service.CompanyService; -import com.gxwebsoft.oa.service.CompanyUserService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; -import java.util.Set; -import java.util.stream.Collectors; - -import static com.gxwebsoft.common.core.constants.AppUserConstants.ADMINISTRATOR; - -/** - * 企业信息控制器 - * - * @author 科技小王子 - * @since 2023-10-23 19:18:58 - */ -@Api(tags = "企业信息管理") -@RestController -@RequestMapping("/api/oa/company") -public class CompanyController extends BaseController { - @Resource - private CompanyService companyService; - @Resource - private CompanyUserService companyUserService; - - @ApiOperation("分页查询企业信息") - @GetMapping("/page") - public ApiResult> page(CompanyParam param) { - final User loginUser = getLoginUser(); - final Integer userId = loginUser.getUserId(); - loginUser.getRoles().forEach(d -> { - if(!StrUtil.equals(d.getRoleCode(),"superAdmin") && !StrUtil.equals(d.getRoleCode(),"admin")){ - // 非管理员按项目成员权限显示 - final List list = companyUserService.list(new LambdaQueryWrapper().eq(CompanyUser::getUserId, userId)); - System.out.println("list = " + list); - final Set collect = list.stream().map(CompanyUser::getCompanyId).collect(Collectors.toSet()); - param.setCompanyIds(collect); - } - }); - // 使用关联查询 - return success(companyService.pageRel(param)); - } - - @ApiOperation("查询全部企业信息") - @GetMapping() - public ApiResult> list(CompanyParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - return success(companyService.list(page.getOrderWrapper())); - // 使用关联查询 - //return success(companyService.listRel(param)); - } - - @ApiOperation("根据id查询企业信息") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - return success(companyService.getById(id)); - // 使用关联查询 - //return success(companyService.getByIdRel(id)); - } - - @ApiOperation("添加企业信息") - @PostMapping() - public ApiResult save(@RequestBody Company company) { - // 记录当前登录用户id - User loginUser = getLoginUser(); - CompanyUser companyUser = new CompanyUser(); - if (loginUser != null) { - company.setUserId(loginUser.getUserId()); - company.setTenantId(loginUser.getTenantId()); - } - if (companyService.save(company)) { - // 添加客户所有者 - companyUser.setUserId(loginUser.getUserId()); - companyUser.setNickname(loginUser.getNickname()); - companyUser.setCompanyId(company.getCompanyId()); - companyUser.setRole(ADMINISTRATOR); - companyUserService.save(companyUser); - return success("添加成功"); - } - return fail("添加失败"); - } - - @ApiOperation("修改企业信息") - @PutMapping() - public ApiResult update(@RequestBody Company company) { - if (companyService.updateById(company)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("删除企业信息") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (companyService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @ApiOperation("批量添加企业信息") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (companyService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @ApiOperation("批量修改企业信息") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(companyService, "company_id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("批量删除企业信息") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (companyService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/modules/oa/controller/CompanyFieldController.java b/modules/oa/controller/CompanyFieldController.java deleted file mode 100644 index 9d417e3..0000000 --- a/modules/oa/controller/CompanyFieldController.java +++ /dev/null @@ -1,116 +0,0 @@ -package com.gxwebsoft.oa.controller; - -import com.gxwebsoft.common.core.web.*; -import com.gxwebsoft.common.system.entity.User; -import com.gxwebsoft.oa.entity.CompanyField; -import com.gxwebsoft.oa.param.CompanyFieldParam; -import com.gxwebsoft.oa.service.CompanyFieldService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 企业参数控制器 - * - * @author 科技小王子 - * @since 2024-02-04 14:44:42 - */ -@Api(tags = "企业参数管理") -@RestController -@RequestMapping("/api/oa/company-field") -public class CompanyFieldController extends BaseController { - @Resource - private CompanyFieldService companyFieldService; - - @ApiOperation("分页查询企业参数") - @GetMapping("/page") - public ApiResult> page(CompanyFieldParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("sort_number desc"); - page.setDefaultOrder("create_time asc"); - return success(companyFieldService.page(page, page.getWrapper())); - // 使用关联查询 - //return success(companyFieldService.pageRel(param)); - } - - @ApiOperation("查询全部企业参数") - @GetMapping() - public ApiResult> list(CompanyFieldParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - return success(companyFieldService.list(page.getOrderWrapper())); - // 使用关联查询 - //return success(companyFieldService.listRel(param)); - } - - @ApiOperation("根据id查询企业参数") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - return success(companyFieldService.getById(id)); - // 使用关联查询 - //return success(companyFieldService.getByIdRel(id)); - } - - @ApiOperation("添加企业参数") - @PostMapping() - public ApiResult save(@RequestBody CompanyField companyField) { - // 记录当前登录用户id - User loginUser = getLoginUser(); - if (loginUser != null) { - companyField.setUserId(loginUser.getUserId()); - } - if (companyFieldService.save(companyField)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @ApiOperation("修改企业参数") - @PutMapping() - public ApiResult update(@RequestBody CompanyField companyField) { - if (companyFieldService.updateById(companyField)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("删除企业参数") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (companyFieldService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @ApiOperation("批量添加企业参数") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (companyFieldService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @ApiOperation("批量修改企业参数") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(companyFieldService, "id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("批量删除企业参数") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (companyFieldService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/modules/oa/controller/CompanyUserController.java b/modules/oa/controller/CompanyUserController.java deleted file mode 100644 index f5c8e3a..0000000 --- a/modules/oa/controller/CompanyUserController.java +++ /dev/null @@ -1,118 +0,0 @@ -package com.gxwebsoft.oa.controller; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.gxwebsoft.common.core.security.JwtUtil; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.common.core.web.BatchParam; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.oa.entity.CompanyUser; -import com.gxwebsoft.oa.param.CompanyUserParam; -import com.gxwebsoft.oa.service.CompanyUserService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import java.util.List; - -/** - * 成员管理控制器 - * - * @author 科技小王子 - * @since 2024-02-04 14:44:42 - */ -@Api(tags = "成员管理管理") -@RestController -@RequestMapping("/api/oa/company-user") -public class CompanyUserController extends BaseController { - @Resource - private CompanyUserService companyUserService; - - @ApiOperation("分页查询成员管理") - @GetMapping("/page") - public ApiResult> page(CompanyUserParam param, HttpServletRequest request) { - // 使用关联查询 - param.setToken(JwtUtil.getAccessToken(request)); - param.setTenantId(getTenantId()); - return success(companyUserService.pageRel(param)); - } - - @ApiOperation("查询全部成员管理") - @GetMapping() - public ApiResult> list(CompanyUserParam param) { - // 使用关联查询 - if (param.getCompanyId() == null) { - return fail("该企业不存在",null); - } - // 使用关联查询 - return success(companyUserService.listRel(param)); - } - - @ApiOperation("根据id查询成员管理") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - // 使用关联查询 - return success(companyUserService.getByIdRel(id)); - } - - @ApiOperation("添加成员管理") - @PostMapping() - public ApiResult save(@RequestBody CompanyUser companyUser) { - if (companyUserService.count(new LambdaQueryWrapper() - .eq(CompanyUser::getUserId, companyUser.getUserId()).eq(CompanyUser::getCompanyId,companyUser.getCompanyId())) > 0) { - return fail("该成员已存在"); - } - if (companyUserService.save(companyUser)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @ApiOperation("修改成员管理") - @PutMapping() - public ApiResult update(@RequestBody CompanyUser companyUser) { - if (companyUserService.updateById(companyUser)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("删除成员管理") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (companyUserService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @ApiOperation("批量添加成员管理") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (companyUserService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @ApiOperation("批量修改成员管理") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(companyUserService, "company_user_id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("批量删除成员管理") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (companyUserService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/modules/oa/controller/LinkController.java b/modules/oa/controller/LinkController.java deleted file mode 100644 index 037d4ac..0000000 --- a/modules/oa/controller/LinkController.java +++ /dev/null @@ -1,116 +0,0 @@ -package com.gxwebsoft.oa.controller; - -import com.gxwebsoft.common.core.web.*; -import com.gxwebsoft.common.system.entity.User; -import com.gxwebsoft.oa.entity.Link; -import com.gxwebsoft.oa.param.LinkParam; -import com.gxwebsoft.oa.service.LinkService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 常用链接控制器 - * - * @author 科技小王子 - * @since 2024-01-14 11:50:39 - */ -@Api(tags = "常用链接管理") -@RestController -@RequestMapping("/api/oa/link") -public class LinkController extends BaseController { - @Resource - private LinkService linkService; - - @ApiOperation("分页查询常用链接") - @GetMapping("/page") - public ApiResult> page(LinkParam param) { - // 使用关联查询 - return success(linkService.pageRel(param)); - } - - - @ApiOperation("查询全部常用链接") - @GetMapping() - public ApiResult> list(LinkParam param) { - // 使用关联查询 - return success(linkService.listRel(param)); - } - - @ApiOperation("根据id查询常用链接") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - // 使用关联查询 - return success(linkService.getByIdRel(id)); - } - - @PreAuthorize("hasAuthority('oa:link:save')") - @ApiOperation("添加常用链接") - @PostMapping() - public ApiResult save(@RequestBody Link link) { - // 记录当前登录用户id - User loginUser = getLoginUser(); - if (loginUser != null) { - link.setUserId(loginUser.getUserId()); - } - if (linkService.save(link)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('oa:link:update')") - @ApiOperation("修改常用链接") - @PutMapping() - public ApiResult update(@RequestBody Link link) { - if (linkService.updateById(link)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('oa:link:remove')") - @ApiOperation("删除常用链接") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (linkService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @PreAuthorize("hasAuthority('oa:link:save')") - @ApiOperation("批量添加常用链接") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (linkService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('oa:link:update')") - @ApiOperation("批量修改常用链接") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(linkService, "id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('oa:link:remove')") - @ApiOperation("批量删除常用链接") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (linkService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/modules/oa/controller/ProductController.java b/modules/oa/controller/ProductController.java deleted file mode 100644 index f98b75b..0000000 --- a/modules/oa/controller/ProductController.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.gxwebsoft.oa.controller; - -import com.gxwebsoft.common.core.web.*; -import com.gxwebsoft.common.system.entity.User; -import com.gxwebsoft.oa.entity.Product; -import com.gxwebsoft.oa.param.ProductParam; -import com.gxwebsoft.oa.service.ProductService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 产品记录表控制器 - * - * @author 科技小王子 - * @since 2023-12-14 14:18:01 - */ -@Api(tags = "产品记录表管理") -@RestController -@RequestMapping("/api/oa/product") -public class ProductController extends BaseController { - @Resource - private ProductService productService; - - @ApiOperation("分页查询产品记录表") - @GetMapping("/page") - public ApiResult> page(ProductParam param) { - // 使用关联查询 - return success(productService.pageRel(param)); - } - - @ApiOperation("查询全部产品记录表") - @GetMapping() - public ApiResult> list(ProductParam param) { - // 使用关联查询 - return success(productService.listRel(param)); - } - - @ApiOperation("根据id查询产品记录表") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - // 使用关联查询 - return success(productService.getByIdRel(id)); - } - - @ApiOperation("添加产品记录表") - @PostMapping() - public ApiResult save(@RequestBody Product product) { - // 记录当前登录用户id - User loginUser = getLoginUser(); - if (loginUser != null) { - product.setUserId(loginUser.getUserId()); - } - if (productService.save(product)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @ApiOperation("修改产品记录表") - @PutMapping() - public ApiResult update(@RequestBody Product product) { - if (productService.updateById(product)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("删除产品记录表") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (productService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @ApiOperation("批量添加产品记录表") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (productService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @ApiOperation("批量修改产品记录表") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(productService, "product_id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("批量删除产品记录表") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (productService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/modules/oa/controller/ProductTabsController.java b/modules/oa/controller/ProductTabsController.java deleted file mode 100644 index fd54e9f..0000000 --- a/modules/oa/controller/ProductTabsController.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.gxwebsoft.oa.controller; - -import com.gxwebsoft.common.core.web.*; -import com.gxwebsoft.common.system.entity.User; -import com.gxwebsoft.oa.entity.ProductTabs; -import com.gxwebsoft.oa.param.ProductTabsParam; -import com.gxwebsoft.oa.service.ProductTabsService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 产品标签记录表控制器 - * - * @author 科技小王子 - * @since 2023-12-14 15:55:52 - */ -@Api(tags = "产品标签记录表管理") -@RestController -@RequestMapping("/api/oa/product-tabs") -public class ProductTabsController extends BaseController { - @Resource - private ProductTabsService productTabsService; - - @ApiOperation("分页查询产品标签记录表") - @GetMapping("/page") - public ApiResult> page(ProductTabsParam param) { - // 使用关联查询 - return success(productTabsService.pageRel(param)); - } - - @ApiOperation("查询全部产品标签记录表") - @GetMapping() - public ApiResult> list(ProductTabsParam param) { - // 使用关联查询 - return success(productTabsService.listRel(param)); - } - - @ApiOperation("根据id查询产品标签记录表") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - // 使用关联查询 - return success(productTabsService.getByIdRel(id)); - } - - @ApiOperation("添加产品标签记录表") - @PostMapping() - public ApiResult save(@RequestBody ProductTabs productTabs) { - // 记录当前登录用户id - User loginUser = getLoginUser(); - if (loginUser != null) { - productTabs.setUserId(loginUser.getUserId()); - } - if (productTabsService.save(productTabs)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @ApiOperation("修改产品标签记录表") - @PutMapping() - public ApiResult update(@RequestBody ProductTabs productTabs) { - if (productTabsService.updateById(productTabs)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("删除产品标签记录表") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (productTabsService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @ApiOperation("批量添加产品标签记录表") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (productTabsService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @ApiOperation("批量修改产品标签记录表") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(productTabsService, "tab_id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("批量删除产品标签记录表") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (productTabsService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/modules/oa/controller/TaskController.java b/modules/oa/controller/TaskController.java deleted file mode 100644 index df94677..0000000 --- a/modules/oa/controller/TaskController.java +++ /dev/null @@ -1,255 +0,0 @@ -package com.gxwebsoft.oa.controller; - -import cn.hutool.core.date.DateField; -import cn.hutool.core.date.DateUtil; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.gxwebsoft.common.core.security.JwtUtil; -import com.gxwebsoft.common.core.utils.MyQrCodeUtil; -import com.gxwebsoft.common.core.web.*; -import com.gxwebsoft.common.system.entity.Role; -import com.gxwebsoft.common.system.entity.User; -import com.gxwebsoft.oa.entity.Task; -import com.gxwebsoft.oa.entity.TaskCount; -import com.gxwebsoft.oa.entity.TaskRecord; -import com.gxwebsoft.oa.param.TaskParam; -import com.gxwebsoft.oa.service.TaskCountService; -import com.gxwebsoft.oa.service.TaskRecordService; -import com.gxwebsoft.oa.service.TaskService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.scheduling.annotation.Scheduled; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.CollectionUtils; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -import static com.gxwebsoft.common.core.constants.TaskConstants.*; - -/** - * 任务记录表控制器 - * - * @author 科技小王子 - * @since 2023-10-23 18:53:01 - */ -@Api(tags = "任务记录表管理") -@RestController -@RequestMapping("/api/oa/task") -public class TaskController extends BaseController { - @Resource - private TaskService taskService; - @Resource - private TaskRecordService taskRecordService; - @Resource - private TaskCountService taskCountService; - - @ApiOperation("分页查询任务记录表") - @GetMapping("/page") - public ApiResult> page(TaskParam param) { - // 使用关联查询 - param.setLoginUserId(getLoginUserId()); - return success(taskService.pageRel(param)); - } - - @ApiOperation("查询全部任务记录表") - @GetMapping() - public ApiResult> list(TaskParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - return success(taskService.list(page.getOrderWrapper())); - // 使用关联查询 - //return success(taskService.listRel(param)); - } - - @ApiOperation("根据id查询任务记录表") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - // 更新阅读状态 - Task task = taskService.getByIdRel(id); - if(!task.getLastReadUser().equals(getLoginUserId())){ - task.setIsRead(1); - taskService.updateById(task); - } - return success(task); - } - - @ApiOperation("添加任务记录表") - @Transactional(rollbackFor = {Exception.class}) - @PostMapping() - public ApiResult save(@RequestBody Task task) { - // 记录当前登录用户id - User loginUser = getLoginUser(); - if (loginUser != null) { - task.setUserId(loginUser.getUserId()); - Role role = loginUser.getRoles().get(0); - task.setRoleId(role.getRoleId()); - task.setRoleCode(role.getRoleCode()); - task.setOrganizationId(loginUser.getOrganizationId()); - task.setAvatar(loginUser.getAvatar()); - task.setNickname(loginUser.getNickname()); - task.setLastAvatar(loginUser.getAvatar()); - task.setLastReadUser(loginUser.getUserId()); - task.setLastNickname(loginUser.getNickname()); - if(task.getName() == null){ - task.setName(task.getContent()); - } - } - if (taskService.saveByRel(task)) { - return success("添加成功", task); - } - return fail("添加失败"); - } - - @ApiOperation("修改任务记录表") - @PutMapping() - public ApiResult update(@RequestBody Task task) { - if (taskService.updateById(task)) { - // 更新统计表 - task.setLoginUserId(getLoginUserId()); - taskService.updateCount(task); - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("删除任务记录表") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (taskService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @ApiOperation("批量添加任务记录表") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (taskService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @ApiOperation("批量修改任务记录表") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(taskService, "task_id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("批量删除任务记录表") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (taskService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @ApiOperation("统计信息") - @GetMapping("/count") - public ApiResult count(TaskParam param) { - User loginUser = getLoginUser(); - ArrayList countNum = taskService.getCountNum(loginUser, param); - return success("操作成功", countNum); - } - - @ApiOperation("生成工单二维码") - @GetMapping("/taskQRCode") - public ApiResult taskQRCode(TaskParam param, HttpServletRequest request) throws IOException { - String url = "https://modules.gxwebsoft.com/oa/task/detail?id=".concat(param.getTaskId().toString()); - final String qrCode = MyQrCodeUtil.getTaskCode(param.getTaskId(),url); - return success("操作成功", qrCode); - } - - @ApiOperation("生成邀请加入二维码") - @GetMapping("/taskJoinQRCode") - public ApiResult taskJoinQRCode(TaskParam param, HttpServletRequest request) throws IOException { - User loginUser = getLoginUser(); - String access_token = JwtUtil.getAccessToken(request); - String url = "https://modules.gxwebsoft.com/passport/register?type=join&dealerId=".concat(loginUser.getUserId().toString())+"&token=".concat(access_token); - final String qrCode = MyQrCodeUtil.getUserCode(loginUser.getUserId(),url); - return success("操作成功", qrCode); - } - - - /** - * 每日清零 - */ - @Scheduled(cron="0 0 0 * * ?") - public void todayTask() { - System.out.println("每日清零任务 = "); - final boolean update = taskCountService.update(new LambdaUpdateWrapper().set(TaskCount::getToday, 0)); - System.out.println("update = " + update); - } - - /** - * 本月清零 - */ - @Scheduled(cron="0 0 1 * * ?") - public void monthTask() { - taskCountService.update(new LambdaUpdateWrapper().set(TaskCount::getMonth, 0)); - } - - /** - * 每年清零 - */ - @Scheduled(cron = "0 0 0 1 * ?") - public void yearTask(){ - taskCountService.update(new LambdaUpdateWrapper().set(TaskCount::getYear, 0)); - } - - /** - * 定时结算已解决待评价的工单的任务 - * 1个小时内没有用户再次提交新的回复则自动结算 - * 时间间隔2分钟执行一次 - */ - @Scheduled(cron="*/30 * * * * *") - public void updateProgressTask() { -// System.out.println("定时任务开始：updateProgressTask = " + DateUtil.now()); - TaskParam taskParam = new TaskParam(); - taskParam.setProgress(TOBECONFIRMED); -// taskParam.setTaskId(689); - taskParam.setLimit(10L); - final PageResult result = taskService.pageRelAll(taskParam); - if(result.getCount() == 0){ - return; - } - final List list = result.getList(); - if (!CollectionUtils.isEmpty(list)) { - list.forEach(task -> { - try { - SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - Date newDate = DateUtil.offset(task.getUpdateTime(), DateField.MINUTE, 60 * 24); - Date date1 = df.parse(newDate.toString()); - Date date2 = df.parse(DateUtil.now()); - final boolean after = date2.after(date1); - if(after){ - // 更新工单状态 - task.setProgress(COMPLETED); - task.setStatus(TASK_STATUS_1); - taskService.updateByIdAll(task); - // 待评价的工单超过24小时没有评价则自动确认 - final TaskRecord taskRecord = new TaskRecord(); - taskRecord.setTaskId(task.getTaskId()); - taskRecord.setContent("超过24小时没有评价的工单系统已自动评价"); - taskRecord.setTenantId(task.getTenantId()); - final boolean save = taskRecordService.save(taskRecord); - System.out.println("save = " + save); - System.out.println("超过24小时没有评价的工单已自动确认 = " + task.getTaskId()); - } - } catch (Exception e) { - e.printStackTrace(); - } - }); - } - } -} diff --git a/modules/oa/controller/TaskCountController.java b/modules/oa/controller/TaskCountController.java deleted file mode 100644 index 9d98480..0000000 --- a/modules/oa/controller/TaskCountController.java +++ /dev/null @@ -1,121 +0,0 @@ -package com.gxwebsoft.oa.controller; - -import com.gxwebsoft.common.core.security.JwtUtil; -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.common.system.entity.User; -import com.gxwebsoft.oa.entity.Task; -import com.gxwebsoft.oa.service.TaskCountService; -import com.gxwebsoft.oa.entity.TaskCount; -import com.gxwebsoft.oa.param.TaskCountParam; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.BatchParam; -import com.gxwebsoft.oa.service.TaskService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import java.util.List; - -/** - * 数据统计控制器 - * - * @author 科技小王子 - * @since 2023-10-30 14:25:30 - */ -@Api(tags = "数据统计管理") -@RestController -@RequestMapping("/api/oa/task-count") -public class TaskCountController extends BaseController { - @Resource - private TaskCountService taskCountService; - - @ApiOperation("分页查询数据统计") - @GetMapping("/page") - public ApiResult> page(TaskCountParam param, HttpServletRequest request) { - param.setToken(JwtUtil.getAccessToken(request)); - param.setTenantId(getTenantId()); - return success(taskCountService.pageRel(param)); - } - - @ApiOperation("查询全部数据统计") - @GetMapping() - public ApiResult> list(TaskCountParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - return success(taskCountService.list(page.getOrderWrapper())); - // 使用关联查询 - //return success(taskCountService.listRel(param)); - } - - @ApiOperation("根据id查询数据统计") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - return success(taskCountService.getById(id)); - // 使用关联查询 - //return success(taskCountService.getByIdRel(id)); - } - - @ApiOperation("添加数据统计") - @PostMapping() - public ApiResult save(@RequestBody TaskCount taskCount) { - // 记录当前登录用户id - User loginUser = getLoginUser(); - if (loginUser != null) { - taskCount.setUserId(loginUser.getUserId()); - } - if (taskCountService.save(taskCount)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @ApiOperation("修改数据统计") - @PutMapping() - public ApiResult update(@RequestBody TaskCount taskCount) { - if (taskCountService.updateById(taskCount)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("删除数据统计") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (taskCountService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @ApiOperation("批量添加数据统计") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (taskCountService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @ApiOperation("批量修改数据统计") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(taskCountService, "task_count_id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("批量删除数据统计") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (taskCountService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/modules/oa/controller/TaskRecordController.java b/modules/oa/controller/TaskRecordController.java deleted file mode 100644 index 95a243e..0000000 --- a/modules/oa/controller/TaskRecordController.java +++ /dev/null @@ -1,135 +0,0 @@ -package com.gxwebsoft.oa.controller; - -import com.gxwebsoft.common.core.security.JwtUtil; -import com.gxwebsoft.common.core.utils.CommonUtil; -import com.gxwebsoft.common.core.web.*; -import com.gxwebsoft.common.system.entity.User; -import com.gxwebsoft.oa.entity.Task; -import com.gxwebsoft.oa.entity.TaskRecord; -import com.gxwebsoft.oa.param.TaskRecordParam; -import com.gxwebsoft.oa.service.TaskRecordService; -import com.gxwebsoft.oa.service.TaskService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import java.util.Date; -import java.util.List; - -import static com.gxwebsoft.common.core.constants.TaskConstants.PENDING; -import static com.gxwebsoft.common.core.constants.TaskConstants.PROCESSING; - -/** - * 工单回复记录表控制器 - * - * @author 科技小王子 - * @since 2023-10-23 18:53:01 - */ -@Api(tags = "工单回复记录表管理") -@RestController -@RequestMapping("/api/oa/task-record") -public class TaskRecordController extends BaseController { - @Resource - private TaskRecordService taskRecordService; - @Resource - private TaskService taskService; - - @ApiOperation("分页查询工单回复记录表") - @GetMapping("/page") - public ApiResult> page(TaskRecordParam param, HttpServletRequest request) { - param.setToken(JwtUtil.getAccessToken(request)); - param.setTenantId(getTenantId()); - return success(taskRecordService.pageRel(param)); - } - - @ApiOperation("查询全部工单回复记录表") - @GetMapping() - public ApiResult> list(TaskRecordParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - return success(taskRecordService.list(page.getOrderWrapper())); - // 使用关联查询 - //return success(taskRecordService.listRel(param)); - } - - @ApiOperation("根据id查询工单回复记录表") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - return success(taskRecordService.getById(id)); - // 使用关联查询 - //return success(taskRecordService.getByIdRel(id)); - } - - @ApiOperation("添加工单回复记录表") - @PostMapping() - public ApiResult save(@RequestBody TaskRecord taskRecord) { - // 记录当前登录用户id - User loginUser = getLoginUser(); - if (loginUser != null) { - taskRecord.setUserId(loginUser.getUserId()); - // 技术人员更新工单状态 - Task task = taskService.getById(taskRecord.getTaskId()); - if (CommonUtil.hasRole(loginUser.getRoles(),"commander") && task.getProgress().equals(PENDING)) { - task.setProgress(PROCESSING); - } - task.setUpdateTime(new Date()); - task.setContent(taskRecord.getContent()); - task.setLastAvatar(loginUser.getAvatar()); - task.setLastReadUser(loginUser.getUserId()); - task.setLastNickname(loginUser.getNickname()); - taskService.updateById(task); - } - if (taskRecordService.save(taskRecord)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @ApiOperation("修改工单回复记录表") - @PutMapping() - public ApiResult update(@RequestBody TaskRecord taskRecord) { - if (taskRecordService.updateById(taskRecord)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("删除工单回复记录表") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (taskRecordService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @ApiOperation("批量添加工单回复记录表") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (taskRecordService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @ApiOperation("批量修改工单回复记录表") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(taskRecordService, "task_record_id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("批量删除工单回复记录表") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (taskRecordService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/modules/oa/controller/TaskUserController.java b/modules/oa/controller/TaskUserController.java deleted file mode 100644 index 916c939..0000000 --- a/modules/oa/controller/TaskUserController.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.gxwebsoft.oa.controller; - -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.common.system.entity.User; -import com.gxwebsoft.oa.service.TaskUserService; -import com.gxwebsoft.oa.entity.TaskUser; -import com.gxwebsoft.oa.param.TaskUserParam; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.BatchParam; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 工单成员控制器 - * - * @author 科技小王子 - * @since 2023-10-23 18:53:01 - */ -@Api(tags = "工单成员管理") -@RestController -@RequestMapping("/api/oa/task-user") -public class TaskUserController extends BaseController { - @Resource - private TaskUserService taskUserService; - - @ApiOperation("分页查询工单成员") - @GetMapping("/page") - public ApiResult> page(TaskUserParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - return success(taskUserService.page(page, page.getWrapper())); - // 使用关联查询 - //return success(taskUserService.pageRel(param)); - } - - @ApiOperation("查询全部工单成员") - @GetMapping() - public ApiResult> list(TaskUserParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - return success(taskUserService.list(page.getOrderWrapper())); - // 使用关联查询 - //return success(taskUserService.listRel(param)); - } - - @ApiOperation("根据id查询工单成员") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - return success(taskUserService.getById(id)); - // 使用关联查询 - //return success(taskUserService.getByIdRel(id)); - } - - @ApiOperation("添加工单成员") - @PostMapping() - public ApiResult save(@RequestBody TaskUser taskUser) { - // 记录当前登录用户id - User loginUser = getLoginUser(); - if (loginUser != null) { - taskUser.setUserId(loginUser.getUserId()); - } - if (taskUserService.save(taskUser)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @ApiOperation("修改工单成员") - @PutMapping() - public ApiResult update(@RequestBody TaskUser taskUser) { - if (taskUserService.updateById(taskUser)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("删除工单成员") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (taskUserService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @ApiOperation("批量添加工单成员") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (taskUserService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @ApiOperation("批量修改工单成员") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(taskUserService, "task_user_id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("批量删除工单成员") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (taskUserService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/modules/oa/entity/App.java b/modules/oa/entity/App.java deleted file mode 100644 index 6817841..0000000 --- a/modules/oa/entity/App.java +++ /dev/null @@ -1,271 +0,0 @@ -package com.gxwebsoft.oa.entity; - -import com.baomidou.mybatisplus.annotation.*; -import com.gxwebsoft.common.system.entity.FileRecord; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - -/** - * 应用管理记录表 - * - * @author 科技小王子 - * @since 2023-10-26 22:06:23 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "App对象", description = "应用管理记录表") -@TableName("oa_app") -public class App implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "应用ID") - @TableId(value = "app_id", type = IdType.AUTO) - private Integer appId; - - @ApiModelProperty(value = "应用名称") - private String appName; - - @ApiModelProperty(value = "应用标识") - private String appCode; - - @ApiModelProperty(value = "应用秘钥") - private String appSecret; - - @ApiModelProperty(value = "上级id, 0是顶级") - private Integer parentId; - - @ApiModelProperty(value = "应用类型") - private String appType; - - @ApiModelProperty(value = "应用类型") - private String appTypeMultiple; - - @ApiModelProperty(value = "类型, 0菜单, 1按钮") - private Integer menuType; - - @ApiModelProperty(value = "企业ID") - private Integer companyId; - - @ApiModelProperty(value = "企业名称") - private String companyName; - - @ApiModelProperty(value = "企业简称") - @TableField(exist = false) - private String shortName; - - @ApiModelProperty(value = "企业商标") - @TableField(exist = false) - private String companyLogo; - - @ApiModelProperty(value = "应用图标") - private String appIcon; - - @ApiModelProperty(value = "二维码") - private String appQrcode; - - @ApiModelProperty(value = "链接地址") - private String appUrl; - - @ApiModelProperty(value = "后台管理地址") - private String adminUrl; - - @ApiModelProperty(value = "下载地址") - private String downUrl; - - @ApiModelProperty(value = "链接地址") - private String serverUrl; - - @ApiModelProperty(value = "文件服务器") - private String fileUrl; - - @ApiModelProperty(value = "回调地址") - private String callbackUrl; - - @ApiModelProperty(value = "腾讯文档地址") - private String docsUrl; - - @ApiModelProperty(value = "代码仓库地址") - private String gitUrl; - - @ApiModelProperty(value = "原型图地址") - private String prototypeUrl; - - @ApiModelProperty(value = "IP白名单") - private String ipAddress; - - @ApiModelProperty(value = "应用截图") - private String images; - - @ApiModelProperty(value = "应用包名") - private String packageName; - - @ApiModelProperty(value = "下载次数") - private Integer clicks; - - @ApiModelProperty(value = "安装次数") - private Integer installs; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "应用介绍") - private String content; - - @ApiModelProperty(value = "项目需求") - private String requirement; - - @ApiModelProperty(value = "开发者(个人或公司)") - private String developer; - - @ApiModelProperty(value = "项目负责人") - private String director; - - @ApiModelProperty(value = "项目经理") - private String projectDirector; - - @ApiModelProperty(value = "业务员") - private String salesman; - - @ApiModelProperty(value = "软件定价") - private BigDecimal price; - - @ApiModelProperty(value = "划线价格") - private BigDecimal linePrice; - - @ApiModelProperty(value = "评分") - private String score; - - @ApiModelProperty(value = "星级") - private String star; - - @ApiModelProperty(value = "菜单路由地址") - private String path; - - @ApiModelProperty(value = "菜单组件地址, 目录可为空") - private String component; - - @ApiModelProperty(value = "权限标识") - private String authority; - - @ApiModelProperty(value = "打开位置") - private String target; - - @ApiModelProperty(value = "是否隐藏, 0否, 1是(仅注册路由不显示在左侧菜单)") - private Integer hide; - - @ApiModelProperty(value = "禁止搜索，1禁止 0 允许") - private Integer search; - - @ApiModelProperty(value = "菜单侧栏选中的path") - private String active; - - @ApiModelProperty(value = "其它路由元信息") - private String meta; - - @ApiModelProperty(value = "版本，0正式版 1体验版 2开发版") - private String edition; - - @ApiModelProperty(value = "版本号") - private String version; - - @ApiModelProperty(value = "是否已安装") - private Integer isUse; - - @ApiModelProperty(value = "附近1") - private String file1; - - @ApiModelProperty(value = "附件2") - private String file2; - - @ApiModelProperty(value = "附件3") - private String file3; - - @ApiModelProperty(value = "是否在续费提醒显示") - private Boolean showExpiration; - - @ApiModelProperty(value = "服务到期时间") - private Date expirationTime; - - @ApiModelProperty(value = "最近一笔的续费金额") - private BigDecimal renewMoney; - - @ApiModelProperty(value = "应用状态") - private String appStatus; - - @ApiModelProperty(value = "是否作为案例展示") - private Boolean showCase; - - @ApiModelProperty(value = "是否推荐") - private Boolean recommend; - - @ApiModelProperty(value = "是否显示在首页") - private Boolean showIndex; - - @ApiModelProperty(value = "排序(数字越小越靠前)") - private Integer sortNumber; - - @ApiModelProperty(value = "状态, 0正常, 1冻结") - private Integer status; - - @ApiModelProperty(value = "是否删除, 0否, 1是") - @TableLogic - private Integer deleted; - - @ApiModelProperty(value = "用户ID") - private Integer userId; - - @ApiModelProperty(value = "机构id") - private Integer organizationId; - - @ApiModelProperty(value = "租户编号") - private String tenantCode; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - - @ApiModelProperty(value = "注册时间") - private Date createTime; - - @ApiModelProperty(value = "修改时间") - private Date updateTime; - - @ApiModelProperty(value = "成员管理") - @TableField(exist = false) - private List users; - - @ApiModelProperty(value = "链接列表") - @TableField(exist = false) - private List appUrlList; - - @ApiModelProperty(value = "项目附件") - @TableField(exist = false) - private List appFiles; - - @ApiModelProperty(value = "主体名称") - @TableField(exist = false) - private String tenantName; - - @ApiModelProperty(value = "开发者名称") - @TableField(exist = false) - private String realName; - - @ApiModelProperty(value = "开发者名称") - @TableField(exist = false) - private String nickname; - - @ApiModelProperty(value = "开发者头像") - @TableField(exist = false) - private String avatar; - - @ApiModelProperty(value = "手机号码") - @TableField(exist = false) - private String phone; - -} diff --git a/modules/oa/entity/AppField.java b/modules/oa/entity/AppField.java deleted file mode 100644 index 635701d..0000000 --- a/modules/oa/entity/AppField.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.gxwebsoft.oa.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.io.Serializable; -import java.util.Date; - -/** - * 应用参数 - * - * @author 科技小王子 - * @since 2024-01-12 20:08:35 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "AppField对象", description = "应用参数") -@TableName("oa_app_field") -public class AppField implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "自增ID") - @TableId(value = "id", type = IdType.AUTO) - private Integer id; - - @ApiModelProperty(value = "应用ID") - private Integer appId; - - @ApiModelProperty(value = "名称") - private String name; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "用户ID") - private Integer userId; - - @ApiModelProperty(value = "状态, 0正常, 1删除") - private Integer status; - - @ApiModelProperty(value = "排序(数字越小越靠前)") - private Integer sortNumber; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - - @ApiModelProperty(value = "注册时间") - private Date createTime; - -} diff --git a/modules/oa/entity/AppRenew.java b/modules/oa/entity/AppRenew.java deleted file mode 100644 index 795ca6f..0000000 --- a/modules/oa/entity/AppRenew.java +++ /dev/null @@ -1,80 +0,0 @@ -package com.gxwebsoft.oa.entity; - -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 com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -/** - * 续费管理 - * - * @author 科技小王子 - * @since 2023-11-14 14:27:57 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "AppRenew对象", description = "续费管理") -@TableName("oa_app_renew") -public class AppRenew implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "自增ID") - @TableId(value = "app_renew_id", type = IdType.AUTO) - private Integer appRenewId; - - @ApiModelProperty(value = "续费金额") - private BigDecimal money; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "开始时间") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date startTime; - - @ApiModelProperty(value = "到期时间") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date endTime; - - @ApiModelProperty(value = "用户ID") - private Integer userId; - - @ApiModelProperty(value = "企业ID") - private Integer companyId; - - @ApiModelProperty(value = "上传附件") - private String images; - - @ApiModelProperty(value = "用户昵称") - private String nickname; - - @ApiModelProperty(value = "应用ID") - private Integer appId; - - @ApiModelProperty(value = "状态, 0正常, 1待确认") - private Integer status; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - - @ApiModelProperty(value = "注册时间") - private Date createTime; - - @ApiModelProperty(value = "企业名称") - @TableField(exist = false) - private String companyName; - - @ApiModelProperty(value = "应用名称") - @TableField(exist = false) - private String appName; - - } diff --git a/modules/oa/entity/AppUrl.java b/modules/oa/entity/AppUrl.java deleted file mode 100644 index 54f1a9a..0000000 --- a/modules/oa/entity/AppUrl.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.gxwebsoft.oa.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import java.io.Serializable; -import java.util.Date; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 项目域名 - * - * @author 科技小王子 - * @since 2024-04-15 13:01:34 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "AppUrl对象", description = "项目域名") -@TableName("oa_app_url") -public class AppUrl implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "自增ID") - @TableId(value = "app_url_id", type = IdType.AUTO) - private Integer appUrlId; - - @ApiModelProperty(value = "应用ID") - private Integer appId; - - @ApiModelProperty(value = "域名类型") - private String name; - - @ApiModelProperty(value = "域名") - private String domain; - - @ApiModelProperty(value = "账号") - private String account; - - @ApiModelProperty(value = "密码") - private String password; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "排序(数字越小越靠前)") - private Integer sortNumber; - - @ApiModelProperty(value = "状态, 0正常, 1待确认") - private Integer status; - - @ApiModelProperty(value = "注册时间") - private Date createTime; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - -} diff --git a/modules/oa/entity/AppUser.java b/modules/oa/entity/AppUser.java deleted file mode 100644 index febb397..0000000 --- a/modules/oa/entity/AppUser.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.gxwebsoft.oa.entity; - -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.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.io.Serializable; -import java.util.Date; - -/** - * 应用成员 - * - * @author 科技小王子 - * @since 2023-10-26 22:06:23 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "AppUser对象", description = "应用成员") -@TableName("oa_app_user") -public class AppUser implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "自增ID") - @TableId(value = "app_user_id", type = IdType.AUTO) - private Integer appUserId; - - @ApiModelProperty(value = "角色，10体验成员 20开发者成员 30管理员 ") - private Integer role; - - @ApiModelProperty(value = "用户ID") - private Integer userId; - - @ApiModelProperty(value = "应用ID") - private Integer appId; - - @ApiModelProperty(value = "状态, 0正常, 1待评价") - private Integer status; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - - @ApiModelProperty(value = "注册时间") - private Date createTime; - - @ApiModelProperty(value = "昵称") - @TableField(exist = false) - private String nickname; - - @ApiModelProperty(value = "用户名") - @TableField(exist = false) - private String username; - - @ApiModelProperty(value = "手机号码") - @TableField(exist = false) - private String phone; - - @ApiModelProperty(value = "邮箱") - @TableField(exist = false) - private String email; - - @ApiModelProperty(value = "头像") - @TableField(exist = false) - private String avatar; - -} diff --git a/modules/oa/entity/Assets.java b/modules/oa/entity/Assets.java deleted file mode 100644 index 62a12eb..0000000 --- a/modules/oa/entity/Assets.java +++ /dev/null @@ -1,173 +0,0 @@ -package com.gxwebsoft.oa.entity; - -import java.math.BigDecimal; - -import com.baomidou.mybatisplus.annotation.*; - -import java.time.LocalDateTime; -import java.io.Serializable; -import java.util.Date; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 服务器资产记录表 - * - * @author 科技小王子 - * @since 2023-10-26 21:08:27 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "Assets对象", description = "服务器资产记录表") -@TableName("oa_assets") -public class Assets implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "资产ID") - @TableId(value = "assets_id", type = IdType.AUTO) - private Integer assetsId; - - @ApiModelProperty(value = "资产名称") - private String name; - - @ApiModelProperty(value = "资产标识") - private String code; - - @ApiModelProperty(value = "资产类型") - private String type; - - @ApiModelProperty(value = "服务器厂商") - private String brand; - - @ApiModelProperty(value = "服务器配置") - private String configuration; - - @ApiModelProperty(value = "初始账号") - private String account; - - @ApiModelProperty(value = "初始密码") - private String password; - - @ApiModelProperty(value = "(阿里云/腾讯云)登录账号") - private String brandAccount; - - @ApiModelProperty(value = "(阿里云/腾讯云)登录密码") - private String brandPassword; - - @ApiModelProperty(value = "宝塔面板") - private String panel; - - @ApiModelProperty(value = "宝塔面板账号") - private String panelAccount; - - @ApiModelProperty(value = "宝塔面板密码") - private String panelPassword; - - @ApiModelProperty(value = "财务信息-合同金额") - private BigDecimal financeAmount; - - @ApiModelProperty(value = "购买年限") - private Integer financeYears; - - @ApiModelProperty(value = "续费金额") - private BigDecimal financeRenew; - - @ApiModelProperty(value = "客户名称") - private String financeCustomerName; - - @ApiModelProperty(value = "客户联系人") - private String financeCustomerContact; - - @ApiModelProperty(value = "客户联系电话") - private String financeCustomerPhone; - - @ApiModelProperty(value = "客户ID") - private Integer customerId; - - @ApiModelProperty(value = "客户名称") - private String customerName; - - @ApiModelProperty(value = "开放端口") - private String openPort; - - @ApiModelProperty(value = "详情内容") - private String content; - - @ApiModelProperty(value = "购买时间") - private Date startTime; - - @ApiModelProperty(value = "到期时间") - private Date endTime; - - @ApiModelProperty(value = "置顶状态") - private String isTop; - - @ApiModelProperty(value = "可见性(public,private,protected)") - private String visibility; - - @ApiModelProperty(value = "宝塔接口秘钥") - private String btSign; - - @ApiModelProperty(value = "文章排序(数字越小越靠前)") - private Integer sortNumber; - - @ApiModelProperty(value = "描述") - private String comments; - - @ApiModelProperty(value = "客户ID") - private Integer companyId; - - @ApiModelProperty(value = "用户ID") - private Integer userId; - - @ApiModelProperty(value = "机构id") - private Integer organizationId; - - @ApiModelProperty(value = "状态, 0正常, 1冻结") - private String status; - - @ApiModelProperty(value = "是否删除, 0否, 1是") - @TableLogic - private Integer deleted; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - - @ApiModelProperty(value = "注册时间") - private Date createTime; - - @ApiModelProperty(value = "修改时间") - private Date updateTime; - - @ApiModelProperty(value = "昵称") - @TableField(exist = false) - private String nickname; - - @ApiModelProperty(value = "开发者头像") - @TableField(exist = false) - private String avatar; - - @ApiModelProperty(value = "企业名称") - @TableField(exist = false) - private String companyName; - - @ApiModelProperty(value = "系统基础统计") - @TableField(exist = false) - private Object systemTotal; - - @ApiModelProperty(value = "磁盘分区信息") - @TableField(exist = false) - private Object diskInfo; - - @ApiModelProperty(value = "实时状态信息(CPU、内存、网络、负载)") - @TableField(exist = false) - private Object netWork; - - @ApiModelProperty(value = "网站列表") - @TableField(exist = false) - private Object sites; - -} diff --git a/modules/oa/entity/AssetsUser.java b/modules/oa/entity/AssetsUser.java deleted file mode 100644 index dbd7a21..0000000 --- a/modules/oa/entity/AssetsUser.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.gxwebsoft.oa.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.io.Serializable; -import java.util.Date; - -/** - * 服务器成员管理 - * - * @author 科技小王子 - * @since 2023-10-26 21:08:27 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "AssetsUser对象", description = "服务器成员管理") -@TableName("oa_assets_user") -public class AssetsUser implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "自增ID") - @TableId(value = "id", type = IdType.AUTO) - private Integer id; - - @ApiModelProperty(value = "角色，10体验成员 20开发者成员 30管理员 ") - private Integer role; - - @ApiModelProperty(value = "用户ID") - private Integer userId; - - @ApiModelProperty(value = "应用ID") - private Integer assetsId; - - @ApiModelProperty(value = "状态, 0正常, 1待评价") - private Integer status; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - - @ApiModelProperty(value = "注册时间") - private Date createTime; - - @ApiModelProperty(value = "昵称") - private String nickname; - -} diff --git a/modules/oa/entity/Company.java b/modules/oa/entity/Company.java deleted file mode 100644 index 4dc6b5b..0000000 --- a/modules/oa/entity/Company.java +++ /dev/null @@ -1,181 +0,0 @@ -package com.gxwebsoft.oa.entity; - -import com.baomidou.mybatisplus.annotation.*; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.io.Serializable; -import java.util.Date; - -/** - * 企业信息 - * - * @author 科技小王子 - * @since 2023-10-23 19:18:58 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "Company对象", description = "企业信息") -@TableName("oa_company") -public class Company implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "企业id") - @TableId(value = "company_id", type = IdType.AUTO) - private Integer companyId; - - @ApiModelProperty(value = "企业简称") - private String shortName; - - @ApiModelProperty(value = "企业全称") - private String companyName; - - @ApiModelProperty(value = "企业标识") - private String companyCode; - - @ApiModelProperty(value = "类型 10企业 20政府单位") - private String companyType; - - @ApiModelProperty(value = "企业类型多选") - private String companyTypeMultiple; - - @ApiModelProperty(value = "应用标识") - private String companyLogo; - - @ApiModelProperty(value = "应用类型") - private String appType; - - @ApiModelProperty(value = "绑定域名") - private String domain; - - @ApiModelProperty(value = "联系电话") - private String phone; - - @ApiModelProperty(value = "邮箱") - private String email; - - @ApiModelProperty(value = "座机电话") - private String tel; - - @ApiModelProperty(value = "发票抬头") - @TableField("Invoice_header") - private String invoiceHeader; - - @ApiModelProperty(value = "企业法人") - private String businessEntity; - - @ApiModelProperty(value = "服务开始时间") - private Date startTime; - - @ApiModelProperty(value = "服务到期时间") - private Date expirationTime; - - @ApiModelProperty(value = "应用版本 10体验版 20授权版 30旗舰版") - private Integer version; - - @ApiModelProperty(value = "成员数量(人数上限)") - private Integer members; - - @ApiModelProperty(value = "成员数量(当前)") - private Integer users; - - @ApiModelProperty(value = "行业类型(父级)") - private String industryParent; - - @ApiModelProperty(value = "行业类型(子级)") - private String industryChild; - - @ApiModelProperty(value = "部门数量") - private Integer departments; - - @ApiModelProperty(value = "存储空间") - private Long storage; - - @ApiModelProperty(value = "存储空间(上限)") - private Long storageMax; - - @ApiModelProperty(value = "所在国家") - private String country; - - @ApiModelProperty(value = "所在省份") - private String province; - - @ApiModelProperty(value = "所在城市") - private String city; - - @ApiModelProperty(value = "所在辖区") - private String region; - - @ApiModelProperty(value = "街道地址") - private String address; - - @ApiModelProperty(value = "经度") - private String longitude; - - @ApiModelProperty(value = "纬度") - private String latitude; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "是否实名认证") - private Integer authentication; - - @ApiModelProperty(value = "企业默认主体") - private Integer authoritative; - - @ApiModelProperty(value = "request合法域名") - private String requestUrl; - - @ApiModelProperty(value = "socket合法域名") - private String socketUrl; - - @ApiModelProperty(value = "主控端域名") - private String serverUrl; - - @ApiModelProperty(value = "业务域名") - private String modulesUrl; - - @ApiModelProperty(value = "是否推荐") - private Integer recommend; - - @ApiModelProperty(value = "点赞数量") - private Integer likes; - - @ApiModelProperty(value = "点击数量") - private Integer clicks; - - @ApiModelProperty(value = "购买数量") - private Integer buys; - - @ApiModelProperty(value = "是否含税, 0不含, 1含") - private Integer isTax; - - @ApiModelProperty(value = "当前克隆的租户ID") - private Integer planId; - - @ApiModelProperty(value = "状态") - private Integer status; - - @ApiModelProperty(value = "排序号") - private Integer sortNumber; - - @ApiModelProperty(value = "用户ID") - private Integer userId; - - @ApiModelProperty(value = "是否删除, 0否, 1是") - @TableLogic - private Integer deleted; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - - @ApiModelProperty(value = "创建时间") - private Date createTime; - - @ApiModelProperty(value = "修改时间") - private Date updateTime; - -} diff --git a/modules/oa/entity/CompanyField.java b/modules/oa/entity/CompanyField.java deleted file mode 100644 index 9eed35c..0000000 --- a/modules/oa/entity/CompanyField.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.gxwebsoft.oa.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.io.Serializable; -import java.util.Date; - -/** - * 企业参数 - * - * @author 科技小王子 - * @since 2024-02-04 14:44:42 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "CompanyField对象", description = "企业参数") -@TableName("oa_company_field") -public class CompanyField implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "自增ID") - @TableId(value = "id", type = IdType.AUTO) - private Integer id; - - @ApiModelProperty(value = "企业ID") - private Integer companyId; - - @ApiModelProperty(value = "名称") - private String name; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "用户ID") - private Integer userId; - - @ApiModelProperty(value = "状态, 0正常, 1删除") - private Integer status; - - @ApiModelProperty(value = "排序(数字越小越靠前)") - private Integer sortNumber; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - - @ApiModelProperty(value = "注册时间") - private Date createTime; - -} diff --git a/modules/oa/entity/CompanyUser.java b/modules/oa/entity/CompanyUser.java deleted file mode 100644 index 0d657f7..0000000 --- a/modules/oa/entity/CompanyUser.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.gxwebsoft.oa.entity; - -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.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.io.Serializable; -import java.util.Date; - -/** - * 成员管理 - * - * @author 科技小王子 - * @since 2024-02-04 14:44:42 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "CompanyUser对象", description = "成员管理") -@TableName("oa_company_user") -public class CompanyUser implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "自增ID") - @TableId(value = "company_user_id", type = IdType.AUTO) - private Integer companyUserId; - - @ApiModelProperty(value = "角色，10体验成员 20开发者成员 30管理员 ") - private Integer role; - - @ApiModelProperty(value = "用户ID") - private Integer userId; - - @ApiModelProperty(value = "企业ID") - private Integer companyId; - - @ApiModelProperty(value = "状态, 0正常, 1待确认") - private Integer status; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - - @ApiModelProperty(value = "注册时间") - private Date createTime; - - @ApiModelProperty(value = "昵称") - private String nickname; - - @ApiModelProperty(value = "用户名") - @TableField(exist = false) - private String username; - - @ApiModelProperty(value = "手机号码") - @TableField(exist = false) - private String phone; - - @ApiModelProperty(value = "邮箱") - @TableField(exist = false) - private String email; - - @ApiModelProperty(value = "头像") - @TableField(exist = false) - private String avatar; - -} diff --git a/modules/oa/entity/Link.java b/modules/oa/entity/Link.java deleted file mode 100644 index 9aa8957..0000000 --- a/modules/oa/entity/Link.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.gxwebsoft.oa.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.io.Serializable; -import java.util.Date; - -/** - * 常用链接 - * - * @author 科技小王子 - * @since 2024-01-14 11:50:39 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "Link对象", description = "常用链接") -@TableName("oa_link") -public class Link implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "自增ID") - @TableId(value = "id", type = IdType.AUTO) - private Integer id; - - @ApiModelProperty(value = "链接名称") - private String name; - - @ApiModelProperty(value = "图标") - private String icon; - - @ApiModelProperty(value = "链接地址") - private String url; - - @ApiModelProperty(value = "链接类型") - private String linkType; - - @ApiModelProperty(value = "应用ID") - private Integer appId; - - @ApiModelProperty(value = "用户ID") - private Integer userId; - - @ApiModelProperty(value = "是否推荐") - private Integer recommend; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "排序(数字越小越靠前)") - private Integer sortNumber; - - @ApiModelProperty(value = "是否删除, 0否, 1是") - @TableLogic - private Integer deleted; - - @ApiModelProperty(value = "状态, 0正常, 1待确认") - private Integer status; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - - @ApiModelProperty(value = "注册时间") - private Date createTime; - -} diff --git a/modules/oa/entity/Product.java b/modules/oa/entity/Product.java deleted file mode 100644 index bef7279..0000000 --- a/modules/oa/entity/Product.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.gxwebsoft.oa.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -/** - * 产品记录表 - * - * @author 科技小王子 - * @since 2023-12-14 14:18:01 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "Product对象", description = "产品记录表") -@TableName("oa_product") -public class Product implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "产品ID") - @TableId(value = "product_id", type = IdType.AUTO) - private Integer productId; - - @ApiModelProperty(value = "产品名称") - private String name; - - @ApiModelProperty(value = "产品标识") - private String code; - - @ApiModelProperty(value = "产品详情") - private String content; - - @ApiModelProperty(value = "产品类型") - private String type; - - @ApiModelProperty(value = "产品金额") - private BigDecimal money; - - @ApiModelProperty(value = "附件") - private String files; - - @ApiModelProperty(value = "产品图标") - private String logo; - - @ApiModelProperty(value = "背景颜色") - private String backgroundColor; - - @ApiModelProperty(value = "背景图片") - private String backgroundImage; - - @ApiModelProperty(value = "背景图片gif") - private String backgroundGif; - - @ApiModelProperty(value = "购买链接") - private String buyUrl; - - @ApiModelProperty(value = "控制台链接") - private String adminUrl; - - @ApiModelProperty(value = "企业ID") - private Integer companyId; - - @ApiModelProperty(value = "用户ID") - private Integer userId; - - @ApiModelProperty(value = "排序(数字越小越靠前)") - private Integer sortNumber; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "状态, 0已上架, 1已下架") - private Integer status; - - @ApiModelProperty(value = "是否删除, 0否, 1是") - @TableLogic - private Integer deleted; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - - @ApiModelProperty(value = "注册时间") - private Date createTime; - - @ApiModelProperty(value = "修改时间") - private Date updateTime; - - @ApiModelProperty(value = "企业信息") - private Company company; - -} diff --git a/modules/oa/entity/ProductTabs.java b/modules/oa/entity/ProductTabs.java deleted file mode 100644 index 78d3d77..0000000 --- a/modules/oa/entity/ProductTabs.java +++ /dev/null @@ -1,81 +0,0 @@ -package com.gxwebsoft.oa.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.io.Serializable; -import java.util.Date; - -/** - * 产品标签记录表 - * - * @author 科技小王子 - * @since 2023-12-14 15:55:52 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "ProductTabs对象", description = "产品标签记录表") -@TableName("oa_product_tabs") -public class ProductTabs implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "产品标签ID") - @TableId(value = "tab_id", type = IdType.AUTO) - private Integer tabId; - - @ApiModelProperty(value = "产品ID") - private Integer productId; - - @ApiModelProperty(value = "标签名称") - private String name; - - @ApiModelProperty(value = "标签类型") - private String type; - - @ApiModelProperty(value = "产品标签详情") - private String content; - - @ApiModelProperty(value = "背景颜色") - private String backgroundColor; - - @ApiModelProperty(value = "背景图片") - private String backgroundImage; - - @ApiModelProperty(value = "附件") - private String files; - - @ApiModelProperty(value = "企业ID") - private Integer companyId; - - @ApiModelProperty(value = "用户ID") - private Integer userId; - - @ApiModelProperty(value = "排序(数字越小越靠前)") - private Integer sortNumber; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "状态, 0已上架, 1已下架") - private Integer status; - - @ApiModelProperty(value = "是否删除, 0否, 1是") - @TableLogic - private Integer deleted; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - - @ApiModelProperty(value = "注册时间") - private Date createTime; - - @ApiModelProperty(value = "修改时间") - private Date updateTime; - -} diff --git a/modules/oa/entity/Task.java b/modules/oa/entity/Task.java deleted file mode 100644 index 83a7f79..0000000 --- a/modules/oa/entity/Task.java +++ /dev/null @@ -1,156 +0,0 @@ -package com.gxwebsoft.oa.entity; - -import com.baomidou.mybatisplus.annotation.*; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.io.Serializable; -import java.util.Date; - -/** - * 任务记录表 - * - * @author 科技小王子 - * @since 2023-10-23 18:53:01 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "Task对象", description = "任务记录表") -@TableName("oa_task") -public class Task implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "工单ID") - @TableId(value = "task_id", type = IdType.AUTO) - private Integer taskId; - - @ApiModelProperty(value = "工单名称") - private String name; - - @ApiModelProperty(value = "工单类型") - private String taskType; - - @ApiModelProperty(value = "任务内容") - private String content; - - @ApiModelProperty(value = "工单附件") - private String files; - - @ApiModelProperty(value = "工单发起人") - private Integer promoter; - - @ApiModelProperty(value = "受理人") - private Integer commander; - - @ApiModelProperty(value = "工单状态， 0未开始 1已指派 ") - private Integer progress; - - @ApiModelProperty(value = "逾期天数") - private Integer overdueDays; - - @ApiModelProperty(value = "优先级") - private String priority; - - @ApiModelProperty(value = "品质要求") - private String quality; - - @ApiModelProperty(value = "时限(天)") - private Integer day; - - @ApiModelProperty(value = "手机号") - private String phone; - - @ApiModelProperty(value = "开始时间") - private Date startTime; - - @ApiModelProperty(value = "结束时间") - private Date endTime; - - @ApiModelProperty(value = "项目ID") - private Integer appId; - - @ApiModelProperty(value = "机构id") - private Integer organizationId; - - @ApiModelProperty(value = "项目ID") - private Integer projectId; - - @ApiModelProperty(value = "客户ID") - private Integer customerId; - - @ApiModelProperty(value = "资产ID") - private Integer assetsId; - - @ApiModelProperty(value = "用户ID") - private Integer userId; - - @ApiModelProperty(value = "用户昵称") - private String nickname; - - @ApiModelProperty(value = "用户头像") - private String avatar; - - @ApiModelProperty(value = "是否已查阅") - private Integer isRead; - - @ApiModelProperty(value = "最后回复人") - private Integer lastReadUser; - - @ApiModelProperty(value = "最后回复人的头像") - private String lastAvatar; - - @ApiModelProperty(value = "最后回复人昵称") - private String lastNickname; - - @ApiModelProperty(value = "排序(数字越小越靠前)") - private Integer sortNumber; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "状态, 0待处理, 1已完成") - private Integer status; - - @ApiModelProperty(value = "结算状态") - private Integer isSettled; - - @ApiModelProperty(value = "是否删除, 0否, 1是") - @TableLogic - private Integer deleted; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - - @ApiModelProperty(value = "注册时间") - private Date createTime; - - @ApiModelProperty(value = "修改时间") - private Date updateTime; - - @ApiModelProperty(value = "项目信息") - @TableField(exist = false) - private String appName; - - @ApiModelProperty(value = "角色ID") - @TableField(exist = false) - private Integer roleId; - - @ApiModelProperty(value = "角色标识") - @TableField(exist = false) - private String roleCode; - - @ApiModelProperty(value = "操作类型") - @TableField(exist = false) - private String action; - - @ApiModelProperty(value = "当前登录用户ID") - @TableField(exist = false) - private Integer loginUserId; - - @ApiModelProperty(value = "机密信息") - @TableField(exist = false) - private String confidential; - -} diff --git a/modules/oa/entity/TaskCount.java b/modules/oa/entity/TaskCount.java deleted file mode 100644 index e2ab342..0000000 --- a/modules/oa/entity/TaskCount.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.gxwebsoft.oa.entity; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import java.io.Serializable; -import java.util.Date; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 数据统计 - * - * @author 科技小王子 - * @since 2023-10-30 14:25:30 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "TaskCount对象", description = "数据统计") -@TableName("oa_task_count") -public class TaskCount implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "自增ID") - @TableId(value = "task_count_id", type = IdType.AUTO) - private Integer taskCountId; - - @ApiModelProperty(value = "用户ID") - private Integer userId; - - @ApiModelProperty(value = "待处理数") - private Integer pending; - - @ApiModelProperty(value = "闲置可抢的工单") - private Integer unused; - - @ApiModelProperty(value = "已完成数") - private Integer completed; - - @ApiModelProperty(value = "今天处理数") - private Integer today; - - @ApiModelProperty(value = "本月处理数") - private Integer month; - - @ApiModelProperty(value = "今年处理数") - private Integer year; - - @ApiModelProperty(value = "总工单数") - private Integer total; - - @ApiModelProperty(value = "部门ID") - private Integer organizationId; - - @ApiModelProperty(value = "角色ID") - private Integer roleId; - - @ApiModelProperty(value = "角色标识") - private String roleCode; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - - @ApiModelProperty(value = "创建时间") - private Date createTime; - - @ApiModelProperty(value = "更新时间") - private Date updateTime; - - @ApiModelProperty(value = "昵称") - @TableField(exist = false) - private String nickname; - - @ApiModelProperty(value = "头像") - @TableField(exist = false) - private String avatar; - - @ApiModelProperty(value = "手机号码") - @TableField(exist = false) - private String phone; - -} diff --git a/modules/oa/entity/TaskRecord.java b/modules/oa/entity/TaskRecord.java deleted file mode 100644 index b51a9e8..0000000 --- a/modules/oa/entity/TaskRecord.java +++ /dev/null @@ -1,86 +0,0 @@ -package com.gxwebsoft.oa.entity; - -import com.baomidou.mybatisplus.annotation.*; -import com.gxwebsoft.common.core.utils.CommonUtil; -import com.gxwebsoft.common.system.entity.User; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.io.Serializable; -import java.util.Date; - -/** - * 工单回复记录表 - * - * @author 科技小王子 - * @since 2023-10-23 18:53:01 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "TaskRecord对象", description = "工单回复记录表") -@TableName("oa_task_record") -public class TaskRecord implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "回复ID") - @TableId(value = "task_record_id", type = IdType.AUTO) - private Integer taskRecordId; - - @ApiModelProperty(value = "上级id, 0是顶级") - private Integer parentId; - - @ApiModelProperty(value = "工单ID") - private Integer taskId; - - @ApiModelProperty(value = "任务内容") - private String content; - - @ApiModelProperty(value = "机密信息") - private String confidential; - - @ApiModelProperty(value = "工单附件") - private String files; - - @ApiModelProperty(value = "用户ID") - private Integer userId; - - @ApiModelProperty(value = "排序(数字越小越靠前)") - private Integer sortNumber; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "状态, 0待处理, 1已完成") - private Integer status; - - @ApiModelProperty(value = "是否删除, 0否, 1是") - @TableLogic - private Integer deleted; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - - @ApiModelProperty(value = "注册时间") - private Date createTime; - - @ApiModelProperty(value = "修改时间") - private Date updateTime; - - @ApiModelProperty(value = "发布者") - @TableField(exist = false) - private String nickname; - - @ApiModelProperty(value = "发布者头像") - @TableField(exist = false) - private String avatar; - - @ApiModelProperty(value = "所在城市") - @TableField(exist = false) - private String city; - - @ApiModelProperty(value = "回复者") - @TableField(exist = false) - private User user; -} diff --git a/modules/oa/entity/TaskUser.java b/modules/oa/entity/TaskUser.java deleted file mode 100644 index f84ee28..0000000 --- a/modules/oa/entity/TaskUser.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.gxwebsoft.oa.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import java.io.Serializable; -import java.util.Date; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 工单成员 - * - * @author 科技小王子 - * @since 2023-10-23 18:53:01 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "TaskUser对象", description = "工单成员") -@TableName("oa_task_user") -public class TaskUser implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "自增ID") - @TableId(value = "task_user_id", type = IdType.AUTO) - private Integer taskUserId; - - @ApiModelProperty(value = "角色，10体验成员 20开发者成员 30管理员 ") - private Integer role; - - @ApiModelProperty(value = "用户ID") - private Integer userId; - - @ApiModelProperty(value = "工单ID") - private Integer taskId; - - @ApiModelProperty(value = "状态, 0待处理, 1已完成") - private Integer status; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - - @ApiModelProperty(value = "加入时间") - private Date createTime; - -} diff --git a/modules/oa/mapper/AppFieldMapper.java b/modules/oa/mapper/AppFieldMapper.java deleted file mode 100644 index 829ac0e..0000000 --- a/modules/oa/mapper/AppFieldMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gxwebsoft.oa.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.oa.entity.AppField; -import com.gxwebsoft.oa.param.AppFieldParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 应用参数Mapper - * - * @author 科技小王子 - * @since 2024-01-12 20:08:35 - */ -public interface AppFieldMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") AppFieldParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") AppFieldParam param); - -} diff --git a/modules/oa/mapper/AppMapper.java b/modules/oa/mapper/AppMapper.java deleted file mode 100644 index df11357..0000000 --- a/modules/oa/mapper/AppMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gxwebsoft.oa.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.oa.entity.App; -import com.gxwebsoft.oa.param.AppParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 应用管理记录表Mapper - * - * @author 科技小王子 - * @since 2023-10-26 22:06:23 - */ -public interface AppMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") AppParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") AppParam param); - -} diff --git a/modules/oa/mapper/AppRenewMapper.java b/modules/oa/mapper/AppRenewMapper.java deleted file mode 100644 index aace0d3..0000000 --- a/modules/oa/mapper/AppRenewMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gxwebsoft.oa.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.oa.entity.AppRenew; -import com.gxwebsoft.oa.param.AppRenewParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 续费管理Mapper - * - * @author 科技小王子 - * @since 2023-11-14 14:27:57 - */ -public interface AppRenewMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") AppRenewParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") AppRenewParam param); - -} diff --git a/modules/oa/mapper/AppUrlMapper.java b/modules/oa/mapper/AppUrlMapper.java deleted file mode 100644 index 16f1201..0000000 --- a/modules/oa/mapper/AppUrlMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gxwebsoft.oa.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.oa.entity.AppUrl; -import com.gxwebsoft.oa.param.AppUrlParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 项目域名Mapper - * - * @author 科技小王子 - * @since 2024-04-15 13:01:34 - */ -public interface AppUrlMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") AppUrlParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") AppUrlParam param); - -} diff --git a/modules/oa/mapper/AppUserMapper.java b/modules/oa/mapper/AppUserMapper.java deleted file mode 100644 index a3dda45..0000000 --- a/modules/oa/mapper/AppUserMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gxwebsoft.oa.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.oa.entity.AppUser; -import com.gxwebsoft.oa.param.AppUserParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 应用成员Mapper - * - * @author 科技小王子 - * @since 2023-10-26 22:06:23 - */ -public interface AppUserMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") AppUserParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") AppUserParam param); - -} diff --git a/modules/oa/mapper/AssetsMapper.java b/modules/oa/mapper/AssetsMapper.java deleted file mode 100644 index 3abc4e7..0000000 --- a/modules/oa/mapper/AssetsMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gxwebsoft.oa.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.oa.entity.Assets; -import com.gxwebsoft.oa.param.AssetsParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 服务器资产记录表Mapper - * - * @author 科技小王子 - * @since 2023-10-26 21:08:27 - */ -public interface AssetsMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") AssetsParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") AssetsParam param); - -} diff --git a/modules/oa/mapper/AssetsUserMapper.java b/modules/oa/mapper/AssetsUserMapper.java deleted file mode 100644 index d3b87cf..0000000 --- a/modules/oa/mapper/AssetsUserMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gxwebsoft.oa.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.oa.entity.AssetsUser; -import com.gxwebsoft.oa.param.AssetsUserParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 服务器成员管理Mapper - * - * @author 科技小王子 - * @since 2023-10-26 21:08:27 - */ -public interface AssetsUserMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") AssetsUserParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") AssetsUserParam param); - -} diff --git a/modules/oa/mapper/CompanyFieldMapper.java b/modules/oa/mapper/CompanyFieldMapper.java deleted file mode 100644 index d1592ec..0000000 --- a/modules/oa/mapper/CompanyFieldMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gxwebsoft.oa.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.oa.entity.CompanyField; -import com.gxwebsoft.oa.param.CompanyFieldParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 企业参数Mapper - * - * @author 科技小王子 - * @since 2024-02-04 14:44:42 - */ -public interface CompanyFieldMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") CompanyFieldParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") CompanyFieldParam param); - -} diff --git a/modules/oa/mapper/CompanyMapper.java b/modules/oa/mapper/CompanyMapper.java deleted file mode 100644 index 659f600..0000000 --- a/modules/oa/mapper/CompanyMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gxwebsoft.oa.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.oa.entity.Company; -import com.gxwebsoft.oa.param.CompanyParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 企业信息Mapper - * - * @author 科技小王子 - * @since 2023-10-23 19:18:58 - */ -public interface CompanyMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") CompanyParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") CompanyParam param); - -} diff --git a/modules/oa/mapper/CompanyUserMapper.java b/modules/oa/mapper/CompanyUserMapper.java deleted file mode 100644 index 5c64d77..0000000 --- a/modules/oa/mapper/CompanyUserMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gxwebsoft.oa.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.oa.entity.CompanyUser; -import com.gxwebsoft.oa.param.CompanyUserParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 成员管理Mapper - * - * @author 科技小王子 - * @since 2024-02-04 14:44:42 - */ -public interface CompanyUserMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") CompanyUserParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") CompanyUserParam param); - -} diff --git a/modules/oa/mapper/LinkMapper.java b/modules/oa/mapper/LinkMapper.java deleted file mode 100644 index 73ce377..0000000 --- a/modules/oa/mapper/LinkMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gxwebsoft.oa.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.oa.entity.Link; -import com.gxwebsoft.oa.param.LinkParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 常用链接Mapper - * - * @author 科技小王子 - * @since 2024-01-14 11:50:39 - */ -public interface LinkMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") LinkParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") LinkParam param); - -} diff --git a/modules/oa/mapper/ProductMapper.java b/modules/oa/mapper/ProductMapper.java deleted file mode 100644 index 25c6b78..0000000 --- a/modules/oa/mapper/ProductMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gxwebsoft.oa.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.oa.entity.Product; -import com.gxwebsoft.oa.param.ProductParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 产品记录表Mapper - * - * @author 科技小王子 - * @since 2023-12-14 14:18:01 - */ -public interface ProductMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") ProductParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") ProductParam param); - -} diff --git a/modules/oa/mapper/ProductTabsMapper.java b/modules/oa/mapper/ProductTabsMapper.java deleted file mode 100644 index 4930542..0000000 --- a/modules/oa/mapper/ProductTabsMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gxwebsoft.oa.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.oa.entity.ProductTabs; -import com.gxwebsoft.oa.param.ProductTabsParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 产品标签记录表Mapper - * - * @author 科技小王子 - * @since 2023-12-14 15:55:52 - */ -public interface ProductTabsMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") ProductTabsParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") ProductTabsParam param); - -} diff --git a/modules/oa/mapper/TaskCountMapper.java b/modules/oa/mapper/TaskCountMapper.java deleted file mode 100644 index b6e6faf..0000000 --- a/modules/oa/mapper/TaskCountMapper.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.gxwebsoft.oa.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.oa.entity.TaskCount; -import com.gxwebsoft.oa.param.TaskCountParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 数据统计Mapper - * - * @author 科技小王子 - * @since 2023-10-30 14:25:30 - */ -public interface TaskCountMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") TaskCountParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") TaskCountParam param); - - - -} diff --git a/modules/oa/mapper/TaskMapper.java b/modules/oa/mapper/TaskMapper.java deleted file mode 100644 index cd35b71..0000000 --- a/modules/oa/mapper/TaskMapper.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.gxwebsoft.oa.mapper; - -import com.baomidou.mybatisplus.annotation.InterceptorIgnore; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.oa.entity.Task; -import com.gxwebsoft.oa.param.TaskParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 任务记录表Mapper - * - * @author 科技小王子 - * @since 2023-10-23 18:53:01 - */ -public interface TaskMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") TaskParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") TaskParam param); - - @InterceptorIgnore(tenantLine = "true") - List selectPageRelAll(PageParam page, TaskParam param); - - @InterceptorIgnore(tenantLine = "true") - void updateByTaskId(@Param("param") Task task); -} diff --git a/modules/oa/mapper/TaskRecordMapper.java b/modules/oa/mapper/TaskRecordMapper.java deleted file mode 100644 index b6ccf6d..0000000 --- a/modules/oa/mapper/TaskRecordMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gxwebsoft.oa.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.oa.entity.TaskRecord; -import com.gxwebsoft.oa.param.TaskRecordParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 工单回复记录表Mapper - * - * @author 科技小王子 - * @since 2023-10-23 18:53:01 - */ -public interface TaskRecordMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") TaskRecordParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") TaskRecordParam param); - -} diff --git a/modules/oa/mapper/TaskUserMapper.java b/modules/oa/mapper/TaskUserMapper.java deleted file mode 100644 index c3f791b..0000000 --- a/modules/oa/mapper/TaskUserMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gxwebsoft.oa.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.oa.entity.TaskUser; -import com.gxwebsoft.oa.param.TaskUserParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 工单成员Mapper - * - * @author 科技小王子 - * @since 2023-10-23 18:53:01 - */ -public interface TaskUserMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") TaskUserParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") TaskUserParam param); - -} diff --git a/modules/oa/mapper/xml/AppFieldMapper.xml b/modules/oa/mapper/xml/AppFieldMapper.xml deleted file mode 100644 index f29bf99..0000000 --- a/modules/oa/mapper/xml/AppFieldMapper.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - SELECT a.* - FROM oa_app_field a - - - AND a.id = #{param.id} - - - AND a.app_id = #{param.appId} - - - AND a.name LIKE CONCAT('%', #{param.name}, '%') - - - AND a.comments LIKE CONCAT('%', #{param.comments}, '%') - - - AND a.user_id = #{param.userId} - - - AND a.status = #{param.status} - - - AND a.sort_number = #{param.sortNumber} - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - - - - - - - - - diff --git a/modules/oa/mapper/xml/AppMapper.xml b/modules/oa/mapper/xml/AppMapper.xml deleted file mode 100644 index d7c2424..0000000 --- a/modules/oa/mapper/xml/AppMapper.xml +++ /dev/null @@ -1,229 +0,0 @@ - - - - - - - SELECT a.*, b.company_name,b.short_name,b.company_logo - FROM oa_app a - LEFT JOIN oa_company b ON a.company_id = b.company_id - - - AND a.app_id = #{param.appId} - - - AND a.app_name LIKE CONCAT('%', #{param.appName}, '%') - - - AND a.app_code LIKE CONCAT('%', #{param.appCode}, '%') - - - AND a.show_case = #{param.showCase} - - - AND a.recommend = #{param.recommend} - - - AND a.show_index = #{param.showIndex} - - - AND a.parent_id = #{param.parentId} - - - AND a.app_type LIKE CONCAT('%', #{param.appType}, '%') - - - AND a.app_type_multiple LIKE CONCAT('%', #{param.appTypeMultiple}, '%') - - - AND a.menu_type = #{param.menuType} - - - AND a.company_id = #{param.companyId} - - - AND a.company_name LIKE CONCAT('%', #{param.companyName}, '%') - - - AND a.app_icon LIKE CONCAT('%', #{param.appIcon}, '%') - - - AND a.app_qrcode LIKE CONCAT('%', #{param.appQrcode}, '%') - - - AND a.app_url LIKE CONCAT('%', #{param.appUrl}, '%') - - - AND a.admin_url LIKE CONCAT('%', #{param.adminUrl}, '%') - - - AND a.down_url LIKE CONCAT('%', #{param.downUrl}, '%') - - - AND a.server_url LIKE CONCAT('%', #{param.serverUrl}, '%') - - - AND a.file_url LIKE CONCAT('%', #{param.fileUrl}, '%') - - - AND a.callback_url LIKE CONCAT('%', #{param.callbackUrl}, '%') - - - AND a.docs_url LIKE CONCAT('%', #{param.docsUrl}, '%') - - - AND a.git_url LIKE CONCAT('%', #{param.gitUrl}, '%') - - - AND a.prototype_url LIKE CONCAT('%', #{param.prototypeUrl}, '%') - - - AND a.ip_address LIKE CONCAT('%', #{param.ipAddress}, '%') - - - AND a.images LIKE CONCAT('%', #{param.images}, '%') - - - AND a.package_name LIKE CONCAT('%', #{param.packageName}, '%') - - - AND a.clicks = #{param.clicks} - - - AND a.installs = #{param.installs} - - - AND a.comments LIKE CONCAT('%', #{param.comments}, '%') - - - AND a.content LIKE CONCAT('%', #{param.content}, '%') - - - AND a.requirement LIKE CONCAT('%', #{param.requirement}, '%') - - - AND a.developer LIKE CONCAT('%', #{param.developer}, '%') - - - AND a.director LIKE CONCAT('%', #{param.director}, '%') - - - AND a.project_director LIKE CONCAT('%', #{param.projectDirector}, '%') - - - AND a.salesman LIKE CONCAT('%', #{param.salesman}, '%') - - - AND a.price = #{param.price} - - - AND a.line_price = #{param.linePrice} - - - AND a.score LIKE CONCAT('%', #{param.score}, '%') - - - AND a.star LIKE CONCAT('%', #{param.star}, '%') - - - AND a.path LIKE CONCAT('%', #{param.path}, '%') - - - AND a.component LIKE CONCAT('%', #{param.component}, '%') - - - AND a.authority LIKE CONCAT('%', #{param.authority}, '%') - - - AND a.target LIKE CONCAT('%', #{param.target}, '%') - - - AND a.hide = #{param.hide} - - - AND a.search = #{param.search} - - - AND a.active LIKE CONCAT('%', #{param.active}, '%') - - - AND a.meta LIKE CONCAT('%', #{param.meta}, '%') - - - AND a.edition LIKE CONCAT('%', #{param.edition}, '%') - - - AND a.version LIKE CONCAT('%', #{param.version}, '%') - - - AND a.is_use = #{param.isUse} - - - AND a.file1 LIKE CONCAT('%', #{param.file1}, '%') - - - AND a.file2 LIKE CONCAT('%', #{param.file2}, '%') - - - AND a.file3 LIKE CONCAT('%', #{param.file3}, '%') - - - AND a.app_status LIKE CONCAT('%', #{param.appStatus}, '%') - - - AND a.sort_number = #{param.sortNumber} - - - AND a.status = #{param.status} - - - AND a.deleted = #{param.deleted} - - - AND a.deleted = 0 - - - AND a.user_id = #{param.userId} - - - AND a.app_id IN - - #{item} - - - - AND a.organization_id = #{param.organizationId} - - - AND a.show_expiration = #{param.showExpiration} - - - AND a.tenant_code LIKE CONCAT('%', #{param.tenantCode}, '%') - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - AND (a.app_name LIKE CONCAT('%', #{param.keywords}, '%') - OR a.app_code LIKE CONCAT('%', #{param.keywords}, '%') - OR a.company_name LIKE CONCAT('%', #{param.keywords}, '%') - OR a.app_url LIKE CONCAT('%', #{param.keywords}, '%') - ) - - - - - - - - - - - diff --git a/modules/oa/mapper/xml/AppRenewMapper.xml b/modules/oa/mapper/xml/AppRenewMapper.xml deleted file mode 100644 index 5e28ed9..0000000 --- a/modules/oa/mapper/xml/AppRenewMapper.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - SELECT a.*, - b.company_name,b.short_name,b.company_logo, - c.app_name - FROM oa_app_renew a - LEFT JOIN oa_company b ON a.company_id = b.company_id - LEFT JOIN oa_app c ON a.app_id = c.app_id - - - AND a.app_renew_id = #{param.appRenewId} - - - AND a.money = #{param.money} - - - AND a.comments LIKE CONCAT('%', #{param.comments}, '%') - - - AND a.start_time LIKE CONCAT('%', #{param.startTime}, '%') - - - AND a.end_time LIKE CONCAT('%', #{param.endTime}, '%') - - - AND a.user_id = #{param.userId} - - - AND a.app_id = #{param.appId} - - - AND a.company_id = #{param.companyId} - - - - AND a.status = #{param.status} - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - - - - - - - - - diff --git a/modules/oa/mapper/xml/AppUrlMapper.xml b/modules/oa/mapper/xml/AppUrlMapper.xml deleted file mode 100644 index e3a2fb9..0000000 --- a/modules/oa/mapper/xml/AppUrlMapper.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - SELECT a.* - FROM oa_app_url a - - - AND a.app_url_id = #{param.appUrlId} - - - AND a.app_id = #{param.appId} - - - AND a.name LIKE CONCAT('%', #{param.name}, '%') - - - AND a.domain LIKE CONCAT('%', #{param.domain}, '%') - - - AND a.comments LIKE CONCAT('%', #{param.comments}, '%') - - - AND a.sort_number = #{param.sortNumber} - - - AND a.status = #{param.status} - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') - ) - - - - - - - - - - - diff --git a/modules/oa/mapper/xml/AppUserMapper.xml b/modules/oa/mapper/xml/AppUserMapper.xml deleted file mode 100644 index 1f15be2..0000000 --- a/modules/oa/mapper/xml/AppUserMapper.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - SELECT a.* - FROM oa_app_user a - - - AND a.app_user_id = #{param.appUserId} - - - AND a.role = #{param.role} - - - AND a.user_id = #{param.userId} - - - AND a.app_id = #{param.appId} - - - AND a.status = #{param.status} - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - AND (b.nickname LIKE CONCAT('%', #{param.keywords}, '%') - OR b.email LIKE CONCAT('%', #{param.keywords}, '%') - OR b.username LIKE CONCAT('%', #{param.keywords}, '%') - OR b.phone LIKE CONCAT('%', #{param.keywords}, '%') - ) - - - - - - - - - - - diff --git a/modules/oa/mapper/xml/AssetsMapper.xml b/modules/oa/mapper/xml/AssetsMapper.xml deleted file mode 100644 index d3e29d5..0000000 --- a/modules/oa/mapper/xml/AssetsMapper.xml +++ /dev/null @@ -1,149 +0,0 @@ - - - - - - - SELECT a.*,b.short_name,b.company_name - FROM oa_assets a - LEFT JOIN oa_company b ON a.company_id = b.company_id - - - AND a.assets_id = #{param.assetsId} - - - AND a.name LIKE CONCAT('%', #{param.name}, '%') - - - AND a.code LIKE CONCAT('%', #{param.code}, '%') - - - AND a.type LIKE CONCAT('%', #{param.type}, '%') - - - AND a.brand LIKE CONCAT('%', #{param.brand}, '%') - - - AND a.configuration LIKE CONCAT('%', #{param.configuration}, '%') - - - AND a.account LIKE CONCAT('%', #{param.account}, '%') - - - AND a.password LIKE CONCAT('%', #{param.password}, '%') - - - AND a.brand_account LIKE CONCAT('%', #{param.brandAccount}, '%') - - - AND a.brand_password LIKE CONCAT('%', #{param.brandPassword}, '%') - - - AND a.panel LIKE CONCAT('%', #{param.panel}, '%') - - - AND a.panel_account LIKE CONCAT('%', #{param.panelAccount}, '%') - - - AND a.panel_password LIKE CONCAT('%', #{param.panelPassword}, '%') - - - AND a.finance_amount = #{param.financeAmount} - - - AND a.finance_years = #{param.financeYears} - - - AND a.finance_renew = #{param.financeRenew} - - - AND a.finance_customer_name LIKE CONCAT('%', #{param.financeCustomerName}, '%') - - - AND a.finance_customer_contact LIKE CONCAT('%', #{param.financeCustomerContact}, '%') - - - AND a.finance_customer_phone LIKE CONCAT('%', #{param.financeCustomerPhone}, '%') - - - AND a.customer_id = #{param.customerId} - - - AND a.customer_name LIKE CONCAT('%', #{param.customerName}, '%') - - - AND a.open_port LIKE CONCAT('%', #{param.openPort}, '%') - - - AND a.content LIKE CONCAT('%', #{param.content}, '%') - - - AND a.end_time >= #{param.startTime} - - - AND a.end_time <= #{param.endTime} - - - AND a.is_top LIKE CONCAT('%', #{param.isTop}, '%') - - - AND a.visibility LIKE CONCAT('%', #{param.visibility}, '%') - - - AND a.bt_sign LIKE CONCAT('%', #{param.btSign}, '%') - - - AND a.sort_number = #{param.sortNumber} - - - AND a.comments LIKE CONCAT('%', #{param.comments}, '%') - - - AND a.company_id = #{param.companyId} - - - AND a.user_id = #{param.userId} - - - AND a.organization_id = #{param.organizationId} - - - AND a.status LIKE CONCAT('%', #{param.status}, '%') - - - AND a.deleted = #{param.deleted} - - - AND a.deleted = 0 - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - AND a.assets_id IN - - #{item} - - - - AND (a.code LIKE CONCAT('%', #{param.keywords}, '%') - OR a.name LIKE CONCAT('%', #{param.keywords}, '%') - ) - - - - - - - - - - - diff --git a/modules/oa/mapper/xml/AssetsUserMapper.xml b/modules/oa/mapper/xml/AssetsUserMapper.xml deleted file mode 100644 index c9c2463..0000000 --- a/modules/oa/mapper/xml/AssetsUserMapper.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - SELECT a.* - FROM oa_assets_user a - - - AND a.id = #{param.id} - - - AND a.role = #{param.role} - - - AND a.user_id = #{param.userId} - - - AND a.assets_id = #{param.assetsId} - - - AND a.status = #{param.status} - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - - - - - - - - - diff --git a/modules/oa/mapper/xml/CompanyFieldMapper.xml b/modules/oa/mapper/xml/CompanyFieldMapper.xml deleted file mode 100644 index 4403997..0000000 --- a/modules/oa/mapper/xml/CompanyFieldMapper.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - SELECT a.* - FROM oa_company_field a - - - AND a.id = #{param.id} - - - AND a.company_id = #{param.companyId} - - - AND a.name LIKE CONCAT('%', #{param.name}, '%') - - - AND a.comments LIKE CONCAT('%', #{param.comments}, '%') - - - AND a.user_id = #{param.userId} - - - AND a.status = #{param.status} - - - AND a.sort_number = #{param.sortNumber} - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - - - - - - - - - diff --git a/modules/oa/mapper/xml/CompanyMapper.xml b/modules/oa/mapper/xml/CompanyMapper.xml deleted file mode 100644 index 5555982..0000000 --- a/modules/oa/mapper/xml/CompanyMapper.xml +++ /dev/null @@ -1,179 +0,0 @@ - - - - - - - SELECT a.* - FROM oa_company a - - - AND a.company_id = #{param.companyId} - - - AND a.short_name LIKE CONCAT('%', #{param.shortName}, '%') - - - AND a.company_name LIKE CONCAT('%', #{param.companyName}, '%') - - - AND a.company_code LIKE CONCAT('%', #{param.companyCode}, '%') - - - AND a.company_type LIKE CONCAT('%', #{param.companyType}, '%') - - - AND a.company_type_multiple LIKE CONCAT('%', #{param.companyTypeMultiple}, '%') - - - AND a.company_logo LIKE CONCAT('%', #{param.companyLogo}, '%') - - - AND a.app_type LIKE CONCAT('%', #{param.appType}, '%') - - - AND a.domain LIKE CONCAT('%', #{param.domain}, '%') - - - AND a.phone LIKE CONCAT('%', #{param.phone}, '%') - - - AND a.email LIKE CONCAT('%', #{param.email}, '%') - - - AND a.Invoice_header LIKE CONCAT('%', #{param.invoiceHeader}, '%') - - - AND a.business_entity LIKE CONCAT('%', #{param.businessEntity}, '%') - - - AND a.start_time LIKE CONCAT('%', #{param.startTime}, '%') - - - AND a.expiration_time LIKE CONCAT('%', #{param.expirationTime}, '%') - - - AND a.version = #{param.version} - - - AND a.members = #{param.members} - - - AND a.users = #{param.users} - - - AND a.industry_parent LIKE CONCAT('%', #{param.industryParent}, '%') - - - AND a.industry_child LIKE CONCAT('%', #{param.industryChild}, '%') - - - AND a.departments = #{param.departments} - - - AND a.storage LIKE CONCAT('%', #{param.storage}, '%') - - - AND a.storage_max LIKE CONCAT('%', #{param.storageMax}, '%') - - - AND a.country LIKE CONCAT('%', #{param.country}, '%') - - - AND a.province LIKE CONCAT('%', #{param.province}, '%') - - - AND a.city LIKE CONCAT('%', #{param.city}, '%') - - - AND a.region LIKE CONCAT('%', #{param.region}, '%') - - - AND a.address LIKE CONCAT('%', #{param.address}, '%') - - - AND a.longitude LIKE CONCAT('%', #{param.longitude}, '%') - - - AND a.latitude LIKE CONCAT('%', #{param.latitude}, '%') - - - AND a.comments LIKE CONCAT('%', #{param.comments}, '%') - - - AND a.authentication = #{param.authentication} - - - AND a.authoritative = #{param.authoritative} - - - AND a.request_url LIKE CONCAT('%', #{param.requestUrl}, '%') - - - AND a.socket_url LIKE CONCAT('%', #{param.socketUrl}, '%') - - - AND a.server_url LIKE CONCAT('%', #{param.serverUrl}, '%') - - - AND a.modules_url LIKE CONCAT('%', #{param.modulesUrl}, '%') - - - AND a.recommend = #{param.recommend} - - - AND a.likes = #{param.likes} - - - AND a.clicks = #{param.clicks} - - - AND a.buys = #{param.buys} - - - AND a.is_tax = #{param.isTax} - - - AND a.plan_id = #{param.planId} - - - AND a.status = #{param.status} - - - AND a.sort_number = #{param.sortNumber} - - - AND a.user_id = #{param.userId} - - - AND a.deleted = #{param.deleted} - - - AND a.deleted = 0 - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - AND ( - a.short_name LIKE CONCAT('%', #{param.keywords}, '%') - OR a.company_name = #{param.keywords} - ) - - - - - - - - - - - diff --git a/modules/oa/mapper/xml/CompanyUserMapper.xml b/modules/oa/mapper/xml/CompanyUserMapper.xml deleted file mode 100644 index 6e8e097..0000000 --- a/modules/oa/mapper/xml/CompanyUserMapper.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - SELECT a.* - FROM oa_company_user a - - - AND a.company_user_id = #{param.companyUserId} - - - AND a.role = #{param.role} - - - AND a.user_id = #{param.userId} - - - AND a.company_id = #{param.companyId} - - - AND a.status = #{param.status} - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - - - - - - - - - diff --git a/modules/oa/mapper/xml/LinkMapper.xml b/modules/oa/mapper/xml/LinkMapper.xml deleted file mode 100644 index 57cc7d0..0000000 --- a/modules/oa/mapper/xml/LinkMapper.xml +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - SELECT a.* - FROM oa_link a - - - AND a.id = #{param.id} - - - AND a.name LIKE CONCAT('%', #{param.name}, '%') - - - AND a.icon LIKE CONCAT('%', #{param.icon}, '%') - - - AND a.url LIKE CONCAT('%', #{param.url}, '%') - - - AND a.link_type LIKE CONCAT('%', #{param.linkType}, '%') - - - AND a.app_id = #{param.appId} - - - AND a.user_id = #{param.userId} - - - AND a.recommend = #{param.recommend} - - - AND a.sort_number = #{param.sortNumber} - - - AND a.deleted = #{param.deleted} - - - AND a.deleted = 0 - - - AND a.status = #{param.status} - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - - - - - - - - - diff --git a/modules/oa/mapper/xml/ProductMapper.xml b/modules/oa/mapper/xml/ProductMapper.xml deleted file mode 100644 index c2c0032..0000000 --- a/modules/oa/mapper/xml/ProductMapper.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - SELECT a.* - FROM oa_product a - - - AND a.product_id = #{param.productId} - - - AND a.name LIKE CONCAT('%', #{param.name}, '%') - - - AND a.code LIKE CONCAT('%', #{param.code}, '%') - - - AND a.content LIKE CONCAT('%', #{param.content}, '%') - - - AND a.type LIKE CONCAT('%', #{param.type}, '%') - - - AND a.files LIKE CONCAT('%', #{param.files}, '%') - - - AND a.company_id = #{param.companyId} - - - AND a.user_id = #{param.userId} - - - AND a.sort_number = #{param.sortNumber} - - - AND a.comments LIKE CONCAT('%', #{param.comments}, '%') - - - AND a.status = #{param.status} - - - AND a.deleted = #{param.deleted} - - - AND a.deleted = 0 - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - AND ( - a.product_id = #{param.keywords} - OR a.code = #{param.keywords} - OR a.name LIKE CONCAT('%', #{param.name}, '%') - ) - - - - - - - - - - - diff --git a/modules/oa/mapper/xml/ProductTabsMapper.xml b/modules/oa/mapper/xml/ProductTabsMapper.xml deleted file mode 100644 index fa83c26..0000000 --- a/modules/oa/mapper/xml/ProductTabsMapper.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - SELECT a.* - FROM oa_product_tabs a - - - AND a.tab_id = #{param.tabId} - - - AND a.product_id = #{param.productId} - - - AND a.name LIKE CONCAT('%', #{param.name}, '%') - - - AND a.type LIKE CONCAT('%', #{param.type}, '%') - - - AND a.content LIKE CONCAT('%', #{param.content}, '%') - - - AND a.background_color LIKE CONCAT('%', #{param.backgroundColor}, '%') - - - AND a.background_image LIKE CONCAT('%', #{param.backgroundImage}, '%') - - - AND a.files LIKE CONCAT('%', #{param.files}, '%') - - - AND a.company_id = #{param.companyId} - - - AND a.user_id = #{param.userId} - - - AND a.sort_number = #{param.sortNumber} - - - AND a.comments LIKE CONCAT('%', #{param.comments}, '%') - - - AND a.status = #{param.status} - - - AND a.deleted = #{param.deleted} - - - AND a.deleted = 0 - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - - - - - - - - - diff --git a/modules/oa/mapper/xml/TaskCountMapper.xml b/modules/oa/mapper/xml/TaskCountMapper.xml deleted file mode 100644 index 9f6182a..0000000 --- a/modules/oa/mapper/xml/TaskCountMapper.xml +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - SELECT a.* - FROM oa_task_count a - - - AND a.task_count_id = #{param.taskCountId} - - - AND a.user_id = #{param.userId} - - - AND a.role_code = #{param.roleCode} - - - AND a.pending = #{param.pending} - - - AND a.completed = #{param.completed} - - - AND a.today = #{param.today} - - - AND a.month = #{param.month} - - - AND a.year = #{param.year} - - - AND a.total = #{param.total} - - - AND a.role_id = #{param.roleId} - - - AND a.organization_id = #{param.organizationId} - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - - - - - - - - - diff --git a/modules/oa/mapper/xml/TaskMapper.xml b/modules/oa/mapper/xml/TaskMapper.xml deleted file mode 100644 index cdc749a..0000000 --- a/modules/oa/mapper/xml/TaskMapper.xml +++ /dev/null @@ -1,131 +0,0 @@ - - - - - - - SELECT a.*,b.app_name - FROM oa_task a - LEFT JOIN oa_app b ON a.app_id = b.app_id - - - AND a.task_id = #{param.taskId} - - - AND a.name LIKE CONCAT('%', #{param.name}, '%') - - - AND a.task_type LIKE CONCAT('%', #{param.taskType}, '%') - - - AND a.content LIKE CONCAT('%', #{param.content}, '%') - - - AND a.files LIKE CONCAT('%', #{param.files}, '%') - - - AND a.promoter = #{param.promoter} - - - AND (a.commander = #{param.commander} OR a.user_id = #{param.commander} OR a.promoter = #{param.commander}) - - - AND a.progress = #{param.progress} - - - AND a.priority LIKE CONCAT('%', #{param.priority}, '%') - - - AND a.quality LIKE CONCAT('%', #{param.quality}, '%') - - - AND a.day = #{param.day} - - - AND a.phone LIKE CONCAT('%', #{param.phone}, '%') - - - AND a.start_time LIKE CONCAT('%', #{param.startTime}, '%') - - - AND a.end_time LIKE CONCAT('%', #{param.endTime}, '%') - - - AND a.app_id = #{param.appId} - - - AND a.organization_id = #{param.organizationId} - - - AND a.customer_id = #{param.companyId} - - - AND a.project_id = #{param.projectId} - - - AND a.customer_id = #{param.customerId} - - - AND a.assets_id = #{param.assetsId} - - - AND a.user_id = #{param.userId} - - - AND a.is_read = #{param.isRead} - - - AND a.last_read_user = #{param.lastReadUser} - - - AND a.sort_number = #{param.sortNumber} - - - AND a.comments LIKE CONCAT('%', #{param.comments}, '%') - - - AND a.status = #{param.status} - - - AND a.deleted = #{param.deleted} - - - AND a.deleted = 0 - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - AND ( - a.task_id = #{param.keywords} - OR a.name LIKE CONCAT('%', #{param.name}, '%') - OR b.app_name LIKE CONCAT('%', #{param.keywords}, '%') - ) - - - - - - - - - - - - - - - UPDATE oa_task SET progress = #{param.progress} WHERE task_id = #{param.taskId} - - - - diff --git a/modules/oa/mapper/xml/TaskRecordMapper.xml b/modules/oa/mapper/xml/TaskRecordMapper.xml deleted file mode 100644 index f0d5c15..0000000 --- a/modules/oa/mapper/xml/TaskRecordMapper.xml +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - SELECT a.* - FROM oa_task_record a - - - AND a.task_record_id = #{param.taskRecordId} - - - AND a.parent_id = #{param.parentId} - - - AND a.task_id = #{param.taskId} - - - AND a.content LIKE CONCAT('%', #{param.content}, '%') - - - AND a.files LIKE CONCAT('%', #{param.files}, '%') - - - AND a.user_id = #{param.userId} - - - AND a.sort_number = #{param.sortNumber} - - - AND a.comments LIKE CONCAT('%', #{param.comments}, '%') - - - AND a.status = #{param.status} - - - AND a.deleted = #{param.deleted} - - - AND a.deleted = 0 - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - - - - - - - - - diff --git a/modules/oa/mapper/xml/TaskUserMapper.xml b/modules/oa/mapper/xml/TaskUserMapper.xml deleted file mode 100644 index dbf8c7d..0000000 --- a/modules/oa/mapper/xml/TaskUserMapper.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - SELECT a.* - FROM oa_task_user a - - - AND a.task_user_id = #{param.taskUserId} - - - AND a.role = #{param.role} - - - AND a.user_id = #{param.userId} - - - AND a.task_id = #{param.taskId} - - - AND a.status = #{param.status} - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - - - - - - - - - diff --git a/modules/oa/param/AppFieldParam.java b/modules/oa/param/AppFieldParam.java deleted file mode 100644 index 77ff556..0000000 --- a/modules/oa/param/AppFieldParam.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.gxwebsoft.oa.param; - -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 应用参数查询参数 - * - * @author 科技小王子 - * @since 2024-01-14 11:42:53 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(value = "AppFieldParam对象", description = "应用参数查询参数") -public class AppFieldParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "自增ID") - @QueryField(type = QueryType.EQ) - private Integer id; - - @ApiModelProperty(value = "应用ID") - @QueryField(type = QueryType.EQ) - private Integer appId; - - @ApiModelProperty(value = "名称") - private String name; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "用户ID") - @QueryField(type = QueryType.EQ) - private Integer userId; - - @ApiModelProperty(value = "状态, 0正常, 1删除") - @QueryField(type = QueryType.EQ) - private Integer status; - - @ApiModelProperty(value = "排序(数字越小越靠前)") - @QueryField(type = QueryType.EQ) - private Integer sortNumber; - -} diff --git a/modules/oa/param/AppParam.java b/modules/oa/param/AppParam.java deleted file mode 100644 index 508a737..0000000 --- a/modules/oa/param/AppParam.java +++ /dev/null @@ -1,240 +0,0 @@ -package com.gxwebsoft.oa.param; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.math.BigDecimal; -import java.util.Set; - -/** - * 应用管理记录表查询参数 - * - * @author 科技小王子 - * @since 2023-10-26 22:06:23 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(value = "AppParam对象", description = "应用管理记录表查询参数") -public class AppParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "应用ID") - @QueryField(type = QueryType.EQ) - private Integer appId; - - @ApiModelProperty(value = "应用名称") - private String appName; - - @ApiModelProperty(value = "应用标识") - private String appCode; - - @ApiModelProperty(value = "上级id, 0是顶级") - @QueryField(type = QueryType.EQ) - private Integer parentId; - - @ApiModelProperty(value = "应用类型") - private String appType; - - @ApiModelProperty(value = "应用类型") - private String appTypeMultiple; - - @ApiModelProperty(value = "类型, 0菜单, 1按钮") - @QueryField(type = QueryType.EQ) - private Integer menuType; - - @ApiModelProperty(value = "企业ID") - @QueryField(type = QueryType.EQ) - private Integer companyId; - - @ApiModelProperty(value = "企业名称") - private String companyName; - - @ApiModelProperty(value = "应用图标") - private String appIcon; - - @ApiModelProperty(value = "二维码") - private String appQrcode; - - @ApiModelProperty(value = "链接地址") - private String appUrl; - - @ApiModelProperty(value = "后台管理地址") - private String adminUrl; - - @ApiModelProperty(value = "下载地址") - private String downUrl; - - @ApiModelProperty(value = "链接地址") - private String serverUrl; - - @ApiModelProperty(value = "文件服务器") - private String fileUrl; - - @ApiModelProperty(value = "回调地址") - private String callbackUrl; - - @ApiModelProperty(value = "腾讯文档地址") - private String docsUrl; - - @ApiModelProperty(value = "代码仓库地址") - private String gitUrl; - - @ApiModelProperty(value = "原型图地址") - private String prototypeUrl; - - @ApiModelProperty(value = "IP白名单") - private String ipAddress; - - @ApiModelProperty(value = "应用截图") - private String images; - - @ApiModelProperty(value = "应用包名") - private String packageName; - - @ApiModelProperty(value = "下载次数") - @QueryField(type = QueryType.EQ) - private Integer clicks; - - @ApiModelProperty(value = "安装次数") - @QueryField(type = QueryType.EQ) - private Integer installs; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "应用介绍") - private String content; - - @ApiModelProperty(value = "项目需求") - private String requirement; - - @ApiModelProperty(value = "开发者(个人或公司)") - private String developer; - - @ApiModelProperty(value = "项目负责人") - private String director; - - @ApiModelProperty(value = "项目经理") - private String projectDirector; - - @ApiModelProperty(value = "业务员") - private String salesman; - - @ApiModelProperty(value = "软件定价") - @QueryField(type = QueryType.EQ) - private BigDecimal price; - - @ApiModelProperty(value = "划线价格") - @QueryField(type = QueryType.EQ) - private BigDecimal linePrice; - - @ApiModelProperty(value = "评分") - private String score; - - @ApiModelProperty(value = "星级") - private String star; - - @ApiModelProperty(value = "菜单路由地址") - private String path; - - @ApiModelProperty(value = "菜单组件地址, 目录可为空") - private String component; - - @ApiModelProperty(value = "权限标识") - private String authority; - - @ApiModelProperty(value = "打开位置") - private String target; - - @ApiModelProperty(value = "是否隐藏, 0否, 1是(仅注册路由不显示在左侧菜单)") - @QueryField(type = QueryType.EQ) - private Integer hide; - - @ApiModelProperty(value = "禁止搜索，1禁止 0 允许") - @QueryField(type = QueryType.EQ) - private Integer search; - - @ApiModelProperty(value = "菜单侧栏选中的path") - private String active; - - @ApiModelProperty(value = "其它路由元信息") - private String meta; - - @ApiModelProperty(value = "版本，0正式版 1体验版 2开发版") - private String edition; - - @ApiModelProperty(value = "版本号") - private String version; - - @ApiModelProperty(value = "是否已安装") - @QueryField(type = QueryType.EQ) - private Integer isUse; - - @ApiModelProperty(value = "附近1") - private String file1; - - @ApiModelProperty(value = "附件2") - private String file2; - - @ApiModelProperty(value = "附件3") - private String file3; - - @ApiModelProperty(value = "应用状态") - private String appStatus; - - @ApiModelProperty(value = "是否在续费提醒显示") - @QueryField(type = QueryType.EQ) - private Boolean showExpiration; - - @ApiModelProperty(value = "排序(数字越小越靠前)") - @QueryField(type = QueryType.EQ) - private Integer sortNumber; - - @ApiModelProperty(value = "状态, 0正常, 1冻结") - @QueryField(type = QueryType.EQ) - private Integer status; - - @ApiModelProperty(value = "是否删除, 0否, 1是") - @QueryField(type = QueryType.EQ) - private Integer deleted; - - @ApiModelProperty(value = "用户ID") - @QueryField(type = QueryType.EQ) - private Integer userId; - - @ApiModelProperty(value = "机构id") - @QueryField(type = QueryType.EQ) - private Integer organizationId; - - @ApiModelProperty(value = "租户编号") - private String tenantCode; - - @ApiModelProperty(value = "按APPID集搜索") - @TableField(exist = false) - private Set appIds; - - @ApiModelProperty(value = "是否作为案例展示") - @TableField(exist = false) - private Boolean showCase; - - @ApiModelProperty(value = "是否推荐") - @TableField(exist = false) - private Boolean recommend; - - @ApiModelProperty(value = "是否显示到首页") - @TableField(exist = false) - private Boolean showIndex; - - @ApiModelProperty(value = "是否读取链接列表") - @TableField(exist = false) - private Boolean showAppUrl; - -} diff --git a/modules/oa/param/AppRenewParam.java b/modules/oa/param/AppRenewParam.java deleted file mode 100644 index f41e461..0000000 --- a/modules/oa/param/AppRenewParam.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.gxwebsoft.oa.param; - -import com.fasterxml.jackson.annotation.JsonInclude; -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.math.BigDecimal; - -/** - * 续费管理查询参数 - * - * @author 科技小王子 - * @since 2023-11-14 14:27:57 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(value = "AppRenewParam对象", description = "续费管理查询参数") -public class AppRenewParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "自增ID") - @QueryField(type = QueryType.EQ) - private Integer appRenewId; - - @ApiModelProperty(value = "续费金额") - @QueryField(type = QueryType.EQ) - private BigDecimal money; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "开始时间") - private String startTime; - - @ApiModelProperty(value = "到期时间") - private String endTime; - - @ApiModelProperty(value = "上传附件") - private String images; - - @ApiModelProperty(value = "用户ID") - @QueryField(type = QueryType.EQ) - private Integer userId; - - @ApiModelProperty(value = "应用ID") - @QueryField(type = QueryType.EQ) - private Integer appId; - - @ApiModelProperty(value = "企业ID") - @QueryField(type = QueryType.EQ) - private Integer companyId; - - @ApiModelProperty(value = "状态, 0正常, 1待确认") - @QueryField(type = QueryType.EQ) - private Integer status; - -} diff --git a/modules/oa/param/AppUrlParam.java b/modules/oa/param/AppUrlParam.java deleted file mode 100644 index 8f54d21..0000000 --- a/modules/oa/param/AppUrlParam.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.gxwebsoft.oa.param; - -import java.math.BigDecimal; -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 项目域名查询参数 - * - * @author 科技小王子 - * @since 2024-04-15 13:01:34 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(value = "AppUrlParam对象", description = "项目域名查询参数") -public class AppUrlParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "自增ID") - @QueryField(type = QueryType.EQ) - private Integer appUrlId; - - @ApiModelProperty(value = "应用ID") - @QueryField(type = QueryType.EQ) - private Integer appId; - - @ApiModelProperty(value = "域名类型") - private String name; - - @ApiModelProperty(value = "域名") - private String domain; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "排序(数字越小越靠前)") - @QueryField(type = QueryType.EQ) - private Integer sortNumber; - - @ApiModelProperty(value = "状态, 0正常, 1待确认") - @QueryField(type = QueryType.EQ) - private Integer status; - -} diff --git a/modules/oa/param/AppUserParam.java b/modules/oa/param/AppUserParam.java deleted file mode 100644 index e799b7e..0000000 --- a/modules/oa/param/AppUserParam.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.gxwebsoft.oa.param; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 应用成员查询参数 - * - * @author 科技小王子 - * @since 2023-10-26 22:06:23 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(value = "AppUserParam对象", description = "应用成员查询参数") -public class AppUserParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "自增ID") - @QueryField(type = QueryType.EQ) - private Integer appUserId; - - @ApiModelProperty(value = "角色，10体验成员 20开发者成员 30管理员 ") - @QueryField(type = QueryType.EQ) - private Integer role; - - @ApiModelProperty(value = "用户ID") - @QueryField(type = QueryType.EQ) - private Integer userId; - - @ApiModelProperty(value = "应用ID") - @QueryField(type = QueryType.EQ) - private Integer appId; - - @ApiModelProperty(value = "状态, 0正常, 1待评价") - @QueryField(type = QueryType.EQ) - private Integer status; - - @ApiModelProperty(value = "昵称") - @TableField(exist = false) - private String nickname; - - @ApiModelProperty(value = "用户名") - @TableField(exist = false) - private String username; - - @ApiModelProperty(value = "手机号码") - @TableField(exist = false) - private String phone; - - @ApiModelProperty(value = "邮箱") - @TableField(exist = false) - private String email; - - @ApiModelProperty(value = "头像") - @TableField(exist = false) - private String avatar; - -} diff --git a/modules/oa/param/AssetsParam.java b/modules/oa/param/AssetsParam.java deleted file mode 100644 index b8e04c8..0000000 --- a/modules/oa/param/AssetsParam.java +++ /dev/null @@ -1,154 +0,0 @@ -package com.gxwebsoft.oa.param; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.math.BigDecimal; -import java.time.LocalDateTime; -import java.util.Date; -import java.util.Set; - -/** - * 服务器资产记录表查询参数 - * - * @author 科技小王子 - * @since 2023-10-26 21:08:27 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(value = "AssetsParam对象", description = "服务器资产记录表查询参数") -public class AssetsParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "资产ID") - @QueryField(type = QueryType.EQ) - private Integer assetsId; - - @ApiModelProperty(value = "资产名称") - private String name; - - @ApiModelProperty(value = "资产标识") - private String code; - - @ApiModelProperty(value = "资产类型") - private String type; - - @ApiModelProperty(value = "服务器厂商") - private String brand; - - @ApiModelProperty(value = "服务器配置") - private String configuration; - - @ApiModelProperty(value = "初始账号") - private String account; - - @ApiModelProperty(value = "初始密码") - private String password; - - @ApiModelProperty(value = "(阿里云/腾讯云)登录账号") - private String brandAccount; - - @ApiModelProperty(value = "(阿里云/腾讯云)登录密码") - private String brandPassword; - - @ApiModelProperty(value = "宝塔面板") - private String panel; - - @ApiModelProperty(value = "宝塔面板账号") - private String panelAccount; - - @ApiModelProperty(value = "宝塔面板密码") - private String panelPassword; - - @ApiModelProperty(value = "财务信息-合同金额") - @QueryField(type = QueryType.EQ) - private BigDecimal financeAmount; - - @ApiModelProperty(value = "购买年限") - @QueryField(type = QueryType.EQ) - private Integer financeYears; - - @ApiModelProperty(value = "续费金额") - @QueryField(type = QueryType.EQ) - private BigDecimal financeRenew; - - @ApiModelProperty(value = "客户名称") - private String financeCustomerName; - - @ApiModelProperty(value = "客户联系人") - private String financeCustomerContact; - - @ApiModelProperty(value = "客户联系电话") - private String financeCustomerPhone; - - @ApiModelProperty(value = "客户ID") - @QueryField(type = QueryType.EQ) - private Integer customerId; - - @ApiModelProperty(value = "客户名称") - private String customerName; - - @ApiModelProperty(value = "开放端口") - private String openPort; - - @ApiModelProperty(value = "详情内容") - private String content; - - @ApiModelProperty(value = "购买时间") - private LocalDateTime startTime; - - @ApiModelProperty(value = "到期时间") - private LocalDateTime endTime; - - @ApiModelProperty(value = "置顶状态") - private String isTop; - - @ApiModelProperty(value = "可见性(public,private,protected)") - private String visibility; - - @ApiModelProperty(value = "宝塔接口秘钥") - private String btSign; - - @ApiModelProperty(value = "文章排序(数字越小越靠前)") - @QueryField(type = QueryType.EQ) - private Integer sortNumber; - - @ApiModelProperty(value = "描述") - private String comments; - - @ApiModelProperty(value = "客户ID") - @QueryField(type = QueryType.EQ) - private Integer companyId; - - @ApiModelProperty(value = "用户ID") - @QueryField(type = QueryType.EQ) - private Integer userId; - - @ApiModelProperty(value = "机构id") - @QueryField(type = QueryType.EQ) - private Integer organizationId; - - @ApiModelProperty(value = "状态, 0正常, 1冻结") - private String status; - - @ApiModelProperty(value = "是否删除, 0否, 1是") - @QueryField(type = QueryType.EQ) - private Integer deleted; - - @ApiModelProperty(value = "企业名称") - @TableField(exist = false) - private String companyName; - - @ApiModelProperty(value = "按ID集搜索") - @TableField(exist = false) - private Set assetsIds; - -} diff --git a/modules/oa/param/AssetsUserParam.java b/modules/oa/param/AssetsUserParam.java deleted file mode 100644 index ec7006f..0000000 --- a/modules/oa/param/AssetsUserParam.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.gxwebsoft.oa.param; - -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 服务器成员管理查询参数 - * - * @author 科技小王子 - * @since 2023-10-26 21:08:27 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(value = "AssetsUserParam对象", description = "服务器成员管理查询参数") -public class AssetsUserParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "自增ID") - @QueryField(type = QueryType.EQ) - private Integer id; - - @ApiModelProperty(value = "角色，10体验成员 20开发者成员 30管理员 ") - @QueryField(type = QueryType.EQ) - private Integer role; - - @ApiModelProperty(value = "用户ID") - @QueryField(type = QueryType.EQ) - private Integer userId; - - @ApiModelProperty(value = "应用ID") - @QueryField(type = QueryType.EQ) - private Integer assetsId; - - @ApiModelProperty(value = "状态, 0正常, 1待评价") - @QueryField(type = QueryType.EQ) - private Integer status; - -} diff --git a/modules/oa/param/CompanyFieldParam.java b/modules/oa/param/CompanyFieldParam.java deleted file mode 100644 index cf31d6e..0000000 --- a/modules/oa/param/CompanyFieldParam.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.gxwebsoft.oa.param; - -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 企业参数查询参数 - * - * @author 科技小王子 - * @since 2024-02-04 14:44:42 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(value = "CompanyFieldParam对象", description = "企业参数查询参数") -public class CompanyFieldParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "自增ID") - @QueryField(type = QueryType.EQ) - private Integer id; - - @ApiModelProperty(value = "企业ID") - @QueryField(type = QueryType.EQ) - private Integer companyId; - - @ApiModelProperty(value = "名称") - private String name; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "用户ID") - @QueryField(type = QueryType.EQ) - private Integer userId; - - @ApiModelProperty(value = "状态, 0正常, 1删除") - @QueryField(type = QueryType.EQ) - private Integer status; - - @ApiModelProperty(value = "排序(数字越小越靠前)") - @QueryField(type = QueryType.EQ) - private Integer sortNumber; - -} diff --git a/modules/oa/param/CompanyParam.java b/modules/oa/param/CompanyParam.java deleted file mode 100644 index 39264d3..0000000 --- a/modules/oa/param/CompanyParam.java +++ /dev/null @@ -1,190 +0,0 @@ -package com.gxwebsoft.oa.param; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.Set; - -/** - * 企业信息查询参数 - * - * @author 科技小王子 - * @since 2023-10-23 19:18:58 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(value = "CompanyParam对象", description = "企业信息查询参数") -public class CompanyParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "企业id") - @QueryField(type = QueryType.EQ) - private Integer companyId; - - @ApiModelProperty(value = "企业简称") - private String shortName; - - @ApiModelProperty(value = "企业全称") - private String companyName; - - @ApiModelProperty(value = "企业标识") - private String companyCode; - - @ApiModelProperty(value = "类型 10企业 20政府单位") - private String companyType; - - @ApiModelProperty(value = "企业类型多选") - private String companyTypeMultiple; - - @ApiModelProperty(value = "应用标识") - private String companyLogo; - - @ApiModelProperty(value = "应用类型") - private String appType; - - @ApiModelProperty(value = "绑定域名") - private String domain; - - @ApiModelProperty(value = "联系电话") - private String phone; - - @ApiModelProperty(value = "邮箱") - private String email; - - @ApiModelProperty(value = "发票抬头") - private String invoiceHeader; - - @ApiModelProperty(value = "企业法人") - private String businessEntity; - - @ApiModelProperty(value = "服务开始时间") - private String startTime; - - @ApiModelProperty(value = "服务到期时间") - private String expirationTime; - - @ApiModelProperty(value = "应用版本 10体验版 20授权版 30旗舰版") - @QueryField(type = QueryType.EQ) - private Integer version; - - @ApiModelProperty(value = "成员数量(人数上限)") - @QueryField(type = QueryType.EQ) - private Integer members; - - @ApiModelProperty(value = "成员数量(当前)") - @QueryField(type = QueryType.EQ) - private Integer users; - - @ApiModelProperty(value = "行业类型(父级)") - private String industryParent; - - @ApiModelProperty(value = "行业类型(子级)") - private String industryChild; - - @ApiModelProperty(value = "部门数量") - @QueryField(type = QueryType.EQ) - private Integer departments; - - @ApiModelProperty(value = "存储空间") - private Long storage; - - @ApiModelProperty(value = "存储空间(上限)") - private Long storageMax; - - @ApiModelProperty(value = "所在国家") - private String country; - - @ApiModelProperty(value = "所在省份") - private String province; - - @ApiModelProperty(value = "所在城市") - private String city; - - @ApiModelProperty(value = "所在辖区") - private String region; - - @ApiModelProperty(value = "街道地址") - private String address; - - @ApiModelProperty(value = "经度") - private String longitude; - - @ApiModelProperty(value = "纬度") - private String latitude; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "是否实名认证") - @QueryField(type = QueryType.EQ) - private Integer authentication; - - @ApiModelProperty(value = "企业默认主体") - @QueryField(type = QueryType.EQ) - private Integer authoritative; - - @ApiModelProperty(value = "request合法域名") - private String requestUrl; - - @ApiModelProperty(value = "socket合法域名") - private String socketUrl; - - @ApiModelProperty(value = "主控端域名") - private String serverUrl; - - @ApiModelProperty(value = "业务域名") - private String modulesUrl; - - @ApiModelProperty(value = "是否推荐") - @QueryField(type = QueryType.EQ) - private Integer recommend; - - @ApiModelProperty(value = "点赞数量") - @QueryField(type = QueryType.EQ) - private Integer likes; - - @ApiModelProperty(value = "点击数量") - @QueryField(type = QueryType.EQ) - private Integer clicks; - - @ApiModelProperty(value = "购买数量") - @QueryField(type = QueryType.EQ) - private Integer buys; - - @ApiModelProperty(value = "是否含税, 0不含, 1含") - @QueryField(type = QueryType.EQ) - private Integer isTax; - - @ApiModelProperty(value = "当前克隆的租户ID") - @QueryField(type = QueryType.EQ) - private Integer planId; - - @ApiModelProperty(value = "状态") - @QueryField(type = QueryType.EQ) - private Integer status; - - @ApiModelProperty(value = "排序号") - @QueryField(type = QueryType.EQ) - private Integer sortNumber; - - @ApiModelProperty(value = "用户ID") - @QueryField(type = QueryType.EQ) - private Integer userId; - - @ApiModelProperty(value = "是否删除, 0否, 1是") - @QueryField(type = QueryType.EQ) - private Integer deleted; - - @ApiModelProperty(value = "按companyId集搜索") - @TableField(exist = false) - private Set companyIds; - -} diff --git a/modules/oa/param/CompanyUserParam.java b/modules/oa/param/CompanyUserParam.java deleted file mode 100644 index 23ea3c0..0000000 --- a/modules/oa/param/CompanyUserParam.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.gxwebsoft.oa.param; - -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 成员管理查询参数 - * - * @author 科技小王子 - * @since 2024-02-04 14:44:42 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(value = "CompanyUserParam对象", description = "成员管理查询参数") -public class CompanyUserParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "自增ID") - @QueryField(type = QueryType.EQ) - private Integer companyUserId; - - @ApiModelProperty(value = "角色，10体验成员 20开发者成员 30管理员 ") - @QueryField(type = QueryType.EQ) - private Integer role; - - @ApiModelProperty(value = "用户ID") - @QueryField(type = QueryType.EQ) - private Integer userId; - - @ApiModelProperty(value = "企业ID") - @QueryField(type = QueryType.EQ) - private Integer companyId; - - @ApiModelProperty(value = "状态, 0正常, 1待确认") - @QueryField(type = QueryType.EQ) - private Integer status; - -} diff --git a/modules/oa/param/LinkParam.java b/modules/oa/param/LinkParam.java deleted file mode 100644 index 0556ebe..0000000 --- a/modules/oa/param/LinkParam.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.gxwebsoft.oa.param; - -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 常用链接查询参数 - * - * @author 科技小王子 - * @since 2024-01-14 11:50:39 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(value = "LinkParam对象", description = "常用链接查询参数") -public class LinkParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "自增ID") - @QueryField(type = QueryType.EQ) - private Integer id; - - @ApiModelProperty(value = "链接名称") - private String name; - - @ApiModelProperty(value = "图标") - private String icon; - - @ApiModelProperty(value = "链接地址") - private String url; - - @ApiModelProperty(value = "链接类型") - private String linkType; - - @ApiModelProperty(value = "应用ID") - @QueryField(type = QueryType.EQ) - private Integer appId; - - @ApiModelProperty(value = "用户ID") - @QueryField(type = QueryType.EQ) - private Integer userId; - - @ApiModelProperty(value = "是否推荐") - @QueryField(type = QueryType.EQ) - private Integer recommend; - - @ApiModelProperty(value = "排序(数字越小越靠前)") - @QueryField(type = QueryType.EQ) - private Integer sortNumber; - - @ApiModelProperty(value = "是否删除, 0否, 1是") - @QueryField(type = QueryType.EQ) - private Integer deleted; - - @ApiModelProperty(value = "状态, 0正常, 1待确认") - @QueryField(type = QueryType.EQ) - private Integer status; - -} diff --git a/modules/oa/param/ProductParam.java b/modules/oa/param/ProductParam.java deleted file mode 100644 index 953b9dc..0000000 --- a/modules/oa/param/ProductParam.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.gxwebsoft.oa.param; - -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 产品记录表查询参数 - * - * @author 科技小王子 - * @since 2023-12-14 14:18:01 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(value = "ProductParam对象", description = "产品记录表查询参数") -public class ProductParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "产品ID") - @QueryField(type = QueryType.EQ) - private Integer productId; - - @ApiModelProperty(value = "产品名称") - private String name; - - @ApiModelProperty(value = "产品标识") - private String code; - - @ApiModelProperty(value = "产品详情") - private String content; - - @ApiModelProperty(value = "产品类型") - private String type; - - @ApiModelProperty(value = "附件") - private String files; - - @ApiModelProperty(value = "企业ID") - @QueryField(type = QueryType.EQ) - private Integer companyId; - - @ApiModelProperty(value = "用户ID") - @QueryField(type = QueryType.EQ) - private Integer userId; - - @ApiModelProperty(value = "排序(数字越小越靠前)") - @QueryField(type = QueryType.EQ) - private Integer sortNumber; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "状态, 0已上架, 1已下架") - @QueryField(type = QueryType.EQ) - private Integer status; - - @ApiModelProperty(value = "是否删除, 0否, 1是") - @QueryField(type = QueryType.EQ) - private Integer deleted; - -} diff --git a/modules/oa/param/ProductTabsParam.java b/modules/oa/param/ProductTabsParam.java deleted file mode 100644 index 936d111..0000000 --- a/modules/oa/param/ProductTabsParam.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.gxwebsoft.oa.param; - -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 产品标签记录表查询参数 - * - * @author 科技小王子 - * @since 2023-12-14 15:55:52 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(value = "ProductTabsParam对象", description = "产品标签记录表查询参数") -public class ProductTabsParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "产品标签ID") - @QueryField(type = QueryType.EQ) - private Integer tabId; - - @ApiModelProperty(value = "产品ID") - @QueryField(type = QueryType.EQ) - private Integer productId; - - @ApiModelProperty(value = "标签名称") - private String name; - - @ApiModelProperty(value = "标签类型") - private String type; - - @ApiModelProperty(value = "产品标签详情") - private String content; - - @ApiModelProperty(value = "背景颜色") - private String backgroundColor; - - @ApiModelProperty(value = "背景图片") - private String backgroundImage; - - @ApiModelProperty(value = "附件") - private String files; - - @ApiModelProperty(value = "企业ID") - @QueryField(type = QueryType.EQ) - private Integer companyId; - - @ApiModelProperty(value = "用户ID") - @QueryField(type = QueryType.EQ) - private Integer userId; - - @ApiModelProperty(value = "排序(数字越小越靠前)") - @QueryField(type = QueryType.EQ) - private Integer sortNumber; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "状态, 0已上架, 1已下架") - @QueryField(type = QueryType.EQ) - private Integer status; - - @ApiModelProperty(value = "是否删除, 0否, 1是") - @QueryField(type = QueryType.EQ) - private Integer deleted; - -} diff --git a/modules/oa/param/TaskCountParam.java b/modules/oa/param/TaskCountParam.java deleted file mode 100644 index 900f257..0000000 --- a/modules/oa/param/TaskCountParam.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.gxwebsoft.oa.param; - -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 数据统计查询参数 - * - * @author 科技小王子 - * @since 2023-10-30 14:25:30 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(value = "TaskCountParam对象", description = "数据统计查询参数") -public class TaskCountParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "自增ID") - @QueryField(type = QueryType.EQ) - private Integer taskCountId; - - @ApiModelProperty(value = "用户ID") - @QueryField(type = QueryType.EQ) - private Integer userId; - - @ApiModelProperty(value = "待处理数") - @QueryField(type = QueryType.EQ) - private Integer pending; - - @ApiModelProperty(value = "已完成数") - @QueryField(type = QueryType.EQ) - private Integer completed; - - @ApiModelProperty(value = "今天处理数") - @QueryField(type = QueryType.EQ) - private Integer today; - - @ApiModelProperty(value = "本月处理数") - @QueryField(type = QueryType.EQ) - private Integer month; - - @ApiModelProperty(value = "今年处理数") - @QueryField(type = QueryType.EQ) - private Integer year; - - @ApiModelProperty(value = "总工单数") - @QueryField(type = QueryType.EQ) - private Integer total; - - @ApiModelProperty(value = "部门ID") - private Integer organizationId; - - @ApiModelProperty(value = "角色ID") - private Integer roleId; - - @ApiModelProperty(value = "角色标识") - private String roleCode; - -} diff --git a/modules/oa/param/TaskParam.java b/modules/oa/param/TaskParam.java deleted file mode 100644 index 7dea647..0000000 --- a/modules/oa/param/TaskParam.java +++ /dev/null @@ -1,134 +0,0 @@ -package com.gxwebsoft.oa.param; - -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.gxwebsoft.common.system.entity.User; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 任务记录表查询参数 - * - * @author 科技小王子 - * @since 2023-10-23 18:53:01 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(value = "TaskParam对象", description = "任务记录表查询参数") -public class TaskParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "工单ID") - @QueryField(type = QueryType.EQ) - private Integer taskId; - - @ApiModelProperty(value = "工单名称") - private String name; - - @ApiModelProperty(value = "工单类型") - private String taskType; - - @ApiModelProperty(value = "任务内容") - private String content; - - @ApiModelProperty(value = "工单附件") - private String files; - - @ApiModelProperty(value = "工单发起人") - @QueryField(type = QueryType.EQ) - private Integer promoter; - - @ApiModelProperty(value = "受理人") - @QueryField(type = QueryType.EQ) - private Integer commander; - - @ApiModelProperty(value = "工单状态， 0未开始 1已指派 ") - @QueryField(type = QueryType.EQ) - private Integer progress; - - @ApiModelProperty(value = "逾期天数") - @QueryField(type = QueryType.EQ) - private Integer overdueDays; - - @ApiModelProperty(value = "优先级") - private String priority; - - @ApiModelProperty(value = "品质要求") - private String quality; - - @ApiModelProperty(value = "时限(天)") - @QueryField(type = QueryType.EQ) - private Integer day; - - @ApiModelProperty(value = "手机号") - private String phone; - - @ApiModelProperty(value = "开始时间") - private String startTime; - - @ApiModelProperty(value = "结束时间") - private String endTime; - - @ApiModelProperty(value = "项目ID") - @QueryField(type = QueryType.EQ) - private Integer appId; - - @ApiModelProperty(value = "机构id") - @QueryField(type = QueryType.EQ) - private Integer organizationId; - - @ApiModelProperty(value = "项目ID") - @QueryField(type = QueryType.EQ) - private Integer projectId; - - @ApiModelProperty(value = "客户ID") - @QueryField(type = QueryType.EQ) - private Integer customerId; - - @ApiModelProperty(value = "资产ID") - @QueryField(type = QueryType.EQ) - private Integer assetsId; - - @ApiModelProperty(value = "企业ID") - @QueryField(type = QueryType.EQ) - private Integer companyId; - - @ApiModelProperty(value = "用户ID") - @QueryField(type = QueryType.EQ) - private Integer userId; - - @ApiModelProperty(value = "是否已查阅") - @QueryField(type = QueryType.EQ) - private Integer isRead; - - @ApiModelProperty(value = "最后回复人") - @QueryField(type = QueryType.EQ) - private Integer lastReadUser; - - @ApiModelProperty(value = "排序(数字越小越靠前)") - @QueryField(type = QueryType.EQ) - private Integer sortNumber; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "状态, 0待处理, 1已完成") - @QueryField(type = QueryType.EQ) - private Integer status; - - @ApiModelProperty(value = "是否删除, 0否, 1是") - @QueryField(type = QueryType.EQ) - private Integer deleted; - - @ApiModelProperty(value = "当前登录用户") - private User loginUser; - - @ApiModelProperty(value = "当前登录用户Id") - private Integer loginUserId; - -} diff --git a/modules/oa/param/TaskRecordParam.java b/modules/oa/param/TaskRecordParam.java deleted file mode 100644 index 32fabd9..0000000 --- a/modules/oa/param/TaskRecordParam.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.gxwebsoft.oa.param; - -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 工单回复记录表查询参数 - * - * @author 科技小王子 - * @since 2023-10-23 18:53:01 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(value = "TaskRecordParam对象", description = "工单回复记录表查询参数") -public class TaskRecordParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "回复ID") - @QueryField(type = QueryType.EQ) - private Integer taskRecordId; - - @ApiModelProperty(value = "上级id, 0是顶级") - @QueryField(type = QueryType.EQ) - private Integer parentId; - - @ApiModelProperty(value = "工单ID") - @QueryField(type = QueryType.EQ) - private Integer taskId; - - @ApiModelProperty(value = "任务内容") - private String content; - - @ApiModelProperty(value = "工单附件") - private String files; - - @ApiModelProperty(value = "用户ID") - @QueryField(type = QueryType.EQ) - private Integer userId; - - @ApiModelProperty(value = "排序(数字越小越靠前)") - @QueryField(type = QueryType.EQ) - private Integer sortNumber; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "状态, 0待处理, 1已完成") - @QueryField(type = QueryType.EQ) - private Integer status; - - @ApiModelProperty(value = "是否删除, 0否, 1是") - @QueryField(type = QueryType.EQ) - private Integer deleted; - -} diff --git a/modules/oa/param/TaskUserParam.java b/modules/oa/param/TaskUserParam.java deleted file mode 100644 index d3917bb..0000000 --- a/modules/oa/param/TaskUserParam.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.gxwebsoft.oa.param; - -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 工单成员查询参数 - * - * @author 科技小王子 - * @since 2023-10-23 18:53:01 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(value = "TaskUserParam对象", description = "工单成员查询参数") -public class TaskUserParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "自增ID") - @QueryField(type = QueryType.EQ) - private Integer taskUserId; - - @ApiModelProperty(value = "角色，10体验成员 20开发者成员 30管理员 ") - @QueryField(type = QueryType.EQ) - private Integer role; - - @ApiModelProperty(value = "用户ID") - @QueryField(type = QueryType.EQ) - private Integer userId; - - @ApiModelProperty(value = "工单ID") - @QueryField(type = QueryType.EQ) - private Integer taskId; - - @ApiModelProperty(value = "状态, 0待处理, 1已完成") - @QueryField(type = QueryType.EQ) - private Integer status; - -} diff --git a/modules/oa/service/AppFieldService.java b/modules/oa/service/AppFieldService.java deleted file mode 100644 index d110a78..0000000 --- a/modules/oa/service/AppFieldService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.oa.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.oa.entity.AppField; -import com.gxwebsoft.oa.param.AppFieldParam; - -import java.util.List; - -/** - * 应用参数Service - * - * @author 科技小王子 - * @since 2024-01-14 11:42:53 - */ -public interface AppFieldService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(AppFieldParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(AppFieldParam param); - - /** - * 根据id查询 - * - * @param id 自增ID - * @return AppField - */ - AppField getByIdRel(Integer id); - -} diff --git a/modules/oa/service/AppRenewService.java b/modules/oa/service/AppRenewService.java deleted file mode 100644 index b5c7eb0..0000000 --- a/modules/oa/service/AppRenewService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.oa.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.oa.entity.AppRenew; -import com.gxwebsoft.oa.param.AppRenewParam; - -import java.util.List; - -/** - * 续费管理Service - * - * @author 科技小王子 - * @since 2023-11-14 14:27:57 - */ -public interface AppRenewService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(AppRenewParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(AppRenewParam param); - - /** - * 根据id查询 - * - * @param appRenewId 自增ID - * @return AppRenew - */ - AppRenew getByIdRel(Integer appRenewId); - -} diff --git a/modules/oa/service/AppService.java b/modules/oa/service/AppService.java deleted file mode 100644 index 14cab2f..0000000 --- a/modules/oa/service/AppService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.oa.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.oa.entity.App; -import com.gxwebsoft.oa.param.AppParam; - -import java.util.List; - -/** - * 应用管理记录表Service - * - * @author 科技小王子 - * @since 2023-10-26 22:06:23 - */ -public interface AppService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(AppParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(AppParam param); - - /** - * 根据id查询 - * - * @param appId 应用ID - * @return App - */ - App getByIdRel(Integer appId); - -} diff --git a/modules/oa/service/AppUrlService.java b/modules/oa/service/AppUrlService.java deleted file mode 100644 index ecea813..0000000 --- a/modules/oa/service/AppUrlService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.oa.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.oa.entity.AppUrl; -import com.gxwebsoft.oa.param.AppUrlParam; - -import java.util.List; - -/** - * 项目域名Service - * - * @author 科技小王子 - * @since 2024-04-15 13:01:34 - */ -public interface AppUrlService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(AppUrlParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(AppUrlParam param); - - /** - * 根据id查询 - * - * @param appUrlId 自增ID - * @return AppUrl - */ - AppUrl getByIdRel(Integer appUrlId); - -} diff --git a/modules/oa/service/AppUserService.java b/modules/oa/service/AppUserService.java deleted file mode 100644 index 8524874..0000000 --- a/modules/oa/service/AppUserService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.oa.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.oa.entity.AppUser; -import com.gxwebsoft.oa.param.AppUserParam; - -import java.util.List; - -/** - * 应用成员Service - * - * @author 科技小王子 - * @since 2023-10-26 22:06:23 - */ -public interface AppUserService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(AppUserParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(AppUserParam param); - - /** - * 根据id查询 - * - * @param appUserId 自增ID - * @return AppUser - */ - AppUser getByIdRel(Integer appUserId); - -} diff --git a/modules/oa/service/AssetsService.java b/modules/oa/service/AssetsService.java deleted file mode 100644 index 415f826..0000000 --- a/modules/oa/service/AssetsService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.oa.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.oa.entity.Assets; -import com.gxwebsoft.oa.param.AssetsParam; - -import java.util.List; - -/** - * 服务器资产记录表Service - * - * @author 科技小王子 - * @since 2023-10-26 21:08:27 - */ -public interface AssetsService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(AssetsParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(AssetsParam param); - - /** - * 根据id查询 - * - * @param assetsId 资产ID - * @return Assets - */ - Assets getByIdRel(Integer assetsId); - -} diff --git a/modules/oa/service/AssetsUserService.java b/modules/oa/service/AssetsUserService.java deleted file mode 100644 index e158981..0000000 --- a/modules/oa/service/AssetsUserService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.oa.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.oa.entity.AssetsUser; -import com.gxwebsoft.oa.param.AssetsUserParam; - -import java.util.List; - -/** - * 服务器成员管理Service - * - * @author 科技小王子 - * @since 2023-10-26 21:08:27 - */ -public interface AssetsUserService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(AssetsUserParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(AssetsUserParam param); - - /** - * 根据id查询 - * - * @param id 自增ID - * @return AssetsUser - */ - AssetsUser getByIdRel(Integer id); - -} diff --git a/modules/oa/service/CompanyFieldService.java b/modules/oa/service/CompanyFieldService.java deleted file mode 100644 index d692935..0000000 --- a/modules/oa/service/CompanyFieldService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.oa.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.oa.entity.CompanyField; -import com.gxwebsoft.oa.param.CompanyFieldParam; - -import java.util.List; - -/** - * 企业参数Service - * - * @author 科技小王子 - * @since 2024-02-04 14:44:42 - */ -public interface CompanyFieldService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(CompanyFieldParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(CompanyFieldParam param); - - /** - * 根据id查询 - * - * @param id 自增ID - * @return CompanyField - */ - CompanyField getByIdRel(Integer id); - -} diff --git a/modules/oa/service/CompanyService.java b/modules/oa/service/CompanyService.java deleted file mode 100644 index 0f07c8c..0000000 --- a/modules/oa/service/CompanyService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.oa.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.oa.entity.Company; -import com.gxwebsoft.oa.param.CompanyParam; - -import java.util.List; - -/** - * 企业信息Service - * - * @author 科技小王子 - * @since 2023-10-23 19:18:58 - */ -public interface CompanyService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(CompanyParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(CompanyParam param); - - /** - * 根据id查询 - * - * @param companyId 企业id - * @return Company - */ - Company getByIdRel(Integer companyId); - -} diff --git a/modules/oa/service/CompanyUserService.java b/modules/oa/service/CompanyUserService.java deleted file mode 100644 index 1716630..0000000 --- a/modules/oa/service/CompanyUserService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.oa.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.oa.entity.CompanyUser; -import com.gxwebsoft.oa.param.CompanyUserParam; - -import java.util.List; - -/** - * 成员管理Service - * - * @author 科技小王子 - * @since 2024-02-04 14:44:42 - */ -public interface CompanyUserService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(CompanyUserParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(CompanyUserParam param); - - /** - * 根据id查询 - * - * @param companyUserId 自增ID - * @return CompanyUser - */ - CompanyUser getByIdRel(Integer companyUserId); - -} diff --git a/modules/oa/service/LinkService.java b/modules/oa/service/LinkService.java deleted file mode 100644 index fc3bb2f..0000000 --- a/modules/oa/service/LinkService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.oa.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.oa.entity.Link; -import com.gxwebsoft.oa.param.LinkParam; - -import java.util.List; - -/** - * 常用链接Service - * - * @author 科技小王子 - * @since 2024-01-14 11:50:39 - */ -public interface LinkService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(LinkParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(LinkParam param); - - /** - * 根据id查询 - * - * @param id 自增ID - * @return Link - */ - Link getByIdRel(Integer id); - -} diff --git a/modules/oa/service/ProductService.java b/modules/oa/service/ProductService.java deleted file mode 100644 index 71465f5..0000000 --- a/modules/oa/service/ProductService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.oa.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.oa.entity.Product; -import com.gxwebsoft.oa.param.ProductParam; - -import java.util.List; - -/** - * 产品记录表Service - * - * @author 科技小王子 - * @since 2023-12-14 14:18:01 - */ -public interface ProductService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(ProductParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(ProductParam param); - - /** - * 根据id查询 - * - * @param productId 产品ID - * @return Product - */ - Product getByIdRel(Integer productId); - -} diff --git a/modules/oa/service/ProductTabsService.java b/modules/oa/service/ProductTabsService.java deleted file mode 100644 index c7450ac..0000000 --- a/modules/oa/service/ProductTabsService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.oa.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.oa.entity.ProductTabs; -import com.gxwebsoft.oa.param.ProductTabsParam; - -import java.util.List; - -/** - * 产品标签记录表Service - * - * @author 科技小王子 - * @since 2023-12-14 15:55:52 - */ -public interface ProductTabsService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(ProductTabsParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(ProductTabsParam param); - - /** - * 根据id查询 - * - * @param tabId 产品标签ID - * @return ProductTabs - */ - ProductTabs getByIdRel(Integer tabId); - -} diff --git a/modules/oa/service/TaskCountService.java b/modules/oa/service/TaskCountService.java deleted file mode 100644 index 2972cc9..0000000 --- a/modules/oa/service/TaskCountService.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.gxwebsoft.oa.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.oa.entity.Task; -import com.gxwebsoft.oa.entity.TaskCount; -import com.gxwebsoft.oa.param.TaskCountParam; - -import java.util.List; - -/** - * 数据统计Service - * - * @author 科技小王子 - * @since 2023-10-30 14:25:30 - */ -public interface TaskCountService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(TaskCountParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(TaskCountParam param); - - /** - * 根据id查询 - * - * @param taskCountId 自增ID - * @return TaskCount - */ - TaskCount getByIdRel(Integer taskCountId); - - TaskCount getByUserId(Integer userId); -} diff --git a/modules/oa/service/TaskRecordService.java b/modules/oa/service/TaskRecordService.java deleted file mode 100644 index bac35dd..0000000 --- a/modules/oa/service/TaskRecordService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.oa.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.oa.entity.TaskRecord; -import com.gxwebsoft.oa.param.TaskRecordParam; - -import java.util.List; - -/** - * 工单回复记录表Service - * - * @author 科技小王子 - * @since 2023-10-23 18:53:01 - */ -public interface TaskRecordService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(TaskRecordParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(TaskRecordParam param); - - /** - * 根据id查询 - * - * @param taskRecordId 回复ID - * @return TaskRecord - */ - TaskRecord getByIdRel(Integer taskRecordId); - -} diff --git a/modules/oa/service/TaskService.java b/modules/oa/service/TaskService.java deleted file mode 100644 index f0f9777..0000000 --- a/modules/oa/service/TaskService.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.gxwebsoft.oa.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.system.entity.User; -import com.gxwebsoft.oa.entity.Task; -import com.gxwebsoft.oa.param.TaskParam; - -import java.util.ArrayList; -import java.util.List; - -/** - * 任务记录表Service - * - * @author 科技小王子 - * @since 2023-10-23 18:53:01 - */ -public interface TaskService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(TaskParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(TaskParam param); - - /** - * 根据id查询 - * - * @param taskId 工单ID - * @return Task - */ - Task getByIdRel(Integer taskId); - - ArrayList getCountNum(User loginUser, TaskParam param); - - boolean saveByRel(Task task); - - void updateCount(Task task); - - PageResult pageRelAll(TaskParam taskParam); - - void updateByIdAll(Task task); -} diff --git a/modules/oa/service/TaskUserService.java b/modules/oa/service/TaskUserService.java deleted file mode 100644 index 67343ed..0000000 --- a/modules/oa/service/TaskUserService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.oa.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.oa.entity.TaskUser; -import com.gxwebsoft.oa.param.TaskUserParam; - -import java.util.List; - -/** - * 工单成员Service - * - * @author 科技小王子 - * @since 2023-10-23 18:53:01 - */ -public interface TaskUserService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(TaskUserParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(TaskUserParam param); - - /** - * 根据id查询 - * - * @param taskUserId 自增ID - * @return TaskUser - */ - TaskUser getByIdRel(Integer taskUserId); - -} diff --git a/modules/oa/service/impl/AppFieldServiceImpl.java b/modules/oa/service/impl/AppFieldServiceImpl.java deleted file mode 100644 index 048633f..0000000 --- a/modules/oa/service/impl/AppFieldServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.gxwebsoft.oa.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.oa.mapper.AppFieldMapper; -import com.gxwebsoft.oa.service.AppFieldService; -import com.gxwebsoft.oa.entity.AppField; -import com.gxwebsoft.oa.param.AppFieldParam; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 应用参数Service实现 - * - * @author 科技小王子 - * @since 2024-01-14 11:42:53 - */ -@Service -public class AppFieldServiceImpl extends ServiceImpl implements AppFieldService { - - @Override - public PageResult pageRel(AppFieldParam param) { - PageParam page = new PageParam<>(param); - //page.setDefaultOrder("create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(AppFieldParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - //page.setDefaultOrder("create_time desc"); - return page.sortRecords(list); - } - - @Override - public AppField getByIdRel(Integer id) { - AppFieldParam param = new AppFieldParam(); - param.setId(id); - return param.getOne(baseMapper.selectListRel(param)); - } - -} diff --git a/modules/oa/service/impl/AppRenewServiceImpl.java b/modules/oa/service/impl/AppRenewServiceImpl.java deleted file mode 100644 index f838475..0000000 --- a/modules/oa/service/impl/AppRenewServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.gxwebsoft.oa.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.oa.entity.AppRenew; -import com.gxwebsoft.oa.mapper.AppRenewMapper; -import com.gxwebsoft.oa.param.AppRenewParam; -import com.gxwebsoft.oa.service.AppRenewService; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 续费管理Service实现 - * - * @author 科技小王子 - * @since 2023-11-14 14:27:57 - */ -@Service -public class AppRenewServiceImpl extends ServiceImpl implements AppRenewService { - - @Override - public PageResult pageRel(AppRenewParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(AppRenewParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - //page.setDefaultOrder("create_time desc"); - return page.sortRecords(list); - } - - @Override - public AppRenew getByIdRel(Integer appRenewId) { - AppRenewParam param = new AppRenewParam(); - param.setAppRenewId(appRenewId); - return param.getOne(baseMapper.selectListRel(param)); - } - -} diff --git a/modules/oa/service/impl/AppServiceImpl.java b/modules/oa/service/impl/AppServiceImpl.java deleted file mode 100644 index a82c000..0000000 --- a/modules/oa/service/impl/AppServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.gxwebsoft.oa.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.oa.mapper.AppMapper; -import com.gxwebsoft.oa.service.AppService; -import com.gxwebsoft.oa.entity.App; -import com.gxwebsoft.oa.param.AppParam; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 应用管理记录表Service实现 - * - * @author 科技小王子 - * @since 2023-10-26 22:06:23 - */ -@Service -public class AppServiceImpl extends ServiceImpl implements AppService { - - @Override - public PageResult pageRel(AppParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("sort_number asc, create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(AppParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - page.setDefaultOrder("sort_number asc, create_time desc"); - return page.sortRecords(list); - } - - @Override - public App getByIdRel(Integer appId) { - AppParam param = new AppParam(); - param.setAppId(appId); - return param.getOne(baseMapper.selectListRel(param)); - } - -} diff --git a/modules/oa/service/impl/AppUrlServiceImpl.java b/modules/oa/service/impl/AppUrlServiceImpl.java deleted file mode 100644 index ae75b22..0000000 --- a/modules/oa/service/impl/AppUrlServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.gxwebsoft.oa.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.oa.mapper.AppUrlMapper; -import com.gxwebsoft.oa.service.AppUrlService; -import com.gxwebsoft.oa.entity.AppUrl; -import com.gxwebsoft.oa.param.AppUrlParam; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 项目域名Service实现 - * - * @author 科技小王子 - * @since 2024-04-15 13:01:34 - */ -@Service -public class AppUrlServiceImpl extends ServiceImpl implements AppUrlService { - - @Override - public PageResult pageRel(AppUrlParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("sort_number asc, create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(AppUrlParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - page.setDefaultOrder("sort_number asc, create_time desc"); - return page.sortRecords(list); - } - - @Override - public AppUrl getByIdRel(Integer appUrlId) { - AppUrlParam param = new AppUrlParam(); - param.setAppUrlId(appUrlId); - return param.getOne(baseMapper.selectListRel(param)); - } - -} diff --git a/modules/oa/service/impl/AppUserServiceImpl.java b/modules/oa/service/impl/AppUserServiceImpl.java deleted file mode 100644 index 55b81c0..0000000 --- a/modules/oa/service/impl/AppUserServiceImpl.java +++ /dev/null @@ -1,93 +0,0 @@ -package com.gxwebsoft.oa.service.impl; - -import cn.hutool.core.net.url.UrlBuilder; -import cn.hutool.core.net.url.UrlQuery; -import cn.hutool.http.HttpRequest; -import com.alibaba.fastjson.JSONObject; -import com.alibaba.fastjson.TypeReference; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.system.entity.User; -import com.gxwebsoft.oa.entity.AppUser; -import com.gxwebsoft.oa.mapper.AppUserMapper; -import com.gxwebsoft.oa.param.AppUserParam; -import com.gxwebsoft.oa.service.AppUserService; -import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; - -/** - * 应用成员Service实现 - * - * @author 科技小王子 - * @since 2023-10-26 22:06:23 - */ -@Service -public class AppUserServiceImpl extends ServiceImpl implements AppUserService { - - @Override - public PageResult pageRel(AppUserParam param) { - PageParam page = new PageParam<>(param); -// page.setDefaultOrder("create_time desc"); - List list = baseMapper.selectPageRel(page, param); - PageResult result = new PageResult<>(list, page.getTotal()); - final List appUserList = result.getList(); - final Set userIds = appUserList.stream().map(AppUser::getUserId).collect(Collectors.toSet()); - // 请求主服务器获取用户信息 - HashMap map = new HashMap<>(); - map.put("userIds", userIds); - // 链式构建GET请求 - final String build = UrlBuilder.of("https://server.gxwebsoft.com/api/system/user/page").setQuery(new UrlQuery(map)).build(); - String response = HttpRequest.get(build) - .header("Authorization", param.getToken()) - .header("Tenantid", param.getTenantId().toString()) - .body(JSONObject.toJSONString(map))//表单内容 - .timeout(20000)//超时，毫秒 - .execute().body(); - - final ApiResult> userResult = JSONObject.parseObject(response, new TypeReference>>() { - }); - final PageResult data = userResult.getData(); - System.out.println("data = " + data); - final List userList = data.getList(); - if (!CollectionUtils.isEmpty(userList)) { - final Map> collect = userList.stream().collect(Collectors.groupingBy(User::getUserId)); - appUserList.forEach(item -> { - final List users = collect.get(item.getUserId()); - if (!CollectionUtils.isEmpty(users)) { - final User user = users.get(0); - item.setNickname(user.getNickname()); - item.setAvatar(user.getAvatar()); - item.setPhone(user.getPhone()); - item.setEmail(user.getEmail()); - } - }); - result.setList(appUserList); - } - return result; - } - - @Override - public List listRel(AppUserParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - //page.setDefaultOrder("create_time desc"); - return page.sortRecords(list); - } - - @Override - public AppUser getByIdRel(Integer appUserId) { - AppUserParam param = new AppUserParam(); - param.setAppUserId(appUserId); - return param.getOne(baseMapper.selectListRel(param)); - } - -} diff --git a/modules/oa/service/impl/AssetsServiceImpl.java b/modules/oa/service/impl/AssetsServiceImpl.java deleted file mode 100644 index 293a327..0000000 --- a/modules/oa/service/impl/AssetsServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.gxwebsoft.oa.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.oa.mapper.AssetsMapper; -import com.gxwebsoft.oa.service.AssetsService; -import com.gxwebsoft.oa.entity.Assets; -import com.gxwebsoft.oa.param.AssetsParam; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 服务器资产记录表Service实现 - * - * @author 科技小王子 - * @since 2023-10-26 21:08:27 - */ -@Service -public class AssetsServiceImpl extends ServiceImpl implements AssetsService { - - @Override - public PageResult pageRel(AssetsParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(AssetsParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - page.setDefaultOrder("create_time desc"); - return page.sortRecords(list); - } - - @Override - public Assets getByIdRel(Integer assetsId) { - AssetsParam param = new AssetsParam(); - param.setAssetsId(assetsId); - return param.getOne(baseMapper.selectListRel(param)); - } - -} diff --git a/modules/oa/service/impl/AssetsUserServiceImpl.java b/modules/oa/service/impl/AssetsUserServiceImpl.java deleted file mode 100644 index c0498bb..0000000 --- a/modules/oa/service/impl/AssetsUserServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.gxwebsoft.oa.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.oa.mapper.AssetsUserMapper; -import com.gxwebsoft.oa.service.AssetsUserService; -import com.gxwebsoft.oa.entity.AssetsUser; -import com.gxwebsoft.oa.param.AssetsUserParam; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 服务器成员管理Service实现 - * - * @author 科技小王子 - * @since 2023-10-26 21:08:27 - */ -@Service -public class AssetsUserServiceImpl extends ServiceImpl implements AssetsUserService { - - @Override - public PageResult pageRel(AssetsUserParam param) { - PageParam page = new PageParam<>(param); - //page.setDefaultOrder("create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(AssetsUserParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - //page.setDefaultOrder("create_time desc"); - return page.sortRecords(list); - } - - @Override - public AssetsUser getByIdRel(Integer id) { - AssetsUserParam param = new AssetsUserParam(); - param.setId(id); - return param.getOne(baseMapper.selectListRel(param)); - } - -} diff --git a/modules/oa/service/impl/CompanyFieldServiceImpl.java b/modules/oa/service/impl/CompanyFieldServiceImpl.java deleted file mode 100644 index 7f24a00..0000000 --- a/modules/oa/service/impl/CompanyFieldServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.gxwebsoft.oa.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.oa.mapper.CompanyFieldMapper; -import com.gxwebsoft.oa.service.CompanyFieldService; -import com.gxwebsoft.oa.entity.CompanyField; -import com.gxwebsoft.oa.param.CompanyFieldParam; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 企业参数Service实现 - * - * @author 科技小王子 - * @since 2024-02-04 14:44:42 - */ -@Service -public class CompanyFieldServiceImpl extends ServiceImpl implements CompanyFieldService { - - @Override - public PageResult pageRel(CompanyFieldParam param) { - PageParam page = new PageParam<>(param); - //page.setDefaultOrder("create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(CompanyFieldParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - //page.setDefaultOrder("create_time desc"); - return page.sortRecords(list); - } - - @Override - public CompanyField getByIdRel(Integer id) { - CompanyFieldParam param = new CompanyFieldParam(); - param.setId(id); - return param.getOne(baseMapper.selectListRel(param)); - } - -} diff --git a/modules/oa/service/impl/CompanyServiceImpl.java b/modules/oa/service/impl/CompanyServiceImpl.java deleted file mode 100644 index a268fc9..0000000 --- a/modules/oa/service/impl/CompanyServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.gxwebsoft.oa.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.oa.mapper.CompanyMapper; -import com.gxwebsoft.oa.service.CompanyService; -import com.gxwebsoft.oa.entity.Company; -import com.gxwebsoft.oa.param.CompanyParam; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 企业信息Service实现 - * - * @author 科技小王子 - * @since 2023-10-23 19:18:58 - */ -@Service -public class CompanyServiceImpl extends ServiceImpl implements CompanyService { - - @Override - public PageResult pageRel(CompanyParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("sort_number asc, create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(CompanyParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - page.setDefaultOrder("sort_number asc, create_time desc"); - return page.sortRecords(list); - } - - @Override - public Company getByIdRel(Integer companyId) { - CompanyParam param = new CompanyParam(); - param.setCompanyId(companyId); - return param.getOne(baseMapper.selectListRel(param)); - } - -} diff --git a/modules/oa/service/impl/CompanyUserServiceImpl.java b/modules/oa/service/impl/CompanyUserServiceImpl.java deleted file mode 100644 index b7c7211..0000000 --- a/modules/oa/service/impl/CompanyUserServiceImpl.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.gxwebsoft.oa.service.impl; - -import cn.hutool.core.net.url.UrlBuilder; -import cn.hutool.core.net.url.UrlQuery; -import cn.hutool.http.HttpRequest; -import com.alibaba.fastjson.JSONObject; -import com.alibaba.fastjson.TypeReference; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.system.entity.User; -import com.gxwebsoft.oa.entity.CompanyUser; -import com.gxwebsoft.oa.mapper.CompanyUserMapper; -import com.gxwebsoft.oa.param.CompanyUserParam; -import com.gxwebsoft.oa.service.CompanyUserService; -import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; - -/** - * 成员管理Service实现 - * - * @author 科技小王子 - * @since 2024-02-04 14:44:42 - */ -@Service -public class CompanyUserServiceImpl extends ServiceImpl implements CompanyUserService { - - @Override - public PageResult pageRel(CompanyUserParam param) { - PageParam page = new PageParam<>(param); - //page.setDefaultOrder("create_time desc"); - List list = baseMapper.selectPageRel(page, param); - PageResult result = new PageResult<>(list, page.getTotal()); - final List companyUserList = result.getList(); - final Set userIds = companyUserList.stream().map(CompanyUser::getUserId).collect(Collectors.toSet()); - // 请求主服务器获取用户信息 - HashMap map = new HashMap<>(); - map.put("userIds", userIds); - System.out.println("map = " + map); - // 链式构建GET请求 - final String build = UrlBuilder.of("https://server.gxwebsoft.com/api/system/user/page").setQuery(new UrlQuery(map)).build(); - String response = HttpRequest.get(build) - .header("Authorization", param.getToken()) - .header("Tenantid", param.getTenantId().toString()) - .body(JSONObject.toJSONString(map))//表单内容 - .timeout(20000)//超时，毫秒 - .execute().body(); - - System.out.println("response = " + response); - - final ApiResult> userResult = JSONObject.parseObject(response, new TypeReference>>() { - }); - final PageResult data = userResult.getData(); - final List userList = data.getList(); - if (!CollectionUtils.isEmpty(userList)) { - final Map> collect = userList.stream().collect(Collectors.groupingBy(User::getUserId)); - companyUserList.forEach(item -> { - final List users = collect.get(item.getUserId()); - if (!CollectionUtils.isEmpty(users)) { - final User user = users.get(0); - item.setNickname(user.getNickname()); - item.setAvatar(user.getAvatar()); - item.setPhone(user.getPhone()); - item.setEmail(user.getEmail()); - } - }); - result.setList(companyUserList); - } - - return result; - } - - @Override - public List listRel(CompanyUserParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - //page.setDefaultOrder("create_time desc"); - return page.sortRecords(list); - } - - @Override - public CompanyUser getByIdRel(Integer companyUserId) { - CompanyUserParam param = new CompanyUserParam(); - param.setCompanyUserId(companyUserId); - return param.getOne(baseMapper.selectListRel(param)); - } - -} diff --git a/modules/oa/service/impl/LinkServiceImpl.java b/modules/oa/service/impl/LinkServiceImpl.java deleted file mode 100644 index cbb089a..0000000 --- a/modules/oa/service/impl/LinkServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.gxwebsoft.oa.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.oa.mapper.LinkMapper; -import com.gxwebsoft.oa.service.LinkService; -import com.gxwebsoft.oa.entity.Link; -import com.gxwebsoft.oa.param.LinkParam; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 常用链接Service实现 - * - * @author 科技小王子 - * @since 2024-01-14 11:50:39 - */ -@Service -public class LinkServiceImpl extends ServiceImpl implements LinkService { - - @Override - public PageResult pageRel(LinkParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("sort_number asc,create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(LinkParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - page.setDefaultOrder("sort_number asc,create_time desc"); - return page.sortRecords(list); - } - - @Override - public Link getByIdRel(Integer id) { - LinkParam param = new LinkParam(); - param.setId(id); - return param.getOne(baseMapper.selectListRel(param)); - } - -} diff --git a/modules/oa/service/impl/ProductServiceImpl.java b/modules/oa/service/impl/ProductServiceImpl.java deleted file mode 100644 index 0b6cbef..0000000 --- a/modules/oa/service/impl/ProductServiceImpl.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.gxwebsoft.oa.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.oa.entity.Product; -import com.gxwebsoft.oa.mapper.ProductMapper; -import com.gxwebsoft.oa.param.ProductParam; -import com.gxwebsoft.oa.service.CompanyService; -import com.gxwebsoft.oa.service.ProductService; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 产品记录表Service实现 - * - * @author 科技小王子 - * @since 2023-12-14 14:18:01 - */ -@Service -public class ProductServiceImpl extends ServiceImpl implements ProductService { - @Resource - private CompanyService companyService; - - @Override - public PageResult pageRel(ProductParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("sort_number asc, create_time desc"); - List list = baseMapper.selectPageRel(page, param); - list.forEach(d -> { - d.setCompany(companyService.getById(d.getCompanyId())); - }); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(ProductParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - page.setDefaultOrder("sort_number asc, create_time desc"); - return page.sortRecords(list); - } - - @Override - public Product getByIdRel(Integer productId) { - ProductParam param = new ProductParam(); - param.setProductId(productId); - Product product = param.getOne(baseMapper.selectListRel(param)); - if(product != null){ - product.setCompany(companyService.getById(product.getCompanyId())); - } - return product; - } - -} diff --git a/modules/oa/service/impl/ProductTabsServiceImpl.java b/modules/oa/service/impl/ProductTabsServiceImpl.java deleted file mode 100644 index a67714d..0000000 --- a/modules/oa/service/impl/ProductTabsServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.gxwebsoft.oa.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.oa.mapper.ProductTabsMapper; -import com.gxwebsoft.oa.service.ProductTabsService; -import com.gxwebsoft.oa.entity.ProductTabs; -import com.gxwebsoft.oa.param.ProductTabsParam; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 产品标签记录表Service实现 - * - * @author 科技小王子 - * @since 2023-12-14 15:55:52 - */ -@Service -public class ProductTabsServiceImpl extends ServiceImpl implements ProductTabsService { - - @Override - public PageResult pageRel(ProductTabsParam param) { - PageParam page = new PageParam<>(param); - //page.setDefaultOrder("create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(ProductTabsParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - //page.setDefaultOrder("create_time desc"); - return page.sortRecords(list); - } - - @Override - public ProductTabs getByIdRel(Integer tabId) { - ProductTabsParam param = new ProductTabsParam(); - param.setTabId(tabId); - return param.getOne(baseMapper.selectListRel(param)); - } - -} diff --git a/modules/oa/service/impl/TaskCountServiceImpl.java b/modules/oa/service/impl/TaskCountServiceImpl.java deleted file mode 100644 index 4a855f0..0000000 --- a/modules/oa/service/impl/TaskCountServiceImpl.java +++ /dev/null @@ -1,145 +0,0 @@ -package com.gxwebsoft.oa.service.impl; - -import cn.hutool.core.net.url.UrlBuilder; -import cn.hutool.core.net.url.UrlQuery; -import cn.hutool.http.HttpRequest; -import com.alibaba.fastjson.JSONObject; -import com.alibaba.fastjson.TypeReference; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.system.entity.User; -import com.gxwebsoft.common.system.service.UserRoleService; -import com.gxwebsoft.oa.entity.TaskCount; -import com.gxwebsoft.oa.mapper.TaskCountMapper; -import com.gxwebsoft.oa.param.TaskCountParam; -import com.gxwebsoft.oa.service.TaskCountService; -import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; - -import javax.annotation.Resource; -import java.util.*; -import java.util.stream.Collectors; - -/** - * 数据统计Service实现 - * - * @author 科技小王子 - * @since 2023-10-30 14:25:30 - */ -@Service -public class TaskCountServiceImpl extends ServiceImpl implements TaskCountService { - @Resource - private UserRoleService userRoleService; - - @Override - public PageResult pageRel(TaskCountParam param) { - - PageParam page = new PageParam<>(param); - page.setDefaultOrder("month desc"); - List list = baseMapper.selectPageRel(page, param); - final PageResult result = new PageResult<>(list, page.getTotal()); - // 请求主服务器获取用户信息 - final List taskCountList = result.getList(); - System.out.println("taskCountList = " + taskCountList); - final Set userIds = taskCountList.stream().map(TaskCount::getUserId).collect(Collectors.toSet()); - HashMap map = new HashMap<>(); -// map.put("roleCode","commander"); - map.put("userIds", userIds); - if (!userIds.isEmpty()) { - // 链式构建GET请求 - final String build = UrlBuilder.of("https://server.gxwebsoft.com/api/system/user/page").setQuery(new UrlQuery(map)).build(); - String response = HttpRequest.get(build) - .header("Authorization", param.getToken()) - .header("Tenantid", param.getTenantId().toString()) - .body(JSONObject.toJSONString(map))//表单内容 - .timeout(20000)//超时，毫秒 - .execute().body(); - - final ApiResult> userResult = JSONObject.parseObject(response, new TypeReference>>() { - }); - final Map> collect = userResult.getData().getList().stream().collect(Collectors.groupingBy(User::getUserId)); - - if (!CollectionUtils.isEmpty(collect)) { - taskCountList.forEach(item -> { - final List users = collect.get(item.getUserId()); - if(!CollectionUtils.isEmpty(users)) { - final User user = users.get(0); - item.setNickname(user.getNickname()); - item.setAvatar(user.getAvatar()); - item.setPhone(user.getPhone()); - } - }); - } - result.setList(taskCountList); - } - return result; - } - - // 远程同步用户数据 - private void updateServerUser(TaskCountParam param){ - // 请求主服务器获取用户信息 - HashMap map = new HashMap<>(); - map.put("isStaff", "1"); - System.out.println("map = " + map); - // 链式构建GET请求 - final String build = UrlBuilder.of("https://server.gxwebsoft.com/api/system/user/page").setQuery(new UrlQuery(map)).build(); - String response = HttpRequest.get(build) - .header("Authorization", param.getToken()) - .header("Tenantid", param.getTenantId().toString()) - .body(JSONObject.toJSONString(map))//表单内容 - .timeout(20000)//超时，毫秒 - .execute().body(); - - final ApiResult> userResult = JSONObject.parseObject(response, new TypeReference>>() { - }); - final Map> collect = userResult.getData().getList().stream().collect(Collectors.groupingBy(User::getUserId)); - - final List userList = userResult.getData().getList(); - TaskCount taskCount = new TaskCount(); - userList.forEach(user -> { - if (count(new LambdaQueryWrapper().eq(TaskCount::getUserId, user.getUserId())) == 0) { - taskCount.setUserId(user.getUserId()); - taskCount.setOrganizationId(user.getOrganizationId()); - taskCount.setTenantId(user.getTenantId()); - user.getRoles().forEach(role -> { - if(role.getRoleCode().equals("staff") || role.getRoleCode().equals("commander")){ - taskCount.setRoleCode("commander"); - taskCount.setRoleId(role.getRoleId()); - } - if(role.getRoleCode().equals("admin")){ - taskCount.setRoleId(role.getRoleId()); - taskCount.setRoleCode(role.getRoleCode()); - } - }); - save(taskCount); - } - }); - } - - @Override - public List listRel(TaskCountParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - //page.setDefaultOrder("create_time desc"); - return page.sortRecords(list); - } - - @Override - public TaskCount getByIdRel(Integer taskCountId) { - TaskCountParam param = new TaskCountParam(); - param.setTaskCountId(taskCountId); - return param.getOne(baseMapper.selectListRel(param)); - } - - @Override - public TaskCount getByUserId(Integer userId) { - TaskCountParam param = new TaskCountParam(); - param.setUserId(userId); - return param.getOne(baseMapper.selectListRel(param)); - } - -} diff --git a/modules/oa/service/impl/TaskRecordServiceImpl.java b/modules/oa/service/impl/TaskRecordServiceImpl.java deleted file mode 100644 index ab331f8..0000000 --- a/modules/oa/service/impl/TaskRecordServiceImpl.java +++ /dev/null @@ -1,90 +0,0 @@ -package com.gxwebsoft.oa.service.impl; - -import cn.hutool.core.net.url.UrlBuilder; -import cn.hutool.core.net.url.UrlQuery; -import cn.hutool.http.HttpRequest; -import com.alibaba.fastjson.JSONObject; -import com.alibaba.fastjson.TypeReference; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.system.entity.User; -import com.gxwebsoft.oa.mapper.TaskRecordMapper; -import com.gxwebsoft.oa.service.TaskRecordService; -import com.gxwebsoft.oa.entity.TaskRecord; -import com.gxwebsoft.oa.param.TaskRecordParam; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; - -/** - * 工单回复记录表Service实现 - * - * @author 科技小王子 - * @since 2023-10-23 18:53:01 - */ -@Service -public class TaskRecordServiceImpl extends ServiceImpl implements TaskRecordService { - - @Override - public PageResult pageRel(TaskRecordParam param) { - PageParam page = new PageParam<>(param); - //page.setDefaultOrder("create_time desc"); - List list = baseMapper.selectPageRel(page, param); - final PageResult result = new PageResult<>(list, page.getTotal()); - - // 请求主服务器获取用户信息 - final List taskRecordList = result.getList(); - final Set userIds = taskRecordList.stream().map(TaskRecord::getUserId).collect(Collectors.toSet()); - HashMap map = new HashMap<>(); - map.put("userIds", userIds); - - // 链式构建GET请求 - final String build = UrlBuilder.of("https://server.gxwebsoft.com/api/system/user/page").setQuery(new UrlQuery(map)).build(); - String response = HttpRequest.get(build) - .header("Authorization", param.getToken()) - .header("Tenantid", param.getTenantId().toString()) - .body(JSONObject.toJSONString(map))//表单内容 - .timeout(20000)//超时，毫秒 - .execute().body(); - - final ApiResult> userResult = JSONObject.parseObject(response, new TypeReference>>() { - }); - final Map> collect = userResult.getData().getList().stream().collect(Collectors.groupingBy(User::getUserId)); - taskRecordList.forEach(item -> { - final List users = collect.get(item.getUserId()); - if(!CollectionUtils.isEmpty(users)) { - final User user = users.get(0); - item.setNickname(user.getNickname()); - item.setAvatar(user.getAvatar()); - item.setCity(user.getCity()); - item.setUser(user); - } - }); - result.setList(taskRecordList); - return result; - } - - @Override - public List listRel(TaskRecordParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - //page.setDefaultOrder("create_time desc"); - return page.sortRecords(list); - } - - @Override - public TaskRecord getByIdRel(Integer taskRecordId) { - TaskRecordParam param = new TaskRecordParam(); - param.setTaskRecordId(taskRecordId); - return param.getOne(baseMapper.selectListRel(param)); - } - -} diff --git a/modules/oa/service/impl/TaskServiceImpl.java b/modules/oa/service/impl/TaskServiceImpl.java deleted file mode 100644 index e717922..0000000 --- a/modules/oa/service/impl/TaskServiceImpl.java +++ /dev/null @@ -1,252 +0,0 @@ -package com.gxwebsoft.oa.service.impl; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.date.DateField; -import cn.hutool.core.date.DateRange; -import cn.hutool.core.date.DateTime; -import cn.hutool.core.date.DateUtil; -import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.system.entity.User; -import com.gxwebsoft.oa.entity.Task; -import com.gxwebsoft.oa.entity.TaskCount; -import com.gxwebsoft.oa.entity.TaskRecord; -import com.gxwebsoft.oa.mapper.TaskMapper; -import com.gxwebsoft.oa.param.TaskParam; -import com.gxwebsoft.oa.service.TaskCountService; -import com.gxwebsoft.oa.service.TaskRecordService; -import com.gxwebsoft.oa.service.TaskService; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.concurrent.atomic.AtomicInteger; - -import static com.gxwebsoft.common.core.constants.TaskConstants.*; - -/** - * 任务记录表Service实现 - * - * @author 科技小王子 - * @since 2023-10-23 18:53:01 - */ -@Service -public class TaskServiceImpl extends ServiceImpl implements TaskService { - @Resource - private TaskRecordService taskRecordService; - @Resource - private TaskCountService taskCountService; - - @Override - public PageResult pageRel(TaskParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(TaskParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - //page.setDefaultOrder("create_time desc"); - return page.sortRecords(list); - } - - @Override - public Task getByIdRel(Integer taskId) { - TaskParam param = new TaskParam(); - param.setTaskId(taskId); - return param.getOne(baseMapper.selectListRel(param)); - } - - @Override - public ArrayList getCountNum(User loginUser, TaskParam param) { - Integer type = loginUser.getType(); - final Integer userId = param.getUserId(); -// if (param.getUserId() != null) { -// this.userId = param.getUserId(); -// }else { -// this.userId = loginUser.getUserId(); -// } - - AtomicInteger count1 = new AtomicInteger(count(new LambdaQueryWrapper().eq(Task::getStatus, 0))); - AtomicInteger count2 = new AtomicInteger(count(new LambdaQueryWrapper().eq(Task::getStatus, 1))); - // 非管理员仅可浏览和自己相关的工单 - loginUser.getRoles().forEach(d -> { - - if (type.equals(6)) { - count1.set(count(new LambdaQueryWrapper().eq(Task::getStatus, 0).eq(Task::getCommander, userId))); - count2.set(count(new LambdaQueryWrapper().eq(Task::getStatus, 1).eq(Task::getCommander, userId))); - } - if (type.equals(10)) { - count1.set(count(new LambdaQueryWrapper().eq(Task::getStatus, 0).eq(Task::getPromoter, userId))); - count2.set(count(new LambdaQueryWrapper().eq(Task::getStatus, 1).eq(Task::getPromoter, userId))); - } - }); - JSONObject json1 = new JSONObject(); - json1.put("tab", "待处理"); - json1.put("key", "0"); - json1.put("count", count1); - JSONObject json2 = new JSONObject(); - json2.put("tab", "已完成"); - json2.put("key", "1"); - json2.put("count", count2); - ArrayList objects = new ArrayList<>(); - objects.add(json1); - objects.add(json2); - return objects; - } - - /** - * 提交工单记录 - */ - @Override - public boolean saveByRel(Task task) { - // 保存工单 - save(task); - // 添加第一条记录 - TaskRecord taskRecord = BeanUtil.copyProperties(task, TaskRecord.class); - taskRecord.setCreateTime(new Date()); - taskRecord.setUpdateTime(new Date()); - taskRecordService.save(taskRecord); - // 添加统计记录表 - if (taskCountService.count(new LambdaQueryWrapper().eq(TaskCount::getUserId, task.getUserId())) == 0) { - final TaskCount taskCount = new TaskCount(); - taskCount.setUserId(task.getUserId()); - taskCount.setRoleId(task.getRoleId()); - taskCount.setRoleCode(task.getRoleCode()); - taskCount.setOrganizationId(task.getOrganizationId()); - taskCountService.save(taskCount); - } - // 更新统计表 - TaskCount taskCount = taskCountService.getByUserId(task.getUserId()); - taskCount.setPending(taskCount.getPending() + 1); - taskCountService.updateById(taskCount); - return true; - } - - @Override - public void updateCount(Task param) { - final Task task = getById(param.getTaskId()); - // 当前时间 2023-11-04 21:47:16 - final String now = DateUtil.now(); - // 今天日期 2023-11-04 - final String today = DateUtil.today(); - // 今天开始的时间 2023-11-04 00:00:00 - final DateTime dayStart = DateUtil.beginOfDay(DateUtil.date()); - // 今天结束的时间 2023-11-04 00:00:00 - final DateTime dayEnd = DateUtil.offsetDay(dayStart, 1); - // 当前月份的开始时间 2023-11-01 00:00:00 - final DateTime monthStart = DateUtil.beginOfMonth(DateUtil.date()); - // 当期月份的结束时间 2023-12-01 00:00:00 - final DateTime monthEnd = DateUtil.offsetMonth(monthStart, 1); - // 今年的开始时间 - final DateTime yearStart = DateUtil.beginOfYear(DateUtil.date()); - // 获取年的值 - final int year = DateUtil.year(yearStart); - // 是否闰年 - final boolean leapYear = DateUtil.isLeapYear(year); - // 获取今年的总天数 - int daysByYear = leapYear ? 366 : 365; - // 今年的结束时间 - final DateTime yearEnd = DateUtil.offsetDay(yearStart, daysByYear); - // 创建日期范围生成器 - DateRange range = DateUtil.range(monthStart, monthEnd, DateField.MONTH); - - // 查询待处理的工单总数量 - final int pendingTasks = count(new LambdaQueryWrapper().eq(Task::getStatus, TASK_STATUS_0)); - // 查询今日已处理的工单数量 - final int todayTasks = count(new LambdaQueryWrapper().between(Task::getUpdateTime, dayStart, dayEnd).eq(Task::getProgress,COMPLETED).eq(Task::getStatus,TASK_STATUS_1)); - // 查询本月已处理的工单数量 - final int monthTasks = count(new LambdaQueryWrapper().between(Task::getUpdateTime, monthStart, monthEnd).eq(Task::getProgress,COMPLETED).eq(Task::getStatus,TASK_STATUS_1)); - // 查询本年已处理的工单总数量 - final int yearTasks = count(new LambdaQueryWrapper().between(Task::getCreateTime, yearStart, yearEnd).eq(Task::getProgress,COMPLETED).eq(Task::getStatus, TASK_STATUS_1)); - // 查询公司总处理工单数量 - final int totalTasks = count(new LambdaQueryWrapper().eq(Task::getProgress,COMPLETED).eq(Task::getStatus, TASK_STATUS_1)); - - // 查询当前登录用户待处理的工单数量 - final int userPendingTasks = count(new LambdaQueryWrapper().eq(Task::getProgress,COMPLETED).eq(Task::getStatus, TASK_STATUS_1).eq(Task::getUserId,task.getUserId())); - // 查询当前登录用户今日已处理的工单数量 - final int userTodayTasks = count(new LambdaQueryWrapper().between(Task::getUpdateTime,dayStart,dayEnd).eq(Task::getProgress,COMPLETED).eq(Task::getStatus, TASK_STATUS_1).eq(Task::getUserId,task.getUserId())); - // 查询当前登录用户本月已处理的工单数量 - final int userMonthTasks = count(new LambdaQueryWrapper().between(Task::getUpdateTime,monthStart,monthEnd).eq(Task::getProgress,COMPLETED).eq(Task::getStatus, TASK_STATUS_1).eq(Task::getUserId,task.getUserId())); - // 查询当前登录用户本年已处理的工单数量 - final int userYearTasks = count(new LambdaQueryWrapper().between(Task::getCreateTime,yearStart,yearEnd).eq(Task::getProgress,COMPLETED).eq(Task::getStatus, TASK_STATUS_1).eq(Task::getUserId,task.getUserId())); - // 查询当前登录用户已处理的总工单数量 - final int userTotalTasks = count(new LambdaQueryWrapper().eq(Task::getProgress,COMPLETED).eq(Task::getStatus, TASK_STATUS_1).eq(Task::getUserId,task.getUserId())); - - // 查询受理人待处理的工单数量 - final int commanderPendingTasks = count(new LambdaQueryWrapper().eq(Task::getStatus, TASK_STATUS_0).eq(Task::getCommander,task.getCommander())); - // 查询受理人今日已处理的工单数量 - final int commanderTodayTasks = count(new LambdaQueryWrapper().between(Task::getUpdateTime,dayStart,dayEnd).eq(Task::getProgress,COMPLETED).eq(Task::getStatus, TASK_STATUS_1).eq(Task::getCommander,task.getCommander())); - // 查询受理人本月已处理的工单数量 - final int commanderMonthTasks = count(new LambdaQueryWrapper().between(Task::getUpdateTime,monthStart,monthEnd).eq(Task::getProgress,COMPLETED).eq(Task::getStatus, TASK_STATUS_1).eq(Task::getCommander,task.getCommander())); - // 查询受理人本年已处理的工单数量 - final int commanderYearTasks = count(new LambdaQueryWrapper().between(Task::getCreateTime,yearStart,yearEnd).eq(Task::getProgress,COMPLETED).eq(Task::getStatus, TASK_STATUS_1).eq(Task::getCommander,task.getCommander())); - // 查询受理人已处理的总工单数量 - final int commanderTotalTasks = count(new LambdaQueryWrapper().eq(Task::getProgress,COMPLETED).eq(Task::getStatus, TASK_STATUS_1).eq(Task::getCommander,task.getCommander())); - - // 统计工单发起人 - if (taskCountService.count(new LambdaQueryWrapper().eq(TaskCount::getUserId,task.getUserId())) == 0) { - final TaskCount taskCount = new TaskCount(); - taskCount.setUserId(task.getUserId()); - taskCountService.save(taskCount); - } - TaskCount user = taskCountService.getByUserId(task.getUserId()); - System.out.println("user = " + user); - user.setPending(userPendingTasks); - user.setToday(userTodayTasks); - user.setMonth(userMonthTasks); - user.setYear(userYearTasks); - user.setTotal(userTotalTasks); - taskCountService.updateById(user); - if(!user.getUserId().equals(task.getCommander())){ - // 统计工单受理人 - TaskCount commander = taskCountService.getByUserId(task.getCommander()); - if(commander != null){ - commander.setPending(commanderPendingTasks); - commander.setToday(commanderTodayTasks); - commander.setMonth(commanderMonthTasks); - commander.setYear(commanderYearTasks); - commander.setTotal(commanderTotalTasks); - taskCountService.updateById(commander); - } - } - // 统计公司数据 - if (taskCountService.count(new LambdaQueryWrapper().eq(TaskCount::getUserId,0).eq(TaskCount::getRoleCode, "superAdmin")) == 0) { - final TaskCount taskCount = new TaskCount(); - taskCount.setRoleCode("superAdmin"); - taskCountService.save(taskCount); - } - final TaskCount superAdmin = taskCountService.getByUserId(param.getLoginUserId()); - if (superAdmin.getRoleCode().equals("superAdmin") || superAdmin.getRoleCode().equals("admin")) { - superAdmin.setPending(pendingTasks); - superAdmin.setToday(todayTasks); - superAdmin.setMonth(monthTasks); - superAdmin.setYear(yearTasks); - superAdmin.setTotal(totalTasks); - taskCountService.updateById(superAdmin); - } - } - - @Override - public PageResult pageRelAll(TaskParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - List list = baseMapper.selectPageRelAll(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public void updateByIdAll(Task task) { - baseMapper.updateByTaskId(task); - } - -} diff --git a/modules/oa/service/impl/TaskUserServiceImpl.java b/modules/oa/service/impl/TaskUserServiceImpl.java deleted file mode 100644 index 0246fa1..0000000 --- a/modules/oa/service/impl/TaskUserServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.gxwebsoft.oa.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.oa.mapper.TaskUserMapper; -import com.gxwebsoft.oa.service.TaskUserService; -import com.gxwebsoft.oa.entity.TaskUser; -import com.gxwebsoft.oa.param.TaskUserParam; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 工单成员Service实现 - * - * @author 科技小王子 - * @since 2023-10-23 18:53:01 - */ -@Service -public class TaskUserServiceImpl extends ServiceImpl implements TaskUserService { - - @Override - public PageResult pageRel(TaskUserParam param) { - PageParam page = new PageParam<>(param); - //page.setDefaultOrder("create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(TaskUserParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - //page.setDefaultOrder("create_time desc"); - return page.sortRecords(list); - } - - @Override - public TaskUser getByIdRel(Integer taskUserId) { - TaskUserParam param = new TaskUserParam(); - param.setTaskUserId(taskUserId); - return param.getOne(baseMapper.selectListRel(param)); - } - -} diff --git a/modules/shop/controller/BrandController.java b/modules/shop/controller/BrandController.java deleted file mode 100644 index 5de7aa2..0000000 --- a/modules/shop/controller/BrandController.java +++ /dev/null @@ -1,118 +0,0 @@ -package com.gxwebsoft.shop.controller; - -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.shop.service.BrandService; -import com.gxwebsoft.shop.entity.Brand; -import com.gxwebsoft.shop.param.BrandParam; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.core.web.BatchParam; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 品牌控制器 - * - * @author 科技小王子 - * @since 2024-04-04 11:38:21 - */ -@Api(tags = "品牌管理") -@RestController -@RequestMapping("/api/shop/brand") -public class BrandController extends BaseController { - @Resource - private BrandService brandService; - - @ApiOperation("分页查询品牌") - @GetMapping("/page") - public ApiResult> page(BrandParam param) { - // 使用关联查询 - return success(brandService.pageRel(param)); - } - - @PreAuthorize("hasAuthority('shop:brand:list')") - @ApiOperation("查询全部品牌") - @GetMapping() - public ApiResult> list(BrandParam param) { - // 使用关联查询 - return success(brandService.listRel(param)); - } - - @ApiOperation("根据id查询品牌") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - // 使用关联查询 - return success(brandService.getByIdRel(id)); - } - - @PreAuthorize("hasAuthority('shop:brand:save')") - @ApiOperation("添加品牌") - @PostMapping() - public ApiResult save(@RequestBody Brand brand) { - // 记录当前登录用户id - // User loginUser = getLoginUser(); - // if (loginUser != null) { - // brand.setUserId(loginUser.getUserId()); - // } - if (brandService.save(brand)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('shop:brand:update')") - @ApiOperation("修改品牌") - @PutMapping() - public ApiResult update(@RequestBody Brand brand) { - if (brandService.updateById(brand)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('shop:brand:remove')") - @ApiOperation("删除品牌") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (brandService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @PreAuthorize("hasAuthority('shop:brand:save')") - @ApiOperation("批量添加品牌") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (brandService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('shop:brand:update')") - @ApiOperation("批量修改品牌") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(brandService, "brand_id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('shop:brand:remove')") - @ApiOperation("批量删除品牌") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (brandService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/modules/shop/controller/CartController.java b/modules/shop/controller/CartController.java deleted file mode 100644 index d64f7ba..0000000 --- a/modules/shop/controller/CartController.java +++ /dev/null @@ -1,187 +0,0 @@ -package com.gxwebsoft.shop.controller; - -import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.common.core.web.BatchParam; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.shop.entity.Cart; -import com.gxwebsoft.shop.entity.Merchant; -import com.gxwebsoft.shop.param.CartParam; -import com.gxwebsoft.shop.service.CartService; -import com.gxwebsoft.shop.service.MerchantService; -import com.gxwebsoft.shop.vo.CartVo; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.*; - -/** - * 购物车控制器 - * - * @author 科技小王子 - * @since 2024-07-29 21:02:39 - */ -@Api(tags = "购物车管理") -@RestController -@RequestMapping("/api/shop/cart") -public class CartController extends BaseController { - @Resource - private CartService cartService; - @Resource - private MerchantService merchantService; - - @ApiOperation("分页查询购物车") - @GetMapping("/page") - public ApiResult> page(CartParam param) { - // 使用关联查询 - return success(cartService.pageRel(param)); - } - - @ApiOperation("查询全部购物车") - @GetMapping() - public ApiResult list(CartParam param) { - if (ObjectUtil.isEmpty(getLoginUser())) { - return success("请先登录",null); - } - // 附加用户ID - param.setUserId(getLoginUserId()); - return success(cartService.listRel(param)); - } - - @PreAuthorize("hasAuthority('shop:cart:list')") - @ApiOperation("根据id查询购物车") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - // 使用关联查询 - return success(cartService.getByIdRel(id)); - } - - @ApiOperation("添加购物车") - @PostMapping() - public ApiResult save(@RequestBody Cart cart) { - if (ObjectUtil.isEmpty(getLoginUser())) { - return success("请先登录",null); - } - // 修正用户ID - cart.setUserId(getLoginUserId()); - // 修正购买数量 - if (ObjectUtil.isEmpty(cart.getCartNum())) { - cart.setCartNum(1); - } - // 超出最大限制 - if (cartService.count(new LambdaUpdateWrapper().eq(Cart::getUserId,getLoginUserId())) > 50) { - return fail("购物车宝贝数量已满，建议您先去结算或清理~"); - } - // 重复商品叠加数量 - final Cart one = cartService.getOne(new LambdaQueryWrapper() - .eq(Cart::getUserId, getLoginUserId()) - .eq(Cart::getGoodsId,cart.getGoodsId()) - .eq(Cart::getSpec,cart.getSpec()) - .last("limit 1")); - if(ObjectUtil.isNotEmpty(one)){ - one.setCartNum(cart.getCartNum()+1); - cartService.updateById(one); - return success("更新成功",one.getId()); - } - if (cartService.save(cart)) { - return success("添加成功",cart.getId()); - } - - return fail("添加失败"); - } - - @ApiOperation("修改购物车") - @PutMapping() - public ApiResult update(@RequestBody Cart cart) { - if (cartService.updateById(cart)) { - final CartParam param = new CartParam(); - param.setType(cart.getType()); - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('shop:cart:remove')") - @ApiOperation("删除购物车") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (cartService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @PreAuthorize("hasAuthority('shop:cart:save')") - @ApiOperation("批量添加购物车") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (cartService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('shop:cart:update')") - @ApiOperation("批量修改购物车") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(cartService, "id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('shop:cart:remove')") - @ApiOperation("批量删除购物车") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (cartService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @ApiOperation("全选操作") - @PutMapping("/onSelectAll/{yes}") - public ApiResult onSelectAll(@PathVariable("yes") Boolean yes) { - if (ObjectUtil.isEmpty(getLoginUser())) { - return success("请先登录",null); - } - final List carts = cartService.list(new LambdaUpdateWrapper() - .eq(Cart::getSelected,!yes) - .eq(Cart::getUserId, getLoginUserId())); - carts.forEach(d -> { - d.setSelected(yes); - }); - return success("修改成功", cartService.updateBatchById(carts)); - } - - @ApiOperation("增加数量") - @PutMapping("/addCartNum") - public ApiResult addCartNum(@RequestBody Cart cart) { - if (ObjectUtil.isEmpty(getLoginUser())) { - return success("请先登录",null); - } - cart.setCartNum(cart.getCartNum()+1); - cartService.updateById(cart); - return success("操作成功"); - } - - @ApiOperation("减少数量") - @PutMapping("/subCartNum") - public ApiResult subCartNum(@RequestBody Cart cart) { - if (ObjectUtil.isEmpty(getLoginUser())) { - return success("请先登录",null); - } - cart.setCartNum(cart.getCartNum()-1); - cartService.updateById(cart); - return success("操作成功"); - } - -} diff --git a/modules/shop/controller/CashierController.java b/modules/shop/controller/CashierController.java deleted file mode 100644 index 5f8eb95..0000000 --- a/modules/shop/controller/CashierController.java +++ /dev/null @@ -1,218 +0,0 @@ -package com.gxwebsoft.shop.controller; - -import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.shop.entity.Cart; -import com.gxwebsoft.shop.service.CashierService; -import com.gxwebsoft.shop.entity.Cashier; -import com.gxwebsoft.shop.param.CashierParam; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.core.web.BatchParam; -import com.gxwebsoft.shop.vo.CashierVo; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 收银控制器 - * - * @author 科技小王子 - * @since 2024-08-04 11:51:43 - */ -@Api(tags = "收银管理") -@RestController -@RequestMapping("/api/shop/cashier") -public class CashierController extends BaseController { - @Resource - private CashierService cashierService; - - @ApiOperation("分页查询收银") - @GetMapping("/page") - public ApiResult> page(CashierParam param) { - // 使用关联查询 - return success(cashierService.pageRel(param)); - } - - @ApiOperation("查询全部收银") - @GetMapping() - public ApiResult list(CashierParam param) { - if (ObjectUtil.isEmpty(getLoginUser())) { - return success("请先登录",null); - } - // 附加收银员ID - param.setCashierId(getLoginUserId()); - // 收银员ID -// final Set collect = getLoginUser().getRoles().stream().map(Role::getRoleCode).collect(Collectors.toSet()); -// if (!collect.contains("merchantClerk")) { -// return fail("这个账户没有收银权限",null); -// } - return success(cashierService.listRel(param)); - } - -// @ApiOperation("按groupId分组查询全部收银") -// @GetMapping("/listByGroupId") -// public ApiResult> listByGroupId(CashierParam param) { -// if (ObjectUtil.isEmpty(getLoginUser())) { -// return success("请先登录",null); -// } -// // 附加收银员ID -// param.setCashierId(getLoginUserId()); -// // 收银员ID -// return success(cashierService.listRelByGroupId(param)); -// } - - @PreAuthorize("hasAuthority('shop:cashier:list')") - @ApiOperation("根据id查询收银") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - // 使用关联查询 - return success(cashierService.getByIdRel(id)); - } - - @ApiOperation("添加收银") - @PostMapping() - public ApiResult save(@RequestBody Cashier cashier) { - if (ObjectUtil.isEmpty(getLoginUser())) { - return success("请先登录",null); - } - cashier.setCashierId(getLoginUserId()); - // 修正购买数量 - if (ObjectUtil.isEmpty(cashier.getCartNum())) { - cashier.setCartNum(1); - } - // 超出最大限制 - if (cashierService.count(new LambdaUpdateWrapper().eq(Cashier::getCashierId,getLoginUserId())) > 50) { - return fail("购物车宝贝数量已满，建议您先去结算或清理~"); - } - // 重复商品叠加数量 - final Cashier one = cashierService.getOne(new LambdaQueryWrapper() - .eq(Cashier::getCashierId,getLoginUserId()) - .eq(Cashier::getGoodsId,cashier.getGoodsId()) - .eq(Cashier::getSpec,cashier.getSpec()) - .eq(Cashier::getGroupId,0) - .last("limit 1")); - - if(ObjectUtil.isNotEmpty(one)){ - return fail("请勿重复添加"); - } - if (cashierService.save(cashier)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @ApiOperation("修改收银") - @PutMapping() - public ApiResult update(@RequestBody Cashier cashier) { - if (cashierService.updateById(cashier)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("删除收银") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (cashierService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @ApiOperation("批量添加收银") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (cashierService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @ApiOperation("批量修改收银") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(cashierService, "id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("批量删除收银") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (cashierService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @ApiOperation("增加数量") - @PutMapping("/addCartNum") - public ApiResult addCartNum(@RequestBody Cashier cashier) { - if (ObjectUtil.isEmpty(getLoginUser())) { - return success("请先登录",null); - } - cashier.setCartNum(cashier.getCartNum()+1); - cashierService.updateById(cashier); - return success("操作成功"); - } - - @ApiOperation("减少数量") - @PutMapping("/subCartNum") - public ApiResult subCartNum(@RequestBody Cashier cashier) { - if (ObjectUtil.isEmpty(getLoginUser())) { - return success("请先登录",null); - } - cashier.setCartNum(cashier.getCartNum()-1); - cashierService.updateById(cashier); - return success("操作成功"); - } - - @ApiOperation("清空") - @PutMapping("/cearCartNum") - public ApiResult removeCartNum(@RequestBody Cashier cashier) { - if (ObjectUtil.isEmpty(getLoginUser())) { - return success("请先登录",null); - } - cashier.setCartNum(cashier.getCartNum()-1); - cashierService.updateById(cashier); - return success("操作成功"); - } - - @ApiOperation("挂单") - @PutMapping("/packCashier") - public ApiResult packCashier() { - if (ObjectUtil.isEmpty(getLoginUser())) { - return success("请先登录",null); - } - final long timeMillis = System.currentTimeMillis(); - final boolean update = cashierService.update(new LambdaUpdateWrapper().eq(Cashier::getGroupId, 0).eq(Cashier::getCashierId, getLoginUserId()).set(Cashier::getGroupId, timeMillis/1000)); - - return success("操作成功",update); - } - - @ApiOperation("取单") - @PutMapping("/getByGroup/{id}") - public ApiResult getByGroup(@PathVariable("id") Integer id) { - if (cashierService.update(new LambdaUpdateWrapper().eq(Cashier::getGroupId,id).set(Cashier::getGroupId,0))) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @ApiOperation("删除整单") - @DeleteMapping("/removeByGroup/{id}") - public ApiResult removeByGroup(@PathVariable("id") Integer id) { - if (cashierService.remove(new LambdaQueryWrapper().eq(Cashier::getGroupId,id))) { - return success("删除成功"); - } - return fail("删除失败"); - } -} diff --git a/modules/shop/controller/ChatConversationController.java b/modules/shop/controller/ChatConversationController.java deleted file mode 100644 index ae21aef..0000000 --- a/modules/shop/controller/ChatConversationController.java +++ /dev/null @@ -1,112 +0,0 @@ -package com.gxwebsoft.shop.controller; - -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.shop.service.ChatConversationService; -import com.gxwebsoft.shop.entity.ChatConversation; -import com.gxwebsoft.shop.param.ChatConversationParam; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.core.web.BatchParam; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 聊天消息表控制器 - * - * @author 科技小王子 - * @since 2024-04-27 16:08:04 - */ -@Api(tags = "聊天消息表管理") -@RestController -@RequestMapping("/api/shop/chat-conversation") -public class ChatConversationController extends BaseController { - @Resource - private ChatConversationService chatConversationService; - - @ApiOperation("分页查询聊天消息表") - @GetMapping("/page") - public ApiResult> page(ChatConversationParam param) { - // 使用关联查询 - return success(chatConversationService.pageRel(param)); - } - - @ApiOperation("查询全部聊天消息表") - @GetMapping() - public ApiResult> list(ChatConversationParam param) { - // 使用关联查询 - return success(chatConversationService.listRel(param)); - } - - @PreAuthorize("hasAuthority('shop:chatConversation:list')") - @ApiOperation("根据id查询聊天消息表") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - // 使用关联查询 - return success(chatConversationService.getByIdRel(id)); - } - - @ApiOperation("添加聊天消息表") - @PostMapping() - public ApiResult save(@RequestBody ChatConversation chatConversation) { - // 记录当前登录用户id - // User loginUser = getLoginUser(); - // if (loginUser != null) { - // chatConversation.setUserId(loginUser.getUserId()); - // } - if (chatConversationService.save(chatConversation)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @ApiOperation("修改聊天消息表") - @PutMapping() - public ApiResult update(@RequestBody ChatConversation chatConversation) { - if (chatConversationService.updateById(chatConversation)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("删除聊天消息表") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (chatConversationService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @ApiOperation("批量添加聊天消息表") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (chatConversationService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @ApiOperation("批量修改聊天消息表") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(chatConversationService, "id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("批量删除聊天消息表") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (chatConversationService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/modules/shop/controller/ChatMessageController.java b/modules/shop/controller/ChatMessageController.java deleted file mode 100644 index d37cf65..0000000 --- a/modules/shop/controller/ChatMessageController.java +++ /dev/null @@ -1,112 +0,0 @@ -package com.gxwebsoft.shop.controller; - -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.shop.service.ChatMessageService; -import com.gxwebsoft.shop.entity.ChatMessage; -import com.gxwebsoft.shop.param.ChatMessageParam; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.core.web.BatchParam; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 聊天消息表控制器 - * - * @author 科技小王子 - * @since 2024-04-27 16:08:04 - */ -@Api(tags = "聊天消息表管理") -@RestController -@RequestMapping("/api/shop/chat-message") -public class ChatMessageController extends BaseController { - @Resource - private ChatMessageService chatMessageService; - - @ApiOperation("分页查询聊天消息表") - @GetMapping("/page") - public ApiResult> page(ChatMessageParam param) { - // 使用关联查询 - return success(chatMessageService.pageRel(param)); - } - - @ApiOperation("查询全部聊天消息表") - @GetMapping() - public ApiResult> list(ChatMessageParam param) { - // 使用关联查询 - return success(chatMessageService.listRel(param)); - } - - @PreAuthorize("hasAuthority('shop:chatMessage:list')") - @ApiOperation("根据id查询聊天消息表") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - // 使用关联查询 - return success(chatMessageService.getByIdRel(id)); - } - - @ApiOperation("添加聊天消息表") - @PostMapping() - public ApiResult save(@RequestBody ChatMessage chatMessage) { - // 记录当前登录用户id - // User loginUser = getLoginUser(); - // if (loginUser != null) { - // chatMessage.setUserId(loginUser.getUserId()); - // } - if (chatMessageService.save(chatMessage)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @ApiOperation("修改聊天消息表") - @PutMapping() - public ApiResult update(@RequestBody ChatMessage chatMessage) { - if (chatMessageService.updateById(chatMessage)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("删除聊天消息表") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (chatMessageService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @ApiOperation("批量添加聊天消息表") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (chatMessageService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @ApiOperation("批量修改聊天消息表") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(chatMessageService, "id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("批量删除聊天消息表") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (chatMessageService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/modules/shop/controller/CountController.java b/modules/shop/controller/CountController.java deleted file mode 100644 index 20f26b7..0000000 --- a/modules/shop/controller/CountController.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.gxwebsoft.shop.controller; - -import cn.hutool.core.date.DateTime; -import cn.hutool.core.date.DateUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.shop.service.CountService; -import com.gxwebsoft.shop.entity.Count; -import com.gxwebsoft.shop.param.CountParam; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.core.web.BatchParam; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 商城销售统计表控制器 - * - * @author 科技小王子 - * @since 2024-07-31 22:25:10 - */ -@Api(tags = "商城销售统计表管理") -@RestController -@RequestMapping("/api/shop/count") -public class CountController extends BaseController { - @Resource - private CountService countService; - - @ApiOperation("分页查询商城销售统计表") - @GetMapping("/data") - public ApiResult data(CountParam param) { - final DateTime dateTime = DateUtil.offsetDay(DateUtil.date(), 1); - System.out.println("dateTime = " + dateTime); - - final DateTime dateTime2 = DateUtil.offsetDay(DateUtil.date(), -1); - System.out.println("dateTime2 = " + dateTime2); - final DateTime dateTime3 = DateUtil.offsetDay(DateUtil.date(), -2); - System.out.println("dateTime3 = " + dateTime3); - return success(countService.list(new LambdaQueryWrapper().ge(Count::getDateTime, dateTime3).last("limit 2"))); - } - - @ApiOperation("分页查询商城销售统计表") - @GetMapping("/page") - public ApiResult> page(CountParam param) { - // 使用关联查询 - return success(countService.pageRel(param)); - } - - @ApiOperation("查询全部商城销售统计表") - @GetMapping() - public ApiResult> list(CountParam param) { - // 使用关联查询 - return success(countService.listRel(param)); - } - - @PreAuthorize("hasAuthority('shop:count:list')") - @ApiOperation("根据id查询商城销售统计表") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - // 使用关联查询 - return success(countService.getByIdRel(id)); - } - - @ApiOperation("添加商城销售统计表") - @PostMapping() - public ApiResult save(@RequestBody Count count) { - if (countService.save(count)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @ApiOperation("修改商城销售统计表") - @PutMapping() - public ApiResult update(@RequestBody Count count) { - if (countService.updateById(count)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("删除商城销售统计表") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (countService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @ApiOperation("批量添加商城销售统计表") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (countService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @ApiOperation("批量修改商城销售统计表") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(countService, "id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("批量删除商城销售统计表") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (countService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/modules/shop/controller/DealerApplyController.java b/modules/shop/controller/DealerApplyController.java deleted file mode 100644 index f2341a2..0000000 --- a/modules/shop/controller/DealerApplyController.java +++ /dev/null @@ -1,144 +0,0 @@ -package com.gxwebsoft.shop.controller; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.shop.entity.DealerReferee; -import com.gxwebsoft.shop.entity.DealerUser; -import com.gxwebsoft.shop.service.DealerApplyService; -import com.gxwebsoft.shop.entity.DealerApply; -import com.gxwebsoft.shop.param.DealerApplyParam; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.core.web.BatchParam; -import com.gxwebsoft.common.system.entity.User; -import com.gxwebsoft.shop.service.DealerRefereeService; -import com.gxwebsoft.shop.service.DealerUserService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 分销商申请记录表控制器 - * - * @author 科技小王子 - * @since 2024-07-28 11:57:41 - */ -@Api(tags = "分销商申请记录表管理") -@RestController -@RequestMapping("/api/shop/dealer-apply") -public class DealerApplyController extends BaseController { - @Resource - private DealerApplyService dealerApplyService; - @Resource - private DealerUserService dealerUserService; - @Resource - private DealerRefereeService dealerRefereeService; - - @ApiOperation("分页查询分销商申请记录表") - @GetMapping("/page") - public ApiResult> page(DealerApplyParam param) { - // 使用关联查询 - return success(dealerApplyService.pageRel(param)); - } - - @ApiOperation("查询全部分销商申请记录表") - @GetMapping() - public ApiResult> list(DealerApplyParam param) { - // 使用关联查询 - return success(dealerApplyService.listRel(param)); - } - - @ApiOperation("根据id查询分销商申请记录表") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - // 使用关联查询 - return success(dealerApplyService.getByIdRel(id)); - } - - @Transactional(rollbackFor = {Exception.class}) - @ApiOperation("添加分销商申请记录表") - @PostMapping() - public ApiResult save(@RequestBody DealerApply dealerApply) { - final Integer refereeId = dealerApply.getRefereeId(); - final DealerUser dealerUser = new DealerUser(); - // 记录当前登录用户id - User loginUser = getLoginUser(); - if (loginUser != null) { - dealerApply.setUserId(loginUser.getUserId()); - dealerUser.setUserId(loginUser.getUserId()); - dealerUser.setMobile(loginUser.getPhone()); - dealerUser.setTenantId(loginUser.getTenantId()); - } - final int count = dealerUserService.count(new LambdaQueryWrapper().eq(DealerUser::getUserId, refereeId)); - System.out.println("count = " + count); - if (dealerUserService.count(new LambdaQueryWrapper().eq(DealerUser::getUserId,refereeId)) == 0) { - return fail("邀请人ID不存在"); - } - if (dealerApplyService.save(dealerApply)) { - // 加入正式分销商 - dealerUser.setRealName(dealerApply.getRealName()); - dealerUser.setRefereeId(dealerApply.getRefereeId()); - dealerUserService.save(dealerUser); - // 添加关系 - final DealerReferee referee = new DealerReferee(); - referee.setDealerId(refereeId); - referee.setUserId(dealerUser.getUserId()); - referee.setLevel(1); - referee.setTenantId(dealerApply.getTenantId()); - dealerRefereeService.save(referee); - - return success("添加成功"); - } - return fail("添加失败"); - } - - @ApiOperation("修改分销商申请记录表") - @PutMapping() - public ApiResult update(@RequestBody DealerApply dealerApply) { - if (dealerApplyService.updateById(dealerApply)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("删除分销商申请记录表") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (dealerApplyService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @ApiOperation("批量添加分销商申请记录表") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (dealerApplyService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @ApiOperation("批量修改分销商申请记录表") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(dealerApplyService, "apply_id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("批量删除分销商申请记录表") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (dealerApplyService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/modules/shop/controller/DealerCapitalController.java b/modules/shop/controller/DealerCapitalController.java deleted file mode 100644 index c52a543..0000000 --- a/modules/shop/controller/DealerCapitalController.java +++ /dev/null @@ -1,113 +0,0 @@ -package com.gxwebsoft.shop.controller; - -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.shop.service.DealerCapitalService; -import com.gxwebsoft.shop.entity.DealerCapital; -import com.gxwebsoft.shop.param.DealerCapitalParam; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.core.web.BatchParam; -import com.gxwebsoft.common.system.entity.User; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 分销商资金明细表控制器 - * - * @author 科技小王子 - * @since 2024-07-28 11:57:41 - */ -@Api(tags = "分销商资金明细表管理") -@RestController -@RequestMapping("/api/shop/dealer-capital") -public class DealerCapitalController extends BaseController { - @Resource - private DealerCapitalService dealerCapitalService; - - @ApiOperation("分页查询分销商资金明细表") - @GetMapping("/page") - public ApiResult> page(DealerCapitalParam param) { - // 使用关联查询 - return success(dealerCapitalService.pageRel(param)); - } - - @ApiOperation("查询全部分销商资金明细表") - @GetMapping() - public ApiResult> list(DealerCapitalParam param) { - // 使用关联查询 - return success(dealerCapitalService.listRel(param)); - } - - @PreAuthorize("hasAuthority('shop:dealerCapital:list')") - @ApiOperation("根据id查询分销商资金明细表") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - // 使用关联查询 - return success(dealerCapitalService.getByIdRel(id)); - } - - @ApiOperation("添加分销商资金明细表") - @PostMapping() - public ApiResult save(@RequestBody DealerCapital dealerCapital) { - // 记录当前登录用户id - User loginUser = getLoginUser(); - if (loginUser != null) { - dealerCapital.setUserId(loginUser.getUserId()); - } - if (dealerCapitalService.save(dealerCapital)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @ApiOperation("修改分销商资金明细表") - @PutMapping() - public ApiResult update(@RequestBody DealerCapital dealerCapital) { - if (dealerCapitalService.updateById(dealerCapital)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("删除分销商资金明细表") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (dealerCapitalService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @ApiOperation("批量添加分销商资金明细表") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (dealerCapitalService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @ApiOperation("批量修改分销商资金明细表") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(dealerCapitalService, "id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("批量删除分销商资金明细表") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (dealerCapitalService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/modules/shop/controller/DealerOrderController.java b/modules/shop/controller/DealerOrderController.java deleted file mode 100644 index 66b1f38..0000000 --- a/modules/shop/controller/DealerOrderController.java +++ /dev/null @@ -1,113 +0,0 @@ -package com.gxwebsoft.shop.controller; - -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.shop.service.DealerOrderService; -import com.gxwebsoft.shop.entity.DealerOrder; -import com.gxwebsoft.shop.param.DealerOrderParam; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.core.web.BatchParam; -import com.gxwebsoft.common.system.entity.User; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 分销商订单记录表控制器 - * - * @author 科技小王子 - * @since 2024-07-28 11:57:41 - */ -@Api(tags = "分销商订单记录表管理") -@RestController -@RequestMapping("/api/shop/dealer-order") -public class DealerOrderController extends BaseController { - @Resource - private DealerOrderService dealerOrderService; - - @ApiOperation("分页查询分销商订单记录表") - @GetMapping("/page") - public ApiResult> page(DealerOrderParam param) { - // 使用关联查询 - return success(dealerOrderService.pageRel(param)); - } - - @ApiOperation("查询全部分销商订单记录表") - @GetMapping() - public ApiResult> list(DealerOrderParam param) { - // 使用关联查询 - return success(dealerOrderService.listRel(param)); - } - - @PreAuthorize("hasAuthority('shop:dealerOrder:list')") - @ApiOperation("根据id查询分销商订单记录表") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - // 使用关联查询 - return success(dealerOrderService.getByIdRel(id)); - } - - @ApiOperation("添加分销商订单记录表") - @PostMapping() - public ApiResult save(@RequestBody DealerOrder dealerOrder) { - // 记录当前登录用户id - User loginUser = getLoginUser(); - if (loginUser != null) { - dealerOrder.setUserId(loginUser.getUserId()); - } - if (dealerOrderService.save(dealerOrder)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @ApiOperation("修改分销商订单记录表") - @PutMapping() - public ApiResult update(@RequestBody DealerOrder dealerOrder) { - if (dealerOrderService.updateById(dealerOrder)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("删除分销商订单记录表") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (dealerOrderService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @ApiOperation("批量添加分销商订单记录表") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (dealerOrderService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @ApiOperation("批量修改分销商订单记录表") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(dealerOrderService, "id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("批量删除分销商订单记录表") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (dealerOrderService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/modules/shop/controller/DealerRefereeController.java b/modules/shop/controller/DealerRefereeController.java deleted file mode 100644 index 4a5462c..0000000 --- a/modules/shop/controller/DealerRefereeController.java +++ /dev/null @@ -1,113 +0,0 @@ -package com.gxwebsoft.shop.controller; - -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.shop.service.DealerRefereeService; -import com.gxwebsoft.shop.entity.DealerReferee; -import com.gxwebsoft.shop.param.DealerRefereeParam; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.core.web.BatchParam; -import com.gxwebsoft.common.system.entity.User; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 分销商推荐关系表控制器 - * - * @author 科技小王子 - * @since 2024-07-28 11:57:41 - */ -@Api(tags = "分销商推荐关系表管理") -@RestController -@RequestMapping("/api/shop/dealer-referee") -public class DealerRefereeController extends BaseController { - @Resource - private DealerRefereeService dealerRefereeService; - - @ApiOperation("分页查询分销商推荐关系表") - @GetMapping("/page") - public ApiResult> page(DealerRefereeParam param) { - // 使用关联查询 - return success(dealerRefereeService.pageRel(param)); - } - - @ApiOperation("查询全部分销商推荐关系表") - @GetMapping() - public ApiResult> list(DealerRefereeParam param) { - // 使用关联查询 - return success(dealerRefereeService.listRel(param)); - } - - @PreAuthorize("hasAuthority('shop:dealerReferee:list')") - @ApiOperation("根据id查询分销商推荐关系表") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - // 使用关联查询 - return success(dealerRefereeService.getByIdRel(id)); - } - - @ApiOperation("添加分销商推荐关系表") - @PostMapping() - public ApiResult save(@RequestBody DealerReferee dealerReferee) { - // 记录当前登录用户id - User loginUser = getLoginUser(); - if (loginUser != null) { - dealerReferee.setUserId(loginUser.getUserId()); - } - if (dealerRefereeService.save(dealerReferee)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @ApiOperation("修改分销商推荐关系表") - @PutMapping() - public ApiResult update(@RequestBody DealerReferee dealerReferee) { - if (dealerRefereeService.updateById(dealerReferee)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("删除分销商推荐关系表") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (dealerRefereeService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @ApiOperation("批量添加分销商推荐关系表") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (dealerRefereeService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @ApiOperation("批量修改分销商推荐关系表") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(dealerRefereeService, "id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("批量删除分销商推荐关系表") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (dealerRefereeService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/modules/shop/controller/DealerSettingController.java b/modules/shop/controller/DealerSettingController.java deleted file mode 100644 index 25a35ea..0000000 --- a/modules/shop/controller/DealerSettingController.java +++ /dev/null @@ -1,107 +0,0 @@ -package com.gxwebsoft.shop.controller; - -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.shop.service.DealerSettingService; -import com.gxwebsoft.shop.entity.DealerSetting; -import com.gxwebsoft.shop.param.DealerSettingParam; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.core.web.BatchParam; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 分销商设置表控制器 - * - * @author 科技小王子 - * @since 2024-07-28 11:57:41 - */ -@Api(tags = "分销商设置表管理") -@RestController -@RequestMapping("/api/shop/dealer-setting") -public class DealerSettingController extends BaseController { - @Resource - private DealerSettingService dealerSettingService; - - @ApiOperation("分页查询分销商设置表") - @GetMapping("/page") - public ApiResult> page(DealerSettingParam param) { - // 使用关联查询 - return success(dealerSettingService.pageRel(param)); - } - - @ApiOperation("查询全部分销商设置表") - @GetMapping() - public ApiResult> list(DealerSettingParam param) { - // 使用关联查询 - return success(dealerSettingService.listRel(param)); - } - - @PreAuthorize("hasAuthority('shop:dealerSetting:list')") - @ApiOperation("根据id查询分销商设置表") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") String id) { - // 使用关联查询 - return success(dealerSettingService.getByIdRel(id)); - } - - @ApiOperation("添加分销商设置表") - @PostMapping() - public ApiResult save(@RequestBody DealerSetting dealerSetting) { - if (dealerSettingService.save(dealerSetting)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @ApiOperation("修改分销商设置表") - @PutMapping() - public ApiResult update(@RequestBody DealerSetting dealerSetting) { - if (dealerSettingService.updateById(dealerSetting)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("删除分销商设置表") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (dealerSettingService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @ApiOperation("批量添加分销商设置表") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (dealerSettingService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @ApiOperation("批量修改分销商设置表") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(dealerSettingService, "key")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("批量删除分销商设置表") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (dealerSettingService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/modules/shop/controller/DealerUserController.java b/modules/shop/controller/DealerUserController.java deleted file mode 100644 index c963188..0000000 --- a/modules/shop/controller/DealerUserController.java +++ /dev/null @@ -1,192 +0,0 @@ -package com.gxwebsoft.shop.controller; - -import cn.hutool.core.io.FileUtil; -import cn.hutool.http.HttpRequest; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.gxwebsoft.common.core.config.ConfigProperties; -import com.gxwebsoft.common.core.utils.RedisUtil; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.common.core.web.BatchParam; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.system.entity.User; -import com.gxwebsoft.shop.entity.DealerUser; -import com.gxwebsoft.shop.param.DealerUserParam; -import com.gxwebsoft.shop.service.DealerUserService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.io.File; -import java.util.HashMap; -import java.util.List; - -import static com.gxwebsoft.common.core.constants.RedisConstants.ACCESS_TOKEN_KEY; - -/** - * 分销商用户记录表控制器 - * - * @author 科技小王子 - * @since 2024-07-28 19:21:15 - */ -@Api(tags = "分销商用户记录表管理") -@RestController -@RequestMapping("/api/shop/dealer-user") -public class DealerUserController extends BaseController { - @Resource - private DealerUserService dealerUserService; - @Resource - private RedisUtil redisUtil; - @Resource - private ConfigProperties config; - - - @ApiOperation("生成专属二维码") - @GetMapping("/getDealerUserQrcode") - public ApiResult getDealerUserQrcode() { - final Integer loginUserId = getLoginUserId(); - if(loginUserId == null){ - return fail("请先登录"); - } - - final DealerUser dealerUser = dealerUserService.getOne(new LambdaQueryWrapper().eq(DealerUser::getUserId, loginUserId).last("limit 1")); - - // 生成小程序码 - String apiUrl = "https://api.weixin.qq.com/wxa/getwxacode?access_token=" + getAccessToken(); - final HashMap map = new HashMap<>(); - map.put("path", "package/dealer/invite?id=" + loginUserId); - map.put("env_version", "trial"); // 正式版为"release"，体验版为"trial"，开发版为"develop" - - // 获取图片 Buffer - byte[] qrCode = HttpRequest.post(apiUrl) - .body(JSON.toJSONString(map)) - .execute().bodyBytes(); - - // 保存的文件名称 - final String fileName = loginUserId.toString().concat(".png"); - // 保存路径 - String filePath = getUploadDir().concat("user-code/") + fileName; - File file = FileUtil.writeBytes(qrCode, filePath); - - if (file != null) { - final String qrcode = config.getFileServer().concat("/user-code/").concat(fileName); - dealerUser.setQrcode(qrcode); - dealerUserService.updateById(dealerUser); - return success("操作成功",qrcode); - } - return success(dealerUser); - } - - @ApiOperation("分页查询分销商用户记录表") - @GetMapping("/page") - public ApiResult> page(DealerUserParam param) { - // 使用关联查询 - return success(dealerUserService.pageRel(param)); - } - - @ApiOperation("查询全部分销商用户记录表") - @GetMapping() - public ApiResult> list(DealerUserParam param) { - // 使用关联查询 - return success(dealerUserService.listRel(param)); - } - - @ApiOperation("根据id查询分销商用户记录表") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - // 分销商信息 - final DealerUser dealerUser = dealerUserService.getOne(new LambdaQueryWrapper() - .eq(DealerUser::getUserId, id) - .eq(DealerUser::getIsDelete, 0) - .last("limit 1") - ); - // 上级分销商 - final DealerUser dealerUser1 = dealerUserService.getOne(new LambdaQueryWrapper() - .eq(DealerUser::getUserId, dealerUser.getRefereeId()) - .eq(DealerUser::getIsDelete, 0)); - dealerUser.setDealerName(dealerUser1.getRealName()); - dealerUser.setDealerUser(dealerUser1); - return success(dealerUser); - } - - @ApiOperation("添加分销商用户记录表") - @PostMapping() - public ApiResult save(@RequestBody DealerUser dealerUser) { - // 记录当前登录用户id - User loginUser = getLoginUser(); - if (loginUser != null) { - dealerUser.setUserId(loginUser.getUserId()); - } - if (dealerUserService.save(dealerUser)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @ApiOperation("修改分销商用户记录表") - @PutMapping() - public ApiResult update(@RequestBody DealerUser dealerUser) { - if (dealerUserService.updateById(dealerUser)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("删除分销商用户记录表") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (dealerUserService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @ApiOperation("批量添加分销商用户记录表") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (dealerUserService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @ApiOperation("批量修改分销商用户记录表") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(dealerUserService, "id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("批量删除分销商用户记录表") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (dealerUserService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - - private String getAccessToken() { - String key = ACCESS_TOKEN_KEY.concat(":").concat(getTenantId().toString()); - // 从缓存获取access_token - final String value = redisUtil.get(key); - if (value != null) { - // 解析access_token - JSONObject response = JSON.parseObject(value); - return response.getString("access_token"); - } - - return null; - } - - - private String getUploadDir() { - return config.getUploadPath() + "file/"; - } -} diff --git a/modules/shop/controller/DealerWithdrawController.java b/modules/shop/controller/DealerWithdrawController.java deleted file mode 100644 index c8c4632..0000000 --- a/modules/shop/controller/DealerWithdrawController.java +++ /dev/null @@ -1,113 +0,0 @@ -package com.gxwebsoft.shop.controller; - -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.shop.service.DealerWithdrawService; -import com.gxwebsoft.shop.entity.DealerWithdraw; -import com.gxwebsoft.shop.param.DealerWithdrawParam; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.core.web.BatchParam; -import com.gxwebsoft.common.system.entity.User; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 分销商提现明细表控制器 - * - * @author 科技小王子 - * @since 2024-07-28 11:57:41 - */ -@Api(tags = "分销商提现明细表管理") -@RestController -@RequestMapping("/api/shop/dealer-withdraw") -public class DealerWithdrawController extends BaseController { - @Resource - private DealerWithdrawService dealerWithdrawService; - - @ApiOperation("分页查询分销商提现明细表") - @GetMapping("/page") - public ApiResult> page(DealerWithdrawParam param) { - // 使用关联查询 - return success(dealerWithdrawService.pageRel(param)); - } - - @ApiOperation("查询全部分销商提现明细表") - @GetMapping() - public ApiResult> list(DealerWithdrawParam param) { - // 使用关联查询 - return success(dealerWithdrawService.listRel(param)); - } - - @PreAuthorize("hasAuthority('shop:dealerWithdraw:list')") - @ApiOperation("根据id查询分销商提现明细表") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - // 使用关联查询 - return success(dealerWithdrawService.getByIdRel(id)); - } - - @ApiOperation("添加分销商提现明细表") - @PostMapping() - public ApiResult save(@RequestBody DealerWithdraw dealerWithdraw) { - // 记录当前登录用户id - User loginUser = getLoginUser(); - if (loginUser != null) { - dealerWithdraw.setUserId(loginUser.getUserId()); - } - if (dealerWithdrawService.save(dealerWithdraw)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @ApiOperation("修改分销商提现明细表") - @PutMapping() - public ApiResult update(@RequestBody DealerWithdraw dealerWithdraw) { - if (dealerWithdrawService.updateById(dealerWithdraw)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("删除分销商提现明细表") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (dealerWithdrawService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @ApiOperation("批量添加分销商提现明细表") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (dealerWithdrawService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @ApiOperation("批量修改分销商提现明细表") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(dealerWithdrawService, "id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("批量删除分销商提现明细表") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (dealerWithdrawService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/modules/shop/controller/GoodsCategoryController.java b/modules/shop/controller/GoodsCategoryController.java deleted file mode 100644 index daf8d90..0000000 --- a/modules/shop/controller/GoodsCategoryController.java +++ /dev/null @@ -1,248 +0,0 @@ -package com.gxwebsoft.shop.controller; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.gxwebsoft.common.core.utils.JSONUtil; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.common.core.web.BatchParam; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.system.entity.User; -import com.gxwebsoft.shop.entity.Goods; -import com.gxwebsoft.shop.entity.GoodsCategory; -import com.gxwebsoft.shop.entity.GoodsSpec; -import com.gxwebsoft.shop.param.GoodsCategoryParam; -import com.gxwebsoft.shop.service.GoodsCategoryService; -import com.gxwebsoft.shop.service.GoodsService; -import com.gxwebsoft.shop.service.GoodsSpecService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.util.CollectionUtils; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; - -import static com.gxwebsoft.common.core.utils.CommonUtil.toTreeData; - -/** - * 商品分类控制器 - * - * @author 科技小王子 - * @since 2024-03-30 19:34:16 - */ -@Api(tags = "商品分类管理") -@RestController -@RequestMapping("/api/shop/goods-category") -public class GoodsCategoryController extends BaseController { - @Resource - private GoodsCategoryService goodsCategoryService; - @Resource - private GoodsSpecService goodsSpecService; - @Resource - private GoodsService goodsService; - - @ApiOperation("查询商城菜单分类级商品数据(不联动)") - @GetMapping("/listCategoryTree") - public ApiResult> listCategoryTree(GoodsCategoryParam param) { - // 查询非店铺分类 - param.setMerchantId(0); - final List goodsCategoryList = goodsCategoryService.listRel(param); - // 收集分类ID - final Set categoryIds = goodsCategoryList.stream().map(GoodsCategory::getCategoryId).collect(Collectors.toSet()); - if (categoryIds.isEmpty()) { - return success(goodsCategoryList); - } - // List转为树形结构 - final List list = toTreeData(goodsCategoryList, 0, GoodsCategory::getParentId, GoodsCategory::getCategoryId, GoodsCategory::setChildren); - // 查询所有商品 - final List goods = goodsService.list(new LambdaQueryWrapper() - .in(Goods::getCategoryId, categoryIds) - .eq(Goods::getIsShow, 1) - .eq(Goods::getDeleted, 0)); - - final Map> collectGoods = goods.stream().collect(Collectors.groupingBy(Goods::getCategoryId)); - - final Set goodsIds = goods.stream().map(Goods::getGoodsId).collect(Collectors.toSet()); - - final List specs = goodsSpecService.list(new LambdaQueryWrapper().in(GoodsSpec::getGoodsId, goodsIds)); - - final Map> collectGoodsSpec = specs.stream().collect(Collectors.groupingBy(GoodsSpec::getGoodsId)); - - list.forEach(d -> { - d.setName(d.getTitle()); - final List goodsList = collectGoods.get(d.getCategoryId()); - if (!CollectionUtils.isEmpty(goodsList)) { - goodsList.forEach(v -> { - final List goodsSpecs = collectGoodsSpec.get(v.getGoodsId()); - if (!CollectionUtils.isEmpty(goodsSpecs)) { - final GoodsSpec spec = goodsSpecs.get(0); - v.setSpecValue(spec.getSpecValue()); - v.setGoodsSpecValue(JSONUtil.parseObject(spec.getSpecValue(), Object.class)); - } - }); - d.setGoods(collectGoods.get(d.getCategoryId())); - } - }); - return success(list); - } - - @ApiOperation("查询商城菜单分类级商品数据(不联动)") - @GetMapping("/listCategoryParentIdTree/{parentId}") - public ApiResult> listCategoryParentIdTree(@PathVariable("parentId") Integer parentId) { - // 查询非店铺分类 - final List list = goodsCategoryService.list(new LambdaQueryWrapper() - .eq(GoodsCategory::getParentId,parentId) - .eq(GoodsCategory::getType,0) - .eq(GoodsCategory::getMerchantId,0)); - - final Set categoryIds = list.stream().map(GoodsCategory::getCategoryId).collect(Collectors.toSet()); - final List goods = goodsService.list(new LambdaQueryWrapper().in(Goods::getCategoryId, categoryIds)); - final Map> collect = goods.stream().collect(Collectors.groupingBy(Goods::getCategoryId)); - - final Map> collectGoods = goods.stream().collect(Collectors.groupingBy(Goods::getCategoryId)); - - final Set goodsIds = goods.stream().map(Goods::getGoodsId).collect(Collectors.toSet()); - - final List specs = goodsSpecService.list(new LambdaQueryWrapper().in(GoodsSpec::getGoodsId, goodsIds)); - - final Map> collectGoodsSpec = specs.stream().collect(Collectors.groupingBy(GoodsSpec::getGoodsId)); - - list.forEach(d -> { - d.setName(d.getTitle()); - final List goodsList = collectGoods.get(d.getCategoryId()); - if (!CollectionUtils.isEmpty(goodsList)) { - goodsList.forEach(v -> { - final List goodsSpecs = collectGoodsSpec.get(v.getGoodsId()); - if (!CollectionUtils.isEmpty(goodsSpecs)) { - final GoodsSpec spec = goodsSpecs.get(0); - v.setSpecValue(spec.getSpecValue()); - v.setGoodsSpecValue(JSONUtil.parseObject(spec.getSpecValue(), Object.class)); - } - }); - d.setGoods(collectGoods.get(d.getCategoryId())); - } - }); - return success("请求成功",list); - } - - @ApiOperation("查询门店菜单分类及菜品数据(联动)") - @GetMapping("/listShopCategoryTree") - public ApiResult> listShopCategoryTree(GoodsCategoryParam param) { - final List list = goodsCategoryService.listRel(param); - final Set categoryIds = list.stream().map(GoodsCategory::getCategoryId).collect(Collectors.toSet()); - if (categoryIds.isEmpty()) { - return success(list); - } - - final List goods = goodsService.list(new LambdaQueryWrapper().in(Goods::getCategoryId, categoryIds).eq(Goods::getIsShow, 1).eq(Goods::getDeleted, 0)); - final Map> collectGoods = goods.stream().collect(Collectors.groupingBy(Goods::getCategoryId)); - - final Set goodsIds = goods.stream().map(Goods::getGoodsId).collect(Collectors.toSet()); - - final List specs = goodsSpecService.list(new LambdaQueryWrapper().in(GoodsSpec::getGoodsId, goodsIds)); - - final Map> collectGoodsSpec = specs.stream().collect(Collectors.groupingBy(GoodsSpec::getGoodsId)); - - list.forEach(d -> { - d.setName(d.getTitle()); - final List goodsList = collectGoods.get(d.getCategoryId()); - if (!CollectionUtils.isEmpty(goodsList)) { - goodsList.forEach(v -> { - final List goodsSpecs = collectGoodsSpec.get(v.getGoodsId()); - if (!CollectionUtils.isEmpty(goodsSpecs)) { - final GoodsSpec spec = goodsSpecs.get(0); - v.setSpecValue(spec.getSpecValue()); - v.setGoodsSpecValue(JSONUtil.parseObject(spec.getSpecValue(), Object.class)); - } - }); - d.setGoods(collectGoods.get(d.getCategoryId())); - } - }); - return success(list); - } - - - @ApiOperation("分页查询商品分类") - @GetMapping("/page") - public ApiResult> page(GoodsCategoryParam param) { - // 使用关联查询 - return success(goodsCategoryService.pageRel(param)); - } - - @ApiOperation("查询全部商品分类") - @GetMapping() - public ApiResult> list(GoodsCategoryParam param) { - // 使用关联查询 - return success(goodsCategoryService.listRel(param)); - } - - @ApiOperation("根据id查询商品分类") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - // 使用关联查询 - return success(goodsCategoryService.getByIdRel(id)); - } - - @ApiOperation("添加商品分类") - @PostMapping() - public ApiResult save(@RequestBody GoodsCategory goodsCategory) { - // 记录当前登录用户id - User loginUser = getLoginUser(); - if (loginUser != null) { - goodsCategory.setUserId(loginUser.getUserId()); - } - if (goodsCategoryService.save(goodsCategory)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @ApiOperation("修改商品分类") - @PutMapping() - public ApiResult update(@RequestBody GoodsCategory goodsCategory) { - if (goodsCategoryService.updateById(goodsCategory)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("删除商品分类") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (goodsCategoryService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @ApiOperation("批量添加商品分类") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (goodsCategoryService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @ApiOperation("批量修改商品分类") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(goodsCategoryService, "category_id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("批量删除商品分类") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (goodsCategoryService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/modules/shop/controller/GoodsController.java b/modules/shop/controller/GoodsController.java deleted file mode 100644 index dca535e..0000000 --- a/modules/shop/controller/GoodsController.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.gxwebsoft.shop.controller; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.gxwebsoft.common.core.utils.JSONUtil; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.common.core.web.BatchParam; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.system.entity.User; -import com.gxwebsoft.shop.entity.Goods; -import com.gxwebsoft.shop.entity.GoodsSku; -import com.gxwebsoft.shop.entity.GoodsSpec; -import com.gxwebsoft.shop.param.GoodsParam; -import com.gxwebsoft.shop.service.GoodsService; -import com.gxwebsoft.shop.service.GoodsSkuService; -import com.gxwebsoft.shop.service.GoodsSpecService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * 商品记录表控制器 - * - * @author 科技小王子 - * @since 2024-07-25 19:22:01 - */ -@Api(tags = "商品记录表管理") -@RestController -@RequestMapping("/api/shop/goods") -public class GoodsController extends BaseController { - @Resource - private GoodsService goodsService; - @Resource - private GoodsSpecService goodsSpecService; - @Resource - private GoodsSkuService goodsSkuService; - - @ApiOperation("统计信息") - @GetMapping("/data") - public ApiResult> data(GoodsParam param) { - Map data = new HashMap<>(); - final LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - - if (param.getMerchantId() != null) { - wrapper.eq(Goods::getMerchantId,param.getMerchantId()); - } - - Integer totalNum = goodsService.count( - wrapper.eq(Goods::getIsShow,1).gt(Goods::getStock,0) - ); - data.put("totalNum", totalNum); - - Integer totalNum2 = goodsService.count( - wrapper.eq(Goods::getIsShow,0) - ); - data.put("totalNum2", totalNum2); - - Integer totalNum3 = goodsService.count( - wrapper.eq(Goods::getStock,0) - ); - data.put("totalNum3", totalNum3); - - // 下架已售罄的商品 - goodsService.update(new LambdaUpdateWrapper().eq(Goods::getStock,0).eq(Goods::getIsShow,1).set(Goods::getIsShow,0)); - - return success(data); - } - - @ApiOperation("分页查询商品记录表") - @GetMapping("/page") - public ApiResult> page(GoodsParam param) { - // 使用关联查询 - System.out.println("param = " + param); - return success(goodsService.pageRel(param)); - } - - @ApiOperation("查询全部商品记录表") - @GetMapping() - public ApiResult> list(GoodsParam param) { - // 使用关联查询 - return success(goodsService.listRel(param)); - } - - @ApiOperation("根据id查询商品记录表") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - // 使用关联查询 - final Goods goods = goodsService.getByIdRel(id); - - // 提取specValue - final GoodsSpec spec = goodsSpecService.getOne(new LambdaQueryWrapper().eq(GoodsSpec::getGoodsId, id).last("limit 1")); - if (spec != null) { - final String specValue = spec.getSpecValue(); - final Object object = JSONUtil.parseObject(specValue, Object.class); - goods.setGoodsSpecValue(object); - } - - return success(goods); - } - - @PreAuthorize("hasAuthority('shop:goods:save')") - @ApiOperation("添加商品记录表") - @PostMapping() - public ApiResult save(@RequestBody Goods goods) { - // 记录当前登录用户id - User loginUser = getLoginUser(); - if (loginUser != null) { - goods.setUserId(loginUser.getUserId()); - } - if (goodsService.save(goods)) { - // 保存商品规格及sku信息 - goodsService.saveBatchByAsync(goods); - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('shop:goods:update')") - @ApiOperation("修改商品记录表") - @PutMapping() - public ApiResult update(@RequestBody Goods goods) { - if (goodsService.updateById(goods)) { - // 删除旧信息 - goodsSpecService.remove(new LambdaQueryWrapper().eq(GoodsSpec::getGoodsId, goods.getGoodsId())); - goodsSkuService.remove(new LambdaQueryWrapper().eq(GoodsSku::getGoodsId, goods.getGoodsId())); - // 保存商品规格及sku信息 - goodsService.saveBatchByAsync(goods); - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('shop:goods:remove')") - @ApiOperation("删除商品记录表") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (goodsService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @PreAuthorize("hasAuthority('shop:goods:save')") - @ApiOperation("批量添加商品记录表") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (goodsService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('shop:goods:update')") - @ApiOperation("批量修改商品记录表") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(goodsService, "goods_id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('shop:goods:remove')") - @ApiOperation("批量删除商品记录表") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (goodsService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/modules/shop/controller/GoodsSkuController.java b/modules/shop/controller/GoodsSkuController.java deleted file mode 100644 index ad9221a..0000000 --- a/modules/shop/controller/GoodsSkuController.java +++ /dev/null @@ -1,157 +0,0 @@ -package com.gxwebsoft.shop.controller; - -import com.baomidou.mybatisplus.core.toolkit.StringUtils; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.common.core.web.BatchParam; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.shop.entity.GoodsSku; -import com.gxwebsoft.shop.entity.GoodsSkuVO; -import com.gxwebsoft.shop.param.GoodsSkuParam; -import com.gxwebsoft.shop.service.GoodsSkuService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; - -/** - * 商品sku列表控制器 - * - * @author 科技小王子 - * @since 2024-07-26 10:49:02 - */ -@Api(tags = "商品sku列表管理") -@RestController -@RequestMapping("/api/shop/goods-sku") -public class GoodsSkuController extends BaseController { - @Resource - private GoodsSkuService goodsSkuService; - - @ApiOperation("根据商品spec生成SKU列表") - @PostMapping("/generateGoodsSku") - public ApiResult> generateGoodsSku(@RequestBody List voList) { - List> resultList = new ArrayList<>(); - voList.forEach(d -> { - resultList.add(d.getDetail()); - }); - System.out.println("resultList = " + resultList); - List combine = generateSku(resultList,0,"",new ArrayList<>()); - - List goodsSkuList = new ArrayList<>(); - for (String sku : combine) { - System.out.println(sku); - GoodsSku goodsSku = new GoodsSku(); - goodsSku.setSku(sku); - goodsSku.setUuid(UUID.randomUUID().toString()); - goodsSku.setImages(new ArrayList<>()); - goodsSkuList.add(goodsSku); - } - - return success(goodsSkuList); - } - - /** - * 根据属性值生成sku - * - * @param list 属性值列表 - * @param index 下标 - * @param str 初始化数据 - * @param newObjs 新obj - */ - public static List generateSku(List> list, int index, String str, List newObjs) { - if (index == list.size()) { - newObjs.add(str); - return newObjs; - } - for (String dataStr : list.get(index)) { - if (StringUtils.isBlank(str)) { - generateSku(list, index + 1, str + dataStr, newObjs); - } else { - generateSku(list, index + 1, str + "," + dataStr, newObjs); - } - } - return newObjs; - } - - @ApiOperation("分页查询商品sku列表") - @GetMapping("/page") - public ApiResult> page(GoodsSkuParam param) { - // 使用关联查询 - return success(goodsSkuService.pageRel(param)); - } - - @ApiOperation("查询全部商品sku列表") - @GetMapping() - public ApiResult> list(GoodsSkuParam param) { - // 使用关联查询 - return success(goodsSkuService.listRel(param)); - } - - @PreAuthorize("hasAuthority('shop:goodsSku:list')") - @ApiOperation("根据id查询商品sku列表") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - // 使用关联查询 - return success(goodsSkuService.getByIdRel(id)); - } - - @ApiOperation("添加商品sku列表") - @PostMapping() - public ApiResult save(@RequestBody GoodsSku goodsSku) { - if (goodsSkuService.save(goodsSku)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @ApiOperation("修改商品sku列表") - @PutMapping() - public ApiResult update(@RequestBody GoodsSku goodsSku) { - if (goodsSkuService.updateById(goodsSku)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("删除商品sku列表") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (goodsSkuService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @ApiOperation("批量添加商品sku列表") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (goodsSkuService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @ApiOperation("批量修改商品sku列表") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(goodsSkuService, "id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("批量删除商品sku列表") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (goodsSkuService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/modules/shop/controller/GoodsSpecController.java b/modules/shop/controller/GoodsSpecController.java deleted file mode 100644 index 634e70d..0000000 --- a/modules/shop/controller/GoodsSpecController.java +++ /dev/null @@ -1,110 +0,0 @@ -package com.gxwebsoft.shop.controller; - -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.shop.service.GoodsSpecService; -import com.gxwebsoft.shop.entity.GoodsSpec; -import com.gxwebsoft.shop.param.GoodsSpecParam; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.core.web.BatchParam; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 商品多规格控制器 - * - * @author 科技小王子 - * @since 2024-04-03 16:06:23 - */ -@Api(tags = "商品多规格管理") -@RestController -@RequestMapping("/api/shop/goods-spec") -public class GoodsSpecController extends BaseController { - @Resource - private GoodsSpecService goodsSpecService; - - @ApiOperation("分页查询商品多规格") - @GetMapping("/page") - public ApiResult> page(GoodsSpecParam param) { - // 使用关联查询 - return success(goodsSpecService.pageRel(param)); - } - - @ApiOperation("查询全部商品多规格") - @GetMapping() - public ApiResult> list(GoodsSpecParam param) { - // 使用关联查询 - return success(goodsSpecService.listRel(param)); - } - - @ApiOperation("根据id查询商品多规格") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - // 使用关联查询 - return success(goodsSpecService.getByIdRel(id)); - } - - @ApiOperation("添加商品多规格") - @PostMapping() - public ApiResult save(@RequestBody GoodsSpec goodsSpec) { - // 记录当前登录用户id - // User loginUser = getLoginUser(); - // if (loginUser != null) { - // goodsSpec.setUserId(loginUser.getUserId()); - // } - if (goodsSpecService.save(goodsSpec)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @ApiOperation("修改商品多规格") - @PutMapping() - public ApiResult update(@RequestBody GoodsSpec goodsSpec) { - if (goodsSpecService.updateById(goodsSpec)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("删除商品多规格") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (goodsSpecService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @ApiOperation("批量添加商品多规格") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (goodsSpecService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @ApiOperation("批量修改商品多规格") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(goodsSpecService, "id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("批量删除商品多规格") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (goodsSpecService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/modules/shop/controller/MerchantAccountController.java b/modules/shop/controller/MerchantAccountController.java deleted file mode 100644 index 5d65090..0000000 --- a/modules/shop/controller/MerchantAccountController.java +++ /dev/null @@ -1,140 +0,0 @@ -package com.gxwebsoft.shop.controller; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.gxwebsoft.common.core.security.JwtUtil; -import com.gxwebsoft.common.core.utils.RequestUtil; -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.shop.mapper.MerchantAccountMapper; -import com.gxwebsoft.shop.service.MerchantAccountService; -import com.gxwebsoft.shop.entity.MerchantAccount; -import com.gxwebsoft.shop.param.MerchantAccountParam; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.core.web.BatchParam; -import com.gxwebsoft.common.system.entity.User; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import java.util.List; - -/** - * 商户账号控制器 - * - * @author 科技小王子 - * @since 2024-04-19 12:02:24 - */ -@Api(tags = "商户账号管理") -@RestController -@RequestMapping("/api/shop/merchant-account") -public class MerchantAccountController extends BaseController { - @Resource - private MerchantAccountService merchantAccountService; - @Resource - private MerchantAccountMapper merchantAccountMapper; - - @ApiOperation("分页查询商户账号") - @GetMapping("/page") - public ApiResult> page(MerchantAccountParam param) { - // 使用关联查询 - return success(merchantAccountService.pageRel(param)); - } - - @ApiOperation("查询全部商户账号") - @GetMapping() - public ApiResult> list(MerchantAccountParam param) { - // 使用关联查询 - return success(merchantAccountService.listRel(param)); - } - - @ApiOperation("根据id查询商户账号") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - // 使用关联查询 - return success(merchantAccountService.getByIdRel(id)); - } - - @ApiOperation("添加商户账号") - @PostMapping() - public ApiResult save(@RequestBody MerchantAccount merchantAccount, HttpServletRequest request) { - if (merchantAccountService.count(new LambdaQueryWrapper().eq(MerchantAccount::getPhone,merchantAccount.getPhone())) > 0) { - return fail("手机号码已存在"); - } - // 获取远程用户信息 - final RequestUtil requestUtil = new RequestUtil(); - String access_token = JwtUtil.getAccessToken(request); - requestUtil.setAccessToken(access_token); - requestUtil.setTenantId(getTenantId().toString()); - User userByPhone = requestUtil.getUserByPhone(merchantAccount.getPhone()); - // 新增注册 - if (userByPhone == null) { - if (requestUtil.saveUserByPhone(merchantAccount)) { - userByPhone = requestUtil.getUserByPhone(merchantAccount.getPhone()); - } - } - merchantAccount.setUserId(userByPhone.getUserId()); - if (merchantAccountService.save(merchantAccount)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @ApiOperation("修改商户账号") - @PutMapping() - public ApiResult update(@RequestBody MerchantAccount merchantAccount) { - if (merchantAccountService.updateById(merchantAccount)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("删除商户账号") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (merchantAccountService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @ApiOperation("批量添加商户账号") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (merchantAccountService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @ApiOperation("批量修改商户账号") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(merchantAccountService, "id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("批量删除商户账号") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (merchantAccountService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @ApiOperation("根据手机号码查询商户账号信息") - @GetMapping("/getMerchantAccountByPhone") - public ApiResult getMerchantAccountByPhone(MerchantAccountParam param){ - param.setTenantId(getTenantId()); - final MerchantAccount merchantAccount = merchantAccountMapper.getMerchantAccountByPhone(param); - if(merchantAccount == null){ - return fail("账号不存在",null); - } - return success(merchantAccount); - } - -} diff --git a/modules/shop/controller/MerchantApplyController.java b/modules/shop/controller/MerchantApplyController.java deleted file mode 100644 index 6c67c23..0000000 --- a/modules/shop/controller/MerchantApplyController.java +++ /dev/null @@ -1,105 +0,0 @@ -package com.gxwebsoft.shop.controller; - -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.shop.service.MerchantApplyService; -import com.gxwebsoft.shop.entity.MerchantApply; -import com.gxwebsoft.shop.param.MerchantApplyParam; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.core.web.BatchParam; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 商户入驻申请控制器 - * - * @author 科技小王子 - * @since 2024-04-05 01:24:36 - */ -@Api(tags = "商户入驻申请管理") -@RestController -@RequestMapping("/api/shop/merchant-apply") -public class MerchantApplyController extends BaseController { - @Resource - private MerchantApplyService merchantApplyService; - - @ApiOperation("分页查询商户入驻申请") - @GetMapping("/page") - public ApiResult> page(MerchantApplyParam param) { - // 使用关联查询 - return success(merchantApplyService.pageRel(param)); - } - - @ApiOperation("查询全部商户入驻申请") - @GetMapping() - public ApiResult> list(MerchantApplyParam param) { - // 使用关联查询 - return success(merchantApplyService.listRel(param)); - } - - @ApiOperation("根据id查询商户入驻申请") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - // 使用关联查询 - return success(merchantApplyService.getByIdRel(id)); - } - - @ApiOperation("添加商户入驻申请") - @PostMapping() - public ApiResult save(@RequestBody MerchantApply merchantApply) { - if (merchantApplyService.save(merchantApply)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @ApiOperation("修改商户入驻申请") - @PutMapping() - public ApiResult update(@RequestBody MerchantApply merchantApply) { - if (merchantApplyService.updateById(merchantApply)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("删除商户入驻申请") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (merchantApplyService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @ApiOperation("批量添加商户入驻申请") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (merchantApplyService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @ApiOperation("批量修改商户入驻申请") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(merchantApplyService, "apply_id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("批量删除商户入驻申请") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (merchantApplyService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/modules/shop/controller/MerchantController.java b/modules/shop/controller/MerchantController.java deleted file mode 100644 index 7fe07ee..0000000 --- a/modules/shop/controller/MerchantController.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.gxwebsoft.shop.controller; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.gxwebsoft.common.core.security.JwtUtil; -import com.gxwebsoft.common.core.utils.RequestUtil; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.common.core.web.BatchParam; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.shop.entity.Merchant; -import com.gxwebsoft.shop.entity.MerchantAccount; -import com.gxwebsoft.shop.param.MerchantParam; -import com.gxwebsoft.shop.service.MerchantAccountService; -import com.gxwebsoft.shop.service.MerchantService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import java.util.List; - -/** - * 商户控制器 - * - * @author 科技小王子 - * @since 2024-04-05 00:03:54 - */ -@Api(tags = "商户管理") -@RestController -@RequestMapping("/api/shop/merchant") -public class MerchantController extends BaseController { - @Resource - private MerchantService merchantService; - @Resource - private MerchantAccountService merchantAccountService; - - @ApiOperation("分页查询商户") - @GetMapping("/page") - public ApiResult> page(MerchantParam param) { - // 使用关联查询 - System.out.println("param = " + param); - return success(merchantService.pageRel(param)); - } - - @ApiOperation("查询全部商户") - @GetMapping() - public ApiResult> list(MerchantParam param) { - // 使用关联查询 - return success(merchantService.listRel(param)); - } - - @ApiOperation("根据id查询商户") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - // 使用关联查询 - return success(merchantService.getByIdRel(id)); - } - - @PreAuthorize("hasAuthority('shop:merchant:save')") - @ApiOperation("添加商户") - @PostMapping() - public ApiResult save(@RequestBody Merchant merchant, HttpServletRequest request) { - if (merchantService.count(new LambdaQueryWrapper().eq(Merchant::getPhone,merchant.getPhone())) > 0) { - return fail("商户手机号码" + merchant.getPhone() + "已存在"); - } - if (merchantService.save(merchant)) { - // 设置商家后台入口 - merchant.setAdminUrl(merchant.getTenantId() + ".m.wsdns.cn"); - merchantService.updateById(merchant); - // 获取用户信息 - final RequestUtil requestUtil = new RequestUtil(); - String access_token = JwtUtil.getAccessToken(request); - requestUtil.setAccessToken(access_token); - requestUtil.setTenantId(getTenantId().toString()); - final MerchantAccount merchantAccount = new MerchantAccount(); - merchantAccount.setMerchantId(merchant.getMerchantId()); - merchantAccount.setPhone(merchant.getPhone()); - merchantAccount.setPassword(merchant.getPhone().substring(merchant.getPhone().length() - 6)); - merchantAccount.setRealName(merchant.getRealName()); - merchantAccount.setRoleId(merchant.getRoleId()); - merchantAccount.setRoleName(merchant.getRoleName()); - requestUtil.saveUserByPhone(merchantAccount); - merchantAccountService.save(merchantAccount); - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('shop:merchant:update')") - @ApiOperation("修改商户") - @PutMapping() - public ApiResult update(@RequestBody Merchant merchant) { - if (merchantService.updateById(merchant)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('shop:merchant:remove')") - @ApiOperation("删除商户") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (merchantService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @PreAuthorize("hasAuthority('shop:merchant:save')") - @ApiOperation("批量添加商户") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (merchantService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('shop:merchant:update')") - @ApiOperation("批量修改商户") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(merchantService, "merchant_id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('shop:merchant:remove')") - @ApiOperation("批量删除商户") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (merchantService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/modules/shop/controller/MerchantTypeController.java b/modules/shop/controller/MerchantTypeController.java deleted file mode 100644 index 06cded9..0000000 --- a/modules/shop/controller/MerchantTypeController.java +++ /dev/null @@ -1,110 +0,0 @@ -package com.gxwebsoft.shop.controller; - -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.shop.service.MerchantTypeService; -import com.gxwebsoft.shop.entity.MerchantType; -import com.gxwebsoft.shop.param.MerchantTypeParam; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.core.web.BatchParam; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 商户类型控制器 - * - * @author 科技小王子 - * @since 2024-04-05 00:08:51 - */ -@Api(tags = "商户类型管理") -@RestController -@RequestMapping("/api/shop/merchant-type") -public class MerchantTypeController extends BaseController { - @Resource - private MerchantTypeService merchantTypeService; - - @ApiOperation("分页查询商户类型") - @GetMapping("/page") - public ApiResult> page(MerchantTypeParam param) { - // 使用关联查询 - return success(merchantTypeService.pageRel(param)); - } - - @ApiOperation("查询全部商户类型") - @GetMapping() - public ApiResult> list(MerchantTypeParam param) { - // 使用关联查询 - return success(merchantTypeService.listRel(param)); - } - - @ApiOperation("根据id查询商户类型") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - // 使用关联查询 - return success(merchantTypeService.getByIdRel(id)); - } - - @ApiOperation("添加商户类型") - @PostMapping() - public ApiResult save(@RequestBody MerchantType merchantType) { - // 记录当前登录用户id - // User loginUser = getLoginUser(); - // if (loginUser != null) { - // merchantType.setUserId(loginUser.getUserId()); - // } - if (merchantTypeService.save(merchantType)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @ApiOperation("修改商户类型") - @PutMapping() - public ApiResult update(@RequestBody MerchantType merchantType) { - if (merchantTypeService.updateById(merchantType)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("删除商户类型") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (merchantTypeService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @ApiOperation("批量添加商户类型") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (merchantTypeService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @ApiOperation("批量修改商户类型") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(merchantTypeService, "id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("批量删除商户类型") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (merchantTypeService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/modules/shop/controller/OrderController.java b/modules/shop/controller/OrderController.java deleted file mode 100644 index 3a472ec..0000000 --- a/modules/shop/controller/OrderController.java +++ /dev/null @@ -1,107 +0,0 @@ -package com.gxwebsoft.shop.controller; - -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.shop.service.OrderService; -import com.gxwebsoft.shop.entity.Order; -import com.gxwebsoft.shop.param.OrderParam; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.core.web.BatchParam; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 控制器 - * - * @author 科技小王子 - * @since 2024-08-09 16:33:41 - */ -@Api(tags = "管理") -@RestController -@RequestMapping("/api/shop/order") -public class OrderController extends BaseController { - @Resource - private OrderService orderService; - - @ApiOperation("分页查询") - @GetMapping("/page") - public ApiResult> page(OrderParam param) { - // 使用关联查询 - return success(orderService.pageRel(param)); - } - - @ApiOperation("查询全部") - @GetMapping() - public ApiResult> list(OrderParam param) { - // 使用关联查询 - return success(orderService.listRel(param)); - } - - @PreAuthorize("hasAuthority('shop:order:list')") - @ApiOperation("根据id查询") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - // 使用关联查询 - return success(orderService.getByIdRel(id)); - } - - @ApiOperation("添加") - @PostMapping() - public ApiResult save(@RequestBody Order order) { - if (orderService.save(order)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @ApiOperation("修改") - @PutMapping() - public ApiResult update(@RequestBody Order order) { - if (orderService.updateById(order)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("删除") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (orderService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @ApiOperation("批量添加") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (orderService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @ApiOperation("批量修改") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(orderService, "order_id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("批量删除") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (orderService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/modules/shop/controller/OrderGoodsController.java b/modules/shop/controller/OrderGoodsController.java deleted file mode 100644 index 1ae3bba..0000000 --- a/modules/shop/controller/OrderGoodsController.java +++ /dev/null @@ -1,113 +0,0 @@ -package com.gxwebsoft.shop.controller; - -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.shop.service.OrderGoodsService; -import com.gxwebsoft.shop.entity.OrderGoods; -import com.gxwebsoft.shop.param.OrderGoodsParam; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.core.web.BatchParam; -import com.gxwebsoft.common.system.entity.User; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 商品信息控制器 - * - * @author 科技小王子 - * @since 2024-05-26 15:42:03 - */ -@Api(tags = "商品信息管理") -@RestController -@RequestMapping("/api/shop/order-goods") -public class OrderGoodsController extends BaseController { - @Resource - private OrderGoodsService orderGoodsService; - - @ApiOperation("分页查询商品信息") - @GetMapping("/page") - public ApiResult> page(OrderGoodsParam param) { - // 使用关联查询 - return success(orderGoodsService.pageRel(param)); - } - - @ApiOperation("查询全部商品信息") - @GetMapping() - public ApiResult> list(OrderGoodsParam param) { - // 使用关联查询 - return success(orderGoodsService.listRel(param)); - } - - @PreAuthorize("hasAuthority('shop:orderGoods:list')") - @ApiOperation("根据id查询商品信息") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - // 使用关联查询 - return success(orderGoodsService.getByIdRel(id)); - } - - @ApiOperation("添加商品信息") - @PostMapping() - public ApiResult save(@RequestBody OrderGoods orderGoods) { - // 记录当前登录用户id - User loginUser = getLoginUser(); - if (loginUser != null) { - orderGoods.setUserId(loginUser.getUserId()); - } - if (orderGoodsService.save(orderGoods)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @ApiOperation("修改商品信息") - @PutMapping() - public ApiResult update(@RequestBody OrderGoods orderGoods) { - if (orderGoodsService.updateById(orderGoods)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("删除商品信息") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (orderGoodsService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @ApiOperation("批量添加商品信息") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (orderGoodsService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @ApiOperation("批量修改商品信息") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(orderGoodsService, "id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("批量删除商品信息") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (orderGoodsService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/modules/shop/controller/OrderInfoController.java b/modules/shop/controller/OrderInfoController.java deleted file mode 100644 index aa2e255..0000000 --- a/modules/shop/controller/OrderInfoController.java +++ /dev/null @@ -1,107 +0,0 @@ -package com.gxwebsoft.shop.controller; - -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.shop.service.OrderInfoService; -import com.gxwebsoft.shop.entity.OrderInfo; -import com.gxwebsoft.shop.param.OrderInfoParam; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.core.web.BatchParam; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 控制器 - * - * @author 科技小王子 - * @since 2024-08-10 13:44:39 - */ -@Api(tags = "管理") -@RestController -@RequestMapping("/api/shop/order-info") -public class OrderInfoController extends BaseController { - @Resource - private OrderInfoService orderInfoService; - - @ApiOperation("分页查询") - @GetMapping("/page") - public ApiResult> page(OrderInfoParam param) { - // 使用关联查询 - return success(orderInfoService.pageRel(param)); - } - - @ApiOperation("查询全部") - @GetMapping() - public ApiResult> list(OrderInfoParam param) { - // 使用关联查询 - return success(orderInfoService.listRel(param)); - } - - @PreAuthorize("hasAuthority('shop:orderInfo:list')") - @ApiOperation("根据id查询") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - // 使用关联查询 - return success(orderInfoService.getByIdRel(id)); - } - - @ApiOperation("添加") - @PostMapping() - public ApiResult save(@RequestBody OrderInfo orderInfo) { - if (orderInfoService.save(orderInfo)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @ApiOperation("修改") - @PutMapping() - public ApiResult update(@RequestBody OrderInfo orderInfo) { - if (orderInfoService.updateById(orderInfo)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("删除") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (orderInfoService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @ApiOperation("批量添加") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (orderInfoService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @ApiOperation("批量修改") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(orderInfoService, "id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("批量删除") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (orderInfoService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/modules/shop/controller/OrderInfoLogController.java b/modules/shop/controller/OrderInfoLogController.java deleted file mode 100644 index bf6bae5..0000000 --- a/modules/shop/controller/OrderInfoLogController.java +++ /dev/null @@ -1,112 +0,0 @@ -package com.gxwebsoft.shop.controller; - -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.shop.service.OrderInfoLogService; -import com.gxwebsoft.shop.entity.OrderInfoLog; -import com.gxwebsoft.shop.param.OrderInfoLogParam; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.core.web.BatchParam; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 订单核销控制器 - * - * @author 科技小王子 - * @since 2024-05-14 13:20:04 - */ -@Api(tags = "订单核销管理") -@RestController -@RequestMapping("/api/shop/order-info-log") -public class OrderInfoLogController extends BaseController { - @Resource - private OrderInfoLogService orderInfoLogService; - - @ApiOperation("分页查询订单核销") - @GetMapping("/page") - public ApiResult> page(OrderInfoLogParam param) { - // 使用关联查询 - return success(orderInfoLogService.pageRel(param)); - } - - @ApiOperation("查询全部订单核销") - @GetMapping() - public ApiResult> list(OrderInfoLogParam param) { - // 使用关联查询 - return success(orderInfoLogService.listRel(param)); - } - - @PreAuthorize("hasAuthority('shop:orderInfoLog:list')") - @ApiOperation("根据id查询订单核销") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - // 使用关联查询 - return success(orderInfoLogService.getByIdRel(id)); - } - - @ApiOperation("添加订单核销") - @PostMapping() - public ApiResult save(@RequestBody OrderInfoLog orderInfoLog) { - // 记录当前登录用户id - // User loginUser = getLoginUser(); - // if (loginUser != null) { - // orderInfoLog.setUserId(loginUser.getUserId()); - // } - if (orderInfoLogService.save(orderInfoLog)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @ApiOperation("修改订单核销") - @PutMapping() - public ApiResult update(@RequestBody OrderInfoLog orderInfoLog) { - if (orderInfoLogService.updateById(orderInfoLog)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("删除订单核销") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (orderInfoLogService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @ApiOperation("批量添加订单核销") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (orderInfoLogService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @ApiOperation("批量修改订单核销") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(orderInfoLogService, "id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("批量删除订单核销") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (orderInfoLogService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/modules/shop/controller/RechargeOrderController.java b/modules/shop/controller/RechargeOrderController.java deleted file mode 100644 index 2d91463..0000000 --- a/modules/shop/controller/RechargeOrderController.java +++ /dev/null @@ -1,182 +0,0 @@ -package com.gxwebsoft.shop.controller; - -import cn.hutool.core.util.IdUtil; -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.common.system.service.UserService; -import com.gxwebsoft.shop.entity.UserBalanceLog; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.core.web.BatchParam; -import com.gxwebsoft.common.system.entity.User; -import com.gxwebsoft.shop.service.UserBalanceLogService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.List; - -import static com.gxwebsoft.common.core.constants.BalanceConstants.BALANCE_ADMIN; - -/** - * 会员充值订单表控制器 - * - * @author 科技小王子 - * @since 2024-07-26 23:18:48 - */ -@Api(tags = "会员充值订单表管理") -@RestController -@RequestMapping("/api/shop/recharge-order") -public class RechargeOrderController extends BaseController { - @Resource - private RechargeOrderService rechargeOrderService; - @Resource - private UserService userService; - @Resource - private UserBalanceLogService userBalanceLogService; - - @PreAuthorize("hasAuthority('shop:rechargeOrder:save')") - @ApiOperation("会员充值") - @PostMapping("/recharge") - @Transactional(rollbackFor = {Exception.class}) - public ApiResult recharge(@RequestBody RechargeOrder rechargeOrder) { - // 充值 - User user = userService.getById(rechargeOrder.getUserId()); - BigDecimal balance = user.getBalance().add(rechargeOrder.getPayPrice()); - user.setBalance(balance); - userService.updateById(user); - // 保存充值记录 - rechargeOrder.setOrderNo(Long.toString(IdUtil.getSnowflakeNextId())); - rechargeOrder.setBalance(balance); - if (rechargeOrderService.save(rechargeOrder)) { - // 记录余额明细 - UserBalanceLog userBalanceLog = new UserBalanceLog(); - userBalanceLog.setUserId(rechargeOrder.getUserId()); - userBalanceLog.setScene(BALANCE_ADMIN); - userBalanceLog.setMoney(rechargeOrder.getPayPrice()); - userBalanceLog.setBalance(balance); - userBalanceLog.setComments("操作人：" + getLoginUser().getNickname()); - userBalanceLog.setRemark(rechargeOrder.getComments()); - userBalanceLog.setMerchantCode(rechargeOrder.getMerchantCode()); - userBalanceLogService.save(userBalanceLog); - return success("充值成功", user); - } - return fail("充值失败"); - } - - @PreAuthorize("hasAuthority('shop:rechargeOrder:list')") - @ApiOperation("分页查询会员充值订单表") - @GetMapping("/page") - public ApiResult> page(RechargeOrderParam param) { - // 使用关联查询 - return success(rechargeOrderService.pageRel(param)); - } - - @PreAuthorize("hasAuthority('shop:rechargeOrder:list')") - @ApiOperation("查询全部会员充值订单表") - @GetMapping() - public ApiResult> list(RechargeOrderParam param) { - // 使用关联查询 - return success(rechargeOrderService.listRel(param)); - } - - @PreAuthorize("hasAuthority('shop:rechargeOrder:list')") - @ApiOperation("根据id查询会员充值订单表") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - // 使用关联查询 - return success(rechargeOrderService.getByIdRel(id)); - } - - @ApiOperation("添加会员充值订单表") - @PostMapping() - public ApiResult save(@RequestBody RechargeOrder rechargeOrder) { - // 记录当前登录用户id - User loginUser = getLoginUser(); - if (loginUser != null) { - rechargeOrder.setUserId(loginUser.getUserId()); - } - if (rechargeOrderService.save(rechargeOrder)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @ApiOperation("修改会员充值订单表") - @PutMapping() - public ApiResult update(@RequestBody RechargeOrder rechargeOrder) { - if (rechargeOrderService.updateById(rechargeOrder)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("删除会员充值订单表") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (rechargeOrderService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @PreAuthorize("hasAuthority('shop:rechargeOrder:save')") - @ApiOperation("批量充值") - @PostMapping("/batchRecharge") - @Transactional(rollbackFor = {Exception.class}) - public ApiResult batchRecharge(@RequestBody List list) { - if (rechargeOrderService.saveBatch(list)) { - String nickname = getLoginUser().getNickname(); - ArrayList users = new ArrayList<>(list.size()); - ArrayList logs = new ArrayList<>(list.size()); - - list.forEach(d -> { - User user = userService.getByIdRel(d.getUserId()); - BigDecimal balance = user.getBalance().add(d.getPayPrice()); - user.setBalance(balance); - users.add(user); - UserBalanceLog userBalanceLog = new UserBalanceLog(); - userBalanceLog.setUserId(d.getUserId()); - userBalanceLog.setScene(BALANCE_ADMIN); - userBalanceLog.setMoney(d.getPayPrice()); - userBalanceLog.setBalance(balance); - userBalanceLog.setComments("操作人：" + nickname); - userBalanceLog.setRemark(d.getComments()); - userBalanceLog.setMerchantCode(d.getMerchantCode()); - logs.add(userBalanceLog); - }); - - // 批量充值 - userService.updateBatchById(users); - // 记录余额明细 - userBalanceLogService.saveBatch(logs); - return success("充值成功"); - } - return fail("充值失败"); - } - - @PreAuthorize("hasAuthority('shop:rechargeOrder:update')") - @ApiOperation("批量修改会员充值订单表") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(rechargeOrderService, "order_id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('shop:rechargeOrder:remove')") - @ApiOperation("批量删除会员充值订单表") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (rechargeOrderService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/modules/shop/controller/SpecController.java b/modules/shop/controller/SpecController.java deleted file mode 100644 index 4857d77..0000000 --- a/modules/shop/controller/SpecController.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.gxwebsoft.shop.controller; - -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.shop.service.SpecService; -import com.gxwebsoft.shop.entity.Spec; -import com.gxwebsoft.shop.param.SpecParam; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.core.web.BatchParam; -import com.gxwebsoft.common.system.entity.User; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 规格控制器 - * - * @author 科技小王子 - * @since 2024-07-25 03:00:41 - */ -@Api(tags = "规格管理") -@RestController -@RequestMapping("/api/shop/spec") -public class SpecController extends BaseController { - @Resource - private SpecService specService; - - @ApiOperation("分页查询规格") - @GetMapping("/page") - public ApiResult> page(SpecParam param) { - // 使用关联查询 - return success(specService.pageRel(param)); - } - - @ApiOperation("查询全部规格") - @GetMapping() - public ApiResult> list(SpecParam param) { - // 使用关联查询 - return success(specService.listRel(param)); - } - - @PreAuthorize("hasAuthority('shop:spec:list')") - @ApiOperation("根据id查询规格") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - // 使用关联查询 - return success(specService.getByIdRel(id)); - } - - @PreAuthorize("hasAuthority('shop:spec:save')") - @ApiOperation("添加规格") - @PostMapping() - public ApiResult save(@RequestBody Spec spec) { - // 记录当前登录用户id - User loginUser = getLoginUser(); - if (loginUser != null) { - spec.setUserId(loginUser.getUserId()); - } - if (specService.save(spec)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('shop:spec:update')") - @ApiOperation("修改规格") - @PutMapping() - public ApiResult update(@RequestBody Spec spec) { - if (specService.updateById(spec)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('shop:spec:remove')") - @ApiOperation("删除规格") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (specService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @PreAuthorize("hasAuthority('shop:spec:save')") - @ApiOperation("批量添加规格") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (specService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - - @PreAuthorize("hasAuthority('shop:spec:update')") - @ApiOperation("批量修改规格") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(specService, "spec_id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - @PreAuthorize("hasAuthority('shop:spec:remove')") - @ApiOperation("批量删除规格") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (specService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/modules/shop/controller/SpecValueController.java b/modules/shop/controller/SpecValueController.java deleted file mode 100644 index 6a05842..0000000 --- a/modules/shop/controller/SpecValueController.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.gxwebsoft.shop.controller; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.common.core.web.BatchParam; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.shop.entity.SpecValue; -import com.gxwebsoft.shop.param.SpecValueParam; -import com.gxwebsoft.shop.service.SpecValueService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 规格值控制器 - * - * @author 科技小王子 - * @since 2024-04-01 09:49:15 - */ -@Api(tags = "规格值管理") -@RestController -@RequestMapping("/api/shop/spec-value") -public class SpecValueController extends BaseController { - @Resource - private SpecValueService specValueService; - - @ApiOperation("分页查询规格值") - @GetMapping("/page") - public ApiResult> page(SpecValueParam param) { - // 使用关联查询 - return success(specValueService.pageRel(param)); - } - - @ApiOperation("查询全部规格值") - @GetMapping() - public ApiResult> list(SpecValueParam param) { - // 使用关联查询 - return success(specValueService.listRel(param)); - } - - @ApiOperation("根据id查询规格值") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - // 使用关联查询 - return success(specValueService.getByIdRel(id)); - } - - @ApiOperation("添加规格值") - @PostMapping() - public ApiResult save(@RequestBody SpecValue specValue) { - if (specValueService.count(new LambdaQueryWrapper().eq(SpecValue::getSpecId,specValue.getSpecId()).eq(SpecValue::getSpecValue,specValue.getSpecValue())) > 0) { - return fail("规格值已存在"); - } - if (specValueService.save(specValue)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @ApiOperation("修改规格值") - @PutMapping() - public ApiResult update(@RequestBody SpecValue specValue) { - if (specValueService.updateById(specValue)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("删除规格值") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (specValueService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @ApiOperation("批量添加规格值") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (specValueService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @ApiOperation("批量修改规格值") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(specValueService, "spec_value_id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("批量删除规格值") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (specValueService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/modules/shop/controller/UserAddressController.java b/modules/shop/controller/UserAddressController.java deleted file mode 100644 index abf3c17..0000000 --- a/modules/shop/controller/UserAddressController.java +++ /dev/null @@ -1,117 +0,0 @@ -package com.gxwebsoft.shop.controller; - -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.shop.service.UserAddressService; -import com.gxwebsoft.shop.entity.UserAddress; -import com.gxwebsoft.shop.param.UserAddressParam; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.core.web.BatchParam; -import com.gxwebsoft.common.system.entity.User; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 收货地址控制器 - * - * @author 科技小王子 - * @since 2024-05-26 10:58:37 - */ -@Api(tags = "收货地址管理") -@RestController -@RequestMapping("/api/shop/user-address") -public class UserAddressController extends BaseController { - @Resource - private UserAddressService userAddressService; - - @ApiOperation("分页查询收货地址") - @GetMapping("/page") - public ApiResult> page(UserAddressParam param) { - // 使用关联查询 - return success(userAddressService.pageRel(param)); - } - - @ApiOperation("查询全部收货地址") - @GetMapping() - public ApiResult> list(UserAddressParam param) { - // 使用关联查询 - return success(userAddressService.listRel(param)); - } - - @PreAuthorize("hasAuthority('shop:userAddress:list')") - @ApiOperation("根据id查询收货地址") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - // 使用关联查询 - return success(userAddressService.getByIdRel(id)); - } - - @ApiOperation("添加收货地址") - @PostMapping() - public ApiResult save(@RequestBody UserAddress userAddress) { - // 记录当前登录用户id - User loginUser = getLoginUser(); - if (loginUser != null) { - userAddress.setUserId(loginUser.getUserId()); - } - if (userAddressService.save(userAddress)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @ApiOperation("修改收货地址") - @PutMapping() - public ApiResult update(@RequestBody UserAddress userAddress) { - if (userAddress.getIsDefault() != null && userAddress.getIsDefault().equals(true)) { - final boolean update = userAddressService.update(new LambdaUpdateWrapper().eq(UserAddress::getUserId, getLoginUserId()).set(UserAddress::getIsDefault, 0)); - } - if (userAddressService.updateById(userAddress)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("删除收货地址") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (userAddressService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @ApiOperation("批量添加收货地址") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (userAddressService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @ApiOperation("批量修改收货地址") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(userAddressService, "id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("批量删除收货地址") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (userAddressService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/modules/shop/controller/UserBalanceLogController.java b/modules/shop/controller/UserBalanceLogController.java deleted file mode 100644 index c126577..0000000 --- a/modules/shop/controller/UserBalanceLogController.java +++ /dev/null @@ -1,142 +0,0 @@ -package com.gxwebsoft.shop.controller; - -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.shop.service.UserBalanceLogService; -import com.gxwebsoft.shop.entity.UserBalanceLog; -import com.gxwebsoft.shop.param.UserBalanceLogParam; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.core.web.BatchParam; -import com.gxwebsoft.common.system.entity.User; -import com.gxwebsoft.common.system.service.UserService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.math.BigDecimal; -import java.util.List; - -import static com.gxwebsoft.common.core.constants.BalanceConstants.BALANCE_ADMIN; - -/** - * 用户余额变动明细表控制器 - * - * @author 科技小王子 - * @since 2024-05-29 15:57:44 - */ -@Api(tags = "用户余额变动明细表管理") -@RestController -@RequestMapping("/api/shop/user-balance-log") -public class UserBalanceLogController extends BaseController { - @Resource - private UserBalanceLogService userBalanceLogService; - @Resource - private UserService userService; - - @ApiOperation("分页查询用户余额变动明细表") - @GetMapping("/page") - public ApiResult> page(UserBalanceLogParam param) { - // 使用关联查询 - return success(userBalanceLogService.pageRel(param)); - } - - @ApiOperation("查询全部用户余额变动明细表") - @GetMapping() - public ApiResult> list(UserBalanceLogParam param) { - // 使用关联查询 - return success(userBalanceLogService.listRel(param)); - } - - @PreAuthorize("hasAuthority('shop:userBalanceLog:list')") - @ApiOperation("根据id查询用户余额变动明细表") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - // 使用关联查询 - return success(userBalanceLogService.getByIdRel(id)); - } - - @ApiOperation("添加用户余额变动明细表") - @PostMapping() - public ApiResult save(@RequestBody UserBalanceLog userBalanceLog) { - if (userBalanceLog.getUserId() == null) { - return fail("用户ID不能为空"); - } - if (userBalanceLog.getMoney() == null || userBalanceLog.getMoney().compareTo(BigDecimal.ZERO) <= 0) { - return fail("充值金额必须大于0"); - } - User user = userService.addBalanceInner(userBalanceLog.getUserId(), userBalanceLog.getMoney()); - if (user == null) { - return fail("用户不存在"); - } - User loginUser = getLoginUser(); - if (userBalanceLog.getScene() == null) { - userBalanceLog.setScene(BALANCE_ADMIN); - } - userBalanceLog.setBalance(user.getBalance()); - if (loginUser != null && userBalanceLog.getAdminId() == null) { - userBalanceLog.setAdminId(loginUser.getUserId()); - } - if ((userBalanceLog.getComments() == null || userBalanceLog.getComments().trim().isEmpty()) - && userBalanceLog.getRemark() != null) { - userBalanceLog.setComments(userBalanceLog.getRemark()); - } - if (userBalanceLog.getStatus() == null) { - userBalanceLog.setStatus(0); - } - if (userBalanceLog.getDeleted() == null) { - userBalanceLog.setDeleted(0); - } - if (userBalanceLogService.save(userBalanceLog)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @ApiOperation("修改用户余额变动明细表") - @PutMapping() - public ApiResult update(@RequestBody UserBalanceLog userBalanceLog) { - if (userBalanceLogService.updateById(userBalanceLog)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("删除用户余额变动明细表") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (userBalanceLogService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @ApiOperation("批量添加用户余额变动明细表") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (userBalanceLogService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @ApiOperation("批量修改用户余额变动明细表") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(userBalanceLogService, "log_id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("批量删除用户余额变动明细表") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (userBalanceLogService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/modules/shop/controller/UserCollectionController.java b/modules/shop/controller/UserCollectionController.java deleted file mode 100644 index dcb1496..0000000 --- a/modules/shop/controller/UserCollectionController.java +++ /dev/null @@ -1,112 +0,0 @@ -package com.gxwebsoft.shop.controller; - -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.shop.service.UserCollectionService; -import com.gxwebsoft.shop.entity.UserCollection; -import com.gxwebsoft.shop.param.UserCollectionParam; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.core.web.BatchParam; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 我的收藏控制器 - * - * @author 科技小王子 - * @since 2024-04-28 18:17:37 - */ -@Api(tags = "我的收藏管理") -@RestController -@RequestMapping("/api/shop/user-collection") -public class UserCollectionController extends BaseController { - @Resource - private UserCollectionService userCollectionService; - - @ApiOperation("分页查询我的收藏") - @GetMapping("/page") - public ApiResult> page(UserCollectionParam param) { - // 使用关联查询 - return success(userCollectionService.pageRel(param)); - } - - @ApiOperation("查询全部我的收藏") - @GetMapping() - public ApiResult> list(UserCollectionParam param) { - // 使用关联查询 - return success(userCollectionService.listRel(param)); - } - - @PreAuthorize("hasAuthority('shop:userCollection:list')") - @ApiOperation("根据id查询我的收藏") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - // 使用关联查询 - return success(userCollectionService.getByIdRel(id)); - } - - @ApiOperation("添加我的收藏") - @PostMapping() - public ApiResult save(@RequestBody UserCollection userCollection) { - // 记录当前登录用户id - // User loginUser = getLoginUser(); - // if (loginUser != null) { - // userCollection.setUserId(loginUser.getUserId()); - // } - if (userCollectionService.save(userCollection)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @ApiOperation("修改我的收藏") - @PutMapping() - public ApiResult update(@RequestBody UserCollection userCollection) { - if (userCollectionService.updateById(userCollection)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("删除我的收藏") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (userCollectionService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @ApiOperation("批量添加我的收藏") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (userCollectionService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @ApiOperation("批量修改我的收藏") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(userCollectionService, "id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("批量删除我的收藏") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (userCollectionService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/modules/shop/controller/UsersController.java b/modules/shop/controller/UsersController.java deleted file mode 100644 index 5588a8a..0000000 --- a/modules/shop/controller/UsersController.java +++ /dev/null @@ -1,107 +0,0 @@ -package com.gxwebsoft.shop.controller; - -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.shop.service.UsersService; -import com.gxwebsoft.shop.entity.Users; -import com.gxwebsoft.shop.param.UsersParam; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.core.web.BatchParam; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 控制器 - * - * @author 科技小王子 - * @since 2024-08-09 15:20:25 - */ -@Api(tags = "管理") -@RestController -@RequestMapping("/api/shop/users") -public class UsersController extends BaseController { - @Resource - private UsersService usersService; - - @ApiOperation("分页查询") - @GetMapping("/page") - public ApiResult> page(UsersParam param) { - // 使用关联查询 - return success(usersService.pageRel(param)); - } - - @ApiOperation("查询全部") - @GetMapping() - public ApiResult> list(UsersParam param) { - // 使用关联查询 - return success(usersService.listRel(param)); - } - - @PreAuthorize("hasAuthority('shop:users:list')") - @ApiOperation("根据id查询") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - // 使用关联查询 - return success(usersService.getByIdRel(id)); - } - - @ApiOperation("添加") - @PostMapping() - public ApiResult save(@RequestBody Users users) { - if (usersService.save(users)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @ApiOperation("修改") - @PutMapping() - public ApiResult update(@RequestBody Users users) { - if (usersService.updateById(users)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("删除") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (usersService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @ApiOperation("批量添加") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (usersService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @ApiOperation("批量修改") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(usersService, "id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @ApiOperation("批量删除") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (usersService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/modules/shop/controller/WechatDepositController.java b/modules/shop/controller/WechatDepositController.java deleted file mode 100644 index 51bad65..0000000 --- a/modules/shop/controller/WechatDepositController.java +++ /dev/null @@ -1,118 +0,0 @@ -package com.gxwebsoft.shop.controller; - -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.shop.service.WechatDepositService; -import com.gxwebsoft.shop.entity.WechatDeposit; -import com.gxwebsoft.shop.param.WechatDepositParam; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.core.web.BatchParam; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 押金控制器 - * - * @author 科技小王子 - * @since 2024-05-03 15:50:28 - */ -@Api(tags = "押金管理") -@RestController -@RequestMapping("/api/shop/wechat-deposit") -public class WechatDepositController extends BaseController { - @Resource - private WechatDepositService wechatDepositService; - - @ApiOperation("分页查询押金") - @GetMapping("/page") - public ApiResult> page(WechatDepositParam param) { - // 使用关联查询 - return success(wechatDepositService.pageRel(param)); - } - - @ApiOperation("查询全部押金") - @GetMapping() - public ApiResult> list(WechatDepositParam param) { - // 使用关联查询 - return success(wechatDepositService.listRel(param)); - } - - @PreAuthorize("hasAuthority('shop:wechatDeposit:list')") - @ApiOperation("根据id查询押金") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - // 使用关联查询 - return success(wechatDepositService.getByIdRel(id)); - } - - @PreAuthorize("hasAuthority('shop:wechatDeposit:list')") - @ApiOperation("添加押金") - @PostMapping() - public ApiResult save(@RequestBody WechatDeposit wechatDeposit) { - // 记录当前登录用户id - // User loginUser = getLoginUser(); - // if (loginUser != null) { - // wechatDeposit.setUserId(loginUser.getUserId()); - // } - if (wechatDepositService.save(wechatDeposit)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('shop:wechatDeposit:update')") - @ApiOperation("修改押金") - @PutMapping() - public ApiResult update(@RequestBody WechatDeposit wechatDeposit) { - if (wechatDepositService.updateById(wechatDeposit)) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('shop:wechatDeposit:remove')") - @ApiOperation("删除押金") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (wechatDepositService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); - } - - @PreAuthorize("hasAuthority('shop:wechatDeposit:save')") - @ApiOperation("批量添加押金") - @PostMapping("/batch") - public ApiResult saveBatch(@RequestBody List list) { - if (wechatDepositService.saveBatch(list)) { - return success("添加成功"); - } - return fail("添加失败"); - } - - @PreAuthorize("hasAuthority('shop:wechatDeposit:update')") - @ApiOperation("批量修改押金") - @PutMapping("/batch") - public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(wechatDepositService, "id")) { - return success("修改成功"); - } - return fail("修改失败"); - } - - @PreAuthorize("hasAuthority('shop:wechatDeposit:remove')") - @ApiOperation("批量删除押金") - @DeleteMapping("/batch") - public ApiResult removeBatch(@RequestBody List ids) { - if (wechatDepositService.removeByIds(ids)) { - return success("删除成功"); - } - return fail("删除失败"); - } - -} diff --git a/modules/shop/controller/WxNativePayController.java b/modules/shop/controller/WxNativePayController.java deleted file mode 100644 index 6b714b6..0000000 --- a/modules/shop/controller/WxNativePayController.java +++ /dev/null @@ -1,158 +0,0 @@ -package com.gxwebsoft.shop.controller; - -import cn.hutool.core.util.IdUtil; -import com.alibaba.fastjson.JSONObject; -import com.gxwebsoft.common.core.config.ConfigProperties; -import com.gxwebsoft.common.core.utils.RedisUtil; -import com.gxwebsoft.common.core.utils.WxNativeUtil; -import com.gxwebsoft.common.core.web.ApiResult; -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.common.system.entity.User; -import com.gxwebsoft.shop.entity.Order; -import com.gxwebsoft.common.system.entity.Payment; -import com.gxwebsoft.common.system.param.SettingParam; -import com.gxwebsoft.shop.service.OrderService; -import com.gxwebsoft.common.system.service.SettingService; -import com.wechat.pay.java.core.Config; -import com.wechat.pay.java.core.RSAAutoCertificateConfig; -import com.wechat.pay.java.service.payments.nativepay.NativePayService; -import com.wechat.pay.java.service.payments.nativepay.model.Amount; -import com.wechat.pay.java.service.payments.nativepay.model.PrepayRequest; -import com.wechat.pay.java.service.payments.nativepay.model.PrepayResponse; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiModelProperty; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.math.BigDecimal; -import java.util.Map; - - -@Api(tags = "微信Native支付接口") -@RestController -@RequestMapping("/api/shop/wx-native-pay") -public class WxNativePayController extends BaseController { - @Value("${spring.profiles.active}") - String active; - public static String merchantId = "1246610101"; - public static String privateKeyPath = "/Users/gxwebsoft/JAVA/com.gxwebsoft.core/src/main/resources/cert/apiclient_key.pem"; - public static String merchantSerialNumber = "48749613B40AA8F1D768583FC352358E13EB5AF0"; - public static String apiV3Key = "zGufUcqa7ovgxRL0kF5OlPr482EZwtn9"; - @Resource - private RedisUtil redisUtil; - private Config wxPayConfig; - @Resource - private ConfigProperties config; - @Resource - private SettingService settingService; - @Resource - private OrderService orderService; - - - @ApiOperation("生成付款码") - @PostMapping("/codeUrl") - public ApiResult getCodeUrl(@RequestBody Order order) { - final User loginUser = getLoginUser(); - if(loginUser == null){ - return fail("请先登录"); - } - String key = "Payment:wxPay:".concat(getTenantId().toString()); - final Payment payment = redisUtil.get(key, Payment.class); - if (payment == null) { - return fail("微信支付未配置"); - } - // 获取微信小程序配置信息 - final String string = redisUtil.get("mp-weixin:".concat(getTenantId().toString())); - if(string == null){ - return fail("微信小程序未配置"); - } - final JSONObject jsonObject = JSONObject.parseObject(string); - final String appId = jsonObject.getString("appId"); - - // 处理订单数据 - order.setTenantId(loginUser.getTenantId()); - order.setUid(loginUser.getUserId()); -// order.setRealName(loginUser.getRealName()); - order.setPhone(loginUser.getPhone()); -// order.setExpirationTime(DateUtil.offset(DateUtil.date(), DateField.MONTH, order.getTotalNum())); - - // 使用自动更新平台证书的RSA配置 - // 一个商户号只能初始化一个配置，否则会因为重复的下载任务报错 - - // 构建service - NativePayService service = new NativePayService.Builder().config(this.getWxPayConfig()).build(); - // request.setXxx(val)设置所需参数，具体参数可见Request定义 - PrepayRequest request = new PrepayRequest(); - // 计算金额 - order.setMoney(new BigDecimal("0.01")); // order.getPayPrice().toString() - long orderNo = IdUtil.getSnowflakeNextId(); - order.setOrderNo(Long.toString(orderNo)); - BigDecimal decimal = order.getMoney(); - final BigDecimal multiply = decimal.multiply(new BigDecimal(100)); - // 将 BigDecimal 转换为 Integer - Integer money = multiply.intValue(); - Amount amount = new Amount(); - amount.setTotal(money); - request.setAmount(amount); - request.setAppid(appId); - request.setMchid(payment.getMchId()); - request.setDescription(order.getComments()); - request.setNotifyUrl("https://modules.gxwebsoft.com/api/shop/wx-native-pay/notify/" + getTenantId()); - request.setOutTradeNo(order.getOrderNo()); - // 调用下单方法，得到应答 - PrepayResponse response = service.prepay(request); - // 使用微信扫描 code_url 对应的二维码，即可体验Native支付 -// System.out.println(response.getCodeUrl()); - // 生成指定url对应的二维码到文件，宽和高都是300像素 -// QrCodeUtil.generate(response.getCodeUrl(), 300, 300, FileUtil.file("/Users/gxwebsoft/Documents/uploads/wx-native-qrcode.jpg")); - orderService.save(order); - - return success("生成付款码", response.getCodeUrl()); - } - - - private Config getWxPayConfig() { - // 获取租户ID - final Integer tenantId = getTenantId(); - Config build = WxNativeUtil.getConfig(tenantId); - if (build != null) { - return build; - } - String key = "Payment:wxPay:".concat(tenantId.toString()); - final Payment payment = redisUtil.get(key, Payment.class); - System.out.println("payment = " + payment); - String apiclientKey = config.getUploadPath().concat("/file").concat(payment.getApiclientKey()); - // 开发环境配置 - if(active.equals("dev")){ - apiclientKey = privateKeyPath; - } - Config config = new RSAAutoCertificateConfig.Builder() - .merchantId(payment.getMchId()) - .privateKeyFromPath(apiclientKey) - .merchantSerialNumber(payment.getMerchantSerialNumber()) - .apiV3Key(payment.getApiKey()) - .build(); - System.out.println("config = " + config); - WxNativeUtil.addConfig(tenantId, config); - return config; - } - - @ApiModelProperty("异步通知") - @PostMapping("/notify/{tenantId}") - public String wxNotify(@RequestHeader Map header, @RequestBody String body, @PathVariable("tenantId") Integer tenantId) { - System.out.println("异步通知*************** = "); - System.out.println("request header = " + header); - System.out.println("request body = " + body); - System.out.println("tenantId = " + tenantId); - - // 获取支付配置信息用于解密 - final SettingParam param = new SettingParam(); - param.setSettingKey("payment"); - param.setTenantId(tenantId); - final String uploadPath = config.getUploadPath(); // 服务器本地路径 - - return "fail"; - } -} diff --git a/modules/shop/controller/WxPayNotifyController.java b/modules/shop/controller/WxPayNotifyController.java deleted file mode 100644 index 56924c4..0000000 --- a/modules/shop/controller/WxPayNotifyController.java +++ /dev/null @@ -1,148 +0,0 @@ -package com.gxwebsoft.shop.controller; - -import com.gxwebsoft.booking.service.UserCardService; -import com.gxwebsoft.common.core.config.ConfigProperties; -import com.gxwebsoft.common.core.utils.RedisUtil; -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.shop.entity.Order; -import com.gxwebsoft.shop.entity.OrderInfo; -import com.gxwebsoft.shop.entity.Payment; -import com.gxwebsoft.shop.service.OrderInfoService; -import com.gxwebsoft.shop.service.OrderService; -import com.gxwebsoft.shop.service.UsersService; -import com.wechat.pay.java.core.notification.NotificationConfig; -import com.wechat.pay.java.core.notification.NotificationParser; -import com.wechat.pay.java.core.notification.RSANotificationConfig; -import com.wechat.pay.java.service.partnerpayments.jsapi.model.Transaction; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiModelProperty; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.Map; - -/** - * 会员特权购买记录表控制器 - * - * @author 科技小王子 - * @since 2023-06-20 18:07:50 - */ -@Api(tags = "微信支付结果通知") -@RestController -@RequestMapping("/api/shop/wx-pay") -public class WxPayNotifyController extends BaseController { - @Value("${spring.profiles.active}") - String active; - @Resource - private OrderService orderService; - @Resource - private OrderInfoService orderInfoService; - @Resource - private UsersService usersService; - @Resource - private UserCardService userCardService; - @Resource - private RedisUtil redisUtil; - @Resource - private ConfigProperties conf; - // 本地证书 - public static String wechatpayCertPath = "/Users/gxwebsoft/JAVA/com.gxwebsoft.core/src/main/resources/cert/wechatpay_4A3231584E93B6AE77820074D07EADEACCB7E223.pem"; // 平台证书 - - @ApiModelProperty("异步通知") - @PostMapping("/notify/{tenantId}") - public String wxNotify(@RequestHeader Map header, @RequestBody String body, @PathVariable("tenantId") Integer tenantId) { - System.out.println("异步通知*************** = "); - System.out.println("request header = " + header); - System.out.println("request body = " + body); - System.out.println("tenantId = " + tenantId); - - // 获取支付配置信息用于解密 - String key = "Payment:1:".concat(tenantId.toString()); - final Payment payment = redisUtil.get(key, Payment.class); - String privateKey = payment.getApiKey(); - String apiclientCert = conf.getUploadPath().concat("/file").concat(payment.getApiclientCert()); - // 开发环境配置 - if(active.equals("dev")){ - apiclientCert = wechatpayCertPath; - } - - com.wechat.pay.java.core.notification.RequestParam requestParam = new com.wechat.pay.java.core.notification.RequestParam.Builder() - .serialNumber(header.get("wechatpay-serial")) - .nonce(header.get("wechatpay-nonce")) - .signature(header.get("wechatpay-signature")) - .timestamp(header.get("wechatpay-timestamp")) - .body(body) - .build(); - - System.out.println("payment = " + payment); - System.out.println("requestParam = " + requestParam); - - // 如果已经初始化了 RSAAutoCertificateConfig，可直接使用 - // 没有的话，则构造一个 - NotificationConfig config = new RSANotificationConfig.Builder() - .apiV3Key(privateKey) - .certificatesFromPath(apiclientCert) - .build(); - - - // 初始化 NotificationParser - NotificationParser parser = new NotificationParser(config); - - // 以支付通知回调为例，验签、解密并转换成 Transaction - try { - Transaction transaction = parser.parse(requestParam, Transaction.class); - final String outTradeNo = transaction.getOutTradeNo(); - final String transactionId = transaction.getTransactionId(); - final Integer total = transaction.getAmount().getTotal(); - final String tradeStateDesc = transaction.getTradeStateDesc(); - final Transaction.TradeStateEnum tradeState = transaction.getTradeState(); - final Transaction.TradeTypeEnum tradeType = transaction.getTradeType(); - System.out.println("transaction = " + transaction); - System.out.println("tradeStateDesc = " + tradeStateDesc); - System.out.println("tradeType = " + tradeType); - System.out.println("tradeState = " + tradeState); - System.out.println("outTradeNo = " + outTradeNo); - System.out.println("amount = " + total); - -// if (StrUtil.equals("支付成功", tradeStateDesc)) { - // 1. 查询要处理的订单 -// Order order = orderService.getByOutTradeNo(outTradeNo); - // 2. 已支付则跳过 -// if (order.getPayStatus().equals(1)) { -// return "SUCCESS"; -// } - // 2. 未支付则处理更新订单状态 -// if (order.getPayStatus().equals(0)) { - // 5. TODO 处理订单状态 -// order.setPayTime(DateUtil.date()); -// order.setPayStatus(1); -// order.setTransactionId(transactionId); -// order.setPayPrice(new BigDecimal(NumberUtil.decimalFormat("0.00", total * 0.01))); -// order.setExpirationTime(DateUtil.offset(DateUtil.date(), DateField.YEAR, 10)); -// System.out.println("实际付款金额 = " + order.getPayPrice()); -// orderService.updateByOutTradeNo(order); - // 6. TODO 同步更新订单明细的支付状态 -// orderInfoService.update(new LambdaUpdateWrapper().eq(OrderInfo::getOrderId,order.getOrderId()).set(OrderInfo::getPayStatus,1)); -// orderInfoService.updateByOutTradeNo(order); - // 7.同步会员卡状态 -// if(order.getType().equals(2)){ -// final UserCard userCard = userCardService.getById(order.getVid()); -// userCard.setStatus(1); -// userCardService.updateById(userCard); -// } - // 8.发放积分 -// usersService.addIntegral(order); - -// return "SUCCESS"; -// } -// } - } catch (Exception $e) { - System.out.println($e.getMessage()); - } - - return "fail"; - } - - -} diff --git a/modules/shop/controller/WxPayNotifyNbgController.java b/modules/shop/controller/WxPayNotifyNbgController.java deleted file mode 100644 index 3c66b0f..0000000 --- a/modules/shop/controller/WxPayNotifyNbgController.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.gxwebsoft.shop.controller; - -import com.gxwebsoft.common.core.utils.RedisUtil; -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.shop.entity.Cart; -import com.gxwebsoft.shop.service.*; -import com.wechat.pay.java.service.partnerpayments.jsapi.model.Transaction; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiModelProperty; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.annotation.Resource; - -/** - * 会员特权购买记录表控制器 - * - * @author 科技小王子 - * @since 2023-06-20 18:07:50 - */ -@Api(tags = "微信支付结果通知") -@RestController -@RequestMapping("/api/shop/wx-pay/notify/nbg") -public class WxPayNotifyNbgController extends BaseController { - @Resource - private OrderService orderService; - @Resource - private OrderInfoService orderInfoService; - @Resource - private OrderGoodsService orderGoodsService; - @Resource - private GoodsService goodsService; - @Resource - private UsersService usersService; - @Resource - private CartService cartService; - - @Resource - private RedisUtil redisUtil; - - @ApiModelProperty("微信支付通知") - @PostMapping() - public String demo(@RequestBody Transaction transaction){ - - System.out.println("支付通知 >>>>> "); - System.out.println("transaction = " + transaction); - - // TODO 1.查询订单信息 -// final Order order = orderService.getByOutTradeNo(transaction.getOutTradeNo()); - // TODO 2.更新订单支付状态 -// order.setPayStatus(1); -// order.setTransactionId(transaction.getTransactionId()); -// order.setPayPrice(new BigDecimal(NumberUtil.decimalFormat("0.00", transaction.getAmount().getTotal() * 0.01))); -// order.setPayTime(DateUtil.date()); -// order.setExpirationTime(DateUtil.offset(DateUtil.date(), DateField.YEAR, 10)); -// orderService.updateById(order); - // TODO 3.更新订单商品的支付状态 -// if (order.getType().equals(0)) { -// final boolean update = orderGoodsService.update(new LambdaUpdateWrapper().eq(OrderGoods::getOrderId, order.getOrderId()).set(OrderGoods::getPayStatus, 1)); -// System.out.println("update1 = " + update); -// // TODO 3.1 更新商品销量、库存数量 -// final List orderGoods = orderGoodsService.list(new LambdaQueryWrapper().eq(OrderGoods::getOrderId, order.getOrderId())); -// final Set goodsIds = orderGoods.stream().map(OrderGoods::getGoodsId).collect(Collectors.toSet()); -// final Map> collectGoods = orderGoods.stream().collect(Collectors.groupingBy(OrderGoods::getGoodsId)); -// final List goods = goodsService.list(new LambdaQueryWrapper().in(Goods::getGoodsId, goodsIds)); -// for (Goods g : goods) { -// final List goods1 = collectGoods.get(g.getGoodsId()); -// final OrderGoods goods2 = goods1.get(0); -// g.setSales(g.getSales() + goods2.getTotalNum()); -// if (g.getStock().compareTo(0) >= 0) { -// g.setStock(g.getStock() - goods2.getTotalNum()); -// } -// -// } -// final boolean batchById = goodsService.updateBatchById(goods); -// System.out.println("batchById = " + batchById); -// } -// if (order.getType().equals(1)) { -// final boolean update = orderInfoService.update(new LambdaUpdateWrapper().eq(OrderInfo::getOrderId, order.getOrderId()).set(OrderInfo::getPayStatus, 1)); -// System.out.println("update2 = " + update); -// // TODO 3.2 更新订单类型为预定的关联订单信息 -// } - - // TODO 4. 清除购物车 -// final boolean remove = cartService.remove(new LambdaQueryWrapper().eq(Cart::getUserId, order.getUid()).eq(Cart::getIsNew, true)); -// System.out.println("remove = " + remove); - - - // TODO 5.累计会员积分 - - return "订单已支付"; - } - -} diff --git a/modules/shop/entity/Brand.java b/modules/shop/entity/Brand.java deleted file mode 100644 index db30dcc..0000000 --- a/modules/shop/entity/Brand.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.gxwebsoft.shop.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import java.io.Serializable; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 品牌 - * - * @author 科技小王子 - * @since 2024-04-04 11:38:21 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "Brand对象", description = "品牌") -@TableName("shop_brand") -public class Brand implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "ID") - @TableId(value = "brand_id", type = IdType.AUTO) - private Integer brandId; - - @ApiModelProperty(value = "品牌名称") - private String brandName; - - @ApiModelProperty(value = "图标") - private String image; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "状态") - private Integer status; - - @ApiModelProperty(value = "排序号") - private Integer sortNumber; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - - @ApiModelProperty(value = "创建时间") - private LocalDateTime createTime; - -} diff --git a/modules/shop/entity/Cart.java b/modules/shop/entity/Cart.java deleted file mode 100644 index fe134e4..0000000 --- a/modules/shop/entity/Cart.java +++ /dev/null @@ -1,110 +0,0 @@ -package com.gxwebsoft.shop.entity; - -import com.baomidou.mybatisplus.annotation.*; - -import java.math.BigDecimal; -import java.io.Serializable; -import java.util.Date; -import java.util.List; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 购物车 - * - * @author 科技小王子 - * @since 2024-07-29 21:02:39 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "Cart对象", description = "购物车") -@TableName("shop_cart") -public class Cart implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "购物车表ID") - @TableId(value = "id", type = IdType.AUTO) - private Integer id; - - @ApiModelProperty(value = "类型 0商城 1预定 ") - private Integer type; - - @ApiModelProperty(value = "唯一标识") - private String code; - - @ApiModelProperty(value = "商品ID") - private Integer goodsId; - - @ApiModelProperty(value = "商品规格") - private String spec; - - @ApiModelProperty(value = "商品价格") - private BigDecimal price; - - @ApiModelProperty(value = "商品数量") - private Integer cartNum; - - @ApiModelProperty(value = "单品合计") - private BigDecimal totalPrice; - - @ApiModelProperty(value = "0 = 未购买 1 = 已购买") - private Boolean isPay; - - @ApiModelProperty(value = "是否为立即购买") - private Boolean isNew; - - @ApiModelProperty(value = "是否选中") - private Boolean selected; - - @ApiModelProperty(value = "拼团id") - private Integer combinationId; - - @ApiModelProperty(value = "秒杀产品ID") - private Integer seckillId; - - @ApiModelProperty(value = "砍价id") - private Integer bargainId; - - @ApiModelProperty(value = "商户ID") - private Integer merchantId; - - @ApiModelProperty(value = "用户ID") - private Integer userId; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - - @ApiModelProperty(value = "添加时间") - private Date createTime; - - @ApiModelProperty(value = "修改时间") - private Date updateTime; - - @ApiModelProperty(value = "店铺名称") - @TableField(exist = false) - private String merchantName; - - @ApiModelProperty(value = "店铺地址") - @TableField(exist = false) - private String address; - - @ApiModelProperty(value = "商品名称") - @TableField(exist = false) - private String goodsName; - - @ApiModelProperty(value = "商品图片") - @TableField(exist = false) - private String image; - - @ApiModelProperty(value = "是否全选") - @TableField(exist = false) - private Boolean selectAll; - - @ApiModelProperty("子菜单") - @TableField(exist = false) - private List children; - -} diff --git a/modules/shop/entity/Cashier.java b/modules/shop/entity/Cashier.java deleted file mode 100644 index 62c4628..0000000 --- a/modules/shop/entity/Cashier.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.gxwebsoft.shop.entity; - -import java.math.BigDecimal; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import java.io.Serializable; -import java.util.Date; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 收银 - * - * @author 科技小王子 - * @since 2024-08-04 11:51:43 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "Cashier对象", description = "收银") -@TableName("shop_cashier") -public class Cashier implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "收银单ID") - @TableId(value = "id", type = IdType.AUTO) - private Integer id; - - @ApiModelProperty(value = "类型 0商城 1外卖") - private Integer type; - - @ApiModelProperty(value = "唯一标识") - private String code; - - @ApiModelProperty(value = "商品ID") - private Integer goodsId; - - @ApiModelProperty(value = "名称") - private String name; - - @ApiModelProperty(value = "商品规格") - private String spec; - - @ApiModelProperty(value = "商品价格") - private BigDecimal price; - - @ApiModelProperty(value = "商品数量") - private Integer cartNum; - - @ApiModelProperty(value = "单商品合计") - private BigDecimal totalPrice; - - @ApiModelProperty(value = "0 = 未购买 1 = 已购买") - private Boolean isPay; - - @ApiModelProperty(value = "是否为立即购买") - private Boolean isNew; - - @ApiModelProperty(value = "是否选中") - private Boolean selected; - - @ApiModelProperty(value = "商户ID") - private Integer merchantId; - - @ApiModelProperty(value = "用户ID") - private Integer userId; - - @ApiModelProperty(value = "收银员ID") - private Integer cashierId; - - @ApiModelProperty(value = "收银单分组ID") - private Integer groupId; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - - @ApiModelProperty(value = "创建时间") - private Date createTime; - - @ApiModelProperty(value = "修改时间") - private Date updateTime; - - @ApiModelProperty(value = "商品名称") - @TableField(exist = false) - private String goodsName; - - @ApiModelProperty(value = "商品图片") - @TableField(exist = false) - private String image; - -} diff --git a/modules/shop/entity/ChatConversation.java b/modules/shop/entity/ChatConversation.java deleted file mode 100644 index 12be0f8..0000000 --- a/modules/shop/entity/ChatConversation.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.gxwebsoft.shop.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableLogic; -import java.io.Serializable; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 聊天消息表 - * - * @author 科技小王子 - * @since 2024-04-27 16:08:04 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "ChatConversation对象", description = "聊天消息表") -@TableName("shop_chat_conversation") -public class ChatConversation implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "自增ID") - @TableId(value = "id", type = IdType.AUTO) - private Integer id; - - @ApiModelProperty(value = "用户ID") - private Integer userId; - - @ApiModelProperty(value = "好友ID") - private Integer friendId; - - @ApiModelProperty(value = "消息类型") - private Integer type; - - @ApiModelProperty(value = "消息内容") - private String content; - - @ApiModelProperty(value = "未读消息") - private Integer unRead; - - @ApiModelProperty(value = "状态, 0未读, 1已读") - private Integer status; - - @ApiModelProperty(value = "是否删除, 0否, 1是") - @TableLogic - private Integer deleted; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - - @ApiModelProperty(value = "注册时间") - private LocalDateTime createTime; - - @ApiModelProperty(value = "修改时间") - private LocalDateTime updateTime; - -} diff --git a/modules/shop/entity/ChatMessage.java b/modules/shop/entity/ChatMessage.java deleted file mode 100644 index 22c2191..0000000 --- a/modules/shop/entity/ChatMessage.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.gxwebsoft.shop.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableLogic; -import java.io.Serializable; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 聊天消息表 - * - * @author 科技小王子 - * @since 2024-04-27 16:08:04 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "ChatMessage对象", description = "聊天消息表") -@TableName("shop_chat_message") -public class ChatMessage implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "自增ID") - @TableId(value = "id", type = IdType.AUTO) - private Integer id; - - @ApiModelProperty(value = "发送人ID") - private Integer formUserId; - - @ApiModelProperty(value = "接收人ID") - private Integer toUserId; - - @ApiModelProperty(value = "消息类型") - private String type; - - @ApiModelProperty(value = "消息内容") - private String content; - - @ApiModelProperty(value = "屏蔽接收方") - private Integer sideTo; - - @ApiModelProperty(value = "屏蔽发送方") - private Integer sideFrom; - - @ApiModelProperty(value = "是否撤回") - private Integer withdraw; - - @ApiModelProperty(value = "文件信息") - private String fileInfo; - - @ApiModelProperty(value = "存在联系方式") - private Integer hasContact; - - @ApiModelProperty(value = "状态, 0未读, 1已读") - private Integer status; - - @ApiModelProperty(value = "是否删除, 0否, 1是") - @TableLogic - private Integer deleted; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - - @ApiModelProperty(value = "注册时间") - private LocalDateTime createTime; - - @ApiModelProperty(value = "修改时间") - private LocalDateTime updateTime; - -} diff --git a/modules/shop/entity/Count.java b/modules/shop/entity/Count.java deleted file mode 100644 index af68635..0000000 --- a/modules/shop/entity/Count.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.gxwebsoft.shop.entity; - -import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import java.time.LocalDate; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import java.io.Serializable; -import java.util.Date; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 商城销售统计表 - * - * @author 科技小王子 - * @since 2024-07-31 22:25:10 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "Count对象", description = "商城销售统计表") -@TableName("shop_count") -public class Count implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "ID") - @TableId(value = "id", type = IdType.AUTO) - private Integer id; - - @ApiModelProperty(value = "统计日期") - private String dateTime; - - @ApiModelProperty(value = "总销售额") - private BigDecimal totalPrice; - - @ApiModelProperty(value = "今日销售额") - private BigDecimal todayPrice; - - @ApiModelProperty(value = "总会员数") - private BigDecimal totalUsers; - - @ApiModelProperty(value = "今日新增") - private BigDecimal todayUsers; - - @ApiModelProperty(value = "总订单笔数") - private BigDecimal totalOrders; - - @ApiModelProperty(value = "今日订单笔数") - private BigDecimal todayOrders; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "状态, 0正常, 1冻结") - private Integer status; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - - @ApiModelProperty(value = "创建时间") - private Date createTime; - -} diff --git a/modules/shop/entity/DealerApply.java b/modules/shop/entity/DealerApply.java deleted file mode 100644 index f5cc2cd..0000000 --- a/modules/shop/entity/DealerApply.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.gxwebsoft.shop.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import java.io.Serializable; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 分销商申请记录表 - * - * @author 科技小王子 - * @since 2024-07-28 11:57:41 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "DealerApply对象", description = "分销商申请记录表") -@TableName("shop_dealer_apply") -public class DealerApply implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键ID") - @TableId(value = "apply_id", type = IdType.AUTO) - private Integer applyId; - - @ApiModelProperty(value = "用户ID") - private Integer userId; - - @ApiModelProperty(value = "姓名") - private String realName; - - @ApiModelProperty(value = "手机号") - private String mobile; - - @ApiModelProperty(value = "推荐人用户ID") - private Integer refereeId; - - @ApiModelProperty(value = "申请方式(10需后台审核 20无需审核)") - private Integer applyType; - - @ApiModelProperty(value = "申请时间") - private Integer applyTime; - - @ApiModelProperty(value = "审核状态 (10待审核 20审核通过 30驳回)") - private Integer applyStatus; - - @ApiModelProperty(value = "审核时间") - private Integer auditTime; - - @ApiModelProperty(value = "驳回原因") - private String rejectReason; - - @ApiModelProperty(value = "商城ID") - private Integer tenantId; - - @ApiModelProperty(value = "创建时间") - private LocalDateTime createTime; - - @ApiModelProperty(value = "修改时间") - private LocalDateTime updateTime; - -} diff --git a/modules/shop/entity/DealerCapital.java b/modules/shop/entity/DealerCapital.java deleted file mode 100644 index 2890052..0000000 --- a/modules/shop/entity/DealerCapital.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.gxwebsoft.shop.entity; - -import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import java.io.Serializable; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 分销商资金明细表 - * - * @author 科技小王子 - * @since 2024-07-28 11:57:41 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "DealerCapital对象", description = "分销商资金明细表") -@TableName("shop_dealer_capital") -public class DealerCapital implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键ID") - @TableId(value = "id", type = IdType.AUTO) - private Integer id; - - @ApiModelProperty(value = "分销商用户ID") - private Integer userId; - - @ApiModelProperty(value = "订单ID") - private Integer orderId; - - @ApiModelProperty(value = "资金流动类型 (10佣金收入 20提现支出 30转账支出 40转账收入)") - private Integer flowType; - - @ApiModelProperty(value = "金额") - private BigDecimal money; - - @ApiModelProperty(value = "描述") - private String describe; - - @ApiModelProperty(value = "对方用户ID") - private Integer toUserId; - - @ApiModelProperty(value = "商城ID") - private Integer tenantId; - - @ApiModelProperty(value = "创建时间") - private LocalDateTime createTime; - - @ApiModelProperty(value = "修改时间") - private LocalDateTime updateTime; - -} diff --git a/modules/shop/entity/DealerOrder.java b/modules/shop/entity/DealerOrder.java deleted file mode 100644 index 826947c..0000000 --- a/modules/shop/entity/DealerOrder.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.gxwebsoft.shop.entity; - -import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import java.io.Serializable; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 分销商订单记录表 - * - * @author 科技小王子 - * @since 2024-07-28 11:57:41 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "DealerOrder对象", description = "分销商订单记录表") -@TableName("shop_dealer_order") -public class DealerOrder implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键ID") - @TableId(value = "id", type = IdType.AUTO) - private Integer id; - - @ApiModelProperty(value = "买家用户ID") - private Integer userId; - - @ApiModelProperty(value = "订单ID") - private Integer orderId; - - @ApiModelProperty(value = "订单总金额(不含运费)") - private BigDecimal orderPrice; - - @ApiModelProperty(value = "分销商用户id(一级)") - private Integer firstUserId; - - @ApiModelProperty(value = "分销商用户id(二级)") - private Integer secondUserId; - - @ApiModelProperty(value = "分销商用户id(三级)") - private Integer thirdUserId; - - @ApiModelProperty(value = "分销佣金(一级)") - private BigDecimal firstMoney; - - @ApiModelProperty(value = "分销佣金(二级)") - private BigDecimal secondMoney; - - @ApiModelProperty(value = "分销佣金(三级)") - private BigDecimal thirdMoney; - - @ApiModelProperty(value = "订单是否失效(0未失效 1已失效)") - private Integer isInvalid; - - @ApiModelProperty(value = "佣金结算(0未结算 1已结算)") - private Integer isSettled; - - @ApiModelProperty(value = "结算时间") - private Integer settleTime; - - @ApiModelProperty(value = "商城ID") - private Integer tenantId; - - @ApiModelProperty(value = "创建时间") - private LocalDateTime createTime; - - @ApiModelProperty(value = "修改时间") - private LocalDateTime updateTime; - -} diff --git a/modules/shop/entity/DealerReferee.java b/modules/shop/entity/DealerReferee.java deleted file mode 100644 index 861d47e..0000000 --- a/modules/shop/entity/DealerReferee.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.gxwebsoft.shop.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import java.io.Serializable; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 分销商推荐关系表 - * - * @author 科技小王子 - * @since 2024-07-28 11:57:41 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "DealerReferee对象", description = "分销商推荐关系表") -@TableName("shop_dealer_referee") -public class DealerReferee implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键ID") - @TableId(value = "id", type = IdType.AUTO) - private Integer id; - - @ApiModelProperty(value = "分销商用户ID") - private Integer dealerId; - - @ApiModelProperty(value = "用户id(被推荐人)") - private Integer userId; - - @ApiModelProperty(value = "推荐关系层级(1,2,3)") - private Integer level; - - @ApiModelProperty(value = "商城ID") - private Integer tenantId; - - @ApiModelProperty(value = "创建时间") - private LocalDateTime createTime; - - @ApiModelProperty(value = "修改时间") - private LocalDateTime updateTime; - -} diff --git a/modules/shop/entity/DealerSetting.java b/modules/shop/entity/DealerSetting.java deleted file mode 100644 index 4bd2f12..0000000 --- a/modules/shop/entity/DealerSetting.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.gxwebsoft.shop.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.io.Serializable; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 分销商设置表 - * - * @author 科技小王子 - * @since 2024-07-28 11:57:41 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "DealerSetting对象", description = "分销商设置表") -@TableName("shop_dealer_setting") -public class DealerSetting implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "设置项标示") - @TableId(value = "key", type = IdType.AUTO) - private String key; - - @ApiModelProperty(value = "设置项描述") - private String describe; - - @ApiModelProperty(value = "设置内容(json格式)") - private String values; - - @ApiModelProperty(value = "商城ID") - private Integer tenantId; - - @ApiModelProperty(value = "更新时间") - private Integer updateTime; - -} diff --git a/modules/shop/entity/DealerUser.java b/modules/shop/entity/DealerUser.java deleted file mode 100644 index ad1abe9..0000000 --- a/modules/shop/entity/DealerUser.java +++ /dev/null @@ -1,91 +0,0 @@ -package com.gxwebsoft.shop.entity; - -import java.math.BigDecimal; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; - -import java.io.Serializable; -import java.util.Date; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 分销商用户记录表 - * - * @author 科技小王子 - * @since 2024-07-28 19:21:15 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "DealerUser对象", description = "分销商用户记录表") -@TableName("shop_dealer_user") -public class DealerUser implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键ID") - @TableId(value = "id", type = IdType.AUTO) - private Integer id; - - @ApiModelProperty(value = "自增ID") - private Integer userId; - - @ApiModelProperty(value = "姓名") - private String realName; - - @ApiModelProperty(value = "手机号") - private String mobile; - - @ApiModelProperty(value = "支付密码") - private String payPassword; - - @ApiModelProperty(value = "当前可提现佣金") - private BigDecimal money; - - @ApiModelProperty(value = "已冻结佣金") - private BigDecimal freezeMoney; - - @ApiModelProperty(value = "累积提现佣金") - private BigDecimal totalMoney; - - @ApiModelProperty(value = "推荐人用户ID") - private Integer refereeId; - - @ApiModelProperty(value = "成员数量(一级)") - private Integer firstNum; - - @ApiModelProperty(value = "成员数量(二级)") - private Integer secondNum; - - @ApiModelProperty(value = "成员数量(三级)") - private Integer thirdNum; - - @ApiModelProperty(value = "专属二维码") - private String qrcode; - - @ApiModelProperty(value = "是否删除") - private Integer isDelete; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - - @ApiModelProperty(value = "创建时间") - private Date createTime; - - @ApiModelProperty(value = "修改时间") - private Date updateTime; - - @ApiModelProperty(value = "推荐人信息") - @TableField(exist = false) - private DealerUser dealerUser; - - @ApiModelProperty(value = "推荐人姓名(脱敏)") - @TableField(exist = false) - private String dealerName; - -} diff --git a/modules/shop/entity/DealerWithdraw.java b/modules/shop/entity/DealerWithdraw.java deleted file mode 100644 index 73fe6e9..0000000 --- a/modules/shop/entity/DealerWithdraw.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.gxwebsoft.shop.entity; - -import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import java.io.Serializable; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 分销商提现明细表 - * - * @author 科技小王子 - * @since 2024-07-28 11:57:41 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "DealerWithdraw对象", description = "分销商提现明细表") -@TableName("shop_dealer_withdraw") -public class DealerWithdraw implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键ID") - @TableId(value = "id", type = IdType.AUTO) - private Integer id; - - @ApiModelProperty(value = "分销商用户ID") - private Integer userId; - - @ApiModelProperty(value = "提现金额") - private BigDecimal money; - - @ApiModelProperty(value = "打款方式 (10微信 20支付宝 30银行卡)") - private Integer payType; - - @ApiModelProperty(value = "支付宝姓名") - private String alipayName; - - @ApiModelProperty(value = "支付宝账号") - private String alipayAccount; - - @ApiModelProperty(value = "开户行名称") - private String bankName; - - @ApiModelProperty(value = "银行开户名") - private String bankAccount; - - @ApiModelProperty(value = "银行卡号") - private String bankCard; - - @ApiModelProperty(value = "申请状态 (10待审核 20审核通过 30驳回 40已打款)") - private Integer applyStatus; - - @ApiModelProperty(value = "审核时间") - private Integer auditTime; - - @ApiModelProperty(value = "驳回原因") - private String rejectReason; - - @ApiModelProperty(value = "来源客户端(APP、H5、小程序等)") - private String platform; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - - @ApiModelProperty(value = "创建时间") - private LocalDateTime createTime; - - @ApiModelProperty(value = "修改时间") - private LocalDateTime updateTime; - -} diff --git a/modules/shop/entity/Goods.java b/modules/shop/entity/Goods.java deleted file mode 100644 index 4bb4615..0000000 --- a/modules/shop/entity/Goods.java +++ /dev/null @@ -1,143 +0,0 @@ -package com.gxwebsoft.shop.entity; - -import java.math.BigDecimal; - -import com.baomidou.mybatisplus.annotation.*; - -import java.io.Serializable; -import java.util.Date; -import java.util.List; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 商品记录表 - * - * @author 科技小王子 - * @since 2024-07-25 19:22:01 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "Goods对象", description = "商品记录表") -@TableName("shop_goods") -public class Goods implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "自增ID") - @TableId(value = "goods_id", type = IdType.AUTO) - private Integer goodsId; - - @ApiModelProperty(value = "类型 1实物商品 2虚拟商品") - private Integer type; - - @ApiModelProperty(value = "商品编码") - private String code; - - @ApiModelProperty(value = "商品标题") - private String goodsName; - - @ApiModelProperty(value = "商品封面图") - private String image; - - @ApiModelProperty(value = "商品详情") - private String content; - - @ApiModelProperty(value = "商品分类ID") - private Integer categoryId; - - @ApiModelProperty(value = "一级分类") - private String categoryParent; - - @ApiModelProperty(value = "二级分类") - private String categoryChildren; - - @ApiModelProperty(value = "商品规格 0单规格 1多规格") - private Integer specs; - - @ApiModelProperty(value = "货架") - private String position; - - @ApiModelProperty(value = "单位名称") - private String unitName; - - @ApiModelProperty(value = "消费赚取积分") - private BigDecimal gainIntegral; - - @ApiModelProperty(value = "进货价格") - private BigDecimal price; - - @ApiModelProperty(value = "销售价格") - private BigDecimal salePrice; - - @ApiModelProperty(value = "库存计算方式(10下单减库存 20付款减库存)") - private Integer deductStockType; - - @ApiModelProperty(value = "封面图") - private String files; - - @ApiModelProperty(value = "销量") - private Integer sales; - - @ApiModelProperty(value = "库存") - private Integer stock; - - @ApiModelProperty(value = "商品重量") - private Integer goodsWeight; - - @ApiModelProperty(value = "推荐") - private Integer recommend; - - @ApiModelProperty(value = "商户ID") - private Integer merchantId; - - @ApiModelProperty(value = "商户名称") - private String merchantName; - - @ApiModelProperty(value = "状态（0：未上架，1：上架）") - private Integer isShow; - - @ApiModelProperty(value = "状态, 0上架 1待上架 2待审核 3审核不通过") - private Integer status; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "排序号") - private Integer sortNumber; - - @ApiModelProperty(value = "用户ID") - private Integer userId; - - @ApiModelProperty(value = "是否删除, 0否, 1是") - @TableLogic - private Integer deleted; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - - @ApiModelProperty(value = "创建时间") - private Date createTime; - - @ApiModelProperty(value = "修改时间") - private Date updateTime; - - @ApiModelProperty(value = "商品规格") - @TableField(exist = false) - private GoodsSpec goodsSpec; - - @ApiModelProperty(value = "规格值") - @TableField(exist = false) - private String specValue; - - @ApiModelProperty(value = "商品规格值") - @TableField(exist = false) - private Object goodsSpecValue; - - @ApiModelProperty(value = "商品sku列表") - @TableField(exist = false) - private List goodsSkus; - -} diff --git a/modules/shop/entity/GoodsCategory.java b/modules/shop/entity/GoodsCategory.java deleted file mode 100644 index e9f420d..0000000 --- a/modules/shop/entity/GoodsCategory.java +++ /dev/null @@ -1,107 +0,0 @@ -package com.gxwebsoft.shop.entity; - -import com.baomidou.mybatisplus.annotation.*; - -import java.io.Serializable; -import java.util.Date; -import java.util.List; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 商品分类 - * - * @author 科技小王子 - * @since 2024-03-30 19:34:16 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "GoodsCategory对象", description = "商品分类") -@TableName("shop_goods_category") -public class GoodsCategory implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "商品分类ID") - @TableId(value = "category_id", type = IdType.AUTO) - private Integer categoryId; - - @ApiModelProperty(value = "分类标识") - private String categoryCode; - - @ApiModelProperty(value = "分类名称") - private String title; - - @ApiModelProperty(value = "分类别名") - @TableField(exist = false) - private String name; - - @ApiModelProperty(value = "类型 0商城分类 1外卖分类") - private Integer type; - - @ApiModelProperty(value = "分类图片") - private String image; - - @ApiModelProperty(value = "上级分类ID") - private Integer parentId; - - @ApiModelProperty(value = "路由/链接地址") - private String path; - - @ApiModelProperty(value = "组件路径") - private String component; - - @ApiModelProperty(value = "绑定的页面") - private Integer pageId; - - @ApiModelProperty(value = "用户ID") - private Integer userId; - - @ApiModelProperty(value = "商品数量") - private Integer count; - - @ApiModelProperty(value = "排序(数字越小越靠前)") - private Integer sortNumber; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "是否隐藏, 0否, 1是(仅注册路由不显示在左侧菜单)") - private Integer hide; - - @ApiModelProperty(value = "是否推荐") - private Integer recommend; - - @ApiModelProperty(value = "是否显示在首页") - private Integer showIndex; - - @ApiModelProperty(value = "商铺ID") - private Integer merchantId; - - @ApiModelProperty(value = "状态, 0正常, 1禁用") - private Integer status; - - @ApiModelProperty(value = "是否删除, 0否, 1是") - @TableLogic - private Integer deleted; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - - @ApiModelProperty(value = "注册时间") - private Date createTime; - - @ApiModelProperty(value = "修改时间") - private Date updateTime; - - @ApiModelProperty("商品列表") - @TableField(exist = false) - private List goods; - - @ApiModelProperty("子菜单") - @TableField(exist = false) - private List children; - -} diff --git a/modules/shop/entity/GoodsSku.java b/modules/shop/entity/GoodsSku.java deleted file mode 100644 index 504b81c..0000000 --- a/modules/shop/entity/GoodsSku.java +++ /dev/null @@ -1,88 +0,0 @@ -package com.gxwebsoft.shop.entity; - -import java.math.BigDecimal; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import java.io.Serializable; -import java.util.Date; -import java.util.List; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 商品sku列表 - * - * @author 科技小王子 - * @since 2024-07-26 10:49:02 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "GoodsSku对象", description = "商品sku列表") -@TableName("shop_goods_sku") -public class GoodsSku implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键ID") - @TableId(value = "id", type = IdType.AUTO) - private Integer id; - - @ApiModelProperty(value = "商品ID") - private Integer goodsId; - - @ApiModelProperty(value = "商品属性索引值 (attr_value|attr_value[|....])") - private String sku; - - @ApiModelProperty(value = "商品图片") - private String image; - - @ApiModelProperty(value = "商品价格") - private BigDecimal price; - - @ApiModelProperty(value = "市场价格") - private BigDecimal salePrice; - - @ApiModelProperty(value = "成本价") - private BigDecimal cost; - - @ApiModelProperty(value = "库存") - private Integer stock; - - @ApiModelProperty(value = "sku编码") - private String skuNo; - - @ApiModelProperty(value = "唯一值") - private String uuid; - - @ApiModelProperty(value = "商品条码") - private String barCode; - - @ApiModelProperty(value = "重量") - private BigDecimal weight; - - @ApiModelProperty(value = "体积") - private BigDecimal volume; - - @ApiModelProperty(value = "状态, 0正常, 1异常") - private Integer status; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - - @ApiModelProperty(value = "创建时间") - private Date createTime; - - @ApiModelProperty(value = "商品图片对象") - @TableField(exist = false) - private List images; - -} diff --git a/modules/shop/entity/GoodsSkuVO.java b/modules/shop/entity/GoodsSkuVO.java deleted file mode 100644 index 1083fd3..0000000 --- a/modules/shop/entity/GoodsSkuVO.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.gxwebsoft.shop.entity; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Builder; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -@Builder -public class GoodsSkuVO implements Serializable { - - @ApiModelProperty("规格名称") - private String value; - - @ApiModelProperty("规格值") - private List detail; - @Data - public static class Payload { - private String value; - private List detail; - } -} diff --git a/modules/shop/entity/GoodsSpec.java b/modules/shop/entity/GoodsSpec.java deleted file mode 100644 index bd18a88..0000000 --- a/modules/shop/entity/GoodsSpec.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.gxwebsoft.shop.entity; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.io.Serializable; -import java.util.List; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 商品多规格 - * - * @author 科技小王子 - * @since 2024-04-03 16:06:23 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "GoodsSpec对象", description = "商品多规格") -@TableName("shop_goods_spec") -public class GoodsSpec implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键") - @TableId(value = "id", type = IdType.AUTO) - private Integer id; - - @ApiModelProperty(value = "商品ID") - private Integer goodsId; - - @ApiModelProperty(value = "规格ID") - private Integer specId; - - @ApiModelProperty(value = "规格名称") - private String specName; - - @ApiModelProperty(value = "规格值") - private String specValue; - - @ApiModelProperty(value = "规格值") - @TableField(exist = false) - private List valueList; - - @ApiModelProperty(value = "活动类型 0=商品，1=秒杀，2=砍价，3=拼团") - private Boolean type; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - -} diff --git a/modules/shop/entity/Merchant.java b/modules/shop/entity/Merchant.java deleted file mode 100644 index a8a74df..0000000 --- a/modules/shop/entity/Merchant.java +++ /dev/null @@ -1,136 +0,0 @@ -package com.gxwebsoft.shop.entity; - -import java.math.BigDecimal; - -import com.baomidou.mybatisplus.annotation.*; - -import java.io.Serializable; -import java.util.Date; -import java.util.List; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 商户 - * - * @author 科技小王子 - * @since 2024-04-05 00:03:54 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "Merchant对象", description = "商户") -@TableName("shop_merchant") -public class Merchant implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "ID") - @TableId(value = "merchant_id", type = IdType.AUTO) - private Integer merchantId; - - @ApiModelProperty(value = "商户名称") - private String merchantName; - - @ApiModelProperty(value = "商户标识") - private String merchantCode; - - @ApiModelProperty(value = "商户图标") - private String image; - - @ApiModelProperty(value = "商户手机号") - private String phone; - - @ApiModelProperty(value = "商户姓名") - private String realName; - - @ApiModelProperty(value = "店铺类型") - private String shopType; - - @ApiModelProperty(value = "项目类型") - private String itemType; - - @ApiModelProperty(value = "商户分类") - private String category; - - @ApiModelProperty(value = "经纬度") - private String lngAndLat; - - @ApiModelProperty(value = "所在省份") - private String province; - - @ApiModelProperty(value = "所在城市") - private String city; - - @ApiModelProperty(value = "所在辖区") - private String region; - - @ApiModelProperty(value = "详细地址") - private String address; - - @ApiModelProperty(value = "每小时价格") - private BigDecimal price; - - @ApiModelProperty(value = "手续费") - private BigDecimal commission; - - @ApiModelProperty(value = "关键字") - private String keywords; - - @ApiModelProperty(value = "资质图片") - private String files; - - @ApiModelProperty(value = "营业时间") - private String businessTime; - - @ApiModelProperty(value = "商户简介") - private String content; - - @ApiModelProperty(value = "是否自营") - private Integer ownStore; - - @ApiModelProperty(value = "是否推荐") - private Integer recommend; - - @ApiModelProperty(value = "是否需要审核") - private Boolean goodsReview; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "管理入口") - private String adminUrl; - - @ApiModelProperty(value = "所有人") - private Integer userId; - - @ApiModelProperty(value = "状态") - private Integer status; - - @ApiModelProperty("是否删除, 0否, 1是") - @TableLogic - private Integer deleted; - - @ApiModelProperty(value = "排序号") - private Integer sortNumber; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - - @ApiModelProperty(value = "创建时间") - private Date createTime; - - @ApiModelProperty(value = "默认商户管理员角色ID") - @TableField(exist = false) - private Integer roleId; - - @ApiModelProperty(value = "角色名称") - @TableField(exist = false) - private String roleName; - - @ApiModelProperty(value = "按店铺分类的购物车商品") - @TableField(exist = false) - private List carts; - -} diff --git a/modules/shop/entity/MerchantAccount.java b/modules/shop/entity/MerchantAccount.java deleted file mode 100644 index 02f096c..0000000 --- a/modules/shop/entity/MerchantAccount.java +++ /dev/null @@ -1,88 +0,0 @@ -package com.gxwebsoft.shop.entity; - -import cn.hutool.core.util.DesensitizedUtil; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import java.io.Serializable; -import java.util.Date; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.springframework.security.core.parameters.P; - -/** - * 商户账号 - * - * @author 科技小王子 - * @since 2024-04-19 12:02:24 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "MerchantAccount对象", description = "商户账号") -@TableName("shop_merchant_account") -public class MerchantAccount implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "ID") - @TableId(value = "id", type = IdType.AUTO) - private Integer id; - - @ApiModelProperty(value = "商户手机号") - private String phone; - - @ApiModelProperty(value = "账号密码") - @TableField(exist = false) - private String password; - - @ApiModelProperty(value = "真实姓名") - private String realName; - - @ApiModelProperty(value = "商户ID") - private Integer merchantId; - - @ApiModelProperty(value = "角色ID") - private Integer roleId; - - @ApiModelProperty(value = "角色名称") - private String roleName; - - @ApiModelProperty(value = "用户ID") - private Integer userId; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "状态") - private Integer status; - - @ApiModelProperty(value = "排序号") - private Integer sortNumber; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - - @ApiModelProperty(value = "创建时间") - private Date createTime; - - @ApiModelProperty(value = "商户名称") - @TableField(exist = false) - private String merchantName; - - @ApiModelProperty(value = "是否需要审核") - @TableField(exist = false) - private Boolean goodsReview; - - @ApiModelProperty("手机号(脱敏)") - @TableField(exist = false) - private String mobile; - - public String getMobile(){ - return DesensitizedUtil.mobilePhone(this.phone); - } - -} diff --git a/modules/shop/entity/MerchantApply.java b/modules/shop/entity/MerchantApply.java deleted file mode 100644 index 74bc6b8..0000000 --- a/modules/shop/entity/MerchantApply.java +++ /dev/null @@ -1,84 +0,0 @@ -package com.gxwebsoft.shop.entity; - -import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import java.io.Serializable; -import java.util.Date; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 商户入驻申请 - * - * @author 科技小王子 - * @since 2024-04-05 01:24:36 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "MerchantApply对象", description = "商户入驻申请") -@TableName("shop_merchant_apply") -public class MerchantApply implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "ID") - @TableId(value = "apply_id", type = IdType.AUTO) - private Integer applyId; - - @ApiModelProperty(value = "商户名称") - private String merchantName; - - @ApiModelProperty(value = "商户图标") - private String image; - - @ApiModelProperty(value = "商户手机号") - private String phone; - - @ApiModelProperty(value = "商户姓名") - private String realName; - - @ApiModelProperty(value = "店铺类型") - private String shopType; - - @ApiModelProperty(value = "商户分类") - private String category; - - @ApiModelProperty(value = "手续费") - private BigDecimal commission; - - @ApiModelProperty(value = "关键字") - private String keywords; - - @ApiModelProperty(value = "资质图片") - private String files; - - @ApiModelProperty(value = "是否自营") - private Integer ownStore; - - @ApiModelProperty(value = "是否推荐") - private Integer recommend; - - @ApiModelProperty(value = "是否需要审核") - private Integer goodsReview; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "状态") - private Integer status; - - @ApiModelProperty(value = "排序号") - private Integer sortNumber; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - - @ApiModelProperty(value = "创建时间") - private Date createTime; - -} diff --git a/modules/shop/entity/MerchantType.java b/modules/shop/entity/MerchantType.java deleted file mode 100644 index c98ce6a..0000000 --- a/modules/shop/entity/MerchantType.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.gxwebsoft.shop.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import java.io.Serializable; -import java.util.Date; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 商户类型 - * - * @author 科技小王子 - * @since 2024-04-05 00:08:51 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "MerchantType对象", description = "商户类型") -@TableName("shop_merchant_type") -public class MerchantType implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "ID") - @TableId(value = "id", type = IdType.AUTO) - private Integer id; - - @ApiModelProperty(value = "店铺类型") - private String name; - - @ApiModelProperty(value = "店铺入驻条件") - private String comments; - - @ApiModelProperty(value = "状态") - private Integer status; - - @ApiModelProperty(value = "排序号") - private Integer sortNumber; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - - @ApiModelProperty(value = "创建时间") - private Date createTime; - -} diff --git a/modules/shop/entity/Order.java b/modules/shop/entity/Order.java deleted file mode 100644 index 0f37d8d..0000000 --- a/modules/shop/entity/Order.java +++ /dev/null @@ -1,173 +0,0 @@ -package com.gxwebsoft.shop.entity; - -import java.math.BigDecimal; - -import com.baomidou.mybatisplus.annotation.*; - -import java.time.LocalDateTime; -import java.io.Serializable; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * - * - * @author 科技小王子 - * @since 2024-08-09 16:33:41 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "Order对象", description = "") -@TableName("shop_order") -public class Order implements Serializable { - private static final long serialVersionUID = 1L; - - @TableId(value = "order_id", type = IdType.AUTO) - private Integer orderId; - - @ApiModelProperty(value = "订单类型，0商城订单 1预定订单 2会员卡") - private Integer type; - - @ApiModelProperty(value = "订单号") - private String orderNo; - - @ApiModelProperty(value = "下单渠道，0小程序预定 1俱乐部训练场 3活动订场") - private Integer channel; - - @ApiModelProperty(value = "微信支付订单号") - private String transactionId; - - @ApiModelProperty(value = "微信退款订单号") - private String refundOrder; - - @ApiModelProperty(value = "场馆id用于权限判断") - private Integer merchantId; - - @ApiModelProperty(value = "商户名称") - private String merchantName; - - @ApiModelProperty(value = "商户编号") - private String merchantCode; - - @ApiModelProperty(value = "用户id") - private Integer uid; - - @ApiModelProperty(value = "使用的优惠券id") - private Integer cid; - - @ApiModelProperty(value = "使用的会员卡id") - private Integer vid; - - @ApiModelProperty(value = "关联管理员id") - private Integer aid; - - @ApiModelProperty(value = "核销管理员id") - private Integer adminId; - - @ApiModelProperty(value = "IC卡号") - private String code; - - @ApiModelProperty(value = "真实姓名") - private String name; - - @ApiModelProperty(value = "手机号码") - private String phone; - - @ApiModelProperty(value = "订单总额") - private BigDecimal totalPrice; - - @ApiModelProperty(value = "减少的金额，使用VIP会员折扣、优惠券抵扣、优惠券折扣后减去的价格") - private BigDecimal reducePrice; - - @ApiModelProperty(value = "实际付款") - private BigDecimal payPrice; - - @ApiModelProperty(value = "用于统计") - private BigDecimal price; - - @ApiModelProperty(value = "价钱，用于积分赠送") - private BigDecimal money; - - @ApiModelProperty(value = "退款金额") - private BigDecimal refundMoney; - - @ApiModelProperty(value = "教练价格") - private BigDecimal coachPrice; - - @ApiModelProperty(value = "教练id") - private Integer coachId; - - @ApiModelProperty(value = "1微信支付，2积分，3支付宝，4现金，5POS机，6VIP月卡，7VIP年卡，8VIP次卡，9IC月卡，10IC年卡，11IC次卡，12免费，13VIP充值卡，14IC充值卡，15积分支付，16VIP季卡，17IC季卡") - private Integer payType; - - @ApiModelProperty(value = "1已付款，2未付款") - private Integer payStatus; - - @ApiModelProperty(value = "1已完成，2未使用，3已取消，4退款申请中，5退款被拒绝，6退款成功，7客户端申请退款") - private Integer orderStatus; - - @ApiModelProperty(value = "优惠类型：0无、1抵扣优惠券、2折扣优惠券、3、VIP月卡、4VIP年卡，5VIP次卡、6VIP会员卡、7IC月卡、8IC年卡、9IC次卡、10IC会员卡、11免费订单、12VIP充值卡、13IC充值卡、14VIP季卡、15IC季卡") - private Integer couponType; - - @ApiModelProperty(value = "二维码地址，保存订单号，支付成功后才生成") - private String qrcode; - - @ApiModelProperty(value = "优惠说明") - private String couponDesc; - - @ApiModelProperty(value = "vip月卡年卡、ic月卡年卡回退次数") - private Integer returnNum; - - @ApiModelProperty(value = "vip充值回退金额") - private BigDecimal returnMoney; - - @ApiModelProperty(value = "预约详情开始时间数组") - private String startTime; - - @ApiModelProperty(value = "是否已开具发票：1已开发票，2未开发票，3不能开具发票") - private Integer isInvoice; - - @ApiModelProperty(value = "发票流水号") - private String invoiceNo; - - private Integer updateTime; - - @ApiModelProperty(value = "付款时间") - private Integer payTime; - - @ApiModelProperty(value = "退款时间") - private Integer refundTime; - - @ApiModelProperty(value = "申请退款时间") - private Integer refundApplyTime; - - @ApiModelProperty(value = "过期时间") - private LocalDateTime expirationTime; - - @ApiModelProperty(value = "对账情况：1=已对账；2=未对账；3=已对账，金额对不上；4=未查询到该订单") - private Integer checkBill; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "排序号") - private Integer sortNumber; - - @ApiModelProperty(value = "是否删除, 0否, 1是") - @TableLogic - private Integer deleted; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - - @ApiModelProperty(value = "昵称") - @TableField(exist = false) - private String nickname; - - @ApiModelProperty(value = "真实姓名") - @TableField(exist = false) - private String realName; - -} diff --git a/modules/shop/entity/OrderGoods.java b/modules/shop/entity/OrderGoods.java deleted file mode 100644 index 850cbc5..0000000 --- a/modules/shop/entity/OrderGoods.java +++ /dev/null @@ -1,105 +0,0 @@ -package com.gxwebsoft.shop.entity; - -import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; - -import java.io.Serializable; -import java.util.Date; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 商品信息 - * - * @author 科技小王子 - * @since 2024-05-26 15:42:03 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "OrderGoods对象", description = "商品信息") -@TableName("shop_order_goods") -public class OrderGoods implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "自增ID") - @TableId(value = "id", type = IdType.AUTO) - private Integer id; - - @ApiModelProperty(value = "关联订单表id") - private Integer orderId; - - @ApiModelProperty(value = "订单标识") - private String orderCode; - - @ApiModelProperty(value = "关联商户ID") - private Integer merchantId; - - @ApiModelProperty(value = "商户名称") - private String merchantName; - - @ApiModelProperty(value = "商品封面图") - private String image; - - @ApiModelProperty(value = "关联商品id") - private Integer goodsId; - - @ApiModelProperty(value = "商品名称") - private String goodsName; - - @ApiModelProperty(value = "单价") - private BigDecimal price; - - @ApiModelProperty(value = "购买数量") - private Integer totalNum; - - @ApiModelProperty(value = "0 未付款 1已付款，2无需付款或占用状态") - private Integer payStatus; - - @ApiModelProperty(value = "0未使用，1已完成，2已取消，3取消中，4退款申请中，5退款被拒绝，6退款成功，7客户端申请退款") - private Integer orderStatus; - - @ApiModelProperty(value = "是否免费：0收费、1免费") - private Boolean isFree; - - @ApiModelProperty(value = "系统版本 0当前版本 其他版本") - private Integer version; - - @ApiModelProperty(value = "预约时间段") - private String timePeriod; - - @ApiModelProperty(value = "预定日期") - private Date dateTime; - - @ApiModelProperty(value = "开场时间") - private Date startTime; - - @ApiModelProperty(value = "结束时间") - private Date endTime; - - @ApiModelProperty(value = "毫秒时间戳") - private Long timeFlag; - - @ApiModelProperty(value = "过期时间") - private Date expirationTime; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "用户id") - private Integer userId; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - - @ApiModelProperty(value = "更新时间") - private Date updateTime; - - @ApiModelProperty(value = "创建时间") - private Date createTime; - -} diff --git a/modules/shop/entity/OrderInfo.java b/modules/shop/entity/OrderInfo.java deleted file mode 100644 index 6be9f29..0000000 --- a/modules/shop/entity/OrderInfo.java +++ /dev/null @@ -1,98 +0,0 @@ -package com.gxwebsoft.shop.entity; - -import java.math.BigDecimal; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import java.io.Serializable; -import java.util.Date; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * - * - * @author 科技小王子 - * @since 2024-08-10 13:44:39 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "OrderInfo对象", description = "") -@TableName("shop_order_info") -public class OrderInfo implements Serializable { - private static final long serialVersionUID = 1L; - - @TableId(value = "id", type = IdType.AUTO) - private Integer id; - - @ApiModelProperty(value = "关联订单表id") - private Integer oid; - - @ApiModelProperty(value = "关联场馆id") - private Integer sid; - - @ApiModelProperty(value = "关联场地id") - private Integer fid; - - @ApiModelProperty(value = "场馆") - private String siteName; - - @ApiModelProperty(value = "场地") - private String fieldName; - - @ApiModelProperty(value = "预约时间段") - private String dateTime; - - @ApiModelProperty(value = "单价") - private BigDecimal price; - - @ApiModelProperty(value = "儿童价") - private BigDecimal childrenPrice; - - @ApiModelProperty(value = "成人人数") - private Integer adultNum; - - @ApiModelProperty(value = "儿童人数") - private Integer childrenNum; - - @ApiModelProperty(value = "1已付款，2未付款，3无需付款或占用状态") - private Integer payStatus; - - @ApiModelProperty(value = "是否免费：1免费、2收费") - private Integer isFree; - - @ApiModelProperty(value = "是否支持儿童票：1支持，2不支持") - private Integer isChildren; - - @ApiModelProperty(value = "预订类型：1全场，2半场") - private Integer type; - - @ApiModelProperty(value = "组合数据:日期+时间段+场馆id+场地id") - private String mergeData; - - @ApiModelProperty(value = "开场时间") - private Integer startTime; - - @ApiModelProperty(value = "下单时间") - private Integer orderTime; - - @ApiModelProperty(value = "毫秒时间戳") - private Long timeFlag; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - - @ApiModelProperty(value = "创建时间") - private Date createTime; - - @ApiModelProperty(value = "组合数据:日期+时间段+场馆id+场地id") - @TableField(exist = false) - private String orderCode; - -} diff --git a/modules/shop/entity/OrderInfoLog.java b/modules/shop/entity/OrderInfoLog.java deleted file mode 100644 index 5f5a226..0000000 --- a/modules/shop/entity/OrderInfoLog.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.gxwebsoft.shop.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import java.io.Serializable; -import java.util.Date; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 订单核销 - * - * @author 科技小王子 - * @since 2024-05-14 13:20:04 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "OrderInfoLog对象", description = "订单核销") -@TableName("shop_order_info_log") -public class OrderInfoLog implements Serializable { - private static final long serialVersionUID = 1L; - - @TableId(value = "id", type = IdType.AUTO) - private Integer id; - - @ApiModelProperty(value = "关联订单表id") - private Integer orderId; - - @ApiModelProperty(value = "关联商户ID") - private Integer merchantId; - - @ApiModelProperty(value = "关联场地id") - private Integer fieldId; - - @ApiModelProperty(value = "核销数量") - private Boolean useNum; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - - @ApiModelProperty(value = "创建时间") - private Date createTime; - -} diff --git a/modules/shop/entity/Payment.java b/modules/shop/entity/Payment.java deleted file mode 100644 index 7bcbcf5..0000000 --- a/modules/shop/entity/Payment.java +++ /dev/null @@ -1,90 +0,0 @@ -package com.gxwebsoft.shop.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.io.Serializable; -import java.util.Date; - -/** - * 支付方式 - * - * @author 科技小王子 - * @since 2024-05-11 12:39:11 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "Payment对象", description = "支付方式") -@TableName("shop_payment") -public class Payment implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "ID") - @TableId(value = "id", type = IdType.AUTO) - private Integer id; - - @ApiModelProperty(value = "支付方式") - private String name; - - @ApiModelProperty(value = "类型") - private Integer type; - - @ApiModelProperty(value = "标识") - private String code; - - @ApiModelProperty(value = "支付图标") - private String image; - - @ApiModelProperty(value = "微信商户号类型 1普通商户2子商户") - private Integer wechatType; - - @ApiModelProperty(value = "应用ID") - private String appId; - - @ApiModelProperty(value = "商户号") - private String mchId; - - @ApiModelProperty(value = "设置APIv3密钥") - private String apiKey; - - @ApiModelProperty(value = "证书文件 (CERT)") - private String apiclientCert; - - @ApiModelProperty(value = "证书文件 (KEY)") - private String apiclientKey; - - @ApiModelProperty(value = "商户证书序列号") - private String merchantSerialNumber; - - @ApiModelProperty(value = "支付结果通知") - private String notifyUrl; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "文章排序(数字越小越靠前)") - private Integer sortNumber; - - @ApiModelProperty(value = "状态, 0未启用, 1启用") - private Boolean status; - - @ApiModelProperty(value = "是否删除, 0否, 1是") - @TableLogic - private Integer deleted; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - - @ApiModelProperty(value = "注册时间") - private Date createTime; - - @ApiModelProperty(value = "修改时间") - private Date updateTime; - -} diff --git a/modules/shop/entity/RechargeOrder.java b/modules/shop/entity/RechargeOrder.java deleted file mode 100644 index fde3d45..0000000 --- a/modules/shop/entity/RechargeOrder.java +++ /dev/null @@ -1,104 +0,0 @@ -package com.gxwebsoft.shop.entity; - -import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableLogic; -import java.io.Serializable; -import java.util.Date; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 会员充值订单表 - * - * @author 科技小王子 - * @since 2024-07-26 23:18:48 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "RechargeOrder对象", description = "会员充值订单表") -@TableName("shop_recharge_order") -public class RechargeOrder implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "订单ID") - @TableId(value = "order_id", type = IdType.AUTO) - private Integer orderId; - - @ApiModelProperty(value = "订单号") - private String orderNo; - - @ApiModelProperty(value = "用户ID") - private Integer userId; - - @ApiModelProperty(value = "充值方式(10自定义金额 20套餐充值)") - private Integer rechargeType; - - @ApiModelProperty(value = "机构id") - private Integer organizationId; - - @ApiModelProperty(value = "充值套餐ID") - private Integer planId; - - @ApiModelProperty(value = "用户支付金额") - private BigDecimal payPrice; - - @ApiModelProperty(value = "赠送金额") - private BigDecimal giftMoney; - - @ApiModelProperty(value = "实际到账金额") - private BigDecimal actualMoney; - - @ApiModelProperty(value = "用户可用余额") - private BigDecimal balance; - - @ApiModelProperty(value = "支付方式（微信/支付宝）") - private String payMethod; - - @ApiModelProperty(value = "支付状态(10待支付 20已支付)") - private Integer payStatus; - - @ApiModelProperty(value = "付款时间") - private Integer payTime; - - @ApiModelProperty(value = "第三方交易记录ID") - private Integer tradeId; - - @ApiModelProperty(value = "来源客户端 (APP、H5、小程序等)") - private String platform; - - @ApiModelProperty(value = "所属门店ID") - private Integer shopId; - - @ApiModelProperty(value = "排序(数字越小越靠前)") - private Integer sortNumber; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "状态, 0正常, 1冻结") - private Integer status; - - @ApiModelProperty(value = "是否删除, 0否, 1是") - @TableLogic - private Integer deleted; - - @ApiModelProperty(value = "商户编码") - private String merchantCode; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - - @ApiModelProperty(value = "注册时间") - private Date createTime; - - @ApiModelProperty(value = "修改时间") - private Date updateTime; - -} diff --git a/modules/shop/entity/Spec.java b/modules/shop/entity/Spec.java deleted file mode 100644 index c8b9779..0000000 --- a/modules/shop/entity/Spec.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.gxwebsoft.shop.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import java.io.Serializable; -import java.util.Date; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 规格 - * - * @author 科技小王子 - * @since 2024-07-25 03:00:41 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "Spec对象", description = "规格") -@TableName("shop_spec") -public class Spec implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "规格ID") - @TableId(value = "spec_id", type = IdType.AUTO) - private Integer specId; - - @ApiModelProperty(value = "规格名称") - private String specName; - - @ApiModelProperty(value = "规格值") - private String specValue; - - @ApiModelProperty(value = "创建用户") - private Integer userId; - - @ApiModelProperty(value = "更新者") - private Integer updater; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "状态, 0正常, 1待修,2异常已修，3异常未修") - private Integer status; - - @ApiModelProperty(value = "排序号") - private Integer sortNumber; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - - @ApiModelProperty(value = "创建时间") - private Date createTime; - -} diff --git a/modules/shop/entity/SpecValue.java b/modules/shop/entity/SpecValue.java deleted file mode 100644 index 73202ce..0000000 --- a/modules/shop/entity/SpecValue.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.gxwebsoft.shop.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import java.io.Serializable; -import java.util.Date; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 规格值 - * - * @author 科技小王子 - * @since 2024-04-01 09:49:15 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "SpecValue对象", description = "规格值") -@TableName("shop_spec_value") -public class SpecValue implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "规格值ID") - @TableId(value = "spec_value_id", type = IdType.AUTO) - private Integer specValueId; - - @ApiModelProperty(value = "规格值") - private String specValue; - - @ApiModelProperty(value = "规格组ID") - private Integer specId; - - @ApiModelProperty(value = "排序号") - private Integer sortNumber; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - -} diff --git a/modules/shop/entity/UserAddress.java b/modules/shop/entity/UserAddress.java deleted file mode 100644 index 370b059..0000000 --- a/modules/shop/entity/UserAddress.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.gxwebsoft.shop.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import java.io.Serializable; -import java.util.Date; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 收货地址 - * - * @author 科技小王子 - * @since 2024-05-26 10:58:37 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "UserAddress对象", description = "收货地址") -@TableName("shop_user_address") -public class UserAddress implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键ID") - @TableId(value = "id", type = IdType.AUTO) - private Integer id; - - @ApiModelProperty(value = "姓名") - private String name; - - @ApiModelProperty(value = "手机号码") - private String phone; - - @ApiModelProperty(value = "所在国家") - private String country; - - @ApiModelProperty(value = "所在省份") - private String province; - - @ApiModelProperty(value = "所在城市") - private String city; - - @ApiModelProperty(value = "所在辖区") - private String region; - - @ApiModelProperty(value = "收货地址") - private String address; - - @ApiModelProperty(value = "1先生 2女士") - private Integer gender; - - @ApiModelProperty(value = "家、公司、学校") - private String type; - - @ApiModelProperty(value = "默认收货地址") - private Boolean isDefault; - - @ApiModelProperty(value = "用户ID") - private Integer userId; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - - @ApiModelProperty(value = "注册时间") - private Date createTime; - -} diff --git a/modules/shop/entity/UserBalanceLog.java b/modules/shop/entity/UserBalanceLog.java deleted file mode 100644 index 181bdfa..0000000 --- a/modules/shop/entity/UserBalanceLog.java +++ /dev/null @@ -1,83 +0,0 @@ -package com.gxwebsoft.shop.entity; - -import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableLogic; -import java.io.Serializable; -import java.util.Date; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 用户余额变动明细表 - * - * @author 科技小王子 - * @since 2024-05-29 15:57:44 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "UserBalanceLog对象", description = "用户余额变动明细表") -@TableName("shop_user_balance_log") -public class UserBalanceLog implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键ID") - @TableId(value = "log_id", type = IdType.AUTO) - private Integer logId; - - @ApiModelProperty(value = "用户ID") - private Integer userId; - - @ApiModelProperty(value = "余额变动场景(10用户充值 20用户消费 30管理员操作 40订单退款)") - private Integer scene; - - @ApiModelProperty(value = "变动金额") - private BigDecimal money; - - @ApiModelProperty(value = "变动后余额") - private BigDecimal balance; - - @ApiModelProperty(value = "管理员备注") - private String remark; - - @ApiModelProperty(value = "操作人ID") - private Integer adminId; - - @ApiModelProperty(value = "订单编号") - private String orderNo; - - @ApiModelProperty(value = "商户ID") - private Integer merchantId; - - @ApiModelProperty(value = "排序(数字越小越靠前)") - private Integer sortNumber; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "状态, 0正常, 1冻结") - private Integer status; - - @ApiModelProperty(value = "是否删除, 0否, 1是") - @TableLogic - private Integer deleted; - - @ApiModelProperty(value = "商户编码") - private String merchantCode; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - - @ApiModelProperty(value = "注册时间") - private Date createTime; - - @ApiModelProperty(value = "修改时间") - private Date updateTime; - -} diff --git a/modules/shop/entity/UserCollection.java b/modules/shop/entity/UserCollection.java deleted file mode 100644 index cf2c2fe..0000000 --- a/modules/shop/entity/UserCollection.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.shop.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import java.io.Serializable; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 我的收藏 - * - * @author 科技小王子 - * @since 2024-04-28 18:17:37 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "UserCollection对象", description = "我的收藏") -@TableName("shop_user_collection") -public class UserCollection implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键ID") - @TableId(value = "id", type = IdType.AUTO) - private Integer id; - - @ApiModelProperty(value = "租户ID") - private Integer tid; - - @ApiModelProperty(value = "用户ID") - private Integer userId; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - - @ApiModelProperty(value = "注册时间") - private LocalDateTime createTime; - -} diff --git a/modules/shop/entity/Users.java b/modules/shop/entity/Users.java deleted file mode 100644 index 5f3068d..0000000 --- a/modules/shop/entity/Users.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.gxwebsoft.shop.entity; - -import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.io.Serializable; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * - * - * @author 科技小王子 - * @since 2024-08-09 15:20:25 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "Users对象", description = "") -@TableName("shop_users") -public class Users implements Serializable { - private static final long serialVersionUID = 1L; - - @TableId(value = "id", type = IdType.AUTO) - private Integer id; - - @ApiModelProperty(value = "用户唯一小程序id") - private String openId; - - @ApiModelProperty(value = "小程序用户秘钥") - private String sessionKey; - - @ApiModelProperty(value = "用户名") - private String username; - - @ApiModelProperty(value = "头像地址") - private String avatarUrl; - - @ApiModelProperty(value = "1男，2女") - private Integer gender; - - @ApiModelProperty(value = "国家") - private String country; - - @ApiModelProperty(value = "省份") - private String province; - - @ApiModelProperty(value = "城市") - private String city; - - @ApiModelProperty(value = "手机号码") - private String phone; - - @ApiModelProperty(value = "积分") - private BigDecimal integral; - - @ApiModelProperty(value = "余额") - private BigDecimal money; - - @ApiModelProperty(value = "注册时间") - private Long createTime; - - private String idcard; - - private String truename; - - @ApiModelProperty(value = "是否管理员：1是；2否") - private Integer isAdmin; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - -} diff --git a/modules/shop/entity/WechatDeposit.java b/modules/shop/entity/WechatDeposit.java deleted file mode 100644 index 108a9c0..0000000 --- a/modules/shop/entity/WechatDeposit.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.gxwebsoft.shop.entity; - -import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.io.Serializable; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 押金 - * - * @author 科技小王子 - * @since 2024-05-03 15:50:28 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "WechatDeposit对象", description = "押金") -@TableName("shop_wechat_deposit") -public class WechatDeposit implements Serializable { - private static final long serialVersionUID = 1L; - - @TableId(value = "id", type = IdType.AUTO) - private Integer id; - - @ApiModelProperty(value = "订单id") - private Integer oid; - - @ApiModelProperty(value = "用户id") - private Integer uid; - - @ApiModelProperty(value = "场地订单号") - private String orderNum; - - @ApiModelProperty(value = "付款订单号") - private String wechatOrder; - - @ApiModelProperty(value = "退款订单号 ") - private String wechatReturn; - - @ApiModelProperty(value = "场馆名称") - private String siteName; - - @ApiModelProperty(value = "微信昵称") - private String username; - - @ApiModelProperty(value = "手机号码") - private String phone; - - @ApiModelProperty(value = "物品名称") - private String name; - - @ApiModelProperty(value = "押金金额") - private BigDecimal price; - - @ApiModelProperty(value = "押金状态，1已付款，2未付款，已退押金") - private Integer status; - - private Integer createTime; - - @ApiModelProperty(value = "租户id") - private Integer tenantId; - -} diff --git a/modules/shop/mapper/BrandMapper.java b/modules/shop/mapper/BrandMapper.java deleted file mode 100644 index 6b03a68..0000000 --- a/modules/shop/mapper/BrandMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gxwebsoft.shop.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.shop.entity.Brand; -import com.gxwebsoft.shop.param.BrandParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 品牌Mapper - * - * @author 科技小王子 - * @since 2024-04-04 11:38:21 - */ -public interface BrandMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") BrandParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") BrandParam param); - -} diff --git a/modules/shop/mapper/CartMapper.java b/modules/shop/mapper/CartMapper.java deleted file mode 100644 index 12b01a5..0000000 --- a/modules/shop/mapper/CartMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gxwebsoft.shop.mapper; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.github.yulichang.base.MPJBaseMapper; -import com.gxwebsoft.shop.entity.Cart; -import com.gxwebsoft.shop.param.CartParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 购物车Mapper - * - * @author 科技小王子 - * @since 2024-07-29 21:02:39 - */ -public interface CartMapper extends MPJBaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") CartParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") CartParam param); - -} diff --git a/modules/shop/mapper/CashierMapper.java b/modules/shop/mapper/CashierMapper.java deleted file mode 100644 index fb0e6e4..0000000 --- a/modules/shop/mapper/CashierMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gxwebsoft.shop.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.shop.entity.Cashier; -import com.gxwebsoft.shop.param.CashierParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 收银Mapper - * - * @author 科技小王子 - * @since 2024-08-04 11:51:43 - */ -public interface CashierMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") CashierParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") CashierParam param); - -} diff --git a/modules/shop/mapper/ChatConversationMapper.java b/modules/shop/mapper/ChatConversationMapper.java deleted file mode 100644 index 1c5cf86..0000000 --- a/modules/shop/mapper/ChatConversationMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gxwebsoft.shop.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.shop.entity.ChatConversation; -import com.gxwebsoft.shop.param.ChatConversationParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 聊天消息表Mapper - * - * @author 科技小王子 - * @since 2024-04-27 16:08:04 - */ -public interface ChatConversationMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") ChatConversationParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") ChatConversationParam param); - -} diff --git a/modules/shop/mapper/ChatMessageMapper.java b/modules/shop/mapper/ChatMessageMapper.java deleted file mode 100644 index 234a0ca..0000000 --- a/modules/shop/mapper/ChatMessageMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gxwebsoft.shop.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.shop.entity.ChatMessage; -import com.gxwebsoft.shop.param.ChatMessageParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 聊天消息表Mapper - * - * @author 科技小王子 - * @since 2024-04-27 16:08:04 - */ -public interface ChatMessageMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") ChatMessageParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") ChatMessageParam param); - -} diff --git a/modules/shop/mapper/CountMapper.java b/modules/shop/mapper/CountMapper.java deleted file mode 100644 index 19df2f6..0000000 --- a/modules/shop/mapper/CountMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gxwebsoft.shop.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.shop.entity.Count; -import com.gxwebsoft.shop.param.CountParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 商城销售统计表Mapper - * - * @author 科技小王子 - * @since 2024-07-31 22:25:10 - */ -public interface CountMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") CountParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") CountParam param); - -} diff --git a/modules/shop/mapper/DealerApplyMapper.java b/modules/shop/mapper/DealerApplyMapper.java deleted file mode 100644 index 89b3979..0000000 --- a/modules/shop/mapper/DealerApplyMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gxwebsoft.shop.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.shop.entity.DealerApply; -import com.gxwebsoft.shop.param.DealerApplyParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 分销商申请记录表Mapper - * - * @author 科技小王子 - * @since 2024-07-28 11:57:41 - */ -public interface DealerApplyMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") DealerApplyParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") DealerApplyParam param); - -} diff --git a/modules/shop/mapper/DealerCapitalMapper.java b/modules/shop/mapper/DealerCapitalMapper.java deleted file mode 100644 index 9a459ec..0000000 --- a/modules/shop/mapper/DealerCapitalMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gxwebsoft.shop.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.shop.entity.DealerCapital; -import com.gxwebsoft.shop.param.DealerCapitalParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 分销商资金明细表Mapper - * - * @author 科技小王子 - * @since 2024-07-28 11:57:41 - */ -public interface DealerCapitalMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") DealerCapitalParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") DealerCapitalParam param); - -} diff --git a/modules/shop/mapper/DealerOrderMapper.java b/modules/shop/mapper/DealerOrderMapper.java deleted file mode 100644 index ebecaf4..0000000 --- a/modules/shop/mapper/DealerOrderMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gxwebsoft.shop.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.shop.entity.DealerOrder; -import com.gxwebsoft.shop.param.DealerOrderParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 分销商订单记录表Mapper - * - * @author 科技小王子 - * @since 2024-07-28 11:57:41 - */ -public interface DealerOrderMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") DealerOrderParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") DealerOrderParam param); - -} diff --git a/modules/shop/mapper/DealerRefereeMapper.java b/modules/shop/mapper/DealerRefereeMapper.java deleted file mode 100644 index 95624e9..0000000 --- a/modules/shop/mapper/DealerRefereeMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gxwebsoft.shop.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.shop.entity.DealerReferee; -import com.gxwebsoft.shop.param.DealerRefereeParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 分销商推荐关系表Mapper - * - * @author 科技小王子 - * @since 2024-07-28 11:57:41 - */ -public interface DealerRefereeMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") DealerRefereeParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") DealerRefereeParam param); - -} diff --git a/modules/shop/mapper/DealerSettingMapper.java b/modules/shop/mapper/DealerSettingMapper.java deleted file mode 100644 index 9465c3b..0000000 --- a/modules/shop/mapper/DealerSettingMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gxwebsoft.shop.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.shop.entity.DealerSetting; -import com.gxwebsoft.shop.param.DealerSettingParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 分销商设置表Mapper - * - * @author 科技小王子 - * @since 2024-07-28 11:57:41 - */ -public interface DealerSettingMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") DealerSettingParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") DealerSettingParam param); - -} diff --git a/modules/shop/mapper/DealerUserMapper.java b/modules/shop/mapper/DealerUserMapper.java deleted file mode 100644 index 0561ec2..0000000 --- a/modules/shop/mapper/DealerUserMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gxwebsoft.shop.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.shop.entity.DealerUser; -import com.gxwebsoft.shop.param.DealerUserParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 分销商用户记录表Mapper - * - * @author 科技小王子 - * @since 2024-07-28 19:21:15 - */ -public interface DealerUserMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") DealerUserParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") DealerUserParam param); - -} diff --git a/modules/shop/mapper/DealerWithdrawMapper.java b/modules/shop/mapper/DealerWithdrawMapper.java deleted file mode 100644 index 9cf6bda..0000000 --- a/modules/shop/mapper/DealerWithdrawMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gxwebsoft.shop.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.shop.entity.DealerWithdraw; -import com.gxwebsoft.shop.param.DealerWithdrawParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 分销商提现明细表Mapper - * - * @author 科技小王子 - * @since 2024-07-28 11:57:41 - */ -public interface DealerWithdrawMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") DealerWithdrawParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") DealerWithdrawParam param); - -} diff --git a/modules/shop/mapper/GoodsCategoryMapper.java b/modules/shop/mapper/GoodsCategoryMapper.java deleted file mode 100644 index 0c41d52..0000000 --- a/modules/shop/mapper/GoodsCategoryMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gxwebsoft.shop.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.shop.entity.GoodsCategory; -import com.gxwebsoft.shop.param.GoodsCategoryParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 商品分类Mapper - * - * @author 科技小王子 - * @since 2024-03-30 19:34:16 - */ -public interface GoodsCategoryMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") GoodsCategoryParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") GoodsCategoryParam param); - -} diff --git a/modules/shop/mapper/GoodsMapper.java b/modules/shop/mapper/GoodsMapper.java deleted file mode 100644 index 341478c..0000000 --- a/modules/shop/mapper/GoodsMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gxwebsoft.shop.mapper; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.github.yulichang.base.MPJBaseMapper; -import com.gxwebsoft.shop.entity.Goods; -import com.gxwebsoft.shop.param.GoodsParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 商品记录表Mapper - * - * @author 科技小王子 - * @since 2024-07-25 19:22:01 - */ -public interface GoodsMapper extends MPJBaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") GoodsParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") GoodsParam param); - -} diff --git a/modules/shop/mapper/GoodsSkuMapper.java b/modules/shop/mapper/GoodsSkuMapper.java deleted file mode 100644 index f327ca9..0000000 --- a/modules/shop/mapper/GoodsSkuMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gxwebsoft.shop.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.shop.entity.GoodsSku; -import com.gxwebsoft.shop.param.GoodsSkuParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 商品sku列表Mapper - * - * @author 科技小王子 - * @since 2024-07-26 10:49:02 - */ -public interface GoodsSkuMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") GoodsSkuParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") GoodsSkuParam param); - -} diff --git a/modules/shop/mapper/GoodsSpecMapper.java b/modules/shop/mapper/GoodsSpecMapper.java deleted file mode 100644 index d349b27..0000000 --- a/modules/shop/mapper/GoodsSpecMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gxwebsoft.shop.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.shop.entity.GoodsSpec; -import com.gxwebsoft.shop.param.GoodsSpecParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 商品sku列表Mapper - * - * @author 科技小王子 - * @since 2024-04-03 16:06:23 - */ -public interface GoodsSpecMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") GoodsSpecParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") GoodsSpecParam param); - -} diff --git a/modules/shop/mapper/MerchantAccountMapper.java b/modules/shop/mapper/MerchantAccountMapper.java deleted file mode 100644 index df655f1..0000000 --- a/modules/shop/mapper/MerchantAccountMapper.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.gxwebsoft.shop.mapper; - -import com.baomidou.mybatisplus.annotation.InterceptorIgnore; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.shop.entity.MerchantAccount; -import com.gxwebsoft.shop.param.MerchantAccountParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 商户账号Mapper - * - * @author 科技小王子 - * @since 2024-04-19 12:02:24 - */ -public interface MerchantAccountMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") MerchantAccountParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") MerchantAccountParam param); - - @InterceptorIgnore(tenantLine = "true") - MerchantAccount getMerchantAccountByPhone(@Param("param") MerchantAccountParam param); - -} diff --git a/modules/shop/mapper/MerchantApplyMapper.java b/modules/shop/mapper/MerchantApplyMapper.java deleted file mode 100644 index 7e8646a..0000000 --- a/modules/shop/mapper/MerchantApplyMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gxwebsoft.shop.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.shop.entity.MerchantApply; -import com.gxwebsoft.shop.param.MerchantApplyParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 商户入驻申请Mapper - * - * @author 科技小王子 - * @since 2024-04-05 01:24:36 - */ -public interface MerchantApplyMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") MerchantApplyParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") MerchantApplyParam param); - -} diff --git a/modules/shop/mapper/MerchantMapper.java b/modules/shop/mapper/MerchantMapper.java deleted file mode 100644 index 06c5ab3..0000000 --- a/modules/shop/mapper/MerchantMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gxwebsoft.shop.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.shop.entity.Merchant; -import com.gxwebsoft.shop.param.MerchantParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 商户Mapper - * - * @author 科技小王子 - * @since 2024-04-05 00:03:54 - */ -public interface MerchantMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") MerchantParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") MerchantParam param); - -} diff --git a/modules/shop/mapper/MerchantTypeMapper.java b/modules/shop/mapper/MerchantTypeMapper.java deleted file mode 100644 index 234b9c4..0000000 --- a/modules/shop/mapper/MerchantTypeMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gxwebsoft.shop.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.shop.entity.MerchantType; -import com.gxwebsoft.shop.param.MerchantTypeParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 商户类型Mapper - * - * @author 科技小王子 - * @since 2024-04-05 00:08:51 - */ -public interface MerchantTypeMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") MerchantTypeParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") MerchantTypeParam param); - -} diff --git a/modules/shop/mapper/OrderGoodsMapper.java b/modules/shop/mapper/OrderGoodsMapper.java deleted file mode 100644 index 9e2abfb..0000000 --- a/modules/shop/mapper/OrderGoodsMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gxwebsoft.shop.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.shop.entity.OrderGoods; -import com.gxwebsoft.shop.param.OrderGoodsParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 商品信息Mapper - * - * @author 科技小王子 - * @since 2024-05-26 15:42:03 - */ -public interface OrderGoodsMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") OrderGoodsParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") OrderGoodsParam param); - -} diff --git a/modules/shop/mapper/OrderInfoLogMapper.java b/modules/shop/mapper/OrderInfoLogMapper.java deleted file mode 100644 index 45b7316..0000000 --- a/modules/shop/mapper/OrderInfoLogMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gxwebsoft.shop.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.shop.entity.OrderInfoLog; -import com.gxwebsoft.shop.param.OrderInfoLogParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 订单核销Mapper - * - * @author 科技小王子 - * @since 2024-05-14 13:20:04 - */ -public interface OrderInfoLogMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") OrderInfoLogParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") OrderInfoLogParam param); - -} diff --git a/modules/shop/mapper/OrderInfoMapper.java b/modules/shop/mapper/OrderInfoMapper.java deleted file mode 100644 index 1978c78..0000000 --- a/modules/shop/mapper/OrderInfoMapper.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.shop.mapper; - -import com.baomidou.mybatisplus.annotation.InterceptorIgnore; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.github.yulichang.base.MPJBaseMapper; -import com.gxwebsoft.shop.entity.Order; -import com.gxwebsoft.shop.entity.OrderInfo; -import com.gxwebsoft.shop.param.OrderInfoParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * Mapper - * - * @author 科技小王子 - * @since 2024-08-10 13:44:39 - */ -public interface OrderInfoMapper extends MPJBaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") OrderInfoParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") OrderInfoParam param); - - @InterceptorIgnore(tenantLine = "true") - void updateByOutTradeNo(@Param("param") Order order); - -} diff --git a/modules/shop/mapper/OrderMapper.java b/modules/shop/mapper/OrderMapper.java deleted file mode 100644 index 45b0803..0000000 --- a/modules/shop/mapper/OrderMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gxwebsoft.shop.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.shop.entity.Order; -import com.gxwebsoft.shop.param.OrderParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * Mapper - * - * @author 科技小王子 - * @since 2024-08-09 16:33:41 - */ -public interface OrderMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") OrderParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") OrderParam param); - -} diff --git a/modules/shop/mapper/RechargeOrderMapper.java b/modules/shop/mapper/RechargeOrderMapper.java deleted file mode 100644 index 8cc2bfb..0000000 --- a/modules/shop/mapper/RechargeOrderMapper.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.gxwebsoft.shop.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 会员充值订单表Mapper - * - * @author 科技小王子 - * @since 2024-07-26 23:18:48 - */ -public interface RechargeOrderMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") RechargeOrderParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") RechargeOrderParam param); - -} diff --git a/modules/shop/mapper/SpecMapper.java b/modules/shop/mapper/SpecMapper.java deleted file mode 100644 index 32e3f14..0000000 --- a/modules/shop/mapper/SpecMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gxwebsoft.shop.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.shop.entity.Spec; -import com.gxwebsoft.shop.param.SpecParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 规格Mapper - * - * @author 科技小王子 - * @since 2024-07-25 03:00:41 - */ -public interface SpecMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") SpecParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") SpecParam param); - -} diff --git a/modules/shop/mapper/SpecValueMapper.java b/modules/shop/mapper/SpecValueMapper.java deleted file mode 100644 index b3e282a..0000000 --- a/modules/shop/mapper/SpecValueMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gxwebsoft.shop.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.shop.entity.SpecValue; -import com.gxwebsoft.shop.param.SpecValueParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 规格值Mapper - * - * @author 科技小王子 - * @since 2024-04-01 09:49:15 - */ -public interface SpecValueMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") SpecValueParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") SpecValueParam param); - -} diff --git a/modules/shop/mapper/UserAddressMapper.java b/modules/shop/mapper/UserAddressMapper.java deleted file mode 100644 index 1a1bc29..0000000 --- a/modules/shop/mapper/UserAddressMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gxwebsoft.shop.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.shop.entity.UserAddress; -import com.gxwebsoft.shop.param.UserAddressParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 收货地址Mapper - * - * @author 科技小王子 - * @since 2024-05-26 10:58:37 - */ -public interface UserAddressMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") UserAddressParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") UserAddressParam param); - -} diff --git a/modules/shop/mapper/UserBalanceLogMapper.java b/modules/shop/mapper/UserBalanceLogMapper.java deleted file mode 100644 index bba2131..0000000 --- a/modules/shop/mapper/UserBalanceLogMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gxwebsoft.shop.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.shop.entity.UserBalanceLog; -import com.gxwebsoft.shop.param.UserBalanceLogParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 用户余额变动明细表Mapper - * - * @author 科技小王子 - * @since 2024-05-29 15:57:44 - */ -public interface UserBalanceLogMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") UserBalanceLogParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") UserBalanceLogParam param); - -} diff --git a/modules/shop/mapper/UserCollectionMapper.java b/modules/shop/mapper/UserCollectionMapper.java deleted file mode 100644 index ba08881..0000000 --- a/modules/shop/mapper/UserCollectionMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gxwebsoft.shop.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.shop.entity.UserCollection; -import com.gxwebsoft.shop.param.UserCollectionParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 我的收藏Mapper - * - * @author 科技小王子 - * @since 2024-04-28 18:17:37 - */ -public interface UserCollectionMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") UserCollectionParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") UserCollectionParam param); - -} diff --git a/modules/shop/mapper/UsersMapper.java b/modules/shop/mapper/UsersMapper.java deleted file mode 100644 index f91864d..0000000 --- a/modules/shop/mapper/UsersMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gxwebsoft.shop.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.shop.entity.Users; -import com.gxwebsoft.shop.param.UsersParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * Mapper - * - * @author 科技小王子 - * @since 2024-08-09 15:20:25 - */ -public interface UsersMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") UsersParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") UsersParam param); - -} diff --git a/modules/shop/mapper/WechatDepositMapper.java b/modules/shop/mapper/WechatDepositMapper.java deleted file mode 100644 index b341473..0000000 --- a/modules/shop/mapper/WechatDepositMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gxwebsoft.shop.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gxwebsoft.shop.entity.WechatDeposit; -import com.gxwebsoft.shop.param.WechatDepositParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 押金Mapper - * - * @author 科技小王子 - * @since 2024-05-03 15:50:28 - */ -public interface WechatDepositMapper extends BaseMapper { - - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") WechatDepositParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") WechatDepositParam param); - -} diff --git a/modules/shop/mapper/xml/BrandMapper.xml b/modules/shop/mapper/xml/BrandMapper.xml deleted file mode 100644 index 437faee..0000000 --- a/modules/shop/mapper/xml/BrandMapper.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - SELECT a.* - FROM shop_brand a - - - AND a.brand_id = #{param.brandId} - - - AND a.brand_name LIKE CONCAT('%', #{param.brandName}, '%') - - - AND a.image LIKE CONCAT('%', #{param.image}, '%') - - - AND a.comments LIKE CONCAT('%', #{param.comments}, '%') - - - AND a.status = #{param.status} - - - AND a.sort_number = #{param.sortNumber} - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') - ) - - - - - - - - - - - diff --git a/modules/shop/mapper/xml/CartMapper.xml b/modules/shop/mapper/xml/CartMapper.xml deleted file mode 100644 index 4feae08..0000000 --- a/modules/shop/mapper/xml/CartMapper.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - SELECT a.*,b.goods_name,b.image,c.merchant_name,c.address - FROM shop_cart a - LEFT JOIN shop_goods b ON a.goods_id = b.goods_id - LEFT JOIN shop_merchant c ON a.merchant_id = c.merchant_id - - - AND a.id = #{param.id} - - - AND a.type = #{param.type} - - - AND a.goods_id LIKE CONCAT('%', #{param.goodsId}, '%') - - - AND a.code LIKE CONCAT('%', #{param.code}, '%') - - - AND a.cart_num = #{param.cartNum} - - - AND a.is_pay = #{param.isPay} - - - AND a.is_new = #{param.isNew} - - - AND a.combination_id = #{param.combinationId} - - - AND a.seckill_id = #{param.seckillId} - - - AND a.bargain_id = #{param.bargainId} - - - AND a.user_id LIKE CONCAT('%', #{param.userId}, '%') - - - AND a.admin_id LIKE CONCAT('%', #{param.adminId}, '%') - - - AND a.selected = #{param.selected} - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - AND (c.merchant_name LIKE CONCAT('%', #{param.keywords}, '%') - OR b.goods_name LIKE CONCAT('%', #{param.keywords}, '%') - ) - - - - - - - - - - - diff --git a/modules/shop/mapper/xml/CashierMapper.xml b/modules/shop/mapper/xml/CashierMapper.xml deleted file mode 100644 index a2e0236..0000000 --- a/modules/shop/mapper/xml/CashierMapper.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - SELECT a.*,b.goods_name,b.image,c.merchant_name,c.address - FROM shop_cashier a - LEFT JOIN shop_goods b ON a.goods_id = b.goods_id - LEFT JOIN shop_merchant c ON a.merchant_id = c.merchant_id - - - AND a.id = #{param.id} - - - AND a.type = #{param.type} - - - AND a.code LIKE CONCAT('%', #{param.code}, '%') - - - AND a.goods_id LIKE CONCAT('%', #{param.goodsId}, '%') - - - AND a.spec LIKE CONCAT('%', #{param.spec}, '%') - - - AND a.price = #{param.price} - - - AND a.cart_num = #{param.cartNum} - - - AND a.total_price = #{param.totalPrice} - - - AND a.is_pay = #{param.isPay} - - - AND a.is_new = #{param.isNew} - - - AND a.selected = #{param.selected} - - - AND a.merchant_id LIKE CONCAT('%', #{param.merchantId}, '%') - - - AND a.user_id LIKE CONCAT('%', #{param.userId}, '%') - - - AND a.cashier_id LIKE CONCAT('%', #{param.cashierId}, '%') - - - AND a.group_id = #{param.groupId} - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - AND (c.merchant_name LIKE CONCAT('%', #{param.keywords}, '%') - OR b.goods_name LIKE CONCAT('%', #{param.keywords}, '%') - ) - - - - - - - - - - - diff --git a/modules/shop/mapper/xml/ChatConversationMapper.xml b/modules/shop/mapper/xml/ChatConversationMapper.xml deleted file mode 100644 index 32262ab..0000000 --- a/modules/shop/mapper/xml/ChatConversationMapper.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - SELECT a.* - FROM shop_chat_conversation a - - - AND a.id = #{param.id} - - - AND a.user_id = #{param.userId} - - - AND a.friend_id = #{param.friendId} - - - AND a.type = #{param.type} - - - AND a.content LIKE CONCAT('%', #{param.content}, '%') - - - AND a.un_read = #{param.unRead} - - - AND a.status = #{param.status} - - - AND a.deleted = #{param.deleted} - - - AND a.deleted = 0 - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') - ) - - - - - - - - - - - diff --git a/modules/shop/mapper/xml/ChatMessageMapper.xml b/modules/shop/mapper/xml/ChatMessageMapper.xml deleted file mode 100644 index ac3c97c..0000000 --- a/modules/shop/mapper/xml/ChatMessageMapper.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - SELECT a.* - FROM shop_chat_message a - - - AND a.id = #{param.id} - - - AND a.form_user_id = #{param.formUserId} - - - AND a.to_user_id = #{param.toUserId} - - - AND a.type LIKE CONCAT('%', #{param.type}, '%') - - - AND a.content LIKE CONCAT('%', #{param.content}, '%') - - - AND a.side_to = #{param.sideTo} - - - AND a.side_from = #{param.sideFrom} - - - AND a.withdraw = #{param.withdraw} - - - AND a.file_info LIKE CONCAT('%', #{param.fileInfo}, '%') - - - AND a.has_contact = #{param.hasContact} - - - AND a.status = #{param.status} - - - AND a.deleted = #{param.deleted} - - - AND a.deleted = 0 - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') - ) - - - - - - - - - - - diff --git a/modules/shop/mapper/xml/CountMapper.xml b/modules/shop/mapper/xml/CountMapper.xml deleted file mode 100644 index 132fbe3..0000000 --- a/modules/shop/mapper/xml/CountMapper.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - SELECT a.* - FROM shop_count a - - - AND a.id = #{param.id} - - - AND a.date_time LIKE CONCAT('%', #{param.dateTime}, '%') - - - AND a.total_price = #{param.totalPrice} - - - AND a.today_price = #{param.todayPrice} - - - AND a.total_users = #{param.totalUsers} - - - AND a.today_users = #{param.todayUsers} - - - AND a.total_orders = #{param.totalOrders} - - - AND a.today_orders = #{param.todayOrders} - - - AND a.comments LIKE CONCAT('%', #{param.comments}, '%') - - - AND a.status = #{param.status} - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') - ) - - - - - - - - - - - diff --git a/modules/shop/mapper/xml/DealerApplyMapper.xml b/modules/shop/mapper/xml/DealerApplyMapper.xml deleted file mode 100644 index d221b82..0000000 --- a/modules/shop/mapper/xml/DealerApplyMapper.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - SELECT a.* - FROM shop_dealer_apply a - - - AND a.apply_id = #{param.applyId} - - - AND a.user_id = #{param.userId} - - - AND a.real_name LIKE CONCAT('%', #{param.realName}, '%') - - - AND a.mobile LIKE CONCAT('%', #{param.mobile}, '%') - - - AND a.referee_id = #{param.refereeId} - - - AND a.apply_type = #{param.applyType} - - - AND a.apply_time = #{param.applyTime} - - - AND a.apply_status = #{param.applyStatus} - - - AND a.audit_time = #{param.auditTime} - - - AND a.reject_reason LIKE CONCAT('%', #{param.rejectReason}, '%') - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') - ) - - - - - - - - - - - diff --git a/modules/shop/mapper/xml/DealerCapitalMapper.xml b/modules/shop/mapper/xml/DealerCapitalMapper.xml deleted file mode 100644 index 551ea7e..0000000 --- a/modules/shop/mapper/xml/DealerCapitalMapper.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - SELECT a.* - FROM shop_dealer_capital a - - - AND a.id = #{param.id} - - - AND a.user_id = #{param.userId} - - - AND a.order_id = #{param.orderId} - - - AND a.flow_type = #{param.flowType} - - - AND a.money = #{param.money} - - - AND a.describe LIKE CONCAT('%', #{param.describe}, '%') - - - AND a.to_user_id = #{param.toUserId} - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') - ) - - - - - - - - - - - diff --git a/modules/shop/mapper/xml/DealerOrderMapper.xml b/modules/shop/mapper/xml/DealerOrderMapper.xml deleted file mode 100644 index 1f70db9..0000000 --- a/modules/shop/mapper/xml/DealerOrderMapper.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - SELECT a.* - FROM shop_dealer_order a - - - AND a.id = #{param.id} - - - AND a.user_id = #{param.userId} - - - AND a.order_id = #{param.orderId} - - - AND a.order_price = #{param.orderPrice} - - - AND a.first_user_id = #{param.firstUserId} - - - AND a.second_user_id = #{param.secondUserId} - - - AND a.third_user_id = #{param.thirdUserId} - - - AND a.first_money = #{param.firstMoney} - - - AND a.second_money = #{param.secondMoney} - - - AND a.third_money = #{param.thirdMoney} - - - AND a.is_invalid = #{param.isInvalid} - - - AND a.is_settled = #{param.isSettled} - - - AND a.settle_time = #{param.settleTime} - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') - ) - - - - - - - - - - - diff --git a/modules/shop/mapper/xml/DealerRefereeMapper.xml b/modules/shop/mapper/xml/DealerRefereeMapper.xml deleted file mode 100644 index 34bd798..0000000 --- a/modules/shop/mapper/xml/DealerRefereeMapper.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - SELECT a.* - FROM shop_dealer_referee a - - - AND a.id = #{param.id} - - - AND a.dealer_id = #{param.dealerId} - - - AND a.user_id = #{param.userId} - - - AND a.level = #{param.level} - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') - ) - - - - - - - - - - - diff --git a/modules/shop/mapper/xml/DealerSettingMapper.xml b/modules/shop/mapper/xml/DealerSettingMapper.xml deleted file mode 100644 index 55013e2..0000000 --- a/modules/shop/mapper/xml/DealerSettingMapper.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - SELECT a.* - FROM shop_dealer_setting a - - - AND a.key = #{param.key} - - - AND a.describe LIKE CONCAT('%', #{param.describe}, '%') - - - AND a.values LIKE CONCAT('%', #{param.values}, '%') - - - AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') - ) - - - - - - - - - - - diff --git a/modules/shop/mapper/xml/DealerUserMapper.xml b/modules/shop/mapper/xml/DealerUserMapper.xml deleted file mode 100644 index caae59b..0000000 --- a/modules/shop/mapper/xml/DealerUserMapper.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - SELECT a.* - FROM shop_dealer_user a - - - AND a.id = #{param.id} - - - AND a.user_id = #{param.userId} - - - AND a.real_name LIKE CONCAT('%', #{param.realName}, '%') - - - AND a.mobile LIKE CONCAT('%', #{param.mobile}, '%') - - - AND a.pay_password LIKE CONCAT('%', #{param.payPassword}, '%') - - - AND a.money = #{param.money} - - - AND a.freeze_money = #{param.freezeMoney} - - - AND a.total_money = #{param.totalMoney} - - - AND a.referee_id = #{param.refereeId} - - - AND a.first_num = #{param.firstNum} - - - AND a.second_num = #{param.secondNum} - - - AND a.third_num = #{param.thirdNum} - - - AND a.is_delete = #{param.isDelete} - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') - ) - - - - - - - - - - - diff --git a/modules/shop/mapper/xml/DealerWithdrawMapper.xml b/modules/shop/mapper/xml/DealerWithdrawMapper.xml deleted file mode 100644 index 31b8e59..0000000 --- a/modules/shop/mapper/xml/DealerWithdrawMapper.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - SELECT a.* - FROM shop_dealer_withdraw a - - - AND a.id = #{param.id} - - - AND a.user_id = #{param.userId} - - - AND a.money = #{param.money} - - - AND a.pay_type = #{param.payType} - - - AND a.alipay_name LIKE CONCAT('%', #{param.alipayName}, '%') - - - AND a.alipay_account LIKE CONCAT('%', #{param.alipayAccount}, '%') - - - AND a.bank_name LIKE CONCAT('%', #{param.bankName}, '%') - - - AND a.bank_account LIKE CONCAT('%', #{param.bankAccount}, '%') - - - AND a.bank_card LIKE CONCAT('%', #{param.bankCard}, '%') - - - AND a.apply_status = #{param.applyStatus} - - - AND a.audit_time = #{param.auditTime} - - - AND a.reject_reason LIKE CONCAT('%', #{param.rejectReason}, '%') - - - AND a.platform LIKE CONCAT('%', #{param.platform}, '%') - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') - ) - - - - - - - - - - - diff --git a/modules/shop/mapper/xml/GoodsCategoryMapper.xml b/modules/shop/mapper/xml/GoodsCategoryMapper.xml deleted file mode 100644 index 3209ea3..0000000 --- a/modules/shop/mapper/xml/GoodsCategoryMapper.xml +++ /dev/null @@ -1,93 +0,0 @@ - - - - - - - SELECT a.* - FROM shop_goods_category a - - - AND a.category_id = #{param.categoryId} - - - AND a.category_code LIKE CONCAT('%', #{param.categoryCode}, '%') - - - AND a.title LIKE CONCAT('%', #{param.title}, '%') - - - AND a.type = #{param.type} - - - AND a.image LIKE CONCAT('%', #{param.image}, '%') - - - AND a.parent_id = #{param.parentId} - - - AND a.path LIKE CONCAT('%', #{param.path}, '%') - - - AND a.component LIKE CONCAT('%', #{param.component}, '%') - - - AND a.page_id = #{param.pageId} - - - AND a.user_id = #{param.userId} - - - AND a.count = #{param.count} - - - AND a.sort_number = #{param.sortNumber} - - - AND a.comments LIKE CONCAT('%', #{param.comments}, '%') - - - AND a.hide = #{param.hide} - - - AND a.recommend = #{param.recommend} - - - AND a.show_index = #{param.showIndex} - - - AND a.merchant_id = #{param.merchantId} - - - AND a.status = #{param.status} - - - AND a.deleted = #{param.deleted} - - - AND a.deleted = 0 - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') - ) - - - - - - - - - - - diff --git a/modules/shop/mapper/xml/GoodsMapper.xml b/modules/shop/mapper/xml/GoodsMapper.xml deleted file mode 100644 index 1f77d76..0000000 --- a/modules/shop/mapper/xml/GoodsMapper.xml +++ /dev/null @@ -1,122 +0,0 @@ - - - - - - - SELECT a.* - FROM shop_goods a - - - AND a.goods_id = #{param.goodsId} - - - AND a.type = #{param.type} - - - AND a.code LIKE CONCAT('%', #{param.code}, '%') - - - AND a.goods_name LIKE CONCAT('%', #{param.goodsName}, '%') - - - AND a.image LIKE CONCAT('%', #{param.image}, '%') - - - AND a.content LIKE CONCAT('%', #{param.content}, '%') - - - AND a.category_id = #{param.categoryId} - - - AND a.category_parent LIKE CONCAT('%', #{param.categoryParent}, '%') - - - AND a.category_children LIKE CONCAT('%', #{param.categoryChildren}, '%') - - - AND a.specs = #{param.specs} - - - AND a.position LIKE CONCAT('%', #{param.position}, '%') - - - AND a.price = #{param.price} - - - AND a.sale_price = #{param.salePrice} - - - AND a.deduct_stock_type = #{param.deductStockType} - - - AND a.files LIKE CONCAT('%', #{param.files}, '%') - - - AND a.sales = #{param.sales} - - - AND a.stock = #{param.stock} - - - AND a.goods_weight = #{param.goodsWeight} - - - AND a.recommend = #{param.recommend} - - - AND a.merchant_id = #{param.merchantId} - - - AND a.category_id IN (SELECT category_id FROM shop_goods_category WHERE parent_id=#{param.parentId}) - - - AND a.merchant_name LIKE CONCAT('%', #{param.merchantName}, '%') - - - AND a.is_show = #{param.isShow} - - - AND a.status = #{param.status} - - - AND a.comments LIKE CONCAT('%', #{param.comments}, '%') - - - AND a.sort_number = #{param.sortNumber} - - - AND a.user_id = #{param.userId} - - - AND a.deleted = #{param.deleted} - - - AND a.deleted = 0 - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - - - - - - - - - - - - - - - diff --git a/modules/shop/mapper/xml/GoodsSkuMapper.xml b/modules/shop/mapper/xml/GoodsSkuMapper.xml deleted file mode 100644 index 82ab333..0000000 --- a/modules/shop/mapper/xml/GoodsSkuMapper.xml +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - - SELECT a.* - FROM shop_goods_sku a - - - AND a.id = #{param.id} - - - AND a.goods_id = #{param.goodsId} - - - AND a.sku LIKE CONCAT('%', #{param.sku}, '%') - - - AND a.image LIKE CONCAT('%', #{param.image}, '%') - - - AND a.price = #{param.price} - - - AND a.sale_price = #{param.salePrice} - - - AND a.cost = #{param.cost} - - - AND a.stock = #{param.stock} - - - AND a.sku_no LIKE CONCAT('%', #{param.skuNo}, '%') - - - AND a.uuid LIKE CONCAT('%', #{param.uuid}, '%') - - - AND a.weight = #{param.weight} - - - AND a.volume = #{param.volume} - - - AND a.status = #{param.status} - - - AND a.comments LIKE CONCAT('%', #{param.comments}, '%') - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') - OR a.goods_id = #{param.keywords} - OR a.uuid = #{param.keywords} - OR a.sku_no = #{param.keywords} - ) - - - - - - - - - - - diff --git a/modules/shop/mapper/xml/GoodsSpecMapper.xml b/modules/shop/mapper/xml/GoodsSpecMapper.xml deleted file mode 100644 index 4d7b7c0..0000000 --- a/modules/shop/mapper/xml/GoodsSpecMapper.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - SELECT a.* - FROM shop_goods_spec a - - - AND a.id = #{param.id} - - - AND a.goods_id = #{param.goodsId} - - - AND a.spec_id = #{param.specId} - - - AND a.spec_name LIKE CONCAT('%', #{param.specName}, '%') - - - AND a.spec_value LIKE CONCAT('%', #{param.specValue}, '%') - - - AND a.type = #{param.type} - - - AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') - ) - - - - - - - - - - - diff --git a/modules/shop/mapper/xml/MerchantAccountMapper.xml b/modules/shop/mapper/xml/MerchantAccountMapper.xml deleted file mode 100644 index 07eadf1..0000000 --- a/modules/shop/mapper/xml/MerchantAccountMapper.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - SELECT a.*,b.merchant_name,b.goods_review - FROM shop_merchant_account a - LEFT JOIN shop_merchant b ON a.merchant_id = b.merchant_id - - - AND a.id = #{param.id} - - - AND a.phone = #{param.phone} - - - AND a.real_name LIKE CONCAT('%', #{param.realName}, '%') - - - AND a.merchant_id = #{param.merchantId} - - - AND a.user_id = #{param.userId} - - - AND a.comments LIKE CONCAT('%', #{param.comments}, '%') - - - AND a.status = #{param.status} - - - AND a.sort_number = #{param.sortNumber} - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') - OR a.phone = #{param.keywords} - OR a.real_name = #{param.keywords} - ) - - - - - - - - - - - - diff --git a/modules/shop/mapper/xml/MerchantApplyMapper.xml b/modules/shop/mapper/xml/MerchantApplyMapper.xml deleted file mode 100644 index 8ff8d0a..0000000 --- a/modules/shop/mapper/xml/MerchantApplyMapper.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - SELECT a.* - FROM shop_merchant_apply a - - - AND a.apply_id = #{param.applyId} - - - AND a.merchant_name LIKE CONCAT('%', #{param.merchantName}, '%') - - - AND a.image LIKE CONCAT('%', #{param.image}, '%') - - - AND a.phone LIKE CONCAT('%', #{param.phone}, '%') - - - AND a.real_name LIKE CONCAT('%', #{param.realName}, '%') - - - AND a.shop_type LIKE CONCAT('%', #{param.shopType}, '%') - - - AND a.category LIKE CONCAT('%', #{param.category}, '%') - - - AND a.commission = #{param.commission} - - - AND a.keywords LIKE CONCAT('%', #{param.keywords}, '%') - - - AND a.files LIKE CONCAT('%', #{param.files}, '%') - - - AND a.own_store = #{param.ownStore} - - - AND a.recommend = #{param.recommend} - - - AND a.goods_review = #{param.goodsReview} - - - AND a.comments LIKE CONCAT('%', #{param.comments}, '%') - - - AND a.status = #{param.status} - - - AND a.sort_number = #{param.sortNumber} - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') - ) - - - - - - - - - - - diff --git a/modules/shop/mapper/xml/MerchantMapper.xml b/modules/shop/mapper/xml/MerchantMapper.xml deleted file mode 100644 index 80eef6f..0000000 --- a/modules/shop/mapper/xml/MerchantMapper.xml +++ /dev/null @@ -1,111 +0,0 @@ - - - - - - - SELECT a.* - FROM shop_merchant a - - - AND a.merchant_id = #{param.merchantId} - - - AND a.merchant_name LIKE CONCAT('%', #{param.merchantName}, '%') - - - AND a.merchant_code LIKE CONCAT('%', #{param.merchantCode}, '%') - - - AND a.type = #{param.type} - - - AND a.image LIKE CONCAT('%', #{param.image}, '%') - - - AND a.phone LIKE CONCAT('%', #{param.phone}, '%') - - - AND a.real_name LIKE CONCAT('%', #{param.realName}, '%') - - - AND a.shop_type LIKE CONCAT('%', #{param.shopType}, '%') - - - AND a.item_type LIKE CONCAT('%', #{param.itemType}, '%') - - - AND a.category LIKE CONCAT('%', #{param.category}, '%') - - - AND a.commission = #{param.commission} - - - AND a.keywords LIKE CONCAT('%', #{param.keywords}, '%') - - - AND a.files LIKE CONCAT('%', #{param.files}, '%') - - - AND a.own_store = #{param.ownStore} - - - AND a.recommend = #{param.recommend} - - - AND a.goods_review = #{param.goodsReview} - - - AND a.comments LIKE CONCAT('%', #{param.comments}, '%') - - - AND a.status = #{param.status} - - - AND a.deleted = #{param.deleted} - - - AND a.deleted = 0 - - - AND a.sort_number = #{param.sortNumber} - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - AND a.merchant_id IN - - #{item} - - - - AND a.merchant_code IN - - #{item} - - - - AND ( - a.merchant_name LIKE CONCAT('%', #{param.keywords}, '%') - OR a.phone LIKE CONCAT('%', #{param.keywords}, '%') - OR a.real_name LIKE CONCAT('%', #{param.keywords}, '%') - ) - - - - - - - - - - - diff --git a/modules/shop/mapper/xml/MerchantTypeMapper.xml b/modules/shop/mapper/xml/MerchantTypeMapper.xml deleted file mode 100644 index d6fd259..0000000 --- a/modules/shop/mapper/xml/MerchantTypeMapper.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - SELECT a.* - FROM shop_merchant_type a - - - AND a.id = #{param.id} - - - AND a.name LIKE CONCAT('%', #{param.name}, '%') - - - AND a.comments LIKE CONCAT('%', #{param.comments}, '%') - - - AND a.status = #{param.status} - - - AND a.sort_number = #{param.sortNumber} - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') - ) - - - - - - - - - - - diff --git a/modules/shop/mapper/xml/OrderGoodsMapper.xml b/modules/shop/mapper/xml/OrderGoodsMapper.xml deleted file mode 100644 index d4661de..0000000 --- a/modules/shop/mapper/xml/OrderGoodsMapper.xml +++ /dev/null @@ -1,96 +0,0 @@ - - - - - - - SELECT a.* - FROM shop_order_goods a - - - AND a.id = #{param.id} - - - AND a.order_id = #{param.orderId} - - - AND a.order_code LIKE CONCAT('%', #{param.orderCode}, '%') - - - AND a.merchant_id = #{param.merchantId} - - - AND a.merchant_name LIKE CONCAT('%', #{param.merchantName}, '%') - - - AND a.image LIKE CONCAT('%', #{param.image}, '%') - - - AND a.goods_id = #{param.goodsId} - - - AND a.goods_name LIKE CONCAT('%', #{param.goodsName}, '%') - - - AND a.price = #{param.price} - - - AND a.pay_status = #{param.payStatus} - - - AND a.order_status = #{param.orderStatus} - - - AND a.is_free = #{param.isFree} - - - AND a.version = #{param.version} - - - AND a.time_period LIKE CONCAT('%', #{param.timePeriod}, '%') - - - AND a.date_time LIKE CONCAT('%', #{param.dateTime}, '%') - - - AND a.start_time LIKE CONCAT('%', #{param.startTime}, '%') - - - AND a.end_time LIKE CONCAT('%', #{param.endTime}, '%') - - - AND a.time_flag LIKE CONCAT('%', #{param.timeFlag}, '%') - - - AND a.expiration_time LIKE CONCAT('%', #{param.expirationTime}, '%') - - - AND a.comments LIKE CONCAT('%', #{param.comments}, '%') - - - AND a.user_id = #{param.userId} - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') - ) - - - - - - - - - - - diff --git a/modules/shop/mapper/xml/OrderInfoLogMapper.xml b/modules/shop/mapper/xml/OrderInfoLogMapper.xml deleted file mode 100644 index 9102086..0000000 --- a/modules/shop/mapper/xml/OrderInfoLogMapper.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - SELECT a.* - FROM shop_order_info_log a - - - AND a.id = #{param.id} - - - AND a.order_id = #{param.orderId} - - - AND a.merchant_id = #{param.merchantId} - - - AND a.field_id = #{param.fieldId} - - - AND a.use_num = #{param.useNum} - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') - ) - - - - - - - - - - - diff --git a/modules/shop/mapper/xml/OrderInfoMapper.xml b/modules/shop/mapper/xml/OrderInfoMapper.xml deleted file mode 100644 index 0c3037a..0000000 --- a/modules/shop/mapper/xml/OrderInfoMapper.xml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - SELECT a.* - FROM shop_order_info a - - - AND a.id = #{param.id} - - - AND a.oid = #{param.oid} - - - AND a.sid = #{param.sid} - - - AND a.fid = #{param.fid} - - - AND a.site_name LIKE CONCAT('%', #{param.siteName}, '%') - - - AND a.field_name LIKE CONCAT('%', #{param.fieldName}, '%') - - - AND a.date_time LIKE CONCAT('%', #{param.dateTime}, '%') - - - AND a.price = #{param.price} - - - AND a.children_price = #{param.childrenPrice} - - - AND a.adult_num = #{param.adultNum} - - - AND a.children_num = #{param.childrenNum} - - - AND a.pay_status = #{param.payStatus} - - - AND a.is_free = #{param.isFree} - - - AND a.is_children = #{param.isChildren} - - - AND a.type = #{param.type} - - - AND a.merge_data LIKE CONCAT('%', #{param.mergeData}, '%') - - - AND a.start_time = #{param.startTime} - - - AND a.order_time = #{param.orderTime} - - - AND a.time_flag LIKE CONCAT('%', #{param.timeFlag}, '%') - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') - ) - - - - - - - - - - - diff --git a/modules/shop/mapper/xml/OrderMapper.xml b/modules/shop/mapper/xml/OrderMapper.xml deleted file mode 100644 index fd0eb99..0000000 --- a/modules/shop/mapper/xml/OrderMapper.xml +++ /dev/null @@ -1,169 +0,0 @@ - - - - - - - SELECT a.*, b.username as nickname, b.truename as realName - FROM shop_order a - LEFT JOIN shop_users b ON a.uid = b.id - - - AND a.order_id = #{param.orderId} - - - AND a.type = #{param.type} - - - AND a.order_no LIKE CONCAT('%', #{param.orderNo}, '%') - - - AND a.channel = #{param.channel} - - - AND a.transaction_id LIKE CONCAT('%', #{param.transactionId}, '%') - - - AND a.refund_order LIKE CONCAT('%', #{param.refundOrder}, '%') - - - AND a.merchant_id = #{param.merchantId} - - - AND a.merchant_name LIKE CONCAT('%', #{param.merchantName}, '%') - - - AND a.merchant_code LIKE CONCAT('%', #{param.merchantCode}, '%') - - - AND a.uid = #{param.uid} - - - AND a.cid = #{param.cid} - - - AND a.vid = #{param.vid} - - - AND a.aid = #{param.aid} - - - AND a.admin_id = #{param.adminId} - - - AND a.code LIKE CONCAT('%', #{param.code}, '%') - - - AND a.name LIKE CONCAT('%', #{param.name}, '%') - - - AND a.phone LIKE CONCAT('%', #{param.phone}, '%') - - - AND a.total_price = #{param.totalPrice} - - - AND a.reduce_price = #{param.reducePrice} - - - AND a.pay_price = #{param.payPrice} - - - AND a.price = #{param.price} - - - AND a.money = #{param.money} - - - AND a.refund_money = #{param.refundMoney} - - - AND a.coach_price = #{param.coachPrice} - - - AND a.coach_id = #{param.coachId} - - - AND a.pay_type = #{param.payType} - - - AND a.pay_status = #{param.payStatus} - - - AND a.order_status = #{param.orderStatus} - - - AND a.coupon_type = #{param.couponType} - - - AND a.qrcode LIKE CONCAT('%', #{param.qrcode}, '%') - - - AND a.coupon_desc LIKE CONCAT('%', #{param.couponDesc}, '%') - - - AND a.return_num = #{param.returnNum} - - - AND a.return_money = #{param.returnMoney} - - - AND a.start_time LIKE CONCAT('%', #{param.startTime}, '%') - - - AND a.is_invoice = #{param.isInvoice} - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - AND a.pay_time = #{param.payTime} - - - AND a.refund_time = #{param.refundTime} - - - AND a.refund_apply_time = #{param.refundApplyTime} - - - AND a.expiration_time LIKE CONCAT('%', #{param.expirationTime}, '%') - - - AND a.check_bill = #{param.checkBill} - - - AND a.comments LIKE CONCAT('%', #{param.comments}, '%') - - - AND a.sort_number = #{param.sortNumber} - - - AND a.deleted = #{param.deleted} - - - AND a.deleted = 0 - - - AND (a.order_no = #{param.keywords} - OR a.order_id = #{param.keywords} - OR a.phone = #{param.keywords} - OR a.user_id = #{param.keywords} - ) - - - - - - - - - - - diff --git a/modules/shop/mapper/xml/RechargeOrderMapper.xml b/modules/shop/mapper/xml/RechargeOrderMapper.xml deleted file mode 100644 index 24c88e3..0000000 --- a/modules/shop/mapper/xml/RechargeOrderMapper.xml +++ /dev/null @@ -1,99 +0,0 @@ - - - - - - - SELECT a.* - FROM shop_recharge_order a - - - AND a.order_id = #{param.orderId} - - - AND a.order_no LIKE CONCAT('%', #{param.orderNo}, '%') - - - AND a.user_id = #{param.userId} - - - AND a.recharge_type = #{param.rechargeType} - - - AND a.organization_id = #{param.organizationId} - - - AND a.plan_id = #{param.planId} - - - AND a.pay_price = #{param.payPrice} - - - AND a.gift_money = #{param.giftMoney} - - - AND a.actual_money = #{param.actualMoney} - - - AND a.balance = #{param.balance} - - - AND a.pay_method LIKE CONCAT('%', #{param.payMethod}, '%') - - - AND a.pay_status = #{param.payStatus} - - - AND a.pay_time = #{param.payTime} - - - AND a.trade_id = #{param.tradeId} - - - AND a.platform LIKE CONCAT('%', #{param.platform}, '%') - - - AND a.shop_id = #{param.shopId} - - - AND a.sort_number = #{param.sortNumber} - - - AND a.comments LIKE CONCAT('%', #{param.comments}, '%') - - - AND a.status = #{param.status} - - - AND a.deleted = #{param.deleted} - - - AND a.deleted = 0 - - - AND a.merchant_code LIKE CONCAT('%', #{param.merchantCode}, '%') - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') - ) - - - - - - - - - - - diff --git a/modules/shop/mapper/xml/SpecMapper.xml b/modules/shop/mapper/xml/SpecMapper.xml deleted file mode 100644 index a6b9614..0000000 --- a/modules/shop/mapper/xml/SpecMapper.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - SELECT a.* - FROM shop_spec a - - - AND a.spec_id = #{param.specId} - - - AND a.spec_name LIKE CONCAT('%', #{param.specName}, '%') - - - AND a.spec_value LIKE CONCAT('%', #{param.specValue}, '%') - - - AND a.user_id = #{param.userId} - - - AND a.updater = #{param.updater} - - - AND a.comments LIKE CONCAT('%', #{param.comments}, '%') - - - AND a.status = #{param.status} - - - AND a.sort_number = #{param.sortNumber} - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') - ) - - - - - - - - - - - diff --git a/modules/shop/mapper/xml/SpecValueMapper.xml b/modules/shop/mapper/xml/SpecValueMapper.xml deleted file mode 100644 index 112fab1..0000000 --- a/modules/shop/mapper/xml/SpecValueMapper.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - SELECT a.* - FROM shop_spec_value a - - - AND a.spec_value_id = #{param.specValueId} - - - AND a.name LIKE CONCAT('%', #{param.name}, '%') - - - AND a.spec_id = #{param.specId} - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') - ) - - - - - - - - - - - diff --git a/modules/shop/mapper/xml/UserAddressMapper.xml b/modules/shop/mapper/xml/UserAddressMapper.xml deleted file mode 100644 index 472bf6f..0000000 --- a/modules/shop/mapper/xml/UserAddressMapper.xml +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - SELECT a.* - FROM shop_user_address a - - - AND a.id = #{param.id} - - - AND a.name LIKE CONCAT('%', #{param.name}, '%') - - - AND a.phone LIKE CONCAT('%', #{param.phone}, '%') - - - AND a.country LIKE CONCAT('%', #{param.country}, '%') - - - AND a.province LIKE CONCAT('%', #{param.province}, '%') - - - AND a.city LIKE CONCAT('%', #{param.city}, '%') - - - AND a.region LIKE CONCAT('%', #{param.region}, '%') - - - AND a.address LIKE CONCAT('%', #{param.address}, '%') - - - AND a.gender = #{param.gender} - - - AND a.type LIKE CONCAT('%', #{param.type}, '%') - - - AND a.is_default = #{param.isDefault} - - - AND a.user_id = #{param.userId} - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') - ) - - - - - - - - - - - diff --git a/modules/shop/mapper/xml/UserBalanceLogMapper.xml b/modules/shop/mapper/xml/UserBalanceLogMapper.xml deleted file mode 100644 index 3bd2500..0000000 --- a/modules/shop/mapper/xml/UserBalanceLogMapper.xml +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - SELECT a.* - FROM shop_user_balance_log a - - - AND a.log_id = #{param.logId} - - - AND a.user_id = #{param.userId} - - - AND a.scene = #{param.scene} - - - AND a.money = #{param.money} - - - AND a.balance = #{param.balance} - - - AND a.remark LIKE CONCAT('%', #{param.remark}, '%') - - - AND a.sort_number = #{param.sortNumber} - - - AND a.comments LIKE CONCAT('%', #{param.comments}, '%') - - - AND a.status = #{param.status} - - - AND a.deleted = #{param.deleted} - - - AND a.deleted = 0 - - - AND a.merchant_code LIKE CONCAT('%', #{param.merchantCode}, '%') - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') - ) - - - - - - - - - - - diff --git a/modules/shop/mapper/xml/UserCollectionMapper.xml b/modules/shop/mapper/xml/UserCollectionMapper.xml deleted file mode 100644 index e5e3fe5..0000000 --- a/modules/shop/mapper/xml/UserCollectionMapper.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - SELECT a.* - FROM shop_user_collection a - - - AND a.id = #{param.id} - - - AND a.tid = #{param.tid} - - - AND a.user_id = #{param.userId} - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') - ) - - - - - - - - - - - diff --git a/modules/shop/mapper/xml/UsersMapper.xml b/modules/shop/mapper/xml/UsersMapper.xml deleted file mode 100644 index add1efb..0000000 --- a/modules/shop/mapper/xml/UsersMapper.xml +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - - SELECT a.* - FROM shop_users a - - - AND a.id = #{param.id} - - - AND a.open_id LIKE CONCAT('%', #{param.openId}, '%') - - - AND a.session_key LIKE CONCAT('%', #{param.sessionKey}, '%') - - - AND a.username LIKE CONCAT('%', #{param.username}, '%') - - - AND a.avatar_url LIKE CONCAT('%', #{param.avatarUrl}, '%') - - - AND a.gender = #{param.gender} - - - AND a.country LIKE CONCAT('%', #{param.country}, '%') - - - AND a.province LIKE CONCAT('%', #{param.province}, '%') - - - AND a.city LIKE CONCAT('%', #{param.city}, '%') - - - AND a.phone LIKE CONCAT('%', #{param.phone}, '%') - - - AND a.integral = #{param.integral} - - - AND a.money = #{param.money} - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - AND a.idcard LIKE CONCAT('%', #{param.idcard}, '%') - - - AND a.truename LIKE CONCAT('%', #{param.truename}, '%') - - - AND a.is_admin = #{param.isAdmin} - - - AND (a.id = #{param.keywords} - OR a.open_id = #{param.keywords} - OR a.phone = #{param.keywords} - OR a.username LIKE CONCAT('%', #{param.keywords}, '%') - OR a.truename LIKE CONCAT('%', #{param.keywords}, '%') - OR a.idcard = #{param.keywords} - ) - - - - - - - - - - - diff --git a/modules/shop/mapper/xml/WechatDepositMapper.xml b/modules/shop/mapper/xml/WechatDepositMapper.xml deleted file mode 100644 index b80b478..0000000 --- a/modules/shop/mapper/xml/WechatDepositMapper.xml +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - SELECT a.* - FROM shop_wechat_deposit a - - - AND a.id = #{param.id} - - - AND a.oid = #{param.oid} - - - AND a.uid = #{param.uid} - - - AND a.order_num LIKE CONCAT('%', #{param.orderNum}, '%') - - - AND a.wechat_order LIKE CONCAT('%', #{param.wechatOrder}, '%') - - - AND a.wechat_return LIKE CONCAT('%', #{param.wechatReturn}, '%') - - - AND a.site_name LIKE CONCAT('%', #{param.siteName}, '%') - - - AND a.username LIKE CONCAT('%', #{param.username}, '%') - - - AND a.phone LIKE CONCAT('%', #{param.phone}, '%') - - - AND a.name LIKE CONCAT('%', #{param.name}, '%') - - - AND a.price = #{param.price} - - - AND a.status = #{param.status} - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - AND (a.oid = #{param.keywords} - OR a.order_num = #{param.keywords} - OR a.phone = #{param.keywords} - ) - - - - - - - - - - - diff --git a/modules/shop/param/BrandParam.java b/modules/shop/param/BrandParam.java deleted file mode 100644 index 28585cd..0000000 --- a/modules/shop/param/BrandParam.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.gxwebsoft.shop.param; - -import java.math.BigDecimal; -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 品牌查询参数 - * - * @author 科技小王子 - * @since 2024-04-04 11:38:21 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(value = "BrandParam对象", description = "品牌查询参数") -public class BrandParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "ID") - @QueryField(type = QueryType.EQ) - private Integer brandId; - - @ApiModelProperty(value = "品牌名称") - private String brandName; - - @ApiModelProperty(value = "图标") - private String image; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "状态") - @QueryField(type = QueryType.EQ) - private Integer status; - - @ApiModelProperty(value = "排序号") - @QueryField(type = QueryType.EQ) - private Integer sortNumber; - -} diff --git a/modules/shop/param/CartParam.java b/modules/shop/param/CartParam.java deleted file mode 100644 index 5c6e973..0000000 --- a/modules/shop/param/CartParam.java +++ /dev/null @@ -1,83 +0,0 @@ -package com.gxwebsoft.shop.param; - -import java.math.BigDecimal; -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import io.swagger.models.auth.In; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 购物车查询参数 - * - * @author 科技小王子 - * @since 2024-07-29 21:02:39 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(value = "CartParam对象", description = "购物车查询参数") -public class CartParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "购物车表ID") - @QueryField(type = QueryType.EQ) - private Integer id; - - @ApiModelProperty(value = "类型 0商城 1预定 ") - @QueryField(type = QueryType.EQ) - private Integer type; - - @ApiModelProperty(value = "商品ID") - @QueryField(type = QueryType.EQ) - private Integer goodsId; - - @ApiModelProperty(value = "唯一标识") - private String code; - - @ApiModelProperty(value = "商品规格") - @QueryField(type = QueryType.EQ) - private String spec; - - @ApiModelProperty(value = "商品数量") - @QueryField(type = QueryType.EQ) - private Integer cartNum; - - @ApiModelProperty(value = "0 = 未购买 1 = 已购买") - @QueryField(type = QueryType.EQ) - private Boolean isPay; - - @ApiModelProperty(value = "是否为立即购买") - @QueryField(type = QueryType.EQ) - private Boolean isNew; - - @ApiModelProperty(value = "拼团id") - @QueryField(type = QueryType.EQ) - private Integer combinationId; - - @ApiModelProperty(value = "秒杀产品ID") - @QueryField(type = QueryType.EQ) - private Integer seckillId; - - @ApiModelProperty(value = "砍价id") - @QueryField(type = QueryType.EQ) - private Integer bargainId; - - @ApiModelProperty(value = "用户ID") - private Integer userId; - - @ApiModelProperty(value = "是否选中") - private Boolean selected; - - @ApiModelProperty(value = "商户ID") - private Integer merchantId; - - @ApiModelProperty(value = "商品名称") - @QueryField(type = QueryType.LIKE) - private String goodsName; - -} diff --git a/modules/shop/param/CashierParam.java b/modules/shop/param/CashierParam.java deleted file mode 100644 index 0d32e62..0000000 --- a/modules/shop/param/CashierParam.java +++ /dev/null @@ -1,88 +0,0 @@ -package com.gxwebsoft.shop.param; - -import java.math.BigDecimal; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 收银查询参数 - * - * @author 科技小王子 - * @since 2024-08-04 11:51:43 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(value = "CashierParam对象", description = "收银查询参数") -public class CashierParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "收银单ID") - @QueryField(type = QueryType.EQ) - private Integer id; - - @ApiModelProperty(value = "类型 0商城 1外卖") - @QueryField(type = QueryType.EQ) - private Integer type; - - @ApiModelProperty(value = "唯一标识") - private String code; - - @ApiModelProperty(value = "商品ID") - private Integer goodsId; - - @ApiModelProperty(value = "名称") - private String name; - - @ApiModelProperty(value = "商品规格") - private String spec; - - @ApiModelProperty(value = "商品价格") - @QueryField(type = QueryType.EQ) - private BigDecimal price; - - @ApiModelProperty(value = "商品数量") - @QueryField(type = QueryType.EQ) - private Integer cartNum; - - @ApiModelProperty(value = "单商品合计") - @QueryField(type = QueryType.EQ) - private BigDecimal totalPrice; - - @ApiModelProperty(value = "0 = 未购买 1 = 已购买") - @QueryField(type = QueryType.EQ) - private Boolean isPay; - - @ApiModelProperty(value = "是否为立即购买") - @QueryField(type = QueryType.EQ) - private Boolean isNew; - - @ApiModelProperty(value = "是否选中") - @QueryField(type = QueryType.EQ) - private Boolean selected; - - @ApiModelProperty(value = "商户ID") - private Integer merchantId; - - @ApiModelProperty(value = "用户ID") - private Integer userId; - - @ApiModelProperty(value = "收银员ID") - private Integer cashierId; - - @ApiModelProperty(value = "收银单分组ID") - private Integer groupId; - - @ApiModelProperty(value = "按groupId分组") - @TableField(exist = false) - private Boolean showByGroup; - -} diff --git a/modules/shop/param/ChatConversationParam.java b/modules/shop/param/ChatConversationParam.java deleted file mode 100644 index 664f24b..0000000 --- a/modules/shop/param/ChatConversationParam.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.gxwebsoft.shop.param; - -import java.math.BigDecimal; -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 聊天消息表查询参数 - * - * @author 科技小王子 - * @since 2024-04-27 16:08:04 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(value = "ChatConversationParam对象", description = "聊天消息表查询参数") -public class ChatConversationParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "自增ID") - @QueryField(type = QueryType.EQ) - private Integer id; - - @ApiModelProperty(value = "用户ID") - @QueryField(type = QueryType.EQ) - private Integer userId; - - @ApiModelProperty(value = "好友ID") - @QueryField(type = QueryType.EQ) - private Integer friendId; - - @ApiModelProperty(value = "消息类型") - @QueryField(type = QueryType.EQ) - private Integer type; - - @ApiModelProperty(value = "消息内容") - private String content; - - @ApiModelProperty(value = "未读消息") - @QueryField(type = QueryType.EQ) - private Integer unRead; - - @ApiModelProperty(value = "状态, 0未读, 1已读") - @QueryField(type = QueryType.EQ) - private Integer status; - - @ApiModelProperty(value = "是否删除, 0否, 1是") - @QueryField(type = QueryType.EQ) - private Integer deleted; - -} diff --git a/modules/shop/param/ChatMessageParam.java b/modules/shop/param/ChatMessageParam.java deleted file mode 100644 index 24cf30b..0000000 --- a/modules/shop/param/ChatMessageParam.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.gxwebsoft.shop.param; - -import java.math.BigDecimal; -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 聊天消息表查询参数 - * - * @author 科技小王子 - * @since 2024-04-27 16:08:04 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(value = "ChatMessageParam对象", description = "聊天消息表查询参数") -public class ChatMessageParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "自增ID") - @QueryField(type = QueryType.EQ) - private Integer id; - - @ApiModelProperty(value = "发送人ID") - @QueryField(type = QueryType.EQ) - private Integer formUserId; - - @ApiModelProperty(value = "接收人ID") - @QueryField(type = QueryType.EQ) - private Integer toUserId; - - @ApiModelProperty(value = "消息类型") - private String type; - - @ApiModelProperty(value = "消息内容") - private String content; - - @ApiModelProperty(value = "屏蔽接收方") - @QueryField(type = QueryType.EQ) - private Integer sideTo; - - @ApiModelProperty(value = "屏蔽发送方") - @QueryField(type = QueryType.EQ) - private Integer sideFrom; - - @ApiModelProperty(value = "是否撤回") - @QueryField(type = QueryType.EQ) - private Integer withdraw; - - @ApiModelProperty(value = "文件信息") - private String fileInfo; - - @ApiModelProperty(value = "存在联系方式") - @QueryField(type = QueryType.EQ) - private Integer hasContact; - - @ApiModelProperty(value = "状态, 0未读, 1已读") - @QueryField(type = QueryType.EQ) - private Integer status; - - @ApiModelProperty(value = "是否删除, 0否, 1是") - @QueryField(type = QueryType.EQ) - private Integer deleted; - -} diff --git a/modules/shop/param/CountParam.java b/modules/shop/param/CountParam.java deleted file mode 100644 index 93036f5..0000000 --- a/modules/shop/param/CountParam.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.gxwebsoft.shop.param; - -import java.math.BigDecimal; -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 商城销售统计表查询参数 - * - * @author 科技小王子 - * @since 2024-07-31 22:25:10 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(value = "CountParam对象", description = "商城销售统计表查询参数") -public class CountParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "ID") - @QueryField(type = QueryType.EQ) - private Integer id; - - @ApiModelProperty(value = "统计日期") - private String dateTime; - - @ApiModelProperty(value = "总销售额") - @QueryField(type = QueryType.EQ) - private BigDecimal totalPrice; - - @ApiModelProperty(value = "今日销售额") - @QueryField(type = QueryType.EQ) - private BigDecimal todayPrice; - - @ApiModelProperty(value = "总会员数") - @QueryField(type = QueryType.EQ) - private BigDecimal totalUsers; - - @ApiModelProperty(value = "今日新增") - @QueryField(type = QueryType.EQ) - private BigDecimal todayUsers; - - @ApiModelProperty(value = "总订单笔数") - @QueryField(type = QueryType.EQ) - private BigDecimal totalOrders; - - @ApiModelProperty(value = "今日订单笔数") - @QueryField(type = QueryType.EQ) - private BigDecimal todayOrders; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "状态, 0正常, 1冻结") - @QueryField(type = QueryType.EQ) - private Integer status; - -} diff --git a/modules/shop/param/DealerApplyParam.java b/modules/shop/param/DealerApplyParam.java deleted file mode 100644 index 5d5479c..0000000 --- a/modules/shop/param/DealerApplyParam.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.gxwebsoft.shop.param; - -import java.math.BigDecimal; -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 分销商申请记录表查询参数 - * - * @author 科技小王子 - * @since 2024-07-28 11:57:41 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(value = "DealerApplyParam对象", description = "分销商申请记录表查询参数") -public class DealerApplyParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键ID") - @QueryField(type = QueryType.EQ) - private Integer applyId; - - @ApiModelProperty(value = "用户ID") - @QueryField(type = QueryType.EQ) - private Integer userId; - - @ApiModelProperty(value = "姓名") - private String realName; - - @ApiModelProperty(value = "手机号") - private String mobile; - - @ApiModelProperty(value = "推荐人用户ID") - @QueryField(type = QueryType.EQ) - private Integer refereeId; - - @ApiModelProperty(value = "申请方式(10需后台审核 20无需审核)") - @QueryField(type = QueryType.EQ) - private Integer applyType; - - @ApiModelProperty(value = "申请时间") - @QueryField(type = QueryType.EQ) - private Integer applyTime; - - @ApiModelProperty(value = "审核状态 (10待审核 20审核通过 30驳回)") - @QueryField(type = QueryType.EQ) - private Integer applyStatus; - - @ApiModelProperty(value = "审核时间") - @QueryField(type = QueryType.EQ) - private Integer auditTime; - - @ApiModelProperty(value = "驳回原因") - private String rejectReason; - -} diff --git a/modules/shop/param/DealerCapitalParam.java b/modules/shop/param/DealerCapitalParam.java deleted file mode 100644 index 29d1fae..0000000 --- a/modules/shop/param/DealerCapitalParam.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.gxwebsoft.shop.param; - -import java.math.BigDecimal; -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 分销商资金明细表查询参数 - * - * @author 科技小王子 - * @since 2024-07-28 11:57:41 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(value = "DealerCapitalParam对象", description = "分销商资金明细表查询参数") -public class DealerCapitalParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键ID") - @QueryField(type = QueryType.EQ) - private Integer id; - - @ApiModelProperty(value = "分销商用户ID") - @QueryField(type = QueryType.EQ) - private Integer userId; - - @ApiModelProperty(value = "订单ID") - @QueryField(type = QueryType.EQ) - private Integer orderId; - - @ApiModelProperty(value = "资金流动类型 (10佣金收入 20提现支出 30转账支出 40转账收入)") - @QueryField(type = QueryType.EQ) - private Integer flowType; - - @ApiModelProperty(value = "金额") - @QueryField(type = QueryType.EQ) - private BigDecimal money; - - @ApiModelProperty(value = "描述") - private String describe; - - @ApiModelProperty(value = "对方用户ID") - @QueryField(type = QueryType.EQ) - private Integer toUserId; - -} diff --git a/modules/shop/param/DealerOrderParam.java b/modules/shop/param/DealerOrderParam.java deleted file mode 100644 index 6a6fbcc..0000000 --- a/modules/shop/param/DealerOrderParam.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.gxwebsoft.shop.param; - -import java.math.BigDecimal; -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 分销商订单记录表查询参数 - * - * @author 科技小王子 - * @since 2024-07-28 11:57:41 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(value = "DealerOrderParam对象", description = "分销商订单记录表查询参数") -public class DealerOrderParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键ID") - @QueryField(type = QueryType.EQ) - private Integer id; - - @ApiModelProperty(value = "买家用户ID") - @QueryField(type = QueryType.EQ) - private Integer userId; - - @ApiModelProperty(value = "订单ID") - @QueryField(type = QueryType.EQ) - private Integer orderId; - - @ApiModelProperty(value = "订单总金额(不含运费)") - @QueryField(type = QueryType.EQ) - private BigDecimal orderPrice; - - @ApiModelProperty(value = "分销商用户id(一级)") - @QueryField(type = QueryType.EQ) - private Integer firstUserId; - - @ApiModelProperty(value = "分销商用户id(二级)") - @QueryField(type = QueryType.EQ) - private Integer secondUserId; - - @ApiModelProperty(value = "分销商用户id(三级)") - @QueryField(type = QueryType.EQ) - private Integer thirdUserId; - - @ApiModelProperty(value = "分销佣金(一级)") - @QueryField(type = QueryType.EQ) - private BigDecimal firstMoney; - - @ApiModelProperty(value = "分销佣金(二级)") - @QueryField(type = QueryType.EQ) - private BigDecimal secondMoney; - - @ApiModelProperty(value = "分销佣金(三级)") - @QueryField(type = QueryType.EQ) - private BigDecimal thirdMoney; - - @ApiModelProperty(value = "订单是否失效(0未失效 1已失效)") - @QueryField(type = QueryType.EQ) - private Integer isInvalid; - - @ApiModelProperty(value = "佣金结算(0未结算 1已结算)") - @QueryField(type = QueryType.EQ) - private Integer isSettled; - - @ApiModelProperty(value = "结算时间") - @QueryField(type = QueryType.EQ) - private Integer settleTime; - -} diff --git a/modules/shop/param/DealerRefereeParam.java b/modules/shop/param/DealerRefereeParam.java deleted file mode 100644 index 4d7f59c..0000000 --- a/modules/shop/param/DealerRefereeParam.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.shop.param; - -import java.math.BigDecimal; -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 分销商推荐关系表查询参数 - * - * @author 科技小王子 - * @since 2024-07-28 11:57:41 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(value = "DealerRefereeParam对象", description = "分销商推荐关系表查询参数") -public class DealerRefereeParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键ID") - @QueryField(type = QueryType.EQ) - private Integer id; - - @ApiModelProperty(value = "分销商用户ID") - @QueryField(type = QueryType.EQ) - private Integer dealerId; - - @ApiModelProperty(value = "用户id(被推荐人)") - @QueryField(type = QueryType.EQ) - private Integer userId; - - @ApiModelProperty(value = "推荐关系层级(1,2,3)") - @QueryField(type = QueryType.EQ) - private Integer level; - -} diff --git a/modules/shop/param/DealerSettingParam.java b/modules/shop/param/DealerSettingParam.java deleted file mode 100644 index cde1670..0000000 --- a/modules/shop/param/DealerSettingParam.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.gxwebsoft.shop.param; - -import java.math.BigDecimal; -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 分销商设置表查询参数 - * - * @author 科技小王子 - * @since 2024-07-28 11:57:41 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(value = "DealerSettingParam对象", description = "分销商设置表查询参数") -public class DealerSettingParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "设置项标示") - @QueryField(type = QueryType.EQ) - private String key; - - @ApiModelProperty(value = "设置项描述") - private String describe; - - @ApiModelProperty(value = "设置内容(json格式)") - private String values; - -} diff --git a/modules/shop/param/DealerUserParam.java b/modules/shop/param/DealerUserParam.java deleted file mode 100644 index 0d7f8ae..0000000 --- a/modules/shop/param/DealerUserParam.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.gxwebsoft.shop.param; - -import java.math.BigDecimal; -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 分销商用户记录表查询参数 - * - * @author 科技小王子 - * @since 2024-07-28 19:21:15 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(value = "DealerUserParam对象", description = "分销商用户记录表查询参数") -public class DealerUserParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键ID") - @QueryField(type = QueryType.EQ) - private Integer id; - - @ApiModelProperty(value = "自增ID") - @QueryField(type = QueryType.EQ) - private Integer userId; - - @ApiModelProperty(value = "姓名") - private String realName; - - @ApiModelProperty(value = "手机号") - private String mobile; - - @ApiModelProperty(value = "支付密码") - private String payPassword; - - @ApiModelProperty(value = "当前可提现佣金") - @QueryField(type = QueryType.EQ) - private BigDecimal money; - - @ApiModelProperty(value = "已冻结佣金") - @QueryField(type = QueryType.EQ) - private BigDecimal freezeMoney; - - @ApiModelProperty(value = "累积提现佣金") - @QueryField(type = QueryType.EQ) - private BigDecimal totalMoney; - - @ApiModelProperty(value = "推荐人用户ID") - @QueryField(type = QueryType.EQ) - private Integer refereeId; - - @ApiModelProperty(value = "成员数量(一级)") - @QueryField(type = QueryType.EQ) - private Integer firstNum; - - @ApiModelProperty(value = "成员数量(二级)") - @QueryField(type = QueryType.EQ) - private Integer secondNum; - - @ApiModelProperty(value = "成员数量(三级)") - @QueryField(type = QueryType.EQ) - private Integer thirdNum; - - @ApiModelProperty(value = "是否删除") - @QueryField(type = QueryType.EQ) - private Integer isDelete; - -} diff --git a/modules/shop/param/DealerWithdrawParam.java b/modules/shop/param/DealerWithdrawParam.java deleted file mode 100644 index 763eb47..0000000 --- a/modules/shop/param/DealerWithdrawParam.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.gxwebsoft.shop.param; - -import java.math.BigDecimal; -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 分销商提现明细表查询参数 - * - * @author 科技小王子 - * @since 2024-07-28 11:57:41 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(value = "DealerWithdrawParam对象", description = "分销商提现明细表查询参数") -public class DealerWithdrawParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键ID") - @QueryField(type = QueryType.EQ) - private Integer id; - - @ApiModelProperty(value = "分销商用户ID") - @QueryField(type = QueryType.EQ) - private Integer userId; - - @ApiModelProperty(value = "提现金额") - @QueryField(type = QueryType.EQ) - private BigDecimal money; - - @ApiModelProperty(value = "打款方式 (10微信 20支付宝 30银行卡)") - @QueryField(type = QueryType.EQ) - private Integer payType; - - @ApiModelProperty(value = "支付宝姓名") - private String alipayName; - - @ApiModelProperty(value = "支付宝账号") - private String alipayAccount; - - @ApiModelProperty(value = "开户行名称") - private String bankName; - - @ApiModelProperty(value = "银行开户名") - private String bankAccount; - - @ApiModelProperty(value = "银行卡号") - private String bankCard; - - @ApiModelProperty(value = "申请状态 (10待审核 20审核通过 30驳回 40已打款)") - @QueryField(type = QueryType.EQ) - private Integer applyStatus; - - @ApiModelProperty(value = "审核时间") - @QueryField(type = QueryType.EQ) - private Integer auditTime; - - @ApiModelProperty(value = "驳回原因") - private String rejectReason; - - @ApiModelProperty(value = "来源客户端(APP、H5、小程序等)") - private String platform; - -} diff --git a/modules/shop/param/GoodsCategoryParam.java b/modules/shop/param/GoodsCategoryParam.java deleted file mode 100644 index a14d70b..0000000 --- a/modules/shop/param/GoodsCategoryParam.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.gxwebsoft.shop.param; - -import java.math.BigDecimal; -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 商品分类查询参数 - * - * @author 科技小王子 - * @since 2024-03-30 19:34:16 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(value = "GoodsCategoryParam对象", description = "商品分类查询参数") -public class GoodsCategoryParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "商品分类ID") - @QueryField(type = QueryType.EQ) - private Integer categoryId; - - @ApiModelProperty(value = "分类标识") - private String categoryCode; - - @ApiModelProperty(value = "分类名称") - private String title; - - @ApiModelProperty(value = "类型 0商城 1外卖") - @QueryField(type = QueryType.EQ) - private Integer type; - - @ApiModelProperty(value = "分类图片") - private String image; - - @ApiModelProperty(value = "上级分类ID") - @QueryField(type = QueryType.EQ) - private Integer parentId; - - @ApiModelProperty(value = "路由/链接地址") - private String path; - - @ApiModelProperty(value = "组件路径") - private String component; - - @ApiModelProperty(value = "绑定的页面") - @QueryField(type = QueryType.EQ) - private Integer pageId; - - @ApiModelProperty(value = "用户ID") - @QueryField(type = QueryType.EQ) - private Integer userId; - - @ApiModelProperty(value = "商品数量") - @QueryField(type = QueryType.EQ) - private Integer count; - - @ApiModelProperty(value = "排序(数字越小越靠前)") - @QueryField(type = QueryType.EQ) - private Integer sortNumber; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "是否隐藏, 0否, 1是(仅注册路由不显示在左侧菜单)") - @QueryField(type = QueryType.EQ) - private Integer hide; - - @ApiModelProperty(value = "是否推荐") - @QueryField(type = QueryType.EQ) - private Integer recommend; - - @ApiModelProperty(value = "是否显示在首页") - @QueryField(type = QueryType.EQ) - private Integer showIndex; - - @ApiModelProperty(value = "商铺ID") - private Integer merchantId; - - @ApiModelProperty(value = "状态, 0正常, 1禁用") - @QueryField(type = QueryType.EQ) - private Integer status; - - @ApiModelProperty(value = "是否删除, 0否, 1是") - @QueryField(type = QueryType.EQ) - private Integer deleted; - -} diff --git a/modules/shop/param/GoodsParam.java b/modules/shop/param/GoodsParam.java deleted file mode 100644 index e2c47c8..0000000 --- a/modules/shop/param/GoodsParam.java +++ /dev/null @@ -1,130 +0,0 @@ -package com.gxwebsoft.shop.param; - -import java.math.BigDecimal; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 商品记录表查询参数 - * - * @author 科技小王子 - * @since 2024-07-25 19:22:01 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(value = "GoodsParam对象", description = "商品记录表查询参数") -public class GoodsParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "自增ID") - @QueryField(type = QueryType.EQ) - private Integer goodsId; - - @ApiModelProperty(value = "类型 1实物商品 2虚拟商品") - @QueryField(type = QueryType.EQ) - private Integer type; - - @ApiModelProperty(value = "商品编码") - private String code; - - @ApiModelProperty(value = "商品标题") - private String goodsName; - - @ApiModelProperty(value = "商品封面图") - private String image; - - @ApiModelProperty(value = "商品详情") - private String content; - - @ApiModelProperty(value = "商品分类ID") - @QueryField(type = QueryType.EQ) - private Integer categoryId; - - @ApiModelProperty(value = "一级分类") - private String categoryParent; - - @ApiModelProperty(value = "二级分类") - private String categoryChildren; - - @ApiModelProperty(value = "商品规格 0单规格 1多规格") - @QueryField(type = QueryType.EQ) - private Integer specs; - - @ApiModelProperty(value = "货架") - private String position; - - @ApiModelProperty(value = "进货价格") - @QueryField(type = QueryType.EQ) - private BigDecimal price; - - @ApiModelProperty(value = "销售价格") - @QueryField(type = QueryType.EQ) - private BigDecimal salePrice; - - @ApiModelProperty(value = "库存计算方式(10下单减库存 20付款减库存)") - @QueryField(type = QueryType.EQ) - private Integer deductStockType; - - @ApiModelProperty(value = "封面图") - private String files; - - @ApiModelProperty(value = "销量") - @QueryField(type = QueryType.EQ) - private Integer sales; - - @ApiModelProperty(value = "库存") - @QueryField(type = QueryType.EQ) - private Integer stock; - - @ApiModelProperty(value = "商品重量") - @QueryField(type = QueryType.EQ) - private Integer goodsWeight; - - @ApiModelProperty(value = "推荐") - @QueryField(type = QueryType.EQ) - private Integer recommend; - - @ApiModelProperty(value = "商户ID") - @QueryField(type = QueryType.EQ) - private Integer merchantId; - - @ApiModelProperty(value = "商户名称") - private String merchantName; - - @ApiModelProperty(value = "状态（0：未上架，1：上架）") - @QueryField(type = QueryType.EQ) - private Integer isShow; - - @ApiModelProperty(value = "状态, 0上架 1待上架 2待审核 3审核不通过") - @QueryField(type = QueryType.EQ) - private Integer status; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "排序号") - @QueryField(type = QueryType.EQ) - private Integer sortNumber; - - @ApiModelProperty(value = "用户ID") - @QueryField(type = QueryType.EQ) - private Integer userId; - - @ApiModelProperty(value = "是否删除, 0否, 1是") - @QueryField(type = QueryType.EQ) - private Integer deleted; - - @ApiModelProperty(value = "父级分类ID") - @TableField(exist = false) - private Integer parentId; - -} diff --git a/modules/shop/param/GoodsSkuParam.java b/modules/shop/param/GoodsSkuParam.java deleted file mode 100644 index fce8f91..0000000 --- a/modules/shop/param/GoodsSkuParam.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.gxwebsoft.shop.param; - -import java.math.BigDecimal; -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 商品sku列表查询参数 - * - * @author 科技小王子 - * @since 2024-07-26 10:49:02 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(value = "GoodsSkuParam对象", description = "商品sku列表查询参数") -public class GoodsSkuParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键ID") - @QueryField(type = QueryType.EQ) - private Integer id; - - @ApiModelProperty(value = "商品ID") - @QueryField(type = QueryType.EQ) - private Integer goodsId; - - @ApiModelProperty(value = "商品属性索引值 (attr_value|attr_value[|....])") - private String sku; - - @ApiModelProperty(value = "商品图片") - private String image; - - @ApiModelProperty(value = "商品价格") - @QueryField(type = QueryType.EQ) - private BigDecimal price; - - @ApiModelProperty(value = "市场价格") - @QueryField(type = QueryType.EQ) - private BigDecimal salePrice; - - @ApiModelProperty(value = "成本价") - @QueryField(type = QueryType.EQ) - private BigDecimal cost; - - @ApiModelProperty(value = "库存") - @QueryField(type = QueryType.EQ) - private Integer stock; - - @ApiModelProperty(value = "sku编码") - private String skuNo; - - @ApiModelProperty(value = "唯一值") - private String uuid; - - @ApiModelProperty(value = "重量") - @QueryField(type = QueryType.EQ) - private BigDecimal weight; - - @ApiModelProperty(value = "体积") - @QueryField(type = QueryType.EQ) - private BigDecimal volume; - - @ApiModelProperty(value = "状态, 0正常, 1异常") - @QueryField(type = QueryType.EQ) - private Integer status; - - @ApiModelProperty(value = "备注") - private String comments; - -} diff --git a/modules/shop/param/GoodsSpecParam.java b/modules/shop/param/GoodsSpecParam.java deleted file mode 100644 index d93bf87..0000000 --- a/modules/shop/param/GoodsSpecParam.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.gxwebsoft.shop.param; - -import java.math.BigDecimal; -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 商品多规格查询参数 - * - * @author 科技小王子 - * @since 2024-04-03 16:06:23 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(value = "GoodsSpecParam对象", description = "商品多规格查询参数") -public class GoodsSpecParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键") - @QueryField(type = QueryType.EQ) - private Integer id; - - @ApiModelProperty(value = "商品ID") - @QueryField(type = QueryType.EQ) - private Integer goodsId; - - @ApiModelProperty(value = "规格ID") - @QueryField(type = QueryType.EQ) - private Integer specId; - - @ApiModelProperty(value = "规格名称") - private String specName; - - @ApiModelProperty(value = "规格值") - private String specValue; - - @ApiModelProperty(value = "活动类型 0=商品，1=秒杀，2=砍价，3=拼团") - @QueryField(type = QueryType.EQ) - private Boolean type; - -} diff --git a/modules/shop/param/MerchantAccountParam.java b/modules/shop/param/MerchantAccountParam.java deleted file mode 100644 index 9b0c29b..0000000 --- a/modules/shop/param/MerchantAccountParam.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.gxwebsoft.shop.param; - -import java.math.BigDecimal; -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 商户账号查询参数 - * - * @author 科技小王子 - * @since 2024-04-19 12:02:24 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(value = "MerchantAccountParam对象", description = "商户账号查询参数") -public class MerchantAccountParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "ID") - @QueryField(type = QueryType.EQ) - private Integer id; - - @ApiModelProperty(value = "商户手机号") - @QueryField(type = QueryType.EQ) - private String phone; - - @ApiModelProperty(value = "真实姓名") - private String realName; - - @ApiModelProperty(value = "商户ID") - @QueryField(type = QueryType.EQ) - private Integer merchantId; - - @ApiModelProperty(value = "用户ID") - @QueryField(type = QueryType.EQ) - private Integer userId; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "状态") - @QueryField(type = QueryType.EQ) - private Integer status; - - @ApiModelProperty(value = "排序号") - @QueryField(type = QueryType.EQ) - private Integer sortNumber; - -} diff --git a/modules/shop/param/MerchantApplyParam.java b/modules/shop/param/MerchantApplyParam.java deleted file mode 100644 index 668534e..0000000 --- a/modules/shop/param/MerchantApplyParam.java +++ /dev/null @@ -1,81 +0,0 @@ -package com.gxwebsoft.shop.param; - -import java.math.BigDecimal; -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 商户入驻申请查询参数 - * - * @author 科技小王子 - * @since 2024-04-05 01:24:36 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(value = "MerchantApplyParam对象", description = "商户入驻申请查询参数") -public class MerchantApplyParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "ID") - @QueryField(type = QueryType.EQ) - private Integer applyId; - - @ApiModelProperty(value = "商户名称") - private String merchantName; - - @ApiModelProperty(value = "商户图标") - private String image; - - @ApiModelProperty(value = "商户手机号") - private String phone; - - @ApiModelProperty(value = "商户姓名") - private String realName; - - @ApiModelProperty(value = "店铺类型") - private String shopType; - - @ApiModelProperty(value = "商户分类") - private String category; - - @ApiModelProperty(value = "手续费") - @QueryField(type = QueryType.EQ) - private BigDecimal commission; - - @ApiModelProperty(value = "关键字") - private String keywords; - - @ApiModelProperty(value = "资质图片") - private String files; - - @ApiModelProperty(value = "是否自营") - @QueryField(type = QueryType.EQ) - private Integer ownStore; - - @ApiModelProperty(value = "是否推荐") - @QueryField(type = QueryType.EQ) - private Integer recommend; - - @ApiModelProperty(value = "是否需要审核") - @QueryField(type = QueryType.EQ) - private Integer goodsReview; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "状态") - @QueryField(type = QueryType.EQ) - private Integer status; - - @ApiModelProperty(value = "排序号") - @QueryField(type = QueryType.EQ) - private Integer sortNumber; - -} diff --git a/modules/shop/param/MerchantParam.java b/modules/shop/param/MerchantParam.java deleted file mode 100644 index 8f0da01..0000000 --- a/modules/shop/param/MerchantParam.java +++ /dev/null @@ -1,116 +0,0 @@ -package com.gxwebsoft.shop.param; - -import java.math.BigDecimal; -import java.util.Set; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableLogic; -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 商户查询参数 - * - * @author 科技小王子 - * @since 2024-04-05 00:03:54 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(value = "MerchantParam对象", description = "商户查询参数") -public class MerchantParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "ID") - @QueryField(type = QueryType.EQ) - private Integer merchantId; - - @ApiModelProperty(value = "商户名称") - private String merchantName; - - @ApiModelProperty(value = "商户标识") - private String merchantCode; - - @ApiModelProperty(value = "店铺类型") - @QueryField(type = QueryType.EQ) - private Integer type; - - @ApiModelProperty(value = "商户图标") - private String image; - - @ApiModelProperty(value = "商户手机号") - private String phone; - - @ApiModelProperty(value = "商户姓名") - private String realName; - - @ApiModelProperty(value = "店铺类型") - private String shopType; - - @ApiModelProperty(value = "项目类型") - private String itemType; - - @ApiModelProperty(value = "商户分类") - private String category; - - @ApiModelProperty(value = "所在省份") - private String province; - - @ApiModelProperty(value = "所在城市") - private String city; - - @ApiModelProperty(value = "所在辖区") - private String region; - - @ApiModelProperty(value = "手续费") - @QueryField(type = QueryType.EQ) - private BigDecimal commission; - - @ApiModelProperty(value = "关键字") - private String keywords; - - @ApiModelProperty(value = "资质图片") - private String files; - - @ApiModelProperty(value = "是否自营") - @QueryField(type = QueryType.EQ) - private Integer ownStore; - - @ApiModelProperty(value = "是否推荐") - @QueryField(type = QueryType.EQ) - private Integer recommend; - - @ApiModelProperty(value = "是否需要审核") - @QueryField(type = QueryType.EQ) - private Integer goodsReview; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "状态") - @QueryField(type = QueryType.EQ) - private Integer status; - - @ApiModelProperty("是否删除, 0否, 1是") - @TableLogic - private Integer deleted; - - @ApiModelProperty(value = "排序号") - @QueryField(type = QueryType.EQ) - private Integer sortNumber; - - @ApiModelProperty(value = "商户ID集合") - @TableField(exist = false) - private Set merchantIds; - - @ApiModelProperty(value = "商户编号集合") - @TableField(exist = false) - private Set merchantCodes; - -} diff --git a/modules/shop/param/MerchantTypeParam.java b/modules/shop/param/MerchantTypeParam.java deleted file mode 100644 index c36b596..0000000 --- a/modules/shop/param/MerchantTypeParam.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.gxwebsoft.shop.param; - -import java.math.BigDecimal; -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 商户类型查询参数 - * - * @author 科技小王子 - * @since 2024-04-05 00:08:51 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(value = "MerchantTypeParam对象", description = "商户类型查询参数") -public class MerchantTypeParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "ID") - @QueryField(type = QueryType.EQ) - private Integer id; - - @ApiModelProperty(value = "店铺类型") - private String name; - - @ApiModelProperty(value = "店铺入驻条件") - private String comments; - - @ApiModelProperty(value = "状态") - @QueryField(type = QueryType.EQ) - private Integer status; - - @ApiModelProperty(value = "排序号") - @QueryField(type = QueryType.EQ) - private Integer sortNumber; - -} diff --git a/modules/shop/param/OrderGoodsParam.java b/modules/shop/param/OrderGoodsParam.java deleted file mode 100644 index bcaaf2f..0000000 --- a/modules/shop/param/OrderGoodsParam.java +++ /dev/null @@ -1,103 +0,0 @@ -package com.gxwebsoft.shop.param; - -import java.math.BigDecimal; -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 商品信息查询参数 - * - * @author 科技小王子 - * @since 2024-05-26 15:42:03 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(value = "OrderGoodsParam对象", description = "商品信息查询参数") -public class OrderGoodsParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "自增ID") - @QueryField(type = QueryType.EQ) - private Integer id; - - @ApiModelProperty(value = "关联订单表id") - @QueryField(type = QueryType.EQ) - private Integer orderId; - - @ApiModelProperty(value = "订单标识") - private String orderCode; - - @ApiModelProperty(value = "关联商户ID") - @QueryField(type = QueryType.EQ) - private Integer merchantId; - - @ApiModelProperty(value = "商户名称") - private String merchantName; - - @ApiModelProperty(value = "商品封面图") - private String image; - - @ApiModelProperty(value = "关联商品id") - @QueryField(type = QueryType.EQ) - private Integer goodsId; - - @ApiModelProperty(value = "商品名称") - private String goodsName; - - @ApiModelProperty(value = "单价") - @QueryField(type = QueryType.EQ) - private BigDecimal price; - - @ApiModelProperty(value = "购买数量") - @QueryField(type = QueryType.EQ) - private Integer totalNum; - - @ApiModelProperty(value = "0 未付款 1已付款，2无需付款或占用状态") - @QueryField(type = QueryType.EQ) - private Integer payStatus; - - @ApiModelProperty(value = "0未使用，1已完成，2已取消，3取消中，4退款申请中，5退款被拒绝，6退款成功，7客户端申请退款") - @QueryField(type = QueryType.EQ) - private Integer orderStatus; - - @ApiModelProperty(value = "是否免费：0收费、1免费") - @QueryField(type = QueryType.EQ) - private Boolean isFree; - - @ApiModelProperty(value = "系统版本 0当前版本 其他版本") - @QueryField(type = QueryType.EQ) - private Integer version; - - @ApiModelProperty(value = "预约时间段") - private String timePeriod; - - @ApiModelProperty(value = "预定日期") - private String dateTime; - - @ApiModelProperty(value = "开场时间") - private String startTime; - - @ApiModelProperty(value = "结束时间") - private String endTime; - - @ApiModelProperty(value = "毫秒时间戳") - private Long timeFlag; - - @ApiModelProperty(value = "过期时间") - private String expirationTime; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "用户id") - @QueryField(type = QueryType.EQ) - private Integer userId; - -} diff --git a/modules/shop/param/OrderInfoLogParam.java b/modules/shop/param/OrderInfoLogParam.java deleted file mode 100644 index 31e8d8d..0000000 --- a/modules/shop/param/OrderInfoLogParam.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.gxwebsoft.shop.param; - -import java.math.BigDecimal; -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 订单核销查询参数 - * - * @author 科技小王子 - * @since 2024-05-14 13:20:04 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(value = "OrderInfoLogParam对象", description = "订单核销查询参数") -public class OrderInfoLogParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @QueryField(type = QueryType.EQ) - private Integer id; - - @ApiModelProperty(value = "关联订单表id") - @QueryField(type = QueryType.EQ) - private Integer orderId; - - @ApiModelProperty(value = "关联商户ID") - @QueryField(type = QueryType.EQ) - private Integer merchantId; - - @ApiModelProperty(value = "关联场地id") - @QueryField(type = QueryType.EQ) - private Integer fieldId; - - @ApiModelProperty(value = "核销数量") - @QueryField(type = QueryType.EQ) - private Boolean useNum; - -} diff --git a/modules/shop/param/OrderInfoParam.java b/modules/shop/param/OrderInfoParam.java deleted file mode 100644 index 3dfe0a3..0000000 --- a/modules/shop/param/OrderInfoParam.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.gxwebsoft.shop.param; - -import java.math.BigDecimal; -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 查询参数 - * - * @author 科技小王子 - * @since 2024-08-10 13:44:39 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(value = "OrderInfoParam对象", description = "查询参数") -public class OrderInfoParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @QueryField(type = QueryType.EQ) - private Integer id; - - @ApiModelProperty(value = "关联订单表id") - @QueryField(type = QueryType.EQ) - private Integer oid; - - @ApiModelProperty(value = "关联场馆id") - @QueryField(type = QueryType.EQ) - private Integer sid; - - @ApiModelProperty(value = "关联场地id") - @QueryField(type = QueryType.EQ) - private Integer fid; - - @ApiModelProperty(value = "场馆") - private String siteName; - - @ApiModelProperty(value = "场地") - private String fieldName; - - @ApiModelProperty(value = "预约时间段") - private String dateTime; - - @ApiModelProperty(value = "单价") - @QueryField(type = QueryType.EQ) - private BigDecimal price; - - @ApiModelProperty(value = "儿童价") - @QueryField(type = QueryType.EQ) - private BigDecimal childrenPrice; - - @ApiModelProperty(value = "成人人数") - @QueryField(type = QueryType.EQ) - private Integer adultNum; - - @ApiModelProperty(value = "儿童人数") - @QueryField(type = QueryType.EQ) - private Integer childrenNum; - - @ApiModelProperty(value = "1已付款，2未付款，3无需付款或占用状态") - @QueryField(type = QueryType.EQ) - private Integer payStatus; - - @ApiModelProperty(value = "是否免费：1免费、2收费") - @QueryField(type = QueryType.EQ) - private Integer isFree; - - @ApiModelProperty(value = "是否支持儿童票：1支持，2不支持") - @QueryField(type = QueryType.EQ) - private Integer isChildren; - - @ApiModelProperty(value = "预订类型：1全场，2半场") - @QueryField(type = QueryType.EQ) - private Integer type; - - @ApiModelProperty(value = "组合数据:日期+时间段+场馆id+场地id") - private String mergeData; - - @ApiModelProperty(value = "开场时间") - @QueryField(type = QueryType.EQ) - private Integer startTime; - - @ApiModelProperty(value = "下单时间") - @QueryField(type = QueryType.EQ) - private Integer orderTime; - - @ApiModelProperty(value = "毫秒时间戳") - private Long timeFlag; - -} diff --git a/modules/shop/param/OrderParam.java b/modules/shop/param/OrderParam.java deleted file mode 100644 index 12d11d7..0000000 --- a/modules/shop/param/OrderParam.java +++ /dev/null @@ -1,184 +0,0 @@ -package com.gxwebsoft.shop.param; - -import java.math.BigDecimal; -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 查询参数 - * - * @author 科技小王子 - * @since 2024-08-09 16:33:41 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(value = "OrderParam对象", description = "查询参数") -public class OrderParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @QueryField(type = QueryType.EQ) - private Integer orderId; - - @ApiModelProperty(value = "订单类型，0商城订单 1预定订单 2会员卡") - @QueryField(type = QueryType.EQ) - private Integer type; - - @ApiModelProperty(value = "订单号") - private String orderNo; - - @ApiModelProperty(value = "下单渠道，0小程序预定 1俱乐部训练场 3活动订场") - @QueryField(type = QueryType.EQ) - private Integer channel; - - @ApiModelProperty(value = "微信支付订单号") - private String transactionId; - - @ApiModelProperty(value = "微信退款订单号") - private String refundOrder; - - @ApiModelProperty(value = "场馆id用于权限判断") - @QueryField(type = QueryType.EQ) - private Integer merchantId; - - @ApiModelProperty(value = "商户名称") - private String merchantName; - - @ApiModelProperty(value = "商户编号") - private String merchantCode; - - @ApiModelProperty(value = "用户id") - @QueryField(type = QueryType.EQ) - private Integer uid; - - @ApiModelProperty(value = "使用的优惠券id") - @QueryField(type = QueryType.EQ) - private Integer cid; - - @ApiModelProperty(value = "使用的会员卡id") - @QueryField(type = QueryType.EQ) - private Integer vid; - - @ApiModelProperty(value = "关联管理员id") - @QueryField(type = QueryType.EQ) - private Integer aid; - - @ApiModelProperty(value = "核销管理员id") - @QueryField(type = QueryType.EQ) - private Integer adminId; - - @ApiModelProperty(value = "IC卡号") - private String code; - - @ApiModelProperty(value = "真实姓名") - private String name; - - @ApiModelProperty(value = "手机号码") - private String phone; - - @ApiModelProperty(value = "订单总额") - @QueryField(type = QueryType.EQ) - private BigDecimal totalPrice; - - @ApiModelProperty(value = "减少的金额，使用VIP会员折扣、优惠券抵扣、优惠券折扣后减去的价格") - @QueryField(type = QueryType.EQ) - private BigDecimal reducePrice; - - @ApiModelProperty(value = "实际付款") - @QueryField(type = QueryType.EQ) - private BigDecimal payPrice; - - @ApiModelProperty(value = "用于统计") - @QueryField(type = QueryType.EQ) - private BigDecimal price; - - @ApiModelProperty(value = "价钱，用于积分赠送") - @QueryField(type = QueryType.EQ) - private BigDecimal money; - - @ApiModelProperty(value = "退款金额") - @QueryField(type = QueryType.EQ) - private BigDecimal refundMoney; - - @ApiModelProperty(value = "教练价格") - @QueryField(type = QueryType.EQ) - private BigDecimal coachPrice; - - @ApiModelProperty(value = "教练id") - @QueryField(type = QueryType.EQ) - private Integer coachId; - - @ApiModelProperty(value = "1微信支付，2积分，3支付宝，4现金，5POS机，6VIP月卡，7VIP年卡，8VIP次卡，9IC月卡，10IC年卡，11IC次卡，12免费，13VIP充值卡，14IC充值卡，15积分支付，16VIP季卡，17IC季卡") - @QueryField(type = QueryType.EQ) - private Boolean payType; - - @ApiModelProperty(value = "1已付款，2未付款") - @QueryField(type = QueryType.EQ) - private Boolean payStatus; - - @ApiModelProperty(value = "1已完成，2未使用，3已取消，4退款申请中，5退款被拒绝，6退款成功，7客户端申请退款") - @QueryField(type = QueryType.EQ) - private Boolean orderStatus; - - @ApiModelProperty(value = "优惠类型：0无、1抵扣优惠券、2折扣优惠券、3、VIP月卡、4VIP年卡，5VIP次卡、6VIP会员卡、7IC月卡、8IC年卡、9IC次卡、10IC会员卡、11免费订单、12VIP充值卡、13IC充值卡、14VIP季卡、15IC季卡") - @QueryField(type = QueryType.EQ) - private Boolean couponType; - - @ApiModelProperty(value = "二维码地址，保存订单号，支付成功后才生成") - private String qrcode; - - @ApiModelProperty(value = "优惠说明") - private String couponDesc; - - @ApiModelProperty(value = "vip月卡年卡、ic月卡年卡回退次数") - @QueryField(type = QueryType.EQ) - private Integer returnNum; - - @ApiModelProperty(value = "vip充值回退金额") - @QueryField(type = QueryType.EQ) - private BigDecimal returnMoney; - - @ApiModelProperty(value = "预约详情开始时间数组") - private String startTime; - - @ApiModelProperty(value = "是否已开具发票：1已开发票，2未开发票，3不能开具发票") - @QueryField(type = QueryType.EQ) - private Boolean isInvoice; - - @ApiModelProperty(value = "付款时间") - @QueryField(type = QueryType.EQ) - private Integer payTime; - - @ApiModelProperty(value = "退款时间") - @QueryField(type = QueryType.EQ) - private Integer refundTime; - - @ApiModelProperty(value = "申请退款时间") - @QueryField(type = QueryType.EQ) - private Integer refundApplyTime; - - @ApiModelProperty(value = "过期时间") - private String expirationTime; - - @ApiModelProperty(value = "对账情况：1=已对账；2=未对账；3=已对账，金额对不上；4=未查询到该订单") - @QueryField(type = QueryType.EQ) - private Integer checkBill; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "排序号") - @QueryField(type = QueryType.EQ) - private Integer sortNumber; - - @ApiModelProperty(value = "是否删除, 0否, 1是") - @QueryField(type = QueryType.EQ) - private Integer deleted; - -} diff --git a/modules/shop/param/RechargeOrderParam.java b/modules/shop/param/RechargeOrderParam.java deleted file mode 100644 index a16ead4..0000000 --- a/modules/shop/param/RechargeOrderParam.java +++ /dev/null @@ -1,105 +0,0 @@ -package com.gxwebsoft.shop.param; - -import java.math.BigDecimal; -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 会员充值订单表查询参数 - * - * @author 科技小王子 - * @since 2024-07-26 23:18:48 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(value = "RechargeOrderParam对象", description = "会员充值订单表查询参数") -public class RechargeOrderParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "订单ID") - @QueryField(type = QueryType.EQ) - private Integer orderId; - - @ApiModelProperty(value = "订单号") - private String orderNo; - - @ApiModelProperty(value = "用户ID") - @QueryField(type = QueryType.EQ) - private Integer userId; - - @ApiModelProperty(value = "充值方式(10自定义金额 20套餐充值)") - @QueryField(type = QueryType.EQ) - private Integer rechargeType; - - @ApiModelProperty(value = "机构id") - @QueryField(type = QueryType.EQ) - private Integer organizationId; - - @ApiModelProperty(value = "充值套餐ID") - @QueryField(type = QueryType.EQ) - private Integer planId; - - @ApiModelProperty(value = "用户支付金额") - @QueryField(type = QueryType.EQ) - private BigDecimal payPrice; - - @ApiModelProperty(value = "赠送金额") - @QueryField(type = QueryType.EQ) - private BigDecimal giftMoney; - - @ApiModelProperty(value = "实际到账金额") - @QueryField(type = QueryType.EQ) - private BigDecimal actualMoney; - - @ApiModelProperty(value = "用户可用余额") - @QueryField(type = QueryType.EQ) - private BigDecimal balance; - - @ApiModelProperty(value = "支付方式（微信/支付宝）") - private String payMethod; - - @ApiModelProperty(value = "支付状态(10待支付 20已支付)") - @QueryField(type = QueryType.EQ) - private Integer payStatus; - - @ApiModelProperty(value = "付款时间") - @QueryField(type = QueryType.EQ) - private Integer payTime; - - @ApiModelProperty(value = "第三方交易记录ID") - @QueryField(type = QueryType.EQ) - private Integer tradeId; - - @ApiModelProperty(value = "来源客户端 (APP、H5、小程序等)") - private String platform; - - @ApiModelProperty(value = "所属门店ID") - @QueryField(type = QueryType.EQ) - private Integer shopId; - - @ApiModelProperty(value = "排序(数字越小越靠前)") - @QueryField(type = QueryType.EQ) - private Integer sortNumber; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "状态, 0正常, 1冻结") - @QueryField(type = QueryType.EQ) - private Integer status; - - @ApiModelProperty(value = "是否删除, 0否, 1是") - @QueryField(type = QueryType.EQ) - private Integer deleted; - - @ApiModelProperty(value = "商户编码") - private String merchantCode; - -} diff --git a/modules/shop/param/SpecParam.java b/modules/shop/param/SpecParam.java deleted file mode 100644 index 460606d..0000000 --- a/modules/shop/param/SpecParam.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.gxwebsoft.shop.param; - -import java.math.BigDecimal; -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 规格查询参数 - * - * @author 科技小王子 - * @since 2024-07-25 03:00:41 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(value = "SpecParam对象", description = "规格查询参数") -public class SpecParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "规格ID") - @QueryField(type = QueryType.EQ) - private Integer specId; - - @ApiModelProperty(value = "规格名称") - private String specName; - - @ApiModelProperty(value = "规格值") - private String specValue; - - @ApiModelProperty(value = "创建用户") - @QueryField(type = QueryType.EQ) - private Integer userId; - - @ApiModelProperty(value = "更新者") - @QueryField(type = QueryType.EQ) - private Integer updater; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "状态, 0正常, 1待修,2异常已修，3异常未修") - @QueryField(type = QueryType.EQ) - private Integer status; - - @ApiModelProperty(value = "排序号") - @QueryField(type = QueryType.EQ) - private Integer sortNumber; - -} diff --git a/modules/shop/param/SpecValueParam.java b/modules/shop/param/SpecValueParam.java deleted file mode 100644 index f773b3b..0000000 --- a/modules/shop/param/SpecValueParam.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gxwebsoft.shop.param; - -import java.math.BigDecimal; -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 规格值查询参数 - * - * @author 科技小王子 - * @since 2024-04-01 09:49:15 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(value = "SpecValueParam对象", description = "规格值查询参数") -public class SpecValueParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "规格值ID") - @QueryField(type = QueryType.EQ) - private Integer specValueId; - - @ApiModelProperty(value = "规格值") - private String name; - - @ApiModelProperty(value = "规格组ID") - @QueryField(type = QueryType.EQ) - private Integer specId; - -} diff --git a/modules/shop/param/UserAddressParam.java b/modules/shop/param/UserAddressParam.java deleted file mode 100644 index be97407..0000000 --- a/modules/shop/param/UserAddressParam.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.gxwebsoft.shop.param; - -import java.math.BigDecimal; -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 收货地址查询参数 - * - * @author 科技小王子 - * @since 2024-05-26 10:58:37 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(value = "UserAddressParam对象", description = "收货地址查询参数") -public class UserAddressParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键ID") - @QueryField(type = QueryType.EQ) - private Integer id; - - @ApiModelProperty(value = "姓名") - private String name; - - @ApiModelProperty(value = "手机号码") - private String phone; - - @ApiModelProperty(value = "所在国家") - private String country; - - @ApiModelProperty(value = "所在省份") - private String province; - - @ApiModelProperty(value = "所在城市") - private String city; - - @ApiModelProperty(value = "所在辖区") - private String region; - - @ApiModelProperty(value = "收货地址") - private String address; - - @ApiModelProperty(value = "1先生 2女士") - @QueryField(type = QueryType.EQ) - private Integer gender; - - @ApiModelProperty(value = "家、公司、学校") - private String type; - - @ApiModelProperty(value = "默认收货地址") - @QueryField(type = QueryType.EQ) - private Boolean isDefault; - - @ApiModelProperty(value = "用户ID") - @QueryField(type = QueryType.EQ) - private Integer userId; - -} diff --git a/modules/shop/param/UserBalanceLogParam.java b/modules/shop/param/UserBalanceLogParam.java deleted file mode 100644 index 22c12ed..0000000 --- a/modules/shop/param/UserBalanceLogParam.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.gxwebsoft.shop.param; - -import java.math.BigDecimal; -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 用户余额变动明细表查询参数 - * - * @author 科技小王子 - * @since 2024-05-29 15:57:44 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(value = "UserBalanceLogParam对象", description = "用户余额变动明细表查询参数") -public class UserBalanceLogParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键ID") - @QueryField(type = QueryType.EQ) - private Integer logId; - - @ApiModelProperty(value = "用户ID") - @QueryField(type = QueryType.EQ) - private Integer userId; - - @ApiModelProperty(value = "余额变动场景(10用户充值 20用户消费 30管理员操作 40订单退款)") - @QueryField(type = QueryType.EQ) - private Integer scene; - - @ApiModelProperty(value = "变动金额") - @QueryField(type = QueryType.EQ) - private BigDecimal money; - - @ApiModelProperty(value = "变动后余额") - @QueryField(type = QueryType.EQ) - private BigDecimal balance; - - @ApiModelProperty(value = "管理员备注") - private String remark; - - @ApiModelProperty(value = "排序(数字越小越靠前)") - @QueryField(type = QueryType.EQ) - private Integer sortNumber; - - @ApiModelProperty(value = "备注") - private String comments; - - @ApiModelProperty(value = "状态, 0正常, 1冻结") - @QueryField(type = QueryType.EQ) - private Integer status; - - @ApiModelProperty(value = "是否删除, 0否, 1是") - @QueryField(type = QueryType.EQ) - private Integer deleted; - - @ApiModelProperty(value = "商户编码") - private String merchantCode; - -} diff --git a/modules/shop/param/UserCollectionParam.java b/modules/shop/param/UserCollectionParam.java deleted file mode 100644 index 99a2013..0000000 --- a/modules/shop/param/UserCollectionParam.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.gxwebsoft.shop.param; - -import java.math.BigDecimal; -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 我的收藏查询参数 - * - * @author 科技小王子 - * @since 2024-04-28 18:17:37 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(value = "UserCollectionParam对象", description = "我的收藏查询参数") -public class UserCollectionParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键ID") - @QueryField(type = QueryType.EQ) - private Integer id; - - @ApiModelProperty(value = "租户ID") - @QueryField(type = QueryType.EQ) - private Integer tid; - - @ApiModelProperty(value = "用户ID") - @QueryField(type = QueryType.EQ) - private Integer userId; - -} diff --git a/modules/shop/param/UsersParam.java b/modules/shop/param/UsersParam.java deleted file mode 100644 index 1139b2c..0000000 --- a/modules/shop/param/UsersParam.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.gxwebsoft.shop.param; - -import java.math.BigDecimal; -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 查询参数 - * - * @author 科技小王子 - * @since 2024-08-09 15:20:25 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(value = "UsersParam对象", description = "查询参数") -public class UsersParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @QueryField(type = QueryType.EQ) - private Integer id; - - @ApiModelProperty(value = "用户唯一小程序id") - private String openId; - - @ApiModelProperty(value = "小程序用户秘钥") - private String sessionKey; - - @ApiModelProperty(value = "用户名") - private String username; - - @ApiModelProperty(value = "头像地址") - private String avatarUrl; - - @ApiModelProperty(value = "1男，2女") - @QueryField(type = QueryType.EQ) - private Integer gender; - - @ApiModelProperty(value = "国家") - private String country; - - @ApiModelProperty(value = "省份") - private String province; - - @ApiModelProperty(value = "城市") - private String city; - - @ApiModelProperty(value = "手机号码") - private String phone; - - @ApiModelProperty(value = "积分") - @QueryField(type = QueryType.EQ) - private BigDecimal integral; - - @ApiModelProperty(value = "余额") - @QueryField(type = QueryType.EQ) - private BigDecimal money; - - @ApiModelProperty(value = "会员卡ID") - private String idcard; - - @ApiModelProperty(value = "真实姓名") - private String truename; - - @ApiModelProperty(value = "是否管理员：1是；2否") - @QueryField(type = QueryType.EQ) - private Boolean isAdmin; - -} diff --git a/modules/shop/param/WechatDepositParam.java b/modules/shop/param/WechatDepositParam.java deleted file mode 100644 index e16b4cf..0000000 --- a/modules/shop/param/WechatDepositParam.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.gxwebsoft.shop.param; - -import java.math.BigDecimal; -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 押金查询参数 - * - * @author 科技小王子 - * @since 2024-05-03 15:50:28 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(value = "WechatDepositParam对象", description = "押金查询参数") -public class WechatDepositParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @QueryField(type = QueryType.EQ) - private Integer id; - - @ApiModelProperty(value = "订单id") - @QueryField(type = QueryType.EQ) - private Integer oid; - - @ApiModelProperty(value = "用户id") - @QueryField(type = QueryType.EQ) - private Integer uid; - - @ApiModelProperty(value = "场地订单号") - private String orderNum; - - @ApiModelProperty(value = "付款订单号") - private String wechatOrder; - - @ApiModelProperty(value = "退款订单号 ") - private String wechatReturn; - - @ApiModelProperty(value = "场馆名称") - private String siteName; - - @ApiModelProperty(value = "微信昵称") - private String username; - - @ApiModelProperty(value = "手机号码") - private String phone; - - @ApiModelProperty(value = "物品名称") - private String name; - - @ApiModelProperty(value = "押金金额") - @QueryField(type = QueryType.EQ) - private BigDecimal price; - - @ApiModelProperty(value = "押金状态，1已付款，2未付款，已退押金") - @QueryField(type = QueryType.EQ) - private Integer status; - -} diff --git a/modules/shop/service/BrandService.java b/modules/shop/service/BrandService.java deleted file mode 100644 index 60f47e5..0000000 --- a/modules/shop/service/BrandService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.shop.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.shop.entity.Brand; -import com.gxwebsoft.shop.param.BrandParam; - -import java.util.List; - -/** - * 品牌Service - * - * @author 科技小王子 - * @since 2024-04-04 11:38:21 - */ -public interface BrandService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(BrandParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(BrandParam param); - - /** - * 根据id查询 - * - * @param brandId ID - * @return Brand - */ - Brand getByIdRel(Integer brandId); - -} diff --git a/modules/shop/service/CartService.java b/modules/shop/service/CartService.java deleted file mode 100644 index 1855d33..0000000 --- a/modules/shop/service/CartService.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.gxwebsoft.shop.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.shop.entity.Cart; -import com.gxwebsoft.shop.param.CartParam; -import com.gxwebsoft.shop.vo.CartVo; - -import java.util.List; - -/** - * 购物车Service - * - * @author 科技小王子 - * @since 2024-07-29 21:02:39 - */ -public interface CartService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(CartParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - CartVo listRel(CartParam param); - - /** - * 根据id查询 - * - * @param id 购物车表ID - * @return Cart - */ - Cart getByIdRel(Integer id); - - List listRelMpj(CartParam param); - -} diff --git a/modules/shop/service/CashierService.java b/modules/shop/service/CashierService.java deleted file mode 100644 index cf8bba3..0000000 --- a/modules/shop/service/CashierService.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.gxwebsoft.shop.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.shop.entity.Cashier; -import com.gxwebsoft.shop.param.CashierParam; -import com.gxwebsoft.shop.vo.CashierVo; - -import java.util.List; - -/** - * 收银Service - * - * @author 科技小王子 - * @since 2024-08-04 11:51:43 - */ -public interface CashierService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(CashierParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - CashierVo listRel(CashierParam param); - - /** - * 根据id查询 - * - * @param id 收银单ID - * @return Cashier - */ - Cashier getByIdRel(Integer id); - - List listRelByGroupId(CashierParam param); -} diff --git a/modules/shop/service/ChatConversationService.java b/modules/shop/service/ChatConversationService.java deleted file mode 100644 index 3770af8..0000000 --- a/modules/shop/service/ChatConversationService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.shop.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.shop.entity.ChatConversation; -import com.gxwebsoft.shop.param.ChatConversationParam; - -import java.util.List; - -/** - * 聊天消息表Service - * - * @author 科技小王子 - * @since 2024-04-27 16:08:04 - */ -public interface ChatConversationService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(ChatConversationParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(ChatConversationParam param); - - /** - * 根据id查询 - * - * @param id 自增ID - * @return ChatConversation - */ - ChatConversation getByIdRel(Integer id); - -} diff --git a/modules/shop/service/ChatMessageService.java b/modules/shop/service/ChatMessageService.java deleted file mode 100644 index 937ab3d..0000000 --- a/modules/shop/service/ChatMessageService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.shop.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.shop.entity.ChatMessage; -import com.gxwebsoft.shop.param.ChatMessageParam; - -import java.util.List; - -/** - * 聊天消息表Service - * - * @author 科技小王子 - * @since 2024-04-27 16:08:04 - */ -public interface ChatMessageService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(ChatMessageParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(ChatMessageParam param); - - /** - * 根据id查询 - * - * @param id 自增ID - * @return ChatMessage - */ - ChatMessage getByIdRel(Integer id); - -} diff --git a/modules/shop/service/CountService.java b/modules/shop/service/CountService.java deleted file mode 100644 index cd52c34..0000000 --- a/modules/shop/service/CountService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.shop.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.shop.entity.Count; -import com.gxwebsoft.shop.param.CountParam; - -import java.util.List; - -/** - * 商城销售统计表Service - * - * @author 科技小王子 - * @since 2024-07-31 22:25:10 - */ -public interface CountService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(CountParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(CountParam param); - - /** - * 根据id查询 - * - * @param id ID - * @return Count - */ - Count getByIdRel(Integer id); - -} diff --git a/modules/shop/service/DealerApplyService.java b/modules/shop/service/DealerApplyService.java deleted file mode 100644 index 92d2051..0000000 --- a/modules/shop/service/DealerApplyService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.shop.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.shop.entity.DealerApply; -import com.gxwebsoft.shop.param.DealerApplyParam; - -import java.util.List; - -/** - * 分销商申请记录表Service - * - * @author 科技小王子 - * @since 2024-07-28 11:57:41 - */ -public interface DealerApplyService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(DealerApplyParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(DealerApplyParam param); - - /** - * 根据id查询 - * - * @param applyId 主键ID - * @return DealerApply - */ - DealerApply getByIdRel(Integer applyId); - -} diff --git a/modules/shop/service/DealerCapitalService.java b/modules/shop/service/DealerCapitalService.java deleted file mode 100644 index 4b7c97a..0000000 --- a/modules/shop/service/DealerCapitalService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.shop.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.shop.entity.DealerCapital; -import com.gxwebsoft.shop.param.DealerCapitalParam; - -import java.util.List; - -/** - * 分销商资金明细表Service - * - * @author 科技小王子 - * @since 2024-07-28 11:57:41 - */ -public interface DealerCapitalService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(DealerCapitalParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(DealerCapitalParam param); - - /** - * 根据id查询 - * - * @param id 主键ID - * @return DealerCapital - */ - DealerCapital getByIdRel(Integer id); - -} diff --git a/modules/shop/service/DealerOrderService.java b/modules/shop/service/DealerOrderService.java deleted file mode 100644 index 19582ed..0000000 --- a/modules/shop/service/DealerOrderService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.shop.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.shop.entity.DealerOrder; -import com.gxwebsoft.shop.param.DealerOrderParam; - -import java.util.List; - -/** - * 分销商订单记录表Service - * - * @author 科技小王子 - * @since 2024-07-28 11:57:41 - */ -public interface DealerOrderService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(DealerOrderParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(DealerOrderParam param); - - /** - * 根据id查询 - * - * @param id 主键ID - * @return DealerOrder - */ - DealerOrder getByIdRel(Integer id); - -} diff --git a/modules/shop/service/DealerRefereeService.java b/modules/shop/service/DealerRefereeService.java deleted file mode 100644 index 430206e..0000000 --- a/modules/shop/service/DealerRefereeService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.shop.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.shop.entity.DealerReferee; -import com.gxwebsoft.shop.param.DealerRefereeParam; - -import java.util.List; - -/** - * 分销商推荐关系表Service - * - * @author 科技小王子 - * @since 2024-07-28 11:57:41 - */ -public interface DealerRefereeService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(DealerRefereeParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(DealerRefereeParam param); - - /** - * 根据id查询 - * - * @param id 主键ID - * @return DealerReferee - */ - DealerReferee getByIdRel(Integer id); - -} diff --git a/modules/shop/service/DealerSettingService.java b/modules/shop/service/DealerSettingService.java deleted file mode 100644 index 069a601..0000000 --- a/modules/shop/service/DealerSettingService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.shop.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.shop.entity.DealerSetting; -import com.gxwebsoft.shop.param.DealerSettingParam; - -import java.util.List; - -/** - * 分销商设置表Service - * - * @author 科技小王子 - * @since 2024-07-28 11:57:41 - */ -public interface DealerSettingService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(DealerSettingParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(DealerSettingParam param); - - /** - * 根据id查询 - * - * @param key 设置项标示 - * @return DealerSetting - */ - DealerSetting getByIdRel(String key); - -} diff --git a/modules/shop/service/DealerUserService.java b/modules/shop/service/DealerUserService.java deleted file mode 100644 index ab0940a..0000000 --- a/modules/shop/service/DealerUserService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.shop.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.shop.entity.DealerUser; -import com.gxwebsoft.shop.param.DealerUserParam; - -import java.util.List; - -/** - * 分销商用户记录表Service - * - * @author 科技小王子 - * @since 2024-07-28 19:21:15 - */ -public interface DealerUserService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(DealerUserParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(DealerUserParam param); - - /** - * 根据id查询 - * - * @param id 主键ID - * @return DealerUser - */ - DealerUser getByIdRel(Integer id); - -} diff --git a/modules/shop/service/DealerWithdrawService.java b/modules/shop/service/DealerWithdrawService.java deleted file mode 100644 index 7d32d3b..0000000 --- a/modules/shop/service/DealerWithdrawService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.shop.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.shop.entity.DealerWithdraw; -import com.gxwebsoft.shop.param.DealerWithdrawParam; - -import java.util.List; - -/** - * 分销商提现明细表Service - * - * @author 科技小王子 - * @since 2024-07-28 11:57:41 - */ -public interface DealerWithdrawService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(DealerWithdrawParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(DealerWithdrawParam param); - - /** - * 根据id查询 - * - * @param id 主键ID - * @return DealerWithdraw - */ - DealerWithdraw getByIdRel(Integer id); - -} diff --git a/modules/shop/service/GoodsCategoryService.java b/modules/shop/service/GoodsCategoryService.java deleted file mode 100644 index 197f068..0000000 --- a/modules/shop/service/GoodsCategoryService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.shop.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.shop.entity.GoodsCategory; -import com.gxwebsoft.shop.param.GoodsCategoryParam; - -import java.util.List; - -/** - * 商品分类Service - * - * @author 科技小王子 - * @since 2024-03-30 19:34:16 - */ -public interface GoodsCategoryService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(GoodsCategoryParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(GoodsCategoryParam param); - - /** - * 根据id查询 - * - * @param categoryId 商品分类ID - * @return GoodsCategory - */ - GoodsCategory getByIdRel(Integer categoryId); - -} diff --git a/modules/shop/service/GoodsService.java b/modules/shop/service/GoodsService.java deleted file mode 100644 index e100827..0000000 --- a/modules/shop/service/GoodsService.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.gxwebsoft.shop.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.shop.entity.Goods; -import com.gxwebsoft.shop.param.GoodsCategoryParam; -import com.gxwebsoft.shop.param.GoodsParam; - -import java.util.List; - -/** - * 商品记录表Service - * - * @author 科技小王子 - * @since 2024-07-25 19:22:01 - */ -public interface GoodsService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(GoodsParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(GoodsParam param); - - /** - * 根据id查询 - * - * @param goodsId 自增ID - * @return Goods - */ - Goods getByIdRel(Integer goodsId); - - void saveBatchByAsync(Goods goods); - - List getGoodsSpec(); - - // 商城商品 - List getGoodsSpecType0(); - // 外卖商品 - List getGoodsSpecType1(); - - -} diff --git a/modules/shop/service/GoodsSkuService.java b/modules/shop/service/GoodsSkuService.java deleted file mode 100644 index 2adadc1..0000000 --- a/modules/shop/service/GoodsSkuService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.shop.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.shop.entity.GoodsSku; -import com.gxwebsoft.shop.param.GoodsSkuParam; - -import java.util.List; - -/** - * 商品sku列表Service - * - * @author 科技小王子 - * @since 2024-07-26 10:49:02 - */ -public interface GoodsSkuService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(GoodsSkuParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(GoodsSkuParam param); - - /** - * 根据id查询 - * - * @param id 主键ID - * @return GoodsSku - */ - GoodsSku getByIdRel(Integer id); - -} diff --git a/modules/shop/service/GoodsSpecService.java b/modules/shop/service/GoodsSpecService.java deleted file mode 100644 index 9633e8c..0000000 --- a/modules/shop/service/GoodsSpecService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.shop.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.shop.entity.GoodsSpec; -import com.gxwebsoft.shop.param.GoodsSpecParam; - -import java.util.List; - -/** - * 商品多规格Service - * - * @author 科技小王子 - * @since 2024-04-03 16:06:23 - */ -public interface GoodsSpecService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(GoodsSpecParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(GoodsSpecParam param); - - /** - * 根据id查询 - * - * @param id 主键 - * @return GoodsSpec - */ - GoodsSpec getByIdRel(Integer id); - -} diff --git a/modules/shop/service/MerchantAccountService.java b/modules/shop/service/MerchantAccountService.java deleted file mode 100644 index 6b55c92..0000000 --- a/modules/shop/service/MerchantAccountService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.shop.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.shop.entity.MerchantAccount; -import com.gxwebsoft.shop.param.MerchantAccountParam; - -import java.util.List; - -/** - * 商户账号Service - * - * @author 科技小王子 - * @since 2024-04-19 12:02:24 - */ -public interface MerchantAccountService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(MerchantAccountParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(MerchantAccountParam param); - - /** - * 根据id查询 - * - * @param id ID - * @return MerchantAccount - */ - MerchantAccount getByIdRel(Integer id); - -} diff --git a/modules/shop/service/MerchantApplyService.java b/modules/shop/service/MerchantApplyService.java deleted file mode 100644 index ffaae39..0000000 --- a/modules/shop/service/MerchantApplyService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.shop.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.shop.entity.MerchantApply; -import com.gxwebsoft.shop.param.MerchantApplyParam; - -import java.util.List; - -/** - * 商户入驻申请Service - * - * @author 科技小王子 - * @since 2024-04-05 01:24:36 - */ -public interface MerchantApplyService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(MerchantApplyParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(MerchantApplyParam param); - - /** - * 根据id查询 - * - * @param applyId ID - * @return MerchantApply - */ - MerchantApply getByIdRel(Integer applyId); - -} diff --git a/modules/shop/service/MerchantService.java b/modules/shop/service/MerchantService.java deleted file mode 100644 index 503ffb3..0000000 --- a/modules/shop/service/MerchantService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.shop.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.shop.entity.Merchant; -import com.gxwebsoft.shop.param.MerchantParam; - -import java.util.List; - -/** - * 商户Service - * - * @author 科技小王子 - * @since 2024-04-05 00:03:54 - */ -public interface MerchantService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(MerchantParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(MerchantParam param); - - /** - * 根据id查询 - * - * @param merchantId ID - * @return Merchant - */ - Merchant getByIdRel(Integer merchantId); - -} diff --git a/modules/shop/service/MerchantTypeService.java b/modules/shop/service/MerchantTypeService.java deleted file mode 100644 index b13aaf9..0000000 --- a/modules/shop/service/MerchantTypeService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.shop.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.shop.entity.MerchantType; -import com.gxwebsoft.shop.param.MerchantTypeParam; - -import java.util.List; - -/** - * 商户类型Service - * - * @author 科技小王子 - * @since 2024-04-05 00:08:51 - */ -public interface MerchantTypeService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(MerchantTypeParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(MerchantTypeParam param); - - /** - * 根据id查询 - * - * @param id ID - * @return MerchantType - */ - MerchantType getByIdRel(Integer id); - -} diff --git a/modules/shop/service/OrderGoodsService.java b/modules/shop/service/OrderGoodsService.java deleted file mode 100644 index bdd58a7..0000000 --- a/modules/shop/service/OrderGoodsService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.shop.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.shop.entity.OrderGoods; -import com.gxwebsoft.shop.param.OrderGoodsParam; - -import java.util.List; - -/** - * 商品信息Service - * - * @author 科技小王子 - * @since 2024-05-26 15:42:03 - */ -public interface OrderGoodsService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(OrderGoodsParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(OrderGoodsParam param); - - /** - * 根据id查询 - * - * @param id 自增ID - * @return OrderGoods - */ - OrderGoods getByIdRel(Integer id); - -} diff --git a/modules/shop/service/OrderInfoLogService.java b/modules/shop/service/OrderInfoLogService.java deleted file mode 100644 index 816eac5..0000000 --- a/modules/shop/service/OrderInfoLogService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.shop.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.shop.entity.OrderInfoLog; -import com.gxwebsoft.shop.param.OrderInfoLogParam; - -import java.util.List; - -/** - * 订单核销Service - * - * @author 科技小王子 - * @since 2024-05-14 13:20:04 - */ -public interface OrderInfoLogService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(OrderInfoLogParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(OrderInfoLogParam param); - - /** - * 根据id查询 - * - * @param id - * @return OrderInfoLog - */ - OrderInfoLog getByIdRel(Integer id); - -} diff --git a/modules/shop/service/OrderInfoService.java b/modules/shop/service/OrderInfoService.java deleted file mode 100644 index 53d22af..0000000 --- a/modules/shop/service/OrderInfoService.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.gxwebsoft.shop.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.booking.param.PeriodParam; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.shop.entity.Order; -import com.gxwebsoft.shop.entity.OrderInfo; -import com.gxwebsoft.shop.param.OrderInfoParam; - -import java.util.List; - -/** - * Service - * - * @author 科技小王子 - * @since 2024-08-10 13:44:39 - */ -public interface OrderInfoService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(OrderInfoParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(OrderInfoParam param); - - /** - * 根据id查询 - * - * @param id - * @return OrderInfo - */ - OrderInfo getByIdRel(Integer id); - - void updateByOutTradeNo(Order order); - - List getTodayOrder(PeriodParam param); - -} diff --git a/modules/shop/service/OrderService.java b/modules/shop/service/OrderService.java deleted file mode 100644 index 30abe8a..0000000 --- a/modules/shop/service/OrderService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.shop.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.shop.entity.Order; -import com.gxwebsoft.shop.param.OrderParam; - -import java.util.List; - -/** - * Service - * - * @author 科技小王子 - * @since 2024-08-09 16:33:41 - */ -public interface OrderService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(OrderParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(OrderParam param); - - /** - * 根据id查询 - * - * @param orderId - * @return Order - */ - Order getByIdRel(Integer orderId); - -} diff --git a/modules/shop/service/RechargeOrderService.java b/modules/shop/service/RechargeOrderService.java deleted file mode 100644 index 92966cf..0000000 --- a/modules/shop/service/RechargeOrderService.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.gxwebsoft.shop.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; - -import java.util.List; - -/** - * 会员充值订单表Service - * - * @author 科技小王子 - * @since 2024-07-26 23:18:48 - */ -public interface RechargeOrderService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(RechargeOrderParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(RechargeOrderParam param); - - /** - * 根据id查询 - * - * @param orderId 订单ID - * @return RechargeOrder - */ - RechargeOrder getByIdRel(Integer orderId); - -} diff --git a/modules/shop/service/SpecService.java b/modules/shop/service/SpecService.java deleted file mode 100644 index b9a6f7c..0000000 --- a/modules/shop/service/SpecService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.shop.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.shop.entity.Spec; -import com.gxwebsoft.shop.param.SpecParam; - -import java.util.List; - -/** - * 规格Service - * - * @author 科技小王子 - * @since 2024-07-25 03:00:41 - */ -public interface SpecService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(SpecParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(SpecParam param); - - /** - * 根据id查询 - * - * @param specId 规格ID - * @return Spec - */ - Spec getByIdRel(Integer specId); - -} diff --git a/modules/shop/service/SpecValueService.java b/modules/shop/service/SpecValueService.java deleted file mode 100644 index 1c77226..0000000 --- a/modules/shop/service/SpecValueService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.shop.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.shop.entity.SpecValue; -import com.gxwebsoft.shop.param.SpecValueParam; - -import java.util.List; - -/** - * 规格值Service - * - * @author 科技小王子 - * @since 2024-04-01 09:49:15 - */ -public interface SpecValueService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(SpecValueParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(SpecValueParam param); - - /** - * 根据id查询 - * - * @param specValueId 规格值ID - * @return SpecValue - */ - SpecValue getByIdRel(Integer specValueId); - -} diff --git a/modules/shop/service/UserAddressService.java b/modules/shop/service/UserAddressService.java deleted file mode 100644 index 8944668..0000000 --- a/modules/shop/service/UserAddressService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.shop.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.shop.entity.UserAddress; -import com.gxwebsoft.shop.param.UserAddressParam; - -import java.util.List; - -/** - * 收货地址Service - * - * @author 科技小王子 - * @since 2024-05-26 10:58:37 - */ -public interface UserAddressService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(UserAddressParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(UserAddressParam param); - - /** - * 根据id查询 - * - * @param id 主键ID - * @return UserAddress - */ - UserAddress getByIdRel(Integer id); - -} diff --git a/modules/shop/service/UserBalanceLogService.java b/modules/shop/service/UserBalanceLogService.java deleted file mode 100644 index 69adec2..0000000 --- a/modules/shop/service/UserBalanceLogService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.shop.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.shop.entity.UserBalanceLog; -import com.gxwebsoft.shop.param.UserBalanceLogParam; - -import java.util.List; - -/** - * 用户余额变动明细表Service - * - * @author 科技小王子 - * @since 2024-05-29 15:57:44 - */ -public interface UserBalanceLogService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(UserBalanceLogParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(UserBalanceLogParam param); - - /** - * 根据id查询 - * - * @param logId 主键ID - * @return UserBalanceLog - */ - UserBalanceLog getByIdRel(Integer logId); - -} diff --git a/modules/shop/service/UserCollectionService.java b/modules/shop/service/UserCollectionService.java deleted file mode 100644 index 96556d8..0000000 --- a/modules/shop/service/UserCollectionService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.shop.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.shop.entity.UserCollection; -import com.gxwebsoft.shop.param.UserCollectionParam; - -import java.util.List; - -/** - * 我的收藏Service - * - * @author 科技小王子 - * @since 2024-04-28 18:17:37 - */ -public interface UserCollectionService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(UserCollectionParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(UserCollectionParam param); - - /** - * 根据id查询 - * - * @param id 主键ID - * @return UserCollection - */ - UserCollection getByIdRel(Integer id); - -} diff --git a/modules/shop/service/UsersService.java b/modules/shop/service/UsersService.java deleted file mode 100644 index b3ae56c..0000000 --- a/modules/shop/service/UsersService.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.gxwebsoft.shop.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.shop.entity.Order; -import com.gxwebsoft.shop.entity.Users; -import com.gxwebsoft.shop.param.UsersParam; - -import java.util.List; - -/** - * Service - * - * @author 科技小王子 - * @since 2024-08-09 15:20:25 - */ -public interface UsersService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(UsersParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(UsersParam param); - - /** - * 根据id查询 - * - * @param id - * @return Users - */ - Users getByIdRel(Integer id); - - void addIntegral(Order order); - - Users getByPhone(String phone); -} diff --git a/modules/shop/service/WechatDepositService.java b/modules/shop/service/WechatDepositService.java deleted file mode 100644 index f77d831..0000000 --- a/modules/shop/service/WechatDepositService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.shop.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.shop.entity.WechatDeposit; -import com.gxwebsoft.shop.param.WechatDepositParam; - -import java.util.List; - -/** - * 押金Service - * - * @author 科技小王子 - * @since 2024-05-03 15:50:28 - */ -public interface WechatDepositService extends IService { - - /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult - */ - PageResult pageRel(WechatDepositParam param); - - /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List - */ - List listRel(WechatDepositParam param); - - /** - * 根据id查询 - * - * @param id - * @return WechatDeposit - */ - WechatDeposit getByIdRel(Integer id); - -} diff --git a/modules/shop/service/impl/BrandServiceImpl.java b/modules/shop/service/impl/BrandServiceImpl.java deleted file mode 100644 index b76c96d..0000000 --- a/modules/shop/service/impl/BrandServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.gxwebsoft.shop.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.shop.mapper.BrandMapper; -import com.gxwebsoft.shop.service.BrandService; -import com.gxwebsoft.shop.entity.Brand; -import com.gxwebsoft.shop.param.BrandParam; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 品牌Service实现 - * - * @author 科技小王子 - * @since 2024-04-04 11:38:21 - */ -@Service -public class BrandServiceImpl extends ServiceImpl implements BrandService { - - @Override - public PageResult pageRel(BrandParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("sort_number asc, create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(BrandParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - page.setDefaultOrder("sort_number asc, create_time desc"); - return page.sortRecords(list); - } - - @Override - public Brand getByIdRel(Integer brandId) { - BrandParam param = new BrandParam(); - param.setBrandId(brandId); - return param.getOne(baseMapper.selectListRel(param)); - } - -} diff --git a/modules/shop/service/impl/CartServiceImpl.java b/modules/shop/service/impl/CartServiceImpl.java deleted file mode 100644 index cee5127..0000000 --- a/modules/shop/service/impl/CartServiceImpl.java +++ /dev/null @@ -1,124 +0,0 @@ -package com.gxwebsoft.shop.service.impl; - -import cn.hutool.core.map.MapUtil; -import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.github.yulichang.wrapper.MPJLambdaWrapper; -import com.gxwebsoft.shop.entity.Goods; -import com.gxwebsoft.shop.entity.GoodsSpec; -import com.gxwebsoft.shop.mapper.CartMapper; -import com.gxwebsoft.shop.service.CartService; -import com.gxwebsoft.shop.entity.Cart; -import com.gxwebsoft.shop.param.CartParam; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.shop.vo.CartShopVo; -import com.gxwebsoft.shop.vo.CartVo; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.math.BigDecimal; -import java.util.*; -import java.util.stream.Collectors; - -/** - * 购物车Service实现 - * - * @author 科技小王子 - * @since 2024-07-29 21:02:39 - */ -@Service -public class CartServiceImpl extends ServiceImpl implements CartService { - - @Override - public PageResult pageRel(CartParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - @Transactional(rollbackFor = {Exception.class}) - public CartVo listRel(CartParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - page.setDefaultOrder("create_time desc"); - final List carts = page.sortRecords(list); - System.out.println("carts = " + carts.size()); - // 整理数据 - final CartVo vo = new CartVo(); - // 计算单品总价 - for (Cart cart : carts) { - cart.setTotalPrice(cart.getPrice().multiply(BigDecimal.valueOf(cart.getCartNum()))); - } - // 计算购物车金额 - final Integer cartNum = carts.stream().map(Cart::getCartNum).reduce(Integer::sum).orElse(0); - final Integer selectNums = carts.stream().filter(d -> d.getSelected().equals(true)).map(Cart::getCartNum).reduce(Integer::sum).orElse(0); - final BigDecimal totalPrice = carts.stream().filter(d -> d.getSelected().equals(true)).map(Cart::getTotalPrice).reduce(BigDecimal.ZERO, BigDecimal::add); - // 按店铺ID分组 - final Map> collectCart = carts.stream().collect(Collectors.groupingBy(Cart::getMerchantId)); - final ArrayList shops = new ArrayList<>(); - if (MapUtil.isNotEmpty(collectCart)) { - for (Integer shopId : collectCart.keySet()) { - final CartShopVo shopVo = new CartShopVo(); - shopVo.setShopId(shopId); - shopVo.setCarts(collectCart.get(shopId)); - if (ObjectUtil.isNotEmpty(collectCart.get(shopId).get(0))) { - final Cart cart = collectCart.get(shopId).get(0); - shopVo.setShopName(cart.getMerchantName()); - shopVo.setShopLogo(cart.getImage()); - shopVo.setAddress(cart.getAddress()); - } - shops.add(shopVo); - } - } - - vo.setShops(shops); - vo.setTotalPrice(totalPrice); - vo.setTotalNums(Long.valueOf(cartNum)); - vo.setSelectNums(Long.valueOf(selectNums)); -// updateBatchById(carts); - - return vo; - } - - @Override - public Cart getByIdRel(Integer id) { - CartParam param = new CartParam(); - param.setId(id); - return param.getOne(baseMapper.selectListRel(param)); - } - - @Override - public List listRelMpj(CartParam param) { - - // 多表查询 - MPJLambdaWrapper mpjLambdaWrapper = new MPJLambdaWrapper<>(); - mpjLambdaWrapper.selectAll(Cart.class) - .select(Goods::getGoodsName) - .select(Goods::getImage) - .leftJoin(Goods.class,Goods::getGoodsId,Cart::getGoodsId).eq(Cart::getUserId,param.getUserId()); - - // 查询选中状态 - if(param.getSelected() != null){ - mpjLambdaWrapper.eq(Cart::getSelected, param.getSelected()); - } - // 商品类型 0商城 1预定 - if(param.getType() != null){ - mpjLambdaWrapper.eq(Cart::getType,param.getType()); - } - // 是否为立即购买 - if(param.getIsNew() != null){ - mpjLambdaWrapper.eq(Cart::getIsNew,param.getIsNew()); - } - // 指定cartId - if(param.getId() != null){ - mpjLambdaWrapper.eq(Cart::getId,param.getId()); - } - System.out.println("mpjLambdaWrapper = " + mpjLambdaWrapper); - return baseMapper.selectJoinList(Cart.class, mpjLambdaWrapper); - } - -} diff --git a/modules/shop/service/impl/CashierServiceImpl.java b/modules/shop/service/impl/CashierServiceImpl.java deleted file mode 100644 index 0c7e522..0000000 --- a/modules/shop/service/impl/CashierServiceImpl.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.gxwebsoft.shop.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.shop.entity.Cashier; -import com.gxwebsoft.shop.mapper.CashierMapper; -import com.gxwebsoft.shop.param.CashierParam; -import com.gxwebsoft.shop.service.CashierService; -import com.gxwebsoft.shop.vo.CashierVo; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - -/** - * 收银Service实现 - * - * @author 科技小王子 - * @since 2024-08-04 11:51:43 - */ -@Service -public class CashierServiceImpl extends ServiceImpl implements CashierService { - - @Override - public PageResult pageRel(CashierParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - @Transactional(rollbackFor = {Exception.class}) - public CashierVo listRel(CashierParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - page.setDefaultOrder("create_time desc"); - - final List cashiers = page.sortRecords(list); - - // 整理数据 - final CashierVo vo = new CashierVo(); - // 计算单品总价 - for (Cashier cashier : cashiers) { - cashier.setTotalPrice(cashier.getPrice().multiply(BigDecimal.valueOf(cashier.getCartNum()))); - } - // 计算购物车金额 - final Integer cartNum = cashiers.stream().map(Cashier::getCartNum).reduce(Integer::sum).orElse(0); - final Integer selectNums = cashiers.stream().filter(d -> d.getSelected().equals(true)).map(Cashier::getCartNum).reduce(Integer::sum).orElse(0); - final BigDecimal totalPrice = cashiers.stream().filter(d -> d.getSelected().equals(true)).map(Cashier::getTotalPrice).reduce(BigDecimal.ZERO, BigDecimal::add); - - // 封装数据 - vo.setCashiers(cashiers); - vo.setTotalPrice(totalPrice); - vo.setTotalNums(Long.valueOf(cartNum)); - vo.setSelectNums(Long.valueOf(selectNums)); - - return vo; - } - - - @Override - @Transactional(rollbackFor = {Exception.class}) - public List listRelByGroupId(CashierParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - page.setDefaultOrder("create_time desc"); - final List cashiers = page.sortRecords(list); - - // 计算单品总价 - cashiers.forEach(d->{ - d.setTotalPrice(d.getPrice().multiply(BigDecimal.valueOf(d.getCartNum()))); - }); - - final Map> collectByGroupId = cashiers.stream().collect(Collectors.groupingBy(Cashier::getGroupId)); - - // 整理数据 - final ArrayList cashierVos = new ArrayList<>(); - for (Integer groupId : collectByGroupId.keySet()) { - final CashierVo vo = new CashierVo(); - final List cashierList = collectByGroupId.get(groupId); - for (Cashier cashier : cashierList) { - if (cashier.getGroupId().equals(groupId)) { - // 计算购物车金额 - final Integer cartNum = cashierList.stream().map(Cashier::getCartNum).reduce(Integer::sum).orElse(0); - final Integer selectNums = cashierList.stream().filter(d -> d.getSelected().equals(true)).map(Cashier::getCartNum).reduce(Integer::sum).orElse(0); - final BigDecimal totalPrice = cashierList.stream().filter(d -> d.getSelected().equals(true)).map(Cashier::getTotalPrice).reduce(BigDecimal.ZERO, BigDecimal::add); - vo.setGroupId(Long.valueOf(groupId)); - vo.setCashiers(cashierList); - vo.setTotalPrice(totalPrice); - vo.setTotalNums(Long.valueOf(cartNum)); - vo.setSelectNums(Long.valueOf(selectNums)); - vo.setComments("订单备注："); - } - } - cashierVos.add(vo); - } - return cashierVos; - } - - @Override - public Cashier getByIdRel(Integer id) { - CashierParam param = new CashierParam(); - param.setId(id); - return param.getOne(baseMapper.selectListRel(param)); - } - -} diff --git a/modules/shop/service/impl/ChatConversationServiceImpl.java b/modules/shop/service/impl/ChatConversationServiceImpl.java deleted file mode 100644 index 8b4e606..0000000 --- a/modules/shop/service/impl/ChatConversationServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.gxwebsoft.shop.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.shop.mapper.ChatConversationMapper; -import com.gxwebsoft.shop.service.ChatConversationService; -import com.gxwebsoft.shop.entity.ChatConversation; -import com.gxwebsoft.shop.param.ChatConversationParam; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 聊天消息表Service实现 - * - * @author 科技小王子 - * @since 2024-04-27 16:08:04 - */ -@Service -public class ChatConversationServiceImpl extends ServiceImpl implements ChatConversationService { - - @Override - public PageResult pageRel(ChatConversationParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("sort_number asc, create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(ChatConversationParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - page.setDefaultOrder("sort_number asc, create_time desc"); - return page.sortRecords(list); - } - - @Override - public ChatConversation getByIdRel(Integer id) { - ChatConversationParam param = new ChatConversationParam(); - param.setId(id); - return param.getOne(baseMapper.selectListRel(param)); - } - -} diff --git a/modules/shop/service/impl/ChatMessageServiceImpl.java b/modules/shop/service/impl/ChatMessageServiceImpl.java deleted file mode 100644 index 8660878..0000000 --- a/modules/shop/service/impl/ChatMessageServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.gxwebsoft.shop.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.shop.mapper.ChatMessageMapper; -import com.gxwebsoft.shop.service.ChatMessageService; -import com.gxwebsoft.shop.entity.ChatMessage; -import com.gxwebsoft.shop.param.ChatMessageParam; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 聊天消息表Service实现 - * - * @author 科技小王子 - * @since 2024-04-27 16:08:04 - */ -@Service -public class ChatMessageServiceImpl extends ServiceImpl implements ChatMessageService { - - @Override - public PageResult pageRel(ChatMessageParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("sort_number asc, create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(ChatMessageParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - page.setDefaultOrder("sort_number asc, create_time desc"); - return page.sortRecords(list); - } - - @Override - public ChatMessage getByIdRel(Integer id) { - ChatMessageParam param = new ChatMessageParam(); - param.setId(id); - return param.getOne(baseMapper.selectListRel(param)); - } - -} diff --git a/modules/shop/service/impl/CountServiceImpl.java b/modules/shop/service/impl/CountServiceImpl.java deleted file mode 100644 index 0aca097..0000000 --- a/modules/shop/service/impl/CountServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.gxwebsoft.shop.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.shop.mapper.CountMapper; -import com.gxwebsoft.shop.service.CountService; -import com.gxwebsoft.shop.entity.Count; -import com.gxwebsoft.shop.param.CountParam; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 商城销售统计表Service实现 - * - * @author 科技小王子 - * @since 2024-07-31 22:25:10 - */ -@Service -public class CountServiceImpl extends ServiceImpl implements CountService { - - @Override - public PageResult pageRel(CountParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(CountParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - page.setDefaultOrder("create_time desc"); - return page.sortRecords(list); - } - - @Override - public Count getByIdRel(Integer id) { - CountParam param = new CountParam(); - param.setId(id); - return param.getOne(baseMapper.selectListRel(param)); - } - -} diff --git a/modules/shop/service/impl/DealerApplyServiceImpl.java b/modules/shop/service/impl/DealerApplyServiceImpl.java deleted file mode 100644 index 1fa3a47..0000000 --- a/modules/shop/service/impl/DealerApplyServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.gxwebsoft.shop.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.shop.mapper.DealerApplyMapper; -import com.gxwebsoft.shop.service.DealerApplyService; -import com.gxwebsoft.shop.entity.DealerApply; -import com.gxwebsoft.shop.param.DealerApplyParam; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 分销商申请记录表Service实现 - * - * @author 科技小王子 - * @since 2024-07-28 11:57:41 - */ -@Service -public class DealerApplyServiceImpl extends ServiceImpl implements DealerApplyService { - - @Override - public PageResult pageRel(DealerApplyParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(DealerApplyParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - page.setDefaultOrder("create_time desc"); - return page.sortRecords(list); - } - - @Override - public DealerApply getByIdRel(Integer applyId) { - DealerApplyParam param = new DealerApplyParam(); - param.setApplyId(applyId); - return param.getOne(baseMapper.selectListRel(param)); - } - -} diff --git a/modules/shop/service/impl/DealerCapitalServiceImpl.java b/modules/shop/service/impl/DealerCapitalServiceImpl.java deleted file mode 100644 index ff78d7f..0000000 --- a/modules/shop/service/impl/DealerCapitalServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.gxwebsoft.shop.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.shop.mapper.DealerCapitalMapper; -import com.gxwebsoft.shop.service.DealerCapitalService; -import com.gxwebsoft.shop.entity.DealerCapital; -import com.gxwebsoft.shop.param.DealerCapitalParam; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 分销商资金明细表Service实现 - * - * @author 科技小王子 - * @since 2024-07-28 11:57:41 - */ -@Service -public class DealerCapitalServiceImpl extends ServiceImpl implements DealerCapitalService { - - @Override - public PageResult pageRel(DealerCapitalParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(DealerCapitalParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - page.setDefaultOrder("create_time desc"); - return page.sortRecords(list); - } - - @Override - public DealerCapital getByIdRel(Integer id) { - DealerCapitalParam param = new DealerCapitalParam(); - param.setId(id); - return param.getOne(baseMapper.selectListRel(param)); - } - -} diff --git a/modules/shop/service/impl/DealerOrderServiceImpl.java b/modules/shop/service/impl/DealerOrderServiceImpl.java deleted file mode 100644 index 2bbbf8c..0000000 --- a/modules/shop/service/impl/DealerOrderServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.gxwebsoft.shop.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.shop.mapper.DealerOrderMapper; -import com.gxwebsoft.shop.service.DealerOrderService; -import com.gxwebsoft.shop.entity.DealerOrder; -import com.gxwebsoft.shop.param.DealerOrderParam; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 分销商订单记录表Service实现 - * - * @author 科技小王子 - * @since 2024-07-28 11:57:41 - */ -@Service -public class DealerOrderServiceImpl extends ServiceImpl implements DealerOrderService { - - @Override - public PageResult pageRel(DealerOrderParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(DealerOrderParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - page.setDefaultOrder("create_time desc"); - return page.sortRecords(list); - } - - @Override - public DealerOrder getByIdRel(Integer id) { - DealerOrderParam param = new DealerOrderParam(); - param.setId(id); - return param.getOne(baseMapper.selectListRel(param)); - } - -} diff --git a/modules/shop/service/impl/DealerRefereeServiceImpl.java b/modules/shop/service/impl/DealerRefereeServiceImpl.java deleted file mode 100644 index 32a02ce..0000000 --- a/modules/shop/service/impl/DealerRefereeServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.gxwebsoft.shop.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.shop.mapper.DealerRefereeMapper; -import com.gxwebsoft.shop.service.DealerRefereeService; -import com.gxwebsoft.shop.entity.DealerReferee; -import com.gxwebsoft.shop.param.DealerRefereeParam; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 分销商推荐关系表Service实现 - * - * @author 科技小王子 - * @since 2024-07-28 11:57:41 - */ -@Service -public class DealerRefereeServiceImpl extends ServiceImpl implements DealerRefereeService { - - @Override - public PageResult pageRel(DealerRefereeParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(DealerRefereeParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - page.setDefaultOrder("create_time desc"); - return page.sortRecords(list); - } - - @Override - public DealerReferee getByIdRel(Integer id) { - DealerRefereeParam param = new DealerRefereeParam(); - param.setId(id); - return param.getOne(baseMapper.selectListRel(param)); - } - -} diff --git a/modules/shop/service/impl/DealerSettingServiceImpl.java b/modules/shop/service/impl/DealerSettingServiceImpl.java deleted file mode 100644 index ce0f338..0000000 --- a/modules/shop/service/impl/DealerSettingServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.gxwebsoft.shop.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.shop.mapper.DealerSettingMapper; -import com.gxwebsoft.shop.service.DealerSettingService; -import com.gxwebsoft.shop.entity.DealerSetting; -import com.gxwebsoft.shop.param.DealerSettingParam; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 分销商设置表Service实现 - * - * @author 科技小王子 - * @since 2024-07-28 11:57:41 - */ -@Service -public class DealerSettingServiceImpl extends ServiceImpl implements DealerSettingService { - - @Override - public PageResult pageRel(DealerSettingParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(DealerSettingParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - page.setDefaultOrder("create_time desc"); - return page.sortRecords(list); - } - - @Override - public DealerSetting getByIdRel(String key) { - DealerSettingParam param = new DealerSettingParam(); - param.setKey(key); - return param.getOne(baseMapper.selectListRel(param)); - } - -} diff --git a/modules/shop/service/impl/DealerUserServiceImpl.java b/modules/shop/service/impl/DealerUserServiceImpl.java deleted file mode 100644 index 8ec4acf..0000000 --- a/modules/shop/service/impl/DealerUserServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.gxwebsoft.shop.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.shop.mapper.DealerUserMapper; -import com.gxwebsoft.shop.service.DealerUserService; -import com.gxwebsoft.shop.entity.DealerUser; -import com.gxwebsoft.shop.param.DealerUserParam; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 分销商用户记录表Service实现 - * - * @author 科技小王子 - * @since 2024-07-28 19:21:15 - */ -@Service -public class DealerUserServiceImpl extends ServiceImpl implements DealerUserService { - - @Override - public PageResult pageRel(DealerUserParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(DealerUserParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - page.setDefaultOrder("create_time desc"); - return page.sortRecords(list); - } - - @Override - public DealerUser getByIdRel(Integer id) { - DealerUserParam param = new DealerUserParam(); - param.setId(id); - return param.getOne(baseMapper.selectListRel(param)); - } - -} diff --git a/modules/shop/service/impl/DealerWithdrawServiceImpl.java b/modules/shop/service/impl/DealerWithdrawServiceImpl.java deleted file mode 100644 index 64702d4..0000000 --- a/modules/shop/service/impl/DealerWithdrawServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.gxwebsoft.shop.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.shop.mapper.DealerWithdrawMapper; -import com.gxwebsoft.shop.service.DealerWithdrawService; -import com.gxwebsoft.shop.entity.DealerWithdraw; -import com.gxwebsoft.shop.param.DealerWithdrawParam; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 分销商提现明细表Service实现 - * - * @author 科技小王子 - * @since 2024-07-28 11:57:41 - */ -@Service -public class DealerWithdrawServiceImpl extends ServiceImpl implements DealerWithdrawService { - - @Override - public PageResult pageRel(DealerWithdrawParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(DealerWithdrawParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - page.setDefaultOrder("create_time desc"); - return page.sortRecords(list); - } - - @Override - public DealerWithdraw getByIdRel(Integer id) { - DealerWithdrawParam param = new DealerWithdrawParam(); - param.setId(id); - return param.getOne(baseMapper.selectListRel(param)); - } - -} diff --git a/modules/shop/service/impl/GoodsCategoryServiceImpl.java b/modules/shop/service/impl/GoodsCategoryServiceImpl.java deleted file mode 100644 index 51f67ee..0000000 --- a/modules/shop/service/impl/GoodsCategoryServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.gxwebsoft.shop.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.shop.mapper.GoodsCategoryMapper; -import com.gxwebsoft.shop.service.GoodsCategoryService; -import com.gxwebsoft.shop.entity.GoodsCategory; -import com.gxwebsoft.shop.param.GoodsCategoryParam; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 商品分类Service实现 - * - * @author 科技小王子 - * @since 2024-03-30 19:34:16 - */ -@Service -public class GoodsCategoryServiceImpl extends ServiceImpl implements GoodsCategoryService { - - @Override - public PageResult pageRel(GoodsCategoryParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("sort_number asc, create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(GoodsCategoryParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - page.setDefaultOrder("sort_number asc, create_time desc"); - return page.sortRecords(list); - } - - @Override - public GoodsCategory getByIdRel(Integer categoryId) { - GoodsCategoryParam param = new GoodsCategoryParam(); - param.setCategoryId(categoryId); - return param.getOne(baseMapper.selectListRel(param)); - } - -} diff --git a/modules/shop/service/impl/GoodsServiceImpl.java b/modules/shop/service/impl/GoodsServiceImpl.java deleted file mode 100644 index 848f173..0000000 --- a/modules/shop/service/impl/GoodsServiceImpl.java +++ /dev/null @@ -1,143 +0,0 @@ -package com.gxwebsoft.shop.service.impl; - -import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.github.yulichang.wrapper.MPJLambdaWrapper; -import com.gxwebsoft.common.core.utils.JSONUtil; -import com.gxwebsoft.shop.entity.*; -import com.gxwebsoft.shop.mapper.GoodsMapper; -import com.gxwebsoft.shop.service.GoodsService; -import com.gxwebsoft.shop.param.GoodsParam; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.shop.service.GoodsSkuService; -import com.gxwebsoft.shop.service.GoodsSpecService; -import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; - -import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; - -/** - * 商品记录表Service实现 - * - * @author 科技小王子 - * @since 2024-07-25 19:22:01 - */ -@Service -public class GoodsServiceImpl extends ServiceImpl implements GoodsService { - @Resource - private GoodsSpecService goodsSpecService; - @Resource - private GoodsSkuService goodsSkuService; - - @Override - public PageResult pageRel(GoodsParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("sort_number asc, create_time desc"); - List list = baseMapper.selectPageRel(page, param); - System.out.println("list = " + list); - final Set goodsIds = list.stream().map(Goods::getGoodsId).collect(Collectors.toSet()); - if (!CollectionUtils.isEmpty(goodsIds)) { - final List specs = goodsSpecService.list(new LambdaQueryWrapper().in(GoodsSpec::getGoodsId, goodsIds)); - final List skus = goodsSkuService.list(new LambdaQueryWrapper().in(GoodsSku::getGoodsId, goodsIds)); - final Map> collectSpecs = specs.stream().collect(Collectors.groupingBy(GoodsSpec::getGoodsId)); - final Map> collectSkus = skus.stream().collect(Collectors.groupingBy(GoodsSku::getGoodsId)); - list.forEach(d -> { - final List goodsSpecs = collectSpecs.get(d.getGoodsId()); - if (!CollectionUtils.isEmpty(goodsSpecs)) { - final GoodsSpec spec = goodsSpecs.get(0); - final String value = spec.getSpecValue(); - final Object object = JSONUtil.parseObject(value,Object.class); - d.setGoodsSpecValue(object); - } -// d.setGoodsSkus(collectSkus.get(d.getGoodsId())); - }); - } - - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(GoodsParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - page.setDefaultOrder("sort_number asc, create_time desc"); - return page.sortRecords(list); - } - - @Override - public Goods getByIdRel(Integer goodsId) { - GoodsParam param = new GoodsParam(); - param.setGoodsId(goodsId); - return param.getOne(baseMapper.selectListRel(param)); - } - - @Override - public void saveBatchByAsync(Goods goods) { - // 保存商品多规格 - if (goods.getSpecs().equals(1)) { - final GoodsSpec spec = goods.getGoodsSpec(); - if (spec != null) { - spec.setGoodsId(goods.getGoodsId()); - if(spec.getSpecValue() == null){ - spec.setSpecValue(JSON.toJSONString(new ArrayList<>())); - } - goodsSpecService.save(spec); - - // 保存商品sku表 - final List goodsSkus = goods.getGoodsSkus(); - if (!CollectionUtils.isEmpty(goodsSkus)) { - goodsSkus.forEach(d -> { - d.setGoodsId(goods.getGoodsId()); - }); - goodsSkuService.saveBatch(goodsSkus); - } - } - } - } - - @Override - public List getGoodsSpec() { - // 多表查询 - MPJLambdaWrapper mpjLambdaWrapper = new MPJLambdaWrapper<>(); - mpjLambdaWrapper.selectAll(Goods.class) - .select(GoodsSpec::getSpecValue) - .select(GoodsSpec::getSpecName) - .leftJoin(GoodsSpec.class,GoodsSpec::getGoodsId,GoodsSpec::getGoodsId); - return baseMapper.selectJoinList(Goods.class, mpjLambdaWrapper); - } - - @Override - public List getGoodsSpecType0() { - // 多表查询 - MPJLambdaWrapper mpjLambdaWrapper = new MPJLambdaWrapper<>(); - mpjLambdaWrapper.selectAll(Goods.class) - .select(GoodsSpec::getSpecValue) - .select(GoodsSpec::getSpecName) - .leftJoin(GoodsSpec.class,GoodsSpec::getGoodsId,GoodsSpec::getGoodsId) - .gt(Goods::getStock,0) - .eq(Goods::getType,0); - return baseMapper.selectJoinList(Goods.class, mpjLambdaWrapper); - } - - @Override - public List getGoodsSpecType1() { - // 多表查询 - MPJLambdaWrapper mpjLambdaWrapper = new MPJLambdaWrapper<>(); - mpjLambdaWrapper.selectAll(Goods.class) - .select(GoodsSpec::getSpecValue) - .select(GoodsSpec::getSpecName) - .leftJoin(GoodsSpec.class,GoodsSpec::getGoodsId,GoodsSpec::getGoodsId) - .gt(Goods::getStock,0) - .eq(Goods::getType,1); - return baseMapper.selectJoinList(Goods.class, mpjLambdaWrapper); - } - -} diff --git a/modules/shop/service/impl/GoodsSkuServiceImpl.java b/modules/shop/service/impl/GoodsSkuServiceImpl.java deleted file mode 100644 index 47adc40..0000000 --- a/modules/shop/service/impl/GoodsSkuServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.gxwebsoft.shop.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.shop.mapper.GoodsSkuMapper; -import com.gxwebsoft.shop.service.GoodsSkuService; -import com.gxwebsoft.shop.entity.GoodsSku; -import com.gxwebsoft.shop.param.GoodsSkuParam; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 商品sku列表Service实现 - * - * @author 科技小王子 - * @since 2024-07-26 10:49:02 - */ -@Service -public class GoodsSkuServiceImpl extends ServiceImpl implements GoodsSkuService { - - @Override - public PageResult pageRel(GoodsSkuParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(GoodsSkuParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - page.setDefaultOrder("create_time desc"); - return page.sortRecords(list); - } - - @Override - public GoodsSku getByIdRel(Integer id) { - GoodsSkuParam param = new GoodsSkuParam(); - param.setId(id); - return param.getOne(baseMapper.selectListRel(param)); - } - -} diff --git a/modules/shop/service/impl/GoodsSpecServiceImpl.java b/modules/shop/service/impl/GoodsSpecServiceImpl.java deleted file mode 100644 index c58a7e8..0000000 --- a/modules/shop/service/impl/GoodsSpecServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.gxwebsoft.shop.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.shop.mapper.GoodsSpecMapper; -import com.gxwebsoft.shop.service.GoodsSpecService; -import com.gxwebsoft.shop.entity.GoodsSpec; -import com.gxwebsoft.shop.param.GoodsSpecParam; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 商品多规格Service实现 - * - * @author 科技小王子 - * @since 2024-04-03 16:06:23 - */ -@Service -public class GoodsSpecServiceImpl extends ServiceImpl implements GoodsSpecService { - - @Override - public PageResult pageRel(GoodsSpecParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("id desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(GoodsSpecParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - page.setDefaultOrder("id desc"); - return page.sortRecords(list); - } - - @Override - public GoodsSpec getByIdRel(Integer id) { - GoodsSpecParam param = new GoodsSpecParam(); - param.setId(id); - return param.getOne(baseMapper.selectListRel(param)); - } - -} diff --git a/modules/shop/service/impl/MerchantAccountServiceImpl.java b/modules/shop/service/impl/MerchantAccountServiceImpl.java deleted file mode 100644 index 1e88ca8..0000000 --- a/modules/shop/service/impl/MerchantAccountServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.gxwebsoft.shop.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.shop.mapper.MerchantAccountMapper; -import com.gxwebsoft.shop.service.MerchantAccountService; -import com.gxwebsoft.shop.entity.MerchantAccount; -import com.gxwebsoft.shop.param.MerchantAccountParam; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 商户账号Service实现 - * - * @author 科技小王子 - * @since 2024-04-19 12:02:24 - */ -@Service -public class MerchantAccountServiceImpl extends ServiceImpl implements MerchantAccountService { - - @Override - public PageResult pageRel(MerchantAccountParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("sort_number asc, create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(MerchantAccountParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - page.setDefaultOrder("sort_number asc, create_time desc"); - return page.sortRecords(list); - } - - @Override - public MerchantAccount getByIdRel(Integer id) { - MerchantAccountParam param = new MerchantAccountParam(); - param.setId(id); - return param.getOne(baseMapper.selectListRel(param)); - } - -} diff --git a/modules/shop/service/impl/MerchantApplyServiceImpl.java b/modules/shop/service/impl/MerchantApplyServiceImpl.java deleted file mode 100644 index 9a67890..0000000 --- a/modules/shop/service/impl/MerchantApplyServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.gxwebsoft.shop.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.shop.mapper.MerchantApplyMapper; -import com.gxwebsoft.shop.service.MerchantApplyService; -import com.gxwebsoft.shop.entity.MerchantApply; -import com.gxwebsoft.shop.param.MerchantApplyParam; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 商户入驻申请Service实现 - * - * @author 科技小王子 - * @since 2024-04-05 01:24:36 - */ -@Service -public class MerchantApplyServiceImpl extends ServiceImpl implements MerchantApplyService { - - @Override - public PageResult pageRel(MerchantApplyParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("sort_number asc, create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(MerchantApplyParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - page.setDefaultOrder("sort_number asc, create_time desc"); - return page.sortRecords(list); - } - - @Override - public MerchantApply getByIdRel(Integer applyId) { - MerchantApplyParam param = new MerchantApplyParam(); - param.setApplyId(applyId); - return param.getOne(baseMapper.selectListRel(param)); - } - -} diff --git a/modules/shop/service/impl/MerchantServiceImpl.java b/modules/shop/service/impl/MerchantServiceImpl.java deleted file mode 100644 index 0df674f..0000000 --- a/modules/shop/service/impl/MerchantServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.gxwebsoft.shop.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.shop.mapper.MerchantMapper; -import com.gxwebsoft.shop.service.MerchantService; -import com.gxwebsoft.shop.entity.Merchant; -import com.gxwebsoft.shop.param.MerchantParam; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 商户Service实现 - * - * @author 科技小王子 - * @since 2024-04-05 00:03:54 - */ -@Service -public class MerchantServiceImpl extends ServiceImpl implements MerchantService { - - @Override - public PageResult pageRel(MerchantParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("sort_number asc, create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(MerchantParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - page.setDefaultOrder("sort_number asc, create_time desc"); - return page.sortRecords(list); - } - - @Override - public Merchant getByIdRel(Integer merchantId) { - MerchantParam param = new MerchantParam(); - param.setMerchantId(merchantId); - return param.getOne(baseMapper.selectListRel(param)); - } - -} diff --git a/modules/shop/service/impl/MerchantTypeServiceImpl.java b/modules/shop/service/impl/MerchantTypeServiceImpl.java deleted file mode 100644 index 6e702f9..0000000 --- a/modules/shop/service/impl/MerchantTypeServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.gxwebsoft.shop.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.shop.mapper.MerchantTypeMapper; -import com.gxwebsoft.shop.service.MerchantTypeService; -import com.gxwebsoft.shop.entity.MerchantType; -import com.gxwebsoft.shop.param.MerchantTypeParam; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 商户类型Service实现 - * - * @author 科技小王子 - * @since 2024-04-05 00:08:51 - */ -@Service -public class MerchantTypeServiceImpl extends ServiceImpl implements MerchantTypeService { - - @Override - public PageResult pageRel(MerchantTypeParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("sort_number asc, create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(MerchantTypeParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - page.setDefaultOrder("sort_number asc, create_time desc"); - return page.sortRecords(list); - } - - @Override - public MerchantType getByIdRel(Integer id) { - MerchantTypeParam param = new MerchantTypeParam(); - param.setId(id); - return param.getOne(baseMapper.selectListRel(param)); - } - -} diff --git a/modules/shop/service/impl/OrderGoodsServiceImpl.java b/modules/shop/service/impl/OrderGoodsServiceImpl.java deleted file mode 100644 index ef4d6aa..0000000 --- a/modules/shop/service/impl/OrderGoodsServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.gxwebsoft.shop.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.shop.mapper.OrderGoodsMapper; -import com.gxwebsoft.shop.service.OrderGoodsService; -import com.gxwebsoft.shop.entity.OrderGoods; -import com.gxwebsoft.shop.param.OrderGoodsParam; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 商品信息Service实现 - * - * @author 科技小王子 - * @since 2024-05-26 15:42:03 - */ -@Service -public class OrderGoodsServiceImpl extends ServiceImpl implements OrderGoodsService { - - @Override - public PageResult pageRel(OrderGoodsParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("sort_number asc, create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(OrderGoodsParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - page.setDefaultOrder("sort_number asc, create_time desc"); - return page.sortRecords(list); - } - - @Override - public OrderGoods getByIdRel(Integer id) { - OrderGoodsParam param = new OrderGoodsParam(); - param.setId(id); - return param.getOne(baseMapper.selectListRel(param)); - } - -} diff --git a/modules/shop/service/impl/OrderInfoLogServiceImpl.java b/modules/shop/service/impl/OrderInfoLogServiceImpl.java deleted file mode 100644 index 53d7166..0000000 --- a/modules/shop/service/impl/OrderInfoLogServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.gxwebsoft.shop.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.shop.mapper.OrderInfoLogMapper; -import com.gxwebsoft.shop.service.OrderInfoLogService; -import com.gxwebsoft.shop.entity.OrderInfoLog; -import com.gxwebsoft.shop.param.OrderInfoLogParam; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 订单核销Service实现 - * - * @author 科技小王子 - * @since 2024-05-14 13:20:04 - */ -@Service -public class OrderInfoLogServiceImpl extends ServiceImpl implements OrderInfoLogService { - - @Override - public PageResult pageRel(OrderInfoLogParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("sort_number asc, create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(OrderInfoLogParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - page.setDefaultOrder("sort_number asc, create_time desc"); - return page.sortRecords(list); - } - - @Override - public OrderInfoLog getByIdRel(Integer id) { - OrderInfoLogParam param = new OrderInfoLogParam(); - param.setId(id); - return param.getOne(baseMapper.selectListRel(param)); - } - -} diff --git a/modules/shop/service/impl/OrderInfoServiceImpl.java b/modules/shop/service/impl/OrderInfoServiceImpl.java deleted file mode 100644 index dec1c7b..0000000 --- a/modules/shop/service/impl/OrderInfoServiceImpl.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.gxwebsoft.shop.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.github.yulichang.wrapper.MPJLambdaWrapper; -import com.gxwebsoft.booking.param.PeriodParam; -import com.gxwebsoft.shop.entity.Order; -import com.gxwebsoft.shop.mapper.OrderInfoMapper; -import com.gxwebsoft.shop.service.OrderInfoService; -import com.gxwebsoft.shop.entity.OrderInfo; -import com.gxwebsoft.shop.param.OrderInfoParam; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * Service实现 - * - * @author 科技小王子 - * @since 2024-08-10 13:44:39 - */ -@Service -public class OrderInfoServiceImpl extends ServiceImpl implements OrderInfoService { - - @Override - public PageResult pageRel(OrderInfoParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("order_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(OrderInfoParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - page.setDefaultOrder("order_time desc"); - return page.sortRecords(list); - } - - @Override - public OrderInfo getByIdRel(Integer id) { - OrderInfoParam param = new OrderInfoParam(); - param.setId(id); - return param.getOne(baseMapper.selectListRel(param)); - } - - @Override - public void updateByOutTradeNo(Order order) { - baseMapper.updateByOutTradeNo(order); - } - - @Override - public List getTodayOrder(PeriodParam param) { - // 多表查询 - MPJLambdaWrapper mpjLambdaWrapper = new MPJLambdaWrapper<>(); - mpjLambdaWrapper.selectAll(OrderInfo.class) - .select(Order::getOrderNo) - .select(Order::getOrderStatus) - .leftJoin(Order.class,Order::getOrderId,OrderInfo::getOid) - .eq(OrderInfo::getDateTime,param.getDateTime()) - .eq(Order::getPayStatus,1) - .eq(OrderInfo::getSid,param.getMerchantId()); -// .gt(OrderInfo::getExpirationTime, LocalDateTime.now()); - return baseMapper.selectJoinList(OrderInfo.class, mpjLambdaWrapper); - } - -} diff --git a/modules/shop/service/impl/OrderServiceImpl.java b/modules/shop/service/impl/OrderServiceImpl.java deleted file mode 100644 index 3276411..0000000 --- a/modules/shop/service/impl/OrderServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.gxwebsoft.shop.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.shop.mapper.OrderMapper; -import com.gxwebsoft.shop.service.OrderService; -import com.gxwebsoft.shop.entity.Order; -import com.gxwebsoft.shop.param.OrderParam; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * Service实现 - * - * @author 科技小王子 - * @since 2024-08-09 16:33:41 - */ -@Service -public class OrderServiceImpl extends ServiceImpl implements OrderService { - - @Override - public PageResult pageRel(OrderParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("sort_number asc, create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(OrderParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - page.setDefaultOrder("sort_number asc, create_time desc"); - return page.sortRecords(list); - } - - @Override - public Order getByIdRel(Integer orderId) { - OrderParam param = new OrderParam(); - param.setOrderId(orderId); - return param.getOne(baseMapper.selectListRel(param)); - } - -} diff --git a/modules/shop/service/impl/RechargeOrderServiceImpl.java b/modules/shop/service/impl/RechargeOrderServiceImpl.java deleted file mode 100644 index e9c4f6c..0000000 --- a/modules/shop/service/impl/RechargeOrderServiceImpl.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.gxwebsoft.shop.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 会员充值订单表Service实现 - * - * @author 科技小王子 - * @since 2024-07-26 23:18:48 - */ -@Service -public class RechargeOrderServiceImpl extends ServiceImpl implements RechargeOrderService { - - @Override - public PageResult pageRel(RechargeOrderParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("sort_number asc, create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(RechargeOrderParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - page.setDefaultOrder("sort_number asc, create_time desc"); - return page.sortRecords(list); - } - - @Override - public RechargeOrder getByIdRel(Integer orderId) { - RechargeOrderParam param = new RechargeOrderParam(); - param.setOrderId(orderId); - return param.getOne(baseMapper.selectListRel(param)); - } - -} diff --git a/modules/shop/service/impl/SpecServiceImpl.java b/modules/shop/service/impl/SpecServiceImpl.java deleted file mode 100644 index 79f8fd1..0000000 --- a/modules/shop/service/impl/SpecServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.gxwebsoft.shop.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.shop.mapper.SpecMapper; -import com.gxwebsoft.shop.service.SpecService; -import com.gxwebsoft.shop.entity.Spec; -import com.gxwebsoft.shop.param.SpecParam; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 规格Service实现 - * - * @author 科技小王子 - * @since 2024-07-25 03:00:41 - */ -@Service -public class SpecServiceImpl extends ServiceImpl implements SpecService { - - @Override - public PageResult pageRel(SpecParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("sort_number asc, create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(SpecParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - page.setDefaultOrder("sort_number asc, create_time desc"); - return page.sortRecords(list); - } - - @Override - public Spec getByIdRel(Integer specId) { - SpecParam param = new SpecParam(); - param.setSpecId(specId); - return param.getOne(baseMapper.selectListRel(param)); - } - -} diff --git a/modules/shop/service/impl/SpecValueServiceImpl.java b/modules/shop/service/impl/SpecValueServiceImpl.java deleted file mode 100644 index 901baad..0000000 --- a/modules/shop/service/impl/SpecValueServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.gxwebsoft.shop.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.shop.mapper.SpecValueMapper; -import com.gxwebsoft.shop.service.SpecValueService; -import com.gxwebsoft.shop.entity.SpecValue; -import com.gxwebsoft.shop.param.SpecValueParam; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 规格值Service实现 - * - * @author 科技小王子 - * @since 2024-04-01 09:49:15 - */ -@Service -public class SpecValueServiceImpl extends ServiceImpl implements SpecValueService { - - @Override - public PageResult pageRel(SpecValueParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("sort_number asc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(SpecValueParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - page.setDefaultOrder("sort_number asc"); - return page.sortRecords(list); - } - - @Override - public SpecValue getByIdRel(Integer specValueId) { - SpecValueParam param = new SpecValueParam(); - param.setSpecValueId(specValueId); - return param.getOne(baseMapper.selectListRel(param)); - } - -} diff --git a/modules/shop/service/impl/UserAddressServiceImpl.java b/modules/shop/service/impl/UserAddressServiceImpl.java deleted file mode 100644 index b383515..0000000 --- a/modules/shop/service/impl/UserAddressServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.gxwebsoft.shop.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.shop.mapper.UserAddressMapper; -import com.gxwebsoft.shop.service.UserAddressService; -import com.gxwebsoft.shop.entity.UserAddress; -import com.gxwebsoft.shop.param.UserAddressParam; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 收货地址Service实现 - * - * @author 科技小王子 - * @since 2024-05-26 10:58:37 - */ -@Service -public class UserAddressServiceImpl extends ServiceImpl implements UserAddressService { - - @Override - public PageResult pageRel(UserAddressParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("is_default desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(UserAddressParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - page.setDefaultOrder("is_default desc"); - return page.sortRecords(list); - } - - @Override - public UserAddress getByIdRel(Integer id) { - UserAddressParam param = new UserAddressParam(); - param.setId(id); - return param.getOne(baseMapper.selectListRel(param)); - } - -} diff --git a/modules/shop/service/impl/UserBalanceLogServiceImpl.java b/modules/shop/service/impl/UserBalanceLogServiceImpl.java deleted file mode 100644 index ec4ecb8..0000000 --- a/modules/shop/service/impl/UserBalanceLogServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.gxwebsoft.shop.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.shop.mapper.UserBalanceLogMapper; -import com.gxwebsoft.shop.service.UserBalanceLogService; -import com.gxwebsoft.shop.entity.UserBalanceLog; -import com.gxwebsoft.shop.param.UserBalanceLogParam; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 用户余额变动明细表Service实现 - * - * @author 科技小王子 - * @since 2024-05-29 15:57:44 - */ -@Service -public class UserBalanceLogServiceImpl extends ServiceImpl implements UserBalanceLogService { - - @Override - public PageResult pageRel(UserBalanceLogParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("sort_number asc, create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(UserBalanceLogParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - page.setDefaultOrder("sort_number asc, create_time desc"); - return page.sortRecords(list); - } - - @Override - public UserBalanceLog getByIdRel(Integer logId) { - UserBalanceLogParam param = new UserBalanceLogParam(); - param.setLogId(logId); - return param.getOne(baseMapper.selectListRel(param)); - } - -} diff --git a/modules/shop/service/impl/UserCollectionServiceImpl.java b/modules/shop/service/impl/UserCollectionServiceImpl.java deleted file mode 100644 index b65ad72..0000000 --- a/modules/shop/service/impl/UserCollectionServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.gxwebsoft.shop.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.shop.mapper.UserCollectionMapper; -import com.gxwebsoft.shop.service.UserCollectionService; -import com.gxwebsoft.shop.entity.UserCollection; -import com.gxwebsoft.shop.param.UserCollectionParam; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 我的收藏Service实现 - * - * @author 科技小王子 - * @since 2024-04-28 18:17:37 - */ -@Service -public class UserCollectionServiceImpl extends ServiceImpl implements UserCollectionService { - - @Override - public PageResult pageRel(UserCollectionParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("sort_number asc, create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(UserCollectionParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - page.setDefaultOrder("sort_number asc, create_time desc"); - return page.sortRecords(list); - } - - @Override - public UserCollection getByIdRel(Integer id) { - UserCollectionParam param = new UserCollectionParam(); - param.setId(id); - return param.getOne(baseMapper.selectListRel(param)); - } - -} diff --git a/modules/shop/service/impl/UsersServiceImpl.java b/modules/shop/service/impl/UsersServiceImpl.java deleted file mode 100644 index 79d9839..0000000 --- a/modules/shop/service/impl/UsersServiceImpl.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.gxwebsoft.shop.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.shop.entity.Order; -import com.gxwebsoft.shop.mapper.UsersMapper; -import com.gxwebsoft.shop.service.UsersService; -import com.gxwebsoft.shop.entity.Users; -import com.gxwebsoft.shop.param.UsersParam; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * Service实现 - * - * @author 科技小王子 - * @since 2024-08-09 15:20:25 - */ -@Service -public class UsersServiceImpl extends ServiceImpl implements UsersService { - - @Override - public PageResult pageRel(UsersParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(UsersParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - page.setDefaultOrder("create_time desc"); - return page.sortRecords(list); - } - - @Override - public Users getByIdRel(Integer id) { - UsersParam param = new UsersParam(); - param.setId(id); - return param.getOne(baseMapper.selectListRel(param)); - } - - @Override - public void addIntegral(Order order) { - - } - - @Override - public Users getByPhone(String phone) { - return null; - } - -} diff --git a/modules/shop/service/impl/WechatDepositServiceImpl.java b/modules/shop/service/impl/WechatDepositServiceImpl.java deleted file mode 100644 index 77a6ec7..0000000 --- a/modules/shop/service/impl/WechatDepositServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.gxwebsoft.shop.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.shop.mapper.WechatDepositMapper; -import com.gxwebsoft.shop.service.WechatDepositService; -import com.gxwebsoft.shop.entity.WechatDeposit; -import com.gxwebsoft.shop.param.WechatDepositParam; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 押金Service实现 - * - * @author 科技小王子 - * @since 2024-05-03 15:50:28 - */ -@Service -public class WechatDepositServiceImpl extends ServiceImpl implements WechatDepositService { - - @Override - public PageResult pageRel(WechatDepositParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } - - @Override - public List listRel(WechatDepositParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - page.setDefaultOrder("create_time desc"); - return page.sortRecords(list); - } - - @Override - public WechatDeposit getByIdRel(Integer id) { - WechatDepositParam param = new WechatDepositParam(); - param.setId(id); - return param.getOne(baseMapper.selectListRel(param)); - } - -} diff --git a/modules/shop/task/OrderTask.java b/modules/shop/task/OrderTask.java deleted file mode 100644 index ba81272..0000000 --- a/modules/shop/task/OrderTask.java +++ /dev/null @@ -1,113 +0,0 @@ -package com.gxwebsoft.shop.task; - -import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.shop.entity.Order; -import com.gxwebsoft.shop.entity.OrderInfo; -import com.gxwebsoft.shop.mapper.OrderMapper; -import com.gxwebsoft.shop.param.OrderParam; -import com.gxwebsoft.shop.service.OrderInfoService; -import com.gxwebsoft.shop.service.OrderService; -import io.swagger.annotations.Api; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.annotation.Resource; - -/** - * 订单结算任务 - * - * @author 科技小王子 - * @since 2024-05-14 13:20:04 - */ -@Api(tags = "订单结算任务") -@RestController -@RequestMapping("/api/shop/order") -public class OrderTask extends BaseController { - @Value("${spring.profiles.active}") - String active; - @Resource - private OrderService orderService; - @Resource - private OrderMapper orderMapper; - @Resource - private OrderInfoService orderInfoService; - - - /** - * 订单任务列表 - */ -// @Scheduled(cron = "*/10 * * * * *") -// public void orderTask() { - // 自动处理过期的预定订单 -// this.settledExpirationOrder(); -// } - - /** - * 自动核销订单 - */ -// @Scheduled(cron = "*/30 * * * * *") -// public void writeOff() { - // 自动核销订单 -// this.orderWriteOff(); -// } - - // 自动处理过期订单任务 - public void settledExpirationOrder() { - if (active.equals("dev")) { - return; - } - final OrderParam p = new OrderParam(); -// p.setOrderStatus(0); -// p.setExpirationTime(DateUtil.date()); -// final List list = orderMapper.selectExpirationOrder(p); -// System.out.println("自动处理过期订单list = " + list); -// list.forEach(d -> { -// d.setOrderStatus(2); -// }); -// if (!CollectionUtils.isEmpty(list)) { -// orderService.updateBatchById(list); -// System.out.println("自动处理过期订单 = " + list.size()); -// } - } - - public void settledExpirationOrderBy3028() { - if (active.equals("dev")) { - return; - } - final Order order = new Order(); -// final List list = orderInfoService.list(new LambdaQueryWrapper().eq(OrderInfo::getTenantId, 10150).eq(OrderInfo::getOrderStatus, 0).eq(OrderInfo::getMerchantId, 3028).eq(OrderInfo::getDateTime, DateUtil.today()).lt(OrderInfo::getStartTime, "21:30:00")); -// list.forEach(d -> { -// d.setOrderStatus(1); -// order.setOrderId(d.getOrderId()); -// }); -// orderInfoService.updateBatchById(list); -// if (!CollectionUtils.isEmpty(list)) { -// orderService.updateById(order); -// } -// System.out.println("自动核销订单(游泳馆) = " + list.size()); - } - - - // 自动核销订单 -// public void orderWriteOff() { -// if (active.equals("dev")) { -// return; -// } -// final Order order = new Order(); -// final int hour = DateUtil.hour(DateUtil.date(), true); -// final int minute = DateUtil.minute(DateUtil.date()); -// final int second = DateUtil.second(DateUtil.date()); -// final String startTime = String.format("%02d", hour).concat(":").concat(String.format("%02d", minute)).concat(":").concat(String.format("%02d", second)); -// final List list = orderInfoService.list(new LambdaQueryWrapper().eq(OrderInfo::getOrderStatus, 0).ne(OrderInfo::getMerchantId, 3028).eq(OrderInfo::getDateTime, DateUtil.today()).lt(OrderInfo::getStartTime, startTime)); -// list.forEach(d -> { -// d.setOrderStatus(1); -// order.setOrderId(d.getOid()); -// }); -// orderInfoService.updateBatchById(list); -// order.setOrderStatus(1); -// orderService.updateById(order); -// System.out.println("自动核销订单 = " + list.size()); -// } - -} diff --git a/modules/shop/vo/CartShopVo.java b/modules/shop/vo/CartShopVo.java deleted file mode 100644 index 449f08e..0000000 --- a/modules/shop/vo/CartShopVo.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gxwebsoft.shop.vo; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.gxwebsoft.shop.entity.Cart; -import com.gxwebsoft.shop.entity.Goods; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.io.Serializable; -import java.util.List; - -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "店铺对象", description = "店铺") -@TableName("shop_merchant") -public class CartShopVo implements Serializable { - - @ApiModelProperty(value = "店铺ID") - private Integer shopId; - - @ApiModelProperty("店铺名称") - private String shopName; - - @ApiModelProperty(value = "店铺图标") - private String shopLogo; - - @ApiModelProperty(value = "门店地址") - private String address; - - @ApiModelProperty(value = "商品列表") - private List carts; - @Data - public static class Payload { - private Integer shopId; - private String shopName; - private String shopLogo; - private String address; - private List carts; - } -} diff --git a/modules/shop/vo/CartVo.java b/modules/shop/vo/CartVo.java deleted file mode 100644 index b79def5..0000000 --- a/modules/shop/vo/CartVo.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.gxwebsoft.shop.vo; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.gxwebsoft.shop.entity.Cart; -import com.gxwebsoft.shop.entity.Merchant; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.List; - -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "Cart对象", description = "购物车") -@TableName("shop_cart") -public class CartVo implements Serializable { - - @ApiModelProperty("店铺列表") - private List shops; - - @ApiModelProperty(value = "购物车总金额") - private BigDecimal totalPrice; - - @ApiModelProperty(value = "宝贝数量") - private Long totalNums; - - @ApiModelProperty(value = "已选中宝贝") - private Long selectNums; - - @Data - public static class Payload { - private List shops; - private BigDecimal totalPrice; - private Long totalNums; - private Long selectNums; - } -} diff --git a/modules/shop/vo/CashierVo.java b/modules/shop/vo/CashierVo.java deleted file mode 100644 index bd62af9..0000000 --- a/modules/shop/vo/CashierVo.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.gxwebsoft.shop.vo; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.gxwebsoft.shop.entity.Cashier; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.List; - -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value = "Cart对象", description = "购物车") -@TableName("shop_cart") -public class CashierVo implements Serializable { - - @ApiModelProperty(value = "购物车总金额") - private BigDecimal totalPrice; - - @ApiModelProperty(value = "宝贝数量") - private Long totalNums; - - @ApiModelProperty(value = "已选中宝贝") - private Long selectNums; - - @ApiModelProperty(value = "收银商品列表") - private List cashiers; - - @ApiModelProperty(value = "分组ID") - private Long groupId; - - @ApiModelProperty(value = "订单备注") - private String comments; - - @Data - public static class Payload { - private BigDecimal totalPrice; - private Long totalNums; - private Long selectNums; - private List cashiers; - private Long groupId; - } -}