From 92b64cd7ecb192dd91fce2b411542237dd73f59e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=97=E5=AE=81=E7=BD=91=E5=AE=BF=E7=A7=91=E6=8A=80?= Date: Sat, 7 Oct 2023 21:36:36 +0800 Subject: [PATCH] Initial commit --- .DS_Store | Bin 0 -> 6148 bytes .gitignore | 31 + .mvn/wrapper/MavenWrapperDownloader.java | 118 + .mvn/wrapper/maven-wrapper.jar | Bin 0 -> 50710 bytes .mvn/wrapper/maven-wrapper.properties | 2 + README.md | 0 hs_err_pid31091.log | 745 ++++++ mvnw | 310 +++ mvnw.cmd | 182 ++ pom.xml | 316 +++ src/.DS_Store | Bin 0 -> 6148 bytes src/main/.DS_Store | Bin 0 -> 6148 bytes src/main/java/.DS_Store | Bin 0 -> 6148 bytes src/main/java/com/.DS_Store | Bin 0 -> 6148 bytes src/main/java/com/gxwebsoft/.DS_Store | Bin 0 -> 6148 bytes .../com/gxwebsoft/WebSoftApplication.java | 28 + .../apps/constants/EquipmentConstants.java | 10 + .../apps/constants/HualalaConstants.java | 18 + .../apps/constants/SfExpressConstants.java | 13 + .../apps/controller/BcAgentController.java | 127 ++ .../apps/controller/BcCartController.java | 254 +++ .../apps/controller/BcCookbookController.java | 139 ++ .../controller/BcEquipmentController.java | 151 ++ .../apps/controller/BcExportController.java | 323 +++ .../apps/controller/BcFoodController.java | 289 +++ .../apps/controller/BcPlanController.java | 144 ++ .../controller/BcStatisticsController.java | 342 +++ .../controller/BcTemporaryController.java | 158 ++ .../apps/controller/CashierController.java | 137 ++ .../controller/EquipmentAlarmController.java | 140 ++ .../apps/controller/EquipmentController.java | 253 ++ .../controller/EquipmentFaultController.java | 140 ++ .../controller/EquipmentGoodsController.java | 130 ++ .../controller/EquipmentOrderController.java | 140 ++ .../EquipmentOrderGoodsController.java | 148 ++ .../controller/EquipmentRecordController.java | 144 ++ .../HualalaCardBenefitsController.java | 134 ++ .../controller/HualalaCardController.java | 140 ++ .../apps/controller/HualalaCart.java | 240 ++ .../controller/HualalaCartFoodController.java | 134 ++ .../apps/controller/HualalaController.java | 384 ++++ .../HualalaFoodCategoryController.java | 134 ++ .../controller/HualalaFoodController.java | 134 ++ .../controller/HualalaShopController.java | 134 ++ .../apps/controller/LinkController.java | 140 ++ .../gxwebsoft/apps/controller/SfExpress.java | 115 + .../apps/controller/TestDataController.java | 142 ++ .../com/gxwebsoft/apps/entity/BcAgent.java | 65 + .../com/gxwebsoft/apps/entity/BcCart.java | 64 + .../com/gxwebsoft/apps/entity/BcCookbook.java | 61 + .../gxwebsoft/apps/entity/BcEquipment.java | 79 + .../com/gxwebsoft/apps/entity/BcExport.java | 112 + .../com/gxwebsoft/apps/entity/BcFood.java | 61 + .../com/gxwebsoft/apps/entity/BcPlan.java | 79 + .../gxwebsoft/apps/entity/BcTemporary.java | 80 + .../com/gxwebsoft/apps/entity/Cashier.java | 95 + .../com/gxwebsoft/apps/entity/Equipment.java | 148 ++ .../gxwebsoft/apps/entity/EquipmentAlarm.java | 72 + .../gxwebsoft/apps/entity/EquipmentFault.java | 75 + .../gxwebsoft/apps/entity/EquipmentGoods.java | 120 + .../gxwebsoft/apps/entity/EquipmentOrder.java | 202 ++ .../apps/entity/EquipmentOrderGoods.java | 119 + .../apps/entity/EquipmentRecord.java | 79 + .../com/gxwebsoft/apps/entity/Hualala.java | 70 + .../gxwebsoft/apps/entity/HualalaCard.java | 131 ++ .../apps/entity/HualalaCardBenefits.java | 69 + .../gxwebsoft/apps/entity/HualalaCart.java | 16 + .../apps/entity/HualalaCartFood.java | 78 + .../gxwebsoft/apps/entity/HualalaFood.java | 300 +++ .../apps/entity/HualalaFoodCategory.java | 111 + .../gxwebsoft/apps/entity/HualalaShop.java | 117 + .../com/gxwebsoft/apps/entity/ItemVo.java | 20 + .../java/com/gxwebsoft/apps/entity/Link.java | 79 + .../com/gxwebsoft/apps/entity/TestData.java | 47 + .../gxwebsoft/apps/mapper/BcAgentMapper.java | 37 + .../apps/mapper/BcCookbookMapper.java | 37 + .../apps/mapper/BcEquipmentMapper.java | 37 + .../gxwebsoft/apps/mapper/BcExportMapper.java | 37 + .../gxwebsoft/apps/mapper/BcFoodMapper.java | 37 + .../gxwebsoft/apps/mapper/BcPlanMapper.java | 37 + .../apps/mapper/BcTemporaryMapper.java | 37 + .../gxwebsoft/apps/mapper/CashierMapper.java | 37 + .../apps/mapper/EquipmentAlarmMapper.java | 37 + .../apps/mapper/EquipmentFaultMapper.java | 37 + .../apps/mapper/EquipmentGoodsMapper.java | 37 + .../apps/mapper/EquipmentMapper.java | 37 + .../mapper/EquipmentOrderGoodsMapper.java | 37 + .../apps/mapper/EquipmentOrderMapper.java | 37 + .../apps/mapper/EquipmentRecordMapper.java | 37 + .../mapper/HualalaCardBenefitsMapper.java | 37 + .../apps/mapper/HualalaCardMapper.java | 37 + .../apps/mapper/HualalaCartFoodMapper.java | 37 + .../mapper/HualalaFoodCategoryMapper.java | 37 + .../apps/mapper/HualalaFoodMapper.java | 37 + .../gxwebsoft/apps/mapper/HualalaMapper.java | 20 + .../apps/mapper/HualalaShopMapper.java | 37 + .../com/gxwebsoft/apps/mapper/LinkMapper.java | 37 + .../gxwebsoft/apps/mapper/TestDataMapper.java | 37 + .../apps/mapper/xml/BcAgentMapper.xml | 44 + .../apps/mapper/xml/BcCookbookMapper.xml | 53 + .../apps/mapper/xml/BcEquipmentMapper.xml | 65 + .../apps/mapper/xml/BcExportMapper.xml | 83 + .../apps/mapper/xml/BcFoodMapper.xml | 57 + .../apps/mapper/xml/BcPlanMapper.xml | 67 + .../apps/mapper/xml/BcTemporaryMapper.xml | 54 + .../apps/mapper/xml/CashierMapper.xml | 86 + .../apps/mapper/xml/EquipmentAlarmMapper.xml | 70 + .../apps/mapper/xml/EquipmentFaultMapper.xml | 70 + .../apps/mapper/xml/EquipmentGoodsMapper.xml | 94 + .../apps/mapper/xml/EquipmentMapper.xml | 121 + .../mapper/xml/EquipmentOrderGoodsMapper.xml | 110 + .../apps/mapper/xml/EquipmentOrderMapper.xml | 194 ++ .../apps/mapper/xml/EquipmentRecordMapper.xml | 78 + .../mapper/xml/HualalaCardBenefitsMapper.xml | 62 + .../apps/mapper/xml/HualalaCardMapper.xml | 125 + .../apps/mapper/xml/HualalaCartFoodMapper.xml | 62 + .../mapper/xml/HualalaFoodCategoryMapper.xml | 104 + .../apps/mapper/xml/HualalaFoodMapper.xml | 335 +++ .../apps/mapper/xml/HualalaMapper.xml | 5 + .../apps/mapper/xml/HualalaShopMapper.xml | 98 + .../gxwebsoft/apps/mapper/xml/LinkMapper.xml | 71 + .../apps/mapper/xml/TestDataMapper.xml | 38 + .../gxwebsoft/apps/param/BcAgentParam.java | 41 + .../gxwebsoft/apps/param/BcCookbookParam.java | 51 + .../apps/param/BcEquipmentParam.java | 66 + .../gxwebsoft/apps/param/BcExportParam.java | 98 + .../com/gxwebsoft/apps/param/BcFoodParam.java | 51 + .../com/gxwebsoft/apps/param/BcPlanParam.java | 69 + .../apps/param/BcTemporaryParam.java | 63 + .../gxwebsoft/apps/param/CashierParam.java | 87 + .../apps/param/EquipmentAlarmParam.java | 65 + .../apps/param/EquipmentFaultParam.java | 68 + .../apps/param/EquipmentGoodsParam.java | 114 + .../apps/param/EquipmentOrderGoodsParam.java | 125 + .../apps/param/EquipmentOrderParam.java | 227 ++ .../gxwebsoft/apps/param/EquipmentParam.java | 127 ++ .../apps/param/EquipmentRecordParam.java | 69 + .../apps/param/HualalaCardBenefitsParam.java | 58 + .../apps/param/HualalaCardParam.java | 130 ++ .../apps/param/HualalaCartFoodParam.java | 66 + .../apps/param/HualalaFoodCategoryParam.java | 106 + .../apps/param/HualalaFoodParam.java | 299 +++ .../gxwebsoft/apps/param/HualalaParam.java | 34 + .../apps/param/HualalaShopParam.java | 97 + .../com/gxwebsoft/apps/param/HxzParam.java | 47 + .../com/gxwebsoft/apps/param/LinkParam.java | 71 + .../gxwebsoft/apps/param/TestDataParam.java | 35 + .../gxwebsoft/apps/result/AllShopResult.java | 33 + .../com/gxwebsoft/apps/result/CartResult.java | 18 + .../apps/result/FoodCategoryResult.java | 33 + .../gxwebsoft/apps/result/OpenFoodResult.java | 36 + .../com/gxwebsoft/apps/result/OperateVo.java | 17 + .../apps/result/ShopBaseInfoResult.java | 32 + .../apps/service/BcAgentService.java | 42 + .../apps/service/BcCookbookService.java | 42 + .../apps/service/BcEquipmentService.java | 42 + .../apps/service/BcExportService.java | 42 + .../gxwebsoft/apps/service/BcFoodService.java | 42 + .../gxwebsoft/apps/service/BcPlanService.java | 42 + .../apps/service/BcTemporaryService.java | 42 + .../apps/service/CashierService.java | 42 + .../apps/service/EquipmentAlarmService.java | 42 + .../apps/service/EquipmentFaultService.java | 42 + .../apps/service/EquipmentGoodsService.java | 42 + .../service/EquipmentOrderGoodsService.java | 42 + .../apps/service/EquipmentOrderService.java | 42 + .../apps/service/EquipmentRecordService.java | 42 + .../apps/service/EquipmentService.java | 44 + .../service/HualalaCardBenefitsService.java | 42 + .../apps/service/HualalaCardService.java | 42 + .../apps/service/HualalaCartFoodService.java | 42 + .../service/HualalaFoodCategoryService.java | 42 + .../apps/service/HualalaFoodService.java | 44 + .../apps/service/HualalaService.java | 32 + .../apps/service/HualalaShopService.java | 44 + .../gxwebsoft/apps/service/LinkService.java | 42 + .../apps/service/TestDataService.java | 42 + .../apps/service/impl/BcAgentServiceImpl.java | 56 + .../service/impl/BcCookbookServiceImpl.java | 47 + .../service/impl/BcEquipmentServiceImpl.java | 47 + .../service/impl/BcExportServiceImpl.java | 47 + .../apps/service/impl/BcFoodServiceImpl.java | 47 + .../apps/service/impl/BcPlanServiceImpl.java | 47 + .../service/impl/BcTemporaryServiceImpl.java | 53 + .../apps/service/impl/CashierServiceImpl.java | 47 + .../impl/EquipmentAlarmServiceImpl.java | 47 + .../impl/EquipmentFaultServiceImpl.java | 47 + .../impl/EquipmentGoodsServiceImpl.java | 47 + .../impl/EquipmentOrderGoodsServiceImpl.java | 47 + .../impl/EquipmentOrderServiceImpl.java | 47 + .../impl/EquipmentRecordServiceImpl.java | 47 + .../service/impl/EquipmentServiceImpl.java | 63 + .../impl/HualalaCardBenefitsServiceImpl.java | 47 + .../service/impl/HualalaCardServiceImpl.java | 47 + .../impl/HualalaCartFoodServiceImpl.java | 47 + .../impl/HualalaFoodCategoryServiceImpl.java | 47 + .../service/impl/HualalaFoodServiceImpl.java | 52 + .../apps/service/impl/HualalaServiceImpl.java | 178 ++ .../service/impl/HualalaShopServiceImpl.java | 134 ++ .../apps/service/impl/LinkServiceImpl.java | 47 + .../service/impl/TestDataServiceImpl.java | 47 + .../java/com/gxwebsoft/apps/utils/BcUtil.java | 118 + .../controller/ArticleCategoryController.java | 141 ++ .../controller/ArticleCommentController.java | 170 ++ .../cms/controller/ArticleController.java | 142 ++ .../cms/controller/ArticleLikeController.java | 162 ++ .../cms/controller/DocsController.java | 139 ++ .../com/gxwebsoft/cms/entity/Article.java | 151 ++ .../gxwebsoft/cms/entity/ArticleCategory.java | 69 + .../gxwebsoft/cms/entity/ArticleComment.java | 151 ++ .../com/gxwebsoft/cms/entity/ArticleLike.java | 52 + .../java/com/gxwebsoft/cms/entity/Docs.java | 72 + .../cms/mapper/ArticleCategoryMapper.java | 37 + .../cms/mapper/ArticleCommentMapper.java | 37 + .../cms/mapper/ArticleLikeMapper.java | 37 + .../gxwebsoft/cms/mapper/ArticleMapper.java | 37 + .../com/gxwebsoft/cms/mapper/DocsMapper.java | 37 + .../cms/mapper/xml/ArticleCategoryMapper.xml | 59 + .../cms/mapper/xml/ArticleCommentMapper.xml | 78 + .../cms/mapper/xml/ArticleLikeMapper.xml | 38 + .../cms/mapper/xml/ArticleMapper.xml | 109 + .../gxwebsoft/cms/mapper/xml/DocsMapper.xml | 68 + .../cms/param/ArticleCategoryParam.java | 62 + .../cms/param/ArticleCommentParam.java | 79 + .../gxwebsoft/cms/param/ArticleLikeParam.java | 41 + .../com/gxwebsoft/cms/param/ArticleParam.java | 114 + .../com/gxwebsoft/cms/param/DocsParam.java | 69 + .../cms/service/ArticleCategoryService.java | 42 + .../cms/service/ArticleCommentService.java | 44 + .../cms/service/ArticleLikeService.java | 42 + .../gxwebsoft/cms/service/ArticleService.java | 42 + .../gxwebsoft/cms/service/DocsService.java | 42 + .../impl/ArticleCategoryServiceImpl.java | 47 + .../impl/ArticleCommentServiceImpl.java | 100 + .../service/impl/ArticleLikeServiceImpl.java | 47 + .../cms/service/impl/ArticleServiceImpl.java | 95 + .../cms/service/impl/DocsServiceImpl.java | 47 + src/main/java/com/gxwebsoft/common/.DS_Store | Bin 0 -> 6148 bytes .../com/gxwebsoft/common/core/Constants.java | 93 + .../common/core/annotation/OperationLog.java | 41 + .../core/annotation/OperationModule.java | 21 + .../common/core/annotation/QueryField.java | 22 + .../common/core/annotation/QueryType.java | 42 + .../core/aspect/OperationLogAspect.java | 229 ++ .../common/core/config/ConfigProperties.java | 105 + .../core/config/HttpMessageConverter.java | 15 + .../common/core/config/MybatisPlusConfig.java | 94 + .../core/config/RestTemplateConfig.java | 29 + .../common/core/config/SpringContextUtil.java | 62 + .../common/core/config/SwaggerConfig.java | 72 + .../common/core/config/WebMvcConfig.java | 31 + .../core/constants/BalanceConstants.java | 10 + .../common/core/constants/OrderConstants.java | 37 + .../core/constants/ProfitConstants.java | 9 + .../common/core/constants/RedisConstants.java | 39 + .../core/constants/WxOfficialConstants.java | 6 + .../core/exception/BusinessException.java | 48 + .../exception/GlobalExceptionHandler.java | 56 + .../core/security/JwtAccessDeniedHandler.java | 29 + .../security/JwtAuthenticationEntryPoint.java | 30 + .../security/JwtAuthenticationFilter.java | 85 + .../common/core/security/JwtSubject.java | 31 + .../common/core/security/JwtUtil.java | 152 ++ .../common/core/security/SecurityConfig.java | 97 + .../common/core/utils/AlipayConfigUtil.java | 110 + .../gxwebsoft/common/core/utils/BtUtil.java | 149 ++ .../common/core/utils/CacheClient.java | 264 +++ .../common/core/utils/CommonUtil.java | 235 ++ .../common/core/utils/FileServerUtil.java | 401 ++++ .../common/core/utils/HttpUtils.java | 311 +++ .../common/core/utils/ImageUtil.java | 62 + .../common/core/utils/JChardetFacadeUtil.java | 2025 +++++++++++++++++ .../gxwebsoft/common/core/utils/JSONUtil.java | 69 + .../common/core/utils/MyQrCodeUtil.java | 62 + .../common/core/utils/OpenOfficeUtil.java | 124 + .../common/core/utils/RedisUtil.java | 279 +++ .../common/core/utils/SchedulingUtil.java | 24 + .../common/core/utils/SignCheckUtil.java | 172 ++ .../common/core/utils/WxOfficialUtil.java | 106 + .../gxwebsoft/common/core/utils/WxUtil.java | 134 ++ .../common/core/utils/WxWorkUtil.java | 134 ++ .../gxwebsoft/common/core/web/ApiResult.java | 87 + .../common/core/web/BaseController.java | 325 +++ .../gxwebsoft/common/core/web/BaseParam.java | 68 + .../gxwebsoft/common/core/web/BatchParam.java | 57 + .../common/core/web/ExistenceParam.java | 96 + .../gxwebsoft/common/core/web/PageParam.java | 343 +++ .../gxwebsoft/common/core/web/PageResult.java | 51 + .../controller/AccessKeyController.java | 150 ++ .../system/controller/AliOssController.java | 244 ++ .../system/controller/CacheController.java | 119 + .../system/controller/CompanyController.java | 154 ++ .../system/controller/DictController.java | 185 ++ .../system/controller/DictDataController.java | 133 ++ .../controller/DictionaryController.java | 155 ++ .../controller/DictionaryDataController.java | 131 ++ .../system/controller/EmailController.java | 49 + .../system/controller/FileController.java | 344 +++ .../controller/FilePreviewController.java | 242 ++ .../controller/LoginRecordController.java | 58 + .../system/controller/MainController.java | 387 ++++ .../system/controller/MenuController.java | 156 ++ .../controller/OperationRecordController.java | 62 + .../controller/OrganizationController.java | 139 ++ .../system/controller/PlugController.java | 171 ++ .../controller/RedisUtilController.java | 77 + .../system/controller/RoleController.java | 152 ++ .../system/controller/RoleMenuController.java | 100 + .../system/controller/SettingController.java | 196 ++ .../system/controller/TenantController.java | 167 ++ .../system/controller/UserController.java | 368 +++ .../system/controller/UserFileController.java | 164 ++ .../system/controller/WxLoginController.java | 371 +++ .../common/system/entity/AccessKey.java | 54 + .../gxwebsoft/common/system/entity/Cache.java | 34 + .../common/system/entity/Company.java | 158 ++ .../gxwebsoft/common/system/entity/Dict.java | 57 + .../common/system/entity/DictData.java | 63 + .../common/system/entity/Dictionary.java | 56 + .../common/system/entity/DictionaryData.java | 64 + .../common/system/entity/EmailRecord.java | 56 + .../common/system/entity/FileRecord.java | 88 + .../common/system/entity/KVEntity.java | 56 + .../common/system/entity/LoginRecord.java | 73 + .../gxwebsoft/common/system/entity/Menu.java | 84 + .../common/system/entity/OperationRecord.java | 95 + .../common/system/entity/Organization.java | 77 + .../gxwebsoft/common/system/entity/Plug.java | 141 ++ .../gxwebsoft/common/system/entity/Role.java | 53 + .../common/system/entity/RoleMenu.java | 44 + .../common/system/entity/Setting.java | 58 + .../common/system/entity/Tenant.java | 79 + .../gxwebsoft/common/system/entity/User.java | 317 +++ .../common/system/entity/UserFile.java | 76 + .../common/system/entity/UserRole.java | 49 + .../common/system/mapper/AccessKeyMapper.java | 37 + .../common/system/mapper/CompanyMapper.java | 38 + .../common/system/mapper/DictDataMapper.java | 47 + .../common/system/mapper/DictMapper.java | 14 + .../system/mapper/DictionaryDataMapper.java | 47 + .../system/mapper/DictionaryMapper.java | 14 + .../system/mapper/EmailRecordMapper.java | 14 + .../system/mapper/FileRecordMapper.java | 47 + .../system/mapper/LoginRecordMapper.java | 48 + .../common/system/mapper/MenuMapper.java | 22 + .../system/mapper/OperationRecordMapper.java | 48 + .../system/mapper/OrganizationMapper.java | 37 + .../common/system/mapper/PlugMapper.java | 42 + .../common/system/mapper/RoleMapper.java | 14 + .../common/system/mapper/RoleMenuMapper.java | 39 + .../common/system/mapper/SettingMapper.java | 40 + .../common/system/mapper/TenantMapper.java | 37 + .../common/system/mapper/UserFileMapper.java | 14 + .../common/system/mapper/UserMapper.java | 55 + .../common/system/mapper/UserRoleMapper.java | 45 + .../system/mapper/xml/AccessKeyMapper.xml | 44 + .../system/mapper/xml/CompanyMapper.xml | 124 + .../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/FileRecordMapper.xml | 79 + .../system/mapper/xml/LoginRecordMapper.xml | 62 + .../common/system/mapper/xml/MenuMapper.xml | 32 + .../mapper/xml/OperationRecordMapper.xml | 71 + .../system/mapper/xml/OrganizationMapper.xml | 86 + .../common/system/mapper/xml/PlugMapper.xml | 105 + .../common/system/mapper/xml/RoleMapper.xml | 5 + .../system/mapper/xml/RoleMenuMapper.xml | 42 + .../system/mapper/xml/SettingMapper.xml | 33 + .../common/system/mapper/xml/TenantMapper.xml | 56 + .../system/mapper/xml/UserFileMapper.xml | 5 + .../common/system/mapper/xml/UserMapper.xml | 231 ++ .../system/mapper/xml/UserRoleMapper.xml | 35 + .../common/system/param/AccessKeyParam.java | 55 + .../common/system/param/AlipayParam.java | 31 + .../common/system/param/CacheParam.java | 25 + .../common/system/param/CompanyParam.java | 131 ++ .../common/system/param/DictDataParam.java | 55 + .../common/system/param/DictParam.java | 38 + .../system/param/DictionaryDataParam.java | 55 + .../common/system/param/DictionaryParam.java | 38 + .../common/system/param/FileRecordParam.java | 70 + .../common/system/param/LoginParam.java | 37 + .../common/system/param/LoginRecordParam.java | 60 + .../common/system/param/MenuParam.java | 68 + .../system/param/OperationRecordParam.java | 67 + .../system/param/OrganizationParam.java | 65 + .../common/system/param/PlugParam.java | 95 + .../common/system/param/RoleParam.java | 41 + .../common/system/param/SettingParam.java | 50 + .../common/system/param/SmsCaptchaParam.java | 31 + .../common/system/param/TenantParam.java | 55 + .../system/param/UpdatePasswordParam.java | 31 + .../common/system/param/UserFileParam.java | 40 + .../common/system/param/UserImportParam.java | 42 + .../common/system/param/UserParam.java | 213 ++ .../common/system/result/CaptchaResult.java | 30 + .../common/system/result/LoginResult.java | 31 + .../common/system/result/RedisResult.java | 35 + .../system/result/SmsCaptchaResult.java | 26 + .../system/service/AccessKeyService.java | 42 + .../common/system/service/AlipayService.java | 21 + .../common/system/service/CompanyService.java | 44 + .../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 | 50 + .../system/service/FileRecordService.java | 58 + .../system/service/LoginRecordService.java | 54 + .../common/system/service/MenuService.java | 18 + .../service/OperationRecordService.java | 49 + .../system/service/OrganizationService.java | 42 + .../common/system/service/PlugService.java | 44 + .../system/service/RoleMenuService.java | 35 + .../common/system/service/RoleService.java | 14 + .../common/system/service/SettingService.java | 59 + .../common/system/service/TenantService.java | 42 + .../system/service/UserFileService.java | 14 + .../system/service/UserRoleService.java | 42 + .../common/system/service/UserService.java | 112 + .../service/impl/AccessKeyServiceImpl.java | 47 + .../service/impl/CompanyServiceImpl.java | 55 + .../service/impl/DictDataServiceImpl.java | 52 + .../system/service/impl/DictServiceImpl.java | 18 + .../impl/DictionaryDataServiceImpl.java | 52 + .../service/impl/DictionaryServiceImpl.java | 18 + .../service/impl/EmailRecordServiceImpl.java | 72 + .../service/impl/FileRecordServiceImpl.java | 63 + .../service/impl/LoginRecordServiceImpl.java | 78 + .../system/service/impl/MenuServiceImpl.java | 139 ++ .../impl/OperationRecordServiceImpl.java | 52 + .../service/impl/OrganizationServiceImpl.java | 45 + .../system/service/impl/PlugServiceImpl.java | 112 + .../service/impl/RoleMenuServiceImpl.java | 31 + .../system/service/impl/RoleServiceImpl.java | 18 + .../service/impl/SettingServiceImpl.java | 155 ++ .../service/impl/TenantServiceImpl.java | 46 + .../service/impl/UserFileServiceImpl.java | 18 + .../service/impl/UserRoleServiceImpl.java | 37 + .../system/service/impl/UserServiceImpl.java | 346 +++ .../house/controller/InfoController.java | 154 ++ .../house/controller/LikeLogController.java | 135 ++ .../controller/ReservationController.java | 136 ++ .../house/controller/ViewsLogController.java | 139 ++ .../java/com/gxwebsoft/house/entity/Info.java | 176 ++ .../com/gxwebsoft/house/entity/LikeLog.java | 56 + .../gxwebsoft/house/entity/Reservation.java | 129 ++ .../com/gxwebsoft/house/entity/ViewsLog.java | 56 + .../gxwebsoft/house/mapper/InfoMapper.java | 37 + .../gxwebsoft/house/mapper/LikeLogMapper.java | 38 + .../house/mapper/ReservationMapper.java | 37 + .../house/mapper/ViewsLogMapper.java | 38 + .../gxwebsoft/house/mapper/xml/InfoMapper.xml | 170 ++ .../house/mapper/xml/LikeLogMapper.xml | 47 + .../house/mapper/xml/ReservationMapper.xml | 116 + .../house/mapper/xml/ViewsLogMapper.xml | 47 + .../com/gxwebsoft/house/param/InfoParam.java | 165 ++ .../gxwebsoft/house/param/LikeLogParam.java | 45 + .../house/param/ReservationParam.java | 134 ++ .../gxwebsoft/house/param/ViewsLogParam.java | 45 + .../gxwebsoft/house/service/InfoService.java | 42 + .../house/service/LikeLogService.java | 45 + .../house/service/ReservationService.java | 42 + .../house/service/ViewsLogService.java | 45 + .../house/service/impl/InfoServiceImpl.java | 46 + .../service/impl/LikeLogServiceImpl.java | 84 + .../service/impl/ReservationServiceImpl.java | 47 + .../service/impl/ViewsLogServiceImpl.java | 74 + .../controller/CertificateController.java | 199 ++ .../ChatConversationController.java | 157 ++ .../controller/ChatMessageController.java | 162 ++ .../love/controller/ProfitController.java | 128 ++ .../love/controller/UserPlanController.java | 167 ++ .../controller/UserPlanEquityController.java | 148 ++ .../controller/UserPlanIconController.java | 129 ++ .../controller/UserPlanLogController.java | 370 +++ .../controller/UserPlanPriceController.java | 125 + .../controller/UserProfileController.java | 205 ++ .../gxwebsoft/love/entity/Certificate.java | 107 + .../love/entity/ChatConversation.java | 65 + .../gxwebsoft/love/entity/ChatMessage.java | 66 + .../com/gxwebsoft/love/entity/Profit.java | 109 + .../com/gxwebsoft/love/entity/UserPlan.java | 98 + .../gxwebsoft/love/entity/UserPlanEquity.java | 91 + .../gxwebsoft/love/entity/UserPlanIcon.java | 55 + .../gxwebsoft/love/entity/UserPlanLog.java | 157 ++ .../gxwebsoft/love/entity/UserPlanPrice.java | 69 + .../gxwebsoft/love/entity/UserProfile.java | 193 ++ .../gxwebsoft/love/enums/ChatMessageType.java | 25 + .../love/mapper/CertificateMapper.java | 37 + .../love/mapper/ChatConversationMapper.java | 37 + .../love/mapper/ChatMessageMapper.java | 37 + .../gxwebsoft/love/mapper/ProfitMapper.java | 37 + .../love/mapper/UserPlanEquityMapper.java | 37 + .../love/mapper/UserPlanIconMapper.java | 37 + .../love/mapper/UserPlanLogMapper.java | 43 + .../gxwebsoft/love/mapper/UserPlanMapper.java | 37 + .../love/mapper/UserPlanPriceMapper.java | 37 + .../love/mapper/UserProfileMapper.java | 37 + .../love/mapper/xml/CertificateMapper.xml | 84 + .../mapper/xml/ChatConversationMapper.xml | 53 + .../love/mapper/xml/ChatMessageMapper.xml | 53 + .../love/mapper/xml/ProfitMapper.xml | 83 + .../love/mapper/xml/UserPlanEquityMapper.xml | 75 + .../love/mapper/xml/UserPlanIconMapper.xml | 50 + .../love/mapper/xml/UserPlanLogMapper.xml | 77 + .../love/mapper/xml/UserPlanMapper.xml | 67 + .../love/mapper/xml/UserPlanPriceMapper.xml | 51 + .../love/mapper/xml/UserProfileMapper.xml | 190 ++ .../love/param/CertificateParam.java | 82 + .../love/param/ChatConversationParam.java | 56 + .../love/param/ChatMessageParam.java | 52 + .../com/gxwebsoft/love/param/ProfitParam.java | 82 + .../love/param/UserPlanEquityParam.java | 72 + .../love/param/UserPlanIconParam.java | 50 + .../love/param/UserPlanLogParam.java | 68 + .../gxwebsoft/love/param/UserPlanParam.java | 69 + .../love/param/UserPlanPriceParam.java | 53 + .../love/param/UserProfileParam.java | 193 ++ .../love/service/CertificateService.java | 51 + .../love/service/ChatConversationService.java | 47 + .../love/service/ChatMessageService.java | 48 + .../gxwebsoft/love/service/ProfitService.java | 42 + .../love/service/UserPlanEquityService.java | 42 + .../love/service/UserPlanIconService.java | 42 + .../love/service/UserPlanLogService.java | 46 + .../love/service/UserPlanPriceService.java | 42 + .../love/service/UserPlanService.java | 42 + .../love/service/UserProfileService.java | 42 + .../service/impl/CertificateServiceImpl.java | 158 ++ .../impl/ChatConversationServiceImpl.java | 124 + .../service/impl/ChatMessageServiceImpl.java | 153 ++ .../love/service/impl/ProfitServiceImpl.java | 47 + .../impl/UserPlanEquityServiceImpl.java | 47 + .../service/impl/UserPlanIconServiceImpl.java | 47 + .../service/impl/UserPlanLogServiceImpl.java | 66 + .../impl/UserPlanPriceServiceImpl.java | 47 + .../service/impl/UserPlanServiceImpl.java | 102 + .../service/impl/UserProfileServiceImpl.java | 148 ++ .../love/socketio/cache/ClientCache.java | 75 + .../love/socketio/config/SocketIOConfig.java | 82 + .../socketio/handler/SocketIOHandler.java | 108 + .../gxwebsoft/love/vo/ChatConversationVO.java | 18 + .../vo/idcheck/BackRecognitionResult.java | 11 + .../vo/idcheck/FrontRecognitionResult.java | 15 + .../love/vo/idcheck/IdCardInfor.java | 14 + .../gxwebsoft/love/vo/idcheck/Response.java | 10 + .../love/vo/idcheck/VerifyResult.java | 14 + .../oa/constants/NoticeConstants.java | 10 + .../gxwebsoft/oa/constants/TaskConstants.java | 13 + .../oa/controller/AppController.java | 186 ++ .../oa/controller/AppUserController.java | 133 ++ .../oa/controller/AssetsController.java | 174 ++ .../oa/controller/AssetsUserController.java | 133 ++ .../oa/controller/CustomerController.java | 131 ++ .../oa/controller/NoticeController.java | 154 ++ .../oa/controller/ProjectController.java | 139 ++ .../oa/controller/TaskController.java | 193 ++ .../oa/controller/TaskRecordController.java | 157 ++ .../oa/controller/TaskUserController.java | 153 ++ .../java/com/gxwebsoft/oa/entity/App.java | 238 ++ .../java/com/gxwebsoft/oa/entity/AppUser.java | 70 + .../java/com/gxwebsoft/oa/entity/Assets.java | 170 ++ .../com/gxwebsoft/oa/entity/AssetsUser.java | 71 + .../com/gxwebsoft/oa/entity/Customer.java | 115 + .../java/com/gxwebsoft/oa/entity/Notice.java | 97 + .../java/com/gxwebsoft/oa/entity/Project.java | 125 + .../java/com/gxwebsoft/oa/entity/Task.java | 188 ++ .../com/gxwebsoft/oa/entity/TaskRecord.java | 75 + .../com/gxwebsoft/oa/entity/TaskUser.java | 67 + .../com/gxwebsoft/oa/mapper/AppMapper.java | 38 + .../gxwebsoft/oa/mapper/AppUserMapper.java | 37 + .../com/gxwebsoft/oa/mapper/AssetsMapper.java | 37 + .../gxwebsoft/oa/mapper/AssetsUserMapper.java | 37 + .../gxwebsoft/oa/mapper/CustomerMapper.java | 37 + .../com/gxwebsoft/oa/mapper/NoticeMapper.java | 37 + .../gxwebsoft/oa/mapper/ProjectMapper.java | 37 + .../com/gxwebsoft/oa/mapper/TaskMapper.java | 37 + .../gxwebsoft/oa/mapper/TaskRecordMapper.java | 37 + .../gxwebsoft/oa/mapper/TaskUserMapper.java | 37 + .../com/gxwebsoft/oa/mapper/xml/AppMapper.xml | 195 ++ .../gxwebsoft/oa/mapper/xml/AppUserMapper.xml | 52 + .../gxwebsoft/oa/mapper/xml/AssetsMapper.xml | 149 ++ .../oa/mapper/xml/AssetsUserMapper.xml | 52 + .../oa/mapper/xml/CustomerMapper.xml | 107 + .../gxwebsoft/oa/mapper/xml/NoticeMapper.xml | 69 + .../gxwebsoft/oa/mapper/xml/ProjectMapper.xml | 116 + .../gxwebsoft/oa/mapper/xml/TaskMapper.xml | 132 ++ .../oa/mapper/xml/TaskRecordMapper.xml | 69 + .../oa/mapper/xml/TaskUserMapper.xml | 50 + .../java/com/gxwebsoft/oa/param/AppParam.java | 187 ++ .../com/gxwebsoft/oa/param/AppUserParam.java | 66 + .../com/gxwebsoft/oa/param/AssetsParam.java | 151 ++ .../gxwebsoft/oa/param/AssetsUserParam.java | 66 + .../com/gxwebsoft/oa/param/CustomerParam.java | 101 + .../com/gxwebsoft/oa/param/NoticeParam.java | 80 + .../com/gxwebsoft/oa/param/ProjectParam.java | 125 + .../com/gxwebsoft/oa/param/TaskParam.java | 145 ++ .../gxwebsoft/oa/param/TaskRecordParam.java | 75 + .../com/gxwebsoft/oa/param/TaskUserParam.java | 45 + .../com/gxwebsoft/oa/service/AppService.java | 45 + .../gxwebsoft/oa/service/AppUserService.java | 42 + .../gxwebsoft/oa/service/AssetsService.java | 42 + .../oa/service/AssetsUserService.java | 42 + .../gxwebsoft/oa/service/CustomerService.java | 43 + .../gxwebsoft/oa/service/NoticeService.java | 51 + .../gxwebsoft/oa/service/ProjectService.java | 42 + .../oa/service/TaskRecordService.java | 42 + .../com/gxwebsoft/oa/service/TaskService.java | 47 + .../gxwebsoft/oa/service/TaskUserService.java | 42 + .../oa/service/impl/AppServiceImpl.java | 52 + .../oa/service/impl/AppUserServiceImpl.java | 47 + .../oa/service/impl/AssetsServiceImpl.java | 47 + .../service/impl/AssetsUserServiceImpl.java | 47 + .../oa/service/impl/CustomerServiceImpl.java | 52 + .../oa/service/impl/NoticeServiceImpl.java | 109 + .../oa/service/impl/ProjectServiceImpl.java | 47 + .../service/impl/TaskRecordServiceImpl.java | 49 + .../oa/service/impl/TaskServiceImpl.java | 141 ++ .../oa/service/impl/TaskUserServiceImpl.java | 47 + .../open/controller/OpenAlipayController.java | 182 ++ .../open/controller/OpenAppController.java | 169 ++ .../controller/OpenAppUserController.java | 155 ++ .../controller/OpenAppstoreController.java | 60 + .../controller/OpenBcAgentController.java | 123 + .../open/controller/OpenBcController.java | 481 ++++ .../controller/OpenBcTemporaryController.java | 129 ++ .../open/controller/OpenCartController.java | 137 ++ .../controller/OpenCategoryController.java | 129 ++ .../controller/OpenChatGptController.java | 112 + .../open/controller/OpenDictController.java | 155 ++ .../controller/OpenDictDataController.java | 133 ++ .../controller/OpenDictionaryController.java | 155 ++ .../OpenDictionaryDataController.java | 133 ++ .../open/controller/OpenDocsController.java | 133 ++ .../controller/OpenEquipmentController.java | 353 +++ .../open/controller/OpenFileController.java | 301 +++ .../open/controller/OpenGoodsController.java | 184 ++ .../open/controller/OpenMainController.java | 911 ++++++++ .../open/controller/OpenMarketController.java | 125 + .../controller/OpenMerchantController.java | 180 ++ .../open/controller/OpenNoticeController.java | 133 ++ .../open/controller/OpenOrderController.java | 323 +++ .../controller/OpenOrderGoodsController.java | 202 ++ .../controller/OpenSettingController.java | 39 + .../open/controller/OpenTaskController.java | 190 ++ .../controller/OpenTaskRecordController.java | 148 ++ .../open/controller/OpenTenantController.java | 1265 ++++++++++ .../open/controller/OpenUserController.java | 44 + .../controller/OpenUserOrderController.java | 87 + .../controller/OpenWxOfficialController.java | 166 ++ .../open/controller/OpenWxWorkController.java | 182 ++ .../gxwebsoft/open/controller/VerifyTxt.java | 19 + .../com/gxwebsoft/open/entity/WxWork.java | 24 + .../gxwebsoft/shop/config/ExpressConfig.java | 25 + .../gxwebsoft/shop/config/WxPayConfig.java | 35 + .../shop/constants/OrderConstants.java | 14 + .../shop/controller/CartController.java | 148 ++ .../shop/controller/CategoryController.java | 141 ++ .../shop/controller/CommentController.java | 139 ++ .../shop/controller/CouponController.java | 139 ++ .../shop/controller/ExpressController.java | 139 ++ .../shop/controller/GoodsController.java | 138 ++ .../controller/GoodsServiceController.java | 139 ++ .../shop/controller/MemberController.java | 139 ++ .../controller/MerchantClerkController.java | 147 ++ .../shop/controller/MerchantController.java | 214 ++ .../MerchantWithdrawController.java | 130 ++ .../controller/OrderAddressController.java | 140 ++ .../shop/controller/OrderController.java | 360 +++ .../shop/controller/OrderGoodsController.java | 133 ++ .../OrderRefundAddressController.java | 139 ++ .../controller/OrderRefundController.java | 151 ++ .../shop/controller/OrderRenewController.java | 140 ++ .../shop/controller/PaymentController.java | 539 +++++ .../controller/PaymentTemplateController.java | 134 ++ .../controller/PaymentTradeController.java | 140 ++ .../controller/RechargeOrderController.java | 200 ++ .../RechargeOrderPlanController.java | 140 ++ .../controller/RechargePlanController.java | 140 ++ .../shop/controller/SfExpressController.java | 21 + .../shop/controller/TestController.java | 24 + .../controller/UserAddressController.java | 139 ++ .../controller/UserBalanceLogController.java | 137 ++ .../controller/UserCommentController.java | 136 ++ .../shop/controller/UserCouponController.java | 139 ++ .../controller/UserFeedbackController.java | 132 ++ .../shop/controller/UserFollowController.java | 180 ++ .../shop/controller/UserGradeController.java | 125 + .../controller/UserGradeLogController.java | 122 + .../shop/controller/UserLikeController.java | 185 ++ .../shop/controller/UserLookController.java | 161 ++ .../shop/controller/UserOauthController.java | 127 ++ .../controller/UserPointsLogController.java | 139 ++ .../controller/UserRefereeController.java | 150 ++ .../shop/controller/WxPayController.java | 25 + .../java/com/gxwebsoft/shop/entity/Cart.java | 76 + .../com/gxwebsoft/shop/entity/Category.java | 70 + .../com/gxwebsoft/shop/entity/Comment.java | 76 + .../com/gxwebsoft/shop/entity/Coupon.java | 104 + .../com/gxwebsoft/shop/entity/Express.java | 70 + .../java/com/gxwebsoft/shop/entity/Goods.java | 195 ++ .../gxwebsoft/shop/entity/GoodsService.java | 71 + .../com/gxwebsoft/shop/entity/Member.java | 50 + .../com/gxwebsoft/shop/entity/Merchant.java | 216 ++ .../gxwebsoft/shop/entity/MerchantClerk.java | 57 + .../shop/entity/MerchantWithdraw.java | 110 + .../java/com/gxwebsoft/shop/entity/Order.java | 261 +++ .../gxwebsoft/shop/entity/OrderAddress.java | 81 + .../com/gxwebsoft/shop/entity/OrderGoods.java | 200 ++ .../gxwebsoft/shop/entity/OrderRefund.java | 117 + .../shop/entity/OrderRefundAddress.java | 82 + .../com/gxwebsoft/shop/entity/OrderRenew.java | 77 + .../com/gxwebsoft/shop/entity/Payment.java | 72 + .../shop/entity/PaymentTemplate.java | 75 + .../gxwebsoft/shop/entity/PaymentTrade.java | 91 + .../gxwebsoft/shop/entity/RechargeOrder.java | 112 + .../shop/entity/RechargeOrderPlan.java | 80 + .../gxwebsoft/shop/entity/RechargePlan.java | 74 + .../gxwebsoft/shop/entity/UserAddress.java | 76 + .../gxwebsoft/shop/entity/UserBalanceLog.java | 81 + .../gxwebsoft/shop/entity/UserComment.java | 144 ++ .../com/gxwebsoft/shop/entity/UserCoupon.java | 100 + .../gxwebsoft/shop/entity/UserFeedback.java | 70 + .../com/gxwebsoft/shop/entity/UserFollow.java | 91 + .../com/gxwebsoft/shop/entity/UserGrade.java | 72 + .../gxwebsoft/shop/entity/UserGradeLog.java | 72 + .../com/gxwebsoft/shop/entity/UserLike.java | 78 + .../com/gxwebsoft/shop/entity/UserLook.java | 61 + .../com/gxwebsoft/shop/entity/UserOauth.java | 69 + .../gxwebsoft/shop/entity/UserPointsLog.java | 66 + .../gxwebsoft/shop/entity/UserReferee.java | 107 + .../com/gxwebsoft/shop/mapper/CartMapper.java | 37 + .../gxwebsoft/shop/mapper/CategoryMapper.java | 37 + .../gxwebsoft/shop/mapper/CommentMapper.java | 37 + .../gxwebsoft/shop/mapper/CouponMapper.java | 37 + .../gxwebsoft/shop/mapper/ExpressMapper.java | 37 + .../gxwebsoft/shop/mapper/GoodsMapper.java | 37 + .../shop/mapper/GoodsServiceMapper.java | 37 + .../gxwebsoft/shop/mapper/MemberMapper.java | 37 + .../shop/mapper/MerchantClerkMapper.java | 37 + .../gxwebsoft/shop/mapper/MerchantMapper.java | 37 + .../shop/mapper/MerchantWithdrawMapper.java | 37 + .../shop/mapper/OrderAddressMapper.java | 37 + .../shop/mapper/OrderGoodsMapper.java | 48 + .../gxwebsoft/shop/mapper/OrderMapper.java | 59 + .../shop/mapper/OrderRefundAddressMapper.java | 37 + .../shop/mapper/OrderRefundMapper.java | 37 + .../shop/mapper/OrderRenewMapper.java | 37 + .../gxwebsoft/shop/mapper/PaymentMapper.java | 37 + .../shop/mapper/PaymentTemplateMapper.java | 37 + .../shop/mapper/PaymentTradeMapper.java | 37 + .../shop/mapper/RechargeOrderMapper.java | 37 + .../shop/mapper/RechargeOrderPlanMapper.java | 37 + .../shop/mapper/RechargePlanMapper.java | 37 + .../shop/mapper/UserAddressMapper.java | 37 + .../shop/mapper/UserBalanceLogMapper.java | 37 + .../shop/mapper/UserCommentMapper.java | 37 + .../shop/mapper/UserCouponMapper.java | 37 + .../shop/mapper/UserFeedbackMapper.java | 37 + .../shop/mapper/UserFollowMapper.java | 37 + .../shop/mapper/UserGradeLogMapper.java | 37 + .../shop/mapper/UserGradeMapper.java | 37 + .../gxwebsoft/shop/mapper/UserLikeMapper.java | 37 + .../gxwebsoft/shop/mapper/UserLookMapper.java | 37 + .../shop/mapper/UserOauthMapper.java | 47 + .../shop/mapper/UserPointsLogMapper.java | 37 + .../shop/mapper/UserRefereeMapper.java | 37 + .../gxwebsoft/shop/mapper/xml/CartMapper.xml | 59 + .../shop/mapper/xml/CategoryMapper.xml | 59 + .../shop/mapper/xml/CommentMapper.xml | 68 + .../shop/mapper/xml/CouponMapper.xml | 95 + .../shop/mapper/xml/ExpressMapper.xml | 62 + .../gxwebsoft/shop/mapper/xml/GoodsMapper.xml | 168 ++ .../shop/mapper/xml/GoodsServiceMapper.xml | 62 + .../shop/mapper/xml/MemberMapper.xml | 61 + .../shop/mapper/xml/MerchantClerkMapper.xml | 46 + .../shop/mapper/xml/MerchantMapper.xml | 150 ++ .../mapper/xml/MerchantWithdrawMapper.xml | 100 + .../shop/mapper/xml/OrderAddressMapper.xml | 74 + .../shop/mapper/xml/OrderGoodsMapper.xml | 219 ++ .../gxwebsoft/shop/mapper/xml/OrderMapper.xml | 224 ++ .../mapper/xml/OrderRefundAddressMapper.xml | 74 + .../shop/mapper/xml/OrderRefundMapper.xml | 95 + .../shop/mapper/xml/OrderRenewMapper.xml | 68 + .../shop/mapper/xml/PaymentMapper.xml | 62 + .../shop/mapper/xml/PaymentTemplateMapper.xml | 68 + .../shop/mapper/xml/PaymentTradeMapper.xml | 83 + .../shop/mapper/xml/RechargeOrderMapper.xml | 101 + .../mapper/xml/RechargeOrderPlanMapper.xml | 71 + .../shop/mapper/xml/RechargePlanMapper.xml | 65 + .../shop/mapper/xml/UserAddressMapper.xml | 68 + .../shop/mapper/xml/UserBalanceLogMapper.xml | 84 + .../shop/mapper/xml/UserCommentMapper.xml | 71 + .../shop/mapper/xml/UserCouponMapper.xml | 92 + .../shop/mapper/xml/UserFeedbackMapper.xml | 66 + .../shop/mapper/xml/UserFollowMapper.xml | 60 + .../shop/mapper/xml/UserGradeLogMapper.xml | 65 + .../shop/mapper/xml/UserGradeMapper.xml | 69 + .../shop/mapper/xml/UserLikeMapper.xml | 73 + .../shop/mapper/xml/UserLookMapper.xml | 57 + .../shop/mapper/xml/UserOauthMapper.xml | 75 + .../shop/mapper/xml/UserPointsLogMapper.xml | 59 + .../shop/mapper/xml/UserRefereeMapper.xml | 78 + .../com/gxwebsoft/shop/param/CartParam.java | 107 + .../gxwebsoft/shop/param/CategoryParam.java | 63 + .../gxwebsoft/shop/param/CommentParam.java | 71 + .../com/gxwebsoft/shop/param/CouponParam.java | 107 + .../gxwebsoft/shop/param/ExpressParam.java | 61 + .../com/gxwebsoft/shop/param/GoodsParam.java | 200 ++ .../shop/param/GoodsServiceParam.java | 62 + .../com/gxwebsoft/shop/param/MemberParam.java | 61 + .../shop/param/MerchantClerkParam.java | 44 + .../gxwebsoft/shop/param/MerchantParam.java | 163 ++ .../shop/param/MerchantWithdrawParam.java | 100 + .../shop/param/OrderAddressParam.java | 76 + .../gxwebsoft/shop/param/OrderGoodsParam.java | 228 ++ .../com/gxwebsoft/shop/param/OrderParam.java | 244 ++ .../shop/param/OrderRefundAddressParam.java | 76 + .../shop/param/OrderRefundParam.java | 101 + .../gxwebsoft/shop/param/OrderRenewParam.java | 73 + .../gxwebsoft/shop/param/PaymentParam.java | 64 + .../shop/param/PaymentTemplateParam.java | 67 + .../shop/param/PaymentTradeParam.java | 85 + .../shop/param/RechargeOrderParam.java | 114 + .../shop/param/RechargeOrderPlanParam.java | 76 + .../shop/param/RechargePlanParam.java | 68 + .../shop/param/UserAddressParam.java | 69 + .../shop/param/UserBalanceLogParam.java | 77 + .../shop/param/UserCommentParam.java | 79 + .../gxwebsoft/shop/param/UserCouponParam.java | 104 + .../shop/param/UserFeedbackParam.java | 54 + .../gxwebsoft/shop/param/UserFollowParam.java | 59 + .../shop/param/UserGradeLogParam.java | 66 + .../gxwebsoft/shop/param/UserGradeParam.java | 63 + .../gxwebsoft/shop/param/UserLikeParam.java | 62 + .../gxwebsoft/shop/param/UserLookParam.java | 52 + .../gxwebsoft/shop/param/UserOauthParam.java | 63 + .../shop/param/UserPointsLogParam.java | 58 + .../shop/param/UserRefereeParam.java | 80 + .../gxwebsoft/shop/service/CartService.java | 42 + .../shop/service/CategoryService.java | 42 + .../shop/service/CommentService.java | 42 + .../gxwebsoft/shop/service/CouponService.java | 42 + .../shop/service/ExpressService.java | 42 + .../gxwebsoft/shop/service/GoodsService.java | 42 + .../shop/service/GoodsServiceService.java | 42 + .../gxwebsoft/shop/service/MemberService.java | 42 + .../shop/service/MerchantClerkService.java | 47 + .../shop/service/MerchantService.java | 54 + .../shop/service/MerchantWithdrawService.java | 42 + .../shop/service/OrderAddressService.java | 42 + .../shop/service/OrderGoodsService.java | 45 + .../service/OrderRefundAddressService.java | 42 + .../shop/service/OrderRefundService.java | 42 + .../shop/service/OrderRenewService.java | 42 + .../gxwebsoft/shop/service/OrderService.java | 62 + .../shop/service/PaymentService.java | 50 + .../shop/service/PaymentTemplateService.java | 42 + .../shop/service/PaymentTradeService.java | 42 + .../service/RechargeOrderPlanService.java | 42 + .../shop/service/RechargeOrderService.java | 43 + .../shop/service/RechargePlanService.java | 42 + .../gxwebsoft/shop/service/TestService.java | 7 + .../shop/service/UserAddressService.java | 42 + .../shop/service/UserBalanceLogService.java | 42 + .../shop/service/UserCommentService.java | 42 + .../shop/service/UserCouponService.java | 42 + .../shop/service/UserFeedbackService.java | 42 + .../shop/service/UserFollowService.java | 42 + .../shop/service/UserGradeLogService.java | 42 + .../shop/service/UserGradeService.java | 42 + .../shop/service/UserLikeService.java | 42 + .../shop/service/UserLookService.java | 42 + .../shop/service/UserOauthService.java | 60 + .../shop/service/UserPointsLogService.java | 42 + .../shop/service/UserRefereeService.java | 42 + .../shop/service/impl/CartServiceImpl.java | 47 + .../service/impl/CategoryServiceImpl.java | 47 + .../shop/service/impl/CommentServiceImpl.java | 47 + .../shop/service/impl/CouponServiceImpl.java | 47 + .../shop/service/impl/ExpressServiceImpl.java | 48 + .../shop/service/impl/GoodsServiceImpl.java | 47 + .../service/impl/GoodsServiceServiceImpl.java | 47 + .../shop/service/impl/MemberServiceImpl.java | 72 + .../impl/MerchantClerkServiceImpl.java | 75 + .../service/impl/MerchantServiceImpl.java | 145 ++ .../impl/MerchantWithdrawServiceImpl.java | 47 + .../service/impl/OrderAddressServiceImpl.java | 47 + .../service/impl/OrderGoodsServiceImpl.java | 56 + .../impl/OrderRefundAddressServiceImpl.java | 47 + .../service/impl/OrderRefundServiceImpl.java | 47 + .../service/impl/OrderRenewServiceImpl.java | 47 + .../shop/service/impl/OrderServiceImpl.java | 249 ++ .../shop/service/impl/PaymentServiceImpl.java | 65 + .../impl/PaymentTemplateServiceImpl.java | 47 + .../service/impl/PaymentTradeServiceImpl.java | 47 + .../impl/RechargeOrderPlanServiceImpl.java | 47 + .../impl/RechargeOrderServiceImpl.java | 52 + .../service/impl/RechargePlanServiceImpl.java | 47 + .../shop/service/impl/TestServiceImpl.java | 12 + .../service/impl/UserAddressServiceImpl.java | 47 + .../impl/UserBalanceLogServiceImpl.java | 47 + .../service/impl/UserCommentServiceImpl.java | 65 + .../service/impl/UserCouponServiceImpl.java | 47 + .../service/impl/UserFeedbackServiceImpl.java | 47 + .../service/impl/UserFollowServiceImpl.java | 66 + .../service/impl/UserGradeLogServiceImpl.java | 47 + .../service/impl/UserGradeServiceImpl.java | 47 + .../service/impl/UserLikeServiceImpl.java | 48 + .../service/impl/UserLookServiceImpl.java | 47 + .../service/impl/UserOauthServiceImpl.java | 90 + .../impl/UserPointsLogServiceImpl.java | 47 + .../service/impl/UserRefereeServiceImpl.java | 47 + .../controller/TowerAccessoryController.java | 132 ++ .../controller/TowerEquipmentController.java | 141 ++ .../controller/TowerModelController.java | 128 ++ .../controller/TowerPlaceController.java | 157 ++ .../TowerPlaceSafetyController.java | 135 ++ .../TowerPlaceStandardController.java | 129 ++ .../controller/TowerProjectController.java | 180 ++ .../TowerProjectOrderController.java | 128 ++ .../TowerProjectPlaceController.java | 130 ++ .../TowerProjectUserController.java | 130 ++ .../controller/TowerWarehouseController.java | 132 ++ .../tower/entity/TowerAccessory.java | 110 + .../tower/entity/TowerEquipment.java | 160 ++ .../gxwebsoft/tower/entity/TowerModel.java | 70 + .../gxwebsoft/tower/entity/TowerPlace.java | 85 + .../tower/entity/TowerPlaceSafety.java | 82 + .../tower/entity/TowerPlaceStandard.java | 47 + .../gxwebsoft/tower/entity/TowerProject.java | 130 ++ .../tower/entity/TowerProjectOrder.java | 87 + .../tower/entity/TowerProjectPlace.java | 60 + .../tower/entity/TowerProjectUser.java | 72 + .../tower/entity/TowerWarehouse.java | 88 + .../tower/mapper/TowerAccessoryMapper.java | 37 + .../tower/mapper/TowerEquipmentMapper.java | 37 + .../tower/mapper/TowerModelMapper.java | 37 + .../tower/mapper/TowerPlaceMapper.java | 37 + .../tower/mapper/TowerPlaceSafetyMapper.java | 37 + .../mapper/TowerPlaceStandardMapper.java | 37 + .../tower/mapper/TowerProjectMapper.java | 37 + .../tower/mapper/TowerProjectOrderMapper.java | 37 + .../tower/mapper/TowerProjectPlaceMapper.java | 37 + .../tower/mapper/TowerProjectUserMapper.java | 37 + .../tower/mapper/TowerWarehouseMapper.java | 37 + .../tower/mapper/xml/TowerAccessoryMapper.xml | 96 + .../tower/mapper/xml/TowerEquipmentMapper.xml | 115 + .../tower/mapper/xml/TowerModelMapper.xml | 71 + .../tower/mapper/xml/TowerPlaceMapper.xml | 83 + .../mapper/xml/TowerPlaceSafetyMapper.xml | 77 + .../mapper/xml/TowerPlaceStandardMapper.xml | 44 + .../tower/mapper/xml/TowerProjectMapper.xml | 104 + .../mapper/xml/TowerProjectOrderMapper.xml | 77 + .../mapper/xml/TowerProjectPlaceMapper.xml | 50 + .../mapper/xml/TowerProjectUserMapper.xml | 53 + .../tower/mapper/xml/TowerWarehouseMapper.xml | 87 + .../tower/param/TowerAccessoryParam.java | 90 + .../tower/param/TowerEquipmentParam.java | 110 + .../tower/param/TowerModelParam.java | 64 + .../tower/param/TowerPlaceParam.java | 81 + .../tower/param/TowerPlaceSafetyParam.java | 76 + .../tower/param/TowerPlaceStandardParam.java | 42 + .../tower/param/TowerProjectOrderParam.java | 87 + .../tower/param/TowerProjectParam.java | 128 ++ .../tower/param/TowerProjectPlaceParam.java | 54 + .../tower/param/TowerProjectUserParam.java | 66 + .../tower/param/TowerWarehouseParam.java | 77 + .../tower/service/TowerAccessoryService.java | 42 + .../tower/service/TowerEquipmentService.java | 42 + .../tower/service/TowerModelService.java | 42 + .../service/TowerPlaceSafetyService.java | 42 + .../tower/service/TowerPlaceService.java | 42 + .../service/TowerPlaceStandardService.java | 42 + .../service/TowerProjectOrderService.java | 42 + .../service/TowerProjectPlaceService.java | 42 + .../tower/service/TowerProjectService.java | 42 + .../service/TowerProjectUserService.java | 42 + .../tower/service/TowerWarehouseService.java | 42 + .../impl/TowerAccessoryServiceImpl.java | 47 + .../impl/TowerEquipmentServiceImpl.java | 47 + .../service/impl/TowerModelServiceImpl.java | 47 + .../impl/TowerPlaceSafetyServiceImpl.java | 47 + .../service/impl/TowerPlaceServiceImpl.java | 47 + .../impl/TowerPlaceStandardServiceImpl.java | 47 + .../impl/TowerProjectOrderServiceImpl.java | 47 + .../impl/TowerProjectPlaceServiceImpl.java | 47 + .../service/impl/TowerProjectServiceImpl.java | 47 + .../impl/TowerProjectUserServiceImpl.java | 47 + .../impl/TowerWarehouseServiceImpl.java | 47 + .../com/qq/weixin/mp/aes/AesException.java | 59 + .../java/com/qq/weixin/mp/aes/ByteGroup.java | 26 + .../java/com/qq/weixin/mp/aes/JsonParse.java | 65 + .../com/qq/weixin/mp/aes/PKCS7Encoder.java | 67 + src/main/java/com/qq/weixin/mp/aes/SHA1.java | 61 + .../qq/weixin/mp/aes/WXBizJsonMsgCrypt.java | 289 +++ src/main/java/lib/commons-codec-1.9.jar | Bin 0 -> 263965 bytes src/main/java/lib/json-20200518.jar | Bin 0 -> 65966 bytes ...itional-spring-configuration-metadata.json | 53 + src/main/resources/alipay-sandbox.properties | 20 + src/main/resources/application-dev.yml | 28 + src/main/resources/application-jimei.yml | 36 + src/main/resources/application-prod.yml | 36 + src/main/resources/application-test.yml | 38 + src/main/resources/application.yml | 103 + src/main/resources/cert/alipayPublicCert.crt | 38 + src/main/resources/cert/alipayRootCert.crt | 88 + src/main/resources/cert/appPublicCert.crt | 19 + src/main/resources/express.properties | 4 + src/main/resources/mp-alipay.properties | 32 + src/main/resources/wxpay.properties | 20 + src/test/java/com/gxwebsoft/RedisTest.java | 30 + src/test/java/com/gxwebsoft/TestMain.java | 283 +++ .../gxwebsoft/WebSoftApplicationTests.java | 13 + .../gxwebsoft/generator/AppsGenerator.java | 189 ++ .../com/gxwebsoft/generator/CmsGenerator.java | 178 ++ .../gxwebsoft/generator/CodeGenerator.java | 167 ++ .../gxwebsoft/generator/HouseGenerator.java | 166 ++ .../gxwebsoft/generator/LoveGenerator.java | 173 ++ .../com/gxwebsoft/generator/OaGenerator.java | 180 ++ .../gxwebsoft/generator/ShopGenerator.java | 209 ++ .../com/gxwebsoft/generator/SysGenerator.java | 175 ++ .../gxwebsoft/generator/TowerGenerator.java | 176 ++ .../engine/BeetlTemplateEnginePlus.java | 50 + .../generator/templates/controller.java.btl | 283 +++ .../generator/templates/entity.java.btl | 158 ++ .../generator/templates/mapper.java.btl | 41 + .../generator/templates/mapper.xml.btl | 96 + .../generator/templates/param.java.btl | 146 ++ .../generator/templates/service.java.btl | 55 + .../generator/templates/serviceImpl.java.btl | 62 + 1035 files changed, 91911 insertions(+) create mode 100644 .DS_Store create mode 100644 .gitignore create mode 100644 .mvn/wrapper/MavenWrapperDownloader.java create mode 100644 .mvn/wrapper/maven-wrapper.jar create mode 100644 .mvn/wrapper/maven-wrapper.properties create mode 100644 README.md create mode 100644 hs_err_pid31091.log create mode 100644 mvnw create mode 100644 mvnw.cmd create mode 100644 pom.xml create mode 100644 src/.DS_Store create mode 100644 src/main/.DS_Store create mode 100644 src/main/java/.DS_Store create mode 100644 src/main/java/com/.DS_Store create mode 100644 src/main/java/com/gxwebsoft/.DS_Store create mode 100644 src/main/java/com/gxwebsoft/WebSoftApplication.java create mode 100644 src/main/java/com/gxwebsoft/apps/constants/EquipmentConstants.java create mode 100644 src/main/java/com/gxwebsoft/apps/constants/HualalaConstants.java create mode 100644 src/main/java/com/gxwebsoft/apps/constants/SfExpressConstants.java create mode 100644 src/main/java/com/gxwebsoft/apps/controller/BcAgentController.java create mode 100644 src/main/java/com/gxwebsoft/apps/controller/BcCartController.java create mode 100644 src/main/java/com/gxwebsoft/apps/controller/BcCookbookController.java create mode 100644 src/main/java/com/gxwebsoft/apps/controller/BcEquipmentController.java create mode 100644 src/main/java/com/gxwebsoft/apps/controller/BcExportController.java create mode 100644 src/main/java/com/gxwebsoft/apps/controller/BcFoodController.java create mode 100644 src/main/java/com/gxwebsoft/apps/controller/BcPlanController.java create mode 100644 src/main/java/com/gxwebsoft/apps/controller/BcStatisticsController.java create mode 100644 src/main/java/com/gxwebsoft/apps/controller/BcTemporaryController.java create mode 100644 src/main/java/com/gxwebsoft/apps/controller/CashierController.java create mode 100644 src/main/java/com/gxwebsoft/apps/controller/EquipmentAlarmController.java create mode 100644 src/main/java/com/gxwebsoft/apps/controller/EquipmentController.java create mode 100644 src/main/java/com/gxwebsoft/apps/controller/EquipmentFaultController.java create mode 100644 src/main/java/com/gxwebsoft/apps/controller/EquipmentGoodsController.java create mode 100644 src/main/java/com/gxwebsoft/apps/controller/EquipmentOrderController.java create mode 100644 src/main/java/com/gxwebsoft/apps/controller/EquipmentOrderGoodsController.java create mode 100644 src/main/java/com/gxwebsoft/apps/controller/EquipmentRecordController.java create mode 100644 src/main/java/com/gxwebsoft/apps/controller/HualalaCardBenefitsController.java create mode 100644 src/main/java/com/gxwebsoft/apps/controller/HualalaCardController.java create mode 100644 src/main/java/com/gxwebsoft/apps/controller/HualalaCart.java create mode 100644 src/main/java/com/gxwebsoft/apps/controller/HualalaCartFoodController.java create mode 100644 src/main/java/com/gxwebsoft/apps/controller/HualalaController.java create mode 100644 src/main/java/com/gxwebsoft/apps/controller/HualalaFoodCategoryController.java create mode 100644 src/main/java/com/gxwebsoft/apps/controller/HualalaFoodController.java create mode 100644 src/main/java/com/gxwebsoft/apps/controller/HualalaShopController.java create mode 100644 src/main/java/com/gxwebsoft/apps/controller/LinkController.java create mode 100644 src/main/java/com/gxwebsoft/apps/controller/SfExpress.java create mode 100644 src/main/java/com/gxwebsoft/apps/controller/TestDataController.java create mode 100644 src/main/java/com/gxwebsoft/apps/entity/BcAgent.java create mode 100644 src/main/java/com/gxwebsoft/apps/entity/BcCart.java create mode 100644 src/main/java/com/gxwebsoft/apps/entity/BcCookbook.java create mode 100644 src/main/java/com/gxwebsoft/apps/entity/BcEquipment.java create mode 100644 src/main/java/com/gxwebsoft/apps/entity/BcExport.java create mode 100644 src/main/java/com/gxwebsoft/apps/entity/BcFood.java create mode 100644 src/main/java/com/gxwebsoft/apps/entity/BcPlan.java create mode 100644 src/main/java/com/gxwebsoft/apps/entity/BcTemporary.java create mode 100644 src/main/java/com/gxwebsoft/apps/entity/Cashier.java create mode 100644 src/main/java/com/gxwebsoft/apps/entity/Equipment.java create mode 100644 src/main/java/com/gxwebsoft/apps/entity/EquipmentAlarm.java create mode 100644 src/main/java/com/gxwebsoft/apps/entity/EquipmentFault.java create mode 100644 src/main/java/com/gxwebsoft/apps/entity/EquipmentGoods.java create mode 100644 src/main/java/com/gxwebsoft/apps/entity/EquipmentOrder.java create mode 100644 src/main/java/com/gxwebsoft/apps/entity/EquipmentOrderGoods.java create mode 100644 src/main/java/com/gxwebsoft/apps/entity/EquipmentRecord.java create mode 100644 src/main/java/com/gxwebsoft/apps/entity/Hualala.java create mode 100644 src/main/java/com/gxwebsoft/apps/entity/HualalaCard.java create mode 100644 src/main/java/com/gxwebsoft/apps/entity/HualalaCardBenefits.java create mode 100644 src/main/java/com/gxwebsoft/apps/entity/HualalaCart.java create mode 100644 src/main/java/com/gxwebsoft/apps/entity/HualalaCartFood.java create mode 100644 src/main/java/com/gxwebsoft/apps/entity/HualalaFood.java create mode 100644 src/main/java/com/gxwebsoft/apps/entity/HualalaFoodCategory.java create mode 100644 src/main/java/com/gxwebsoft/apps/entity/HualalaShop.java create mode 100644 src/main/java/com/gxwebsoft/apps/entity/ItemVo.java create mode 100644 src/main/java/com/gxwebsoft/apps/entity/Link.java create mode 100644 src/main/java/com/gxwebsoft/apps/entity/TestData.java create mode 100644 src/main/java/com/gxwebsoft/apps/mapper/BcAgentMapper.java create mode 100644 src/main/java/com/gxwebsoft/apps/mapper/BcCookbookMapper.java create mode 100644 src/main/java/com/gxwebsoft/apps/mapper/BcEquipmentMapper.java create mode 100644 src/main/java/com/gxwebsoft/apps/mapper/BcExportMapper.java create mode 100644 src/main/java/com/gxwebsoft/apps/mapper/BcFoodMapper.java create mode 100644 src/main/java/com/gxwebsoft/apps/mapper/BcPlanMapper.java create mode 100644 src/main/java/com/gxwebsoft/apps/mapper/BcTemporaryMapper.java create mode 100644 src/main/java/com/gxwebsoft/apps/mapper/CashierMapper.java create mode 100644 src/main/java/com/gxwebsoft/apps/mapper/EquipmentAlarmMapper.java create mode 100644 src/main/java/com/gxwebsoft/apps/mapper/EquipmentFaultMapper.java create mode 100644 src/main/java/com/gxwebsoft/apps/mapper/EquipmentGoodsMapper.java create mode 100644 src/main/java/com/gxwebsoft/apps/mapper/EquipmentMapper.java create mode 100644 src/main/java/com/gxwebsoft/apps/mapper/EquipmentOrderGoodsMapper.java create mode 100644 src/main/java/com/gxwebsoft/apps/mapper/EquipmentOrderMapper.java create mode 100644 src/main/java/com/gxwebsoft/apps/mapper/EquipmentRecordMapper.java create mode 100644 src/main/java/com/gxwebsoft/apps/mapper/HualalaCardBenefitsMapper.java create mode 100644 src/main/java/com/gxwebsoft/apps/mapper/HualalaCardMapper.java create mode 100644 src/main/java/com/gxwebsoft/apps/mapper/HualalaCartFoodMapper.java create mode 100644 src/main/java/com/gxwebsoft/apps/mapper/HualalaFoodCategoryMapper.java create mode 100644 src/main/java/com/gxwebsoft/apps/mapper/HualalaFoodMapper.java create mode 100644 src/main/java/com/gxwebsoft/apps/mapper/HualalaMapper.java create mode 100644 src/main/java/com/gxwebsoft/apps/mapper/HualalaShopMapper.java create mode 100644 src/main/java/com/gxwebsoft/apps/mapper/LinkMapper.java create mode 100644 src/main/java/com/gxwebsoft/apps/mapper/TestDataMapper.java create mode 100644 src/main/java/com/gxwebsoft/apps/mapper/xml/BcAgentMapper.xml create mode 100644 src/main/java/com/gxwebsoft/apps/mapper/xml/BcCookbookMapper.xml create mode 100644 src/main/java/com/gxwebsoft/apps/mapper/xml/BcEquipmentMapper.xml create mode 100644 src/main/java/com/gxwebsoft/apps/mapper/xml/BcExportMapper.xml create mode 100644 src/main/java/com/gxwebsoft/apps/mapper/xml/BcFoodMapper.xml create mode 100644 src/main/java/com/gxwebsoft/apps/mapper/xml/BcPlanMapper.xml create mode 100644 src/main/java/com/gxwebsoft/apps/mapper/xml/BcTemporaryMapper.xml create mode 100644 src/main/java/com/gxwebsoft/apps/mapper/xml/CashierMapper.xml create mode 100644 src/main/java/com/gxwebsoft/apps/mapper/xml/EquipmentAlarmMapper.xml create mode 100644 src/main/java/com/gxwebsoft/apps/mapper/xml/EquipmentFaultMapper.xml create mode 100644 src/main/java/com/gxwebsoft/apps/mapper/xml/EquipmentGoodsMapper.xml create mode 100644 src/main/java/com/gxwebsoft/apps/mapper/xml/EquipmentMapper.xml create mode 100644 src/main/java/com/gxwebsoft/apps/mapper/xml/EquipmentOrderGoodsMapper.xml create mode 100644 src/main/java/com/gxwebsoft/apps/mapper/xml/EquipmentOrderMapper.xml create mode 100644 src/main/java/com/gxwebsoft/apps/mapper/xml/EquipmentRecordMapper.xml create mode 100644 src/main/java/com/gxwebsoft/apps/mapper/xml/HualalaCardBenefitsMapper.xml create mode 100644 src/main/java/com/gxwebsoft/apps/mapper/xml/HualalaCardMapper.xml create mode 100644 src/main/java/com/gxwebsoft/apps/mapper/xml/HualalaCartFoodMapper.xml create mode 100644 src/main/java/com/gxwebsoft/apps/mapper/xml/HualalaFoodCategoryMapper.xml create mode 100644 src/main/java/com/gxwebsoft/apps/mapper/xml/HualalaFoodMapper.xml create mode 100644 src/main/java/com/gxwebsoft/apps/mapper/xml/HualalaMapper.xml create mode 100644 src/main/java/com/gxwebsoft/apps/mapper/xml/HualalaShopMapper.xml create mode 100644 src/main/java/com/gxwebsoft/apps/mapper/xml/LinkMapper.xml create mode 100644 src/main/java/com/gxwebsoft/apps/mapper/xml/TestDataMapper.xml create mode 100644 src/main/java/com/gxwebsoft/apps/param/BcAgentParam.java create mode 100644 src/main/java/com/gxwebsoft/apps/param/BcCookbookParam.java create mode 100644 src/main/java/com/gxwebsoft/apps/param/BcEquipmentParam.java create mode 100644 src/main/java/com/gxwebsoft/apps/param/BcExportParam.java create mode 100644 src/main/java/com/gxwebsoft/apps/param/BcFoodParam.java create mode 100644 src/main/java/com/gxwebsoft/apps/param/BcPlanParam.java create mode 100644 src/main/java/com/gxwebsoft/apps/param/BcTemporaryParam.java create mode 100644 src/main/java/com/gxwebsoft/apps/param/CashierParam.java create mode 100644 src/main/java/com/gxwebsoft/apps/param/EquipmentAlarmParam.java create mode 100644 src/main/java/com/gxwebsoft/apps/param/EquipmentFaultParam.java create mode 100644 src/main/java/com/gxwebsoft/apps/param/EquipmentGoodsParam.java create mode 100644 src/main/java/com/gxwebsoft/apps/param/EquipmentOrderGoodsParam.java create mode 100644 src/main/java/com/gxwebsoft/apps/param/EquipmentOrderParam.java create mode 100644 src/main/java/com/gxwebsoft/apps/param/EquipmentParam.java create mode 100644 src/main/java/com/gxwebsoft/apps/param/EquipmentRecordParam.java create mode 100644 src/main/java/com/gxwebsoft/apps/param/HualalaCardBenefitsParam.java create mode 100644 src/main/java/com/gxwebsoft/apps/param/HualalaCardParam.java create mode 100644 src/main/java/com/gxwebsoft/apps/param/HualalaCartFoodParam.java create mode 100644 src/main/java/com/gxwebsoft/apps/param/HualalaFoodCategoryParam.java create mode 100644 src/main/java/com/gxwebsoft/apps/param/HualalaFoodParam.java create mode 100644 src/main/java/com/gxwebsoft/apps/param/HualalaParam.java create mode 100644 src/main/java/com/gxwebsoft/apps/param/HualalaShopParam.java create mode 100644 src/main/java/com/gxwebsoft/apps/param/HxzParam.java create mode 100644 src/main/java/com/gxwebsoft/apps/param/LinkParam.java create mode 100644 src/main/java/com/gxwebsoft/apps/param/TestDataParam.java create mode 100644 src/main/java/com/gxwebsoft/apps/result/AllShopResult.java create mode 100644 src/main/java/com/gxwebsoft/apps/result/CartResult.java create mode 100644 src/main/java/com/gxwebsoft/apps/result/FoodCategoryResult.java create mode 100644 src/main/java/com/gxwebsoft/apps/result/OpenFoodResult.java create mode 100644 src/main/java/com/gxwebsoft/apps/result/OperateVo.java create mode 100644 src/main/java/com/gxwebsoft/apps/result/ShopBaseInfoResult.java create mode 100644 src/main/java/com/gxwebsoft/apps/service/BcAgentService.java create mode 100644 src/main/java/com/gxwebsoft/apps/service/BcCookbookService.java create mode 100644 src/main/java/com/gxwebsoft/apps/service/BcEquipmentService.java create mode 100644 src/main/java/com/gxwebsoft/apps/service/BcExportService.java create mode 100644 src/main/java/com/gxwebsoft/apps/service/BcFoodService.java create mode 100644 src/main/java/com/gxwebsoft/apps/service/BcPlanService.java create mode 100644 src/main/java/com/gxwebsoft/apps/service/BcTemporaryService.java create mode 100644 src/main/java/com/gxwebsoft/apps/service/CashierService.java create mode 100644 src/main/java/com/gxwebsoft/apps/service/EquipmentAlarmService.java create mode 100644 src/main/java/com/gxwebsoft/apps/service/EquipmentFaultService.java create mode 100644 src/main/java/com/gxwebsoft/apps/service/EquipmentGoodsService.java create mode 100644 src/main/java/com/gxwebsoft/apps/service/EquipmentOrderGoodsService.java create mode 100644 src/main/java/com/gxwebsoft/apps/service/EquipmentOrderService.java create mode 100644 src/main/java/com/gxwebsoft/apps/service/EquipmentRecordService.java create mode 100644 src/main/java/com/gxwebsoft/apps/service/EquipmentService.java create mode 100644 src/main/java/com/gxwebsoft/apps/service/HualalaCardBenefitsService.java create mode 100644 src/main/java/com/gxwebsoft/apps/service/HualalaCardService.java create mode 100644 src/main/java/com/gxwebsoft/apps/service/HualalaCartFoodService.java create mode 100644 src/main/java/com/gxwebsoft/apps/service/HualalaFoodCategoryService.java create mode 100644 src/main/java/com/gxwebsoft/apps/service/HualalaFoodService.java create mode 100644 src/main/java/com/gxwebsoft/apps/service/HualalaService.java create mode 100644 src/main/java/com/gxwebsoft/apps/service/HualalaShopService.java create mode 100644 src/main/java/com/gxwebsoft/apps/service/LinkService.java create mode 100644 src/main/java/com/gxwebsoft/apps/service/TestDataService.java create mode 100644 src/main/java/com/gxwebsoft/apps/service/impl/BcAgentServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/apps/service/impl/BcCookbookServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/apps/service/impl/BcEquipmentServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/apps/service/impl/BcExportServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/apps/service/impl/BcFoodServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/apps/service/impl/BcPlanServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/apps/service/impl/BcTemporaryServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/apps/service/impl/CashierServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/apps/service/impl/EquipmentAlarmServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/apps/service/impl/EquipmentFaultServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/apps/service/impl/EquipmentGoodsServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/apps/service/impl/EquipmentOrderGoodsServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/apps/service/impl/EquipmentOrderServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/apps/service/impl/EquipmentRecordServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/apps/service/impl/EquipmentServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/apps/service/impl/HualalaCardBenefitsServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/apps/service/impl/HualalaCardServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/apps/service/impl/HualalaCartFoodServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/apps/service/impl/HualalaFoodCategoryServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/apps/service/impl/HualalaFoodServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/apps/service/impl/HualalaServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/apps/service/impl/HualalaShopServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/apps/service/impl/LinkServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/apps/service/impl/TestDataServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/apps/utils/BcUtil.java create mode 100644 src/main/java/com/gxwebsoft/cms/controller/ArticleCategoryController.java create mode 100644 src/main/java/com/gxwebsoft/cms/controller/ArticleCommentController.java create mode 100644 src/main/java/com/gxwebsoft/cms/controller/ArticleController.java create mode 100644 src/main/java/com/gxwebsoft/cms/controller/ArticleLikeController.java create mode 100644 src/main/java/com/gxwebsoft/cms/controller/DocsController.java create mode 100644 src/main/java/com/gxwebsoft/cms/entity/Article.java create mode 100644 src/main/java/com/gxwebsoft/cms/entity/ArticleCategory.java create mode 100644 src/main/java/com/gxwebsoft/cms/entity/ArticleComment.java create mode 100644 src/main/java/com/gxwebsoft/cms/entity/ArticleLike.java create mode 100644 src/main/java/com/gxwebsoft/cms/entity/Docs.java create mode 100644 src/main/java/com/gxwebsoft/cms/mapper/ArticleCategoryMapper.java create mode 100644 src/main/java/com/gxwebsoft/cms/mapper/ArticleCommentMapper.java create mode 100644 src/main/java/com/gxwebsoft/cms/mapper/ArticleLikeMapper.java create mode 100644 src/main/java/com/gxwebsoft/cms/mapper/ArticleMapper.java create mode 100644 src/main/java/com/gxwebsoft/cms/mapper/DocsMapper.java create mode 100644 src/main/java/com/gxwebsoft/cms/mapper/xml/ArticleCategoryMapper.xml create mode 100644 src/main/java/com/gxwebsoft/cms/mapper/xml/ArticleCommentMapper.xml create mode 100644 src/main/java/com/gxwebsoft/cms/mapper/xml/ArticleLikeMapper.xml create mode 100644 src/main/java/com/gxwebsoft/cms/mapper/xml/ArticleMapper.xml create mode 100644 src/main/java/com/gxwebsoft/cms/mapper/xml/DocsMapper.xml create mode 100644 src/main/java/com/gxwebsoft/cms/param/ArticleCategoryParam.java create mode 100644 src/main/java/com/gxwebsoft/cms/param/ArticleCommentParam.java create mode 100644 src/main/java/com/gxwebsoft/cms/param/ArticleLikeParam.java create mode 100644 src/main/java/com/gxwebsoft/cms/param/ArticleParam.java create mode 100644 src/main/java/com/gxwebsoft/cms/param/DocsParam.java create mode 100644 src/main/java/com/gxwebsoft/cms/service/ArticleCategoryService.java create mode 100644 src/main/java/com/gxwebsoft/cms/service/ArticleCommentService.java create mode 100644 src/main/java/com/gxwebsoft/cms/service/ArticleLikeService.java create mode 100644 src/main/java/com/gxwebsoft/cms/service/ArticleService.java create mode 100644 src/main/java/com/gxwebsoft/cms/service/DocsService.java create mode 100644 src/main/java/com/gxwebsoft/cms/service/impl/ArticleCategoryServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/cms/service/impl/ArticleCommentServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/cms/service/impl/ArticleLikeServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/cms/service/impl/ArticleServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/cms/service/impl/DocsServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/common/.DS_Store create mode 100644 src/main/java/com/gxwebsoft/common/core/Constants.java create mode 100644 src/main/java/com/gxwebsoft/common/core/annotation/OperationLog.java create mode 100644 src/main/java/com/gxwebsoft/common/core/annotation/OperationModule.java create mode 100644 src/main/java/com/gxwebsoft/common/core/annotation/QueryField.java create mode 100644 src/main/java/com/gxwebsoft/common/core/annotation/QueryType.java create mode 100644 src/main/java/com/gxwebsoft/common/core/aspect/OperationLogAspect.java create mode 100644 src/main/java/com/gxwebsoft/common/core/config/ConfigProperties.java create mode 100644 src/main/java/com/gxwebsoft/common/core/config/HttpMessageConverter.java create mode 100644 src/main/java/com/gxwebsoft/common/core/config/MybatisPlusConfig.java create mode 100644 src/main/java/com/gxwebsoft/common/core/config/RestTemplateConfig.java create mode 100644 src/main/java/com/gxwebsoft/common/core/config/SpringContextUtil.java create mode 100644 src/main/java/com/gxwebsoft/common/core/config/SwaggerConfig.java create mode 100644 src/main/java/com/gxwebsoft/common/core/config/WebMvcConfig.java create mode 100644 src/main/java/com/gxwebsoft/common/core/constants/BalanceConstants.java create mode 100644 src/main/java/com/gxwebsoft/common/core/constants/OrderConstants.java create mode 100644 src/main/java/com/gxwebsoft/common/core/constants/ProfitConstants.java create mode 100644 src/main/java/com/gxwebsoft/common/core/constants/RedisConstants.java create mode 100644 src/main/java/com/gxwebsoft/common/core/constants/WxOfficialConstants.java create mode 100644 src/main/java/com/gxwebsoft/common/core/exception/BusinessException.java create mode 100644 src/main/java/com/gxwebsoft/common/core/exception/GlobalExceptionHandler.java create mode 100644 src/main/java/com/gxwebsoft/common/core/security/JwtAccessDeniedHandler.java create mode 100644 src/main/java/com/gxwebsoft/common/core/security/JwtAuthenticationEntryPoint.java create mode 100644 src/main/java/com/gxwebsoft/common/core/security/JwtAuthenticationFilter.java create mode 100644 src/main/java/com/gxwebsoft/common/core/security/JwtSubject.java create mode 100644 src/main/java/com/gxwebsoft/common/core/security/JwtUtil.java create mode 100644 src/main/java/com/gxwebsoft/common/core/security/SecurityConfig.java create mode 100644 src/main/java/com/gxwebsoft/common/core/utils/AlipayConfigUtil.java create mode 100644 src/main/java/com/gxwebsoft/common/core/utils/BtUtil.java create mode 100644 src/main/java/com/gxwebsoft/common/core/utils/CacheClient.java create mode 100644 src/main/java/com/gxwebsoft/common/core/utils/CommonUtil.java create mode 100644 src/main/java/com/gxwebsoft/common/core/utils/FileServerUtil.java create mode 100644 src/main/java/com/gxwebsoft/common/core/utils/HttpUtils.java create mode 100644 src/main/java/com/gxwebsoft/common/core/utils/ImageUtil.java create mode 100644 src/main/java/com/gxwebsoft/common/core/utils/JChardetFacadeUtil.java create mode 100644 src/main/java/com/gxwebsoft/common/core/utils/JSONUtil.java create mode 100644 src/main/java/com/gxwebsoft/common/core/utils/MyQrCodeUtil.java create mode 100644 src/main/java/com/gxwebsoft/common/core/utils/OpenOfficeUtil.java create mode 100644 src/main/java/com/gxwebsoft/common/core/utils/RedisUtil.java create mode 100644 src/main/java/com/gxwebsoft/common/core/utils/SchedulingUtil.java create mode 100644 src/main/java/com/gxwebsoft/common/core/utils/SignCheckUtil.java create mode 100644 src/main/java/com/gxwebsoft/common/core/utils/WxOfficialUtil.java create mode 100644 src/main/java/com/gxwebsoft/common/core/utils/WxUtil.java create mode 100644 src/main/java/com/gxwebsoft/common/core/utils/WxWorkUtil.java create mode 100644 src/main/java/com/gxwebsoft/common/core/web/ApiResult.java create mode 100644 src/main/java/com/gxwebsoft/common/core/web/BaseController.java create mode 100644 src/main/java/com/gxwebsoft/common/core/web/BaseParam.java create mode 100644 src/main/java/com/gxwebsoft/common/core/web/BatchParam.java create mode 100644 src/main/java/com/gxwebsoft/common/core/web/ExistenceParam.java create mode 100644 src/main/java/com/gxwebsoft/common/core/web/PageParam.java create mode 100644 src/main/java/com/gxwebsoft/common/core/web/PageResult.java create mode 100644 src/main/java/com/gxwebsoft/common/system/controller/AccessKeyController.java create mode 100644 src/main/java/com/gxwebsoft/common/system/controller/AliOssController.java create mode 100644 src/main/java/com/gxwebsoft/common/system/controller/CacheController.java create mode 100644 src/main/java/com/gxwebsoft/common/system/controller/CompanyController.java create mode 100644 src/main/java/com/gxwebsoft/common/system/controller/DictController.java create mode 100644 src/main/java/com/gxwebsoft/common/system/controller/DictDataController.java create mode 100644 src/main/java/com/gxwebsoft/common/system/controller/DictionaryController.java create mode 100644 src/main/java/com/gxwebsoft/common/system/controller/DictionaryDataController.java create mode 100644 src/main/java/com/gxwebsoft/common/system/controller/EmailController.java create mode 100644 src/main/java/com/gxwebsoft/common/system/controller/FileController.java create mode 100644 src/main/java/com/gxwebsoft/common/system/controller/FilePreviewController.java create mode 100644 src/main/java/com/gxwebsoft/common/system/controller/LoginRecordController.java create mode 100644 src/main/java/com/gxwebsoft/common/system/controller/MainController.java create mode 100644 src/main/java/com/gxwebsoft/common/system/controller/MenuController.java create mode 100644 src/main/java/com/gxwebsoft/common/system/controller/OperationRecordController.java create mode 100644 src/main/java/com/gxwebsoft/common/system/controller/OrganizationController.java create mode 100644 src/main/java/com/gxwebsoft/common/system/controller/PlugController.java create mode 100644 src/main/java/com/gxwebsoft/common/system/controller/RedisUtilController.java create mode 100644 src/main/java/com/gxwebsoft/common/system/controller/RoleController.java create mode 100644 src/main/java/com/gxwebsoft/common/system/controller/RoleMenuController.java create mode 100644 src/main/java/com/gxwebsoft/common/system/controller/SettingController.java create mode 100644 src/main/java/com/gxwebsoft/common/system/controller/TenantController.java create mode 100644 src/main/java/com/gxwebsoft/common/system/controller/UserController.java create mode 100644 src/main/java/com/gxwebsoft/common/system/controller/UserFileController.java create mode 100644 src/main/java/com/gxwebsoft/common/system/controller/WxLoginController.java create mode 100644 src/main/java/com/gxwebsoft/common/system/entity/AccessKey.java create mode 100644 src/main/java/com/gxwebsoft/common/system/entity/Cache.java create mode 100644 src/main/java/com/gxwebsoft/common/system/entity/Company.java create mode 100644 src/main/java/com/gxwebsoft/common/system/entity/Dict.java create mode 100644 src/main/java/com/gxwebsoft/common/system/entity/DictData.java create mode 100644 src/main/java/com/gxwebsoft/common/system/entity/Dictionary.java create mode 100644 src/main/java/com/gxwebsoft/common/system/entity/DictionaryData.java create mode 100644 src/main/java/com/gxwebsoft/common/system/entity/EmailRecord.java create mode 100644 src/main/java/com/gxwebsoft/common/system/entity/FileRecord.java create mode 100644 src/main/java/com/gxwebsoft/common/system/entity/KVEntity.java create mode 100644 src/main/java/com/gxwebsoft/common/system/entity/LoginRecord.java create mode 100644 src/main/java/com/gxwebsoft/common/system/entity/Menu.java create mode 100644 src/main/java/com/gxwebsoft/common/system/entity/OperationRecord.java create mode 100644 src/main/java/com/gxwebsoft/common/system/entity/Organization.java create mode 100644 src/main/java/com/gxwebsoft/common/system/entity/Plug.java create mode 100644 src/main/java/com/gxwebsoft/common/system/entity/Role.java create mode 100644 src/main/java/com/gxwebsoft/common/system/entity/RoleMenu.java create mode 100644 src/main/java/com/gxwebsoft/common/system/entity/Setting.java create mode 100644 src/main/java/com/gxwebsoft/common/system/entity/Tenant.java create mode 100644 src/main/java/com/gxwebsoft/common/system/entity/User.java create mode 100644 src/main/java/com/gxwebsoft/common/system/entity/UserFile.java create mode 100644 src/main/java/com/gxwebsoft/common/system/entity/UserRole.java create mode 100644 src/main/java/com/gxwebsoft/common/system/mapper/AccessKeyMapper.java create mode 100644 src/main/java/com/gxwebsoft/common/system/mapper/CompanyMapper.java create mode 100644 src/main/java/com/gxwebsoft/common/system/mapper/DictDataMapper.java create mode 100644 src/main/java/com/gxwebsoft/common/system/mapper/DictMapper.java create mode 100644 src/main/java/com/gxwebsoft/common/system/mapper/DictionaryDataMapper.java create mode 100644 src/main/java/com/gxwebsoft/common/system/mapper/DictionaryMapper.java create mode 100644 src/main/java/com/gxwebsoft/common/system/mapper/EmailRecordMapper.java create mode 100644 src/main/java/com/gxwebsoft/common/system/mapper/FileRecordMapper.java create mode 100644 src/main/java/com/gxwebsoft/common/system/mapper/LoginRecordMapper.java create mode 100644 src/main/java/com/gxwebsoft/common/system/mapper/MenuMapper.java create mode 100644 src/main/java/com/gxwebsoft/common/system/mapper/OperationRecordMapper.java create mode 100644 src/main/java/com/gxwebsoft/common/system/mapper/OrganizationMapper.java create mode 100644 src/main/java/com/gxwebsoft/common/system/mapper/PlugMapper.java create mode 100644 src/main/java/com/gxwebsoft/common/system/mapper/RoleMapper.java create mode 100644 src/main/java/com/gxwebsoft/common/system/mapper/RoleMenuMapper.java create mode 100644 src/main/java/com/gxwebsoft/common/system/mapper/SettingMapper.java create mode 100644 src/main/java/com/gxwebsoft/common/system/mapper/TenantMapper.java create mode 100644 src/main/java/com/gxwebsoft/common/system/mapper/UserFileMapper.java create mode 100644 src/main/java/com/gxwebsoft/common/system/mapper/UserMapper.java create mode 100644 src/main/java/com/gxwebsoft/common/system/mapper/UserRoleMapper.java create mode 100644 src/main/java/com/gxwebsoft/common/system/mapper/xml/AccessKeyMapper.xml create mode 100644 src/main/java/com/gxwebsoft/common/system/mapper/xml/CompanyMapper.xml create mode 100644 src/main/java/com/gxwebsoft/common/system/mapper/xml/DictDataMapper.xml create mode 100644 src/main/java/com/gxwebsoft/common/system/mapper/xml/DictMapper.xml create mode 100644 src/main/java/com/gxwebsoft/common/system/mapper/xml/DictionaryDataMapper.xml create mode 100644 src/main/java/com/gxwebsoft/common/system/mapper/xml/DictionaryMapper.xml create mode 100644 src/main/java/com/gxwebsoft/common/system/mapper/xml/EmailRecordMapper.xml create mode 100644 src/main/java/com/gxwebsoft/common/system/mapper/xml/FileRecordMapper.xml create mode 100644 src/main/java/com/gxwebsoft/common/system/mapper/xml/LoginRecordMapper.xml create mode 100644 src/main/java/com/gxwebsoft/common/system/mapper/xml/MenuMapper.xml create mode 100644 src/main/java/com/gxwebsoft/common/system/mapper/xml/OperationRecordMapper.xml create mode 100644 src/main/java/com/gxwebsoft/common/system/mapper/xml/OrganizationMapper.xml create mode 100644 src/main/java/com/gxwebsoft/common/system/mapper/xml/PlugMapper.xml create mode 100644 src/main/java/com/gxwebsoft/common/system/mapper/xml/RoleMapper.xml create mode 100644 src/main/java/com/gxwebsoft/common/system/mapper/xml/RoleMenuMapper.xml create mode 100644 src/main/java/com/gxwebsoft/common/system/mapper/xml/SettingMapper.xml create mode 100644 src/main/java/com/gxwebsoft/common/system/mapper/xml/TenantMapper.xml create mode 100644 src/main/java/com/gxwebsoft/common/system/mapper/xml/UserFileMapper.xml create mode 100644 src/main/java/com/gxwebsoft/common/system/mapper/xml/UserMapper.xml create mode 100644 src/main/java/com/gxwebsoft/common/system/mapper/xml/UserRoleMapper.xml create mode 100644 src/main/java/com/gxwebsoft/common/system/param/AccessKeyParam.java create mode 100644 src/main/java/com/gxwebsoft/common/system/param/AlipayParam.java create mode 100644 src/main/java/com/gxwebsoft/common/system/param/CacheParam.java create mode 100644 src/main/java/com/gxwebsoft/common/system/param/CompanyParam.java create mode 100644 src/main/java/com/gxwebsoft/common/system/param/DictDataParam.java create mode 100644 src/main/java/com/gxwebsoft/common/system/param/DictParam.java create mode 100644 src/main/java/com/gxwebsoft/common/system/param/DictionaryDataParam.java create mode 100644 src/main/java/com/gxwebsoft/common/system/param/DictionaryParam.java create mode 100644 src/main/java/com/gxwebsoft/common/system/param/FileRecordParam.java create mode 100644 src/main/java/com/gxwebsoft/common/system/param/LoginParam.java create mode 100644 src/main/java/com/gxwebsoft/common/system/param/LoginRecordParam.java create mode 100644 src/main/java/com/gxwebsoft/common/system/param/MenuParam.java create mode 100644 src/main/java/com/gxwebsoft/common/system/param/OperationRecordParam.java create mode 100644 src/main/java/com/gxwebsoft/common/system/param/OrganizationParam.java create mode 100644 src/main/java/com/gxwebsoft/common/system/param/PlugParam.java create mode 100644 src/main/java/com/gxwebsoft/common/system/param/RoleParam.java create mode 100644 src/main/java/com/gxwebsoft/common/system/param/SettingParam.java create mode 100644 src/main/java/com/gxwebsoft/common/system/param/SmsCaptchaParam.java create mode 100644 src/main/java/com/gxwebsoft/common/system/param/TenantParam.java create mode 100644 src/main/java/com/gxwebsoft/common/system/param/UpdatePasswordParam.java create mode 100644 src/main/java/com/gxwebsoft/common/system/param/UserFileParam.java create mode 100644 src/main/java/com/gxwebsoft/common/system/param/UserImportParam.java create mode 100644 src/main/java/com/gxwebsoft/common/system/param/UserParam.java create mode 100644 src/main/java/com/gxwebsoft/common/system/result/CaptchaResult.java create mode 100644 src/main/java/com/gxwebsoft/common/system/result/LoginResult.java create mode 100644 src/main/java/com/gxwebsoft/common/system/result/RedisResult.java create mode 100644 src/main/java/com/gxwebsoft/common/system/result/SmsCaptchaResult.java create mode 100644 src/main/java/com/gxwebsoft/common/system/service/AccessKeyService.java create mode 100644 src/main/java/com/gxwebsoft/common/system/service/AlipayService.java create mode 100644 src/main/java/com/gxwebsoft/common/system/service/CompanyService.java create mode 100644 src/main/java/com/gxwebsoft/common/system/service/DictDataService.java create mode 100644 src/main/java/com/gxwebsoft/common/system/service/DictService.java create mode 100644 src/main/java/com/gxwebsoft/common/system/service/DictionaryDataService.java create mode 100644 src/main/java/com/gxwebsoft/common/system/service/DictionaryService.java create mode 100644 src/main/java/com/gxwebsoft/common/system/service/EmailRecordService.java create mode 100644 src/main/java/com/gxwebsoft/common/system/service/FileRecordService.java create mode 100644 src/main/java/com/gxwebsoft/common/system/service/LoginRecordService.java create mode 100644 src/main/java/com/gxwebsoft/common/system/service/MenuService.java create mode 100644 src/main/java/com/gxwebsoft/common/system/service/OperationRecordService.java create mode 100644 src/main/java/com/gxwebsoft/common/system/service/OrganizationService.java create mode 100644 src/main/java/com/gxwebsoft/common/system/service/PlugService.java create mode 100644 src/main/java/com/gxwebsoft/common/system/service/RoleMenuService.java create mode 100644 src/main/java/com/gxwebsoft/common/system/service/RoleService.java create mode 100644 src/main/java/com/gxwebsoft/common/system/service/SettingService.java create mode 100644 src/main/java/com/gxwebsoft/common/system/service/TenantService.java create mode 100644 src/main/java/com/gxwebsoft/common/system/service/UserFileService.java create mode 100644 src/main/java/com/gxwebsoft/common/system/service/UserRoleService.java create mode 100644 src/main/java/com/gxwebsoft/common/system/service/UserService.java create mode 100644 src/main/java/com/gxwebsoft/common/system/service/impl/AccessKeyServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/common/system/service/impl/CompanyServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/common/system/service/impl/DictDataServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/common/system/service/impl/DictServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/common/system/service/impl/DictionaryDataServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/common/system/service/impl/DictionaryServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/common/system/service/impl/EmailRecordServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/common/system/service/impl/FileRecordServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/common/system/service/impl/LoginRecordServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/common/system/service/impl/MenuServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/common/system/service/impl/OperationRecordServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/common/system/service/impl/OrganizationServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/common/system/service/impl/PlugServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/common/system/service/impl/RoleMenuServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/common/system/service/impl/RoleServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/common/system/service/impl/SettingServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/common/system/service/impl/TenantServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/common/system/service/impl/UserFileServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/common/system/service/impl/UserRoleServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/common/system/service/impl/UserServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/house/controller/InfoController.java create mode 100644 src/main/java/com/gxwebsoft/house/controller/LikeLogController.java create mode 100644 src/main/java/com/gxwebsoft/house/controller/ReservationController.java create mode 100644 src/main/java/com/gxwebsoft/house/controller/ViewsLogController.java create mode 100644 src/main/java/com/gxwebsoft/house/entity/Info.java create mode 100644 src/main/java/com/gxwebsoft/house/entity/LikeLog.java create mode 100644 src/main/java/com/gxwebsoft/house/entity/Reservation.java create mode 100644 src/main/java/com/gxwebsoft/house/entity/ViewsLog.java create mode 100644 src/main/java/com/gxwebsoft/house/mapper/InfoMapper.java create mode 100644 src/main/java/com/gxwebsoft/house/mapper/LikeLogMapper.java create mode 100644 src/main/java/com/gxwebsoft/house/mapper/ReservationMapper.java create mode 100644 src/main/java/com/gxwebsoft/house/mapper/ViewsLogMapper.java create mode 100644 src/main/java/com/gxwebsoft/house/mapper/xml/InfoMapper.xml create mode 100644 src/main/java/com/gxwebsoft/house/mapper/xml/LikeLogMapper.xml create mode 100644 src/main/java/com/gxwebsoft/house/mapper/xml/ReservationMapper.xml create mode 100644 src/main/java/com/gxwebsoft/house/mapper/xml/ViewsLogMapper.xml create mode 100644 src/main/java/com/gxwebsoft/house/param/InfoParam.java create mode 100644 src/main/java/com/gxwebsoft/house/param/LikeLogParam.java create mode 100644 src/main/java/com/gxwebsoft/house/param/ReservationParam.java create mode 100644 src/main/java/com/gxwebsoft/house/param/ViewsLogParam.java create mode 100644 src/main/java/com/gxwebsoft/house/service/InfoService.java create mode 100644 src/main/java/com/gxwebsoft/house/service/LikeLogService.java create mode 100644 src/main/java/com/gxwebsoft/house/service/ReservationService.java create mode 100644 src/main/java/com/gxwebsoft/house/service/ViewsLogService.java create mode 100644 src/main/java/com/gxwebsoft/house/service/impl/InfoServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/house/service/impl/LikeLogServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/house/service/impl/ReservationServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/house/service/impl/ViewsLogServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/love/controller/CertificateController.java create mode 100644 src/main/java/com/gxwebsoft/love/controller/ChatConversationController.java create mode 100644 src/main/java/com/gxwebsoft/love/controller/ChatMessageController.java create mode 100644 src/main/java/com/gxwebsoft/love/controller/ProfitController.java create mode 100644 src/main/java/com/gxwebsoft/love/controller/UserPlanController.java create mode 100644 src/main/java/com/gxwebsoft/love/controller/UserPlanEquityController.java create mode 100644 src/main/java/com/gxwebsoft/love/controller/UserPlanIconController.java create mode 100644 src/main/java/com/gxwebsoft/love/controller/UserPlanLogController.java create mode 100644 src/main/java/com/gxwebsoft/love/controller/UserPlanPriceController.java create mode 100644 src/main/java/com/gxwebsoft/love/controller/UserProfileController.java create mode 100644 src/main/java/com/gxwebsoft/love/entity/Certificate.java create mode 100644 src/main/java/com/gxwebsoft/love/entity/ChatConversation.java create mode 100644 src/main/java/com/gxwebsoft/love/entity/ChatMessage.java create mode 100644 src/main/java/com/gxwebsoft/love/entity/Profit.java create mode 100644 src/main/java/com/gxwebsoft/love/entity/UserPlan.java create mode 100644 src/main/java/com/gxwebsoft/love/entity/UserPlanEquity.java create mode 100644 src/main/java/com/gxwebsoft/love/entity/UserPlanIcon.java create mode 100644 src/main/java/com/gxwebsoft/love/entity/UserPlanLog.java create mode 100644 src/main/java/com/gxwebsoft/love/entity/UserPlanPrice.java create mode 100644 src/main/java/com/gxwebsoft/love/entity/UserProfile.java create mode 100644 src/main/java/com/gxwebsoft/love/enums/ChatMessageType.java create mode 100644 src/main/java/com/gxwebsoft/love/mapper/CertificateMapper.java create mode 100644 src/main/java/com/gxwebsoft/love/mapper/ChatConversationMapper.java create mode 100644 src/main/java/com/gxwebsoft/love/mapper/ChatMessageMapper.java create mode 100644 src/main/java/com/gxwebsoft/love/mapper/ProfitMapper.java create mode 100644 src/main/java/com/gxwebsoft/love/mapper/UserPlanEquityMapper.java create mode 100644 src/main/java/com/gxwebsoft/love/mapper/UserPlanIconMapper.java create mode 100644 src/main/java/com/gxwebsoft/love/mapper/UserPlanLogMapper.java create mode 100644 src/main/java/com/gxwebsoft/love/mapper/UserPlanMapper.java create mode 100644 src/main/java/com/gxwebsoft/love/mapper/UserPlanPriceMapper.java create mode 100644 src/main/java/com/gxwebsoft/love/mapper/UserProfileMapper.java create mode 100644 src/main/java/com/gxwebsoft/love/mapper/xml/CertificateMapper.xml create mode 100644 src/main/java/com/gxwebsoft/love/mapper/xml/ChatConversationMapper.xml create mode 100644 src/main/java/com/gxwebsoft/love/mapper/xml/ChatMessageMapper.xml create mode 100644 src/main/java/com/gxwebsoft/love/mapper/xml/ProfitMapper.xml create mode 100644 src/main/java/com/gxwebsoft/love/mapper/xml/UserPlanEquityMapper.xml create mode 100644 src/main/java/com/gxwebsoft/love/mapper/xml/UserPlanIconMapper.xml create mode 100644 src/main/java/com/gxwebsoft/love/mapper/xml/UserPlanLogMapper.xml create mode 100644 src/main/java/com/gxwebsoft/love/mapper/xml/UserPlanMapper.xml create mode 100644 src/main/java/com/gxwebsoft/love/mapper/xml/UserPlanPriceMapper.xml create mode 100644 src/main/java/com/gxwebsoft/love/mapper/xml/UserProfileMapper.xml create mode 100644 src/main/java/com/gxwebsoft/love/param/CertificateParam.java create mode 100644 src/main/java/com/gxwebsoft/love/param/ChatConversationParam.java create mode 100644 src/main/java/com/gxwebsoft/love/param/ChatMessageParam.java create mode 100644 src/main/java/com/gxwebsoft/love/param/ProfitParam.java create mode 100644 src/main/java/com/gxwebsoft/love/param/UserPlanEquityParam.java create mode 100644 src/main/java/com/gxwebsoft/love/param/UserPlanIconParam.java create mode 100644 src/main/java/com/gxwebsoft/love/param/UserPlanLogParam.java create mode 100644 src/main/java/com/gxwebsoft/love/param/UserPlanParam.java create mode 100644 src/main/java/com/gxwebsoft/love/param/UserPlanPriceParam.java create mode 100644 src/main/java/com/gxwebsoft/love/param/UserProfileParam.java create mode 100644 src/main/java/com/gxwebsoft/love/service/CertificateService.java create mode 100644 src/main/java/com/gxwebsoft/love/service/ChatConversationService.java create mode 100644 src/main/java/com/gxwebsoft/love/service/ChatMessageService.java create mode 100644 src/main/java/com/gxwebsoft/love/service/ProfitService.java create mode 100644 src/main/java/com/gxwebsoft/love/service/UserPlanEquityService.java create mode 100644 src/main/java/com/gxwebsoft/love/service/UserPlanIconService.java create mode 100644 src/main/java/com/gxwebsoft/love/service/UserPlanLogService.java create mode 100644 src/main/java/com/gxwebsoft/love/service/UserPlanPriceService.java create mode 100644 src/main/java/com/gxwebsoft/love/service/UserPlanService.java create mode 100644 src/main/java/com/gxwebsoft/love/service/UserProfileService.java create mode 100644 src/main/java/com/gxwebsoft/love/service/impl/CertificateServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/love/service/impl/ChatConversationServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/love/service/impl/ChatMessageServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/love/service/impl/ProfitServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/love/service/impl/UserPlanEquityServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/love/service/impl/UserPlanIconServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/love/service/impl/UserPlanLogServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/love/service/impl/UserPlanPriceServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/love/service/impl/UserPlanServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/love/service/impl/UserProfileServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/love/socketio/cache/ClientCache.java create mode 100644 src/main/java/com/gxwebsoft/love/socketio/config/SocketIOConfig.java create mode 100644 src/main/java/com/gxwebsoft/love/socketio/handler/SocketIOHandler.java create mode 100644 src/main/java/com/gxwebsoft/love/vo/ChatConversationVO.java create mode 100644 src/main/java/com/gxwebsoft/love/vo/idcheck/BackRecognitionResult.java create mode 100644 src/main/java/com/gxwebsoft/love/vo/idcheck/FrontRecognitionResult.java create mode 100644 src/main/java/com/gxwebsoft/love/vo/idcheck/IdCardInfor.java create mode 100644 src/main/java/com/gxwebsoft/love/vo/idcheck/Response.java create mode 100644 src/main/java/com/gxwebsoft/love/vo/idcheck/VerifyResult.java create mode 100644 src/main/java/com/gxwebsoft/oa/constants/NoticeConstants.java create mode 100644 src/main/java/com/gxwebsoft/oa/constants/TaskConstants.java create mode 100644 src/main/java/com/gxwebsoft/oa/controller/AppController.java create mode 100644 src/main/java/com/gxwebsoft/oa/controller/AppUserController.java create mode 100644 src/main/java/com/gxwebsoft/oa/controller/AssetsController.java create mode 100644 src/main/java/com/gxwebsoft/oa/controller/AssetsUserController.java create mode 100644 src/main/java/com/gxwebsoft/oa/controller/CustomerController.java create mode 100644 src/main/java/com/gxwebsoft/oa/controller/NoticeController.java create mode 100644 src/main/java/com/gxwebsoft/oa/controller/ProjectController.java create mode 100644 src/main/java/com/gxwebsoft/oa/controller/TaskController.java create mode 100644 src/main/java/com/gxwebsoft/oa/controller/TaskRecordController.java create mode 100644 src/main/java/com/gxwebsoft/oa/controller/TaskUserController.java create mode 100644 src/main/java/com/gxwebsoft/oa/entity/App.java create mode 100644 src/main/java/com/gxwebsoft/oa/entity/AppUser.java create mode 100644 src/main/java/com/gxwebsoft/oa/entity/Assets.java create mode 100644 src/main/java/com/gxwebsoft/oa/entity/AssetsUser.java create mode 100644 src/main/java/com/gxwebsoft/oa/entity/Customer.java create mode 100644 src/main/java/com/gxwebsoft/oa/entity/Notice.java create mode 100644 src/main/java/com/gxwebsoft/oa/entity/Project.java create mode 100644 src/main/java/com/gxwebsoft/oa/entity/Task.java create mode 100644 src/main/java/com/gxwebsoft/oa/entity/TaskRecord.java create mode 100644 src/main/java/com/gxwebsoft/oa/entity/TaskUser.java create mode 100644 src/main/java/com/gxwebsoft/oa/mapper/AppMapper.java create mode 100644 src/main/java/com/gxwebsoft/oa/mapper/AppUserMapper.java create mode 100644 src/main/java/com/gxwebsoft/oa/mapper/AssetsMapper.java create mode 100644 src/main/java/com/gxwebsoft/oa/mapper/AssetsUserMapper.java create mode 100644 src/main/java/com/gxwebsoft/oa/mapper/CustomerMapper.java create mode 100644 src/main/java/com/gxwebsoft/oa/mapper/NoticeMapper.java create mode 100644 src/main/java/com/gxwebsoft/oa/mapper/ProjectMapper.java create mode 100644 src/main/java/com/gxwebsoft/oa/mapper/TaskMapper.java create mode 100644 src/main/java/com/gxwebsoft/oa/mapper/TaskRecordMapper.java create mode 100644 src/main/java/com/gxwebsoft/oa/mapper/TaskUserMapper.java create mode 100644 src/main/java/com/gxwebsoft/oa/mapper/xml/AppMapper.xml create mode 100644 src/main/java/com/gxwebsoft/oa/mapper/xml/AppUserMapper.xml create mode 100644 src/main/java/com/gxwebsoft/oa/mapper/xml/AssetsMapper.xml create mode 100644 src/main/java/com/gxwebsoft/oa/mapper/xml/AssetsUserMapper.xml create mode 100644 src/main/java/com/gxwebsoft/oa/mapper/xml/CustomerMapper.xml create mode 100644 src/main/java/com/gxwebsoft/oa/mapper/xml/NoticeMapper.xml create mode 100644 src/main/java/com/gxwebsoft/oa/mapper/xml/ProjectMapper.xml create mode 100644 src/main/java/com/gxwebsoft/oa/mapper/xml/TaskMapper.xml create mode 100644 src/main/java/com/gxwebsoft/oa/mapper/xml/TaskRecordMapper.xml create mode 100644 src/main/java/com/gxwebsoft/oa/mapper/xml/TaskUserMapper.xml create mode 100644 src/main/java/com/gxwebsoft/oa/param/AppParam.java create mode 100644 src/main/java/com/gxwebsoft/oa/param/AppUserParam.java create mode 100644 src/main/java/com/gxwebsoft/oa/param/AssetsParam.java create mode 100644 src/main/java/com/gxwebsoft/oa/param/AssetsUserParam.java create mode 100644 src/main/java/com/gxwebsoft/oa/param/CustomerParam.java create mode 100644 src/main/java/com/gxwebsoft/oa/param/NoticeParam.java create mode 100644 src/main/java/com/gxwebsoft/oa/param/ProjectParam.java create mode 100644 src/main/java/com/gxwebsoft/oa/param/TaskParam.java create mode 100644 src/main/java/com/gxwebsoft/oa/param/TaskRecordParam.java create mode 100644 src/main/java/com/gxwebsoft/oa/param/TaskUserParam.java create mode 100644 src/main/java/com/gxwebsoft/oa/service/AppService.java create mode 100644 src/main/java/com/gxwebsoft/oa/service/AppUserService.java create mode 100644 src/main/java/com/gxwebsoft/oa/service/AssetsService.java create mode 100644 src/main/java/com/gxwebsoft/oa/service/AssetsUserService.java create mode 100644 src/main/java/com/gxwebsoft/oa/service/CustomerService.java create mode 100644 src/main/java/com/gxwebsoft/oa/service/NoticeService.java create mode 100644 src/main/java/com/gxwebsoft/oa/service/ProjectService.java create mode 100644 src/main/java/com/gxwebsoft/oa/service/TaskRecordService.java create mode 100644 src/main/java/com/gxwebsoft/oa/service/TaskService.java create mode 100644 src/main/java/com/gxwebsoft/oa/service/TaskUserService.java create mode 100644 src/main/java/com/gxwebsoft/oa/service/impl/AppServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/oa/service/impl/AppUserServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/oa/service/impl/AssetsServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/oa/service/impl/AssetsUserServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/oa/service/impl/CustomerServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/oa/service/impl/NoticeServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/oa/service/impl/ProjectServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/oa/service/impl/TaskRecordServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/oa/service/impl/TaskServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/oa/service/impl/TaskUserServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/open/controller/OpenAlipayController.java create mode 100644 src/main/java/com/gxwebsoft/open/controller/OpenAppController.java create mode 100644 src/main/java/com/gxwebsoft/open/controller/OpenAppUserController.java create mode 100644 src/main/java/com/gxwebsoft/open/controller/OpenAppstoreController.java create mode 100644 src/main/java/com/gxwebsoft/open/controller/OpenBcAgentController.java create mode 100644 src/main/java/com/gxwebsoft/open/controller/OpenBcController.java create mode 100644 src/main/java/com/gxwebsoft/open/controller/OpenBcTemporaryController.java create mode 100644 src/main/java/com/gxwebsoft/open/controller/OpenCartController.java create mode 100644 src/main/java/com/gxwebsoft/open/controller/OpenCategoryController.java create mode 100644 src/main/java/com/gxwebsoft/open/controller/OpenChatGptController.java create mode 100644 src/main/java/com/gxwebsoft/open/controller/OpenDictController.java create mode 100644 src/main/java/com/gxwebsoft/open/controller/OpenDictDataController.java create mode 100644 src/main/java/com/gxwebsoft/open/controller/OpenDictionaryController.java create mode 100644 src/main/java/com/gxwebsoft/open/controller/OpenDictionaryDataController.java create mode 100644 src/main/java/com/gxwebsoft/open/controller/OpenDocsController.java create mode 100644 src/main/java/com/gxwebsoft/open/controller/OpenEquipmentController.java create mode 100644 src/main/java/com/gxwebsoft/open/controller/OpenFileController.java create mode 100644 src/main/java/com/gxwebsoft/open/controller/OpenGoodsController.java create mode 100644 src/main/java/com/gxwebsoft/open/controller/OpenMainController.java create mode 100644 src/main/java/com/gxwebsoft/open/controller/OpenMarketController.java create mode 100644 src/main/java/com/gxwebsoft/open/controller/OpenMerchantController.java create mode 100644 src/main/java/com/gxwebsoft/open/controller/OpenNoticeController.java create mode 100644 src/main/java/com/gxwebsoft/open/controller/OpenOrderController.java create mode 100644 src/main/java/com/gxwebsoft/open/controller/OpenOrderGoodsController.java create mode 100644 src/main/java/com/gxwebsoft/open/controller/OpenSettingController.java create mode 100644 src/main/java/com/gxwebsoft/open/controller/OpenTaskController.java create mode 100644 src/main/java/com/gxwebsoft/open/controller/OpenTaskRecordController.java create mode 100644 src/main/java/com/gxwebsoft/open/controller/OpenTenantController.java create mode 100644 src/main/java/com/gxwebsoft/open/controller/OpenUserController.java create mode 100644 src/main/java/com/gxwebsoft/open/controller/OpenUserOrderController.java create mode 100644 src/main/java/com/gxwebsoft/open/controller/OpenWxOfficialController.java create mode 100644 src/main/java/com/gxwebsoft/open/controller/OpenWxWorkController.java create mode 100644 src/main/java/com/gxwebsoft/open/controller/VerifyTxt.java create mode 100644 src/main/java/com/gxwebsoft/open/entity/WxWork.java create mode 100644 src/main/java/com/gxwebsoft/shop/config/ExpressConfig.java create mode 100644 src/main/java/com/gxwebsoft/shop/config/WxPayConfig.java create mode 100644 src/main/java/com/gxwebsoft/shop/constants/OrderConstants.java create mode 100644 src/main/java/com/gxwebsoft/shop/controller/CartController.java create mode 100644 src/main/java/com/gxwebsoft/shop/controller/CategoryController.java create mode 100644 src/main/java/com/gxwebsoft/shop/controller/CommentController.java create mode 100644 src/main/java/com/gxwebsoft/shop/controller/CouponController.java create mode 100644 src/main/java/com/gxwebsoft/shop/controller/ExpressController.java create mode 100644 src/main/java/com/gxwebsoft/shop/controller/GoodsController.java create mode 100644 src/main/java/com/gxwebsoft/shop/controller/GoodsServiceController.java create mode 100644 src/main/java/com/gxwebsoft/shop/controller/MemberController.java create mode 100644 src/main/java/com/gxwebsoft/shop/controller/MerchantClerkController.java create mode 100644 src/main/java/com/gxwebsoft/shop/controller/MerchantController.java create mode 100644 src/main/java/com/gxwebsoft/shop/controller/MerchantWithdrawController.java create mode 100644 src/main/java/com/gxwebsoft/shop/controller/OrderAddressController.java create mode 100644 src/main/java/com/gxwebsoft/shop/controller/OrderController.java create mode 100644 src/main/java/com/gxwebsoft/shop/controller/OrderGoodsController.java create mode 100644 src/main/java/com/gxwebsoft/shop/controller/OrderRefundAddressController.java create mode 100644 src/main/java/com/gxwebsoft/shop/controller/OrderRefundController.java create mode 100644 src/main/java/com/gxwebsoft/shop/controller/OrderRenewController.java create mode 100644 src/main/java/com/gxwebsoft/shop/controller/PaymentController.java create mode 100644 src/main/java/com/gxwebsoft/shop/controller/PaymentTemplateController.java create mode 100644 src/main/java/com/gxwebsoft/shop/controller/PaymentTradeController.java create mode 100644 src/main/java/com/gxwebsoft/shop/controller/RechargeOrderController.java create mode 100644 src/main/java/com/gxwebsoft/shop/controller/RechargeOrderPlanController.java create mode 100644 src/main/java/com/gxwebsoft/shop/controller/RechargePlanController.java create mode 100644 src/main/java/com/gxwebsoft/shop/controller/SfExpressController.java create mode 100644 src/main/java/com/gxwebsoft/shop/controller/TestController.java create mode 100644 src/main/java/com/gxwebsoft/shop/controller/UserAddressController.java create mode 100644 src/main/java/com/gxwebsoft/shop/controller/UserBalanceLogController.java create mode 100644 src/main/java/com/gxwebsoft/shop/controller/UserCommentController.java create mode 100644 src/main/java/com/gxwebsoft/shop/controller/UserCouponController.java create mode 100644 src/main/java/com/gxwebsoft/shop/controller/UserFeedbackController.java create mode 100644 src/main/java/com/gxwebsoft/shop/controller/UserFollowController.java create mode 100644 src/main/java/com/gxwebsoft/shop/controller/UserGradeController.java create mode 100644 src/main/java/com/gxwebsoft/shop/controller/UserGradeLogController.java create mode 100644 src/main/java/com/gxwebsoft/shop/controller/UserLikeController.java create mode 100644 src/main/java/com/gxwebsoft/shop/controller/UserLookController.java create mode 100644 src/main/java/com/gxwebsoft/shop/controller/UserOauthController.java create mode 100644 src/main/java/com/gxwebsoft/shop/controller/UserPointsLogController.java create mode 100644 src/main/java/com/gxwebsoft/shop/controller/UserRefereeController.java create mode 100644 src/main/java/com/gxwebsoft/shop/controller/WxPayController.java create mode 100644 src/main/java/com/gxwebsoft/shop/entity/Cart.java create mode 100644 src/main/java/com/gxwebsoft/shop/entity/Category.java create mode 100644 src/main/java/com/gxwebsoft/shop/entity/Comment.java create mode 100644 src/main/java/com/gxwebsoft/shop/entity/Coupon.java create mode 100644 src/main/java/com/gxwebsoft/shop/entity/Express.java create mode 100644 src/main/java/com/gxwebsoft/shop/entity/Goods.java create mode 100644 src/main/java/com/gxwebsoft/shop/entity/GoodsService.java create mode 100644 src/main/java/com/gxwebsoft/shop/entity/Member.java create mode 100644 src/main/java/com/gxwebsoft/shop/entity/Merchant.java create mode 100644 src/main/java/com/gxwebsoft/shop/entity/MerchantClerk.java create mode 100644 src/main/java/com/gxwebsoft/shop/entity/MerchantWithdraw.java create mode 100644 src/main/java/com/gxwebsoft/shop/entity/Order.java create mode 100644 src/main/java/com/gxwebsoft/shop/entity/OrderAddress.java create mode 100644 src/main/java/com/gxwebsoft/shop/entity/OrderGoods.java create mode 100644 src/main/java/com/gxwebsoft/shop/entity/OrderRefund.java create mode 100644 src/main/java/com/gxwebsoft/shop/entity/OrderRefundAddress.java create mode 100644 src/main/java/com/gxwebsoft/shop/entity/OrderRenew.java create mode 100644 src/main/java/com/gxwebsoft/shop/entity/Payment.java create mode 100644 src/main/java/com/gxwebsoft/shop/entity/PaymentTemplate.java create mode 100644 src/main/java/com/gxwebsoft/shop/entity/PaymentTrade.java create mode 100644 src/main/java/com/gxwebsoft/shop/entity/RechargeOrder.java create mode 100644 src/main/java/com/gxwebsoft/shop/entity/RechargeOrderPlan.java create mode 100644 src/main/java/com/gxwebsoft/shop/entity/RechargePlan.java create mode 100644 src/main/java/com/gxwebsoft/shop/entity/UserAddress.java create mode 100644 src/main/java/com/gxwebsoft/shop/entity/UserBalanceLog.java create mode 100644 src/main/java/com/gxwebsoft/shop/entity/UserComment.java create mode 100644 src/main/java/com/gxwebsoft/shop/entity/UserCoupon.java create mode 100644 src/main/java/com/gxwebsoft/shop/entity/UserFeedback.java create mode 100644 src/main/java/com/gxwebsoft/shop/entity/UserFollow.java create mode 100644 src/main/java/com/gxwebsoft/shop/entity/UserGrade.java create mode 100644 src/main/java/com/gxwebsoft/shop/entity/UserGradeLog.java create mode 100644 src/main/java/com/gxwebsoft/shop/entity/UserLike.java create mode 100644 src/main/java/com/gxwebsoft/shop/entity/UserLook.java create mode 100644 src/main/java/com/gxwebsoft/shop/entity/UserOauth.java create mode 100644 src/main/java/com/gxwebsoft/shop/entity/UserPointsLog.java create mode 100644 src/main/java/com/gxwebsoft/shop/entity/UserReferee.java create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/CartMapper.java create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/CategoryMapper.java create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/CommentMapper.java create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/CouponMapper.java create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/ExpressMapper.java create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/GoodsMapper.java create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/GoodsServiceMapper.java create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/MemberMapper.java create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/MerchantClerkMapper.java create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/MerchantMapper.java create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/MerchantWithdrawMapper.java create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/OrderAddressMapper.java create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/OrderGoodsMapper.java create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/OrderMapper.java create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/OrderRefundAddressMapper.java create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/OrderRefundMapper.java create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/OrderRenewMapper.java create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/PaymentMapper.java create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/PaymentTemplateMapper.java create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/PaymentTradeMapper.java create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/RechargeOrderMapper.java create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/RechargeOrderPlanMapper.java create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/RechargePlanMapper.java create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/UserAddressMapper.java create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/UserBalanceLogMapper.java create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/UserCommentMapper.java create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/UserCouponMapper.java create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/UserFeedbackMapper.java create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/UserFollowMapper.java create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/UserGradeLogMapper.java create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/UserGradeMapper.java create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/UserLikeMapper.java create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/UserLookMapper.java create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/UserOauthMapper.java create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/UserPointsLogMapper.java create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/UserRefereeMapper.java create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/xml/CartMapper.xml create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/xml/CategoryMapper.xml create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/xml/CommentMapper.xml create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/xml/CouponMapper.xml create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/xml/ExpressMapper.xml create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsMapper.xml create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsServiceMapper.xml create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/xml/MemberMapper.xml create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/xml/MerchantClerkMapper.xml create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/xml/MerchantMapper.xml create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/xml/MerchantWithdrawMapper.xml create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/xml/OrderAddressMapper.xml create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/xml/OrderGoodsMapper.xml create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/xml/OrderMapper.xml create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/xml/OrderRefundAddressMapper.xml create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/xml/OrderRefundMapper.xml create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/xml/OrderRenewMapper.xml create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/xml/PaymentMapper.xml create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/xml/PaymentTemplateMapper.xml create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/xml/PaymentTradeMapper.xml create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/xml/RechargeOrderMapper.xml create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/xml/RechargeOrderPlanMapper.xml create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/xml/RechargePlanMapper.xml create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/xml/UserAddressMapper.xml create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/xml/UserBalanceLogMapper.xml create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/xml/UserCommentMapper.xml create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/xml/UserCouponMapper.xml create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/xml/UserFeedbackMapper.xml create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/xml/UserFollowMapper.xml create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/xml/UserGradeLogMapper.xml create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/xml/UserGradeMapper.xml create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/xml/UserLikeMapper.xml create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/xml/UserLookMapper.xml create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/xml/UserOauthMapper.xml create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/xml/UserPointsLogMapper.xml create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/xml/UserRefereeMapper.xml create mode 100644 src/main/java/com/gxwebsoft/shop/param/CartParam.java create mode 100644 src/main/java/com/gxwebsoft/shop/param/CategoryParam.java create mode 100644 src/main/java/com/gxwebsoft/shop/param/CommentParam.java create mode 100644 src/main/java/com/gxwebsoft/shop/param/CouponParam.java create mode 100644 src/main/java/com/gxwebsoft/shop/param/ExpressParam.java create mode 100644 src/main/java/com/gxwebsoft/shop/param/GoodsParam.java create mode 100644 src/main/java/com/gxwebsoft/shop/param/GoodsServiceParam.java create mode 100644 src/main/java/com/gxwebsoft/shop/param/MemberParam.java create mode 100644 src/main/java/com/gxwebsoft/shop/param/MerchantClerkParam.java create mode 100644 src/main/java/com/gxwebsoft/shop/param/MerchantParam.java create mode 100644 src/main/java/com/gxwebsoft/shop/param/MerchantWithdrawParam.java create mode 100644 src/main/java/com/gxwebsoft/shop/param/OrderAddressParam.java create mode 100644 src/main/java/com/gxwebsoft/shop/param/OrderGoodsParam.java create mode 100644 src/main/java/com/gxwebsoft/shop/param/OrderParam.java create mode 100644 src/main/java/com/gxwebsoft/shop/param/OrderRefundAddressParam.java create mode 100644 src/main/java/com/gxwebsoft/shop/param/OrderRefundParam.java create mode 100644 src/main/java/com/gxwebsoft/shop/param/OrderRenewParam.java create mode 100644 src/main/java/com/gxwebsoft/shop/param/PaymentParam.java create mode 100644 src/main/java/com/gxwebsoft/shop/param/PaymentTemplateParam.java create mode 100644 src/main/java/com/gxwebsoft/shop/param/PaymentTradeParam.java create mode 100644 src/main/java/com/gxwebsoft/shop/param/RechargeOrderParam.java create mode 100644 src/main/java/com/gxwebsoft/shop/param/RechargeOrderPlanParam.java create mode 100644 src/main/java/com/gxwebsoft/shop/param/RechargePlanParam.java create mode 100644 src/main/java/com/gxwebsoft/shop/param/UserAddressParam.java create mode 100644 src/main/java/com/gxwebsoft/shop/param/UserBalanceLogParam.java create mode 100644 src/main/java/com/gxwebsoft/shop/param/UserCommentParam.java create mode 100644 src/main/java/com/gxwebsoft/shop/param/UserCouponParam.java create mode 100644 src/main/java/com/gxwebsoft/shop/param/UserFeedbackParam.java create mode 100644 src/main/java/com/gxwebsoft/shop/param/UserFollowParam.java create mode 100644 src/main/java/com/gxwebsoft/shop/param/UserGradeLogParam.java create mode 100644 src/main/java/com/gxwebsoft/shop/param/UserGradeParam.java create mode 100644 src/main/java/com/gxwebsoft/shop/param/UserLikeParam.java create mode 100644 src/main/java/com/gxwebsoft/shop/param/UserLookParam.java create mode 100644 src/main/java/com/gxwebsoft/shop/param/UserOauthParam.java create mode 100644 src/main/java/com/gxwebsoft/shop/param/UserPointsLogParam.java create mode 100644 src/main/java/com/gxwebsoft/shop/param/UserRefereeParam.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/CartService.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/CategoryService.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/CommentService.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/CouponService.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/ExpressService.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/GoodsService.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/GoodsServiceService.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/MemberService.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/MerchantClerkService.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/MerchantService.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/MerchantWithdrawService.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/OrderAddressService.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/OrderGoodsService.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/OrderRefundAddressService.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/OrderRefundService.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/OrderRenewService.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/OrderService.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/PaymentService.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/PaymentTemplateService.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/PaymentTradeService.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/RechargeOrderPlanService.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/RechargeOrderService.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/RechargePlanService.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/TestService.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/UserAddressService.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/UserBalanceLogService.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/UserCommentService.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/UserCouponService.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/UserFeedbackService.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/UserFollowService.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/UserGradeLogService.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/UserGradeService.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/UserLikeService.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/UserLookService.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/UserOauthService.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/UserPointsLogService.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/UserRefereeService.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/impl/CartServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/impl/CategoryServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/impl/CommentServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/impl/CouponServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/impl/ExpressServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/impl/GoodsServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/impl/GoodsServiceServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/impl/MemberServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/impl/MerchantClerkServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/impl/MerchantServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/impl/MerchantWithdrawServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/impl/OrderAddressServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/impl/OrderGoodsServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/impl/OrderRefundAddressServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/impl/OrderRefundServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/impl/OrderRenewServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/impl/OrderServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/impl/PaymentServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/impl/PaymentTemplateServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/impl/PaymentTradeServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/impl/RechargeOrderPlanServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/impl/RechargeOrderServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/impl/RechargePlanServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/impl/TestServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/impl/UserAddressServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/impl/UserBalanceLogServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/impl/UserCommentServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/impl/UserCouponServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/impl/UserFeedbackServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/impl/UserFollowServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/impl/UserGradeLogServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/impl/UserGradeServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/impl/UserLikeServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/impl/UserLookServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/impl/UserOauthServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/impl/UserPointsLogServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/shop/service/impl/UserRefereeServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/tower/controller/TowerAccessoryController.java create mode 100644 src/main/java/com/gxwebsoft/tower/controller/TowerEquipmentController.java create mode 100644 src/main/java/com/gxwebsoft/tower/controller/TowerModelController.java create mode 100644 src/main/java/com/gxwebsoft/tower/controller/TowerPlaceController.java create mode 100644 src/main/java/com/gxwebsoft/tower/controller/TowerPlaceSafetyController.java create mode 100644 src/main/java/com/gxwebsoft/tower/controller/TowerPlaceStandardController.java create mode 100644 src/main/java/com/gxwebsoft/tower/controller/TowerProjectController.java create mode 100644 src/main/java/com/gxwebsoft/tower/controller/TowerProjectOrderController.java create mode 100644 src/main/java/com/gxwebsoft/tower/controller/TowerProjectPlaceController.java create mode 100644 src/main/java/com/gxwebsoft/tower/controller/TowerProjectUserController.java create mode 100644 src/main/java/com/gxwebsoft/tower/controller/TowerWarehouseController.java create mode 100644 src/main/java/com/gxwebsoft/tower/entity/TowerAccessory.java create mode 100644 src/main/java/com/gxwebsoft/tower/entity/TowerEquipment.java create mode 100644 src/main/java/com/gxwebsoft/tower/entity/TowerModel.java create mode 100644 src/main/java/com/gxwebsoft/tower/entity/TowerPlace.java create mode 100644 src/main/java/com/gxwebsoft/tower/entity/TowerPlaceSafety.java create mode 100644 src/main/java/com/gxwebsoft/tower/entity/TowerPlaceStandard.java create mode 100644 src/main/java/com/gxwebsoft/tower/entity/TowerProject.java create mode 100644 src/main/java/com/gxwebsoft/tower/entity/TowerProjectOrder.java create mode 100644 src/main/java/com/gxwebsoft/tower/entity/TowerProjectPlace.java create mode 100644 src/main/java/com/gxwebsoft/tower/entity/TowerProjectUser.java create mode 100644 src/main/java/com/gxwebsoft/tower/entity/TowerWarehouse.java create mode 100644 src/main/java/com/gxwebsoft/tower/mapper/TowerAccessoryMapper.java create mode 100644 src/main/java/com/gxwebsoft/tower/mapper/TowerEquipmentMapper.java create mode 100644 src/main/java/com/gxwebsoft/tower/mapper/TowerModelMapper.java create mode 100644 src/main/java/com/gxwebsoft/tower/mapper/TowerPlaceMapper.java create mode 100644 src/main/java/com/gxwebsoft/tower/mapper/TowerPlaceSafetyMapper.java create mode 100644 src/main/java/com/gxwebsoft/tower/mapper/TowerPlaceStandardMapper.java create mode 100644 src/main/java/com/gxwebsoft/tower/mapper/TowerProjectMapper.java create mode 100644 src/main/java/com/gxwebsoft/tower/mapper/TowerProjectOrderMapper.java create mode 100644 src/main/java/com/gxwebsoft/tower/mapper/TowerProjectPlaceMapper.java create mode 100644 src/main/java/com/gxwebsoft/tower/mapper/TowerProjectUserMapper.java create mode 100644 src/main/java/com/gxwebsoft/tower/mapper/TowerWarehouseMapper.java create mode 100644 src/main/java/com/gxwebsoft/tower/mapper/xml/TowerAccessoryMapper.xml create mode 100644 src/main/java/com/gxwebsoft/tower/mapper/xml/TowerEquipmentMapper.xml create mode 100644 src/main/java/com/gxwebsoft/tower/mapper/xml/TowerModelMapper.xml create mode 100644 src/main/java/com/gxwebsoft/tower/mapper/xml/TowerPlaceMapper.xml create mode 100644 src/main/java/com/gxwebsoft/tower/mapper/xml/TowerPlaceSafetyMapper.xml create mode 100644 src/main/java/com/gxwebsoft/tower/mapper/xml/TowerPlaceStandardMapper.xml create mode 100644 src/main/java/com/gxwebsoft/tower/mapper/xml/TowerProjectMapper.xml create mode 100644 src/main/java/com/gxwebsoft/tower/mapper/xml/TowerProjectOrderMapper.xml create mode 100644 src/main/java/com/gxwebsoft/tower/mapper/xml/TowerProjectPlaceMapper.xml create mode 100644 src/main/java/com/gxwebsoft/tower/mapper/xml/TowerProjectUserMapper.xml create mode 100644 src/main/java/com/gxwebsoft/tower/mapper/xml/TowerWarehouseMapper.xml create mode 100644 src/main/java/com/gxwebsoft/tower/param/TowerAccessoryParam.java create mode 100644 src/main/java/com/gxwebsoft/tower/param/TowerEquipmentParam.java create mode 100644 src/main/java/com/gxwebsoft/tower/param/TowerModelParam.java create mode 100644 src/main/java/com/gxwebsoft/tower/param/TowerPlaceParam.java create mode 100644 src/main/java/com/gxwebsoft/tower/param/TowerPlaceSafetyParam.java create mode 100644 src/main/java/com/gxwebsoft/tower/param/TowerPlaceStandardParam.java create mode 100644 src/main/java/com/gxwebsoft/tower/param/TowerProjectOrderParam.java create mode 100644 src/main/java/com/gxwebsoft/tower/param/TowerProjectParam.java create mode 100644 src/main/java/com/gxwebsoft/tower/param/TowerProjectPlaceParam.java create mode 100644 src/main/java/com/gxwebsoft/tower/param/TowerProjectUserParam.java create mode 100644 src/main/java/com/gxwebsoft/tower/param/TowerWarehouseParam.java create mode 100644 src/main/java/com/gxwebsoft/tower/service/TowerAccessoryService.java create mode 100644 src/main/java/com/gxwebsoft/tower/service/TowerEquipmentService.java create mode 100644 src/main/java/com/gxwebsoft/tower/service/TowerModelService.java create mode 100644 src/main/java/com/gxwebsoft/tower/service/TowerPlaceSafetyService.java create mode 100644 src/main/java/com/gxwebsoft/tower/service/TowerPlaceService.java create mode 100644 src/main/java/com/gxwebsoft/tower/service/TowerPlaceStandardService.java create mode 100644 src/main/java/com/gxwebsoft/tower/service/TowerProjectOrderService.java create mode 100644 src/main/java/com/gxwebsoft/tower/service/TowerProjectPlaceService.java create mode 100644 src/main/java/com/gxwebsoft/tower/service/TowerProjectService.java create mode 100644 src/main/java/com/gxwebsoft/tower/service/TowerProjectUserService.java create mode 100644 src/main/java/com/gxwebsoft/tower/service/TowerWarehouseService.java create mode 100644 src/main/java/com/gxwebsoft/tower/service/impl/TowerAccessoryServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/tower/service/impl/TowerEquipmentServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/tower/service/impl/TowerModelServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/tower/service/impl/TowerPlaceSafetyServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/tower/service/impl/TowerPlaceServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/tower/service/impl/TowerPlaceStandardServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/tower/service/impl/TowerProjectOrderServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/tower/service/impl/TowerProjectPlaceServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/tower/service/impl/TowerProjectServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/tower/service/impl/TowerProjectUserServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/tower/service/impl/TowerWarehouseServiceImpl.java create mode 100644 src/main/java/com/qq/weixin/mp/aes/AesException.java create mode 100644 src/main/java/com/qq/weixin/mp/aes/ByteGroup.java create mode 100644 src/main/java/com/qq/weixin/mp/aes/JsonParse.java create mode 100644 src/main/java/com/qq/weixin/mp/aes/PKCS7Encoder.java create mode 100644 src/main/java/com/qq/weixin/mp/aes/SHA1.java create mode 100644 src/main/java/com/qq/weixin/mp/aes/WXBizJsonMsgCrypt.java create mode 100644 src/main/java/lib/commons-codec-1.9.jar create mode 100644 src/main/java/lib/json-20200518.jar create mode 100644 src/main/resources/META-INF/additional-spring-configuration-metadata.json create mode 100644 src/main/resources/alipay-sandbox.properties create mode 100644 src/main/resources/application-dev.yml create mode 100644 src/main/resources/application-jimei.yml create mode 100644 src/main/resources/application-prod.yml create mode 100644 src/main/resources/application-test.yml create mode 100644 src/main/resources/application.yml create mode 100644 src/main/resources/cert/alipayPublicCert.crt create mode 100644 src/main/resources/cert/alipayRootCert.crt create mode 100644 src/main/resources/cert/appPublicCert.crt create mode 100644 src/main/resources/express.properties create mode 100644 src/main/resources/mp-alipay.properties create mode 100644 src/main/resources/wxpay.properties create mode 100644 src/test/java/com/gxwebsoft/RedisTest.java create mode 100644 src/test/java/com/gxwebsoft/TestMain.java create mode 100644 src/test/java/com/gxwebsoft/WebSoftApplicationTests.java create mode 100644 src/test/java/com/gxwebsoft/generator/AppsGenerator.java create mode 100644 src/test/java/com/gxwebsoft/generator/CmsGenerator.java create mode 100644 src/test/java/com/gxwebsoft/generator/CodeGenerator.java create mode 100644 src/test/java/com/gxwebsoft/generator/HouseGenerator.java create mode 100644 src/test/java/com/gxwebsoft/generator/LoveGenerator.java create mode 100644 src/test/java/com/gxwebsoft/generator/OaGenerator.java create mode 100644 src/test/java/com/gxwebsoft/generator/ShopGenerator.java create mode 100644 src/test/java/com/gxwebsoft/generator/SysGenerator.java create mode 100644 src/test/java/com/gxwebsoft/generator/TowerGenerator.java create mode 100644 src/test/java/com/gxwebsoft/generator/engine/BeetlTemplateEnginePlus.java create mode 100644 src/test/java/com/gxwebsoft/generator/templates/controller.java.btl create mode 100644 src/test/java/com/gxwebsoft/generator/templates/entity.java.btl create mode 100644 src/test/java/com/gxwebsoft/generator/templates/mapper.java.btl create mode 100644 src/test/java/com/gxwebsoft/generator/templates/mapper.xml.btl create mode 100644 src/test/java/com/gxwebsoft/generator/templates/param.java.btl create mode 100644 src/test/java/com/gxwebsoft/generator/templates/service.java.btl create mode 100644 src/test/java/com/gxwebsoft/generator/templates/serviceImpl.java.btl diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..f2677169e6f22bab8d424adb326374edcea38e28 GIT binary patch literal 6148 zcmeHK%}T>S5Z-O8O({YS3OxqA7HlO7;w8lT0!H+pQWFwtFlI}VnnNk%tS{t~_&m<+ zZVthKHxWAnyWi~m>}Ed5{xHV4y9%d_nT#<58X`xfMbO;p>gZrZF6W3?5tR8dNJP*w z(O)#-x9_ro`7C1#*8KjDV41{uF`0bwPPezS+c)~g(0K5kMClcNvC3UPyTj475J^z$ zesB{<<=ouA5NYAZX_U!?IE*0V{x(iSQMzK4hPll3l*1SpgSk0cuWfrWwoaz@W^Ap` zjzPCi?agLj92_2Kn(oA0PYVKG(<;ZrBH4i(BbtN{XIk!(D5ySXlZmbRtmub!c{7u zO6B^A!BslgEgk1*tQ4wr#^uT|k6yWcyl}ZX*ew~(xTBDIVt^QEGSF2+6VLxk_+?rj z`OOp>5d*})KVyLRX5P$&qV(DNtvozyEohI>P%y4S1qAfQB>)DvkBp>K`7P8T&e2#Y V#97cT(*fxsAPJ$482AMSz5ttNOe_EZ literal 0 HcmV?d00001 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..a2a3040 --- /dev/null +++ b/.gitignore @@ -0,0 +1,31 @@ +HELP.md +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/** +!**/src/test/** + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ + +### VS Code ### +.vscode/ diff --git a/.mvn/wrapper/MavenWrapperDownloader.java b/.mvn/wrapper/MavenWrapperDownloader.java new file mode 100644 index 0000000..a45eb6b --- /dev/null +++ b/.mvn/wrapper/MavenWrapperDownloader.java @@ -0,0 +1,118 @@ +/* + * Copyright 2007-present the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import java.net.*; +import java.io.*; +import java.nio.channels.*; +import java.util.Properties; + +public class MavenWrapperDownloader { + + private static final String WRAPPER_VERSION = "0.5.6"; + /** + * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided. + */ + private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/" + + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar"; + + /** + * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to + * use instead of the default one. + */ + private static final String MAVEN_WRAPPER_PROPERTIES_PATH = + ".mvn/wrapper/maven-wrapper.properties"; + + /** + * Path where the maven-wrapper.jar will be saved to. + */ + private static final String MAVEN_WRAPPER_JAR_PATH = + ".mvn/wrapper/maven-wrapper.jar"; + + /** + * Name of the property which should be used to override the default download url for the wrapper. + */ + private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl"; + + public static void main(String args[]) { + System.out.println("- Downloader started"); + File baseDirectory = new File(args[0]); + System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath()); + + // If the maven-wrapper.properties exists, read it and check if it contains a custom + // wrapperUrl parameter. + File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH); + String url = DEFAULT_DOWNLOAD_URL; + if (mavenWrapperPropertyFile.exists()) { + FileInputStream mavenWrapperPropertyFileInputStream = null; + try { + mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile); + Properties mavenWrapperProperties = new Properties(); + mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream); + url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url); + } catch (IOException e) { + System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'"); + } finally { + try { + if (mavenWrapperPropertyFileInputStream != null) { + mavenWrapperPropertyFileInputStream.close(); + } + } catch (IOException e) { + // Ignore ... + } + } + } + System.out.println("- Downloading from: " + url); + + File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH); + if (!outputFile.getParentFile().exists()) { + if (!outputFile.getParentFile().mkdirs()) { + System.out.println( + "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'"); + } + } + System.out.println("- Downloading to: " + outputFile.getAbsolutePath()); + try { + downloadFileFromURL(url, outputFile); + System.out.println("Done"); + System.exit(0); + } catch (Throwable e) { + System.out.println("- Error downloading"); + e.printStackTrace(); + System.exit(1); + } + } + + private static void downloadFileFromURL(String urlString, File destination) throws Exception { + if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) { + String username = System.getenv("MVNW_USERNAME"); + char[] password = System.getenv("MVNW_PASSWORD").toCharArray(); + Authenticator.setDefault(new Authenticator() { + @Override + protected PasswordAuthentication getPasswordAuthentication() { + return new PasswordAuthentication(username, password); + } + }); + } + URL website = new URL(urlString); + ReadableByteChannel rbc; + rbc = Channels.newChannel(website.openStream()); + FileOutputStream fos = new FileOutputStream(destination); + fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE); + fos.close(); + rbc.close(); + } + +} diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..2cc7d4a55c0cd0092912bf49ae38b3a9e3fd0054 GIT binary patch literal 50710 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 EfAhh=DF6Tf literal 0 HcmV?d00001 diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..642d572 --- /dev/null +++ b/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,2 @@ +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar diff --git a/README.md b/README.md new file mode 100644 index 0000000..e69de29 diff --git a/hs_err_pid31091.log b/hs_err_pid31091.log new file mode 100644 index 0000000..a319cb6 --- /dev/null +++ b/hs_err_pid31091.log @@ -0,0 +1,745 @@ +# +# A fatal error has been detected by the Java Runtime Environment: +# +# Internal Error (signature.cpp:120), pid=31091, tid=0x0000000000007303 +# Error: ShouldNotReachHere() +# +# JRE version: OpenJDK Runtime Environment (8.0_322-b06) (build 1.8.0_322-b06) +# Java VM: OpenJDK 64-Bit Server VM (25.322-b06 mixed mode bsd-aarch64 compressed oops) +# Failed to write core dump. Core dumps have been disabled. To enable core dumping, try "ulimit -c unlimited" before starting Java again +# +# If you would like to submit a bug report, please visit: +# https://bell-sw.com/support +# + +--------------- T H R E A D --------------- + +Current thread (0x000000012d2c4000): JavaThread "http-nio-9090-exec-4" daemon [_thread_in_vm, id=29443, stack(0x0000000175758000,0x000000017595b000)] + +Stack: [0x0000000175758000,0x000000017595b000], sp=0x00000001759578a0, free space=2046k +Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code) +V [libjvm.dylib+0x54f438] +V [libjvm.dylib+0x18856c] +V [libjvm.dylib+0x4bf228] +V [libjvm.dylib+0x4bf4f0] +V [libjvm.dylib+0x1db018] +V [libjvm.dylib+0x27acec] +j org.springframework.web.method.annotation.ModelFactory.updateModel(Lorg/springframework/web/context/request/NativeWebRequest;Lorg/springframework/web/method/support/ModelAndViewContainer;)V+34 +j org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter.getModelAndView(Lorg/springframework/web/method/support/ModelAndViewContainer;Lorg/springframework/web/method/annotation/ModelFactory;Lorg/springframework/web/context/request/NativeWebRequest;)Lorg/springframework/web/servlet/ModelAndView;+3 +j org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter.invokeHandlerMethod(Ljavax/servlet/http/HttpServletRequest;Ljavax/servlet/http/HttpServletResponse;Lorg/springframework/web/method/HandlerMethod;)Lorg/springframework/web/servlet/ModelAndView;+273 +j org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter.handleInternal(Ljavax/servlet/http/HttpServletRequest;Ljavax/servlet/http/HttpServletResponse;Lorg/springframework/web/method/HandlerMethod;)Lorg/springframework/web/servlet/ModelAndView;+81 +j org.springframework.web.servlet.mvc.method.AbstractHandlerMethodAdapter.handle(Ljavax/servlet/http/HttpServletRequest;Ljavax/servlet/http/HttpServletResponse;Ljava/lang/Object;)Lorg/springframework/web/servlet/ModelAndView;+7 +j org.springframework.web.servlet.DispatcherServlet.doDispatch(Ljavax/servlet/http/HttpServletRequest;Ljavax/servlet/http/HttpServletResponse;)V+259 +j org.springframework.web.servlet.DispatcherServlet.doService(Ljavax/servlet/http/HttpServletRequest;Ljavax/servlet/http/HttpServletResponse;)V+241 +j org.springframework.web.servlet.FrameworkServlet.processRequest(Ljavax/servlet/http/HttpServletRequest;Ljavax/servlet/http/HttpServletResponse;)V+71 +j org.springframework.web.servlet.FrameworkServlet.doGet(Ljavax/servlet/http/HttpServletRequest;Ljavax/servlet/http/HttpServletResponse;)V+3 +j javax.servlet.http.HttpServlet.service(Ljavax/servlet/http/HttpServletRequest;Ljavax/servlet/http/HttpServletResponse;)V+35 +j org.springframework.web.servlet.FrameworkServlet.service(Ljavax/servlet/http/HttpServletRequest;Ljavax/servlet/http/HttpServletResponse;)V+33 +j javax.servlet.http.HttpServlet.service(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;)V+36 +j org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;)V+304 +j org.apache.catalina.core.ApplicationFilterChain.doFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;)V+99 +j org.apache.tomcat.websocket.server.WsFilter.doFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;Ljavax/servlet/FilterChain;)V+21 +j org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;)V+135 +j org.apache.catalina.core.ApplicationFilterChain.doFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;)V+99 +j org.springframework.web.filter.OncePerRequestFilter.doFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;Ljavax/servlet/FilterChain;)V+122 +j org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;)V+135 +j org.apache.catalina.core.ApplicationFilterChain.doFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;)V+99 +j org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;)V+52 +j org.springframework.security.web.access.intercept.FilterSecurityInterceptor.invoke(Lorg/springframework/security/web/FilterInvocation;)V+79 +j org.springframework.security.web.access.intercept.FilterSecurityInterceptor.doFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;Ljavax/servlet/FilterChain;)V+11 +j org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;)V+136 +j org.springframework.security.web.access.ExceptionTranslationFilter.doFilter(Ljavax/servlet/http/HttpServletRequest;Ljavax/servlet/http/HttpServletResponse;Ljavax/servlet/FilterChain;)V+3 +j org.springframework.security.web.access.ExceptionTranslationFilter.doFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;Ljavax/servlet/FilterChain;)V+10 +j org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;)V+136 +j org.springframework.security.web.session.SessionManagementFilter.doFilter(Ljavax/servlet/http/HttpServletRequest;Ljavax/servlet/http/HttpServletResponse;Ljavax/servlet/FilterChain;)V+210 +j org.springframework.security.web.session.SessionManagementFilter.doFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;Ljavax/servlet/FilterChain;)V+10 +j org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;)V+136 +j org.springframework.security.web.authentication.AnonymousAuthenticationFilter.doFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;Ljavax/servlet/FilterChain;)V+105 +j org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;)V+136 +j org.springframework.security.web.servletapi.SecurityContextHolderAwareRequestFilter.doFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;Ljavax/servlet/FilterChain;)V+19 +j org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;)V+136 +j org.springframework.security.web.savedrequest.RequestCacheAwareFilter.doFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;Ljavax/servlet/FilterChain;)V+32 +j org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;)V+136 +j com.gxwebsoft.common.core.security.JwtAuthenticationFilter.doFilterInternal(Ljavax/servlet/http/HttpServletRequest;Ljavax/servlet/http/HttpServletResponse;Ljavax/servlet/FilterChain;)V+275 +j org.springframework.web.filter.OncePerRequestFilter.doFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;Ljavax/servlet/FilterChain;)V+147 +j org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;)V+136 +j org.springframework.web.filter.CorsFilter.doFilterInternal(Ljavax/servlet/http/HttpServletRequest;Ljavax/servlet/http/HttpServletResponse;Ljavax/servlet/FilterChain;)V+43 +j org.springframework.web.filter.OncePerRequestFilter.doFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;Ljavax/servlet/FilterChain;)V+147 +j org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;)V+136 +j org.springframework.security.web.header.HeaderWriterFilter.doHeadersAfter(Ljavax/servlet/http/HttpServletRequest;Ljavax/servlet/http/HttpServletResponse;Ljavax/servlet/FilterChain;)V+29 +j org.springframework.security.web.header.HeaderWriterFilter.doFilterInternal(Ljavax/servlet/http/HttpServletRequest;Ljavax/servlet/http/HttpServletResponse;Ljavax/servlet/FilterChain;)V+21 +j org.springframework.web.filter.OncePerRequestFilter.doFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;Ljavax/servlet/FilterChain;)V+147 +j org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;)V+136 +j org.springframework.security.web.context.SecurityContextPersistenceFilter.doFilter(Ljavax/servlet/http/HttpServletRequest;Ljavax/servlet/http/HttpServletResponse;Ljavax/servlet/FilterChain;)V+181 +j org.springframework.security.web.context.SecurityContextPersistenceFilter.doFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;Ljavax/servlet/FilterChain;)V+10 +j org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;)V+136 +j org.springframework.security.web.context.request.async.WebAsyncManagerIntegrationFilter.doFilterInternal(Ljavax/servlet/http/HttpServletRequest;Ljavax/servlet/http/HttpServletResponse;Ljavax/servlet/FilterChain;)V+42 +j org.springframework.web.filter.OncePerRequestFilter.doFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;Ljavax/servlet/FilterChain;)V+147 +j org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;)V+136 +j org.springframework.security.web.FilterChainProxy.doFilterInternal(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;Ljavax/servlet/FilterChain;)V+148 +j org.springframework.security.web.FilterChainProxy.doFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;Ljavax/servlet/FilterChain;)V+48 +j org.springframework.web.filter.DelegatingFilterProxy.invokeDelegate(Ljavax/servlet/Filter;Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;Ljavax/servlet/FilterChain;)V+5 +j org.springframework.web.filter.DelegatingFilterProxy.doFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;Ljavax/servlet/FilterChain;)V+85 +j org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;)V+135 +j org.apache.catalina.core.ApplicationFilterChain.doFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;)V+99 +j org.springframework.web.filter.RequestContextFilter.doFilterInternal(Ljavax/servlet/http/HttpServletRequest;Ljavax/servlet/http/HttpServletResponse;Ljavax/servlet/FilterChain;)V+21 +j org.springframework.web.filter.OncePerRequestFilter.doFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;Ljavax/servlet/FilterChain;)V+147 +j org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;)V+135 +j org.apache.catalina.core.ApplicationFilterChain.doFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;)V+99 +j org.springframework.web.filter.FormContentFilter.doFilterInternal(Ljavax/servlet/http/HttpServletRequest;Ljavax/servlet/http/HttpServletResponse;Ljavax/servlet/FilterChain;)V+38 +j org.springframework.web.filter.OncePerRequestFilter.doFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;Ljavax/servlet/FilterChain;)V+147 +j org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;)V+135 +j org.apache.catalina.core.ApplicationFilterChain.doFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;)V+99 +j org.springframework.web.filter.CharacterEncodingFilter.doFilterInternal(Ljavax/servlet/http/HttpServletRequest;Ljavax/servlet/http/HttpServletResponse;Ljavax/servlet/FilterChain;)V+53 +j org.springframework.web.filter.OncePerRequestFilter.doFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;Ljavax/servlet/FilterChain;)V+147 +j org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;)V+135 +j org.apache.catalina.core.ApplicationFilterChain.doFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;)V+99 +j org.apache.catalina.core.StandardWrapperValve.invoke(Lorg/apache/catalina/connector/Request;Lorg/apache/catalina/connector/Response;)V+694 +j org.apache.catalina.core.StandardContextValve.invoke(Lorg/apache/catalina/connector/Request;Lorg/apache/catalina/connector/Response;)V+169 +j org.apache.catalina.authenticator.AuthenticatorBase.invoke(Lorg/apache/catalina/connector/Request;Lorg/apache/catalina/connector/Response;)V+260 +j org.apache.catalina.core.StandardHostValve.invoke(Lorg/apache/catalina/connector/Request;Lorg/apache/catalina/connector/Response;)V+128 +j org.apache.catalina.valves.ErrorReportValve.invoke(Lorg/apache/catalina/connector/Request;Lorg/apache/catalina/connector/Response;)V+6 +j org.apache.catalina.core.StandardEngineValve.invoke(Lorg/apache/catalina/connector/Request;Lorg/apache/catalina/connector/Response;)V+59 +j org.apache.catalina.connector.CoyoteAdapter.service(Lorg/apache/coyote/Request;Lorg/apache/coyote/Response;)V+199 +j org.apache.coyote.http11.Http11Processor.service(Lorg/apache/tomcat/util/net/SocketWrapperBase;)Lorg/apache/tomcat/util/net/AbstractEndpoint$Handler$SocketState;+737 +j org.apache.coyote.AbstractProcessorLight.process(Lorg/apache/tomcat/util/net/SocketWrapperBase;Lorg/apache/tomcat/util/net/SocketEvent;)Lorg/apache/tomcat/util/net/AbstractEndpoint$Handler$SocketState;+170 +j org.apache.coyote.AbstractProtocol$ConnectionHandler.process(Lorg/apache/tomcat/util/net/SocketWrapperBase;Lorg/apache/tomcat/util/net/SocketEvent;)Lorg/apache/tomcat/util/net/AbstractEndpoint$Handler$SocketState;+505 +j org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun()V+216 +j org.apache.tomcat.util.net.SocketProcessorBase.run()V+21 +j org.apache.tomcat.util.threads.ThreadPoolExecutor.runWorker(Lorg/apache/tomcat/util/threads/ThreadPoolExecutor$Worker;)V+92 +j org.apache.tomcat.util.threads.ThreadPoolExecutor$Worker.run()V+5 +j org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run()V+4 +j java.lang.Thread.run()V+11 +v ~StubRoutines::call_stub +V [libjvm.dylib+0x282778] +V [libjvm.dylib+0x2812a4] +V [libjvm.dylib+0x2814f8] +V [libjvm.dylib+0x3086e4] +V [libjvm.dylib+0x514724] +V [libjvm.dylib+0x5145d0] +V [libjvm.dylib+0x44aeb8] +...... + +Java frames: (J=compiled Java code, j=interpreted, Vv=VM code) +j org.springframework.web.method.annotation.ModelFactory.updateModel(Lorg/springframework/web/context/request/NativeWebRequest;Lorg/springframework/web/method/support/ModelAndViewContainer;)V+34 +j org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter.getModelAndView(Lorg/springframework/web/method/support/ModelAndViewContainer;Lorg/springframework/web/method/annotation/ModelFactory;Lorg/springframework/web/context/request/NativeWebRequest;)Lorg/springframework/web/servlet/ModelAndView;+3 +j org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter.invokeHandlerMethod(Ljavax/servlet/http/HttpServletRequest;Ljavax/servlet/http/HttpServletResponse;Lorg/springframework/web/method/HandlerMethod;)Lorg/springframework/web/servlet/ModelAndView;+273 +j org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter.handleInternal(Ljavax/servlet/http/HttpServletRequest;Ljavax/servlet/http/HttpServletResponse;Lorg/springframework/web/method/HandlerMethod;)Lorg/springframework/web/servlet/ModelAndView;+81 +j org.springframework.web.servlet.mvc.method.AbstractHandlerMethodAdapter.handle(Ljavax/servlet/http/HttpServletRequest;Ljavax/servlet/http/HttpServletResponse;Ljava/lang/Object;)Lorg/springframework/web/servlet/ModelAndView;+7 +j org.springframework.web.servlet.DispatcherServlet.doDispatch(Ljavax/servlet/http/HttpServletRequest;Ljavax/servlet/http/HttpServletResponse;)V+259 +j org.springframework.web.servlet.DispatcherServlet.doService(Ljavax/servlet/http/HttpServletRequest;Ljavax/servlet/http/HttpServletResponse;)V+241 +j org.springframework.web.servlet.FrameworkServlet.processRequest(Ljavax/servlet/http/HttpServletRequest;Ljavax/servlet/http/HttpServletResponse;)V+71 +j org.springframework.web.servlet.FrameworkServlet.doGet(Ljavax/servlet/http/HttpServletRequest;Ljavax/servlet/http/HttpServletResponse;)V+3 +j javax.servlet.http.HttpServlet.service(Ljavax/servlet/http/HttpServletRequest;Ljavax/servlet/http/HttpServletResponse;)V+35 +j org.springframework.web.servlet.FrameworkServlet.service(Ljavax/servlet/http/HttpServletRequest;Ljavax/servlet/http/HttpServletResponse;)V+33 +j javax.servlet.http.HttpServlet.service(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;)V+36 +j org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;)V+304 +j org.apache.catalina.core.ApplicationFilterChain.doFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;)V+99 +j org.apache.tomcat.websocket.server.WsFilter.doFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;Ljavax/servlet/FilterChain;)V+21 +j org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;)V+135 +j org.apache.catalina.core.ApplicationFilterChain.doFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;)V+99 +j org.springframework.web.filter.OncePerRequestFilter.doFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;Ljavax/servlet/FilterChain;)V+122 +j org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;)V+135 +j org.apache.catalina.core.ApplicationFilterChain.doFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;)V+99 +j org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;)V+52 +j org.springframework.security.web.access.intercept.FilterSecurityInterceptor.invoke(Lorg/springframework/security/web/FilterInvocation;)V+79 +j org.springframework.security.web.access.intercept.FilterSecurityInterceptor.doFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;Ljavax/servlet/FilterChain;)V+11 +j org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;)V+136 +j org.springframework.security.web.access.ExceptionTranslationFilter.doFilter(Ljavax/servlet/http/HttpServletRequest;Ljavax/servlet/http/HttpServletResponse;Ljavax/servlet/FilterChain;)V+3 +j org.springframework.security.web.access.ExceptionTranslationFilter.doFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;Ljavax/servlet/FilterChain;)V+10 +j org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;)V+136 +j org.springframework.security.web.session.SessionManagementFilter.doFilter(Ljavax/servlet/http/HttpServletRequest;Ljavax/servlet/http/HttpServletResponse;Ljavax/servlet/FilterChain;)V+210 +j org.springframework.security.web.session.SessionManagementFilter.doFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;Ljavax/servlet/FilterChain;)V+10 +j org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;)V+136 +j org.springframework.security.web.authentication.AnonymousAuthenticationFilter.doFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;Ljavax/servlet/FilterChain;)V+105 +j org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;)V+136 +j org.springframework.security.web.servletapi.SecurityContextHolderAwareRequestFilter.doFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;Ljavax/servlet/FilterChain;)V+19 +j org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;)V+136 +j org.springframework.security.web.savedrequest.RequestCacheAwareFilter.doFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;Ljavax/servlet/FilterChain;)V+32 +j org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;)V+136 +j com.gxwebsoft.common.core.security.JwtAuthenticationFilter.doFilterInternal(Ljavax/servlet/http/HttpServletRequest;Ljavax/servlet/http/HttpServletResponse;Ljavax/servlet/FilterChain;)V+275 +j org.springframework.web.filter.OncePerRequestFilter.doFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;Ljavax/servlet/FilterChain;)V+147 +j org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;)V+136 +j org.springframework.web.filter.CorsFilter.doFilterInternal(Ljavax/servlet/http/HttpServletRequest;Ljavax/servlet/http/HttpServletResponse;Ljavax/servlet/FilterChain;)V+43 +j org.springframework.web.filter.OncePerRequestFilter.doFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;Ljavax/servlet/FilterChain;)V+147 +j org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;)V+136 +j org.springframework.security.web.header.HeaderWriterFilter.doHeadersAfter(Ljavax/servlet/http/HttpServletRequest;Ljavax/servlet/http/HttpServletResponse;Ljavax/servlet/FilterChain;)V+29 +j org.springframework.security.web.header.HeaderWriterFilter.doFilterInternal(Ljavax/servlet/http/HttpServletRequest;Ljavax/servlet/http/HttpServletResponse;Ljavax/servlet/FilterChain;)V+21 +j org.springframework.web.filter.OncePerRequestFilter.doFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;Ljavax/servlet/FilterChain;)V+147 +j org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;)V+136 +j org.springframework.security.web.context.SecurityContextPersistenceFilter.doFilter(Ljavax/servlet/http/HttpServletRequest;Ljavax/servlet/http/HttpServletResponse;Ljavax/servlet/FilterChain;)V+181 +j org.springframework.security.web.context.SecurityContextPersistenceFilter.doFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;Ljavax/servlet/FilterChain;)V+10 +j org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;)V+136 +j org.springframework.security.web.context.request.async.WebAsyncManagerIntegrationFilter.doFilterInternal(Ljavax/servlet/http/HttpServletRequest;Ljavax/servlet/http/HttpServletResponse;Ljavax/servlet/FilterChain;)V+42 +j org.springframework.web.filter.OncePerRequestFilter.doFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;Ljavax/servlet/FilterChain;)V+147 +j org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;)V+136 +j org.springframework.security.web.FilterChainProxy.doFilterInternal(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;Ljavax/servlet/FilterChain;)V+148 +j org.springframework.security.web.FilterChainProxy.doFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;Ljavax/servlet/FilterChain;)V+48 +j org.springframework.web.filter.DelegatingFilterProxy.invokeDelegate(Ljavax/servlet/Filter;Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;Ljavax/servlet/FilterChain;)V+5 +j org.springframework.web.filter.DelegatingFilterProxy.doFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;Ljavax/servlet/FilterChain;)V+85 +j org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;)V+135 +j org.apache.catalina.core.ApplicationFilterChain.doFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;)V+99 +j org.springframework.web.filter.RequestContextFilter.doFilterInternal(Ljavax/servlet/http/HttpServletRequest;Ljavax/servlet/http/HttpServletResponse;Ljavax/servlet/FilterChain;)V+21 +j org.springframework.web.filter.OncePerRequestFilter.doFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;Ljavax/servlet/FilterChain;)V+147 +j org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;)V+135 +j org.apache.catalina.core.ApplicationFilterChain.doFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;)V+99 +j org.springframework.web.filter.FormContentFilter.doFilterInternal(Ljavax/servlet/http/HttpServletRequest;Ljavax/servlet/http/HttpServletResponse;Ljavax/servlet/FilterChain;)V+38 +j org.springframework.web.filter.OncePerRequestFilter.doFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;Ljavax/servlet/FilterChain;)V+147 +j org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;)V+135 +j org.apache.catalina.core.ApplicationFilterChain.doFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;)V+99 +j org.springframework.web.filter.CharacterEncodingFilter.doFilterInternal(Ljavax/servlet/http/HttpServletRequest;Ljavax/servlet/http/HttpServletResponse;Ljavax/servlet/FilterChain;)V+53 +j org.springframework.web.filter.OncePerRequestFilter.doFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;Ljavax/servlet/FilterChain;)V+147 +j org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;)V+135 +j org.apache.catalina.core.ApplicationFilterChain.doFilter(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;)V+99 +j org.apache.catalina.core.StandardWrapperValve.invoke(Lorg/apache/catalina/connector/Request;Lorg/apache/catalina/connector/Response;)V+694 +j org.apache.catalina.core.StandardContextValve.invoke(Lorg/apache/catalina/connector/Request;Lorg/apache/catalina/connector/Response;)V+169 +j org.apache.catalina.authenticator.AuthenticatorBase.invoke(Lorg/apache/catalina/connector/Request;Lorg/apache/catalina/connector/Response;)V+260 +j org.apache.catalina.core.StandardHostValve.invoke(Lorg/apache/catalina/connector/Request;Lorg/apache/catalina/connector/Response;)V+128 +j org.apache.catalina.valves.ErrorReportValve.invoke(Lorg/apache/catalina/connector/Request;Lorg/apache/catalina/connector/Response;)V+6 +j org.apache.catalina.core.StandardEngineValve.invoke(Lorg/apache/catalina/connector/Request;Lorg/apache/catalina/connector/Response;)V+59 +j org.apache.catalina.connector.CoyoteAdapter.service(Lorg/apache/coyote/Request;Lorg/apache/coyote/Response;)V+199 +j org.apache.coyote.http11.Http11Processor.service(Lorg/apache/tomcat/util/net/SocketWrapperBase;)Lorg/apache/tomcat/util/net/AbstractEndpoint$Handler$SocketState;+737 +j org.apache.coyote.AbstractProcessorLight.process(Lorg/apache/tomcat/util/net/SocketWrapperBase;Lorg/apache/tomcat/util/net/SocketEvent;)Lorg/apache/tomcat/util/net/AbstractEndpoint$Handler$SocketState;+170 +j org.apache.coyote.AbstractProtocol$ConnectionHandler.process(Lorg/apache/tomcat/util/net/SocketWrapperBase;Lorg/apache/tomcat/util/net/SocketEvent;)Lorg/apache/tomcat/util/net/AbstractEndpoint$Handler$SocketState;+505 +j org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun()V+216 +j org.apache.tomcat.util.net.SocketProcessorBase.run()V+21 +j org.apache.tomcat.util.threads.ThreadPoolExecutor.runWorker(Lorg/apache/tomcat/util/threads/ThreadPoolExecutor$Worker;)V+92 +j org.apache.tomcat.util.threads.ThreadPoolExecutor$Worker.run()V+5 +j org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run()V+4 +j java.lang.Thread.run()V+11 +v ~StubRoutines::call_stub + +--------------- P R O C E S S --------------- + +Java Threads: ( => current thread ) + 0x000000012ca6b800 JavaThread "lettuce-eventExecutorLoop-1-1" daemon [_thread_blocked, id=29955, stack(0x0000000175b70000,0x0000000175d73000)] + 0x000000012ca9d000 JavaThread "lettuce-nioEventLoop-6-1" daemon [_thread_in_native, id=29703, stack(0x0000000175964000,0x0000000175b67000)] +=>0x000000012d2c4000 JavaThread "http-nio-9090-exec-4" daemon [_thread_in_vm, id=29443, stack(0x0000000175758000,0x000000017595b000)] + 0x000000011f0a3800 JavaThread "http-nio-9090-exec-3" daemon [_thread_in_Java, id=38403, stack(0x000000017554c000,0x000000017574f000)] + 0x000000011f0a0000 JavaThread "http-nio-9090-exec-2" daemon [_thread_blocked, id=38659, stack(0x0000000175340000,0x0000000175543000)] + 0x000000011f09f000 JavaThread "http-nio-9090-exec-1" daemon [_thread_blocked, id=28459, stack(0x0000000175134000,0x0000000175337000)] + 0x000000012cad2000 JavaThread "http-nio-9090-Acceptor" daemon [_thread_in_native, id=39171, stack(0x0000000174f28000,0x000000017512b000)] + 0x000000012cad1000 JavaThread "http-nio-9090-Poller" daemon [_thread_in_native, id=39431, stack(0x0000000174d1c000,0x0000000174f1f000)] + 0x000000014ecb0800 JavaThread "File Watcher" daemon [_thread_blocked, id=27907, stack(0x0000000174b10000,0x0000000174d13000)] + 0x000000012cabf000 JavaThread "Live Reload Server" daemon [_thread_in_native, id=27675, stack(0x0000000174904000,0x0000000174b07000)] + 0x000000012c8de000 JavaThread "nioEventLoopGroup-4-1" [_thread_in_native, id=27155, stack(0x00000001746f8000,0x00000001748fb000)] + 0x000000014d207000 JavaThread "container-0" [_thread_blocked, id=40195, stack(0x00000001744ec000,0x00000001746ef000)] + 0x000000014e3a1800 JavaThread "Catalina-utility-2" [_thread_blocked, id=26371, stack(0x00000001742e0000,0x00000001744e3000)] + 0x000000014d202000 JavaThread "Catalina-utility-1" [_thread_blocked, id=40455, stack(0x00000001740d4000,0x00000001742d7000)] + 0x000000014e755800 JavaThread "lettuce-timer-3-1" daemon [_thread_blocked, id=40719, stack(0x0000000173ec8000,0x00000001740cb000)] + 0x000000014d0ae800 JavaThread "RMI TCP Connection(5)-127.0.0.1" daemon [_thread_in_native, id=14599, stack(0x0000000173cbc000,0x0000000173ebf000)] + 0x000000014ed3b000 JavaThread "RMI TCP Connection(2)-127.0.0.1" daemon [_thread_in_native, id=41227, stack(0x0000000173ab0000,0x0000000173cb3000)] + 0x000000012a00a800 JavaThread "Druid-ConnectionPool-Destroy-1108833840" daemon [_thread_blocked, id=25347, stack(0x00000001738a4000,0x0000000173aa7000)] + 0x000000012980b000 JavaThread "Druid-ConnectionPool-Create-1108833840" daemon [_thread_blocked, id=25103, stack(0x0000000173698000,0x000000017389b000)] + 0x000000014d1dc800 JavaThread "mysql-cj-abandoned-connection-cleanup" daemon [_thread_blocked, id=24591, stack(0x000000017348c000,0x000000017368f000)] + 0x000000014e4ec800 JavaThread "RMI Scheduler(0)" daemon [_thread_blocked, id=24067, stack(0x0000000173280000,0x0000000173483000)] + 0x000000014d171000 JavaThread "RMI TCP Connection(4)-127.0.0.1" daemon [_thread_in_native, id=23555, stack(0x0000000173074000,0x0000000173277000)] + 0x000000014e453800 JavaThread "Attach Listener" daemon [_thread_blocked, id=23051, stack(0x0000000172e68000,0x000000017306b000)] + 0x000000011f8d0000 JavaThread "restartedMain" [_thread_blocked, id=42243, stack(0x0000000172c5c000,0x0000000172e5f000)] + 0x000000014e0f1000 JavaThread "Thread-1" [_thread_blocked, id=22787, stack(0x0000000172a50000,0x0000000172c53000)] + 0x000000014e0c2000 JavaThread "RMI TCP Accept-0" daemon [_thread_in_native, id=22275, stack(0x0000000172638000,0x000000017283b000)] + 0x000000014e09f000 JavaThread "Service Thread" daemon [_thread_blocked, id=22019, stack(0x000000017242c000,0x000000017262f000)] + 0x000000014ee0e800 JavaThread "C1 CompilerThread3" daemon [_thread_in_vm, id=16387, stack(0x0000000172220000,0x0000000172423000)] + 0x000000014ee0d800 JavaThread "C2 CompilerThread2" daemon [_thread_blocked, id=16899, stack(0x0000000172014000,0x0000000172217000)] + 0x000000014ee0c800 JavaThread "C2 CompilerThread1" daemon [_thread_blocked, id=15875, stack(0x0000000171e08000,0x000000017200b000)] + 0x000000014ee0b800 JavaThread "C2 CompilerThread0" daemon [_thread_blocked, id=17411, stack(0x0000000171bfc000,0x0000000171dff000)] + 0x000000014ee07800 JavaThread "Monitor Ctrl-Break" daemon [_thread_in_native, id=17667, stack(0x00000001719f0000,0x0000000171bf3000)] + 0x000000014e810800 JavaThread "Signal Dispatcher" daemon [_thread_blocked, id=17923, stack(0x00000001717e4000,0x00000001719e7000)] + 0x000000014e029800 JavaThread "Finalizer" daemon [_thread_blocked, id=13827, stack(0x00000001714c0000,0x00000001716c3000)] + 0x000000014e027000 JavaThread "Reference Handler" daemon [_thread_blocked, id=19971, stack(0x00000001712b4000,0x00000001714b7000)] + 0x000000014e009000 JavaThread "main" [_thread_blocked, id=5635, stack(0x000000016fc30000,0x000000016fe33000)] + +Other Threads: + 0x000000013c815000 VMThread [stack: 0x00000001710a8000,0x00000001712ab000] [id=13059] + 0x000000011f865000 WatcherThread [stack: 0x0000000172844000,0x0000000172a47000] [id=42755] + +VM state:not at safepoint (normal execution) + +VM Mutex/Monitor currently owned by a thread: ([mutex/lock_event]) +[0x0000600002eb2900] CodeCache_lock - owner thread: 0x000000014ee0e800 +[0x0000600002eb3f80] Compile_lock - owner thread: 0x000000014ee0e800 +[0x0000600002eb8080] MethodCompileQueue_lock - owner thread: 0x000000014ee0e800 + +heap address: 0x00000005c0000000, size: 8192 MB, Compressed Oops mode: Zero based, Oop shift amount: 3 +Narrow klass base: 0x0000000800000000, Narrow klass shift: 0 +Compressed class space size: 1073741824 Address: 0x0000000800000000 + +Heap: + PSYoungGen total 2729984K, used 76175K [0x0000000715580000, 0x00000007bfd00000, 0x00000007c0000000) + eden space 2672128K, 2% used [0x0000000715580000,0x0000000719fe3fc8,0x00000007b8700000) + from space 57856K, 0% used [0x00000007bc480000,0x00000007bc480000,0x00000007bfd00000) + to space 60416K, 0% used [0x00000007b8700000,0x00000007b8700000,0x00000007bc200000) + ParOldGen total 483328K, used 184293K [0x00000005c0000000, 0x00000005dd800000, 0x0000000715580000) + object space 483328K, 38% used [0x00000005c0000000,0x00000005cb3f9600,0x00000005dd800000) + Metaspace used 92443K, capacity 98046K, committed 99632K, reserved 1136640K + class space used 10271K, capacity 11254K, committed 11568K, reserved 1048576K + +Card table byte_map: [0x0000000109ecc000,0x000000010aed0000] byte_map_base: 0x00000001070cc000 + +Marking Bits: (ParMarkBitMap*) 0x000000010184da70 + Begin Bits: [0x000000010b97c000, 0x000000011397c000) + End Bits: [0x000000011397c000, 0x000000011b97c000) + +Polling page: 0x00000001003dc000 + +CodeCache: size=131072Kb used=20310Kb max_used=20310Kb free=110761Kb + bounds [0x0000000101ecc000, 0x00000001032ac000, 0x0000000109ecc000] + total_blobs=11280 nmethods=10658 adapters=535 + compilation: enabled + +Compilation events (10 events): +Event: 18.150 Thread 0x000000014ee0e800 nmethod 10897 0x000000010327fed0 code [0x0000000103280000, 0x0000000103280090] +Event: 18.150 Thread 0x000000014ee0e800 10899 1 org.apache.ibatis.ognl.OgnlContext::getRoot (5 bytes) +Event: 18.150 Thread 0x000000014ee0e800 nmethod 10899 0x0000000103280110 code [0x0000000103280240, 0x00000001032802d0] +Event: 18.150 Thread 0x000000014ee0e800 10898 1 com.alibaba.druid.proxy.jdbc.ConnectionProxyImpl::getRawObject (5 bytes) +Event: 18.150 Thread 0x000000014ee0e800 nmethod 10898 0x0000000103280350 code [0x0000000103280480, 0x0000000103280510] +Event: 18.150 Thread 0x000000014ee0e800 10900 1 net.sf.jsqlparser.parser.CCJSqlParser$JJCalls:: (5 bytes) +Event: 18.150 Thread 0x000000014ee0e800 nmethod 10900 0x0000000103280590 code [0x00000001032806c0, 0x0000000103280790] +Event: 18.150 Thread 0x000000014ee0e800 10901 1 java.util.Collections::reverse (125 bytes) +Event: 18.150 Thread 0x000000014ee0e800 nmethod 10901 0x0000000103280810 code [0x0000000103280a00, 0x0000000103280dc0] +Event: 18.176 Thread 0x000000014ee0e800 10902 1 com.alibaba.druid.sql.parser.SQLExprParser::primary (6226 bytes) + +GC Heap History (10 events): +Event: 7.500 GC heap before +{Heap before GC invocations=12 (full 3): + PSYoungGen total 1641984K, used 42475K [0x0000000715580000, 0x00000007a1980000, 0x00000007c0000000) + eden space 1599488K, 0% used [0x0000000715580000,0x0000000715580000,0x0000000776f80000) + from space 42496K, 99% used [0x0000000776f80000,0x00000007798facd0,0x0000000779900000) + to space 57856K, 0% used [0x000000079e100000,0x000000079e100000,0x00000007a1980000) + ParOldGen total 189440K, used 64230K [0x00000005c0000000, 0x00000005cb900000, 0x0000000715580000) + object space 189440K, 33% used [0x00000005c0000000,0x00000005c3eb9b00,0x00000005cb900000) + Metaspace used 56074K, capacity 59103K, committed 59184K, reserved 1101824K + class space used 6856K, capacity 7422K, committed 7472K, reserved 1048576K +Event: 7.729 GC heap after +Heap after GC invocations=12 (full 3): + PSYoungGen total 1641984K, used 0K [0x0000000715580000, 0x00000007a1980000, 0x00000007c0000000) + eden space 1599488K, 0% used [0x0000000715580000,0x0000000715580000,0x0000000776f80000) + from space 42496K, 0% used [0x0000000776f80000,0x0000000776f80000,0x0000000779900000) + to space 57856K, 0% used [0x000000079e100000,0x000000079e100000,0x00000007a1980000) + ParOldGen total 327168K, used 104687K [0x00000005c0000000, 0x00000005d3f80000, 0x0000000715580000) + object space 327168K, 31% used [0x00000005c0000000,0x00000005c663bed0,0x00000005d3f80000) + Metaspace used 55901K, capacity 58827K, committed 59184K, reserved 1101824K + class space used 6831K, capacity 7376K, committed 7472K, reserved 1048576K +} +Event: 12.785 GC heap before +{Heap before GC invocations=13 (full 3): + PSYoungGen total 1641984K, used 1599488K [0x0000000715580000, 0x00000007a1980000, 0x00000007c0000000) + eden space 1599488K, 100% used [0x0000000715580000,0x0000000776f80000,0x0000000776f80000) + from space 42496K, 0% used [0x0000000776f80000,0x0000000776f80000,0x0000000779900000) + to space 57856K, 0% used [0x000000079e100000,0x000000079e100000,0x00000007a1980000) + ParOldGen total 327168K, used 104687K [0x00000005c0000000, 0x00000005d3f80000, 0x0000000715580000) + object space 327168K, 31% used [0x00000005c0000000,0x00000005c663bed0,0x00000005d3f80000) + Metaspace used 79446K, capacity 84909K, committed 85040K, reserved 1124352K + class space used 9049K, capacity 9984K, committed 10032K, reserved 1048576K +Event: 12.804 GC heap after +Heap after GC invocations=13 (full 3): + PSYoungGen total 2195456K, used 49272K [0x0000000715580000, 0x00000007a1180000, 0x00000007c0000000) + eden space 2145792K, 0% used [0x0000000715580000,0x0000000715580000,0x0000000798500000) + from space 49664K, 99% used [0x000000079e100000,0x00000007a111e178,0x00000007a1180000) + to space 62976K, 0% used [0x0000000799680000,0x0000000799680000,0x000000079d400000) + ParOldGen total 327168K, used 104703K [0x00000005c0000000, 0x00000005d3f80000, 0x0000000715580000) + object space 327168K, 32% used [0x00000005c0000000,0x00000005c663fed0,0x00000005d3f80000) + Metaspace used 79446K, capacity 84909K, committed 85040K, reserved 1124352K + class space used 9049K, capacity 9984K, committed 10032K, reserved 1048576K +} +Event: 17.034 GC heap before +{Heap before GC invocations=14 (full 3): + PSYoungGen total 2195456K, used 2195064K [0x0000000715580000, 0x00000007a1180000, 0x00000007c0000000) + eden space 2145792K, 100% used [0x0000000715580000,0x0000000798500000,0x0000000798500000) + from space 49664K, 99% used [0x000000079e100000,0x00000007a111e178,0x00000007a1180000) + to space 62976K, 0% used [0x0000000799680000,0x0000000799680000,0x000000079d400000) + ParOldGen total 327168K, used 104703K [0x00000005c0000000, 0x00000005d3f80000, 0x0000000715580000) + object space 327168K, 32% used [0x00000005c0000000,0x00000005c663fed0,0x00000005d3f80000) + Metaspace used 79973K, capacity 85653K, committed 85936K, reserved 1124352K + class space used 9083K, capacity 10044K, committed 10160K, reserved 1048576K +Event: 17.090 GC heap after +Heap after GC invocations=14 (full 3): + PSYoungGen total 2226688K, used 32624K [0x0000000715580000, 0x00000007c0000000, 0x00000007c0000000) + eden space 2163712K, 0% used [0x0000000715580000,0x0000000715580000,0x0000000799680000) + from space 62976K, 51% used [0x0000000799680000,0x000000079b65c2d0,0x000000079d400000) + to space 60928K, 0% used [0x00000007bc480000,0x00000007bc480000,0x00000007c0000000) + ParOldGen total 327168K, used 145593K [0x00000005c0000000, 0x00000005d3f80000, 0x0000000715580000) + object space 327168K, 44% used [0x00000005c0000000,0x00000005c8e2e718,0x00000005d3f80000) + Metaspace used 79973K, capacity 85653K, committed 85936K, reserved 1124352K + class space used 9083K, capacity 10044K, committed 10160K, reserved 1048576K +} +Event: 17.875 GC heap before +{Heap before GC invocations=15 (full 3): + PSYoungGen total 2226688K, used 550337K [0x0000000715580000, 0x00000007c0000000, 0x00000007c0000000) + eden space 2163712K, 23% used [0x0000000715580000,0x0000000734f14408,0x0000000799680000) + from space 62976K, 51% used [0x0000000799680000,0x000000079b65c2d0,0x000000079d400000) + to space 60928K, 0% used [0x00000007bc480000,0x00000007bc480000,0x00000007c0000000) + ParOldGen total 327168K, used 145593K [0x00000005c0000000, 0x00000005d3f80000, 0x0000000715580000) + object space 327168K, 44% used [0x00000005c0000000,0x00000005c8e2e718,0x00000005d3f80000) + Metaspace used 92415K, capacity 98572K, committed 98640K, reserved 1136640K + class space used 10319K, capacity 11401K, committed 11440K, reserved 1048576K +Event: 17.902 GC heap after +Heap after GC invocations=15 (full 3): + PSYoungGen total 2729984K, used 14366K [0x0000000715580000, 0x00000007bfd00000, 0x00000007c0000000) + eden space 2672128K, 0% used [0x0000000715580000,0x0000000715580000,0x00000007b8700000) + from space 57856K, 24% used [0x00000007bc480000,0x00000007bd2878a0,0x00000007bfd00000) + to space 60416K, 0% used [0x00000007b8700000,0x00000007b8700000,0x00000007bc200000) + ParOldGen total 327168K, used 178070K [0x00000005c0000000, 0x00000005d3f80000, 0x0000000715580000) + object space 327168K, 54% used [0x00000005c0000000,0x00000005cade5818,0x00000005d3f80000) + Metaspace used 92415K, capacity 98572K, committed 98640K, reserved 1136640K + class space used 10319K, capacity 11401K, committed 11440K, reserved 1048576K +} +Event: 17.902 GC heap before +{Heap before GC invocations=16 (full 4): + PSYoungGen total 2729984K, used 14366K [0x0000000715580000, 0x00000007bfd00000, 0x00000007c0000000) + eden space 2672128K, 0% used [0x0000000715580000,0x0000000715580000,0x00000007b8700000) + from space 57856K, 24% used [0x00000007bc480000,0x00000007bd2878a0,0x00000007bfd00000) + to space 60416K, 0% used [0x00000007b8700000,0x00000007b8700000,0x00000007bc200000) + ParOldGen total 327168K, used 178070K [0x00000005c0000000, 0x00000005d3f80000, 0x0000000715580000) + object space 327168K, 54% used [0x00000005c0000000,0x00000005cade5818,0x00000005d3f80000) + Metaspace used 92415K, capacity 98572K, committed 98640K, reserved 1136640K + class space used 10319K, capacity 11401K, committed 11440K, reserved 1048576K +Event: 18.135 GC heap after +Heap after GC invocations=16 (full 4): + PSYoungGen total 2729984K, used 0K [0x0000000715580000, 0x00000007bfd00000, 0x00000007c0000000) + eden space 2672128K, 0% used [0x0000000715580000,0x0000000715580000,0x00000007b8700000) + from space 57856K, 0% used [0x00000007bc480000,0x00000007bc480000,0x00000007bfd00000) + to space 60416K, 0% used [0x00000007b8700000,0x00000007b8700000,0x00000007bc200000) + ParOldGen total 483328K, used 184293K [0x00000005c0000000, 0x00000005dd800000, 0x0000000715580000) + object space 483328K, 38% used [0x00000005c0000000,0x00000005cb3f9600,0x00000005dd800000) + Metaspace used 91510K, capacity 97090K, committed 98640K, reserved 1136640K + class space used 10179K, capacity 11150K, committed 11440K, reserved 1048576K +} + +Deoptimization events (0 events): +No events + +Classes redefined (0 events): +No events + +Internal exceptions (10 events): +Event: 18.172 Thread 0x000000011f8d0000 Exception (0x00000007166f8760) thrown at [/System/Volumes/Data/ws/workspace/jdk-8u322/label/macosx-aarch64/type/b8/build/hotspot/src/share/vm/prims/jni.cpp, line 738] +Event: 18.172 Thread 0x000000011f8d0000 Exception (0x00000007166ffc50) thrown at [/System/Volumes/Data/ws/workspace/jdk-8u322/label/macosx-aarch64/type/b8/build/hotspot/src/share/vm/prims/jni.cpp, line 738] +Event: 18.178 Thread 0x000000011f8d0000 Exception (0x00000007168c3b80) thrown at [/System/Volumes/Data/ws/workspace/jdk-8u322/label/macosx-aarch64/type/b8/build/hotspot/src/share/vm/prims/jni.cpp, line 738] +Event: 18.178 Thread 0x000000011f8d0000 Exception (0x00000007168cdcf0) thrown at [/System/Volumes/Data/ws/workspace/jdk-8u322/label/macosx-aarch64/type/b8/build/hotspot/src/share/vm/prims/jni.cpp, line 738] +Event: 18.178 Thread 0x000000011f8d0000 Exception (0x00000007168d4200) thrown at [/System/Volumes/Data/ws/workspace/jdk-8u322/label/macosx-aarch64/type/b8/build/hotspot/src/share/vm/prims/jni.cpp, line 738] +Event: 18.178 Thread 0x000000011f8d0000 Exception (0x00000007168da6e0) thrown at [/System/Volumes/Data/ws/workspace/jdk-8u322/label/macosx-aarch64/type/b8/build/hotspot/src/share/vm/prims/jni.cpp, line 738] +Event: 18.182 Thread 0x000000011f8d0000 Exception (0x0000000716b67a70) thrown at [/System/Volumes/Data/ws/workspace/jdk-8u322/label/macosx-aarch64/type/b8/build/hotspot/src/share/vm/prims/jni.cpp, line 738] +Event: 18.182 Thread 0x000000011f8d0000 Exception (0x0000000716b6f330) thrown at [/System/Volumes/Data/ws/workspace/jdk-8u322/label/macosx-aarch64/type/b8/build/hotspot/src/share/vm/prims/jni.cpp, line 738] +Event: 18.182 Thread 0x000000011f8d0000 Exception (0x0000000716b796a8) thrown at [/System/Volumes/Data/ws/workspace/jdk-8u322/label/macosx-aarch64/type/b8/build/hotspot/src/share/vm/prims/jni.cpp, line 738] +Event: 18.182 Thread 0x000000011f8d0000 Exception (0x0000000716b80b98) thrown at [/System/Volumes/Data/ws/workspace/jdk-8u322/label/macosx-aarch64/type/b8/build/hotspot/src/share/vm/prims/jni.cpp, line 738] + +Events (10 events): +Event: 18.180 loading class com/fasterxml/jackson/core/json/JsonWriteContext +Event: 18.180 loading class com/fasterxml/jackson/core/json/JsonWriteContext done +Event: 18.180 loading class org/springframework/util/TypeUtils +Event: 18.180 loading class org/springframework/util/TypeUtils done +Event: 18.181 Executing VM operation: ForceSafepoint +Event: 18.181 Executing VM operation: ForceSafepoint done +Event: 18.181 loading class com/fasterxml/jackson/core/io/NumberOutput +Event: 18.181 loading class com/fasterxml/jackson/core/io/NumberOutput done +Event: 18.182 loading class org/apache/tomcat/util/buf/HexUtils +Event: 18.182 loading class org/apache/tomcat/util/buf/HexUtils done + + +Dynamic libraries: +0x00000001a144e000 /System/Library/Frameworks/Cocoa.framework/Versions/A/Cocoa +0x000000018d9c7000 /System/Library/Frameworks/AppKit.framework/Versions/C/AppKit +0x0000000190efd000 /System/Library/Frameworks/CoreData.framework/Versions/A/CoreData +0x000000018bd24000 /System/Library/Frameworks/Foundation.framework/Versions/C/Foundation +0x0000000195849000 /usr/lib/libSystem.B.dylib +0x000000018e87e000 /System/Library/PrivateFrameworks/UIFoundation.framework/Versions/A/UIFoundation +0x000000019b747000 /System/Library/PrivateFrameworks/RemoteViewServices.framework/Versions/A/RemoteViewServices +0x0000000193d60000 /System/Library/PrivateFrameworks/XCTTargetBootstrap.framework/Versions/A/XCTTargetBootstrap +0x000000019754a000 /System/Library/PrivateFrameworks/InternationalSupport.framework/Versions/A/InternationalSupport +0x00000001975d3000 /System/Library/PrivateFrameworks/UserActivity.framework/Versions/A/UserActivity +0x0000000196a78000 /usr/lib/libspindump.dylib +0x000000018eaee000 /System/Library/Frameworks/UniformTypeIdentifiers.framework/Versions/A/UniformTypeIdentifiers +0x00000001922ed000 /usr/lib/libapp_launch_measurement.dylib +0x0000000191865000 /System/Library/PrivateFrameworks/CoreAnalytics.framework/Versions/A/CoreAnalytics +0x00000001922f0000 /System/Library/PrivateFrameworks/CoreAutoLayout.framework/Versions/A/CoreAutoLayout +0x0000000193663000 /System/Library/Frameworks/Metal.framework/Versions/A/Metal +0x00000001943b2000 /usr/lib/liblangid.dylib +0x0000000193d64000 /System/Library/PrivateFrameworks/CoreSVG.framework/Versions/A/CoreSVG +0x000000018ffb5000 /System/Library/PrivateFrameworks/SkyLight.framework/Versions/A/SkyLight +0x0000000190382000 /System/Library/Frameworks/CoreGraphics.framework/Versions/A/CoreGraphics +0x000000019bdc5000 /System/Library/Frameworks/Accelerate.framework/Versions/A/Accelerate +0x00000001964ec000 /System/Library/PrivateFrameworks/IconServices.framework/Versions/A/IconServices +0x0000000193645000 /System/Library/Frameworks/IOSurface.framework/Versions/A/IOSurface +0x0000000191895000 /usr/lib/libDiagnosticMessagesClient.dylib +0x0000000195799000 /usr/lib/libz.1.dylib +0x000000019f20e000 /System/Library/Frameworks/ApplicationServices.framework/Versions/A/ApplicationServices +0x0000000193d48000 /System/Library/PrivateFrameworks/DFRFoundation.framework/Versions/A/DFRFoundation +0x000000018d268000 /usr/lib/libicucore.A.dylib +0x000000019834b000 /System/Library/Frameworks/AudioToolbox.framework/Versions/A/AudioToolbox +0x0000000197556000 /System/Library/PrivateFrameworks/DataDetectorsCore.framework/Versions/A/DataDetectorsCore +0x00000001ad6a4000 /System/Library/PrivateFrameworks/TextInput.framework/Versions/A/TextInput +0x000000018ff2c000 /usr/lib/libMobileGestalt.dylib +0x0000000193a18000 /System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/HIToolbox.framework/Versions/A/HIToolbox +0x0000000191cf6000 /System/Library/Frameworks/QuartzCore.framework/Versions/A/QuartzCore +0x000000018cee5000 /System/Library/Frameworks/Security.framework/Versions/A/Security +0x000000019b787000 /System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/SpeechRecognition.framework/Versions/A/SpeechRecognition +0x0000000192044000 /System/Library/PrivateFrameworks/CoreUI.framework/Versions/A/CoreUI +0x000000018c7b6000 /System/Library/Frameworks/CoreAudio.framework/Versions/A/CoreAudio +0x0000000191989000 /System/Library/Frameworks/DiskArbitration.framework/Versions/A/DiskArbitration +0x0000000196e5d000 /System/Library/PrivateFrameworks/MultitouchSupport.framework/Versions/A/MultitouchSupport +0x000000018ff2a000 /usr/lib/libenergytrace.dylib +0x000000018d891000 /System/Library/Frameworks/IOKit.framework/Versions/A/IOKit +0x000000019bb70000 /System/Library/Frameworks/CoreServices.framework/Versions/A/CoreServices +0x000000019227d000 /System/Library/PrivateFrameworks/PerformanceAnalysis.framework/Versions/A/PerformanceAnalysis +0x00000001ec251000 /System/Library/Frameworks/OpenGL.framework/Versions/A/OpenGL +0x0000000194e03000 /System/Library/PrivateFrameworks/MobileKeyBag.framework/Versions/A/MobileKeyBag +0x000000018ac6e000 /usr/lib/libobjc.A.dylib +0x0000000190992000 /System/Library/Frameworks/ColorSync.framework/Versions/A/ColorSync +0x000000018ae30000 /System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation +0x0000000193fe5000 /System/Library/Frameworks/CoreImage.framework/Versions/A/CoreImage +0x000000018c5d9000 /System/Library/Frameworks/CoreText.framework/Versions/A/CoreText +0x0000000193d94000 /System/Library/Frameworks/ImageIO.framework/Versions/A/ImageIO +0x000000019584f000 /System/Library/PrivateFrameworks/SoftLinking.framework/Versions/A/SoftLinking +0x000000019233a000 /usr/lib/libxml2.2.dylib +0x000000018ad2e000 /usr/lib/libc++.1.dylib +0x0000000195ae8000 /usr/lib/libcompression.dylib +0x00000001974a3000 /System/Library/PrivateFrameworks/TextureIO.framework/Versions/A/TextureIO +0x0000000196206000 /usr/lib/libate.dylib +0x0000000195843000 /usr/lib/system/libcache.dylib +0x0000000195801000 /usr/lib/system/libcommonCrypto.dylib +0x000000019582a000 /usr/lib/system/libcompiler_rt.dylib +0x0000000195821000 /usr/lib/system/libcopyfile.dylib +0x000000018ab82000 /usr/lib/system/libcorecrypto.dylib +0x000000018ac27000 /usr/lib/system/libdispatch.dylib +0x000000018adef000 /usr/lib/system/libdyld.dylib +0x0000000195839000 /usr/lib/system/libkeymgr.dylib +0x00000001957e3000 /usr/lib/system/libmacho.dylib +0x0000000194ee3000 /usr/lib/system/libquarantine.dylib +0x0000000195836000 /usr/lib/system/libremovefile.dylib +0x000000018ff81000 /usr/lib/system/libsystem_asl.dylib +0x000000018ab2c000 /usr/lib/system/libsystem_blocks.dylib +0x000000018acad000 /usr/lib/system/libsystem_c.dylib +0x000000019582e000 /usr/lib/system/libsystem_collections.dylib +0x00000001943a2000 /usr/lib/system/libsystem_configuration.dylib +0x0000000193626000 /usr/lib/system/libsystem_containermanager.dylib +0x000000019554a000 /usr/lib/system/libsystem_coreservices.dylib +0x000000018d513000 /usr/lib/system/libsystem_darwin.dylib +0x000000019583a000 /usr/lib/system/libsystem_dnssd.dylib +0x000000018acaa000 /usr/lib/system/libsystem_featureflags.dylib +0x000000018ae04000 /usr/lib/system/libsystem_info.dylib +0x00000001957ab000 /usr/lib/system/libsystem_m.dylib +0x000000018abfc000 /usr/lib/system/libsystem_malloc.dylib +0x000000018ff12000 /usr/lib/system/libsystem_networkextension.dylib +0x000000018d967000 /usr/lib/system/libsystem_notify.dylib +0x000000019ba4d000 /usr/lib/system/libsystem_product_info_filter.dylib +0x00000001943a7000 /usr/lib/system/libsystem_sandbox.dylib +0x0000000195833000 /usr/lib/system/libsystem_secinit.dylib +0x000000018adac000 /usr/lib/system/libsystem_kernel.dylib +0x000000018adfc000 /usr/lib/system/libsystem_platform.dylib +0x000000018ade2000 /usr/lib/system/libsystem_pthread.dylib +0x00000001916be000 /usr/lib/system/libsystem_symptoms.dylib +0x000000018ab68000 /usr/lib/system/libsystem_trace.dylib +0x000000019580e000 /usr/lib/system/libunwind.dylib +0x000000018ab2e000 /usr/lib/system/libxpc.dylib +0x000000018ad92000 /usr/lib/libc++abi.dylib +0x0000000195819000 /usr/lib/liboah.dylib +0x00000001960ce000 /usr/lib/liblzma.5.dylib +0x000000018ba18000 /System/Library/Frameworks/SystemConfiguration.framework/Versions/A/SystemConfiguration +0x000000019584b000 /usr/lib/libfakelink.dylib +0x000000018fa59000 /System/Library/Frameworks/CFNetwork.framework/Versions/A/CFNetwork +0x0000000195992000 /usr/lib/libarchive.2.dylib +0x00000001943ae000 /System/Library/PrivateFrameworks/AppleSystemInfo.framework/Versions/A/AppleSystemInfo +0x0000000194f0e000 /usr/lib/libbsm.0.dylib +0x000000018ef91000 /usr/lib/libnetwork.dylib +0x00000001957e9000 /usr/lib/system/libkxld.dylib +0x0000000194b25000 /System/Library/PrivateFrameworks/IOMobileFramebuffer.framework/Versions/A/IOMobileFramebuffer +0x0000000208082000 /usr/lib/libCoreEntitlements.dylib +0x000000019552c000 /System/Library/PrivateFrameworks/AppleFSCompression.framework/Versions/A/AppleFSCompression +0x0000000194ef6000 /usr/lib/libcoretls.dylib +0x00000001960e7000 /usr/lib/libcoretls_cfhelpers.dylib +0x0000000195ae3000 /usr/lib/libpam.2.dylib +0x00000001912e6000 /usr/lib/libsqlite3.dylib +0x000000019614f000 /usr/lib/libxar.1.dylib +0x000000019553d000 /usr/lib/libbz2.1.0.dylib +0x0000000195850000 /usr/lib/libpcap.A.dylib +0x00000001916b5000 /usr/lib/libdns_services.dylib +0x0000000195ab6000 /usr/lib/libapple_nghttp2.dylib +0x000000019588d000 /usr/lib/libiconv.2.dylib +0x00000001957e2000 /usr/lib/libcharset.1.dylib +0x00000001922b9000 /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/FSEvents.framework/Versions/A/FSEvents +0x000000018d51e000 /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CarbonCore.framework/Versions/A/CarbonCore +0x00000001918ec000 /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/Metadata.framework/Versions/A/Metadata +0x0000000195550000 /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/OSServices.framework/Versions/A/OSServices +0x0000000195a18000 /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/SearchKit.framework/Versions/A/SearchKit +0x0000000191643000 /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/AE.framework/Versions/A/AE +0x000000018b374000 /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/LaunchServices.framework/Versions/A/LaunchServices +0x0000000196077000 /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/DictionaryServices.framework/Versions/A/DictionaryServices +0x00000001922c6000 /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/SharedFileList.framework/Versions/A/SharedFileList +0x0000000194ee6000 /usr/lib/libCheckFix.dylib +0x000000018ff99000 /System/Library/PrivateFrameworks/TCC.framework/Versions/A/TCC +0x00000001943b4000 /System/Library/PrivateFrameworks/CoreNLP.framework/Versions/A/CoreNLP +0x0000000191898000 /System/Library/PrivateFrameworks/MetadataUtilities.framework/Versions/A/MetadataUtilities +0x000000018bad1000 /usr/lib/libmecabra.dylib +0x0000000194f1f000 /usr/lib/libmecab.dylib +0x000000018ba9d000 /usr/lib/libCRFSuite.dylib +0x0000000194f7d000 /usr/lib/libgermantok.dylib +0x0000000195a8f000 /usr/lib/libThaiTokenizer.dylib +0x0000000191991000 /System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vImage.framework/Versions/A/vImage +0x000000019bb47000 /System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/vecLib +0x0000000196193000 /System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libvMisc.dylib +0x0000000194a2f000 /System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libvDSP.dylib +0x000000018b6f7000 /System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libBLAS.dylib +0x0000000195bb7000 /System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libLAPACK.dylib +0x0000000194f80000 /System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libLinearAlgebra.dylib +0x0000000195ace000 /System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libSparseBLAS.dylib +0x0000000195bb2000 /System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libQuadrature.dylib +0x00000001944ab000 /System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libBNNS.dylib +0x000000018b9b5000 /System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libSparse.dylib +0x00000001944a3000 /System/Library/PrivateFrameworks/LinguisticData.framework/Versions/A/LinguisticData +0x000000018b96b000 /System/Library/PrivateFrameworks/Lexicon.framework/Versions/A/Lexicon +0x000000019618b000 /usr/lib/libChineseTokenizer.dylib +0x000000018c112000 /System/Library/PrivateFrameworks/LanguageModeling.framework/Versions/A/LanguageModeling +0x0000000195a91000 /System/Library/PrivateFrameworks/AppleSauce.framework/Versions/A/AppleSauce +0x0000000194b12000 /System/Library/PrivateFrameworks/CoreEmoji.framework/Versions/A/CoreEmoji +0x0000000195980000 /usr/lib/libcmph.dylib +0x0000000192299000 /System/Library/Frameworks/OpenDirectory.framework/Versions/A/Frameworks/CFOpenDirectory.framework/Versions/A/CFOpenDirectory +0x0000000192289000 /System/Library/Frameworks/OpenDirectory.framework/Versions/A/OpenDirectory +0x00000001960e9000 /System/Library/PrivateFrameworks/APFS.framework/Versions/A/APFS +0x0000000194e3e000 /System/Library/Frameworks/SecurityFoundation.framework/Versions/A/SecurityFoundation +0x000000019615d000 /usr/lib/libutil.dylib +0x000000018d853000 /System/Library/PrivateFrameworks/CoreServicesStore.framework/Versions/A/CoreServicesStore +0x0000000196161000 /usr/lib/libxslt.1.dylib +0x0000000194ed2000 /System/Library/PrivateFrameworks/BackgroundTaskManagement.framework/Versions/A/BackgroundTaskManagement +0x00000001973c4000 /System/Library/Frameworks/ImageIO.framework/Versions/A/Resources/libRadiance.dylib +0x00000001973cd000 /System/Library/Frameworks/ImageIO.framework/Versions/A/Resources/libJPEG.dylib +0x000000019731f000 /System/Library/Frameworks/ImageIO.framework/Versions/A/Resources/libPng.dylib +0x0000000197341000 /System/Library/Frameworks/ImageIO.framework/Versions/A/Resources/libTIFF.dylib +0x0000000197428000 /System/Library/Frameworks/ImageIO.framework/Versions/A/Resources/libGIF.dylib +0x0000000196d6d000 /System/Library/Frameworks/ImageIO.framework/Versions/A/Resources/libJP2.dylib +0x00000001964b2000 /usr/lib/libexpat.1.dylib +0x0000000196d28000 /System/Library/PrivateFrameworks/AppleJPEG.framework/Versions/A/AppleJPEG +0x00000001938d7000 /System/Library/PrivateFrameworks/FontServices.framework/libFontParser.dylib +0x00000001915e8000 /System/Library/PrivateFrameworks/RunningBoardServices.framework/Versions/A/RunningBoardServices +0x00000001a1ac4000 /System/Library/PrivateFrameworks/IOSurfaceAccelerator.framework/Versions/A/IOSurfaceAccelerator +0x0000000196e59000 /System/Library/PrivateFrameworks/WatchdogClient.framework/Versions/A/WatchdogClient +0x000000018c216000 /System/Library/Frameworks/CoreDisplay.framework/Versions/A/CoreDisplay +0x00000001937c5000 /System/Library/Frameworks/CoreMedia.framework/Versions/A/CoreMedia +0x0000000193659000 /System/Library/PrivateFrameworks/IOAccelerator.framework/Versions/A/IOAccelerator +0x0000000192427000 /System/Library/Frameworks/CoreVideo.framework/Versions/A/CoreVideo +0x0000000195ae1000 /System/Library/Frameworks/MetalPerformanceShaders.framework/Versions/A/MetalPerformanceShaders +0x0000000196e96000 /System/Library/Frameworks/VideoToolbox.framework/Versions/A/VideoToolbox +0x000000019152c000 /System/Library/PrivateFrameworks/BaseBoard.framework/Versions/A/BaseBoard +0x00000001912cb000 /System/Library/PrivateFrameworks/ProtocolBuffer.framework/Versions/A/ProtocolBuffer +0x00000001973bf000 /System/Library/PrivateFrameworks/GPUWrangler.framework/Versions/A/GPUWrangler +0x000000019739e000 /System/Library/PrivateFrameworks/IOPresentment.framework/Versions/A/IOPresentment +0x00000001973c7000 /System/Library/PrivateFrameworks/DSExternalDisplay.framework/Versions/A/DSExternalDisplay +0x00000001ec244000 /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libCoreFSCache.dylib +0x00000001f5a2f000 /System/Library/PrivateFrameworks/GPUCompiler.framework/Versions/31001/Libraries/libGPUCompilerUtils.dylib +0x000000019742d000 /System/Library/PrivateFrameworks/CMCaptureCore.framework/Versions/A/CMCaptureCore +0x0000000196a66000 /System/Library/PrivateFrameworks/AppServerSupport.framework/Versions/A/AppServerSupport +0x0000000198c06000 /System/Library/PrivateFrameworks/perfdata.framework/Versions/A/perfdata +0x000000018c336000 /System/Library/PrivateFrameworks/AudioToolboxCore.framework/Versions/A/AudioToolboxCore +0x000000019379d000 /System/Library/PrivateFrameworks/caulk.framework/Versions/A/caulk +0x00000001984fb000 /usr/lib/libAudioStatistics.dylib +0x00000001a9e18000 /System/Library/PrivateFrameworks/SystemPolicy.framework/Versions/A/SystemPolicy +0x000000019875b000 /usr/lib/libSMC.dylib +0x00000001a1330000 /System/Library/Frameworks/CoreMIDI.framework/Versions/A/CoreMIDI +0x00000001972ed000 /usr/lib/libAudioToolboxUtility.dylib +0x00000001a6245000 /System/Library/PrivateFrameworks/OSAServicesClient.framework/Versions/A/OSAServicesClient +0x0000000198c13000 /usr/lib/libperfcheck.dylib +0x00000001aa91f000 /usr/lib/libmis.dylib +0x00000001ec2a5000 /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGLU.dylib +0x00000001ec264000 /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGFXShared.dylib +0x00000001ec44e000 /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib +0x00000001ec26d000 /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGLImage.dylib +0x00000001ec261000 /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libCVMSPluginSupport.dylib +0x00000001ec24b000 /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libCoreVMClient.dylib +0x000000019432f000 /System/Library/Frameworks/MetalPerformanceShaders.framework/Versions/A/Frameworks/MPSCore.framework/Versions/A/MPSCore +0x000000019549f000 /System/Library/Frameworks/MetalPerformanceShaders.framework/Versions/A/Frameworks/MPSImage.framework/Versions/A/MPSImage +0x0000000194f95000 /System/Library/Frameworks/MetalPerformanceShaders.framework/Versions/A/Frameworks/MPSNeuralNetwork.framework/Versions/A/MPSNeuralNetwork +0x00000001953d2000 /System/Library/Frameworks/MetalPerformanceShaders.framework/Versions/A/Frameworks/MPSMatrix.framework/Versions/A/MPSMatrix +0x00000001951ad000 /System/Library/Frameworks/MetalPerformanceShaders.framework/Versions/A/Frameworks/MPSRayIntersector.framework/Versions/A/MPSRayIntersector +0x0000000195403000 /System/Library/Frameworks/MetalPerformanceShaders.framework/Versions/A/Frameworks/MPSNDArray.framework/Versions/A/MPSNDArray +0x00000001edf7c000 /System/Library/Frameworks/MetalPerformanceShaders.framework/Versions/A/Frameworks/MPSFunctions.framework/Versions/A/MPSFunctions +0x000000018b5d5000 /System/Library/PrivateFrameworks/MetalTools.framework/Versions/A/MetalTools +0x00000001943ac000 /System/Library/PrivateFrameworks/AggregateDictionary.framework/Versions/A/AggregateDictionary +0x0000000196298000 /usr/lib/libIOReport.dylib +0x00000001a0317000 /System/Library/PrivateFrameworks/ASEProcessing.framework/Versions/A/ASEProcessing +0x000000019660b000 /System/Library/PrivateFrameworks/FaceCore.framework/Versions/A/FaceCore +0x00000001965fd000 /System/Library/PrivateFrameworks/GraphVisualizer.framework/Versions/A/GraphVisualizer +0x00000001f5946000 /System/Library/PrivateFrameworks/FontServices.framework/Versions/A/FontServices +0x0000000196a20000 /System/Library/PrivateFrameworks/OTSVG.framework/Versions/A/OTSVG +0x0000000191ff5000 /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ATS.framework/Versions/A/Resources/libFontRegistry.dylib +0x0000000196a6f000 /System/Library/PrivateFrameworks/FontServices.framework/libhvf.dylib +0x00000001f5947000 /System/Library/PrivateFrameworks/FontServices.framework/libXTFontStaticRegistryData.dylib +0x00000001ec5f0000 /System/Library/Frameworks/OpenCL.framework/Versions/A/OpenCL +0x0000000196466000 /System/Library/PrivateFrameworks/AppleVA.framework/Versions/A/AppleVA +0x0000000198523000 /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ATS.framework/Versions/A/ATS +0x0000000190a8f000 /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/HIServices.framework/Versions/A/HIServices +0x0000000197437000 /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/PrintCore.framework/Versions/A/PrintCore +0x00000001988ae000 /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/QD.framework/Versions/A/QD +0x00000001988a6000 /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ColorSyncLegacy.framework/Versions/A/ColorSyncLegacy +0x000000019850f000 /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/SpeechSynthesis.framework/Versions/A/SpeechSynthesis +0x00000001973f8000 /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ATSUI.framework/Versions/A/ATSUI +0x000000019883b000 /usr/lib/libcups.2.dylib +0x0000000198c21000 /System/Library/Frameworks/Kerberos.framework/Versions/A/Kerberos +0x0000000198c32000 /System/Library/Frameworks/GSS.framework/Versions/A/GSS +0x0000000198592000 /usr/lib/libresolv.9.dylib +0x0000000196a7d000 /System/Library/PrivateFrameworks/Heimdal.framework/Versions/A/Heimdal +0x000000019f586000 /System/Library/Frameworks/Kerberos.framework/Versions/A/Libraries/libHeimdalProxy.dylib +0x00000001916c7000 /System/Library/Frameworks/Network.framework/Versions/A/Network +0x00000001964cd000 /usr/lib/libheimdal-asn1.dylib +0x0000000198c78000 /System/Library/PrivateFrameworks/CommonAuth.framework/Versions/A/CommonAuth +0x0000000198489000 /System/Library/PrivateFrameworks/AudioSession.framework/Versions/A/AudioSession +0x000000019655e000 /System/Library/PrivateFrameworks/MediaExperience.framework/Versions/A/MediaExperience +0x0000000198311000 /System/Library/PrivateFrameworks/AudioSession.framework/libSessionUtility.dylib +0x00000001988ba000 /System/Library/PrivateFrameworks/AudioResourceArbitration.framework/Versions/A/AudioResourceArbitration +0x000000019c9c5000 /System/Library/PrivateFrameworks/PowerLog.framework/Versions/A/PowerLog +0x00000001964d6000 /System/Library/PrivateFrameworks/IconFoundation.framework/Versions/A/IconFoundation +0x000000019b773000 /System/Library/PrivateFrameworks/SpeechRecognitionCore.framework/Versions/A/SpeechRecognitionCore +0x00000001cf25b000 /System/Library/CoreServices/Encodings/libSimplifiedChineseConverter.dylib +0x00000001011b0000 /Users/gxwebsoft/Library/Java/JavaVirtualMachines/liberica-1.8.0_322/jre/lib/server/libjvm.dylib +0x00000001003f4000 /Users/gxwebsoft/Library/Java/JavaVirtualMachines/liberica-1.8.0_322/jre/lib/libverify.dylib +0x0000000100550000 /Users/gxwebsoft/Library/Java/JavaVirtualMachines/liberica-1.8.0_322/jre/lib/libjava.dylib +0x0000000100500000 /Users/gxwebsoft/Library/Java/JavaVirtualMachines/liberica-1.8.0_322/jre/lib/libinstrument.dylib +0x00000001005a0000 /Users/gxwebsoft/Library/Java/JavaVirtualMachines/liberica-1.8.0_322/jre/lib/libzip.dylib +0x00000001284fc000 /Users/gxwebsoft/Library/Java/JavaVirtualMachines/liberica-1.8.0_322/jre/lib/libnio.dylib +0x0000000128550000 /Users/gxwebsoft/Library/Java/JavaVirtualMachines/liberica-1.8.0_322/jre/lib/libnet.dylib +0x0000000128524000 /Users/gxwebsoft/Library/Java/JavaVirtualMachines/liberica-1.8.0_322/jre/lib/libmanagement.dylib +0x000000012c700000 /Users/gxwebsoft/Library/Java/JavaVirtualMachines/liberica-1.8.0_322/jre/lib/libsunec.dylib + +VM Arguments: +jvm_args: -XX:TieredStopAtLevel=1 -Xverify:none -Dspring.output.ansi.enabled=always -javaagent:/Applications/IntelliJ IDEA.app/Contents/lib/idea_rt.jar=50783:/Applications/IntelliJ IDEA.app/Contents/bin -Dcom.sun.management.jmxremote -Dspring.jmx.enabled=true -Dspring.liveBeansView.mbeanDomain -Dspring.application.admin.enabled=true -Dfile.encoding=UTF-8 +java_command: com.gxwebsoft.WebSoftApplication +java_class_path (initial): /Users/gxwebsoft/Library/Java/JavaVirtualMachines/liberica-1.8.0_322/jre/lib/charsets.jar:/Users/gxwebsoft/Library/Java/JavaVirtualMachines/liberica-1.8.0_322/jre/lib/ext/cldrdata.jar:/Users/gxwebsoft/Library/Java/JavaVirtualMachines/liberica-1.8.0_322/jre/lib/ext/dnsns.jar:/Users/gxwebsoft/Library/Java/JavaVirtualMachines/liberica-1.8.0_322/jre/lib/ext/jaccess.jar:/Users/gxwebsoft/Library/Java/JavaVirtualMachines/liberica-1.8.0_322/jre/lib/ext/jfxrt.jar:/Users/gxwebsoft/Library/Java/JavaVirtualMachines/liberica-1.8.0_322/jre/lib/ext/localedata.jar:/Users/gxwebsoft/Library/Java/JavaVirtualMachines/liberica-1.8.0_322/jre/lib/ext/nashorn.jar:/Users/gxwebsoft/Library/Java/JavaVirtualMachines/liberica-1.8.0_322/jre/lib/ext/sunec.jar:/Users/gxwebsoft/Library/Java/JavaVirtualMachines/liberica-1.8.0_322/jre/lib/ext/sunjce_provider.jar:/Users/gxwebsoft/Library/Java/JavaVirtualMachines/liberica-1.8.0_322/jre/lib/ext/sunpkcs11.jar:/Users/gxwebsoft/Library/Java/JavaVirtualMachines/liberica-1.8.0_322/jre/lib/ext/zipfs.jar:/Users/gxwebsoft/Library/Java/JavaVirtualMachines/liberica-1.8.0_322/jre/lib/jce.jar:/Users/gxwebsoft/Library/Java/JavaVirtualMachines/liberica-1.8.0_322/jre/lib/jfr.jar:/Users/gxwebsoft/Library/Java/JavaVirtualMachines/liberica-1.8.0_322/jre/lib/jfxswt.jar:/Users/gxwebsoft/Library/Java/JavaVirtualMachines/liberica-1.8.0_322/jre/lib/jsse.jar:/Users/gxwebsoft/Library/Java/JavaVirtualMachines/liberica-1.8.0_322/jre/lib/management-agent.jar:/Users/gxwebsoft/Library/Java/JavaVirtualMachines/liberica-1.8.0_322/jre/lib/resources.jar:/Users/gxwebsoft/Library/Java/JavaVirtualMachines/liberica-1.8.0_322/jre/lib/rt.jar:/Users/gxwebsoft/Library/Java/JavaVirtualMachines/liberica-1.8.0_322/lib/ant-javafx.jar:/Users/gxwebsoft/Library/Java/JavaVirtualMachines/liberica-1.8.0_322/lib/dt.jar:/Users/gxwebsoft/Library/Java/JavaVirtualMachines/liberica-1.8.0_322/lib/javafx-mx.jar:/Users/gxwebsoft/Library/Java/JavaVirtualMachines/liberica-1.8.0_322/lib/ +Launcher Type: SUN_STANDARD + +Environment Variables: +PATH=/Users/gxwebsoft/.yarn/bin:/Users/gxwebsoft/.config/yarn/global/node_modules/.bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Library/Apple/usr/bin:/Users/gxwebsoft/Library/Application Support/JetBrains/Toolbox/scripts +SHELL=/bin/zsh + +Signal Handlers: +SIGSEGV: [libjvm.dylib+0x54ffdc], sa_mask[0]=11111111011111110111111111111111, sa_flags=SA_ONSTACK|SA_RESTART|SA_SIGINFO +SIGBUS: [libjvm.dylib+0x54ffdc], sa_mask[0]=11111111011111110111111111111111, sa_flags=SA_RESTART|SA_SIGINFO +SIGFPE: [libjvm.dylib+0x44d678], sa_mask[0]=11111111011111110111111111111111, sa_flags=SA_RESTART|SA_SIGINFO +SIGPIPE: [libjvm.dylib+0x44d678], sa_mask[0]=11111111011111110111111111111111, sa_flags=SA_RESTART|SA_SIGINFO +SIGXFSZ: [libjvm.dylib+0x44d678], sa_mask[0]=11111111011111110111111111111111, sa_flags=SA_RESTART|SA_SIGINFO +SIGILL: [libjvm.dylib+0x44d678], sa_mask[0]=11111111011111110111111111111111, sa_flags=SA_RESTART|SA_SIGINFO +SIGUSR1: SIG_DFL, sa_mask[0]=00000000000000000000000000000000, sa_flags=none +SIGUSR2: [libjvm.dylib+0x44df9c], sa_mask[0]=00100000000000000000000000000000, sa_flags=SA_RESTART|SA_SIGINFO +SIGHUP: [libjvm.dylib+0x44bf28], sa_mask[0]=11111111011111110111111111111111, sa_flags=SA_RESTART|SA_SIGINFO +SIGINT: [libjvm.dylib+0x44bf28], sa_mask[0]=11111111011111110111111111111111, sa_flags=SA_RESTART|SA_SIGINFO +SIGTERM: [libjvm.dylib+0x44bf28], sa_mask[0]=11111111011111110111111111111111, sa_flags=SA_RESTART|SA_SIGINFO +SIGQUIT: [libjvm.dylib+0x44bf28], sa_mask[0]=11111111011111110111111111111111, sa_flags=SA_RESTART|SA_SIGINFO + + +--------------- S Y S T E M --------------- + +OS:Bsduname:Darwin 21.3.0 Darwin Kernel Version 21.3.0: Wed Jan 5 21:37:58 PST 2022; root:xnu-8019.80.24~20/RELEASE_ARM64_T6000 arm64 +rlimit: STACK 8176k, CORE 0k, NPROC 5333, NOFILE 10240, AS infinity +load average:4.43 4.29 4.45 + +CPU:total 10 (initial active 10) simd, crc, lse + +Memory: 16k page, physical 33554432k(80224k free) + +/proc/meminfo: + + +vm_info: OpenJDK 64-Bit Server VM (25.322-b06) for bsd-aarch64 JRE (1.8.0_322-b06), built on Jan 19 2022 05:50:08 by "re" with gcc Apple LLVM 12.0.0 (clang-1200.0.32.28) + +time: Mon Jul 17 17:45:36 2023 +timezone: CST +elapsed time: 18.208368 seconds (0d 0h 0m 18s) + diff --git a/mvnw b/mvnw new file mode 100644 index 0000000..a16b543 --- /dev/null +++ b/mvnw @@ -0,0 +1,310 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven Start Up Batch script +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# M2_HOME - location of maven2's installed home dir +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "`uname`" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + export JAVA_HOME="`/usr/libexec/java_home`" + else + export JAVA_HOME="/Library/Java/Home" + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=`java-config --jre-home` + fi +fi + +if [ -z "$M2_HOME" ] ; then + ## resolve links - $0 may be a link to maven's home + PRG="$0" + + # need this for relative symlinks + while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG="`dirname "$PRG"`/$link" + fi + done + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Mingw, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="`which java`" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=`cd "$wdir/.."; pwd` + fi + # end of workaround + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +BASE_DIR=`find_maven_basedir "$(pwd)"` +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found .mvn/wrapper/maven-wrapper.jar" + fi +else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." + fi + if [ -n "$MVNW_REPOURL" ]; then + jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + else + jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + fi + while IFS="=" read key value; do + case "$key" in (wrapperUrl) jarUrl="$value"; break ;; + esac + done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Downloading from: $jarUrl" + fi + wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" + if $cygwin; then + wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"` + fi + + if command -v wget > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found wget ... using wget" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget "$jarUrl" -O "$wrapperJarPath" + else + wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" + fi + elif command -v curl > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found curl ... using curl" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl -o "$wrapperJarPath" "$jarUrl" -f + else + curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f + fi + + else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Falling back to using Java to download" + fi + javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" + # For Cygwin, switch paths to Windows format before running javac + if $cygwin; then + javaClass=`cygpath --path --windows "$javaClass"` + fi + if [ -e "$javaClass" ]; then + if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Compiling MavenWrapperDownloader.java ..." + fi + # Compiling the Java class + ("$JAVA_HOME/bin/javac" "$javaClass") + fi + if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + # Running the downloader + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Running MavenWrapperDownloader.java ..." + fi + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +if [ "$MVNW_VERBOSE" = true ]; then + echo $MAVEN_PROJECTBASEDIR +fi +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --path --windows "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` +fi + +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" +export MAVEN_CMD_LINE_ARGS + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/mvnw.cmd b/mvnw.cmd new file mode 100644 index 0000000..c8d4337 --- /dev/null +++ b/mvnw.cmd @@ -0,0 +1,182 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM https://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" +if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + +FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) +) else ( + if not "%MVNW_REPOURL%" == "" ( + SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %DOWNLOAD_URL% + ) + + powershell -Command "&{"^ + "$webclient = new-object System.Net.WebClient;"^ + "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ + "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ + "}"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + +%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" +if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%" == "on" pause + +if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% + +exit /B %ERROR_CODE% diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..d53960e --- /dev/null +++ b/pom.xml @@ -0,0 +1,316 @@ + + + 4.0.0 + + com.gxwebsoft + com-gxwebsoft-server + 1.5.2 + + com-gxwebsoft-api + WebSoftApi project for Spring Boot + + + org.springframework.boot + spring-boot-starter-parent + 2.5.4 + + + + + 1.8 + UTF-8 + UTF-8 + + + + + + org.springframework.boot + spring-boot-devtools + runtime + true + + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + org.springframework.boot + spring-boot-starter-web + + + + + org.springframework.boot + spring-boot-starter-aop + + + + + org.springframework.boot + spring-boot-configuration-processor + true + + + + + org.projectlombok + lombok + true + + + + + mysql + mysql-connector-java + runtime + + + + + com.alibaba + druid-spring-boot-starter + 1.2.6 + + + + + com.baomidou + mybatis-plus-boot-starter + 3.4.3.3 + + + + + com.github.yulichang + mybatis-plus-join-boot-starter + 1.4.5 + + + + + com.baomidou + mybatis-plus-generator + 3.4.1 + + + + + cn.hutool + hutool-core + 5.8.11 + + + cn.hutool + hutool-extra + 5.8.11 + + + cn.hutool + hutool-http + 5.8.11 + + + cn.hutool + hutool-crypto + 5.8.11 + + + + + cn.afterturn + easypoi-base + 4.4.0 + + + + + org.apache.tika + tika-core + 2.1.0 + + + + + com.github.livesense + jodconverter-core + 1.0.5 + + + + + org.springframework.boot + spring-boot-starter-mail + + + + + com.ibeetl + beetl + 3.6.1.RELEASE + + + + + io.springfox + springfox-boot-starter + 3.0.0 + + + + + org.springframework.boot + spring-boot-starter-security + + + + + io.jsonwebtoken + jjwt-impl + 0.11.2 + + + io.jsonwebtoken + jjwt-jackson + 0.11.2 + + + + + com.github.whvcse + easy-captcha + 1.6.2 + + + + + org.springframework.boot + spring-boot-starter-data-redis + + + + + com.aliyun + aliyun-java-sdk-core + 4.4.3 + + + + com.alipay.sdk + alipay-sdk-java + 4.35.0.ALL + + + + org.bouncycastle + bcprov-jdk15on + 1.70 + + + + commons-logging + commons-logging + 1.2 + + + + com.alibaba + fastjson + 2.0.20 + + + + + com.google.zxing + core + 3.3.3 + + + + com.google.code.gson + gson + 2.8.0 + + + + com.vaadin.external.google + android-json + 0.0.20131108.vaadin1 + compile + + + + + com.corundumstudio.socketio + netty-socketio + 2.0.2 + + + + + com.github.wechatpay-apiv3 + wechatpay-java + 0.2.9 + + + + com.github.binarywang + weixin-java-miniapp + 4.5.0 + + + + + com.aliyun.oss + aliyun-sdk-oss + 3.17.0 + + + + + + + + src/main/java + + **/*Mapper.xml + + + + src/main/resources + + ** + + + + + + org.springframework.boot + spring-boot-maven-plugin + 2.5.4 + + + + org.projectlombok + lombok + + + + + + + + + + aliYunMaven + https://maven.aliyun.com/repository/public + + + + diff --git a/src/.DS_Store b/src/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..0787fb7b15229e3b1308635a538cf207523385ad GIT binary patch literal 6148 zcmeH~K?=e^3`G;|LU7Zi%h`AUZ!na40xzH-h@ce&UC+_|$ppdbT10*z`IF3q(zoa| zBBI@GzY=LhWCk~trG=3x@0kh68F=pTt>P!&@2c$2NroNPq-LfCNb3 zhX~lc4V%rYGLirZkie6GeIF9sG>4X|{^>yQ5dhkt?1r_^63}D?Xbvq^QGsbp4;roN zV~Ewg9h%}?4lPw{yJ!p_8c$Z6VqjX^MH3R3W)}t$Ab}BqY0X=^|JU$O^Z%%YDG89k zpApce-}D_`D(=>|*R%RIs;=wTS#c@+X-IrEk$` zL`3`haV^q`NDDWWm4%5Z@&JhP8{Tj3ht;B=96)--iS@&7q~Le>xC+1b{XuyJ79K1T}(S!u1*@b}wNMJ%>Uh~fG|1JE}{6A@7N&+PC zX9Tp_>^41KD(=>|*R%RQs7ddY*ootW$?2Jc0B^niaeI z6+0^cw*P#40VV(&x+``bW@gM+IOC4%*XiSSx!>Md@hb2XF*8;s%=T+rA_5{H0wN#+ zBCsF=d5UB6yr5^&qlkbAEQ5f59~#}YmyXo<&t{kmTA4-j#O(C1`1k#() z=#BAPSeA%r_tkGjHX_o(4drZMX?AYDu!qbj5RN-~Im(BO--pj}QN5lpZYysxz+eCJ zhtv2T_pTF}r2+nk1TNf{9y|%z#;8t^in_=w~1aHScZ^zhJ fJAU?}s4KR{c}<)GosPWIf&3XTU1(I`)(ZRpf(8|U literal 0 HcmV?d00001 diff --git a/src/main/java/com/gxwebsoft/.DS_Store b/src/main/java/com/gxwebsoft/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..45f4ec022dc0c7d6f522afa6bf4f089ef967ceae GIT binary patch literal 6148 zcmeHKI|{-;5S>vG!N$^Zuiy<9(G%nXf`W}k5VTI^xjdS0K23;r+Q^$Q`*vsNZOAKj zG9seu+hHZL5Rn<&P#!i6&GyX)Hp++s;W*cPe`@&v^QL+oMqd zDnJFO02QDD-&G*%>umnrV|f}CpaOrOfZY!TZden$K)*ULcnbiWAnb;@_Y%Nj0bot+ z0ug~}P=P_!Y%w(Gh?mT(iCtjOMYH+Pe6wbUqW*TAUp!s326ChVRG_cGIF<{m|6BNn z{=ZM+iV9GHzfwRan`X1dCuMCNe4N$V0^h+c=Lt8%+$k8m90R=^V`1fZ=}D1SY>xe! V*abQrai;_MGhn*VsKBokcme016|DdO literal 0 HcmV?d00001 diff --git a/src/main/java/com/gxwebsoft/WebSoftApplication.java b/src/main/java/com/gxwebsoft/WebSoftApplication.java new file mode 100644 index 0000000..80c9a42 --- /dev/null +++ b/src/main/java/com/gxwebsoft/WebSoftApplication.java @@ -0,0 +1,28 @@ +package com.gxwebsoft; + +import com.gxwebsoft.common.core.config.ConfigProperties; +import org.mybatis.spring.annotation.MapperScan; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.scheduling.annotation.EnableAsync; +import org.springframework.scheduling.annotation.EnableScheduling; +import org.springframework.transaction.annotation.EnableTransactionManagement; + +/** + * 启动类 + * Created by WebSoft on 2018-02-22 11:29:03 + */ +@EnableAsync +@EnableTransactionManagement +@MapperScan("com.gxwebsoft.**.mapper") +@EnableConfigurationProperties(ConfigProperties.class) +@SpringBootApplication +@EnableScheduling +public class WebSoftApplication { + + public static void main(String[] args) { + SpringApplication.run(WebSoftApplication.class, args); + } + +} diff --git a/src/main/java/com/gxwebsoft/apps/constants/EquipmentConstants.java b/src/main/java/com/gxwebsoft/apps/constants/EquipmentConstants.java new file mode 100644 index 0000000..82a407c --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/constants/EquipmentConstants.java @@ -0,0 +1,10 @@ +package com.gxwebsoft.apps.constants; + +public class EquipmentConstants { + // 事件类型 + public static final String EVENT_TYPE_BIND = "电池绑定"; + public static final String EVENT_TYPE_CHANGE = "电池更换"; + public static final String EVENT_TYPE_UNBIND = "电池解绑"; + + +} diff --git a/src/main/java/com/gxwebsoft/apps/constants/HualalaConstants.java b/src/main/java/com/gxwebsoft/apps/constants/HualalaConstants.java new file mode 100644 index 0000000..c00e1da --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/constants/HualalaConstants.java @@ -0,0 +1,18 @@ +package com.gxwebsoft.apps.constants; + +public class HualalaConstants { + // 集团ID + public static final String GROUP_ID = "1528"; + // 服务器接口 + public static final String API_URL = "https://www-openapi.hualala.com"; + // appKey + public static final String APP_KEY = "2487"; + // appSecret + public static final String APP_SECRET = "Hgr520dQpEiFe0FV"; + // version + public static final Integer VERSION = 3; + // 店铺ID + public static final Long shopId = 0L; + + +} diff --git a/src/main/java/com/gxwebsoft/apps/constants/SfExpressConstants.java b/src/main/java/com/gxwebsoft/apps/constants/SfExpressConstants.java new file mode 100644 index 0000000..c68ddfe --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/constants/SfExpressConstants.java @@ -0,0 +1,13 @@ +package com.gxwebsoft.apps.constants; + +public class SfExpressConstants { + // 开发者id + public static final Long DEV_ID = 1651421896L; + // 开发者密钥 + public static final String DEV_KEY = "2f10570c5057570fe0e488a425a6d813"; + // 正式环境 + public static final String SERVER_HOST = "https://openic.sf-express.com"; + // 店铺ID + public static final String SHOP_ID = "3243279847393"; + +} diff --git a/src/main/java/com/gxwebsoft/apps/controller/BcAgentController.java b/src/main/java/com/gxwebsoft/apps/controller/BcAgentController.java new file mode 100644 index 0000000..84c1ee9 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/controller/BcAgentController.java @@ -0,0 +1,127 @@ +package com.gxwebsoft.apps.controller; + +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.apps.service.BcAgentService; +import com.gxwebsoft.apps.entity.BcAgent; +import com.gxwebsoft.apps.param.BcAgentParam; +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.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 2023-04-24 19:25:59 + */ +@Api(tags = "代报餐管理管理") +@RestController +@RequestMapping("/api/apps/bc-agent") +public class BcAgentController extends BaseController { + @Resource + private BcAgentService bcAgentService; + + @PreAuthorize("hasAuthority('apps:bcAgent:list')") + @OperationLog + @ApiOperation("分页查询代报餐管理") + @GetMapping("/page") + public ApiResult> page(BcAgentParam param) { + // 使用关联查询 + return success(bcAgentService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('apps:bcAgent:list')") + @OperationLog + @ApiOperation("查询全部代报餐管理") + @GetMapping() + public ApiResult> list(BcAgentParam param) { + // 使用关联查询 + return success(bcAgentService.listRel(param)); + } + + @PreAuthorize("hasAuthority('apps:bcAgent:list')") + @OperationLog + @ApiOperation("根据id查询代报餐管理") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + // 使用关联查询 + return success(bcAgentService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('apps:bcAgent:save')") + @OperationLog + @ApiOperation("添加代报餐管理") + @PostMapping() + public ApiResult save(@RequestBody BcAgent bcAgent) { + if (bcAgentService.save(bcAgent)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('apps:bcAgent:update')") + @OperationLog + @ApiOperation("修改代报餐管理") + @PutMapping() + public ApiResult update(@RequestBody BcAgent bcAgent) { + if (bcAgentService.updateById(bcAgent)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('apps:bcAgent:remove')") + @OperationLog + @ApiOperation("删除代报餐管理") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (bcAgentService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('apps:bcAgent:save')") + @OperationLog + @ApiOperation("批量添加代报餐管理") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (bcAgentService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('apps:bcAgent:update')") + @OperationLog + @ApiOperation("批量修改代报餐管理") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(bcAgentService, "agent_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('apps:bcAgent:remove')") + @OperationLog + @ApiOperation("批量删除代报餐管理") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (bcAgentService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/apps/controller/BcCartController.java b/src/main/java/com/gxwebsoft/apps/controller/BcCartController.java new file mode 100644 index 0000000..45070a8 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/controller/BcCartController.java @@ -0,0 +1,254 @@ +package com.gxwebsoft.apps.controller; + +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.IdUtil; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.gxwebsoft.apps.entity.BcCart; +import com.gxwebsoft.apps.entity.BcPlan; +import com.gxwebsoft.apps.result.CartResult; +import com.gxwebsoft.apps.service.BcPlanService; +import com.gxwebsoft.common.core.exception.BusinessException; +import com.gxwebsoft.common.core.utils.JSONUtil; +import com.gxwebsoft.common.core.web.ApiResult; +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.shop.entity.Goods; +import com.gxwebsoft.shop.entity.Order; +import com.gxwebsoft.shop.entity.OrderGoods; +import com.gxwebsoft.shop.param.CartParam; +import com.gxwebsoft.shop.service.GoodsService; +import com.gxwebsoft.shop.service.OrderGoodsService; +import com.gxwebsoft.shop.service.OrderService; +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.util.CollectionUtils; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.math.BigDecimal; +import java.sql.Date; +import java.util.ArrayList; +import java.util.List; +import java.util.Set; +import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; + +import static com.gxwebsoft.common.core.constants.OrderConstants.PAY_STATUS_SUCCESS; + +/** + * 批量报餐 + * + * @author 科技小王子 + * @since 2022-11-25 19:04:43 + */ +@Api(tags = "购物车记录表管理") +@RestController +@RequestMapping("/api/apps/bc-cart") +public class BcCartController extends BaseController { + @Resource + private GoodsService goodsService; + @Resource + private StringRedisTemplate stringRedisTemplate; + @Resource + private OrderService orderService; + @Resource + private OrderGoodsService orderGoodsService; + + @Resource + private BcPlanService bcPlanService; + + @ApiOperation("添加购物车") + @PostMapping("/addCart") + public ApiResult addCart(@RequestBody BcCart vo) { + final Goods goods = goodsService.getById(vo.getGoodsId()); + if (goods == null) { + return fail("该商品已下架"); + } + // 获取当天菜单 + final List bcList = bcPlanService.list(new LambdaQueryWrapper().eq(BcPlan::getDayTime, vo.getDeliveryTime() + " 00:00:00")); + System.out.println("bcList = " + bcList); + if (bcList != null && !CollectionUtils.isEmpty(bcList)) { + final BcPlan bcPlan = bcList.get(0); + final ArrayList arrayList = JSONUtil.parseObject(bcPlan.getGoodsIds(), ArrayList.class); + if(!arrayList.contains(vo.getGoodsId())) { + return fail(vo.getDeliveryTime() + "没有上架" + goods.getGoodsName()); + } + } + + // 1. key = cache10048:cart651:2023-05-04 + String key = "cache" + getTenantId() + ":cart" + getLoginUserId() + ":" + vo.getDeliveryTime(); + // 2. 准备数据 + + vo.setImage(goods.getImage()); + vo.setGoodsName(goods.getGoodsName()); + vo.setComments(goods.getComments()); + vo.setCategoryId(goods.getCategoryId()); + vo.setGear(goods.getGear()); + vo.setUserId(getLoginUserId()); + // 2. 保存到购物车 + stringRedisTemplate.opsForHash().put(key, vo.getGoodsId().toString(), JSONObject.toJSONString(vo)); + //设置过期时间600秒 + System.out.println("设置过期时间600秒 = " + key); + stringRedisTemplate.opsForHash().getOperations().expire(key,60*60*3, TimeUnit.SECONDS); + // 3. 查询购物车并返回 + final List list = getCart(key); + final ArrayList cartAll = getCartAll(); + return success("添加成功", cartAll); + } + + @ApiOperation("查看购物车") + @PostMapping("/showCart") + public ApiResult showCart() { +// System.out.println("vo = " + vo); + + // 按预定日期查询 +// if (vo.getDeliveryTime() != null) { +// // key = cache10048:cart651:2023-05-04 +// String key = "cache" + getTenantId() + ":cart" + getLoginUserId() + ":" + vo.getDeliveryTime(); +// final List list = getCart(key); +// return success("获取成功", list); +// } + // 查询全部购物车数据 + return success("获取成功", getCartAll()); + } + + @ApiOperation("从购物车创建订单") + @PostMapping("/createOrder") + @Transactional(rollbackFor = {Exception.class}) + public ApiResult createOrder(@RequestBody CartParam param) { + // 1.判断是否代报餐 + Integer userId = 0; + if (param.getAgentUserId() != null) { + userId = param.getAgentUserId(); + } else { + userId = getLoginUserId(); + } + // 2.从缓存读取用户的购物车数据 + final ArrayList cartAll = getCartAll(); + if (cartAll.size() == 0) { + throw new BusinessException("订单不存在"); + } + // 3.批量创建订单 + Integer finalUserId = userId; + final ArrayList orderIds = new ArrayList<>(); + cartAll.forEach(d -> { + // 过滤空单 + if (!d.getTotalNum().equals(0)) { + System.out.println("批量创建订单d = " + d); + Order order = new Order(); + // 查询今日订单是否存在 + final Order one = orderService.getOne(new LambdaQueryWrapper() + .eq(Order::getUserId, finalUserId) + .eq(Order::getPayStatus,PAY_STATUS_SUCCESS) + .eq(Order::getDeliveryTime, Date.valueOf(d.getDeliveryTime()))); + if(one == null){ + order.setOrderNo(IdUtil.getSnowflakeNextId()); + order.setTotalPrice(d.getTotalPrice()); + order.setOrderPrice(d.getTotalPrice()); + order.setPayPrice(d.getTotalPrice()); + order.setDeliveryTime(Date.valueOf(d.getDeliveryTime())); + order.setExpirationTime(DateUtil.nextMonth()); + order.setIsTemporary(param.getIsTemporary()); + order.setUserId(finalUserId); + order.setWeek(DateUtil.dayOfWeek(order.getDeliveryTime()) - 1); + orderService.save(order); + }else { + order.setOrderId(one.getOrderId()); + } + orderIds.add(order.getOrderId()); + + // 添加订单商品 + final List items = d.getItems(); + final ArrayList orderGoods = new ArrayList<>(); + items.forEach(g -> { + if(!g.getTotalNum().equals(0)){ + final OrderGoods og = new OrderGoods(); + og.setOrderId(order.getOrderId()); + og.setGoodsId(g.getGoodsId()); + og.setGoodsName(g.getGoodsName()); + og.setImageUrl(g.getImage()); + og.setTotalNum(g.getTotalNum()); + og.setCategoryId(g.getCategoryId()); + og.setGoodsPrice(g.getGoodsPrice()); + og.setComments(g.getComments()); + og.setGear(g.getGear()); + og.setGoodsId(g.getGoodsId()); + og.setTemporary(param.getIsTemporary()); + og.setUserId(finalUserId); +// og.setDeliveryTime(order.getDeliveryTime()); + orderGoods.add(og); + } + }); + orderGoodsService.saveBatch(orderGoods); + } + }); + // 4.清空购物车 + removeCart(); + return success("创建成功",orderIds); + } + + @ApiOperation("清空购物车") + @GetMapping("/clearCart") + public ApiResult clearCart() { + removeCart(); + return success("清空成功"); + } + + /** + * 清空购物车 + */ + private void removeCart() { + String key = "cache" + getTenantId() + ":cart" + getLoginUserId() + ":"; + final Set keys = stringRedisTemplate.keys(key + "*"); + System.out.println("清空购物车keys = " + keys); + assert keys != null; + stringRedisTemplate.delete(keys); + } + + /** + * 获取购物车数据(按预定日期) + */ + private List getCart(String key) { + // 获取购物车数据 + List values = stringRedisTemplate.opsForHash().values(key); + return values.stream().map(item -> JSONUtil.parseObject(JSONUtil.toJSONString(item), BcCart.class)).collect(Collectors.toList()); + } + + /** + * 查询全部购物车数据 + */ + private ArrayList getCartAll() { + String key = "cache" + getTenantId() + ":cart" + getLoginUserId(); + Set keys = stringRedisTemplate.keys(key + "*"); +// System.out.println("keys = " + keys); + assert keys != null; + final ArrayList list = new ArrayList<>(); + keys.forEach(d -> { + final List values = stringRedisTemplate.opsForHash().values(d); + final CartResult cartResult = new CartResult(); + final ArrayList dataList = new ArrayList<>(); + + values.forEach(item -> { + BcCart bcCart = JSONUtil.parseObject(item.toString(), BcCart.class); + assert bcCart != null; +// System.out.println("cartResult = " + cartResult.getTotalPrice()); + if (cartResult.getTotalNum() == null) { + cartResult.setTotalNum(0); + } + if (cartResult.getTotalPrice() == null) { + cartResult.setTotalPrice(new BigDecimal(0)); + } + cartResult.setTotalNum(cartResult.getTotalNum() + bcCart.getTotalNum()); + cartResult.setDeliveryTime(bcCart.getDeliveryTime()); + cartResult.setTotalPrice(cartResult.getTotalPrice().add(bcCart.getGoodsPrice().multiply(BigDecimal.valueOf(bcCart.getTotalNum())))); + dataList.add(bcCart); + }); + cartResult.setItems(dataList); + list.add(cartResult); + }); + return list; + } + +} diff --git a/src/main/java/com/gxwebsoft/apps/controller/BcCookbookController.java b/src/main/java/com/gxwebsoft/apps/controller/BcCookbookController.java new file mode 100644 index 0000000..5305f16 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/controller/BcCookbookController.java @@ -0,0 +1,139 @@ +package com.gxwebsoft.apps.controller; + +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.apps.service.BcCookbookService; +import com.gxwebsoft.apps.entity.BcCookbook; +import com.gxwebsoft.apps.param.BcCookbookParam; +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.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 2023-05-05 14:56:54 + */ +@Api(tags = "常用菜谱管理") +@RestController +@RequestMapping("/api/apps/bc-cookbook") +public class BcCookbookController extends BaseController { + @Resource + private BcCookbookService bcCookbookService; + + @PreAuthorize("hasAuthority('apps:bcCookbook:list')") + @OperationLog + @ApiOperation("分页查询常用菜谱") + @GetMapping("/page") + public ApiResult> page(BcCookbookParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(bcCookbookService.page(page, page.getWrapper())); + // 使用关联查询 + //return success(bcCookbookService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('apps:bcCookbook:list')") + @OperationLog + @ApiOperation("查询全部常用菜谱") + @GetMapping() + public ApiResult> list(BcCookbookParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(bcCookbookService.list(page.getOrderWrapper())); + // 使用关联查询 + //return success(bcCookbookService.listRel(param)); + } + + @PreAuthorize("hasAuthority('apps:bcCookbook:list')") + @OperationLog + @ApiOperation("根据id查询常用菜谱") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + return success(bcCookbookService.getById(id)); + // 使用关联查询 + //return success(bcCookbookService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('apps:bcCookbook:save')") + @OperationLog + @ApiOperation("添加常用菜谱") + @PostMapping() + public ApiResult save(@RequestBody BcCookbook bcCookbook) { + // 记录当前登录用户id、租户id、商户编号 + User loginUser = getLoginUser(); + if (loginUser != null) { + bcCookbook.setUserId(loginUser.getUserId()); + } + if (bcCookbookService.save(bcCookbook)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('apps:bcCookbook:update')") + @OperationLog + @ApiOperation("修改常用菜谱") + @PutMapping() + public ApiResult update(@RequestBody BcCookbook bcCookbook) { + if (bcCookbookService.updateById(bcCookbook)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('apps:bcCookbook:remove')") + @OperationLog + @ApiOperation("删除常用菜谱") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (bcCookbookService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('apps:bcCookbook:save')") + @OperationLog + @ApiOperation("批量添加常用菜谱") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (bcCookbookService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('apps:bcCookbook:update')") + @OperationLog + @ApiOperation("批量修改常用菜谱") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(bcCookbookService, "cookbook_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('apps:bcCookbook:remove')") + @OperationLog + @ApiOperation("批量删除常用菜谱") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (bcCookbookService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/apps/controller/BcEquipmentController.java b/src/main/java/com/gxwebsoft/apps/controller/BcEquipmentController.java new file mode 100644 index 0000000..0217f93 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/controller/BcEquipmentController.java @@ -0,0 +1,151 @@ +package com.gxwebsoft.apps.controller; + +import com.gxwebsoft.apps.utils.BcUtil; +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.apps.service.BcEquipmentService; +import com.gxwebsoft.apps.entity.BcEquipment; +import com.gxwebsoft.apps.param.BcEquipmentParam; +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.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 2023-05-02 10:34:40 + */ +@Api(tags = "报餐设备管理管理") +@RestController +@RequestMapping("/api/apps/bc-equipment") +public class BcEquipmentController extends BaseController { + @Resource + private BcEquipmentService bcEquipmentService; + @Resource + private BcUtil bcUtil; + + @PreAuthorize("hasAuthority('apps:bcEquipment:list')") + @OperationLog + @ApiOperation("分页查询报餐设备管理") + @GetMapping("/page") + public ApiResult> page(BcEquipmentParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(bcEquipmentService.page(page, page.getWrapper())); + // 使用关联查询 + //return success(bcEquipmentService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('apps:bcEquipment:list')") + @OperationLog + @ApiOperation("查询全部报餐设备管理") + @GetMapping() + public ApiResult> list(BcEquipmentParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(bcEquipmentService.list(page.getOrderWrapper())); + // 使用关联查询 + //return success(bcEquipmentService.listRel(param)); + } + + @PreAuthorize("hasAuthority('apps:bcEquipment:list')") + @OperationLog + @ApiOperation("根据id查询报餐设备管理") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + return success(bcEquipmentService.getById(id)); + // 使用关联查询 + //return success(bcEquipmentService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('apps:bcEquipment:list')") + @OperationLog + @ApiOperation("添加报餐设备管理") + @PostMapping() + public ApiResult save(@RequestBody BcEquipment bcEquipment) { + // 记录当前登录用户id、租户id、商户编号 + User loginUser = getLoginUser(); + if (loginUser != null) { + bcEquipment.setUserId(loginUser.getUserId()); + bcEquipment.setMerchantCode(getMerchantCode()); + } + if (bcEquipmentService.save(bcEquipment)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('apps:bcEquipment:list')") + @OperationLog + @ApiOperation("修改报餐设备管理") + @PutMapping() + public ApiResult update(@RequestBody BcEquipment bcEquipment) { + if (bcEquipmentService.updateById(bcEquipment)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('apps:bcEquipment:list')") + @OperationLog + @ApiOperation("删除报餐设备管理") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (bcEquipmentService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('apps:bcEquipment:save')") + @OperationLog + @ApiOperation("批量添加报餐设备管理") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (bcEquipmentService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('apps:bcEquipment:update')") + @OperationLog + @ApiOperation("批量修改报餐设备管理") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(bcEquipmentService, "bc_equipment_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('apps:bcEquipment:remove')") + @OperationLog + @ApiOperation("批量删除报餐设备管理") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (bcEquipmentService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('apps:bcEquipment:list')") + @ApiOperation("发送企业微信推送消息") + @PostMapping("/addSend") + public ApiResult addSend(@RequestBody BcEquipment bcEquipment) { + bcUtil.send(bcEquipment.getComments()); + return success("发送成功"); + } + +} diff --git a/src/main/java/com/gxwebsoft/apps/controller/BcExportController.java b/src/main/java/com/gxwebsoft/apps/controller/BcExportController.java new file mode 100644 index 0000000..105928b --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/controller/BcExportController.java @@ -0,0 +1,323 @@ +package com.gxwebsoft.apps.controller; + +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.gxwebsoft.apps.entity.BcExport; +import com.gxwebsoft.apps.param.BcExportParam; +import com.gxwebsoft.apps.service.BcExportService; +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.param.UserParam; +import com.gxwebsoft.common.system.service.UserService; +import com.gxwebsoft.shop.entity.Order; +import com.gxwebsoft.shop.entity.OrderGoods; +import com.gxwebsoft.shop.service.OrderGoodsService; +import com.gxwebsoft.shop.service.OrderService; +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.util.StringUtils; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.math.BigDecimal; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; + +import static com.gxwebsoft.common.core.constants.OrderConstants.DELIVERY_STATUS_YES; +import static com.gxwebsoft.common.core.constants.OrderConstants.PAY_STATUS_SUCCESS; + +/** + * 报餐统计导出控制器 + * + * @author 科技小王子 + * @since 2023-06-01 21:47:02 + */ +@Api(tags = "报餐统计导出管理") +@RestController +@RequestMapping("/api/apps/bc-export") +public class BcExportController extends BaseController { + @Resource + private BcExportService bcExportService; + + @Resource + private OrderService orderService; + + @Resource + private OrderGoodsService orderGoodsService; + + @Resource + private UserService userService; + + @PreAuthorize("hasAuthority('apps:bcExport:list')") + @OperationLog + @ApiOperation("分页查询报餐统计导出") + @GetMapping("/page") + public ApiResult> page(BcExportParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(bcExportService.page(page, page.getWrapper())); + // 使用关联查询 + //return success(bcExportService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('apps:bcExport:list')") + @ApiOperation("查询全部报餐统计导出") + @GetMapping() + public ApiResult> list(BcExportParam param) { + LinkedList resutl = new LinkedList<>(); + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + // 查询所有员工信息 + final UserParam param1 = new UserParam(); + param1.setOrganizationId(param.getOrganizationId()); + final List users = userService.listRel(param1); + if(CollectionUtils.isEmpty(users)){ + return success(resutl); + } + final Set userIds = users.stream().map(User::getUserId).collect(Collectors.toSet()); + + // 获取所有订单 + final LambdaQueryWrapper wrapper = new LambdaQueryWrapper() + .eq(Order::getPayStatus,PAY_STATUS_SUCCESS) + .in(Order::getUserId,userIds); + + if(param.getDeliveryTimeStart() == null){ + System.out.println("默认查询当天 = "); + // 今天开始时间 2023-05-01 00:00:00 + DateTime parse = DateUtil.parse(DateUtil.today()); + wrapper.eq(Order::getDeliveryTime, parse); + } + if(StringUtils.hasText(param.getDeliveryTime())){ + wrapper.eq(Order::getDeliveryTime, param.getDeliveryTime()); + } + if(StringUtils.hasText(param.getDeliveryTimeStart())){ + wrapper.ge(Order::getDeliveryTime, param.getDeliveryTimeStart()); + } + if(StringUtils.hasText(param.getDeliveryTimeEnd())){ + wrapper.le(Order::getDeliveryTime, param.getDeliveryTimeEnd()); + } + + final List list = orderService.list(wrapper); + if(CollectionUtils.isEmpty(list)){ + return success(resutl); + } + // 获取所有订单商品 + final Set orderIds = list.stream().map(Order::getOrderId).collect(Collectors.toSet()); + final List orderGoods = orderGoodsService.list(new LambdaQueryWrapper().in(OrderGoods::getOrderId, orderIds)); + + // 按订单分组 + final Map> orderGoodsCollect = orderGoods.stream().collect(Collectors.groupingBy(OrderGoods::getOrderId)); + // 按员工分组 + final Map> userCollect = list.stream().collect(Collectors.groupingBy(Order::getUserId)); + // 计算订餐和签到次数 + int btotalCount = 0; + int btotalSingCount = 0; + int ltotalCount = 0; + int ltotalSingCount = 0; + int dtotalCount = 0; + int dtotalSingCount = 0; + BigDecimal maxTotalPrice = BigDecimal.ZERO; + int maxGear10 = 0; + int maxGear20 = 0; + int maxSignGear10 = 0; + int maxSignGear20 = 0; + for (Integer userId : userCollect.keySet()) { + final List userList = userCollect.get(userId); // 员工订单 + final User user = users.stream().filter(u -> u.getUserId().equals(userId)).findFirst().get(); + BcExport bcExport = new BcExport(); + int bCount = 0; + int bSingCount = 0; + int lCount = 0; + int lSingCount = 0; + int dCount = 0; + int dSingCount = 0; + int gear10 = 0; + int gear20 = 0; + int signGear10 = 0; + int signGear20 = 0; + BigDecimal totalPrice = BigDecimal.ZERO; + for (Order order : userList) { + // 获取商品 + totalPrice = totalPrice.add(order.getTotalPrice()); + final List goodsList = orderGoodsCollect.get(order.getOrderId()); + if(!CollectionUtils.isEmpty(goodsList)){ + for (OrderGoods goods : goodsList) { + // 查询早餐 + // 查询午餐 + // 查询晚餐 + if(goods.getCategoryId().equals(25)){ + bCount++; + if(goods.getDeliveryStatus().equals(DELIVERY_STATUS_YES)){ + bSingCount++; + } + } + if(goods.getCategoryId().equals(26)){ + lCount++; + // 统计档口 + if(goods.getGear().equals(10)){ + gear10++; + } + if (goods.getGear().equals(20)) { + gear20++; + } + if(goods.getDeliveryStatus().equals(DELIVERY_STATUS_YES)){ + lSingCount++; + // 统计档口 + if(goods.getGear().equals(10)){ + signGear10++; + } + if (goods.getGear().equals(20)) { + signGear20++; + } + } + } + if(goods.getCategoryId().equals(27)){ + dCount++; + if(goods.getDeliveryStatus().equals(DELIVERY_STATUS_YES)){ + dSingCount++; + } + } + } + } + } + btotalCount += bCount; + btotalSingCount += bSingCount; + ltotalCount += lCount; + ltotalSingCount += lSingCount; + dtotalCount += dCount; + dtotalSingCount += dSingCount; + maxTotalPrice = maxTotalPrice.add(totalPrice); + maxGear10 += gear10; + maxGear20 += gear20; + maxSignGear10 += signGear10; + maxSignGear20 += signGear20; + + bcExport.setBreakfastPost(bCount); + bcExport.setBreakfastSign(bSingCount); + bcExport.setLunchPost(lCount); + bcExport.setLunchSign(lSingCount); + bcExport.setDinnerPost(dCount); + bcExport.setDinnerSign(dSingCount); + bcExport.setExpendMoney(totalPrice); + bcExport.setGear10(gear10); + bcExport.setGear20(gear20); + bcExport.setSignGear10(signGear10); + bcExport.setSignGear20(signGear20); + bcExport.setUserId(userId); + bcExport.setOrganizationName(user.getOrganizationName()); + bcExport.setNickname(user.getNickname()); + bcExport.setLunchPostText(lCount+""); + bcExport.setLunchSignText(lSingCount+""); + + resutl.add(bcExport); + + } + BcExport totalBcExport = new BcExport(); + totalBcExport.setNickname("合计"); + totalBcExport.setBreakfastPost(btotalCount); + totalBcExport.setBreakfastSign(btotalSingCount); + totalBcExport.setLunchPost(ltotalCount); + totalBcExport.setLunchSign(ltotalSingCount); + totalBcExport.setDinnerPost(dtotalCount); + totalBcExport.setDinnerSign(dtotalSingCount); + totalBcExport.setExpendMoney(maxTotalPrice); + totalBcExport.setGear10(maxGear10); + totalBcExport.setGear20(maxGear20); + totalBcExport.setSignGear10(maxSignGear10); + totalBcExport.setSignGear20(maxSignGear20); + totalBcExport.setLunchPostText(ltotalCount + "(" + maxGear10 + "/" + maxGear20 + ")"); + totalBcExport.setLunchSignText(ltotalSingCount + "(" + maxSignGear10 + "/" + maxSignGear20 + ")"); + totalBcExport.setOrganizationName(""); + resutl.addFirst(totalBcExport); + return success(resutl); + } + + @PreAuthorize("hasAuthority('apps:bcExport:list')") + @OperationLog + @ApiOperation("根据id查询报餐统计导出") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + return success(bcExportService.getById(id)); + // 使用关联查询 + //return success(bcExportService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('apps:bcExport:save')") + @OperationLog + @ApiOperation("添加报餐统计导出") + @PostMapping() + public ApiResult save(@RequestBody BcExport bcExport) { + // 记录当前登录用户id + User loginUser = getLoginUser(); + if (loginUser != null) { + bcExport.setUserId(loginUser.getUserId()); + } + if (bcExportService.save(bcExport)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('apps:bcExport:update')") + @OperationLog + @ApiOperation("修改报餐统计导出") + @PutMapping() + public ApiResult update(@RequestBody BcExport bcExport) { + if (bcExportService.updateById(bcExport)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('apps:bcExport:remove')") + @OperationLog + @ApiOperation("删除报餐统计导出") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (bcExportService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('apps:bcExport:save')") + @OperationLog + @ApiOperation("批量添加报餐统计导出") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (bcExportService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('apps:bcExport:update')") + @OperationLog + @ApiOperation("批量修改报餐统计导出") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(bcExportService, "export_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('apps:bcExport:remove')") + @OperationLog + @ApiOperation("批量删除报餐统计导出") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (bcExportService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/apps/controller/BcFoodController.java b/src/main/java/com/gxwebsoft/apps/controller/BcFoodController.java new file mode 100644 index 0000000..6e84c26 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/controller/BcFoodController.java @@ -0,0 +1,289 @@ +package com.gxwebsoft.apps.controller; + +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.gxwebsoft.apps.entity.BcFood; +import com.gxwebsoft.apps.entity.BcPlan; +import com.gxwebsoft.apps.param.BcFoodParam; +import com.gxwebsoft.apps.param.BcPlanParam; +import com.gxwebsoft.apps.service.BcFoodService; +import com.gxwebsoft.apps.service.BcPlanService; +import com.gxwebsoft.common.core.annotation.OperationLog; +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.Order; +import com.gxwebsoft.shop.entity.OrderGoods; +import com.gxwebsoft.shop.entity.UserReferee; +import com.gxwebsoft.shop.param.OrderGoodsParam; +import com.gxwebsoft.shop.param.OrderParam; +import com.gxwebsoft.shop.param.UserRefereeParam; +import com.gxwebsoft.shop.service.GoodsService; +import com.gxwebsoft.shop.service.OrderGoodsService; +import com.gxwebsoft.shop.service.OrderService; +import com.gxwebsoft.shop.service.UserRefereeService; +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.HashMap; +import java.util.List; + +import static com.gxwebsoft.common.core.constants.OrderConstants.ORDER_STATUS_DOING; +import static com.gxwebsoft.common.core.constants.OrderConstants.PAY_STATUS_SUCCESS; + +/** + * 发布菜品明细控制器 + * + * @author 科技小王子 + * @since 2023-04-27 17:59:40 + */ +@Api(tags = "发布菜品明细管理") +@RestController +@RequestMapping("/api/apps/bc-food") +public class BcFoodController extends BaseController { + @Resource + private BcFoodService bcFoodService; + @Resource + private BcPlanService bcPlanService; + @Resource + private GoodsService goodsService; + @Resource + private OrderService orderService; + @Resource + private OrderGoodsService orderGoodsService; + @Resource + private UserRefereeService userRefereeService; + + @ApiOperation("查询菜品列表") + @GetMapping("/getFoodList") + public ApiResult getFoodList(BcPlanParam param) { + // 验证签名 + isCheckSign(); + BcPlan plan = param.getOne(bcPlanService.listRel(param)); + if(plan == null){ + return fail("当日未发布菜品"); + } +// System.out.println("查询菜品列表param = " + param); +// System.out.println("plan = " + plan); + // json转数组 如：[0,1]转为ArrayList + List goodsIds = new ArrayList<>(); + goodsIds = JSONUtil.parseObject(plan.getGoodsIds(), ArrayList.class); + final List list = goodsService.listByIds(goodsIds); + final HashMap map = new HashMap<>(); + map.put("week",plan.getWeek()); + map.put("list",list); + return success(map); + } + + @ApiOperation("查询一周菜谱") + @GetMapping("/getWeekFood") + public ApiResult getWeekFood() { + // 验证签名 + isCheckSign(); + final HashMap map = new HashMap<>(); + // 今天日期 + final DateTime today = DateUtil.parse(DateUtil.today()); + // 本周一周开始的日期 + final DateTime dateTime = DateUtil.beginOfWeek(today); + // 查询本周菜谱 + final List list = bcPlanService.list(new LambdaQueryWrapper().ge(BcPlan::getDayTime, dateTime).last("limit 0,7")); + try { + list.forEach(d -> { + // json转数组 如：[0,1]转为ArrayList + d.setGoodsList(goodsService.listByIds(JSONUtil.parseObject(d.getGoodsIds(), ArrayList.class))); + }); + } catch (Exception e) { + e.printStackTrace(); + } + return success(list); + } + + @ApiOperation("查询代取餐人员的报餐信息") + @GetMapping("/getOthersFood") + public ApiResult getOthersFood() { + // 验证签名 + isCheckSign(); + + UserRefereeParam param = new UserRefereeParam(); + param.setDealerId(getLoginUserId()); + List list = userRefereeService.listRel(param); + // 附加自己 + final UserReferee userReferee = new UserReferee(); + userReferee.setUserId(getLoginUserId()); + userReferee.setNickname(getLoginUser().getNickname()); + list.add(userReferee); + list.forEach(d -> { + // 查询他的订单信息 + OrderParam orderParam = new OrderParam(); + orderParam.setUserId(d.getUserId()); + orderParam.setDeliveryTime(DateUtil.beginOfDay(DateUtil.date()).toString()); + orderParam.setOrderStatus(ORDER_STATUS_DOING); + orderParam.setPayStatus(PAY_STATUS_SUCCESS); + List orders = orderService.listRel(orderParam); + orders.forEach(o -> { + // 查询菜品信息 + List orderGoods = orderGoodsService.list(new LambdaQueryWrapper() + .eq(OrderGoods::getOrderId,o.getOrderId()) + .gt(OrderGoods::getTotalNum,0)); + o.setGoodsList(orderGoods); + }); + d.setOrder(orders); + }); + return success(list); + } + + @ApiOperation("取消代餐") + @GetMapping("/cancel") + public ApiResult cancel() { + UserRefereeParam param = new UserRefereeParam(); + param.setDealerId(getLoginUserId()); + List list = userRefereeService.listRel(param); + list.forEach(d -> { + // 查询他的订单信息 + OrderParam orderParam = new OrderParam(); + orderParam.setUserId(d.getUserId()); + orderParam.setDeliveryTime(DateUtil.beginOfDay(DateUtil.date()).toString()); + orderParam.setPayStatus(PAY_STATUS_SUCCESS); + List orders = orderService.listRel(orderParam); + orders.forEach(o -> { + // 查询菜品信息 + OrderGoodsParam goodsParam = new OrderGoodsParam(); + goodsParam.setOrderId(o.getOrderId()); + List orderGoods = orderGoodsService.listRel(goodsParam); + o.setGoodsList(orderGoods); + }); + d.setOrder(orders); + }); + return success(list); + } + + @ApiOperation("查询临时报餐信息") + @GetMapping("/getTemporaryOrder") + public ApiResult getTemporaryOrder(OrderParam param) { + // 验证签名 + isCheckSign(); + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper + .eq(Order::getUserId,getLoginUserId()) + .eq(Order::getPayStatus,PAY_STATUS_SUCCESS) + .eq(Order::getOrderStatus,ORDER_STATUS_DOING) + .eq(Order::getDeleted,0) + .eq(Order::getIsTemporary,1) + .eq(Order::getDeliveryTime,param.getDeliveryTime()); + Order order = orderService.getOne(lambdaQueryWrapper,false); + if(order != null){ + final List goods = orderGoodsService.list(new LambdaQueryWrapper().eq(OrderGoods::getOrderId, order.getOrderId())); + order.setGoodsList(goods); + return success("查询成功",order); + } + return fail("没有临时报餐数据",null); + } + + @PreAuthorize("hasAuthority('apps:bcFood:list')") + @OperationLog + @ApiOperation("分页查询发布菜品明细") + @GetMapping("/page") + public ApiResult> page(BcFoodParam param) { + // 使用关联查询 + return success(bcFoodService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('apps:bcFood:list')") + @OperationLog + @ApiOperation("查询全部发布菜品明细") + @GetMapping() + public ApiResult> list(BcFoodParam param) { + // 使用关联查询 + return success(bcFoodService.listRel(param)); + } + + @PreAuthorize("hasAuthority('apps:bcFood:list')") + @OperationLog + @ApiOperation("根据id查询发布菜品明细") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + // 使用关联查询 + return success(bcFoodService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('apps:bcFood:save')") + @OperationLog + @ApiOperation("添加发布菜品明细") + @PostMapping() + public ApiResult save(@RequestBody BcFood bcFood) { + // 记录当前登录用户id、租户id、商户编号 + User loginUser = getLoginUser(); + if (loginUser != null) { + bcFood.setUserId(loginUser.getUserId()); + } + if (bcFoodService.save(bcFood)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('apps:bcFood:update')") + @OperationLog + @ApiOperation("修改发布菜品明细") + @PutMapping() + public ApiResult update(@RequestBody BcFood bcFood) { + if (bcFoodService.updateById(bcFood)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('apps:bcFood:remove')") + @OperationLog + @ApiOperation("删除发布菜品明细") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (bcFoodService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('apps:bcFood:save')") + @OperationLog + @ApiOperation("批量添加发布菜品明细") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (bcFoodService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('apps:bcFood:update')") + @OperationLog + @ApiOperation("批量修改发布菜品明细") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(bcFoodService, "bc_food_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('apps:bcFood:remove')") + @OperationLog + @ApiOperation("批量删除发布菜品明细") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (bcFoodService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/apps/controller/BcPlanController.java b/src/main/java/com/gxwebsoft/apps/controller/BcPlanController.java new file mode 100644 index 0000000..d2b92dc --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/controller/BcPlanController.java @@ -0,0 +1,144 @@ +package com.gxwebsoft.apps.controller; + +import cn.hutool.core.date.DateUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.gxwebsoft.apps.entity.BcPlan; +import com.gxwebsoft.apps.param.BcPlanParam; +import com.gxwebsoft.apps.service.BcPlanService; +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.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.Date; +import java.util.List; + +/** + * 菜品发布管理控制器 + * + * @author 科技小王子 + * @since 2023-04-27 17:59:40 + */ +@Api(tags = "菜品发布管理管理") +@RestController +@RequestMapping("/api/apps/bc-plan") +public class BcPlanController extends BaseController { + @Resource + private BcPlanService bcPlanService; + + @PreAuthorize("hasAuthority('apps:bcPlan:list')") + @OperationLog + @ApiOperation("分页查询菜品发布管理") + @GetMapping("/page") + public ApiResult> page(BcPlanParam param) { + // 使用关联查询 + return success(bcPlanService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('apps:bcPlan:list')") + @OperationLog + @ApiOperation("查询全部菜品发布管理") + @GetMapping() + public ApiResult> list(BcPlanParam param) { + // 使用关联查询 + return success(bcPlanService.listRel(param)); + } + + @PreAuthorize("hasAuthority('apps:bcPlan:list')") + @OperationLog + @ApiOperation("根据id查询菜品发布管理") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + // 使用关联查询 + return success(bcPlanService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('apps:bcPlan:save')") + @OperationLog + @ApiOperation("添加菜品发布管理") + @PostMapping() + public ApiResult save(@RequestBody BcPlan bcPlan) { + // 记录当前登录用户id、租户id、商户编号 + User loginUser = getLoginUser(); + if (loginUser != null) { + bcPlan.setUserId(loginUser.getUserId()); + } + if(bcPlanService.count(new LambdaQueryWrapper().eq(BcPlan::getDayTime, bcPlan.getDayTime())) > 0){ + return fail("当天已发布过菜品"); + } + bcPlan.setWeek(DateUtil.dayOfWeek(bcPlan.getDayTime()) - 1); + if (bcPlanService.save(bcPlan)) { + return success("发布成功"); + } + return fail("发布失败"); + } + + @PreAuthorize("hasAuthority('apps:bcPlan:update')") + @OperationLog + @ApiOperation("修改菜品发布管理") + @PutMapping() + public ApiResult update(@RequestBody BcPlan bcPlan) { + System.out.println("bcPlan = " + bcPlan); + final Date dayTime = bcPlan.getDayTime(); + System.out.println("dayTime = " + dayTime); + final int week = DateUtil.dayOfWeek(dayTime); + bcPlan.setWeek(week - 1); + if (bcPlanService.updateById(bcPlan)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('apps:bcPlan:remove')") + @OperationLog + @ApiOperation("删除菜品发布管理") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (bcPlanService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('apps:bcPlan:save')") + @OperationLog + @ApiOperation("批量添加菜品发布管理") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (bcPlanService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('apps:bcPlan:update')") + @OperationLog + @ApiOperation("批量修改菜品发布管理") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(bcPlanService, "bc_plan_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('apps:bcPlan:remove')") + @OperationLog + @ApiOperation("批量删除菜品发布管理") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (bcPlanService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/apps/controller/BcStatisticsController.java b/src/main/java/com/gxwebsoft/apps/controller/BcStatisticsController.java new file mode 100644 index 0000000..3bc2ab5 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/controller/BcStatisticsController.java @@ -0,0 +1,342 @@ +package com.gxwebsoft.apps.controller; + +import cn.hutool.core.date.DateUnit; +import cn.hutool.core.date.DateUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.gxwebsoft.apps.entity.BcPlan; +import com.gxwebsoft.apps.param.BcPlanParam; +import com.gxwebsoft.apps.service.BcPlanService; +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.system.entity.User; +import com.gxwebsoft.common.system.service.OrganizationService; +import com.gxwebsoft.common.system.service.UserService; +import com.gxwebsoft.shop.entity.Goods; +import com.gxwebsoft.shop.entity.Order; +import com.gxwebsoft.shop.entity.OrderGoods; +import com.gxwebsoft.shop.param.OrderGoodsParam; +import com.gxwebsoft.shop.service.GoodsService; +import com.gxwebsoft.shop.service.OrderGoodsService; +import com.gxwebsoft.shop.service.OrderService; +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; + +import javax.annotation.Resource; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.stream.Collectors; + +import static com.gxwebsoft.common.core.constants.OrderConstants.*; + +/** + * 报餐统计控制器 + * + * @author 科技小王子 + * @since 2023-04-27 17:59:40 + */ +@Api(tags = "报餐统计管理") +@RestController +@RequestMapping("/api/apps/bc-statistics") +public class BcStatisticsController extends BaseController { + @Resource + private GoodsService goodsService; + @Resource + private OrderService orderService; + @Resource + private OrderGoodsService orderGoodsService; + @Resource + private BcPlanService bcPlanService; + @Resource + private UserService userService; + @Resource + private OrganizationService organizationService; + + + @ApiOperation("预定菜品统计") + @GetMapping("/baoCanFoodCount") + public ApiResult baoCanFoodCount(BcPlanParam param) { + // 验证签名 + isCheckSign(); + + BcPlan plan = param.getOne(bcPlanService.listRel(param)); + System.out.println("1查询菜品列表param = " + plan); + if (plan == null) { + return fail("当日未发布菜品"); + } + // json转数组 如：[0,1]转为ArrayList + ArrayList goodsIds = JSONUtil.parseObject(plan.getGoodsIds(), ArrayList.class); + final List list = goodsService.listByIds(goodsIds); + final ArrayList goods = new ArrayList<>(); + + // 查询今日有效订单 + final List orders = orderService.list(new LambdaQueryWrapper() + .eq(Order::getDeliveryTime, param.getDayTime()) + .eq(Order::getPayStatus, PAY_STATUS_SUCCESS) + .ne(Order::getOrderStatus, ORDER_STATUS_CANCEL) + ); + final List orderIds = orders.stream().map(Order::getOrderId).collect(Collectors.toList()); + + // 整理餐段菜品数据 + list.forEach(d -> { + if (d.getCategoryId().equals(param.getCategoryId())) { + final int DeliveryTimes = orderGoodsService.count(new LambdaQueryWrapper() + .in(OrderGoods::getOrderId, orderIds) + .eq(OrderGoods::getCategoryId, param.getCategoryId()) + .eq(OrderGoods::getGoodsId, d.getGoodsId()) + .gt(OrderGoods::getTotalNum, 0) + ); + final int NoDeliveryTimes = orderGoodsService.count(new LambdaQueryWrapper() + .in(OrderGoods::getOrderId, orderIds) + .eq(OrderGoods::getCategoryId, param.getCategoryId()) + .eq(OrderGoods::getGoodsId, d.getGoodsId()) + .gt(OrderGoods::getTotalNum, 0) + .eq(OrderGoods::getDeliveryStatus, 10) + ); + + d.setDeliveryTimes(DeliveryTimes); + d.setNoDeliveryTimes(NoDeliveryTimes); + goods.add(d); + } + }); + return success("查询成功", goods); + } + + @ApiOperation("预定人员统计") + @GetMapping("/baoCanUserCount") + public ApiResult baoCanUserCount(BcPlanParam param) { + // 验证签名 + isCheckSign(); + // 查询今日有效订单 + final List list = orderService.list(new LambdaQueryWrapper() + .eq(Order::getDeliveryTime, param.getDayTime()) + .eq(Order::getPayStatus, PAY_STATUS_SUCCESS) + .ne(Order::getOrderStatus, ORDER_STATUS_CANCEL) + ); + final List orderIds = list.stream().map(Order::getOrderId).collect(Collectors.toList()); +// System.out.println("list.size() = " + list.size()); + final List list25 = orderGoodsService.list(new LambdaQueryWrapper() + .in(OrderGoods::getOrderId, orderIds) + .eq(OrderGoods::getCategoryId, param.getCategoryId()) + .gt(OrderGoods::getTotalNum, 0) + .eq(OrderGoods::getDeleted, 0) + ); + final List userIds25 = list25.stream().map(OrderGoods::getUserId).collect(Collectors.toList()); + final List users25 = userService.listByIds(userIds25); + return success("查询成功", users25); + } + + @ApiOperation("报餐统计") + @GetMapping("/baoCanUsers") + public ApiResult baoCanUsers(OrderGoodsParam param) { + // 验证签名 + isCheckSign(); + System.out.println("param = " + param); + // 修复订单商品的支付状态 +// repairPayPriceStatus(); + + final HashMap map = new HashMap<>(); + + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + // 默认查询条件 + wrapper.ge(Order::getPayStatus,PAY_STATUS_SUCCESS) + .ne(Order::getOrderStatus, ORDER_STATUS_CANCEL); + + // 按部门查询 + if(param.getOrganizationId() != null){ + System.out.println("按部门查询 = "); + final List users = userService.list(new LambdaQueryWrapper().eq(User::getOrganizationId,param.getOrganizationId())); + final List collect = users.stream().map(User::getUserId).collect(Collectors.toList()); + System.out.println("userIds = " + collect); + wrapper.in(Order::getUserId,collect); + } + + // 是否选择日期 + if(param.getDeliveryTime() == null && param.getDeliveryTimeStart() == null && param.getCategoryId() != 0){ + return success("请选择预定日期",map); + } + // 按时间范围查询 + if(param.getDeliveryTimeStart() != null){ + // 最大只能选择一个月 + SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + try { + Date date1 = df.parse(param.getDeliveryTimeStart()); + Date date2 = df.parse(param.getDeliveryTimeEnd()); + final boolean after = date1.after(date2); + final long between = DateUtil.between(date1, date2, DateUnit.DAY); + if(between > 30L){ + return fail("超出日期查询范围"); + } + System.out.println("between = " + between); + System.out.println("after = " + after); + } catch (ParseException e) { + e.printStackTrace(); + } + wrapper.ge(Order::getDeliveryTime,param.getDeliveryTimeStart()); + wrapper.le(Order::getDeliveryTime,param.getDeliveryTimeEnd()); + } + // 按预定日期查询 + if(param.getDeliveryTime() != null){ + wrapper.eq(Order::getDeliveryTime,param.getDeliveryTime()); + } + + final List list = orderService.list(wrapper); + + if(list.size() == 0){ + return success("查询成功",null); + } + + System.out.println("报餐统计 = " + list.size()); + final List orderIds = list.stream().map(Order::getOrderId).collect(Collectors.toList()); + System.out.println("orderIds = " + orderIds.size()); + + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(OrderGoods::getDeleted,0) + .gt(OrderGoods::getTotalNum,0) + .in(OrderGoods::getOrderId,orderIds); + + if(param.getCategoryId() != null){ + queryWrapper.eq(OrderGoods::getCategoryId,param.getCategoryId()); + } + if(param.getGear() != null){ + queryWrapper.eq(OrderGoods::getGear,param.getGear()); + } + // 已报餐 + final int post = orderGoodsService.count(queryWrapper); + + // 已签到 + queryWrapper.eq(OrderGoods::getDeliveryStatus,DELIVERY_STATUS_YES); + final int sign = orderGoodsService.count(queryWrapper); + + // 未签到 + int noSign = post - sign; + + map.put("post",post); + map.put("sign",sign); + map.put("noSign", noSign); + return success(map); + + +// +//// 查询今日签到记录 +// final int sign25 = orderGoodsService.count(new LambdaQueryWrapper() +// .in(OrderGoods::getOrderId, orderIds) +// .eq(OrderGoods::getCategoryId, 25) +// .eq(OrderGoods::getDeliveryStatus, 20) +// .gt(OrderGoods::getTotalNum, 0) +// .eq(OrderGoods::getDeleted, 0) +// ); +// final int sign26 = orderGoodsService.count(new LambdaQueryWrapper() +// .in(OrderGoods::getOrderId, orderIds) +// .eq(OrderGoods::getCategoryId, 26) +// .eq(OrderGoods::getDeliveryStatus, 20) +// .gt(OrderGoods::getTotalNum, 0) +// .eq(OrderGoods::getDeleted, 0) +// ); +// final int sign27 = orderGoodsService.count(new LambdaQueryWrapper() +// .in(OrderGoods::getOrderId, orderIds) +// .eq(OrderGoods::getCategoryId, 27) +// .eq(OrderGoods::getDeliveryStatus, 20) +// .gt(OrderGoods::getTotalNum, 0) +// .eq(OrderGoods::getDeleted, 0) +// ); +//// // 查询今日报餐人数 +// final int post25 = orderGoodsService.count(new LambdaQueryWrapper() +// .in(OrderGoods::getOrderId, orderIds) +// .eq(OrderGoods::getCategoryId, 25) +// .gt(OrderGoods::getTotalNum, 0) +// .eq(OrderGoods::getDeleted, 0) +// ); +// final int post26 = orderGoodsService.count(new LambdaQueryWrapper() +// .in(OrderGoods::getOrderId, orderIds) +// .eq(OrderGoods::getCategoryId, 26) +// .gt(OrderGoods::getTotalNum, 0) +// .eq(OrderGoods::getDeleted, 0) +// ); +// final int post27 = orderGoodsService.count(new LambdaQueryWrapper() +// .in(OrderGoods::getOrderId, orderIds) +// .eq(OrderGoods::getCategoryId, 27) +// .gt(OrderGoods::getTotalNum, 0) +// .eq(OrderGoods::getDeleted, 0) +// ); +//// +// map.put("breakfastSignUsers", sign25); +// map.put("lunchSignUsers", sign26); +// map.put("dinnerSignUsers", sign27); +// +// map.put("breakfastPostUsers", post25); +// map.put("lunchPostUsers", post26); +// map.put("dinnerPostUsers", post27); + + + } + + @ApiOperation("导出报表") + @GetMapping("/export") + public ApiResult export(OrderGoodsParam param) { + return success("导出报表"); + } + + private void repairPayPriceStatus() { + final OrderGoodsParam param = new OrderGoodsParam(); + param.setUserId(0); + final List list = orderGoodsService.listRel(param); + System.out.println("修复支付状态 = " + list.size()); + list.forEach(d -> { + final Order order = orderService.getById(d.getOrderId()); + if (order != null) { + System.out.println("order = " + order); + d.setPayStatus(PAY_STATUS_SUCCESS); + d.setUserId(order.getUserId()); + orderGoodsService.updateById(d); + } else { + orderGoodsService.removeById(d); + } + }); + } + + private void updateTimeByOrderGoods() { + System.out.println("修复数据 = "); +// final Order order = orderService.getById(2467); + final LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); +// wrapper.eq(Order::getTenantId,10048); +// wrapper.eq(Order::getDeleted,0); +// wrapper.eq(Order::getOrderStatus,10); +// wrapper.eq(Order::getDeliveryStatus,10); + wrapper.in(Order::getOrderId, 3184); +// wrapper.eq(Order::getPayStatus,20); +// wrapper.gt(Order::getOrderId,1000); +// wrapper.lt(Order::getOrderId,2000); + final List list = orderService.list(wrapper); + System.out.println("修复数据list = " + list.size()); + list.forEach(order -> { + final OrderGoodsParam orderGoodsParam = new OrderGoodsParam(); + orderGoodsParam.setOrderId(order.getOrderId()); + final List goods = orderGoodsService.listRel(orderGoodsParam); + goods.forEach(d -> { + d.setDeliveryTime(order.getDeliveryTime()); + d.setPayStatus(order.getPayStatus()); + orderGoodsService.updateById(d); + System.out.println("修复预定时间 = " + d.getOrderId()); + }); + }); + } + + + @ApiOperation("今日上架物品") + @GetMapping("/getNoGrounding") + public ApiResult getNoGrounding(BcPlanParam param) { + final List list = bcPlanService.list(new LambdaQueryWrapper().eq(BcPlan::getDayTime, param.getDayTime())); + final BcPlan bcPlan = list.get(0); + final ArrayList arrayList = JSONUtil.parseObject(bcPlan.getGoodsIds(), ArrayList.class); +// final List goodsList = goodsService.list(new LambdaQueryWrapper().in(Goods::getGoodsId, arrayList)); + return success("查询成功", arrayList); + } +} diff --git a/src/main/java/com/gxwebsoft/apps/controller/BcTemporaryController.java b/src/main/java/com/gxwebsoft/apps/controller/BcTemporaryController.java new file mode 100644 index 0000000..868029e --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/controller/BcTemporaryController.java @@ -0,0 +1,158 @@ +package com.gxwebsoft.apps.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.apps.service.BcTemporaryService; +import com.gxwebsoft.apps.entity.BcTemporary; +import com.gxwebsoft.apps.param.BcTemporaryParam; +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.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.Date; +import java.util.List; + +/** + * 临时报餐管理控制器 + * + * @author 科技小王子 + * @since 2023-04-24 21:47:57 + */ +@Api(tags = "临时报餐管理管理") +@RestController +@RequestMapping("/api/apps/bc-temporary") +public class BcTemporaryController extends BaseController { + @Resource + private BcTemporaryService bcTemporaryService; + + @PreAuthorize("hasAuthority('apps:bcTemporary:list')") + @OperationLog + @ApiOperation("分页查询临时报餐管理") + @GetMapping("/page") + public ApiResult> page(BcTemporaryParam param) { + // 使用关联查询 + return success(bcTemporaryService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('apps:bcTemporary:list')") + @OperationLog + @ApiOperation("查询全部临时报餐管理") + @GetMapping() + public ApiResult> list(BcTemporaryParam param) { + // 使用关联查询 + return success(bcTemporaryService.listRel(param)); + } + + @PreAuthorize("hasAuthority('apps:bcTemporary:list')") + @OperationLog + @ApiOperation("根据id查询临时报餐管理") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + return success(bcTemporaryService.getById(id)); + // 使用关联查询 + //return success(bcTemporaryService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('apps:bcTemporary:save')") + @OperationLog + @ApiOperation("添加临时报餐管理") + @PostMapping() + public ApiResult save(@RequestBody BcTemporary bcTemporary) { + bcTemporary.setUserId(getLoginUserId()); + if (bcTemporaryService.save(bcTemporary)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + + @PreAuthorize("hasAuthority('apps:bcTemporary:save')") + @OperationLog + @ApiOperation("申请临时报餐") + @PostMapping("/apply") + public ApiResult apply(@RequestBody BcTemporary bcTemporary) { + bcTemporary.setUserId(getLoginUserId()); + final int count = bcTemporaryService.count(new LambdaQueryWrapper() + .eq(BcTemporary::getUserId, getLoginUserId()) + .eq(BcTemporary::getStatus, 0) + .eq(BcTemporary::getDayTime,DateUtil.today())); + if(count > 0){ + return fail("请勿重复提交"); + } + final DateTime dayTime = DateUtil.parse(DateUtil.today()); + bcTemporary.setDayTime(dayTime); + bcTemporary.setExpirationTime(DateUtil.offsetMinute(DateUtil.parse(DateUtil.now()), 60)); + if (bcTemporaryService.save(bcTemporary)) { + return success("提交成功"); + } + return fail("提交成功"); + } + + @PreAuthorize("hasAuthority('apps:bcTemporary:list')") + @OperationLog + @ApiOperation("修改临时报餐管理") + @PutMapping() + public ApiResult update(@RequestBody BcTemporary bcTemporary) { + // 失效时间为审核通过后半个小时 + bcTemporary.setExpirationTime(DateUtil.offsetMinute(DateUtil.parse(DateUtil.now()), 60)); + if (bcTemporaryService.updateById(bcTemporary)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('apps:bcTemporary:remove')") + @OperationLog + @ApiOperation("删除临时报餐管理") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (bcTemporaryService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('apps:bcTemporary:save')") + @OperationLog + @ApiOperation("批量添加临时报餐管理") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (bcTemporaryService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('apps:bcTemporary:update')") + @OperationLog + @ApiOperation("批量修改临时报餐管理") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(bcTemporaryService, "temporary_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('apps:bcTemporary:remove')") + @OperationLog + @ApiOperation("批量删除临时报餐管理") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (bcTemporaryService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/apps/controller/CashierController.java b/src/main/java/com/gxwebsoft/apps/controller/CashierController.java new file mode 100644 index 0000000..9cca5d8 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/controller/CashierController.java @@ -0,0 +1,137 @@ +package com.gxwebsoft.apps.controller; + +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.apps.service.CashierService; +import com.gxwebsoft.apps.entity.Cashier; +import com.gxwebsoft.apps.param.CashierParam; +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.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 WebSoft + * @since 2022-11-18 11:47:09 + */ +@Api(tags = "海牛收银台记录表管理") +@RestController +@RequestMapping("/api/apps/cashier") +public class CashierController extends BaseController { + @Resource + private CashierService cashierService; + + @PreAuthorize("hasAuthority('apps:cashier:list')") + @OperationLog + @ApiOperation("分页查询海牛收银台记录表") + @GetMapping("/page") + public ApiResult> page(CashierParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(cashierService.page(page, page.getWrapper())); + // 使用关联查询 + //return success(cashierService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('apps:cashier:list')") + @OperationLog + @ApiOperation("查询全部海牛收银台记录表") + @GetMapping() + public ApiResult> list(CashierParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(cashierService.list(page.getOrderWrapper())); + // 使用关联查询 + //return success(cashierService.listRel(param)); + } + + @PreAuthorize("hasAuthority('apps:cashier:list')") + @OperationLog + @ApiOperation("根据id查询海牛收银台记录表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + return success(cashierService.getById(id)); + // 使用关联查询 + //return success(cashierService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('apps:cashier:save')") + @OperationLog + @ApiOperation("添加海牛收银台记录表") + @PostMapping() + public ApiResult save(@RequestBody Cashier cashier) { + if(getMerchantCode() != null){ + cashier.setMerchantCode(getMerchantCode()); + } + if (cashierService.save(cashier)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('apps:cashier:update')") + @OperationLog + @ApiOperation("修改海牛收银台记录表") + @PutMapping() + public ApiResult update(@RequestBody Cashier cashier) { + if (cashierService.updateById(cashier)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('apps:cashier:remove')") + @OperationLog + @ApiOperation("删除海牛收银台记录表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (cashierService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('apps:cashier:save')") + @OperationLog + @ApiOperation("批量添加海牛收银台记录表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (cashierService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('apps:cashier:update')") + @OperationLog + @ApiOperation("批量修改海牛收银台记录表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(cashierService, "cashier_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('apps:cashier:remove')") + @OperationLog + @ApiOperation("批量删除海牛收银台记录表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (cashierService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/apps/controller/EquipmentAlarmController.java b/src/main/java/com/gxwebsoft/apps/controller/EquipmentAlarmController.java new file mode 100644 index 0000000..a06c06e --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/controller/EquipmentAlarmController.java @@ -0,0 +1,140 @@ +package com.gxwebsoft.apps.controller; + +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.apps.service.EquipmentAlarmService; +import com.gxwebsoft.apps.entity.EquipmentAlarm; +import com.gxwebsoft.apps.param.EquipmentAlarmParam; +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.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 2022-12-01 23:49:44 + */ +@Api(tags = "故障报警记录管理") +@RestController +@RequestMapping("/api/apps/equipment-alarm") +public class EquipmentAlarmController extends BaseController { + @Resource + private EquipmentAlarmService equipmentAlarmService; + + @PreAuthorize("hasAuthority('apps:equipmentAlarm:list')") + @OperationLog + @ApiOperation("分页查询故障报警记录") + @GetMapping("/page") + public ApiResult> page(EquipmentAlarmParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); +// return success(equipmentAlarmService.page(page, page.getWrapper())); + // 使用关联查询 + return success(equipmentAlarmService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('apps:equipmentAlarm:list')") + @OperationLog + @ApiOperation("查询全部故障报警记录") + @GetMapping() + public ApiResult> list(EquipmentAlarmParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(equipmentAlarmService.list(page.getOrderWrapper())); + // 使用关联查询 + //return success(equipmentAlarmService.listRel(param)); + } + + @PreAuthorize("hasAuthority('apps:equipmentAlarm:list')") + @OperationLog + @ApiOperation("根据id查询故障报警记录") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + return success(equipmentAlarmService.getById(id)); + // 使用关联查询 + //return success(equipmentAlarmService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('apps:equipmentAlarm:save')") + @OperationLog + @ApiOperation("添加故障报警记录") + @PostMapping() + public ApiResult save(@RequestBody EquipmentAlarm equipmentAlarm) { + // 记录当前登录用户id、租户id + User loginUser = getLoginUser(); + if (loginUser != null) { + equipmentAlarm.setUserId(loginUser.getUserId()); + equipmentAlarm.setMerchantCode(getMerchantCode()); + } + if (equipmentAlarmService.save(equipmentAlarm)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('apps:equipmentAlarm:update')") + @OperationLog + @ApiOperation("修改故障报警记录") + @PutMapping() + public ApiResult update(@RequestBody EquipmentAlarm equipmentAlarm) { + if (equipmentAlarmService.updateById(equipmentAlarm)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('apps:equipmentAlarm:remove')") + @OperationLog + @ApiOperation("删除故障报警记录") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (equipmentAlarmService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('apps:equipmentAlarm:save')") + @OperationLog + @ApiOperation("批量添加故障报警记录") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (equipmentAlarmService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('apps:equipmentAlarm:update')") + @OperationLog + @ApiOperation("批量修改故障报警记录") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(equipmentAlarmService, "id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('apps:equipmentAlarm:remove')") + @OperationLog + @ApiOperation("批量删除故障报警记录") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (equipmentAlarmService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/apps/controller/EquipmentController.java b/src/main/java/com/gxwebsoft/apps/controller/EquipmentController.java new file mode 100644 index 0000000..9f59ca3 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/controller/EquipmentController.java @@ -0,0 +1,253 @@ +package com.gxwebsoft.apps.controller; + +import cn.hutool.core.date.DateUtil; +import com.alibaba.fastjson.JSONObject; +import com.alipay.api.AlipayApiException; +import com.alipay.api.DefaultAlipayClient; +import com.alipay.api.domain.AlipayOpenAppQrcodeCreateModel; +import com.alipay.api.request.AlipayOpenAppQrcodeCreateRequest; +import com.alipay.api.response.AlipayOpenAppQrcodeCreateResponse; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.gxwebsoft.apps.entity.Equipment; +import com.gxwebsoft.apps.entity.EquipmentRecord; +import com.gxwebsoft.apps.param.EquipmentParam; +import com.gxwebsoft.apps.service.EquipmentRecordService; +import com.gxwebsoft.apps.service.EquipmentService; +import com.gxwebsoft.common.core.annotation.OperationLog; +import com.gxwebsoft.common.core.exception.BusinessException; +import com.gxwebsoft.common.core.utils.AlipayConfigUtil; +import com.gxwebsoft.common.core.web.*; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.shop.entity.Merchant; +import com.gxwebsoft.shop.entity.Order; +import com.gxwebsoft.shop.service.MerchantService; +import com.gxwebsoft.shop.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.util.List; + +import static com.gxwebsoft.apps.constants.EquipmentConstants.EVENT_TYPE_BIND; +import static com.gxwebsoft.common.core.constants.OrderConstants.*; + +/** + * 设备管理控制器 + * + * @author 科技小王子 + * @since 2022-11-30 02:11:16 + */ +@Api(tags = "设备管理管理") +@RestController +@RequestMapping("/api/apps/equipment") +public class EquipmentController extends BaseController { + @Resource + private EquipmentService equipmentService; + @Resource + private OrderService orderService; + @Resource + private AlipayConfigUtil alipayConfig; + @Resource + private MerchantService merchantService; + @Resource + private EquipmentRecordService equipmentRecordService; + + @PreAuthorize("hasAuthority('apps:equipment:list')") + @OperationLog + @ApiOperation("分页查询设备管理") + @GetMapping("/page") + public ApiResult> page(EquipmentParam param) { + // 使用关联查询 + if (getMerchantCode() != null) { + param.setMerchantCode(getMerchantCode()); + } + return success(equipmentService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('apps:equipment:list')") + @OperationLog + @ApiOperation("查询全部设备管理") + @GetMapping() + public ApiResult> list(EquipmentParam param) { + PageParam page = new PageParam<>(param); +// page.setDefaultOrder("create_time desc"); +// return success(equipmentService.list(page.getOrderWrapper())); + // 使用关联查询 + return success(equipmentService.listRel(param)); + } + + @PreAuthorize("hasAuthority('apps:equipment:list')") + @OperationLog + @ApiOperation("根据id查询设备管理") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { +// return success(equipmentService.getById(id)); + // 使用关联查询 + return success(equipmentService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('apps:equipment:save')") + @OperationLog + @ApiOperation("添加设备管理") + @PostMapping() + public ApiResult save(@RequestBody Equipment equipment) throws AlipayApiException { + // 记录当前登录用户id、租户id + User loginUser = getLoginUser(); + if (getMerchantCode() != null) { + equipment.setMerchantCode(getMerchantCode()); + } + if (equipmentService.count(new LambdaQueryWrapper() + .eq(Equipment::getEquipmentCode, equipment.getEquipmentCode())) > 0) { + return fail("设备编号已存在"); + } + if (equipmentService.save(equipment)) { + // 生成二维码 + String qrcode = createQrcode(equipment); + equipment.setQrcode(qrcode); + equipmentService.saveOrUpdate(equipment); + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('apps:equipment:update')") + @OperationLog + @ApiOperation("修改设备管理") + @PutMapping() + public ApiResult update(@RequestBody Equipment equipment) throws AlipayApiException { + if (equipmentService.updateById(equipment)) { + // 生成二维码 + String qrcode = createQrcode(equipment); + equipment.setQrcode(qrcode); + equipmentService.saveOrUpdate(equipment); + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('apps:equipment:update')") + @OperationLog + @ApiOperation("绑定设备") + @PutMapping("/bind") + public ApiResult bindEquipment(@RequestBody Equipment equipment) { + final Integer orderId = equipment.getOrderId(); + final Order order = orderService.getById(orderId); + Equipment one = equipmentService.getOne(new LambdaQueryWrapper().eq(Equipment::getEquipmentCode, equipment.getEquipmentCode())); + if(one == null){ + return fail("设备不存在"); + } + if(!one.getUserId().equals(0)){ + return fail("该设备已被绑定"); + } + Equipment saveData = new Equipment(); + saveData.setEquipmentId(one.getEquipmentId()); + saveData.setUserId(equipment.getUserId()); + saveData.setOrderId(orderId); + if (equipmentService.updateById(saveData)) { + // 记录明细 + EquipmentRecord record = new EquipmentRecord(); + record.setEquipmentCode(one.getEquipmentCode()); + record.setUserId(getLoginUserId()); + record.setEventType(EVENT_TYPE_BIND); + record.setComments("订单号：".concat(Long.toString(order.getOrderNo()))); + record.setMerchantCode(one.getMerchantCode()); + equipmentRecordService.save(record); + // 订单发货 + order.setDeliveryStatus(DELIVERY_STATUS_YES); + order.setOrderStatus(ORDER_STATUS_COMPLETED); + order.setReceiptStatus(RECEIPT_STATUS_YES); + order.setExpirationTime(DateUtil.nextMonth()); + order.setEquipmentId(one.getEquipmentId()); + orderService.updateById(order); + return success("绑定成功"); + } + return fail("绑定失败"); + } + + @PreAuthorize("hasAuthority('apps:equipment:remove')") + @OperationLog + @ApiOperation("删除设备管理") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (equipmentService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('apps:equipment:save')") + @OperationLog + @ApiOperation("批量添加设备管理") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (equipmentService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('apps:equipment:update')") + @OperationLog + @ApiOperation("批量修改设备管理") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(equipmentService, "equipment_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('apps:equipment:remove')") + @OperationLog + @ApiOperation("批量删除设备管理") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (equipmentService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + // 生成支付宝小程序码 + private String createQrcode(Equipment equipment) throws AlipayApiException{ + // 实例化客户端 + DefaultAlipayClient alipayClient = alipayConfig.alipayClient(getTenantId()); + + AlipayOpenAppQrcodeCreateRequest request = new AlipayOpenAppQrcodeCreateRequest(); + AlipayOpenAppQrcodeCreateModel model = new AlipayOpenAppQrcodeCreateModel(); + model.setUrlParam("pages/equipment/equipment"); + System.out.println("equipment = " + equipment); + // __id__=2&merchantCode=M311539&merchantId=52 + // pages/equipment/equipment + +// Merchant merchant = merchantService.getMerchantByCode(equipment.getMerchantCode()); +// if(merchant == null){ +// throw new BusinessException("该商户不存在"); +// } + model.setQueryParam("equipmentId=".concat(equipment.getEquipmentId().toString())); + model.setDescribe("扫码租赁电池"); + request.setBizModel(model); + AlipayOpenAppQrcodeCreateResponse response = alipayClient.certificateExecute(request); + System.out.println(response.getBody()); + if (response.isSuccess()) { + System.out.println("调用成功"); + final JSONObject jsonObject = JSONObject.parseObject(response.getBody()); + final String alipay_open_app_qrcode_create_response = jsonObject.getString("alipay_open_app_qrcode_create_response"); + final JSONObject jsonObject1 = JSONObject.parseObject(alipay_open_app_qrcode_create_response); + return jsonObject1.getString("qr_code_url"); + } else { + System.out.println("调用失败"); + return null; + } + } + + @PreAuthorize("hasAuthority('apps:equipment:update')") + @ApiOperation("确认收货") + @PostMapping("/receipt") + public ApiResult receipt(@RequestBody Order order){ + orderService.updateById(order); + return success("确认收货"); + } +} diff --git a/src/main/java/com/gxwebsoft/apps/controller/EquipmentFaultController.java b/src/main/java/com/gxwebsoft/apps/controller/EquipmentFaultController.java new file mode 100644 index 0000000..f42c6cc --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/controller/EquipmentFaultController.java @@ -0,0 +1,140 @@ +package com.gxwebsoft.apps.controller; + +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.apps.service.EquipmentFaultService; +import com.gxwebsoft.apps.entity.EquipmentFault; +import com.gxwebsoft.apps.param.EquipmentFaultParam; +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.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 2022-12-01 18:40:25 + */ +@Api(tags = "故障电池管理") +@RestController +@RequestMapping("/api/apps/equipment-fault") +public class EquipmentFaultController extends BaseController { + @Resource + private EquipmentFaultService equipmentFaultService; + + @PreAuthorize("hasAuthority('apps:equipmentFault:list')") + @OperationLog + @ApiOperation("分页查询故障电池") + @GetMapping("/page") + public ApiResult> page(EquipmentFaultParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); +// return success(equipmentFaultService.page(page, page.getWrapper())); + // 使用关联查询 + return success(equipmentFaultService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('apps:equipmentFault:list')") + @OperationLog + @ApiOperation("查询全部故障电池") + @GetMapping() + public ApiResult> list(EquipmentFaultParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(equipmentFaultService.list(page.getOrderWrapper())); + // 使用关联查询 +// return success(equipmentFaultService.listRel(param)); + } + + @PreAuthorize("hasAuthority('apps:equipmentFault:list')") + @OperationLog + @ApiOperation("根据id查询故障电池") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + return success(equipmentFaultService.getById(id)); + // 使用关联查询 + //return success(equipmentFaultService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('apps:equipmentFault:save')") + @OperationLog + @ApiOperation("添加故障电池") + @PostMapping() + public ApiResult save(@RequestBody EquipmentFault equipmentFault) { + // 记录当前登录用户id、租户id + User loginUser = getLoginUser(); + if (loginUser != null) { + equipmentFault.setUserId(loginUser.getUserId()); + equipmentFault.setMerchantCode(getMerchantCode()); + } + if (equipmentFaultService.save(equipmentFault)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('apps:equipmentFault:update')") + @OperationLog + @ApiOperation("修改故障电池") + @PutMapping() + public ApiResult update(@RequestBody EquipmentFault equipmentFault) { + if (equipmentFaultService.updateById(equipmentFault)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('apps:equipmentFault:remove')") + @OperationLog + @ApiOperation("删除故障电池") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (equipmentFaultService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('apps:equipmentFault:save')") + @OperationLog + @ApiOperation("批量添加故障电池") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (equipmentFaultService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('apps:equipmentFault:update')") + @OperationLog + @ApiOperation("批量修改故障电池") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(equipmentFaultService, "id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('apps:equipmentFault:remove')") + @OperationLog + @ApiOperation("批量删除故障电池") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (equipmentFaultService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/apps/controller/EquipmentGoodsController.java b/src/main/java/com/gxwebsoft/apps/controller/EquipmentGoodsController.java new file mode 100644 index 0000000..6279315 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/controller/EquipmentGoodsController.java @@ -0,0 +1,130 @@ +package com.gxwebsoft.apps.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.gxwebsoft.apps.entity.Equipment; +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.apps.service.EquipmentGoodsService; +import com.gxwebsoft.apps.entity.EquipmentGoods; +import com.gxwebsoft.apps.param.EquipmentGoodsParam; +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.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 2023-02-28 22:40:50 + */ +@Api(tags = "电池管理记录表管理") +@RestController +@RequestMapping("/api/apps/equipment-goods") +public class EquipmentGoodsController extends BaseController { + @Resource + private EquipmentGoodsService equipmentGoodsService; + + @PreAuthorize("hasAuthority('apps:equipmentGoods:list')") + @OperationLog + @ApiOperation("分页查询电池管理记录表") + @GetMapping("/page") + public ApiResult> page(EquipmentGoodsParam param) { + // 使用关联查询 + return success(equipmentGoodsService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('apps:equipmentGoods:list')") + @OperationLog + @ApiOperation("查询全部电池管理记录表") + @GetMapping() + public ApiResult> list(EquipmentGoodsParam param) { + // 使用关联查询 + return success(equipmentGoodsService.listRel(param)); + } + + @PreAuthorize("hasAuthority('apps:equipmentGoods:list')") + @OperationLog + @ApiOperation("根据id查询电池管理记录表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + // 使用关联查询 + return success(equipmentGoodsService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('apps:equipmentGoods:save')") + @OperationLog + @ApiOperation("添加电池管理记录表") + @PostMapping() + public ApiResult save(@RequestBody EquipmentGoods equipmentGoods) { + System.out.println("equipmentGoods = " + equipmentGoods); + if (equipmentGoodsService.save(equipmentGoods)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('apps:equipmentGoods:update')") + @OperationLog + @ApiOperation("修改电池管理记录表") + @PutMapping() + public ApiResult update(@RequestBody EquipmentGoods equipmentGoods) { + if (equipmentGoodsService.updateById(equipmentGoods)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('apps:equipmentGoods:remove')") + @OperationLog + @ApiOperation("删除电池管理记录表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (equipmentGoodsService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('apps:equipmentGoods:save')") + @OperationLog + @ApiOperation("批量添加电池管理记录表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (equipmentGoodsService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('apps:equipmentGoods:update')") + @OperationLog + @ApiOperation("批量修改电池管理记录表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(equipmentGoodsService, "goods_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('apps:equipmentGoods:remove')") + @OperationLog + @ApiOperation("批量删除电池管理记录表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (equipmentGoodsService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/apps/controller/EquipmentOrderController.java b/src/main/java/com/gxwebsoft/apps/controller/EquipmentOrderController.java new file mode 100644 index 0000000..9774396 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/controller/EquipmentOrderController.java @@ -0,0 +1,140 @@ +package com.gxwebsoft.apps.controller; + +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.apps.service.EquipmentOrderService; +import com.gxwebsoft.apps.entity.EquipmentOrder; +import com.gxwebsoft.apps.param.EquipmentOrderParam; +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.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 2023-04-14 21:24:31 + */ +@Api(tags = "订单记录表管理") +@RestController +@RequestMapping("/api/apps/equipment-order") +public class EquipmentOrderController extends BaseController { + @Resource + private EquipmentOrderService equipmentOrderService; + + @PreAuthorize("hasAuthority('apps:equipmentOrder:list')") + @OperationLog + @ApiOperation("分页查询订单记录表") + @GetMapping("/page") + public ApiResult> page(EquipmentOrderParam param) { +// PageParam page = new PageParam<>(param); +// page.setDefaultOrder("create_time desc"); +// return success(equipmentOrderService.page(page, page.getWrapper())); + // 使用关联查询 + return success(equipmentOrderService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('apps:equipmentOrder:list')") + @OperationLog + @ApiOperation("查询全部订单记录表") + @GetMapping() + public ApiResult> list(EquipmentOrderParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(equipmentOrderService.list(page.getOrderWrapper())); + // 使用关联查询 + //return success(equipmentOrderService.listRel(param)); + } + + @PreAuthorize("hasAuthority('apps:equipmentOrder:list')") + @OperationLog + @ApiOperation("根据id查询订单记录表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + return success(equipmentOrderService.getById(id)); + // 使用关联查询 + //return success(equipmentOrderService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('apps:equipmentOrder:save')") + @OperationLog + @ApiOperation("添加订单记录表") + @PostMapping() + public ApiResult save(@RequestBody EquipmentOrder equipmentOrder) { + // 记录当前登录用户id、租户id、商户编号 + User loginUser = getLoginUser(); + if (loginUser != null) { + equipmentOrder.setUserId(loginUser.getUserId()); + equipmentOrder.setMerchantCode(getMerchantCode()); + } + if (equipmentOrderService.save(equipmentOrder)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('apps:equipmentOrder:update')") + @OperationLog + @ApiOperation("修改订单记录表") + @PutMapping() + public ApiResult update(@RequestBody EquipmentOrder equipmentOrder) { + if (equipmentOrderService.updateById(equipmentOrder)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('apps:equipmentOrder:remove')") + @OperationLog + @ApiOperation("删除订单记录表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (equipmentOrderService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('apps:equipmentOrder:save')") + @OperationLog + @ApiOperation("批量添加订单记录表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (equipmentOrderService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('apps:equipmentOrder:update')") + @OperationLog + @ApiOperation("批量修改订单记录表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(equipmentOrderService, "order_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('apps:equipmentOrder:remove')") + @OperationLog + @ApiOperation("批量删除订单记录表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (equipmentOrderService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/apps/controller/EquipmentOrderGoodsController.java b/src/main/java/com/gxwebsoft/apps/controller/EquipmentOrderGoodsController.java new file mode 100644 index 0000000..26afd4b --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/controller/EquipmentOrderGoodsController.java @@ -0,0 +1,148 @@ +package com.gxwebsoft.apps.controller; + +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.apps.service.EquipmentOrderGoodsService; +import com.gxwebsoft.apps.entity.EquipmentOrderGoods; +import com.gxwebsoft.apps.param.EquipmentOrderGoodsParam; +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.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 2023-05-11 19:10:13 + */ +@Api(tags = "电池管理记录表管理") +@RestController +@RequestMapping("/api/apps/equipment-order-goods") +public class EquipmentOrderGoodsController extends BaseController { + @Resource + private EquipmentOrderGoodsService equipmentOrderGoodsService; + + @PreAuthorize("hasAuthority('apps:equipmentOrderGoods:list')") + @OperationLog + @ApiOperation("分页查询电池管理记录表") + @GetMapping("/page") + public ApiResult> page(EquipmentOrderGoodsParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(equipmentOrderGoodsService.page(page, page.getWrapper())); + // 使用关联查询 + //return success(equipmentOrderGoodsService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('apps:equipmentOrderGoods:list')") + @OperationLog + @ApiOperation("查询全部电池管理记录表") + @GetMapping() + public ApiResult> list(EquipmentOrderGoodsParam param) { +// PageParam page = new PageParam<>(param); +// page.setDefaultOrder("create_time desc"); +// System.out.println("param = " + param); +// final EquipmentOrderGoods eog = equipmentOrderGoodsService.getById(param.getGoodsId()); +// System.out.println("eog = " + eog); +// eog.setOrderId(param.getOrderId()); +// equipmentOrderGoodsService.updateById(eog); +// +// final List list = equipmentOrderGoodsService.list(page.getOrderWrapper()); +// +// return success(equipmentOrderGoodsService.list(page.getOrderWrapper())); + // 使用关联查询 + return success(equipmentOrderGoodsService.listRel(param)); + } + + @PreAuthorize("hasAuthority('apps:equipmentOrderGoods:list')") + @OperationLog + @ApiOperation("根据id查询电池管理记录表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + return success(equipmentOrderGoodsService.getById(id)); + // 使用关联查询 + //return success(equipmentOrderGoodsService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('apps:equipmentOrderGoods:save')") + @OperationLog + @ApiOperation("添加电池管理记录表") + @PostMapping() + public ApiResult save(@RequestBody EquipmentOrderGoods equipmentOrderGoods) { + // 记录当前登录用户id、租户id、商户编号 + User loginUser = getLoginUser(); + if (loginUser != null) { + equipmentOrderGoods.setUserId(loginUser.getUserId()); + equipmentOrderGoods.setMerchantCode(getMerchantCode()); + } + if (equipmentOrderGoodsService.save(equipmentOrderGoods)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('apps:equipmentOrderGoods:update')") + @OperationLog + @ApiOperation("修改电池管理记录表") + @PutMapping() + public ApiResult update(@RequestBody EquipmentOrderGoods equipmentOrderGoods) { + if (equipmentOrderGoodsService.updateById(equipmentOrderGoods)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('apps:equipmentOrderGoods:remove')") + @OperationLog + @ApiOperation("删除电池管理记录表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (equipmentOrderGoodsService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('apps:equipmentOrderGoods:save')") + @OperationLog + @ApiOperation("批量添加电池管理记录表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (equipmentOrderGoodsService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('apps:equipmentOrderGoods:update')") + @OperationLog + @ApiOperation("批量修改电池管理记录表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(equipmentOrderGoodsService, "order_goods_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('apps:equipmentOrderGoods:remove')") + @OperationLog + @ApiOperation("批量删除电池管理记录表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (equipmentOrderGoodsService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/apps/controller/EquipmentRecordController.java b/src/main/java/com/gxwebsoft/apps/controller/EquipmentRecordController.java new file mode 100644 index 0000000..5469754 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/controller/EquipmentRecordController.java @@ -0,0 +1,144 @@ +package com.gxwebsoft.apps.controller; + +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.apps.service.EquipmentRecordService; +import com.gxwebsoft.apps.entity.EquipmentRecord; +import com.gxwebsoft.apps.param.EquipmentRecordParam; +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.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 2022-12-03 01:23:53 + */ +@Api(tags = "前世今生管理") +@RestController +@RequestMapping("/api/apps/equipment-record") +public class EquipmentRecordController extends BaseController { + @Resource + private EquipmentRecordService equipmentRecordService; + + @PreAuthorize("hasAuthority('apps:equipmentRecord:list')") + @OperationLog + @ApiOperation("分页查询前世今生") + @GetMapping("/page") + public ApiResult> page(EquipmentRecordParam param) { + PageParam page = new PageParam<>(param); + // 搜索条件 + if (getMerchantCode() != null) { + param.setMerchantCode(getMerchantCode()); + } +// page.setDefaultOrder("create_time desc"); +// return success(equipmentRecordService.page(page, page.getWrapper())); + // 使用关联查询 + return success(equipmentRecordService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('apps:equipmentRecord:list')") + @OperationLog + @ApiOperation("查询全部前世今生") + @GetMapping() + public ApiResult> list(EquipmentRecordParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); +// return success(equipmentRecordService.list(page.getOrderWrapper())); + // 使用关联查询 + return success(equipmentRecordService.listRel(param)); + } + + @PreAuthorize("hasAuthority('apps:equipmentRecord:list')") + @OperationLog + @ApiOperation("根据id查询前世今生") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { +// return success(equipmentRecordService.getById(id)); + // 使用关联查询 + return success(equipmentRecordService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('apps:equipmentRecord:save')") + @OperationLog + @ApiOperation("添加前世今生") + @PostMapping() + public ApiResult save(@RequestBody EquipmentRecord equipmentRecord) { + // 记录当前登录用户id、租户id、商户编号 + User loginUser = getLoginUser(); + if (loginUser != null) { + equipmentRecord.setUserId(loginUser.getUserId()); + equipmentRecord.setMerchantCode(getMerchantCode()); + } + if (equipmentRecordService.save(equipmentRecord)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('apps:equipmentRecord:update')") + @OperationLog + @ApiOperation("修改前世今生") + @PutMapping() + public ApiResult update(@RequestBody EquipmentRecord equipmentRecord) { + if (equipmentRecordService.updateById(equipmentRecord)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('apps:equipmentRecord:remove')") + @OperationLog + @ApiOperation("删除前世今生") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (equipmentRecordService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('apps:equipmentRecord:save')") + @OperationLog + @ApiOperation("批量添加前世今生") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (equipmentRecordService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('apps:equipmentRecord:update')") + @OperationLog + @ApiOperation("批量修改前世今生") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(equipmentRecordService, "id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('apps:equipmentRecord:remove')") + @OperationLog + @ApiOperation("批量删除前世今生") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (equipmentRecordService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/apps/controller/HualalaCardBenefitsController.java b/src/main/java/com/gxwebsoft/apps/controller/HualalaCardBenefitsController.java new file mode 100644 index 0000000..1376585 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/controller/HualalaCardBenefitsController.java @@ -0,0 +1,134 @@ +package com.gxwebsoft.apps.controller; + +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.apps.service.HualalaCardBenefitsService; +import com.gxwebsoft.apps.entity.HualalaCardBenefits; +import com.gxwebsoft.apps.param.HualalaCardBenefitsParam; +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.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 2023-01-08 12:22:50 + */ +@Api(tags = "会员权益管理") +@RestController +@RequestMapping("/api/apps/hualala-card-benefits") +public class HualalaCardBenefitsController extends BaseController { + @Resource + private HualalaCardBenefitsService hualalaCardBenefitsService; + + @PreAuthorize("hasAuthority('apps:hualalaCardBenefits:list')") + @OperationLog + @ApiOperation("分页查询会员权益") + @GetMapping("/page") + public ApiResult> page(HualalaCardBenefitsParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(hualalaCardBenefitsService.page(page, page.getWrapper())); + // 使用关联查询 + //return success(hualalaCardBenefitsService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('apps:hualalaCardBenefits:list')") + @OperationLog + @ApiOperation("查询全部会员权益") + @GetMapping() + public ApiResult> list(HualalaCardBenefitsParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(hualalaCardBenefitsService.list(page.getOrderWrapper())); + // 使用关联查询 + //return success(hualalaCardBenefitsService.listRel(param)); + } + + @PreAuthorize("hasAuthority('apps:hualalaCardBenefits:list')") + @OperationLog + @ApiOperation("根据id查询会员权益") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + return success(hualalaCardBenefitsService.getById(id)); + // 使用关联查询 + //return success(hualalaCardBenefitsService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('apps:hualalaCardBenefits:save')") + @OperationLog + @ApiOperation("添加会员权益") + @PostMapping() + public ApiResult save(@RequestBody HualalaCardBenefits hualalaCardBenefits) { + if (hualalaCardBenefitsService.save(hualalaCardBenefits)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('apps:hualalaCardBenefits:update')") + @OperationLog + @ApiOperation("修改会员权益") + @PutMapping() + public ApiResult update(@RequestBody HualalaCardBenefits hualalaCardBenefits) { + if (hualalaCardBenefitsService.updateById(hualalaCardBenefits)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('apps:hualalaCardBenefits:remove')") + @OperationLog + @ApiOperation("删除会员权益") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (hualalaCardBenefitsService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('apps:hualalaCardBenefits:save')") + @OperationLog + @ApiOperation("批量添加会员权益") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (hualalaCardBenefitsService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('apps:hualalaCardBenefits:update')") + @OperationLog + @ApiOperation("批量修改会员权益") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(hualalaCardBenefitsService, "id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('apps:hualalaCardBenefits:remove')") + @OperationLog + @ApiOperation("批量删除会员权益") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (hualalaCardBenefitsService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/apps/controller/HualalaCardController.java b/src/main/java/com/gxwebsoft/apps/controller/HualalaCardController.java new file mode 100644 index 0000000..66cea36 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/controller/HualalaCardController.java @@ -0,0 +1,140 @@ +package com.gxwebsoft.apps.controller; + +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.apps.service.HualalaCardService; +import com.gxwebsoft.apps.entity.HualalaCard; +import com.gxwebsoft.apps.param.HualalaCardParam; +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.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 2023-01-08 12:22:50 + */ +@Api(tags = "管理") +@RestController +@RequestMapping("/api/apps/hualala-card") +public class HualalaCardController extends BaseController { + @Resource + private HualalaCardService hualalaCardService; + + @PreAuthorize("hasAuthority('apps:hualalaCard:list')") + @OperationLog + @ApiOperation("分页查询") + @GetMapping("/page") + public ApiResult> page(HualalaCardParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(hualalaCardService.page(page, page.getWrapper())); + // 使用关联查询 + //return success(hualalaCardService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('apps:hualalaCard:list')") + @OperationLog + @ApiOperation("查询全部") + @GetMapping() + public ApiResult> list(HualalaCardParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(hualalaCardService.list(page.getOrderWrapper())); + // 使用关联查询 + //return success(hualalaCardService.listRel(param)); + } + + @PreAuthorize("hasAuthority('apps:hualalaCard:list')") + @OperationLog + @ApiOperation("根据id查询") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + return success(hualalaCardService.getById(id)); + // 使用关联查询 + //return success(hualalaCardService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('apps:hualalaCard:save')") + @OperationLog + @ApiOperation("添加") + @PostMapping() + public ApiResult save(@RequestBody HualalaCard hualalaCard) { + // 记录当前登录用户id、租户id、商户编号 + User loginUser = getLoginUser(); + if (loginUser != null) { + hualalaCard.setUserId(loginUser.getUserId()); + hualalaCard.setMerchantCode(getMerchantCode()); + } + if (hualalaCardService.save(hualalaCard)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('apps:hualalaCard:update')") + @OperationLog + @ApiOperation("修改") + @PutMapping() + public ApiResult update(@RequestBody HualalaCard hualalaCard) { + if (hualalaCardService.updateById(hualalaCard)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('apps:hualalaCard:remove')") + @OperationLog + @ApiOperation("删除") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (hualalaCardService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('apps:hualalaCard:save')") + @OperationLog + @ApiOperation("批量添加") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (hualalaCardService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('apps:hualalaCard:update')") + @OperationLog + @ApiOperation("批量修改") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(hualalaCardService, "id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('apps:hualalaCard:remove')") + @OperationLog + @ApiOperation("批量删除") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (hualalaCardService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/apps/controller/HualalaCart.java b/src/main/java/com/gxwebsoft/apps/controller/HualalaCart.java new file mode 100644 index 0000000..5037c20 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/controller/HualalaCart.java @@ -0,0 +1,240 @@ +package com.gxwebsoft.apps.controller; + +import cn.hutool.core.util.StrUtil; +import cn.hutool.crypto.digest.DigestUtil; +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.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.gxwebsoft.apps.entity.HualalaFood; +import com.gxwebsoft.apps.entity.HualalaShop; +import com.gxwebsoft.apps.entity.ItemVo; +import com.gxwebsoft.apps.result.*; +import com.gxwebsoft.apps.service.HualalaFoodService; +import com.gxwebsoft.apps.service.HualalaService; +import com.gxwebsoft.apps.service.HualalaShopService; +import com.gxwebsoft.common.core.utils.CacheClient; +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.system.entity.User; +import com.gxwebsoft.shop.entity.Order; +import com.gxwebsoft.shop.entity.OrderGoods; +import com.gxwebsoft.shop.param.OrderParam; +import com.gxwebsoft.shop.service.OrderGoodsService; +import com.gxwebsoft.shop.service.OrderService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.val; +import org.springframework.data.redis.core.StringRedisTemplate; +import org.springframework.http.*; +import org.springframework.util.LinkedMultiValueMap; +import org.springframework.util.MultiValueMap; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.client.RestTemplate; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.math.BigDecimal; +import java.util.*; +import java.util.stream.Collectors; + +import static com.gxwebsoft.common.core.constants.OrderConstants.PAY_STATUS_SUCCESS; +import static com.gxwebsoft.common.core.constants.RedisConstants.*; + +/** + * 哗啦啦-购物车 + * 教程参考 https://blog.csdn.net/qq_34383510/article/details/127824628 + * @author 科技小王子 + * @since 2022-11-25 12:55:33 + */ +@Api(tags = "哗啦啦-购物车") +@RestController +@RequestMapping("/api/apps/hualala-cart") +public class HualalaCart extends BaseController { + + @Resource + private StringRedisTemplate stringRedisTemplate; + @Resource + private CacheClient cacheClient; + @Resource + private HualalaService hualalaService; + @Resource + private HualalaFoodService hualalaFoodService; + @Resource + private OrderService orderService; + @Resource + private OrderGoodsService orderGoodsService; + @Resource + private HualalaShopService hualalaShopService; + + @ApiOperation("我的购物车") + @GetMapping() + public ApiResult cart(ItemVo param) { + String key = getKey(param.getShopId()); + + return success("查询成功",showCart(key)); + } + + @ApiOperation("添加购物车") + @PostMapping("/addCart") + public ApiResult addCart(@RequestBody ItemVo param) { + String key = getKey(param.getShopId()); + cacheClient.hPut(key,param.getFoodId().toString(),JSONUtil.toJSONString(param)); + + return success("添加成功",showCart(key)); + } + + @ApiOperation("生成订单并清空购物车") + @PostMapping("/createOrder") + public ApiResult createOrder(@RequestBody Order order){ + String key = getKey(order.getShopId().toString()); + // 记录当前登录用户id、租户id + User loginUser = getLoginUser(); + if (loginUser != null) { + order.setUserId(loginUser.getUserId()); + } + order.setMerchantCode(order.getShopId().toString()); + order.setPayMethod("通联支付"); + if (orderService.save(order)) { + // 添加订单商品 + List hValues = cacheClient.hValues(key); + hValues.forEach(d -> { + JSONObject json = JSONObject.parseObject(d.toString()); + OrderGoods orderGoods = new OrderGoods(); + orderGoods.setOrderId(order.getOrderId()); + orderGoods.setGoodsName(json.getString("foodName")); + orderGoods.setImageUrl(json.getString("imge")); + orderGoods.setTotalNum(Integer.valueOf(json.getString("num"))); + orderGoods.setGoodsId(Integer.valueOf(json.getString("foodId"))); + orderGoods.setGoodsSkuId(json.getString("foodUnitID")); + orderGoods.setUserId(getLoginUserId()); + BigDecimal totalPrice = new BigDecimal(json.getString("price")); + orderGoods.setTotalPrice(totalPrice); + orderGoods.setTenantId(getTenantId()); + orderGoodsService.save(orderGoods); + }); + + // 清空购物车 + cacheClient.delete(key); + return success("订单创建成功",order); + } + return fail("订单创建失败"); + } + + @ApiOperation("通联支付") + @PostMapping("/allinPay") + public ApiResult allinPay(@RequestBody Order order){ + Order orderInfo = orderService.getById(order.getOrderId()); + System.out.println("orderInfo = " + orderInfo); + final HualalaShop shop = hualalaShopService.getByIdRel(orderInfo.getShopId()); + final String payMerchantNo = shop.getPayMerchantNo(); + final String paySecret = shop.getPaySecret(); + System.out.println("payMerchantNo = " + payMerchantNo); + System.out.println("paySecret = " + paySecret); + + // 正式接口 + String url = "https://interface.allinpaygx.com/api/access/payInterface/unifiedPay"; + // 测试接口 +// String url = "https://interfacetest.allinpaygx.com/api/access/payInterface/unifiedPay"; +// System.out.println("接口地址 = " + url); + // map传参数 + Map map = new HashMap<>(); + // 计算金额 + final BigDecimal orderPrice = orderInfo.getOrderPrice().multiply(new BigDecimal(100)); + final int amount = Integer.parseInt(orderPrice.stripTrailingZeros().toPlainString()); + map.put("merchantNo", payMerchantNo); // 正式商户 +// map.put("merchantNo", "113201120053"); // 测试商户：113201120053 + map.put("merchantOrderNo", orderInfo.getOrderNo()); + map.put("amount",String.valueOf(amount)); + map.put("notifyUrl","https://open.gxwebsoft.com/api/apps/hualala-cart/payNotify"); + map.put("payType","W06S"); + // 附加签名 + String sign = getSign(map,paySecret); + System.out.println("sign = " + sign); + map.put("sign",sign); + System.out.println("请求参数 = " + map); + String result = HttpUtil.post(url,map); + System.out.println("result = " + result); + JSONObject resultObj = JSON.parseObject(result); + JSONObject payinfo = JSON.parseObject(resultObj.getString("payinfo")); + System.out.println("payinfo = " + payinfo); + return success("支付参数",payinfo); + } + + public static String getSign(Map treeMap, String paySecret) { +// String secret = paySecret; // 正式秘钥 +// String secret = "aceb62c896d849c89d1c8b9a4416d1a7"; // 测试秘钥 + TreeMap tMap = new TreeMap<>(); + for (Map.Entry entry : treeMap.entrySet()) { + if (!StrUtil.isEmpty(entry.getValue().toString()) && !entry.getKey().equals("sign")) { + tMap.put(entry.getKey(), entry.getValue().toString()); + } + } + StringBuffer buf = new StringBuffer(); + for (String key : tMap.keySet()) { + buf.append(key).append(treeMap.get(key)); + } + buf.append(paySecret); + System.out.println("buf = " + buf); + return DigestUtil.md5Hex(buf.toString()).toUpperCase(); + } + + @ApiOperation("通联支付") + @PostMapping("/payNotify") + public String payNotify(@RequestParam Map params){ + // 支付成功 + if (orderService.allinPay(params)) { + return "success"; + } + return "error"; + + } + + @ApiOperation("交易查询") + @PostMapping("/findOrderInfo") + public ApiResult findOrderInfo(@RequestBody Order order){ + final Order data = orderService.getByOutTradeNo(order.getOrderNo().toString()); + return success("查询结果",data); + } + + + // 获取Key + private String getKey(String shopId) { + return HLL_CART_FOOD_KEY.concat(shopId).concat(":").concat(getLoginUserId().toString()); + } + + private OperateVo showCart(String key){ + // 获取购物车数据 + List values = cacheClient.hValues(key); +// System.out.println("values = " + values); + List collect = values.stream().map(item -> JSONUtil.parseObject(JSONUtil.toJSONString(item), ItemVo.class)).collect(Collectors.toList()); +// System.out.println("collect = " + collect); + + // 封装数据结果 + OperateVo operateVo = new OperateVo(); + operateVo.setTotalNum(0); + operateVo.setTotalPrice(BigDecimal.valueOf(0)); + operateVo.setItems(collect); + collect.forEach(d -> { +// System.out.println("operateVo.getTotalNum() + d.getNum() = " + operateVo.getTotalNum() + d.getNum()); + operateVo.setTotalNum(operateVo.getTotalNum()+d.getNum()); + operateVo.setTotalPrice(operateVo.getTotalPrice().add(d.getPrice().multiply(BigDecimal.valueOf(d.getNum())))); + }); +// System.out.println("operateVo = " + operateVo); + return operateVo; + } + + + @ApiOperation("通联支付2") + @PostMapping("/test") + public ApiResult test(){ + final Order order = orderService.getByOutTradeNo("2023030149684157"); + order.setPayStatus(PAY_STATUS_SUCCESS); + order.setPayPrice(order.getTotalPrice()); + orderService.updateById(order); + return success("成功",order); + } +} diff --git a/src/main/java/com/gxwebsoft/apps/controller/HualalaCartFoodController.java b/src/main/java/com/gxwebsoft/apps/controller/HualalaCartFoodController.java new file mode 100644 index 0000000..36072ef --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/controller/HualalaCartFoodController.java @@ -0,0 +1,134 @@ +package com.gxwebsoft.apps.controller; + +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.apps.service.HualalaCartFoodService; +import com.gxwebsoft.apps.entity.HualalaCartFood; +import com.gxwebsoft.apps.param.HualalaCartFoodParam; +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.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 2023-01-14 14:46:44 + */ +@Api(tags = "购物车商品管理") +@RestController +@RequestMapping("/api/apps/hualala-cart-food") +public class HualalaCartFoodController extends BaseController { + @Resource + private HualalaCartFoodService hualalaCartFoodService; + + @PreAuthorize("hasAuthority('apps:hualalaCartFood:list')") + @OperationLog + @ApiOperation("分页查询购物车商品") + @GetMapping("/page") + public ApiResult> page(HualalaCartFoodParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(hualalaCartFoodService.page(page, page.getWrapper())); + // 使用关联查询 + //return success(hualalaCartFoodService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('apps:hualalaCartFood:list')") + @OperationLog + @ApiOperation("查询全部购物车商品") + @GetMapping() + public ApiResult> list(HualalaCartFoodParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(hualalaCartFoodService.list(page.getOrderWrapper())); + // 使用关联查询 + //return success(hualalaCartFoodService.listRel(param)); + } + + @PreAuthorize("hasAuthority('apps:hualalaCartFood:list')") + @OperationLog + @ApiOperation("根据id查询购物车商品") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + return success(hualalaCartFoodService.getById(id)); + // 使用关联查询 + //return success(hualalaCartFoodService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('apps:hualalaCartFood:save')") + @OperationLog + @ApiOperation("添加购物车商品") + @PostMapping() + public ApiResult save(@RequestBody HualalaCartFood hualalaCartFood) { + if (hualalaCartFoodService.save(hualalaCartFood)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('apps:hualalaCartFood:update')") + @OperationLog + @ApiOperation("修改购物车商品") + @PutMapping() + public ApiResult update(@RequestBody HualalaCartFood hualalaCartFood) { + if (hualalaCartFoodService.updateById(hualalaCartFood)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('apps:hualalaCartFood:remove')") + @OperationLog + @ApiOperation("删除购物车商品") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (hualalaCartFoodService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('apps:hualalaCartFood:save')") + @OperationLog + @ApiOperation("批量添加购物车商品") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (hualalaCartFoodService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('apps:hualalaCartFood:update')") + @OperationLog + @ApiOperation("批量修改购物车商品") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(hualalaCartFoodService, "id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('apps:hualalaCartFood:remove')") + @OperationLog + @ApiOperation("批量删除购物车商品") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (hualalaCartFoodService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/apps/controller/HualalaController.java b/src/main/java/com/gxwebsoft/apps/controller/HualalaController.java new file mode 100644 index 0000000..1fe7a16 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/controller/HualalaController.java @@ -0,0 +1,384 @@ +package com.gxwebsoft.apps.controller; + +import cn.hutool.core.util.NumberUtil; +import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.gxwebsoft.apps.entity.HualalaFood; +import com.gxwebsoft.apps.entity.HualalaFoodCategory; +import com.gxwebsoft.apps.entity.HualalaShop; +import com.gxwebsoft.apps.entity.ItemVo; +import com.gxwebsoft.apps.param.*; +import com.gxwebsoft.apps.result.AllShopResult; +import com.gxwebsoft.apps.result.FoodCategoryResult; +import com.gxwebsoft.apps.result.OpenFoodResult; +import com.gxwebsoft.apps.result.ShopBaseInfoResult; +import com.gxwebsoft.apps.service.HualalaFoodCategoryService; +import com.gxwebsoft.apps.service.HualalaFoodService; +import com.gxwebsoft.apps.service.HualalaService; +import com.gxwebsoft.apps.service.HualalaShopService; +import com.gxwebsoft.common.core.utils.CacheClient; +import com.gxwebsoft.common.core.utils.CommonUtil; +import com.gxwebsoft.common.core.utils.JSONUtil; +import com.gxwebsoft.common.core.web.ApiResult; +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.shop.entity.Merchant; +import com.gxwebsoft.shop.entity.Order; +import com.gxwebsoft.shop.entity.OrderGoods; +import com.gxwebsoft.shop.mapper.OrderGoodsMapper; +import com.gxwebsoft.shop.param.MerchantParam; +import com.gxwebsoft.shop.param.OrderParam; +import com.gxwebsoft.shop.service.OrderGoodsService; +import com.gxwebsoft.shop.service.OrderService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.val; +import org.springframework.data.geo.Point; +import org.springframework.data.redis.core.StringRedisTemplate; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.client.RestTemplate; + +import javax.annotation.Resource; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; + +import static com.gxwebsoft.common.core.constants.RedisConstants.*; + +/** + * 哗啦啦接口 + * 桂小厨GO + * AppID:wx445232847c503f1b + * AppSecret:eb81fbcac21da949d819143b43d18636 + * 桂小厨+ + * AppID:wx445232847c503f1b + * AppSecret:eb81fbcac21da949d819143b43d18636 + * @author 科技小王子 + * @since 2022-11-25 12:55:33 + */ +@Api(tags = "哗啦啦接口") +@RestController +@RequestMapping("/api/apps/hualala") +public class HualalaController extends BaseController { + @Resource + private HualalaService hualalaService; + @Resource + private HualalaShopService hualalaShopService; + @Resource + private StringRedisTemplate stringRedisTemplate; + @Resource + private CacheClient cacheClient; + @Resource + private HualalaFoodService hualalaFoodService; + @Resource + private HualalaFoodCategoryService hualalaFoodCategoryService; + @Resource + private OrderService orderService; + @Resource + private OrderGoodsService orderGoodsService; + @Resource + private OrderGoodsMapper orderGoodsMapper; + + @ApiOperation("哗啦啦万能接口") + @PostMapping() + public ApiResult post(@RequestBody HualalaParam hualalaParam) { + // 接口 + String apiUrl = hualalaParam.getApiUrl(); + // 请求参数 + HashMap params = hualalaParam.getParams(); + // 执行请求 + JSONObject response = hualalaService.doPost(apiUrl, params); + return success("请求成功",response); + } + + @ApiOperation("查询集团店铺列表") + @PostMapping("/getAllShop") + public ApiResult getAllShop(@RequestBody Map params) { + // 请求缓存数据 + AllShopResult cache = cacheClient.get(getAllShop, AllShopResult.class); + if(cache != null){ + return success("请求成功",cache.getShopInfoList()); + } + + // 执行请求解析data数据 + JSONObject response = hualalaService.doPost("/doc/getAllShop", params); + AllShopResult result = JSONObject.parseObject(response.getString("data"), AllShopResult.class); + cacheClient.set(getAllShop,result); + + List shopInfoList = result.getShopInfoList(); + // 过滤非桂小厨品牌门店 + List shops = shopInfoList.stream().filter(d -> d.getBrandName().equals("桂小厨")).collect(Collectors.toList()); + shops.forEach(d -> { + d.setCreateTime(null); + d.setTenantId(getTenantId()); + cacheClient.geoAdd(haulalaGeoKey,d.getMapLongitudeValueBaiDu(),d.getMapLatitudeValueBaiDu(),d.getShopId().toString()); + }); + hualalaShopService.saveBatch(shops); + return success("缓存成功",shops); + + +// try { +// // 执行请求解析data数据 +// JSONObject response = hualalaService.doPost("/doc/getAllShop", params); +// AllShopResult result = JSONObject.parseObject(response.getString("data"), AllShopResult.class); +// cacheClient.set(getAllShop,result,1L,TimeUnit.DAYS); +// return success("请求成功",result); +// } catch (Exception e) { +// throw new RuntimeException(); +// } + } + + + @ApiOperation("查询店铺信息") + @PostMapping("/getBaseInfo") + public ApiResult getBaseInfo(@RequestBody Map params) { + // 请求缓存数据 + String key = getBaseInfo.concat(":").concat(params.get("shopId").toString()); + Merchant merchant = cacheClient.get(key, Merchant.class); + if(merchant != null){ + return success("请求成功",merchant); + } + try { + // 执行请求解析data数据 + JSONObject response = hualalaService.doPost("/doc/getBaseInfo", params); + ShopBaseInfoResult result = JSONObject.parseObject(response.getString("data"), ShopBaseInfoResult.class); + cacheClient.set(key,result); + return success("缓存成功",result); + } catch (Exception e) { + throw new RuntimeException(); + } + } + + + @ApiOperation("查询店铺菜品分类") + @PostMapping("/getFoodClassCategory") + public ApiResult getFoodClassCategory(@RequestBody Map params) { + // 只查询外卖菜品 + params.put("type",1); + // 请求缓存数据 + String key = getFoodClassCategory.concat(":").concat(params.get("shopId").toString()); + FoodCategoryResult cache = cacheClient.get(key, FoodCategoryResult.class); + if(cache != null){ + return success("请求成功",cache); + } + + try { + // 执行请求解析data数据 + JSONObject response = hualalaService.doPost("/doc/getFoodClassCategory", params); + FoodCategoryResult result = JSONObject.parseObject(response.getString("data"), FoodCategoryResult.class); + cacheClient.set(key,result); + return success("缓存成功",result); + } catch (Exception e) { + throw new RuntimeException(); + } + } + + @ApiOperation("查询店铺菜品列表") + @PostMapping("/getOpenFood") + public ApiResult getOpenFood(@RequestBody Map params) { + // 请求缓存数据 + String key = getOpenFood.concat(":").concat(params.get("shopId").toString()); + OpenFoodResult cache = cacheClient.get(key, OpenFoodResult.class); + if(cache != null){ + // 计算加入购物车的商品数量 + List foodList = cache.getFoodList(); + foodList.forEach(d -> { + String cartKey = HLL_CART_FOOD_KEY.concat(d.getShopId()).concat(":").concat(getLoginUserId().toString()); + ItemVo item = cacheClient.hGet(cartKey, d.getFoodId(), ItemVo.class); + if(item != null){ + d.setCartNum(item.getNum()); + } + }); +// List foods = CommonUtil.toTreeData(cache.getFoodList(), null, HualalaFood::getParentFoodId, HualalaFood::getFoodOnlineCategoryId, HualalaFood::setChildren); + Map> collect = foodList.stream().collect(Collectors.groupingBy(HualalaFood::getFoodOnlineCategoryId)); + return success("请求成功",collect); + } + + // 执行请求解析当前店铺的菜品数据 + JSONObject response = hualalaService.doPost("/doc/getOpenFood", params); + OpenFoodResult result = JSONObject.parseObject(response.getString("data"), OpenFoodResult.class); + // 筛选出外卖菜品 + List foodList = result.getFoodList(); + List foodList2 = foodList.stream().filter(d -> d.getTakeawayTag().equals("2")).collect(Collectors.toList()); + // 筛选出可以点单的菜品 + List foods = foodList2.stream().filter(d -> d.getIsSingleSale().equals(1)).collect(Collectors.toList()); + // 存入redis + result.setFoodList(foods); + result.setCount(foods.size()); + cacheClient.set(key,result); + hualalaFoodService.saveBatch(foods); + return success("缓存成功",result.getFoodList()); + } + +// @ApiOperation("查询店铺菜品列表(备份)") +// @PostMapping("/getOpenFood2") +// public ApiResult getOpenFood2(@RequestBody Map params) { +// // 请求缓存数据 +// String key = getOpenFood.concat(":").concat(params.get("shopId").toString()); +// OpenFoodResult cache = cacheClient.get(key, OpenFoodResult.class); +// if(cache != null){ +// // 计算加入购物车的商品数量 +// List foodList = cache.getFoodList(); +// foodList.forEach(d -> { +// String cartKey = HLL_CART_FOOD_KEY.concat(d.getShopId()).concat(":").concat(getLoginUserId().toString()); +// ItemVo item = cacheClient.hGet(cartKey, d.getFoodId(), ItemVo.class); +// if(item != null){ +// d.setCartNum(item.getNum()); +// } +// }); +// return success("请求成功",foodList); +// } +// try { +// // 执行请求解析当前店铺的菜品数据 +// JSONObject response = hualalaService.doPost("/doc/getOpenFood", params); +// OpenFoodResult result = JSONObject.parseObject(response.getString("data"), OpenFoodResult.class); +// // 筛选出外卖菜品 +// List foodList = result.getFoodList(); +// List foodList2 = foodList.stream().filter(d -> d.getTakeawayTag().equals("2")).collect(Collectors.toList()); +// // 筛选出可以点单的菜品 +// List foods = foodList2.stream().filter(d -> d.getIsSingleSale().equals(1)).collect(Collectors.toList()); +// // 存入redis +// result.setFoodList(foods); +// result.setCount(foods.size()); +// cacheClient.set(key,result); +// return success("缓存成功",result.getFoodList()); +// } catch (Exception e) { +// throw new RuntimeException(); +// } +// } + + @PreAuthorize("hasAuthority('apps:hualala:list')") + @ApiOperation("保存菜品到redis（已废弃）") + @PostMapping("/setOpenFoodToRedis") + public ApiResult setOpenFoodToRedis(@RequestBody HualalaFoodParam food) { + System.out.println("food = " + food); + String key = "cache:getOpenFood:shop-"+food.getShopId()+":category-"+food.getFoodCategoryCode()+":"+food.getFoodId(); +// stringRedisTemplate.opsForHash().put(key,food.getFoodId(),food.getData().toString()); + return success("请求成功",food); + // 请求缓存数据 +// String key = getOpenFood + params.get("shopId"); +// String jsonStr = stringRedisTemplate.opsForValue().get(key); +// if(StrUtil.isNotBlank(jsonStr)){ +// return success("请求成功",JSON.parseObject(jsonStr)); +// } +// try { +// // 执行请求解析data数据 +// JSONObject response = hualalaService.doPost("/doc/getOpenFood", params); +// stringRedisTemplate.opsForValue().set(key, response.getString("data"),1,TimeUnit.DAYS); +// return success("请求成功",JSON.parseObject(response.getString("data"))); +// } catch (Exception e) { +// throw new RuntimeException(); +// } + } + + @ApiOperation("根据定位查询附近的门店列表") + @PostMapping("/getListByGeo") + public ApiResult> getListByGeo(@RequestBody HualalaShopParam param) { + return success(hualalaShopService.listByGeo(param)); + } + + @PreAuthorize("hasAuthority('apps:hualala:list')") + @ApiOperation("把商户坐标写入redis缓存") + @PostMapping("/geoAdd") + public ApiResult geoAdd(){ + String key1 = "shop:geo:guixiaochu"; + stringRedisTemplate.opsForGeo().add(key1,new Point(108.321614,22.815124),"76230180"); + stringRedisTemplate.opsForGeo().add(key1,new Point(108.335703,22.813917),"76230181"); + stringRedisTemplate.opsForGeo().add(key1,new Point(108.370343,22.830116),"76230179"); + stringRedisTemplate.opsForGeo().add(key1,new Point(108.292017,22.869498),"76258872"); + stringRedisTemplate.opsForGeo().add(key1,new Point(108.393005,22.81194),"76230126"); + stringRedisTemplate.opsForGeo().add(key1,new Point(108.325202,22.785341),"76230178"); + return success("添加完毕"); + } + + @ApiOperation("推送订单") + @PostMapping("/pushOrder") + public ApiResult pushOrder(@RequestBody OrderParam param){ + Integer orderId = param.getOrderId(); + Order orderInfo = orderService.getById(orderId); + System.out.println("orderInfo = " + orderInfo); + final List goodsInfo = orderGoodsMapper.selectByOrderId(orderId); + System.out.println("goodsInfo = " + goodsInfo); + // 菜品信息 + ArrayList orderItem = new ArrayList<>(); + goodsInfo.forEach(goods -> { + JSONObject item = new JSONObject(); + item.put("foodID",goods.getGoodsId()); // 菜品id + item.put("foodName",goods.getGoodsName()); // 菜品名称 + item.put("foodUnit","份"); // 规格名称 + item.put("foodUnitID",goods.getGoodsSkuId()); // 菜品规格id + item.put("isSetFood",0); // 是/否套餐，0：非套餐 1：套餐 + item.put("isBatching",0); // 0：正常菜，1：主菜，2：配菜，3：加价做法 + item.put("foodCount",goods.getTotalNum()); // 菜品数量 + item.put("originPrice",goods.getTotalPrice()); // 菜品原价 + item.put("takeoutPackagingFee","0"); // 打包费 + item.put("isDiscount",0); // 是/否打折 ，0：不是 1：是 + item.put("duePrice",goods.getTotalPrice()); // TODO 菜品成售价 + orderItem.add(item); + }); + + // 支付信息 + ArrayList payInfo = new ArrayList<>(); + JSONObject payItem = new JSONObject(); + payItem.put("paymentSubjectID",Long.valueOf("51010440")); // 科目id + payItem.put("paymentSubjectName","微信小程序实收"); // 科目名称 + payItem.put("dueAmount",orderInfo.getPayPrice()); // TODO 实收金额 + payItem.put("paymentStatus",20); // 支付状态，15：未支付；20：已支付 + payItem.put("payWay",70); // 支付方式，70：商家自定义科目 + payInfo.add(payItem); + + // 用户信息 + JSONObject userInfo = new JSONObject(); + userInfo.put("userName","邓莉莉"); + userInfo.put("userMobile","15878179339"); + userInfo.put("shopMpID","wxa4e2b8bc9c14c743"); + userInfo.put("userSex","0"); // 用户性别, 1:先生 0:女士 2:不显示，不传默认0 女士 + + // 订单信息 + JSONObject order = new JSONObject(); + order.put("orderSubType",20); // 订单类型 20: 外送 + order.put("orderStatus",20); // 订单状态 20：已付款 + order.put("discountTotalAmount","0"); // TODO 优惠金额 + order.put("dinners",1); // 用餐人数 + // 期望送达时间 + SimpleDateFormat sdf1 = new SimpleDateFormat("yyyyMMddHHmm"); + order.put("orderTime",sdf1.format(orderInfo.getCreateTime())); + order.put("orderItem",orderItem); // 菜品信息 + order.put("takeoutAddress","南宁市良庆区五象大道401号五象航洋城1号楼1226室"); // TODO 外送地址 + order.put("deliveryAmount","8.00"); // TODO 配送费 + order.put("serviceAmount","0"); // 服务费，必传0 + order.put("channelKey","399_weixin"); // 渠道:微信小程序 + order.put("isAlreadyPaid","1"); // 是/否支付 + order.put("orderMode",1); // 1：先付，2：后付 + order.put("OrderRemark","测试订单(不需要制作及发货)"); // TODO 订单备注 + order.put("payment",payInfo); // 支付信息 + order.put("userInfo",userInfo); // 用户信息 + + HashMap params = new HashMap<>(); + params.put("shopID",Long.valueOf("76220517")); // 店铺ID + params.put("isCheackOut",0); // 0 ：默认 不需要收银台数据 1： 需要收银台数据 + params.put("isThirdPay",2); // 只有单纯核销哗啦啦会员卡时传1，其它都传2 + params.put("bankCode","weChat"); // 支付方式，weChat微信 aliPay支付宝，非哗啦啦支付传weChat + params.put("order",order); // 订单信息 + params.put("isSentMsg",1); // 下单后pos是/否显示订单，下单带支付科目信息先付传1，下单不带支付科目信息先付传0，后付传1 + params.put("msgType",120); // 消息类型，240： 堂食、闪吃，120：外送，121：自提 ，与order中orderSubType要对应 + params.put("thirdOrderID",orderInfo.getOrderNo()); // 三方订单号，作用：十分钟内对相同的thirdOrderID进行去重处理，仅开放平台使用做去重处理，不会传到pos及报表 + + // 执行订单推送 +// JSONObject response = hualalaService.doPost("/order/submitordernew", params); +// System.out .println("response = " + response); + + // 同步配送平台 +// JSONObject result = hualalaService.doExpress(orderInfo); + + return success("推送成功",null); + } + +} diff --git a/src/main/java/com/gxwebsoft/apps/controller/HualalaFoodCategoryController.java b/src/main/java/com/gxwebsoft/apps/controller/HualalaFoodCategoryController.java new file mode 100644 index 0000000..b65dfc0 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/controller/HualalaFoodCategoryController.java @@ -0,0 +1,134 @@ +package com.gxwebsoft.apps.controller; + +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.apps.service.HualalaFoodCategoryService; +import com.gxwebsoft.apps.entity.HualalaFoodCategory; +import com.gxwebsoft.apps.param.HualalaFoodCategoryParam; +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.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 2023-01-12 09:49:46 + */ +@Api(tags = "菜品分类管理") +@RestController +@RequestMapping("/api/apps/hualala-food-category") +public class HualalaFoodCategoryController extends BaseController { + @Resource + private HualalaFoodCategoryService hualalaFoodCategoryService; + + @PreAuthorize("hasAuthority('apps:hualalaFoodCategory:list')") + @OperationLog + @ApiOperation("分页查询菜品分类") + @GetMapping("/page") + public ApiResult> page(HualalaFoodCategoryParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(hualalaFoodCategoryService.page(page, page.getWrapper())); + // 使用关联查询 + //return success(hualalaFoodCategoryService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('apps:hualalaFoodCategory:list')") + @OperationLog + @ApiOperation("查询全部菜品分类") + @GetMapping() + public ApiResult> list(HualalaFoodCategoryParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(hualalaFoodCategoryService.list(page.getOrderWrapper())); + // 使用关联查询 + //return success(hualalaFoodCategoryService.listRel(param)); + } + + @PreAuthorize("hasAuthority('apps:hualalaFoodCategory:list')") + @OperationLog + @ApiOperation("根据id查询菜品分类") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + return success(hualalaFoodCategoryService.getById(id)); + // 使用关联查询 + //return success(hualalaFoodCategoryService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('apps:hualalaFoodCategory:save')") + @OperationLog + @ApiOperation("添加菜品分类") + @PostMapping() + public ApiResult save(@RequestBody HualalaFoodCategory hualalaFoodCategory) { + if (hualalaFoodCategoryService.save(hualalaFoodCategory)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('apps:hualalaFoodCategory:update')") + @OperationLog + @ApiOperation("修改菜品分类") + @PutMapping() + public ApiResult update(@RequestBody HualalaFoodCategory hualalaFoodCategory) { + if (hualalaFoodCategoryService.updateById(hualalaFoodCategory)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('apps:hualalaFoodCategory:remove')") + @OperationLog + @ApiOperation("删除菜品分类") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (hualalaFoodCategoryService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('apps:hualalaFoodCategory:save')") + @OperationLog + @ApiOperation("批量添加菜品分类") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (hualalaFoodCategoryService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('apps:hualalaFoodCategory:update')") + @OperationLog + @ApiOperation("批量修改菜品分类") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(hualalaFoodCategoryService, "id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('apps:hualalaFoodCategory:remove')") + @OperationLog + @ApiOperation("批量删除菜品分类") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (hualalaFoodCategoryService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/apps/controller/HualalaFoodController.java b/src/main/java/com/gxwebsoft/apps/controller/HualalaFoodController.java new file mode 100644 index 0000000..1283490 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/controller/HualalaFoodController.java @@ -0,0 +1,134 @@ +package com.gxwebsoft.apps.controller; + +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.apps.service.HualalaFoodService; +import com.gxwebsoft.apps.entity.HualalaFood; +import com.gxwebsoft.apps.param.HualalaFoodParam; +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.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 2023-01-12 15:34:55 + */ +@Api(tags = "菜品分类管理") +@RestController +@RequestMapping("/api/apps/hualala-food") +public class HualalaFoodController extends BaseController { + @Resource + private HualalaFoodService hualalaFoodService; + + @PreAuthorize("hasAuthority('apps:hualalaFood:list')") + @OperationLog + @ApiOperation("分页查询菜品分类") + @GetMapping("/page") + public ApiResult> page(HualalaFoodParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(hualalaFoodService.page(page, page.getWrapper())); + // 使用关联查询 + //return success(hualalaFoodService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('apps:hualalaFood:list')") + @OperationLog + @ApiOperation("查询全部菜品分类") + @GetMapping() + public ApiResult> list(HualalaFoodParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(hualalaFoodService.list(page.getOrderWrapper())); + // 使用关联查询 + //return success(hualalaFoodService.listRel(param)); + } + + @PreAuthorize("hasAuthority('apps:hualalaFood:list')") + @OperationLog + @ApiOperation("根据id查询菜品分类") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + return success(hualalaFoodService.getById(id)); + // 使用关联查询 + //return success(hualalaFoodService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('apps:hualalaFood:save')") + @OperationLog + @ApiOperation("添加菜品分类") + @PostMapping() + public ApiResult save(@RequestBody HualalaFood hualalaFood) { + if (hualalaFoodService.save(hualalaFood)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('apps:hualalaFood:update')") + @OperationLog + @ApiOperation("修改菜品分类") + @PutMapping() + public ApiResult update(@RequestBody HualalaFood hualalaFood) { + if (hualalaFoodService.updateById(hualalaFood)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('apps:hualalaFood:remove')") + @OperationLog + @ApiOperation("删除菜品分类") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (hualalaFoodService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('apps:hualalaFood:save')") + @OperationLog + @ApiOperation("批量添加菜品分类") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (hualalaFoodService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('apps:hualalaFood:update')") + @OperationLog + @ApiOperation("批量修改菜品分类") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(hualalaFoodService, "id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('apps:hualalaFood:remove')") + @OperationLog + @ApiOperation("批量删除菜品分类") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (hualalaFoodService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/apps/controller/HualalaShopController.java b/src/main/java/com/gxwebsoft/apps/controller/HualalaShopController.java new file mode 100644 index 0000000..8e44718 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/controller/HualalaShopController.java @@ -0,0 +1,134 @@ +package com.gxwebsoft.apps.controller; + +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.apps.service.HualalaShopService; +import com.gxwebsoft.apps.entity.HualalaShop; +import com.gxwebsoft.apps.param.HualalaShopParam; +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.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 2023-01-12 18:24:44 + */ +@Api(tags = "哗啦啦门店管理管理") +@RestController +@RequestMapping("/api/apps/hualala-shop") +public class HualalaShopController extends BaseController { + @Resource + private HualalaShopService hualalaShopService; + + @PreAuthorize("hasAuthority('apps:hualalaShop:list')") + @OperationLog + @ApiOperation("分页查询哗啦啦门店管理") + @GetMapping("/page") + public ApiResult> page(HualalaShopParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(hualalaShopService.page(page, page.getWrapper())); + // 使用关联查询 + //return success(hualalaShopService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('apps:hualalaShop:list')") + @OperationLog + @ApiOperation("查询全部哗啦啦门店管理") + @GetMapping() + public ApiResult> list(HualalaShopParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(hualalaShopService.list(page.getOrderWrapper())); + // 使用关联查询 + //return success(hualalaShopService.listRel(param)); + } + + @PreAuthorize("hasAuthority('apps:hualalaShop:list')") + @OperationLog + @ApiOperation("根据id查询哗啦啦门店管理") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + return success(hualalaShopService.getById(id)); + // 使用关联查询 + //return success(hualalaShopService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('apps:hualalaShop:save')") + @OperationLog + @ApiOperation("添加哗啦啦门店管理") + @PostMapping() + public ApiResult save(@RequestBody HualalaShop hualalaShop) { + if (hualalaShopService.save(hualalaShop)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('apps:hualalaShop:update')") + @OperationLog + @ApiOperation("修改哗啦啦门店管理") + @PutMapping() + public ApiResult update(@RequestBody HualalaShop hualalaShop) { + if (hualalaShopService.updateById(hualalaShop)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('apps:hualalaShop:remove')") + @OperationLog + @ApiOperation("删除哗啦啦门店管理") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (hualalaShopService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('apps:hualalaShop:save')") + @OperationLog + @ApiOperation("批量添加哗啦啦门店管理") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (hualalaShopService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('apps:hualalaShop:update')") + @OperationLog + @ApiOperation("批量修改哗啦啦门店管理") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(hualalaShopService, "shop_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('apps:hualalaShop:remove')") + @OperationLog + @ApiOperation("批量删除哗啦啦门店管理") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (hualalaShopService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/apps/controller/LinkController.java b/src/main/java/com/gxwebsoft/apps/controller/LinkController.java new file mode 100644 index 0000000..15c42c8 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/controller/LinkController.java @@ -0,0 +1,140 @@ +package com.gxwebsoft.apps.controller; + +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.apps.service.LinkService; +import com.gxwebsoft.apps.entity.Link; +import com.gxwebsoft.apps.param.LinkParam; +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.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 2022-11-25 12:55:33 + */ +@Api(tags = "常用链接推荐记录表管理") +@RestController +@RequestMapping("/api/apps/link") +public class LinkController extends BaseController { + @Resource + private LinkService linkService; + + @PreAuthorize("hasAuthority('apps:link:list')") + @OperationLog + @ApiOperation("分页查询常用链接推荐记录表") + @GetMapping("/page") + public ApiResult> page(LinkParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("sort_number asc, create_time desc"); + return success(linkService.page(page, page.getWrapper())); + // 使用关联查询 + //return success(linkService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('apps:link:list')") + @OperationLog + @ApiOperation("查询全部常用链接推荐记录表") + @GetMapping() + public ApiResult> list(LinkParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("sort_number asc, create_time desc"); + return success(linkService.list(page.getOrderWrapper())); + // 使用关联查询 + //return success(linkService.listRel(param)); + } + + @PreAuthorize("hasAuthority('apps:link:list')") + @OperationLog + @ApiOperation("根据id查询常用链接推荐记录表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + return success(linkService.getById(id)); + // 使用关联查询 + //return success(linkService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('apps:link:save')") + @OperationLog + @ApiOperation("添加常用链接推荐记录表") + @PostMapping() + public ApiResult save(@RequestBody Link link) { + // 记录当前登录用户id、租户id + User loginUser = getLoginUser(); + if (loginUser != null) { + link.setUserId(loginUser.getUserId()); + link.setMerchantCode(getMerchantCode()); + } + if (linkService.save(link)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('apps:link:update')") + @OperationLog + @ApiOperation("修改常用链接推荐记录表") + @PutMapping() + public ApiResult update(@RequestBody Link link) { + if (linkService.updateById(link)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('apps:link:remove')") + @OperationLog + @ApiOperation("删除常用链接推荐记录表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (linkService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('apps:link:save')") + @OperationLog + @ApiOperation("批量添加常用链接推荐记录表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (linkService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('apps:link:update')") + @OperationLog + @ApiOperation("批量修改常用链接推荐记录表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(linkService, "link_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('apps:link:remove')") + @OperationLog + @ApiOperation("批量删除常用链接推荐记录表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (linkService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/apps/controller/SfExpress.java b/src/main/java/com/gxwebsoft/apps/controller/SfExpress.java new file mode 100644 index 0000000..b152ece --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/controller/SfExpress.java @@ -0,0 +1,115 @@ +package com.gxwebsoft.apps.controller; + +import cn.hutool.core.util.RandomUtil; +import cn.hutool.http.HttpUtil; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import lombok.val; +import org.apache.commons.codec.binary.Base64; + +import java.security.MessageDigest; +import java.util.Date; + +public class SfExpress { + + //开发者id + private final Long devId= 1651421896L; + //开发者密钥 + private final String devKey="2f10570c5057570fe0e488a425a6d813"; + //正式环境 + private final String serverHost="https://openic.sf-express.com"; + //店铺ID + private final String shopId="3243279847393"; + + + + + public static void main(String[] args) { + try { + SfExpress api = new SfExpress(); + String postData = api.orderOnlineByJson(); + String sign = generateOpenSign(postData,api.devId, api.devKey); + String url = api.serverHost.concat("/open/api/external/createorder?sign=").concat(sign); + String result = HttpUtil.post(url,postData); + System.out.println("result = " + result); + val resultObj = JSON.parseObject(result); + JSONObject resultData = JSON.parseObject(resultObj.getString("result")); + + } catch (Exception e) { + e.printStackTrace(); + } + } + + public static String generateOpenSign(String postData, Long appId, String appKey) throws Exception { + StringBuilder sb = new StringBuilder(); + sb.append(postData); + sb.append("&" + appId + "&" + appKey); + System.out.println("sb = " + sb); + MessageDigest md = MessageDigest.getInstance("MD5"); + byte[] md5 = md.digest(sb.toString().getBytes("utf-8")); + int i; + StringBuffer buf = new StringBuffer(""); + for (int offset = 0; offset < md5.length; offset++) { + i = md5[offset]; + if (i < 0) { + i += 256; + } + if (i < 16) { + buf.append("0"); + } + buf.append(Integer.toHexString(i)); + } + + return Base64.encodeBase64String(buf.toString().getBytes("utf-8")); + } + + //即时查询接口 + public String orderOnlineByJson() throws Exception{ + // 组装应用级参数 + JSONObject json = new JSONObject(); + json.put("dev_id",devId); + json.put("shop_id",shopId); + json.put("shop_order_id", RandomUtil.randomNumbers(16)); + json.put("order_source","1"); + long timestamp = new Date().getTime(); + json.put("order_time",timestamp/1000); + json.put("push_time",timestamp/1000); + json.put("version",19); + JSONObject receive = new JSONObject(); + receive.put("user_name","顺丰同城"); + receive.put("user_phone","18978189563"); + receive.put("user_address","北京市海淀区学清嘉创大厦A座15层"); + receive.put("user_lng","116.354787"); + receive.put("user_lat","40.030613"); + json.put("receive",receive); + JSONObject orderDetail = new JSONObject(); + orderDetail.put("total_price",100); + orderDetail.put("product_type",1); + orderDetail.put("weight_gram",100); + orderDetail.put("product_num",1); + orderDetail.put("product_type_num",1); + json.put("order_detail",orderDetail); + return json.toString(); + } + //中文转Unicode + /** + * @Title: unicodeEncode + * @Description: unicode编码 将中文字符转换成Unicode字符 + * @param string + * @return + */ + public String unicodeEncode(String string) { + char[] utfBytes = string.toCharArray(); + String unicodeBytes = ""; + for (int i = 0; i < utfBytes.length; i++) { + String hexB = Integer.toHexString(utfBytes[i]); + if (hexB.length() <= 2) { + hexB = "00" + hexB; + } + unicodeBytes = unicodeBytes + "\\u" + hexB; + } + return unicodeBytes; + } + +} + diff --git a/src/main/java/com/gxwebsoft/apps/controller/TestDataController.java b/src/main/java/com/gxwebsoft/apps/controller/TestDataController.java new file mode 100644 index 0000000..a51ab70 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/controller/TestDataController.java @@ -0,0 +1,142 @@ +package com.gxwebsoft.apps.controller; + +import com.alibaba.fastjson.JSONObject; +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.apps.service.TestDataService; +import com.gxwebsoft.apps.entity.TestData; +import com.gxwebsoft.apps.param.TestDataParam; +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.entity.User; +import com.gxwebsoft.shop.entity.Order; +import com.gxwebsoft.shop.entity.OrderGoods; +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.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; + +/** + * 测试数据表控制器 + * + * @author 科技小王子 + * @since 2023-02-01 12:13:46 + */ +@Api(tags = "测试数据表管理") +@RestController +@RequestMapping("/api/apps/test-data") +public class TestDataController extends BaseController { + @Resource + private TestDataService testDataService; + + @PreAuthorize("hasAuthority('apps:testData:list')") + @OperationLog + @ApiOperation("分页查询测试数据表") + @GetMapping("/page") + public ApiResult> page(TestDataParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(testDataService.page(page, page.getWrapper())); + // 使用关联查询 + //return success(testDataService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('apps:testData:list')") + @OperationLog + @ApiOperation("查询全部测试数据表") + @GetMapping() + public ApiResult> list(TestDataParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(testDataService.list(page.getOrderWrapper())); + // 使用关联查询 + //return success(testDataService.listRel(param)); + } + + @PreAuthorize("hasAuthority('apps:testData:list')") + @OperationLog + @ApiOperation("根据id查询测试数据表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + return success(testDataService.getById(id)); + // 使用关联查询 + //return success(testDataService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('apps:testData:save')") + @OperationLog + @ApiOperation("添加测试数据表") + @PostMapping() + public ApiResult save(@RequestBody TestData testData) { + if (testDataService.save(testData)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('apps:testData:update')") + @OperationLog + @ApiOperation("修改测试数据表") + @PutMapping() + public ApiResult update(@RequestBody TestData testData) { + if (testDataService.updateById(testData)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('apps:testData:remove')") + @OperationLog + @ApiOperation("删除测试数据表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (testDataService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('apps:testData:save')") + @OperationLog + @ApiOperation("批量添加测试数据表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (testDataService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('apps:testData:update')") + @OperationLog + @ApiOperation("批量修改测试数据表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(testDataService, "id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('apps:testData:remove')") + @OperationLog + @ApiOperation("批量删除测试数据表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (testDataService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + + +} diff --git a/src/main/java/com/gxwebsoft/apps/entity/BcAgent.java b/src/main/java/com/gxwebsoft/apps/entity/BcAgent.java new file mode 100644 index 0000000..c6058e3 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/entity/BcAgent.java @@ -0,0 +1,65 @@ +package com.gxwebsoft.apps.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 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-04-24 19:25:59 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "BcAgent对象", description = "代报餐管理") +@TableName("apps_bc_agent") +public class BcAgent implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "自增ID") + @TableId(value = "agent_id", type = IdType.AUTO) + private Integer agentId; + + @ApiModelProperty(value = "用户ID") + private Integer userId; + + @ApiModelProperty(value = "代报餐用户ID") + private Integer parentId; + + @ApiModelProperty(value = "状态, 0待处理, 1已完成") + private Integer status; + + @ApiModelProperty(value = "租户id") + private Integer tenantId; + + @ApiModelProperty(value = "加入时间") + private Date createTime; + + @ApiModelProperty(value = "被代报餐职员") + @TableField(exist = false) + private User user; + + @ApiModelProperty(value = "代报餐人员") + @TableField(exist = false) + private User parentUser; + + @ApiModelProperty(value = "被代报餐职员") + @TableField(exist = false) + private String nickname; + + @ApiModelProperty(value = "代报餐人员") + @TableField(exist = false) + private String parentName; + +} diff --git a/src/main/java/com/gxwebsoft/apps/entity/BcCart.java b/src/main/java/com/gxwebsoft/apps/entity/BcCart.java new file mode 100644 index 0000000..450230a --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/entity/BcCart.java @@ -0,0 +1,64 @@ +package com.gxwebsoft.apps.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; +import java.math.BigDecimal; + +/** + * 报餐系统购物车 + * + * @author 科技小王子 + * @since 2023-04-27 17:59:40 + */ +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "报餐系统购物车", description = "报餐系统购物车") +@Data +public class BcCart implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "预定日期") + @TableField(exist = false) + private String deliveryTime; + + @ApiModelProperty(value = "商品ID") + @TableField(exist = false) + private Integer goodsId; + + @ApiModelProperty(value = "商品价格") + @TableField(exist = false) + private BigDecimal goodsPrice; + + @ApiModelProperty(value = "商品数量") + @TableField(exist = false) + private Integer totalNum; + + @ApiModelProperty(value = "商品名称") + @TableField(exist = false) + private String goodsName; + + @ApiModelProperty(value = "商品描述") + @TableField(exist = false) + private String comments; + + @ApiModelProperty(value = "商品封面图") + @TableField(exist = false) + private String image; + + @ApiModelProperty(value = "商品分类") + @TableField(exist = false) + private Integer categoryId; + + @ApiModelProperty(value = "物品档口") + @TableField(exist = false) + private Integer gear; + + @ApiModelProperty(value = "用户ID") + @TableField(exist = false) + private Integer userId; + +} diff --git a/src/main/java/com/gxwebsoft/apps/entity/BcCookbook.java b/src/main/java/com/gxwebsoft/apps/entity/BcCookbook.java new file mode 100644 index 0000000..a9c02ec --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/entity/BcCookbook.java @@ -0,0 +1,61 @@ +package com.gxwebsoft.apps.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-05-05 14:56:54 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "BcCookbook对象", description = "常用菜谱") +@TableName("apps_bc_cookbook") +public class BcCookbook implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "自增ID") + @TableId(value = "cookbook_id", type = IdType.AUTO) + private Integer cookbookId; + + @ApiModelProperty(value = "菜品计划") + private Integer planId; + + @ApiModelProperty(value = "餐段 早餐 午餐 晚餐") + private String period; + + @ApiModelProperty(value = "状态, 0待发布, 1已发布") + private Integer status; + + @ApiModelProperty(value = "备注") + private String comments; + + @ApiModelProperty(value = "发布人") + 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/src/main/java/com/gxwebsoft/apps/entity/BcEquipment.java b/src/main/java/com/gxwebsoft/apps/entity/BcEquipment.java new file mode 100644 index 0000000..d02992d --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/entity/BcEquipment.java @@ -0,0 +1,79 @@ +package com.gxwebsoft.apps.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-05-02 10:34:40 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "BcEquipment对象", description = "报餐设备管理") +@TableName("apps_bc_equipment") +public class BcEquipment implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "设备ID") + @TableId(value = "bc_equipment_id", type = IdType.AUTO) + private Integer bcEquipmentId; + + @ApiModelProperty(value = "设备名称") + private String equipmentName; + + @ApiModelProperty(value = "设备编码") + private String equipmentCode; + + @ApiModelProperty(value = "所属档口") + private Integer gear; + + @ApiModelProperty(value = "职员工号") + private Integer staffId; + + @ApiModelProperty(value = "二维码") + private String qrcode; + + @ApiModelProperty(value = "设备详情") + private String content; + + @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 = "商户编码") + private String merchantCode; + + @ApiModelProperty(value = "租户id") + private Integer tenantId; + + @ApiModelProperty(value = "注册时间") + private Date createTime; + + @ApiModelProperty(value = "修改时间") + private Date updateTime; + +} diff --git a/src/main/java/com/gxwebsoft/apps/entity/BcExport.java b/src/main/java/com/gxwebsoft/apps/entity/BcExport.java new file mode 100644 index 0000000..3504526 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/entity/BcExport.java @@ -0,0 +1,112 @@ +package com.gxwebsoft.apps.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-06-01 21:47:02 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "BcExport对象", description = "报餐统计导出") +@TableName("apps_bc_export") +public class BcExport implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "自增ID") + @TableId(value = "export_id", type = IdType.AUTO) + private Integer exportId; + + @ApiModelProperty(value = "机构名称") + private String organizationName; + + @ApiModelProperty(value = "昵称") + private String nickname; + + @ApiModelProperty(value = "实际消费的金额(不含退款)") + private BigDecimal expendMoney; + + @ApiModelProperty(value = "早餐报餐次数") + private Integer breakfastPost; + + @ApiModelProperty(value = "早餐签到次数") + private Integer breakfastSign; + + @ApiModelProperty(value = "午餐报餐次数") + private Integer lunchPost; + + @ApiModelProperty(value = "午餐签到次数") + private Integer lunchSign; + + @ApiModelProperty(value = "晚餐报餐次数") + private Integer dinnerPost; + + @ApiModelProperty(value = "晚餐签到次数") + private Integer dinnerSign; + + @ApiModelProperty(value = "食堂档口") + private Integer gear10; + + @ApiModelProperty(value = "物品档口") + private Integer gear20; + + @ApiModelProperty(value = "食堂档口") + private Integer signGear10; + + @ApiModelProperty(value = "物品档口") + private Integer signGear20; + + @ApiModelProperty(value = "商品价格(单价)") + private BigDecimal goodsPrice; + + @ApiModelProperty(value = "午餐报餐次数") + private String lunchPostText; + + @ApiModelProperty(value = "午餐报餐次数") + private String lunchSignText; + + @ApiModelProperty(value = "发货时间") + private Date deliveryTime; + + @ApiModelProperty(value = "状态, 0待发布, 1已发布") + private Integer status; + + @ApiModelProperty(value = "备注") + private String comments; + + @ApiModelProperty(value = "订单号") + private Integer orderId; + + @ApiModelProperty(value = "机构id") + private Integer organizationId; + + @ApiModelProperty(value = "发布人") + 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/src/main/java/com/gxwebsoft/apps/entity/BcFood.java b/src/main/java/com/gxwebsoft/apps/entity/BcFood.java new file mode 100644 index 0000000..b33f9e2 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/entity/BcFood.java @@ -0,0 +1,61 @@ +package com.gxwebsoft.apps.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-04-27 17:59:40 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "BcFood对象", description = "发布菜品明细") +@TableName("apps_bc_food") +public class BcFood implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "自增ID") + @TableId(value = "bc_food_id", type = IdType.AUTO) + private Integer bcFoodId; + + @ApiModelProperty(value = "菜品计划") + private Integer planId; + + @ApiModelProperty(value = "餐段 早餐 午餐 晚餐") + private String period; + + @ApiModelProperty(value = "状态, 0待发布, 1已发布") + private Integer status; + + @ApiModelProperty(value = "备注") + private String comments; + + @ApiModelProperty(value = "发布人") + 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 String nickname; + +} diff --git a/src/main/java/com/gxwebsoft/apps/entity/BcPlan.java b/src/main/java/com/gxwebsoft/apps/entity/BcPlan.java new file mode 100644 index 0000000..7c6d4e8 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/entity/BcPlan.java @@ -0,0 +1,79 @@ +package com.gxwebsoft.apps.entity; + +import com.baomidou.mybatisplus.annotation.*; +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.Date; +import java.util.List; + +/** + * 菜品发布管理 + * + * @author 科技小王子 + * @since 2023-04-27 17:59:40 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "BcPlan对象", description = "菜品发布管理") +@TableName("apps_bc_plan") +public class BcPlan implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "自增ID") + @TableId(value = "bc_plan_id", type = IdType.AUTO) + private Integer bcPlanId; + + @ApiModelProperty(value = "发布日期") + private Date dayTime; + + @ApiModelProperty(value = "0星期日 1星期一 2星期二 3星期三 4星期四 5星期五 6星期六") + private Integer week; + + @ApiModelProperty(value = "发布类型") + private String type; + + @ApiModelProperty(value = "餐段") + private String period; + + @ApiModelProperty(value = "多天菜品是否重复") + private Integer isRepeat; + + @ApiModelProperty(value = "状态, 0待发布, 1已发布") + private Integer status; + + @ApiModelProperty(value = "备注") + private String comments; + + @ApiModelProperty(value = "菜品ID") + private String goodsIds; + + @ApiModelProperty(value = "商品列表") + @TableField(exist = false) + private List goodsList; + + @ApiModelProperty(value = "发布人") + 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 String nickname; + +} diff --git a/src/main/java/com/gxwebsoft/apps/entity/BcTemporary.java b/src/main/java/com/gxwebsoft/apps/entity/BcTemporary.java new file mode 100644 index 0000000..5baddb5 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/entity/BcTemporary.java @@ -0,0 +1,80 @@ +package com.gxwebsoft.apps.entity; + +import com.baomidou.mybatisplus.annotation.*; + +import java.time.LocalDateTime; +import java.io.Serializable; +import java.util.Date; + +import com.gxwebsoft.common.system.entity.User; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Value; + +/** + * 临时报餐管理 + * + * @author 科技小王子 + * @since 2023-04-24 21:47:57 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "BcTemporary对象", description = "临时报餐管理") +@TableName("apps_bc_temporary") +public class BcTemporary implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "自增ID") + @TableId(value = "temporary_id", type = IdType.AUTO) + private Integer temporaryId; + + @ApiModelProperty(value = "用户ID") + private Integer userId; + + @ApiModelProperty(value = "工单ID") + private Integer parentId; + + @ApiModelProperty(value = "申请状态") + private Integer applyStatus; + + @ApiModelProperty(value = "状态, 0待处理, 1已完成") + private Integer status; + + @ApiModelProperty(value = "租户id") + private Integer tenantId; + + @ApiModelProperty(value = "加入时间") + private Date createTime; + + @ApiModelProperty(value = "备注") + private String comments; + + @ApiModelProperty(value = "报餐日期") + private Date dayTime; + + @ApiModelProperty(value = "是否删除, 0否, 1是") + @TableLogic + private Integer deleted; + + @ApiModelProperty(value = "失效时间") + private Date expirationTime; + + @ApiModelProperty(value = "昵称") + @TableField(exist = false) + private String nickname; + + @ApiModelProperty(value = "代报餐人员") + @TableField(exist = false) + private String dealerName; + + @ApiModelProperty(value = "被代报餐职员") + @TableField(exist = false) + private User user; + + @ApiModelProperty(value = "代报餐人员") + @TableField(exist = false) + private User parentUser; + +} diff --git a/src/main/java/com/gxwebsoft/apps/entity/Cashier.java b/src/main/java/com/gxwebsoft/apps/entity/Cashier.java new file mode 100644 index 0000000..838bbbc --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/entity/Cashier.java @@ -0,0 +1,95 @@ +package com.gxwebsoft.apps.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 WebSoft + * @since 2022-11-18 11:47:09 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "Cashier对象", description = "海牛收银台记录表") +@TableName("apps_cashier") +public class Cashier implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "ID") + @TableId(value = "cashier_id", type = IdType.AUTO) + private Integer cashierId; + + @ApiModelProperty(value = "客户ID") + private String buyerId; + + @ApiModelProperty(value = "设备ID") + private String merchantCode; + + @ApiModelProperty(value = "支付标识") + private String code; + + @ApiModelProperty(value = "返回消息") + private String msg; + + @ApiModelProperty(value = "客户端交易订单编号") + private String outTradeNo; + + @ApiModelProperty(value = "数量") + private String amount; + + @ApiModelProperty(value = "支付时间") + private String payTime; + + @ApiModelProperty(value = "支付方式") + private String payType; + + @ApiModelProperty(value = "交易金额") + private BigDecimal totalAmount; + + @ApiModelProperty(value = "实收金额") + private BigDecimal receiptAmount; + + @ApiModelProperty(value = "第三方交易手续费") + private BigDecimal feeAmount; + + @ApiModelProperty(value = "第三方结算金额") + private BigDecimal settleAmount; + + @ApiModelProperty(value = "商户名称") + private String merchantName; + + @ApiModelProperty(value = "手机号码") + private String mobile; + + @ApiModelProperty(value = "订单备注") + private String orderRemark; + + @ApiModelProperty(value = "订单状态") + private String orderStatus; + + @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/src/main/java/com/gxwebsoft/apps/entity/Equipment.java b/src/main/java/com/gxwebsoft/apps/entity/Equipment.java new file mode 100644 index 0000000..f91fd16 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/entity/Equipment.java @@ -0,0 +1,148 @@ +package com.gxwebsoft.apps.entity; + +import com.baomidou.mybatisplus.annotation.*; +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.math.BigDecimal; +import java.util.Date; + +/** + * 设备管理 + * + * @author 科技小王子 + * @since 2022-11-30 02:11:16 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "Equipment对象", description = "设备管理") +@TableName("apps_equipment") +public class Equipment implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "设备ID") + @TableId(value = "equipment_id", type = IdType.AUTO) + private Integer equipmentId; + + @ApiModelProperty(value = "设备名称") + private String equipmentName; + + @ApiModelProperty(value = "设备编码") + private String equipmentCode; + + @ApiModelProperty("设备分类") + private String equipmentCategory; + + @ApiModelProperty(value = "分类ID") + private Integer categoryId; + + @ApiModelProperty(value = "头像") + private String equipmentAvatar; + + @ApiModelProperty(value = "电池型号") + private String batteryModel; + + @ApiModelProperty(value = "BMS") + private String bms; + + @ApiModelProperty(value = "商品详情") + private String content; + + @ApiModelProperty(value = "是否激活") + private String isCtive; + + @ApiModelProperty(value = "工作状态") + private String workingStatus; + + @ApiModelProperty(value = "租赁状态") + private String leaseStatus; + + @ApiModelProperty(value = "电池状态") + private String batteryStatus; + + @ApiModelProperty(value = "电池电量") + private String batteryPower; + + @ApiModelProperty(value = "是否在线") + private String isOnline; + + @ApiModelProperty(value = "总电压") + private String totalVoltage; + + @ApiModelProperty(value = "BMS板供应商") + private String bmsBrand; + + @ApiModelProperty(value = "剩余容量") + private String surplusCapacity; + + @ApiModelProperty(value = "ICCID") + private String iccid; + + @ApiModelProperty(value = "设备激活时间") + private Date ctiveTime; + + @ApiModelProperty(value = "电池出厂时间") + private Date batteryDeliveryTime; + + @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 = "商户编号") + private String merchantCode; + + @ApiModelProperty(value = "租户id") + private Integer tenantId; + + @ApiModelProperty(value = "注册时间") + private Date createTime; + + @ApiModelProperty(value = "修改时间") + private Date updateTime; + + @ApiModelProperty(value = "所属商户ID") + @TableField(exist = false) + private Integer merchantId; + + @ApiModelProperty(value = "所属商户名称") + @TableField(exist = false) + private String merchantName; + + @ApiModelProperty(value = "订单ID") + private Integer orderId; + + @ApiModelProperty(value = "电池租金") + private BigDecimal batteryRent; + + @ApiModelProperty(value = "电池押金") + private BigDecimal batteryDeposit; + + @ApiModelProperty(value = "电池保险") + private BigDecimal batteryInsurance; + + @ApiModelProperty(value = "设备价格") + private BigDecimal batteryPrice; + + @ApiModelProperty(value = "二维码") + private String qrcode; + + @ApiModelProperty(value = "绑定的用户") + @TableField(exist = false) + private User user; +} diff --git a/src/main/java/com/gxwebsoft/apps/entity/EquipmentAlarm.java b/src/main/java/com/gxwebsoft/apps/entity/EquipmentAlarm.java new file mode 100644 index 0000000..e23c581 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/entity/EquipmentAlarm.java @@ -0,0 +1,72 @@ +package com.gxwebsoft.apps.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 2022-12-01 23:49:44 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "EquipmentAlarm对象", description = "故障报警记录") +@TableName("apps_equipment_alarm") +public class EquipmentAlarm implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "记录ID") + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + @ApiModelProperty(value = "设备编码") + private String equipmentCode; + + @ApiModelProperty(value = "报警类型") + private String alarmType; + + @ApiModelProperty(value = "备注") + private String comments; + + @ApiModelProperty(value = "处理时间") + private Date handleTime; + + @ApiModelProperty(value = "用户ID") + private Integer userId; + + @ApiModelProperty(value = "排序(数字越小越靠前)") + private Integer sortNumber; + + @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 merchantName; + +} diff --git a/src/main/java/com/gxwebsoft/apps/entity/EquipmentFault.java b/src/main/java/com/gxwebsoft/apps/entity/EquipmentFault.java new file mode 100644 index 0000000..8fdc596 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/entity/EquipmentFault.java @@ -0,0 +1,75 @@ +package com.gxwebsoft.apps.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 2022-12-01 18:40:25 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "EquipmentFault对象", description = "故障电池") +@TableName("apps_equipment_fault") +public class EquipmentFault implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "记录ID") + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + @ApiModelProperty(value = "设备编号") + private String equipmentCode; + + @ApiModelProperty(value = "故障原因") + private String faultType; + + @ApiModelProperty(value = "上传图片") + private String image; + + @ApiModelProperty(value = "备注") + private String comments; + + @ApiModelProperty(value = "处理时间") + private Date handleTime; + + @ApiModelProperty(value = "用户ID") + private Integer userId; + + @ApiModelProperty(value = "排序(数字越小越靠前)") + private Integer sortNumber; + + @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 merchantName; + +} diff --git a/src/main/java/com/gxwebsoft/apps/entity/EquipmentGoods.java b/src/main/java/com/gxwebsoft/apps/entity/EquipmentGoods.java new file mode 100644 index 0000000..c65c4eb --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/entity/EquipmentGoods.java @@ -0,0 +1,120 @@ +package com.gxwebsoft.apps.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-02-28 22:40:50 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "EquipmentGoods对象", description = "电池管理记录表") +@TableName("apps_equipment_goods") +public class EquipmentGoods implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "商品ID") + @TableId(value = "goods_id", type = IdType.AUTO) + private Integer goodsId; + + @ApiModelProperty(value = "商品名称") + private String goodsName; + + @ApiModelProperty(value = "下单类型") + private String equipmentCategory; + + @ApiModelProperty(value = "商品封面图") + private String image; + + @ApiModelProperty(value = "二维码") + private String qrcode; + + @ApiModelProperty(value = "分类ID") + private Integer categoryId; + + @ApiModelProperty(value = "电池型号") + private String batteryModel; + + @ApiModelProperty(value = "库存总量") + private Integer stockTotal; + + @ApiModelProperty(value = "商品卖点") + private String sellingPoint; + + @ApiModelProperty(value = "商品详情") + private String content; + + @ApiModelProperty(value = "电池租金") + private BigDecimal batteryRent; + + @ApiModelProperty(value = "电池价格") + private BigDecimal batteryPrice; + + @ApiModelProperty(value = "电池押金") + private BigDecimal batteryDeposit; + + @ApiModelProperty(value = "电池保险") + private BigDecimal batteryInsurance; + + @ApiModelProperty(value = "用户ID") + private Integer userId; + + @ApiModelProperty(value = "首付款") + private BigDecimal downPayment; + + @ApiModelProperty(value = "分期期数") + private BigDecimal periods; + + @ApiModelProperty(value = "每期还款") + private BigDecimal repayment; + + @ApiModelProperty(value = "手续费") + private BigDecimal serviceCharges; + + @ApiModelProperty(value = "分期方式") + private Integer periodsType; + + @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 merchantName; + + @ApiModelProperty(value = "订单ID") + @TableField(exist = false) + private Integer orderId; + +} diff --git a/src/main/java/com/gxwebsoft/apps/entity/EquipmentOrder.java b/src/main/java/com/gxwebsoft/apps/entity/EquipmentOrder.java new file mode 100644 index 0000000..476e4ac --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/entity/EquipmentOrder.java @@ -0,0 +1,202 @@ +package com.gxwebsoft.apps.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 2023-04-14 21:24:31 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "EquipmentOrder对象", description = "订单记录表") +@TableName("apps_equipment_order") +public class EquipmentOrder 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 subject; + + @ApiModelProperty(value = "订单号") + private String orderNo; + + @ApiModelProperty(value = "商品总金额(不含优惠折扣)") + private BigDecimal totalPrice; + + @ApiModelProperty(value = "订单金额(含优惠折扣)") + private BigDecimal orderPrice; + + @ApiModelProperty(value = "优惠券ID") + private Integer couponId; + + @ApiModelProperty(value = "优惠券抵扣金额") + private BigDecimal couponMoney; + + @ApiModelProperty(value = "积分抵扣金额") + private BigDecimal pointsMoney; + + @ApiModelProperty(value = "积分抵扣数量") + private Integer pointsNum; + + @ApiModelProperty(value = "实际付款金额(包含运费)") + private BigDecimal payPrice; + + @ApiModelProperty(value = "第三方支付实收金额") + private BigDecimal receiptAmount; + + @ApiModelProperty(value = "后台修改的订单金额(差价)") + private BigDecimal updatePrice; + + @ApiModelProperty(value = "买家留言") + private String buyerRemark; + + @ApiModelProperty(value = "支付方式(废弃)") + private Integer payType; + + @ApiModelProperty(value = "支付方式（余额10/微信20/支付宝30/通联支付40/其他支付50）") + private String payMethod; + + @ApiModelProperty(value = "付款状态(10未付款 20已付款)") + private Integer payStatus; + + @ApiModelProperty(value = "付款时间") + private Date payTime; + + @ApiModelProperty(value = "第三方交易记录ID") + private String tradeId; + + @ApiModelProperty(value = "配送方式(10快递配送 20门店自提)") + private Integer deliveryType; + + @ApiModelProperty(value = "自提门店ID") + private Integer extractShopId; + + @ApiModelProperty(value = "核销店员ID") + private Integer extractClerkId; + + @ApiModelProperty(value = "运费金额") + private BigDecimal expressPrice; + + @ApiModelProperty(value = "物流公司ID (废弃)") + private Integer expressId; + + @ApiModelProperty(value = "物流单号 (废弃)") + private String expressNo; + + @ApiModelProperty(value = "发货状态(10未发货 20已发货 30部分发货)") + private Integer deliveryStatus; + + @ApiModelProperty(value = "发货时间") + private Date deliveryTime; + + @ApiModelProperty(value = "收货状态(10未收货 20已收货)") + private Integer receiptStatus; + + @ApiModelProperty(value = "收货时间") + private Date receiptTime; + + @ApiModelProperty(value = "订单状态(10进行中 20取消 21待取消 30已完成)") + private Integer orderStatus; + + @ApiModelProperty(value = "赠送的积分数量") + private Integer pointsBonus; + + @ApiModelProperty(value = "商家备注") + private String merchantRemark; + + @ApiModelProperty(value = "订单是否已结算(0未结算 1已结算)") + private Integer isSettled; + + @ApiModelProperty(value = "续租订单的关联单号") + private Integer rentOrderId; + + @ApiModelProperty(value = "微信支付交易号(废弃)") + private String transactionId; + + @ApiModelProperty(value = "是否已评价(0否 1是)") + private Integer isComment; + + @ApiModelProperty(value = "订单来源(10普通订单 20砍价订单 30秒杀订单)") + private Integer orderSource; + + @ApiModelProperty(value = "来源记录ID") + private Integer orderSourceId; + + @ApiModelProperty(value = "来源记录的参数 (json格式)") + private String orderSourceData; + + @ApiModelProperty(value = "电池租金") + private BigDecimal batteryRent; + + @ApiModelProperty(value = "电池押金") + private BigDecimal batteryDeposit; + + @ApiModelProperty(value = "保险") + private BigDecimal batteryInsurance; + + @ApiModelProperty(value = "购买月份数量") + private Integer month; + + @ApiModelProperty(value = "服务到期时间") + private Date expirationTime; + + @ApiModelProperty(value = "来源客户端 (APP、H5、小程序等)") + private String platform; + + @ApiModelProperty(value = "是否续费订单") + private Integer isRenew; + + @ApiModelProperty(value = "用户ID") + private Integer userId; + + @ApiModelProperty(value = "所属门店ID") + private Integer shopId; + + @ApiModelProperty(value = "商品ID") + private Integer goodsId; + + @ApiModelProperty(value = "电池商品ID") + private Integer equipmentId; + + @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/src/main/java/com/gxwebsoft/apps/entity/EquipmentOrderGoods.java b/src/main/java/com/gxwebsoft/apps/entity/EquipmentOrderGoods.java new file mode 100644 index 0000000..51f5889 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/entity/EquipmentOrderGoods.java @@ -0,0 +1,119 @@ +package com.gxwebsoft.apps.entity; + +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import java.time.LocalDateTime; +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-05-11 19:10:13 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "EquipmentOrderGoods对象", description = "电池管理记录表") +@TableName("apps_equipment_order_goods") +public class EquipmentOrderGoods implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "商品ID") + @TableId(value = "order_goods_id", type = IdType.AUTO) + private Integer orderGoodsId; + + @ApiModelProperty(value = "商品名称") + private String goodsName; + + @ApiModelProperty(value = "下单类型") + private String equipmentCategory; + + @ApiModelProperty(value = "商品封面图") + private String image; + + @ApiModelProperty(value = "二维码") + private String qrcode; + + @ApiModelProperty(value = "分类ID") + private Integer categoryId; + + @ApiModelProperty(value = "电池型号") + private String batteryModel; + + @ApiModelProperty(value = "商品卖点") + private String sellingPoint; + + @ApiModelProperty(value = "库存总量") + private Integer stockTotal; + + @ApiModelProperty(value = "商品详情") + private String content; + + @ApiModelProperty(value = "电池租金") + private BigDecimal batteryRent; + + @ApiModelProperty(value = "电池价格") + private BigDecimal batteryPrice; + + @ApiModelProperty(value = "电池押金") + private BigDecimal batteryDeposit; + + @ApiModelProperty(value = "电池保险") + private BigDecimal batteryInsurance; + + @ApiModelProperty(value = "首付款") + private BigDecimal downPayment; + + @ApiModelProperty(value = "分期期数") + private BigDecimal periods; + + @ApiModelProperty(value = "分期还款") + private BigDecimal repayment; + + @ApiModelProperty(value = "手续费") + private BigDecimal serviceCharges; + + @ApiModelProperty(value = "分期方式 10按周 20按月") + private Integer periodsType; + + @ApiModelProperty(value = "订单编号") + private Integer orderId; + + @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 = "商户编码") + private String merchantCode; + + @ApiModelProperty(value = "租户id") + private Integer tenantId; + + @ApiModelProperty(value = "注册时间") + private Date createTime; + + @ApiModelProperty(value = "修改时间") + private Date updateTime; + +} diff --git a/src/main/java/com/gxwebsoft/apps/entity/EquipmentRecord.java b/src/main/java/com/gxwebsoft/apps/entity/EquipmentRecord.java new file mode 100644 index 0000000..688db34 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/entity/EquipmentRecord.java @@ -0,0 +1,79 @@ +package com.gxwebsoft.apps.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 2022-12-03 01:23:53 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "EquipmentRecord对象", description = "前世今生") +@TableName("apps_equipment_record") +public class EquipmentRecord implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "记录ID") + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + @ApiModelProperty(value = "设备编码") + private String equipmentCode; + + @ApiModelProperty(value = "事件类型") + private String eventType; + + @ApiModelProperty(value = "请求参数") + private String params; + + @ApiModelProperty(value = "用户ID") + private Integer userId; + + @ApiModelProperty(value = "订单ID") + private Integer orderId; + + @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 merchantName; + + @ApiModelProperty(value = "用户昵称") + @TableField(exist = false) + private String nickname; + +} diff --git a/src/main/java/com/gxwebsoft/apps/entity/Hualala.java b/src/main/java/com/gxwebsoft/apps/entity/Hualala.java new file mode 100644 index 0000000..7d96aa7 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/entity/Hualala.java @@ -0,0 +1,70 @@ +package com.gxwebsoft.apps.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 2022-11-25 12:55:33 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "Link对象", description = "常用链接推荐记录表") +@TableName("apps_hualala") +public class Hualala implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "当前请求的时间戳(毫秒)") + @TableField(exist = false) + private Long timestamp; + + @ApiModelProperty(value = "服务器接口") + @TableField(exist = false) + private String apiUrl = "https://www-openapi.hualala.com"; + + @ApiModelProperty(value = "开发者Key") + @TableField(exist = false) + private String appKey = "2487"; + + @ApiModelProperty(value = "appSecret") + @TableField(exist = false) + private String appSecret = "Hgr520dQpEiFe0FV"; + + @ApiModelProperty(value = "集团ID") + @TableField(exist = false) + private String groupID = "1528"; + + @ApiModelProperty(value = "店铺ID") + @TableField(exist = false) + private String shopID = "76288809"; + + @ApiModelProperty(value = "签名") + @TableField(exist = false) + private String signature; + + @ApiModelProperty(value = "版本号，固定传 3") + @TableField(exist = false) + private Integer version = 3; + + @ApiModelProperty(value = "业务参数 格式为jsonString") + @TableField(exist = false) + private String requestBody; + + @ApiModelProperty(value = "租户id") + private Integer tenantId; + + @ApiModelProperty(value = "注册时间") + private Date createTime; + + @ApiModelProperty(value = "修改时间") + private Date updateTime; + +} diff --git a/src/main/java/com/gxwebsoft/apps/entity/HualalaCard.java b/src/main/java/com/gxwebsoft/apps/entity/HualalaCard.java new file mode 100644 index 0000000..c48e776 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/entity/HualalaCard.java @@ -0,0 +1,131 @@ +package com.gxwebsoft.apps.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-01-08 12:22:50 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "HualalaCard对象", description = "") +@TableName("apps_hualala_card") +public class HualalaCard implements Serializable { + private static final long serialVersionUID = 1L; + + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + @ApiModelProperty(value = "groupID") + private String groupId; + + @ApiModelProperty(value = "shopID") + private String shopId; + + @ApiModelProperty(value = "网速会员id") + private Integer userId; + + @ApiModelProperty(value = "会员卡ID") + private String cardId; + + private String cardTypeId; + + @ApiModelProperty(value = "会员卡等级ID") + private String cardLevelId; + + @ApiModelProperty(value = "会员卡等级名称") + private String cardLevelName; + + @ApiModelProperty(value = "卡状态　10：正常　20：挂失中　30：冻结　40：注销（作废）50：已过期") + private String cardStatus; + + private String customerId; + + @ApiModelProperty(value = "会员卡入会店铺字段") + private String createShopId; + + @ApiModelProperty(value = "入会店铺名称") + private String createShopName; + + @ApiModelProperty(value = "卡号") + private String cardNo; + + @ApiModelProperty(value = "姓名") + private String customerName; + + @ApiModelProperty(value = " 手机号") + private String customerMobile; + + @ApiModelProperty(value = "性别 0：女 1：男 2：未知") + private Integer customerSex; + + @ApiModelProperty(value = "生日") + private String customerBirthday; + + @ApiModelProperty(value = "卡余额") + private BigDecimal cardBalance; + + @ApiModelProperty(value = "积分余额") + private BigDecimal pointBalance; + + @ApiModelProperty(value = "累计储值金额") + private BigDecimal saveMoneyTotal; + + @ApiModelProperty(value = "累计消费金额") + private BigDecimal consumptionTotal; + + @ApiModelProperty(value = "累计消费次数") + private Integer consumptionCount; + + @ApiModelProperty(value = "当前等级积分") + private Integer grade; + + @ApiModelProperty(value = "下一等级积分") + private Integer nextLevelGrade; + + @ApiModelProperty(value = "有效期至(yyyyMMddHHmmss) 0：表示永久有效") + private String expireTime; + + @ApiModelProperty(value = "最后一次交易时间") + private String lastTransTime; + + @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/src/main/java/com/gxwebsoft/apps/entity/HualalaCardBenefits.java b/src/main/java/com/gxwebsoft/apps/entity/HualalaCardBenefits.java new file mode 100644 index 0000000..e0c0708 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/entity/HualalaCardBenefits.java @@ -0,0 +1,69 @@ +package com.gxwebsoft.apps.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-01-08 12:22:50 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "HualalaCardBenefits对象", description = "会员权益") +@TableName("apps_hualala_card_benefits") +public class HualalaCardBenefits implements Serializable { + private static final long serialVersionUID = 1L; + + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + @ApiModelProperty(value = "会员等级名称") + private String cardLevelName; + + @ApiModelProperty(value = "名称") + private String name; + + @ApiModelProperty(value = "封面图") + private String image; + + @ApiModelProperty(value = "内容") + private String content; + + @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/src/main/java/com/gxwebsoft/apps/entity/HualalaCart.java b/src/main/java/com/gxwebsoft/apps/entity/HualalaCart.java new file mode 100644 index 0000000..85730e1 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/entity/HualalaCart.java @@ -0,0 +1,16 @@ +package com.gxwebsoft.apps.entity; + +import lombok.Data; + +import java.math.BigDecimal; +import java.util.List; + +/** + * 购物车 + */ +@Data +public class HualalaCart { + List items;// 商品列表 + BigDecimal totalPrice; // 总结 + int totalNum; // 总数 +} diff --git a/src/main/java/com/gxwebsoft/apps/entity/HualalaCartFood.java b/src/main/java/com/gxwebsoft/apps/entity/HualalaCartFood.java new file mode 100644 index 0000000..560dbc4 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/entity/HualalaCartFood.java @@ -0,0 +1,78 @@ +package com.gxwebsoft.apps.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 2023-01-14 14:46:44 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "HualalaCartFood对象", description = "购物车商品") +@TableName("apps_hualala_cart_food") +public class HualalaCartFood 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 Integer foodId; + + @ApiModelProperty(value = "菜品名称") + private String foodName; + + @ApiModelProperty(value = "skuId") + private String skuId; + + @ApiModelProperty(value = "店铺id") + private Integer shopId; + + @ApiModelProperty(value = "店铺名称") + private String shopName; + + @ApiModelProperty(value = "店铺标志") + private String shopLogo; + + @ApiModelProperty(value = "商品图") + private String coverUrl; + + @ApiModelProperty(value = "已放入购物车数量") + @TableField(exist = false) + private Long num; + + @ApiModelProperty(value = "售价") + private BigDecimal sellPrice; + + @ApiModelProperty(value = "库存") + private Integer stock; + + @ApiModelProperty(value = "租户id") + private Integer tenantId; + + @ApiModelProperty(value = "注册时间") + private Date createTime; + + @ApiModelProperty(value = "修改时间") + private Date updateTime; + +} diff --git a/src/main/java/com/gxwebsoft/apps/entity/HualalaFood.java b/src/main/java/com/gxwebsoft/apps/entity/HualalaFood.java new file mode 100644 index 0000000..76b1196 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/entity/HualalaFood.java @@ -0,0 +1,300 @@ +package com.gxwebsoft.apps.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; +import java.util.List; + +/** + * 菜品分类 + * + * @author 科技小王子 + * @since 2023-01-12 15:34:55 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "HualalaFood对象", description = "菜品分类") +@TableName("apps_hualala_food") +public class HualalaFood implements Serializable { + private static final long serialVersionUID = 1L; + + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + @ApiModelProperty(value = "菜品ID") + private String foodId; + + @ApiModelProperty(value = "菜品Key") + private String foodKey; + + @ApiModelProperty(value = "集团ID") + private String groupId; + + @ApiModelProperty(value = "店铺ID") + private String shopId; + + @ApiModelProperty(value = "菜品条目数") + private String foodCount; + + @ApiModelProperty(value = "加入购物车数量") + @TableField(exist = false) + private Integer cartNum; + + @ApiModelProperty(value = "售价") + @TableField(exist = false) + private BigDecimal sellPrice; + + @ApiModelProperty("子菜单") + @TableField(exist = false) + private List children; +// +// @ApiModelProperty(value = "pos菜品分类ID") +// private String foodCategoryId; +// +// @ApiModelProperty(value = "pos菜品分类Key") +// private String foodCategoryKey; +// +// @ApiModelProperty(value = "pos菜品分类名称") +// private String foodCategoryName; + + @ApiModelProperty(value = "线上菜品分类ID") + private String foodOnlineCategoryId; + + @ApiModelProperty(value = "线上菜品分类Key") + private String foodOnlineCategoryKey; + + @ApiModelProperty(value = "线上菜品分类名称") + private String foodOnlineCategoryName; + + @ApiModelProperty(value = "是/否是配料，false：不是 true：是") + private Integer isBatching; + + @ApiModelProperty(value = "是/否可单独销售 0：不单独销售（默认） 1：可单独销售") + private Integer isSingleSale; + + @ApiModelProperty(value = "此菜品关联的收入科目key，例如冷菜收入、热菜收入、酒水收入") + private String foodSubjectKey; + + @ApiModelProperty(value = "对应出品部门Key列表") + private String departmentKeyLst; + + @ApiModelProperty(value = "配菜的分类key,在这里选择配菜") + private String batchingFoodCategoryKey; + + @ApiModelProperty(value = "菜品名称") + private String foodName; + + @ApiModelProperty(value = "菜品编号 可用于与三方菜品数据做映射") + private String foodCode; + + @ApiModelProperty(value = "菜品别名") + private String foodAliasName; + + @ApiModelProperty(value = "菜品注记码") + private String foodMnemonicCode; + + @ApiModelProperty(value = "配菜的分类key,在这里选择配菜") + private Integer isDiscount; + + @ApiModelProperty(value = "规格") + private Object units; + + @ApiModelProperty(value = "起售") + private String minOrderCount; + + @ApiModelProperty(value = "分类编号") + private String foodCategoryCode; + + @ApiModelProperty(value = "分类英文名") + private String foodCategoryEnName; + + @ApiModelProperty(value = "分类分组名称") + private String foodCategoryGroupName; + + @ApiModelProperty(value = "0:堂食 1:堂食，外送，自提 2:外送，自提 3:自提 4:外送 5:堂食，自提 6:堂食，外送") + private String takeawayTag; + + @ApiModelProperty(value = "菜品图片") + private String imgePath; + + @ApiModelProperty(value = "结算系数") + private String settlementProportion; + + @ApiModelProperty(value = "分类显示排序值") + private Integer sortIndex; + + @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; + +// private Integer isComments; +// +// private Integer isActive; +// +// private Integer isOpen; +// +// private Integer isSetFood; +// +// private Object setFoodDetailJson; +// +// private Integer isTempFood; +// +// private String py; +// +// +// private String tasteList; +// +// private Object tasteGroupList; +// +// private Object makingMethodList; +// +// private Object makingMethodGroupList; +// +// private Integer isSpecialty; +// +// private Integer isRecommend; +// +// private Integer isNews; +// +// private String hotTag; +// +// private String salesCount; +// +// private Integer isNeedConfirmFoodNumber; +// +// private String takeoutPackagingFee; +// +// private String incrementUnit; + +// private Integer isHasImage; +// +// private String imageHwp; +// +// private String starLevel; +// +// private String foodTagIds; +// + private String parentFoodId; +// +// private String foodEnName; +// +// private Integer isAutoAdd; +// +// private Integer isCanRefund; +// +// private Integer setPerson; +// +// private Integer tasteIsRequired; +// +// private Integer tasteIsMultiple; +// +// private Integer makingMethodIsRequired; +// +// private Integer makingMethodIsMultiple; +// +// private String initClickAmount; +// +// private String actualClickAmount; +// +// private String recentClickAmount; +// +// private String clickAlertMess; +// +// private String sourceFoodId; +// +// private String salesCommission; +// +// private String foodKeyElementLst; +// +// private String foodSortIndex; +// +// private String actionTime; +// +// private String foodSubjectName; +// +// private String foodSubjectCode; +// +// private String departmentId; +// +// private String departmentKey; +// +// private String popularity; +// +// private String detailSplit; +// +// private String batchingIsFoodNumberRate; + +// @ApiModelProperty(value = "特价") +// private String specialPrice; +// +// @ApiModelProperty(value = "特价2") +// private String specialPrice2; +// +// @ApiModelProperty(value = "特价2") +// private String specialPrice3; +// +// @ApiModelProperty(value = "特价2") +// private String specialPrice4; +// +// @ApiModelProperty(value = "特价2") +// private String specialPrice5; +// +// @ApiModelProperty(value = "特价2") +// private String specialPrice6; +// +// @ApiModelProperty(value = "特价2") +// private String onlineWmPrice; +// +// @ApiModelProperty(value = "标签ids") +// private String tagIds; +// +// @ApiModelProperty(value = "标签名称") +// private String tagNames; +// +// @ApiModelProperty(value = "礼品券ID") +// private String giftItemId; +// +// @ApiModelProperty(value = "礼品券有效期") +// private String giftValidPeriod; +// +// @ApiModelProperty(value = "菜品分类说明") +// private String description; +// +// @ApiModelProperty(value = "记录状态") +// private String action; + +// @ApiModelProperty(value = "封面图") +// private String image; +// +// @ApiModelProperty(value = "内容") +// private String content; +// +// @ApiModelProperty(value = "排序(数字越小越靠前)") +// private Integer sortNumber; +// +// @ApiModelProperty(value = "备注") +// private String comments; + +// private String workingLunchTag; +// +// private String adsId; + +} diff --git a/src/main/java/com/gxwebsoft/apps/entity/HualalaFoodCategory.java b/src/main/java/com/gxwebsoft/apps/entity/HualalaFoodCategory.java new file mode 100644 index 0000000..3175e6d --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/entity/HualalaFoodCategory.java @@ -0,0 +1,111 @@ +package com.gxwebsoft.apps.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-01-12 09:49:46 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "HualalaFoodCategory对象", description = "菜品分类") +@TableName("apps_hualala_food_category") +public class HualalaFoodCategory implements Serializable { + private static final long serialVersionUID = 1L; + + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + @ApiModelProperty(value = "是/否配料分类 0：不是（默认） 1：是") + private Integer type; + + @ApiModelProperty(value = "名称") + private String foodCategoryName; + + @ApiModelProperty(value = "收入名称") + private String foodSubjectName; + + @ApiModelProperty(value = "菜品Key") + private String foodKey; + + @ApiModelProperty(value = "菜品条目数") + private String foodCount; + + @ApiModelProperty(value = "分类ID") + private String foodCategoryId; + + @ApiModelProperty(value = "分类ID") + private String foodCategoryGroupName; + + @ApiModelProperty(value = "分类Key") + private String foodCategoryKey; + + @ApiModelProperty(value = "记录状态") + private String action; + + @ApiModelProperty(value = "结算系数") + private String settlementProportion; + + @ApiModelProperty(value = "是否启用") + private Integer isActive; + + @ApiModelProperty(value = "是/否配料分类 0：不是（默认） 1：是") + private Integer isBatching; + + @ApiModelProperty(value = "是/否可单独销售 0：不单独销售（默认） 1：可单独销售") + private Integer isSingleSale; + + @ApiModelProperty(value = "分类显示排序值") + private Integer sortIndex; + + @ApiModelProperty(value = "介绍页id") + private Integer adsId; + + @ApiModelProperty(value = "店铺ID") + private String shopId; + + @ApiModelProperty(value = "封面图") + private String image; + + @ApiModelProperty(value = "内容") + private String content; + + @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/src/main/java/com/gxwebsoft/apps/entity/HualalaShop.java b/src/main/java/com/gxwebsoft/apps/entity/HualalaShop.java new file mode 100644 index 0000000..f6c01b7 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/entity/HualalaShop.java @@ -0,0 +1,117 @@ +package com.gxwebsoft.apps.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-01-12 18:24:44 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "HualalaShop对象", description = "哗啦啦门店管理") +@TableName("apps_hualala_shop") +public class HualalaShop implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "id") + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + @ApiModelProperty(value = "店铺ID") + private Long shopId; + + @ApiModelProperty(value = "店铺名称") + private String shopName; + + @ApiModelProperty(value = "店铺logo") + private String logoUrl; + + @ApiModelProperty(value = "所在城市ID") + private String shopCity; + + @ApiModelProperty(value = "所在城市") + private String shopCityName; + + @ApiModelProperty(value = "营业时间") + private String shopOpenTime; + + @ApiModelProperty(value = "店内电话") + private String shopPhone; + + @ApiModelProperty(value = "HLL") + private String acspType; + + @ApiModelProperty(value = "1") + private String action; + + @ApiModelProperty(value = "20230111104803") + private String actionTime; + + @ApiModelProperty(value = "品牌ID") + private String brandId; + + @ApiModelProperty(value = "品牌名称") + private String brandName; + + @ApiModelProperty(value = "1") + private String businessModel; + + @ApiModelProperty(value = "图片") + private String imagePath; + + @ApiModelProperty(value = "22.7913010") + private Double mapLatitudeValueBaiDu; + + @ApiModelProperty(value = "108.3312800") + private Double mapLongitudeValueBaiDu; + + @ApiModelProperty(value = "0") + private Integer operationMode; + + @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 payMerchantNo; + + @ApiModelProperty(value = "小通云缴秘钥") + private String paySecret; + + @ApiModelProperty(value = "客户ID") + private Integer customerId; + + @ApiModelProperty(value = "距离") + @TableField(exist = false) + private Double distance; + + @ApiModelProperty(value = "租户id") + private Integer tenantId; + + @ApiModelProperty(value = "注册时间") + private Date createTime; + + @ApiModelProperty(value = "修改时间") + private Date updateTime; + +} diff --git a/src/main/java/com/gxwebsoft/apps/entity/ItemVo.java b/src/main/java/com/gxwebsoft/apps/entity/ItemVo.java new file mode 100644 index 0000000..60b37f6 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/entity/ItemVo.java @@ -0,0 +1,20 @@ +package com.gxwebsoft.apps.entity; + +import lombok.Data; + +import java.math.BigDecimal; + +/** + * 操作购物车信息 + */ +@Data +public class ItemVo { + private String userId; // 用户ID + private String shopId; // 店铺ID + private Integer foodId; // 菜品ID + private Integer num; // 数量 + private BigDecimal price; // 售价 + private String imge; // 菜品图片 + private String foodName; // 菜品名称 + private String foodUnitID; // 规格ID +} diff --git a/src/main/java/com/gxwebsoft/apps/entity/Link.java b/src/main/java/com/gxwebsoft/apps/entity/Link.java new file mode 100644 index 0000000..006b829 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/entity/Link.java @@ -0,0 +1,79 @@ +package com.gxwebsoft.apps.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 2022-11-25 12:55:33 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "Link对象", description = "常用链接推荐记录表") +@TableName("apps_link") +public class Link implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "链接ID") + @TableId(value = "link_id", type = IdType.AUTO) + private Integer linkId; + + @ApiModelProperty(value = "链接名称") + private String linkName; + + @ApiModelProperty(value = "链接图标") + private String linkIcon; + + @ApiModelProperty(value = "路由地址") + private String linkPath; + + @ApiModelProperty(value = "组件路径") + private String linkComponent; + + @ApiModelProperty(value = "链接类型") + private String type; + + @ApiModelProperty(value = "点击次数") + private Integer clicks; + + @ApiModelProperty(value = "推荐理由") + private String comments; + + @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 = "商户编号") + private String merchantCode; + + @ApiModelProperty(value = "租户id") + private Integer tenantId; + + @ApiModelProperty(value = "注册时间") + private Date createTime; + + @ApiModelProperty(value = "修改时间") + private Date updateTime; + +} diff --git a/src/main/java/com/gxwebsoft/apps/entity/TestData.java b/src/main/java/com/gxwebsoft/apps/entity/TestData.java new file mode 100644 index 0000000..232e598 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/entity/TestData.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.apps.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-02-01 12:13:46 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "TestData对象", description = "测试数据表") +@TableName("apps_test_data") +public class TestData implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键ID") + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + @ApiModelProperty(value = "标题") + private String title; + + @ApiModelProperty(value = "内容") + private String content; + + @ApiModelProperty(value = "租户id") + private Integer tenantId; + + @ApiModelProperty(value = "注册时间") + private Date createTime; + + @ApiModelProperty(value = "修改时间") + private Date updateTime; + +} diff --git a/src/main/java/com/gxwebsoft/apps/mapper/BcAgentMapper.java b/src/main/java/com/gxwebsoft/apps/mapper/BcAgentMapper.java new file mode 100644 index 0000000..cbb956a --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/mapper/BcAgentMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.apps.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.apps.entity.BcAgent; +import com.gxwebsoft.apps.param.BcAgentParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 代报餐管理Mapper + * + * @author 科技小王子 + * @since 2023-04-24 19:25:59 + */ +public interface BcAgentMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") BcAgentParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") BcAgentParam param); + +} diff --git a/src/main/java/com/gxwebsoft/apps/mapper/BcCookbookMapper.java b/src/main/java/com/gxwebsoft/apps/mapper/BcCookbookMapper.java new file mode 100644 index 0000000..06c057f --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/mapper/BcCookbookMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.apps.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.apps.entity.BcCookbook; +import com.gxwebsoft.apps.param.BcCookbookParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 常用菜谱Mapper + * + * @author 科技小王子 + * @since 2023-05-05 14:56:54 + */ +public interface BcCookbookMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") BcCookbookParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") BcCookbookParam param); + +} diff --git a/src/main/java/com/gxwebsoft/apps/mapper/BcEquipmentMapper.java b/src/main/java/com/gxwebsoft/apps/mapper/BcEquipmentMapper.java new file mode 100644 index 0000000..4a9b7b1 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/mapper/BcEquipmentMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.apps.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.apps.entity.BcEquipment; +import com.gxwebsoft.apps.param.BcEquipmentParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 报餐设备管理Mapper + * + * @author 科技小王子 + * @since 2023-05-02 10:34:40 + */ +public interface BcEquipmentMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") BcEquipmentParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") BcEquipmentParam param); + +} diff --git a/src/main/java/com/gxwebsoft/apps/mapper/BcExportMapper.java b/src/main/java/com/gxwebsoft/apps/mapper/BcExportMapper.java new file mode 100644 index 0000000..75345d9 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/mapper/BcExportMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.apps.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.apps.entity.BcExport; +import com.gxwebsoft.apps.param.BcExportParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 报餐统计导出Mapper + * + * @author 科技小王子 + * @since 2023-06-01 21:47:02 + */ +public interface BcExportMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") BcExportParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") BcExportParam param); + +} diff --git a/src/main/java/com/gxwebsoft/apps/mapper/BcFoodMapper.java b/src/main/java/com/gxwebsoft/apps/mapper/BcFoodMapper.java new file mode 100644 index 0000000..957d632 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/mapper/BcFoodMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.apps.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.apps.entity.BcFood; +import com.gxwebsoft.apps.param.BcFoodParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 发布菜品明细Mapper + * + * @author 科技小王子 + * @since 2023-04-27 17:59:40 + */ +public interface BcFoodMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") BcFoodParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") BcFoodParam param); + +} diff --git a/src/main/java/com/gxwebsoft/apps/mapper/BcPlanMapper.java b/src/main/java/com/gxwebsoft/apps/mapper/BcPlanMapper.java new file mode 100644 index 0000000..bc93d98 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/mapper/BcPlanMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.apps.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.apps.entity.BcPlan; +import com.gxwebsoft.apps.param.BcPlanParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 菜品发布管理Mapper + * + * @author 科技小王子 + * @since 2023-04-27 17:59:40 + */ +public interface BcPlanMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") BcPlanParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") BcPlanParam param); + +} diff --git a/src/main/java/com/gxwebsoft/apps/mapper/BcTemporaryMapper.java b/src/main/java/com/gxwebsoft/apps/mapper/BcTemporaryMapper.java new file mode 100644 index 0000000..22cebef --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/mapper/BcTemporaryMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.apps.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.apps.entity.BcTemporary; +import com.gxwebsoft.apps.param.BcTemporaryParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 临时报餐管理Mapper + * + * @author 科技小王子 + * @since 2023-04-24 21:47:57 + */ +public interface BcTemporaryMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") BcTemporaryParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") BcTemporaryParam param); + +} diff --git a/src/main/java/com/gxwebsoft/apps/mapper/CashierMapper.java b/src/main/java/com/gxwebsoft/apps/mapper/CashierMapper.java new file mode 100644 index 0000000..7e5585e --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/mapper/CashierMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.apps.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.apps.entity.Cashier; +import com.gxwebsoft.apps.param.CashierParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 海牛收银台记录表Mapper + * + * @author WebSoft + * @since 2022-11-18 11:47:09 + */ +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/src/main/java/com/gxwebsoft/apps/mapper/EquipmentAlarmMapper.java b/src/main/java/com/gxwebsoft/apps/mapper/EquipmentAlarmMapper.java new file mode 100644 index 0000000..9131be8 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/mapper/EquipmentAlarmMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.apps.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.apps.entity.EquipmentAlarm; +import com.gxwebsoft.apps.param.EquipmentAlarmParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 故障报警记录Mapper + * + * @author 科技小王子 + * @since 2022-12-01 23:49:44 + */ +public interface EquipmentAlarmMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") EquipmentAlarmParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") EquipmentAlarmParam param); + +} diff --git a/src/main/java/com/gxwebsoft/apps/mapper/EquipmentFaultMapper.java b/src/main/java/com/gxwebsoft/apps/mapper/EquipmentFaultMapper.java new file mode 100644 index 0000000..9b7f9f8 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/mapper/EquipmentFaultMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.apps.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.apps.entity.EquipmentFault; +import com.gxwebsoft.apps.param.EquipmentFaultParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 故障电池Mapper + * + * @author 科技小王子 + * @since 2022-12-01 18:40:25 + */ +public interface EquipmentFaultMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") EquipmentFaultParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") EquipmentFaultParam param); + +} diff --git a/src/main/java/com/gxwebsoft/apps/mapper/EquipmentGoodsMapper.java b/src/main/java/com/gxwebsoft/apps/mapper/EquipmentGoodsMapper.java new file mode 100644 index 0000000..bbe47c9 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/mapper/EquipmentGoodsMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.apps.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.apps.entity.EquipmentGoods; +import com.gxwebsoft.apps.param.EquipmentGoodsParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 电池管理记录表Mapper + * + * @author 科技小王子 + * @since 2023-02-28 22:40:50 + */ +public interface EquipmentGoodsMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") EquipmentGoodsParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") EquipmentGoodsParam param); + +} diff --git a/src/main/java/com/gxwebsoft/apps/mapper/EquipmentMapper.java b/src/main/java/com/gxwebsoft/apps/mapper/EquipmentMapper.java new file mode 100644 index 0000000..905ba86 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/mapper/EquipmentMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.apps.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.apps.entity.Equipment; +import com.gxwebsoft.apps.param.EquipmentParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 设备管理Mapper + * + * @author 科技小王子 + * @since 2022-11-30 02:11:16 + */ +public interface EquipmentMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") EquipmentParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") EquipmentParam param); + +} diff --git a/src/main/java/com/gxwebsoft/apps/mapper/EquipmentOrderGoodsMapper.java b/src/main/java/com/gxwebsoft/apps/mapper/EquipmentOrderGoodsMapper.java new file mode 100644 index 0000000..88c3887 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/mapper/EquipmentOrderGoodsMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.apps.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.apps.entity.EquipmentOrderGoods; +import com.gxwebsoft.apps.param.EquipmentOrderGoodsParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 电池管理记录表Mapper + * + * @author 科技小王子 + * @since 2023-05-11 19:10:13 + */ +public interface EquipmentOrderGoodsMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") EquipmentOrderGoodsParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") EquipmentOrderGoodsParam param); + +} diff --git a/src/main/java/com/gxwebsoft/apps/mapper/EquipmentOrderMapper.java b/src/main/java/com/gxwebsoft/apps/mapper/EquipmentOrderMapper.java new file mode 100644 index 0000000..f3ba899 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/mapper/EquipmentOrderMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.apps.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.apps.entity.EquipmentOrder; +import com.gxwebsoft.apps.param.EquipmentOrderParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 订单记录表Mapper + * + * @author 科技小王子 + * @since 2023-04-14 21:24:31 + */ +public interface EquipmentOrderMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") EquipmentOrderParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") EquipmentOrderParam param); + +} diff --git a/src/main/java/com/gxwebsoft/apps/mapper/EquipmentRecordMapper.java b/src/main/java/com/gxwebsoft/apps/mapper/EquipmentRecordMapper.java new file mode 100644 index 0000000..7f9244f --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/mapper/EquipmentRecordMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.apps.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.apps.entity.EquipmentRecord; +import com.gxwebsoft.apps.param.EquipmentRecordParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 前世今生Mapper + * + * @author 科技小王子 + * @since 2022-12-03 01:23:53 + */ +public interface EquipmentRecordMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") EquipmentRecordParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") EquipmentRecordParam param); + +} diff --git a/src/main/java/com/gxwebsoft/apps/mapper/HualalaCardBenefitsMapper.java b/src/main/java/com/gxwebsoft/apps/mapper/HualalaCardBenefitsMapper.java new file mode 100644 index 0000000..139a468 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/mapper/HualalaCardBenefitsMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.apps.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.apps.entity.HualalaCardBenefits; +import com.gxwebsoft.apps.param.HualalaCardBenefitsParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 会员权益Mapper + * + * @author 科技小王子 + * @since 2023-01-08 12:22:50 + */ +public interface HualalaCardBenefitsMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") HualalaCardBenefitsParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") HualalaCardBenefitsParam param); + +} diff --git a/src/main/java/com/gxwebsoft/apps/mapper/HualalaCardMapper.java b/src/main/java/com/gxwebsoft/apps/mapper/HualalaCardMapper.java new file mode 100644 index 0000000..3f64ff3 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/mapper/HualalaCardMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.apps.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.apps.entity.HualalaCard; +import com.gxwebsoft.apps.param.HualalaCardParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * Mapper + * + * @author 科技小王子 + * @since 2023-01-08 12:22:50 + */ +public interface HualalaCardMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") HualalaCardParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") HualalaCardParam param); + +} diff --git a/src/main/java/com/gxwebsoft/apps/mapper/HualalaCartFoodMapper.java b/src/main/java/com/gxwebsoft/apps/mapper/HualalaCartFoodMapper.java new file mode 100644 index 0000000..7f1cedd --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/mapper/HualalaCartFoodMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.apps.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.apps.entity.HualalaCartFood; +import com.gxwebsoft.apps.param.HualalaCartFoodParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 购物车商品Mapper + * + * @author 科技小王子 + * @since 2023-01-14 14:46:44 + */ +public interface HualalaCartFoodMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") HualalaCartFoodParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") HualalaCartFoodParam param); + +} diff --git a/src/main/java/com/gxwebsoft/apps/mapper/HualalaFoodCategoryMapper.java b/src/main/java/com/gxwebsoft/apps/mapper/HualalaFoodCategoryMapper.java new file mode 100644 index 0000000..b4f33c3 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/mapper/HualalaFoodCategoryMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.apps.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.apps.entity.HualalaFoodCategory; +import com.gxwebsoft.apps.param.HualalaFoodCategoryParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 菜品分类Mapper + * + * @author 科技小王子 + * @since 2023-01-12 09:49:46 + */ +public interface HualalaFoodCategoryMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") HualalaFoodCategoryParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") HualalaFoodCategoryParam param); + +} diff --git a/src/main/java/com/gxwebsoft/apps/mapper/HualalaFoodMapper.java b/src/main/java/com/gxwebsoft/apps/mapper/HualalaFoodMapper.java new file mode 100644 index 0000000..3886d45 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/mapper/HualalaFoodMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.apps.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.apps.entity.HualalaFood; +import com.gxwebsoft.apps.param.HualalaFoodParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 菜品分类Mapper + * + * @author 科技小王子 + * @since 2023-01-12 15:34:55 + */ +public interface HualalaFoodMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") HualalaFoodParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") HualalaFoodParam param); + +} diff --git a/src/main/java/com/gxwebsoft/apps/mapper/HualalaMapper.java b/src/main/java/com/gxwebsoft/apps/mapper/HualalaMapper.java new file mode 100644 index 0000000..286aeef --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/mapper/HualalaMapper.java @@ -0,0 +1,20 @@ +package com.gxwebsoft.apps.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.apps.entity.Hualala; +import com.gxwebsoft.apps.entity.Link; +import com.gxwebsoft.apps.param.LinkParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 哗啦啦Mapper + * + * @author 科技小王子 + * @since 2022-11-25 12:55:33 + */ +public interface HualalaMapper extends BaseMapper { + +} diff --git a/src/main/java/com/gxwebsoft/apps/mapper/HualalaShopMapper.java b/src/main/java/com/gxwebsoft/apps/mapper/HualalaShopMapper.java new file mode 100644 index 0000000..84eff72 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/mapper/HualalaShopMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.apps.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.apps.entity.HualalaShop; +import com.gxwebsoft.apps.param.HualalaShopParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 哗啦啦门店管理Mapper + * + * @author 科技小王子 + * @since 2023-01-12 18:24:44 + */ +public interface HualalaShopMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") HualalaShopParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") HualalaShopParam param); + +} diff --git a/src/main/java/com/gxwebsoft/apps/mapper/LinkMapper.java b/src/main/java/com/gxwebsoft/apps/mapper/LinkMapper.java new file mode 100644 index 0000000..5a2c573 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/mapper/LinkMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.apps.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.apps.entity.Link; +import com.gxwebsoft.apps.param.LinkParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 常用链接推荐记录表Mapper + * + * @author 科技小王子 + * @since 2022-11-25 12:55:33 + */ +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/src/main/java/com/gxwebsoft/apps/mapper/TestDataMapper.java b/src/main/java/com/gxwebsoft/apps/mapper/TestDataMapper.java new file mode 100644 index 0000000..ddb858e --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/mapper/TestDataMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.apps.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.apps.entity.TestData; +import com.gxwebsoft.apps.param.TestDataParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 测试数据表Mapper + * + * @author 科技小王子 + * @since 2023-02-01 12:13:46 + */ +public interface TestDataMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") TestDataParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") TestDataParam param); + +} diff --git a/src/main/java/com/gxwebsoft/apps/mapper/xml/BcAgentMapper.xml b/src/main/java/com/gxwebsoft/apps/mapper/xml/BcAgentMapper.xml new file mode 100644 index 0000000..b0c71fb --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/mapper/xml/BcAgentMapper.xml @@ -0,0 +1,44 @@ + + + + + + + SELECT a.*,b.nickname,c.nickname as parentName + FROM apps_bc_agent a + LEFT JOIN sys_user b ON a.user_id = b.user_id + LEFT JOIN sys_user c ON a.parent_id = c.user_id + + + AND a.agent_id = #{param.agentId} + + + AND a.user_id = #{param.userId} + + + AND a.parent_id = #{param.parentId} + + + AND a.status = #{param.status} + + + AND a.create_time >= #{param.createTimeStart} + + + AND a.create_time <= #{param.createTimeEnd} + + AND b.deleted = 0 AND c.deleted = 0 + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/apps/mapper/xml/BcCookbookMapper.xml b/src/main/java/com/gxwebsoft/apps/mapper/xml/BcCookbookMapper.xml new file mode 100644 index 0000000..577901f --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/mapper/xml/BcCookbookMapper.xml @@ -0,0 +1,53 @@ + + + + + + + SELECT a.* + FROM apps_bc_cookbook a + + + AND a.cookbook_id = #{param.cookbookId} + + + AND a.plan_id = #{param.planId} + + + AND a.period LIKE CONCAT('%', #{param.period}, '%') + + + AND a.status = #{param.status} + + + AND a.comments LIKE CONCAT('%', #{param.comments}, '%') + + + 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/src/main/java/com/gxwebsoft/apps/mapper/xml/BcEquipmentMapper.xml b/src/main/java/com/gxwebsoft/apps/mapper/xml/BcEquipmentMapper.xml new file mode 100644 index 0000000..2461118 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/mapper/xml/BcEquipmentMapper.xml @@ -0,0 +1,65 @@ + + + + + + + SELECT a.* + FROM apps_bc_equipment a + + + AND a.bc_equipment_id = #{param.bcEquipmentId} + + + AND a.equipment_name LIKE CONCAT('%', #{param.equipmentName}, '%') + + + AND a.equipment_code LIKE CONCAT('%', #{param.equipmentCode}, '%') + + + AND a.qrcode LIKE CONCAT('%', #{param.qrcode}, '%') + + + AND a.content LIKE CONCAT('%', #{param.content}, '%') + + + 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.merchant_code LIKE CONCAT('%', #{param.merchantCode}, '%') + + + AND a.create_time >= #{param.createTimeStart} + + + AND a.create_time <= #{param.createTimeEnd} + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/apps/mapper/xml/BcExportMapper.xml b/src/main/java/com/gxwebsoft/apps/mapper/xml/BcExportMapper.xml new file mode 100644 index 0000000..75c3fb8 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/mapper/xml/BcExportMapper.xml @@ -0,0 +1,83 @@ + + + + + + + SELECT a.* + FROM apps_bc_export a + + + AND a.export_id = #{param.exportId} + + + AND a.organization_name LIKE CONCAT('%', #{param.organizationName}, '%') + + + AND a.expend_money = #{param.expendMoney} + + + AND a.breakfast_post = #{param.breakfastPost} + + + AND a.breakfast_sign = #{param.breakfastSign} + + + AND a.lunch_post = #{param.lunchPost} + + + AND a.lunch_sign = #{param.lunchSign} + + + AND a.dinner_post = #{param.dinnerPost} + + + AND a.dinner_sign = #{param.dinnerSign} + + + AND a.goods_price = #{param.goodsPrice} + + + AND a.delivery_time LIKE CONCAT('%', #{param.deliveryTime}, '%') + + + AND a.status = #{param.status} + + + AND a.comments LIKE CONCAT('%', #{param.comments}, '%') + + + AND a.order_id = #{param.orderId} + + + AND a.organization_id = #{param.organizationId} + + + 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/src/main/java/com/gxwebsoft/apps/mapper/xml/BcFoodMapper.xml b/src/main/java/com/gxwebsoft/apps/mapper/xml/BcFoodMapper.xml new file mode 100644 index 0000000..d0fbaaf --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/mapper/xml/BcFoodMapper.xml @@ -0,0 +1,57 @@ + + + + + + + SELECT a.*,b.nickname + FROM apps_bc_food a + LEFT JOIN sys_user b ON a.user_id = b.user_id + + + AND a.bc_food_id = #{param.bcFoodId} + + + AND a.plan_id = #{param.planId} + + + AND a.period LIKE CONCAT('%', #{param.period}, '%') + + + AND a.status = #{param.status} + + + AND a.comments LIKE CONCAT('%', #{param.comments}, '%') + + + 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 ( b.nickname LIKE CONCAT('%', #{param.keywords}, '%') ) + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/apps/mapper/xml/BcPlanMapper.xml b/src/main/java/com/gxwebsoft/apps/mapper/xml/BcPlanMapper.xml new file mode 100644 index 0000000..e7732c7 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/mapper/xml/BcPlanMapper.xml @@ -0,0 +1,67 @@ + + + + + + + SELECT a.*,b.nickname + FROM apps_bc_plan a + LEFT JOIN sys_user b ON a.user_id = b.user_id + + + AND a.bc_plan_id = #{param.bcPlanId} + + + AND a.day_time LIKE CONCAT('%', #{param.dayTime}, '%') + + + AND a.week = #{param.week} + + + AND a.type LIKE CONCAT('%', #{param.type}, '%') + + + AND a.expiration_time LIKE CONCAT('%', #{param.expirationTime}, '%') + + + AND a.status = #{param.status} + + + AND a.comments LIKE CONCAT('%', #{param.comments}, '%') + + + AND a.user_id = #{param.userId} + + + AND a.deleted = #{param.deleted} + + + AND a.deleted = 0 + + + AND a.day_time >= #{param.createTimeStart} + + + AND a.day_time <= #{param.createTimeEnd} + + + AND a.day_time = #{param.oldTime} + + + + AND ( b.nickname LIKE CONCAT('%', #{param.keywords}, '%') OR a.day_time LIKE CONCAT('%', #{param.keywords}, '%') ) + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/apps/mapper/xml/BcTemporaryMapper.xml b/src/main/java/com/gxwebsoft/apps/mapper/xml/BcTemporaryMapper.xml new file mode 100644 index 0000000..a82fdc4 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/mapper/xml/BcTemporaryMapper.xml @@ -0,0 +1,54 @@ + + + + + + + SELECT a.*,b.nickname + FROM apps_bc_temporary a + LEFT JOIN sys_user b ON a.user_id = b.user_id + + + AND a.temporary_id = #{param.temporaryId} + + + AND a.user_id = #{param.userId} + + + AND a.parent_id = #{param.parentId} + + + AND a.status = #{param.status} + + + AND a.apply_status = #{param.applyStatus} + + + AND a.expiration_time >= #{param.dayTime} + + + AND a.deleted = #{param.deleted} + + + AND a.deleted = 0 + + + AND a.create_time >= #{param.createTimeStart} + + + AND a.create_time <= #{param.createTimeEnd} + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/apps/mapper/xml/CashierMapper.xml b/src/main/java/com/gxwebsoft/apps/mapper/xml/CashierMapper.xml new file mode 100644 index 0000000..5a9e915 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/mapper/xml/CashierMapper.xml @@ -0,0 +1,86 @@ + + + + + + + SELECT a.* + FROM apps_cashier a + + + AND a.cashier_id = #{param.cashierId} + + + AND a.buyer_id LIKE CONCAT('%', #{param.buyerId}, '%') + + + AND a.merchant_code LIKE CONCAT('%', #{param.merchantCode}, '%') + + + AND a.code LIKE CONCAT('%', #{param.code}, '%') + + + AND a.msg LIKE CONCAT('%', #{param.msg}, '%') + + + AND a.out_trade_no LIKE CONCAT('%', #{param.outTradeNo}, '%') + + + AND a.amount LIKE CONCAT('%', #{param.amount}, '%') + + + AND a.pay_time LIKE CONCAT('%', #{param.payTime}, '%') + + + AND a.pay_type LIKE CONCAT('%', #{param.payType}, '%') + + + AND a.total_amount = #{param.totalAmount} + + + AND a.receipt_amount = #{param.receiptAmount} + + + AND a.fee_amount = #{param.feeAmount} + + + AND a.settle_amount = #{param.settleAmount} + + + AND a.merchant_name LIKE CONCAT('%', #{param.merchantName}, '%') + + + AND a.mobile LIKE CONCAT('%', #{param.mobile}, '%') + + + AND a.order_remark LIKE CONCAT('%', #{param.orderRemark}, '%') + + + AND a.order_status LIKE CONCAT('%', #{param.orderStatus}, '%') + + + AND a.deleted = #{param.deleted} + + + AND a.deleted = 0 + + + AND a.create_time >= #{param.createTimeStart} + + + AND a.create_time <= #{param.createTimeEnd} + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/apps/mapper/xml/EquipmentAlarmMapper.xml b/src/main/java/com/gxwebsoft/apps/mapper/xml/EquipmentAlarmMapper.xml new file mode 100644 index 0000000..e8860d3 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/mapper/xml/EquipmentAlarmMapper.xml @@ -0,0 +1,70 @@ + + + + + + + SELECT a.*, + b.merchant_name,b.merchant_code + FROM apps_equipment_alarm a + LEFT JOIN shop_merchant b ON a.merchant_code = b.merchant_code + + + AND a.id = #{param.id} + + + AND a.equipment_code LIKE CONCAT('%', #{param.equipmentCode}, '%') + + + AND a.alarm_type LIKE CONCAT('%', #{param.alarmType}, '%') + + + AND a.comments LIKE CONCAT('%', #{param.comments}, '%') + + + AND a.handle_time LIKE CONCAT('%', #{param.handleTime}, '%') + + + AND a.user_id = #{param.userId} + + + AND a.sort_number = #{param.sortNumber} + + + 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.merchant_name LIKE CONCAT('%', #{param.merchantName}, '%') + + + AND b.merchant_code = #{param.merchantCode} + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/apps/mapper/xml/EquipmentFaultMapper.xml b/src/main/java/com/gxwebsoft/apps/mapper/xml/EquipmentFaultMapper.xml new file mode 100644 index 0000000..ce6bf2e --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/mapper/xml/EquipmentFaultMapper.xml @@ -0,0 +1,70 @@ + + + + + + + SELECT a.*, + b.merchant_name,b.merchant_code + FROM apps_equipment_fault a + LEFT JOIN shop_merchant b ON a.merchant_code = b.merchant_code + + + AND a.id = #{param.id} + + + AND a.equipment_code = #{param.equipmentCode} + + + AND a.fault_type LIKE CONCAT('%', #{param.faultType}, '%') + + + AND a.comments LIKE CONCAT('%', #{param.comments}, '%') + + + AND a.handle_time LIKE CONCAT('%', #{param.handleTime}, '%') + + + AND a.user_id = #{param.userId} + + + AND a.sort_number = #{param.sortNumber} + + + 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.merchant_name LIKE CONCAT('%', #{param.merchantName}, '%') + + + AND b.merchant_code = #{param.merchantCode} + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/apps/mapper/xml/EquipmentGoodsMapper.xml b/src/main/java/com/gxwebsoft/apps/mapper/xml/EquipmentGoodsMapper.xml new file mode 100644 index 0000000..7136e08 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/mapper/xml/EquipmentGoodsMapper.xml @@ -0,0 +1,94 @@ + + + + + + + SELECT a.*, + b.merchant_name,b.merchant_code + FROM apps_equipment_goods a + LEFT JOIN shop_merchant b ON a.merchant_code = b.merchant_code + + + AND a.goods_id = #{param.goodsId} + + + AND a.equipment_category LIKE CONCAT('%', #{param.equipment_category}, '%') + + + AND a.image LIKE CONCAT('%', #{param.image}, '%') + + + AND a.goods_name LIKE CONCAT('%', #{param.goodsName}, '%') + + + AND a.qrcode LIKE CONCAT('%', #{param.qrcode}, '%') + + + AND a.category_id = #{param.categoryId} + + + AND a.battery_model LIKE CONCAT('%', #{param.batteryModel}, '%') + + + AND a.content LIKE CONCAT('%', #{param.content}, '%') + + + AND a.battery_rent = #{param.batteryRent} + + + AND a.battery_price = #{param.batteryPrice} + + + AND a.battery_deposit = #{param.batteryDeposit} + + + AND a.battery_insurance = #{param.batteryInsurance} + + + 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.merchant_code LIKE CONCAT('%', #{param.merchantCode}, '%') + + + AND a.create_time >= #{param.createTimeStart} + + + AND a.create_time <= #{param.createTimeEnd} + + + AND a.merchant_code <= #{param.merchantCode} + + + AND b.merchant_name <= #{param.merchantName} + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/apps/mapper/xml/EquipmentMapper.xml b/src/main/java/com/gxwebsoft/apps/mapper/xml/EquipmentMapper.xml new file mode 100644 index 0000000..043de45 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/mapper/xml/EquipmentMapper.xml @@ -0,0 +1,121 @@ + + + + + + + SELECT a.*, + b.merchant_name,b.merchant_code + FROM apps_equipment a + LEFT JOIN shop_merchant b ON a.merchant_code = b.merchant_code + + + AND a.equipment_id = #{param.equipmentId} + + + AND a.equipment_name LIKE CONCAT('%', #{param.equipmentName}, '%') + + + AND a.equipment_code LIKE CONCAT('%', #{param.equipmentCode}, '%') + + + AND a.equipment_category LIKE CONCAT('%', #{param.equipmentCategory}, '%') + + + AND a.equipment_avatar LIKE CONCAT('%', #{param.equipmentAvatar}, '%') + + + AND a.battery_model LIKE CONCAT('%', #{param.batteryModel}, '%') + + + AND a.bms LIKE CONCAT('%', #{param.bms}, '%') + + + AND a.content LIKE CONCAT('%', #{param.content}, '%') + + + AND a.is_ctive LIKE CONCAT('%', #{param.isCtive}, '%') + + + AND a.working_status LIKE CONCAT('%', #{param.workingStatus}, '%') + + + AND a.lease_status LIKE CONCAT('%', #{param.leaseStatus}, '%') + + + AND a.battery_status LIKE CONCAT('%', #{param.batteryStatus}, '%') + + + AND a.battery_power LIKE CONCAT('%', #{param.batteryPower}, '%') + + + AND a.is_online LIKE CONCAT('%', #{param.isOnline}, '%') + + + AND a.total_voltage LIKE CONCAT('%', #{param.totalVoltage}, '%') + + + AND a.bms_brand LIKE CONCAT('%', #{param.bmsBrand}, '%') + + + AND a.surplus_capacity LIKE CONCAT('%', #{param.surplusCapacity}, '%') + + + AND a.iccid LIKE CONCAT('%', #{param.iccid}, '%') + + + AND a.ctive_time LIKE CONCAT('%', #{param.ctiveTime}, '%') + + + AND a.battery_delivery_time LIKE CONCAT('%', #{param.batteryDeliveryTime}, '%') + + + AND a.order_id = #{param.orderId} + + + AND a.user_id = #{param.userId} + + + AND a.merchant_code LIKE CONCAT('%', #{param.merchantCode}, '%') + + + 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 b.merchant_name LIKE CONCAT('%', #{param.merchantName}, '%') + + + AND b.merchant_code = #{param.merchantCode} + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/apps/mapper/xml/EquipmentOrderGoodsMapper.xml b/src/main/java/com/gxwebsoft/apps/mapper/xml/EquipmentOrderGoodsMapper.xml new file mode 100644 index 0000000..0a75b05 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/mapper/xml/EquipmentOrderGoodsMapper.xml @@ -0,0 +1,110 @@ + + + + + + + SELECT a.* + FROM apps_equipment_order_goods a + + + AND a.order_goods_id = #{param.orderGoodsId} + + + AND a.goods_name LIKE CONCAT('%', #{param.goodsName}, '%') + + + AND a.equipment_category LIKE CONCAT('%', #{param.equipmentCategory}, '%') + + + AND a.image LIKE CONCAT('%', #{param.image}, '%') + + + AND a.qrcode LIKE CONCAT('%', #{param.qrcode}, '%') + + + AND a.category_id = #{param.categoryId} + + + AND a.battery_model LIKE CONCAT('%', #{param.batteryModel}, '%') + + + AND a.selling_point LIKE CONCAT('%', #{param.sellingPoint}, '%') + + + AND a.stock_total = #{param.stockTotal} + + + AND a.content LIKE CONCAT('%', #{param.content}, '%') + + + AND a.battery_rent = #{param.batteryRent} + + + AND a.battery_price = #{param.batteryPrice} + + + AND a.battery_deposit = #{param.batteryDeposit} + + + AND a.battery_insurance = #{param.batteryInsurance} + + + AND a.down_payment = #{param.downPayment} + + + AND a.periods = #{param.periods} + + + AND a.repayment = #{param.repayment} + + + AND a.service_charges = #{param.serviceCharges} + + + AND a.periods_type = #{param.periodsType} + + + AND a.order_id = #{param.orderId} + + + 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.merchant_code LIKE CONCAT('%', #{param.merchantCode}, '%') + + + AND a.create_time >= #{param.createTimeStart} + + + AND a.create_time <= #{param.createTimeEnd} + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/apps/mapper/xml/EquipmentOrderMapper.xml b/src/main/java/com/gxwebsoft/apps/mapper/xml/EquipmentOrderMapper.xml new file mode 100644 index 0000000..bf65d02 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/mapper/xml/EquipmentOrderMapper.xml @@ -0,0 +1,194 @@ + + + + + + + SELECT a.* + FROM apps_equipment_order a + + + AND a.order_id = #{param.orderId} + + + AND a.subject LIKE CONCAT('%', #{param.subject}, '%') + + + AND a.order_no LIKE CONCAT('%', #{param.orderNo}, '%') + + + AND a.total_price = #{param.totalPrice} + + + AND a.order_price = #{param.orderPrice} + + + AND a.coupon_id = #{param.couponId} + + + AND a.coupon_money = #{param.couponMoney} + + + AND a.points_money = #{param.pointsMoney} + + + AND a.points_num = #{param.pointsNum} + + + AND a.pay_price = #{param.payPrice} + + + AND a.receipt_amount = #{param.receiptAmount} + + + AND a.update_price = #{param.updatePrice} + + + AND a.buyer_remark LIKE CONCAT('%', #{param.buyerRemark}, '%') + + + AND a.pay_type = #{param.payType} + + + AND a.pay_method LIKE CONCAT('%', #{param.payMethod}, '%') + + + AND a.pay_status = #{param.payStatus} + + + AND a.pay_time LIKE CONCAT('%', #{param.payTime}, '%') + + + AND a.trade_id LIKE CONCAT('%', #{param.tradeId}, '%') + + + AND a.delivery_type = #{param.deliveryType} + + + AND a.extract_shop_id = #{param.extractShopId} + + + AND a.extract_clerk_id = #{param.extractClerkId} + + + AND a.express_price = #{param.expressPrice} + + + AND a.express_id = #{param.expressId} + + + AND a.express_no LIKE CONCAT('%', #{param.expressNo}, '%') + + + AND a.delivery_status = #{param.deliveryStatus} + + + AND a.delivery_time LIKE CONCAT('%', #{param.deliveryTime}, '%') + + + AND a.receipt_status = #{param.receiptStatus} + + + AND a.receipt_time LIKE CONCAT('%', #{param.receiptTime}, '%') + + + AND a.order_status = #{param.orderStatus} + + + AND a.points_bonus = #{param.pointsBonus} + + + AND a.merchant_remark LIKE CONCAT('%', #{param.merchantRemark}, '%') + + + AND a.is_settled = #{param.isSettled} + + + AND a.rent_order_id = #{param.rentOrderId} + + + AND a.transaction_id LIKE CONCAT('%', #{param.transactionId}, '%') + + + AND a.is_comment = #{param.isComment} + + + AND a.order_source = #{param.orderSource} + + + AND a.order_source_id = #{param.orderSourceId} + + + AND a.order_source_data LIKE CONCAT('%', #{param.orderSourceData}, '%') + + + AND a.battery_rent = #{param.batteryRent} + + + AND a.battery_deposit = #{param.batteryDeposit} + + + AND a.battery_insurance = #{param.batteryInsurance} + + + AND a.month = #{param.month} + + + AND a.expiration_time LIKE CONCAT('%', #{param.expirationTime}, '%') + + + AND a.platform LIKE CONCAT('%', #{param.platform}, '%') + + + AND a.is_renew = #{param.isRenew} + + + AND a.user_id = #{param.userId} + + + AND a.shop_id = #{param.shopId} + + + AND a.goods_id = #{param.goodsId} + + + AND a.equipment_id = #{param.equipmentId} + + + 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} + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/apps/mapper/xml/EquipmentRecordMapper.xml b/src/main/java/com/gxwebsoft/apps/mapper/xml/EquipmentRecordMapper.xml new file mode 100644 index 0000000..7213717 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/mapper/xml/EquipmentRecordMapper.xml @@ -0,0 +1,78 @@ + + + + + + + SELECT a.*, + b.merchant_name,b.merchant_code, + c.nickname,c.user_id + FROM apps_equipment_record a + LEFT JOIN shop_merchant b ON a.merchant_code = b.merchant_code + LEFT JOIN sys_user c ON a.user_id = c.user_id + + + AND a.id = #{param.id} + + + AND a.equipment_code LIKE CONCAT('%', #{param.equipmentCode}, '%') + + + AND a.event_type LIKE CONCAT('%', #{param.eventType}, '%') + + + AND a.params LIKE CONCAT('%', #{param.params}, '%') + + + 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.merchant_code LIKE CONCAT('%', #{param.merchantCode}, '%') + + + AND a.create_time >= #{param.createTimeStart} + + + AND a.create_time <= #{param.createTimeEnd} + + + AND a.create_time <= #{param.createTimeEnd} + + + AND a.order_id = #{param.orderId} + + + AND b.merchant_name LIKE CONCAT('%', #{param.merchantName}, '%') + + + AND b.merchant_code = #{param.merchantCode} + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/apps/mapper/xml/HualalaCardBenefitsMapper.xml b/src/main/java/com/gxwebsoft/apps/mapper/xml/HualalaCardBenefitsMapper.xml new file mode 100644 index 0000000..4614721 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/mapper/xml/HualalaCardBenefitsMapper.xml @@ -0,0 +1,62 @@ + + + + + + + SELECT a.* + FROM apps_hualala_card_benefits a + + + AND a.id = #{param.id} + + + AND a.card_level_name LIKE CONCAT('%', #{param.cardLevelName}, '%') + + + AND a.name LIKE CONCAT('%', #{param.name}, '%') + + + AND a.image LIKE CONCAT('%', #{param.image}, '%') + + + AND a.content LIKE CONCAT('%', #{param.content}, '%') + + + 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} + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/apps/mapper/xml/HualalaCardMapper.xml b/src/main/java/com/gxwebsoft/apps/mapper/xml/HualalaCardMapper.xml new file mode 100644 index 0000000..1ff3515 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/mapper/xml/HualalaCardMapper.xml @@ -0,0 +1,125 @@ + + + + + + + SELECT a.* + FROM apps_hualala_card a + + + AND a.id = #{param.id} + + + AND a.group_id LIKE CONCAT('%', #{param.groupId}, '%') + + + AND a.shop_id LIKE CONCAT('%', #{param.shopId}, '%') + + + AND a.user_id = #{param.userId} + + + AND a.card_id LIKE CONCAT('%', #{param.cardId}, '%') + + + AND a.card_type_id LIKE CONCAT('%', #{param.cardTypeId}, '%') + + + AND a.card_level_id LIKE CONCAT('%', #{param.cardLevelId}, '%') + + + AND a.card_level_name LIKE CONCAT('%', #{param.cardLevelName}, '%') + + + AND a.card_status LIKE CONCAT('%', #{param.cardStatus}, '%') + + + AND a.customer_id LIKE CONCAT('%', #{param.customerId}, '%') + + + AND a.create_shop_id LIKE CONCAT('%', #{param.createShopId}, '%') + + + AND a.create_shop_name LIKE CONCAT('%', #{param.createShopName}, '%') + + + AND a.card_no LIKE CONCAT('%', #{param.cardNo}, '%') + + + AND a.customer_name LIKE CONCAT('%', #{param.customerName}, '%') + + + AND a.customer_mobile LIKE CONCAT('%', #{param.customerMobile}, '%') + + + AND a.customer_sex = #{param.customerSex} + + + AND a.customer_birthday LIKE CONCAT('%', #{param.customerBirthday}, '%') + + + AND a.card_balance = #{param.cardBalance} + + + AND a.point_balance = #{param.pointBalance} + + + AND a.save_money_total = #{param.saveMoneyTotal} + + + AND a.consumption_total = #{param.consumptionTotal} + + + AND a.consumption_count = #{param.consumptionCount} + + + AND a.grade = #{param.grade} + + + AND a.next_level_grade = #{param.nextLevelGrade} + + + AND a.expire_time LIKE CONCAT('%', #{param.expireTime}, '%') + + + AND a.last_trans_time LIKE CONCAT('%', #{param.lastTransTime}, '%') + + + 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} + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/apps/mapper/xml/HualalaCartFoodMapper.xml b/src/main/java/com/gxwebsoft/apps/mapper/xml/HualalaCartFoodMapper.xml new file mode 100644 index 0000000..e4d0a9d --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/mapper/xml/HualalaCartFoodMapper.xml @@ -0,0 +1,62 @@ + + + + + + + SELECT a.* + FROM apps_hualala_cart_food a + + + AND a.id = #{param.id} + + + AND a.user_id = #{param.userId} + + + AND a.food_id = #{param.foodId} + + + AND a.food_name LIKE CONCAT('%', #{param.foodName}, '%') + + + AND a.sku_id LIKE CONCAT('%', #{param.skuId}, '%') + + + AND a.shop_id = #{param.shopId} + + + AND a.shop_name LIKE CONCAT('%', #{param.shopName}, '%') + + + AND a.shop_logo LIKE CONCAT('%', #{param.shopLogo}, '%') + + + AND a.cover_url LIKE CONCAT('%', #{param.coverUrl}, '%') + + + AND a.sell_price = #{param.sellPrice} + + + AND a.stock = #{param.stock} + + + AND a.create_time >= #{param.createTimeStart} + + + AND a.create_time <= #{param.createTimeEnd} + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/apps/mapper/xml/HualalaFoodCategoryMapper.xml b/src/main/java/com/gxwebsoft/apps/mapper/xml/HualalaFoodCategoryMapper.xml new file mode 100644 index 0000000..8d9040e --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/mapper/xml/HualalaFoodCategoryMapper.xml @@ -0,0 +1,104 @@ + + + + + + + SELECT a.* + FROM apps_hualala_food_category a + + + AND a.id = #{param.id} + + + AND a.type = #{param.type} + + + AND a.food_category_name LIKE CONCAT('%', #{param.foodCategoryName}, '%') + + + AND a.food_subject_name LIKE CONCAT('%', #{param.foodSubjectName}, '%') + + + AND a.food_key LIKE CONCAT('%', #{param.foodKey}, '%') + + + AND a.food_count LIKE CONCAT('%', #{param.foodCount}, '%') + + + AND a.food_category_id LIKE CONCAT('%', #{param.foodCategoryId}, '%') + + + AND a.food_category_group_name LIKE CONCAT('%', #{param.foodCategoryGroupName}, '%') + + + AND a.food_category_key LIKE CONCAT('%', #{param.foodCategoryKey}, '%') + + + AND a.action LIKE CONCAT('%', #{param.action}, '%') + + + AND a.settlement_proportion LIKE CONCAT('%', #{param.settlementProportion}, '%') + + + AND a.is_active = #{param.isActive} + + + AND a.is_batching = #{param.isBatching} + + + AND a.is_single_sale = #{param.isSingleSale} + + + AND a.sort_index = #{param.sortIndex} + + + AND a.ads_id = #{param.adsId} + + + AND a.shop_id LIKE CONCAT('%', #{param.shopId}, '%') + + + AND a.image LIKE CONCAT('%', #{param.image}, '%') + + + AND a.content LIKE CONCAT('%', #{param.content}, '%') + + + 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} + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/apps/mapper/xml/HualalaFoodMapper.xml b/src/main/java/com/gxwebsoft/apps/mapper/xml/HualalaFoodMapper.xml new file mode 100644 index 0000000..0e56981 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/mapper/xml/HualalaFoodMapper.xml @@ -0,0 +1,335 @@ + + + + + + + SELECT a.* + FROM apps_hualala_food a + + + AND a.id = #{param.id} + + + AND a.food_id LIKE CONCAT('%', #{param.foodId}, '%') + + + AND a.food_key LIKE CONCAT('%', #{param.foodKey}, '%') + + + AND a.group_id LIKE CONCAT('%', #{param.groupId}, '%') + + + AND a.shop_id LIKE CONCAT('%', #{param.shopId}, '%') + + + AND a.food_count LIKE CONCAT('%', #{param.foodCount}, '%') + + + AND a.food_category_id LIKE CONCAT('%', #{param.foodCategoryId}, '%') + + + AND a.food_category_key LIKE CONCAT('%', #{param.foodCategoryKey}, '%') + + + AND a.food_category_name LIKE CONCAT('%', #{param.foodCategoryName}, '%') + + + AND a.food_online_category_id LIKE CONCAT('%', #{param.foodOnlineCategoryId}, '%') + + + AND a.food_online_category_key LIKE CONCAT('%', #{param.foodOnlineCategoryKey}, '%') + + + AND a.food_online_category_name LIKE CONCAT('%', #{param.foodOnlineCategoryName}, '%') + + + AND a.is_batching = #{param.isBatching} + + + AND a.is_single_sale = #{param.isSingleSale} + + + AND a.food_subject_key LIKE CONCAT('%', #{param.foodSubjectKey}, '%') + + + AND a.department_key_lst LIKE CONCAT('%', #{param.departmentKeyLst}, '%') + + + AND a.batching_food_category_key LIKE CONCAT('%', #{param.batchingFoodCategoryKey}, '%') + + + AND a.food_name LIKE CONCAT('%', #{param.foodName}, '%') + + + AND a.food_code LIKE CONCAT('%', #{param.foodCode}, '%') + + + AND a.food_alias_name LIKE CONCAT('%', #{param.foodAliasName}, '%') + + + AND a.food_mnemonic_code LIKE CONCAT('%', #{param.foodMnemonicCode}, '%') + + + AND a.is_discount = #{param.isDiscount} + + + AND a.is_comments = #{param.isComments} + + + AND a.is_active = #{param.isActive} + + + AND a.is_open = #{param.isOpen} + + + AND a.is_set_food = #{param.isSetFood} + + + AND a.set_food_detail_json LIKE CONCAT('%', #{param.setFoodDetailJson}, '%') + + + AND a.is_temp_food = #{param.isTempFood} + + + AND a.units LIKE CONCAT('%', #{param.units}, '%') + + + AND a.py LIKE CONCAT('%', #{param.py}, '%') + + + AND a.min_order_count LIKE CONCAT('%', #{param.minOrderCount}, '%') + + + AND a.taste_list LIKE CONCAT('%', #{param.tasteList}, '%') + + + AND a.taste_group_list LIKE CONCAT('%', #{param.tasteGroupList}, '%') + + + AND a.making_method_list LIKE CONCAT('%', #{param.makingMethodList}, '%') + + + AND a.making_method_group_list LIKE CONCAT('%', #{param.makingMethodGroupList}, '%') + + + AND a.is_specialty = #{param.isSpecialty} + + + AND a.is_recommend = #{param.isRecommend} + + + AND a.is_news = #{param.isNews} + + + AND a.hot_tag LIKE CONCAT('%', #{param.hotTag}, '%') + + + AND a.sales_count LIKE CONCAT('%', #{param.salesCount}, '%') + + + AND a.is_need_confirm_food_number = #{param.isNeedConfirmFoodNumber} + + + AND a.takeout_packaging_fee LIKE CONCAT('%', #{param.takeoutPackagingFee}, '%') + + + AND a.increment_unit LIKE CONCAT('%', #{param.incrementUnit}, '%') + + + AND a.takeaway_tag LIKE CONCAT('%', #{param.takeawayTag}, '%') + + + AND a.working_lunch_tag LIKE CONCAT('%', #{param.workingLunchTag}, '%') + + + AND a.ads_id LIKE CONCAT('%', #{param.adsId}, '%') + + + AND a.imge_path LIKE CONCAT('%', #{param.imgePath}, '%') + + + AND a.is_has_image = #{param.isHasImage} + + + AND a.image_hwp LIKE CONCAT('%', #{param.imageHwp}, '%') + + + AND a.star_level LIKE CONCAT('%', #{param.starLevel}, '%') + + + AND a.food_tag_ids LIKE CONCAT('%', #{param.foodTagIds}, '%') + + + AND a.parent_food_id LIKE CONCAT('%', #{param.parentFoodId}, '%') + + + AND a.food_en_name LIKE CONCAT('%', #{param.foodEnName}, '%') + + + AND a.is_auto_add = #{param.isAutoAdd} + + + AND a.is_can_refund = #{param.isCanRefund} + + + AND a.set_person = #{param.setPerson} + + + AND a.taste_is_required = #{param.tasteIsRequired} + + + AND a.taste_is_multiple = #{param.tasteIsMultiple} + + + AND a.making_method_is_required = #{param.makingMethodIsRequired} + + + AND a.making_method_is_multiple = #{param.makingMethodIsMultiple} + + + AND a.init_click_amount LIKE CONCAT('%', #{param.initClickAmount}, '%') + + + AND a.actual_click_amount LIKE CONCAT('%', #{param.actualClickAmount}, '%') + + + AND a.recent_click_amount LIKE CONCAT('%', #{param.recentClickAmount}, '%') + + + AND a.click_alert_mess LIKE CONCAT('%', #{param.clickAlertMess}, '%') + + + AND a.source_food_id LIKE CONCAT('%', #{param.sourceFoodId}, '%') + + + AND a.sales_commission LIKE CONCAT('%', #{param.salesCommission}, '%') + + + AND a.food_key_element_lst LIKE CONCAT('%', #{param.foodKeyElementLst}, '%') + + + AND a.food_sort_index LIKE CONCAT('%', #{param.foodSortIndex}, '%') + + + AND a.action_time LIKE CONCAT('%', #{param.actionTime}, '%') + + + AND a.food_subject_name LIKE CONCAT('%', #{param.foodSubjectName}, '%') + + + AND a.food_subject_code LIKE CONCAT('%', #{param.foodSubjectCode}, '%') + + + AND a.department_id LIKE CONCAT('%', #{param.departmentId}, '%') + + + AND a.department_key LIKE CONCAT('%', #{param.departmentKey}, '%') + + + AND a.popularity LIKE CONCAT('%', #{param.popularity}, '%') + + + AND a.detail_split LIKE CONCAT('%', #{param.detailSplit}, '%') + + + AND a.batching_is_food_number_rate LIKE CONCAT('%', #{param.batchingIsFoodNumberRate}, '%') + + + AND a.food_category_code LIKE CONCAT('%', #{param.foodCategoryCode}, '%') + + + AND a.food_category_en_name LIKE CONCAT('%', #{param.foodCategoryEnName}, '%') + + + AND a.food_category_group_name LIKE CONCAT('%', #{param.foodCategoryGroupName}, '%') + + + AND a.special_price LIKE CONCAT('%', #{param.specialPrice}, '%') + + + AND a.special_price2 LIKE CONCAT('%', #{param.specialPrice2}, '%') + + + AND a.special_price3 LIKE CONCAT('%', #{param.specialPrice3}, '%') + + + AND a.special_price4 LIKE CONCAT('%', #{param.specialPrice4}, '%') + + + AND a.special_price5 LIKE CONCAT('%', #{param.specialPrice5}, '%') + + + AND a.special_price6 LIKE CONCAT('%', #{param.specialPrice6}, '%') + + + AND a.online_wm_price LIKE CONCAT('%', #{param.onlineWmPrice}, '%') + + + AND a.tag_ids LIKE CONCAT('%', #{param.tagIds}, '%') + + + AND a.tag_names LIKE CONCAT('%', #{param.tagNames}, '%') + + + AND a.gift_item_id LIKE CONCAT('%', #{param.giftItemId}, '%') + + + AND a.gift_valid_period LIKE CONCAT('%', #{param.giftValidPeriod}, '%') + + + AND a.description LIKE CONCAT('%', #{param.description}, '%') + + + AND a.action LIKE CONCAT('%', #{param.action}, '%') + + + AND a.settlement_proportion LIKE CONCAT('%', #{param.settlementProportion}, '%') + + + AND a.sort_index = #{param.sortIndex} + + + AND a.image LIKE CONCAT('%', #{param.image}, '%') + + + AND a.content LIKE CONCAT('%', #{param.content}, '%') + + + 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} + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/apps/mapper/xml/HualalaMapper.xml b/src/main/java/com/gxwebsoft/apps/mapper/xml/HualalaMapper.xml new file mode 100644 index 0000000..83ff23d --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/mapper/xml/HualalaMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/src/main/java/com/gxwebsoft/apps/mapper/xml/HualalaShopMapper.xml b/src/main/java/com/gxwebsoft/apps/mapper/xml/HualalaShopMapper.xml new file mode 100644 index 0000000..ba77d82 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/mapper/xml/HualalaShopMapper.xml @@ -0,0 +1,98 @@ + + + + + + + SELECT a.* + FROM apps_hualala_shop a + + + AND a.shop_id = #{param.shopId} + + + AND a.shop_name LIKE CONCAT('%', #{param.shopName}, '%') + + + AND a.logo_url LIKE CONCAT('%', #{param.logoUrl}, '%') + + + AND a.shop_city LIKE CONCAT('%', #{param.shopCity}, '%') + + + AND a.shop_city_name LIKE CONCAT('%', #{param.shopCityName}, '%') + + + AND a.shop_open_time LIKE CONCAT('%', #{param.shopOpenTime}, '%') + + + AND a.shop_phone LIKE CONCAT('%', #{param.shopPhone}, '%') + + + AND a.acsp_type LIKE CONCAT('%', #{param.acspType}, '%') + + + AND a.action LIKE CONCAT('%', #{param.action}, '%') + + + AND a.action_time LIKE CONCAT('%', #{param.actionTime}, '%') + + + AND a.brand_id LIKE CONCAT('%', #{param.brandId}, '%') + + + AND a.brand_name LIKE CONCAT('%', #{param.brandName}, '%') + + + AND a.business_model LIKE CONCAT('%', #{param.businessModel}, '%') + + + AND a.image_path LIKE CONCAT('%', #{param.imagePath}, '%') + + + AND a.map_latitude_value_bai_du LIKE CONCAT('%', #{param.mapLatitudeValueBaiDu}, '%') + + + AND a.map_longitude_value_bai_du LIKE CONCAT('%', #{param.mapLongitudeValueBaiDu}, '%') + + + AND a.operation_mode = #{param.operationMode} + + + 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.customer_id = #{param.customerId} + + + AND a.create_time >= #{param.createTimeStart} + + + AND a.create_time <= #{param.createTimeEnd} + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/apps/mapper/xml/LinkMapper.xml b/src/main/java/com/gxwebsoft/apps/mapper/xml/LinkMapper.xml new file mode 100644 index 0000000..e16e103 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/mapper/xml/LinkMapper.xml @@ -0,0 +1,71 @@ + + + + + + + SELECT a.* + FROM apps_link a + + + AND a.link_id = #{param.linkId} + + + AND a.link_name LIKE CONCAT('%', #{param.linkName}, '%') + + + AND a.link_icon LIKE CONCAT('%', #{param.linkIcon}, '%') + + + AND a.link_path LIKE CONCAT('%', #{param.linkPath}, '%') + + + AND a.link_component LIKE CONCAT('%', #{param.linkComponent}, '%') + + + AND a.type LIKE CONCAT('%', #{param.type}, '%') + + + AND a.clicks = #{param.clicks} + + + 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.user_id = #{param.userId} + + + AND a.merchant_code = #{param.merchantCode} + + + AND a.create_time >= #{param.createTimeStart} + + + AND a.create_time <= #{param.createTimeEnd} + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/apps/mapper/xml/TestDataMapper.xml b/src/main/java/com/gxwebsoft/apps/mapper/xml/TestDataMapper.xml new file mode 100644 index 0000000..88d5d46 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/mapper/xml/TestDataMapper.xml @@ -0,0 +1,38 @@ + + + + + + + SELECT a.* + FROM apps_test_data a + + + AND a.id = #{param.id} + + + AND a.title LIKE CONCAT('%', #{param.title}, '%') + + + AND a.content LIKE CONCAT('%', #{param.content}, '%') + + + AND a.create_time >= #{param.createTimeStart} + + + AND a.create_time <= #{param.createTimeEnd} + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/apps/param/BcAgentParam.java b/src/main/java/com/gxwebsoft/apps/param/BcAgentParam.java new file mode 100644 index 0000000..2a660c3 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/param/BcAgentParam.java @@ -0,0 +1,41 @@ +package com.gxwebsoft.apps.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-04-24 19:25:59 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "BcAgentParam对象", description = "代报餐管理查询参数") +public class BcAgentParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "自增ID") + @QueryField(type = QueryType.EQ) + private Integer agentId; + + @ApiModelProperty(value = "用户ID") + @QueryField(type = QueryType.EQ) + private Integer userId; + + @ApiModelProperty(value = "工单ID") + @QueryField(type = QueryType.EQ) + private Integer parentId; + + @ApiModelProperty(value = "状态, 0待处理, 1已完成") + @QueryField(type = QueryType.EQ) + private Integer status; + +} diff --git a/src/main/java/com/gxwebsoft/apps/param/BcCookbookParam.java b/src/main/java/com/gxwebsoft/apps/param/BcCookbookParam.java new file mode 100644 index 0000000..0079279 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/param/BcCookbookParam.java @@ -0,0 +1,51 @@ +package com.gxwebsoft.apps.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-05-05 14:56:54 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "BcCookbookParam对象", description = "常用菜谱查询参数") +public class BcCookbookParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "自增ID") + @QueryField(type = QueryType.EQ) + private Integer cookbookId; + + @ApiModelProperty(value = "菜品计划") + @QueryField(type = QueryType.EQ) + private Integer planId; + + @ApiModelProperty(value = "餐段 早餐 午餐 晚餐") + private String period; + + @ApiModelProperty(value = "状态, 0待发布, 1已发布") + @QueryField(type = QueryType.EQ) + private Integer status; + + @ApiModelProperty(value = "备注") + private String comments; + + @ApiModelProperty(value = "发布人") + @QueryField(type = QueryType.EQ) + private Integer userId; + + @ApiModelProperty(value = "是否删除, 0否, 1是") + @QueryField(type = QueryType.EQ) + private Integer deleted; + +} diff --git a/src/main/java/com/gxwebsoft/apps/param/BcEquipmentParam.java b/src/main/java/com/gxwebsoft/apps/param/BcEquipmentParam.java new file mode 100644 index 0000000..d787b36 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/param/BcEquipmentParam.java @@ -0,0 +1,66 @@ +package com.gxwebsoft.apps.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-05-02 10:34:40 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "BcEquipmentParam对象", description = "报餐设备管理查询参数") +public class BcEquipmentParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "设备ID") + @QueryField(type = QueryType.EQ) + private Integer bcEquipmentId; + + @ApiModelProperty(value = "设备名称") + private String equipmentName; + + @ApiModelProperty(value = "设备编码") + private String equipmentCode; + + @ApiModelProperty(value = "所属档口") + private Integer gear; + + @ApiModelProperty(value = "二维码") + private String qrcode; + + @ApiModelProperty(value = "商品详情") + private String content; + + @ApiModelProperty(value = "员工工号") + @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; + + @ApiModelProperty(value = "商户编码") + private String merchantCode; + +} diff --git a/src/main/java/com/gxwebsoft/apps/param/BcExportParam.java b/src/main/java/com/gxwebsoft/apps/param/BcExportParam.java new file mode 100644 index 0000000..4c9b1bb --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/param/BcExportParam.java @@ -0,0 +1,98 @@ +package com.gxwebsoft.apps.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-06-01 21:47:02 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "BcExportParam对象", description = "报餐统计导出查询参数") +public class BcExportParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "自增ID") + @QueryField(type = QueryType.EQ) + private Integer exportId; + + @ApiModelProperty(value = "机构名称") + private String organizationName; + + @ApiModelProperty(value = "实际消费的金额(不含退款)") + @QueryField(type = QueryType.EQ) + private BigDecimal expendMoney; + + @ApiModelProperty(value = "早餐报餐次数") + @QueryField(type = QueryType.EQ) + private Integer breakfastPost; + + @ApiModelProperty(value = "早餐签到次数") + @QueryField(type = QueryType.EQ) + private Integer breakfastSign; + + @ApiModelProperty(value = "午餐报餐次数") + @QueryField(type = QueryType.EQ) + private Integer lunchPost; + + @ApiModelProperty(value = "午餐签到次数") + @QueryField(type = QueryType.EQ) + private Integer lunchSign; + + @ApiModelProperty(value = "晚餐报餐次数") + @QueryField(type = QueryType.EQ) + private Integer dinnerPost; + + @ApiModelProperty(value = "晚餐签到次数") + @QueryField(type = QueryType.EQ) + private Integer dinnerSign; + + @ApiModelProperty(value = "商品价格(单价)") + @QueryField(type = QueryType.EQ) + private BigDecimal goodsPrice; + + @ApiModelProperty(value = "发货时间") + private String deliveryTime; + + @ApiModelProperty(value = "起始时间") + private String deliveryTimeStart; + + @ApiModelProperty(value = "结束时间") + private String deliveryTimeEnd; + + @ApiModelProperty(value = "状态, 0待发布, 1已发布") + @QueryField(type = QueryType.EQ) + private Integer status; + + @ApiModelProperty(value = "备注") + private String comments; + + @ApiModelProperty(value = "订单号") + @QueryField(type = QueryType.EQ) + private Integer orderId; + + @ApiModelProperty(value = "机构id") + @QueryField(type = QueryType.EQ) + private Integer organizationId; + + @ApiModelProperty(value = "发布人") + @QueryField(type = QueryType.EQ) + private Integer userId; + + @ApiModelProperty(value = "是否删除, 0否, 1是") + @QueryField(type = QueryType.EQ) + private Integer deleted; + +} diff --git a/src/main/java/com/gxwebsoft/apps/param/BcFoodParam.java b/src/main/java/com/gxwebsoft/apps/param/BcFoodParam.java new file mode 100644 index 0000000..73f43e7 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/param/BcFoodParam.java @@ -0,0 +1,51 @@ +package com.gxwebsoft.apps.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-04-27 17:59:40 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "BcFoodParam对象", description = "发布菜品明细查询参数") +public class BcFoodParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "自增ID") + @QueryField(type = QueryType.EQ) + private Integer bcFoodId; + + @ApiModelProperty(value = "菜品计划") + @QueryField(type = QueryType.EQ) + private Integer planId; + + @ApiModelProperty(value = "餐段 早餐 午餐 晚餐") + private String period; + + @ApiModelProperty(value = "状态, 0待发布, 1已发布") + @QueryField(type = QueryType.EQ) + private Integer status; + + @ApiModelProperty(value = "备注") + private String comments; + + @ApiModelProperty(value = "发布人") + @QueryField(type = QueryType.EQ) + private Integer userId; + + @ApiModelProperty(value = "是否删除, 0否, 1是") + @QueryField(type = QueryType.EQ) + private Integer deleted; + +} diff --git a/src/main/java/com/gxwebsoft/apps/param/BcPlanParam.java b/src/main/java/com/gxwebsoft/apps/param/BcPlanParam.java new file mode 100644 index 0000000..001ba13 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/param/BcPlanParam.java @@ -0,0 +1,69 @@ +package com.gxwebsoft.apps.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-04-27 17:59:40 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "BcPlanParam对象", description = "菜品发布管理查询参数") +public class BcPlanParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "自增ID") + @QueryField(type = QueryType.EQ) + private Integer bcPlanId; + + @ApiModelProperty(value = "发布日期") + private String dayTime; + + @ApiModelProperty(value = "星期几") + private Integer week; + + @ApiModelProperty(value = "发布类型") + private String type; + + @ApiModelProperty(value = "餐段") + private String period; + + @ApiModelProperty(value = "多天菜品是否重复") + private Integer isRepeat; + + @ApiModelProperty(value = "菜品分类") + private Integer categoryId; + + @ApiModelProperty(value = "失效时间") + private String expirationTime; + + @ApiModelProperty(value = "状态, 0待发布, 1已发布") + @QueryField(type = QueryType.EQ) + private Integer status; + + @ApiModelProperty(value = "备注") + private String comments; + + @ApiModelProperty(value = "发布人") + @QueryField(type = QueryType.EQ) + private Integer userId; + + @ApiModelProperty(value = "是否删除, 0否, 1是") + @QueryField(type = QueryType.EQ) + private Integer deleted; + + @ApiModelProperty(value = "使用往日菜单") + @QueryField(type = QueryType.EQ) + private String oldTime; + +} diff --git a/src/main/java/com/gxwebsoft/apps/param/BcTemporaryParam.java b/src/main/java/com/gxwebsoft/apps/param/BcTemporaryParam.java new file mode 100644 index 0000000..9c32893 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/param/BcTemporaryParam.java @@ -0,0 +1,63 @@ +package com.gxwebsoft.apps.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; + +import java.util.Date; + +/** + * 临时报餐管理查询参数 + * + * @author 科技小王子 + * @since 2023-04-24 21:47:57 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "BcTemporaryParam对象", description = "临时报餐管理查询参数") +public class BcTemporaryParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "自增ID") + @QueryField(type = QueryType.EQ) + private Integer temporaryId; + + @ApiModelProperty(value = "用户ID") + @QueryField(type = QueryType.EQ) + private Integer userId; + + @ApiModelProperty(value = "工单ID") + @QueryField(type = QueryType.EQ) + private Integer parentId; + + @ApiModelProperty(value = "申请状态") + @QueryField(type = QueryType.EQ) + private Integer applyStatus; + + @ApiModelProperty(value = "状态, 0待处理, 1已完成") + @QueryField(type = QueryType.EQ) + private Integer status; + + @ApiModelProperty(value = "备注") + private String comments; + + @ApiModelProperty(value = "报餐日期") + private Date dayTime; + + @ApiModelProperty(value = "是否删除, 0否, 1是") + @QueryField(type = QueryType.EQ) + private Integer deleted; + + @ApiModelProperty(value = "失效时间") + private Date expirationTime; + + @ApiModelProperty(value = "昵称") + private String nickname; + +} diff --git a/src/main/java/com/gxwebsoft/apps/param/CashierParam.java b/src/main/java/com/gxwebsoft/apps/param/CashierParam.java new file mode 100644 index 0000000..7413dc5 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/param/CashierParam.java @@ -0,0 +1,87 @@ +package com.gxwebsoft.apps.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; + +import java.math.BigDecimal; + +/** + * 海牛收银台记录表查询参数 + * + * @author WebSoft + * @since 2022-11-18 11:47:09 + */ +@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 cashierId; + + @ApiModelProperty(value = "客户ID") + private String buyerId; + + @ApiModelProperty(value = "设备ID") + private String merchantCode; + + @ApiModelProperty(value = "支付标识") + private String code; + + @ApiModelProperty(value = "返回消息") + private String msg; + + @ApiModelProperty(value = "客户端交易订单编号") + private String outTradeNo; + + @ApiModelProperty(value = "数量") + private String amount; + + @ApiModelProperty(value = "支付时间") + private String payTime; + + @ApiModelProperty(value = "支付方式") + private String payType; + + @ApiModelProperty(value = "交易金额") + @QueryField(type = QueryType.EQ) + private BigDecimal totalAmount; + + @ApiModelProperty(value = "实收金额") + @QueryField(type = QueryType.EQ) + private BigDecimal receiptAmount; + + @ApiModelProperty(value = "第三方交易手续费") + @QueryField(type = QueryType.EQ) + private BigDecimal feeAmount; + + @ApiModelProperty(value = "第三方结算金额") + @QueryField(type = QueryType.EQ) + private BigDecimal settleAmount; + + @ApiModelProperty(value = "商户名称") + private String merchantName; + + @ApiModelProperty(value = "手机号码") + private String mobile; + + @ApiModelProperty(value = "订单备注") + private String orderRemark; + + @ApiModelProperty(value = "订单状态") + private String orderStatus; + + @ApiModelProperty(value = "是否删除, 0否, 1是") + @QueryField(type = QueryType.EQ) + private Integer deleted; + +} diff --git a/src/main/java/com/gxwebsoft/apps/param/EquipmentAlarmParam.java b/src/main/java/com/gxwebsoft/apps/param/EquipmentAlarmParam.java new file mode 100644 index 0000000..2705b6d --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/param/EquipmentAlarmParam.java @@ -0,0 +1,65 @@ +package com.gxwebsoft.apps.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 2022-12-01 23:49:44 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "EquipmentAlarmParam对象", description = "故障报警记录查询参数") +public class EquipmentAlarmParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "记录ID") + @QueryField(type = QueryType.EQ) + private Integer id; + + @ApiModelProperty(value = "设备编码") + private String equipmentCode; + + @ApiModelProperty(value = "报警类型") + private String alarmType; + + @ApiModelProperty(value = "备注") + private String comments; + + @ApiModelProperty(value = "处理时间") + private String handleTime; + + @ApiModelProperty(value = "用户ID") + @QueryField(type = QueryType.EQ) + private Integer userId; + + @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 = "商户编码") + private String merchantCode; + + @ApiModelProperty(value = "所属商户名称") + @TableField(exist = false) + private String merchantName; + +} diff --git a/src/main/java/com/gxwebsoft/apps/param/EquipmentFaultParam.java b/src/main/java/com/gxwebsoft/apps/param/EquipmentFaultParam.java new file mode 100644 index 0000000..46f6368 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/param/EquipmentFaultParam.java @@ -0,0 +1,68 @@ +package com.gxwebsoft.apps.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 2022-12-01 18:40:25 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "EquipmentFaultParam对象", description = "故障电池查询参数") +public class EquipmentFaultParam 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 equipmentCode; + + @ApiModelProperty(value = "故障原因") + private String faultType; + + @ApiModelProperty(value = "商品封面图") + private String image; + + @ApiModelProperty(value = "备注") + private String comments; + + @ApiModelProperty(value = "处理时间") + private String handleTime; + + @ApiModelProperty(value = "用户ID") + @QueryField(type = QueryType.EQ) + private Integer userId; + + @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 = "商户编码") + private String merchantCode; + + @ApiModelProperty(value = "所属商户名称") + @QueryField(type = QueryType.EQ) + private String merchantName; + +} diff --git a/src/main/java/com/gxwebsoft/apps/param/EquipmentGoodsParam.java b/src/main/java/com/gxwebsoft/apps/param/EquipmentGoodsParam.java new file mode 100644 index 0000000..1aaf3a1 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/param/EquipmentGoodsParam.java @@ -0,0 +1,114 @@ +package com.gxwebsoft.apps.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-02-28 22:40:50 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "EquipmentGoodsParam对象", description = "电池管理记录表查询参数") +public class EquipmentGoodsParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "商品ID") + @QueryField(type = QueryType.EQ) + private Integer goodsId; + + @ApiModelProperty(value = "商品名称") + @QueryField(type = QueryType.LIKE) + private String goodsName; + + @ApiModelProperty(value = "下单类型") + private String equipmentCategory; + + @ApiModelProperty(value = "商品封面图") + private String image; + + @ApiModelProperty(value = "二维码") + private String qrcode; + + @ApiModelProperty(value = "分类ID") + @QueryField(type = QueryType.EQ) + private Integer categoryId; + + @ApiModelProperty(value = "电池型号") + private String batteryModel; + + @ApiModelProperty(value = "商品详情") + private String content; + + @ApiModelProperty(value = "商品卖点") + @QueryField(type = QueryType.LIKE) + private String sellingPoint; + + @ApiModelProperty(value = "电池租金") + @QueryField(type = QueryType.EQ) + private BigDecimal batteryRent; + + @ApiModelProperty(value = "电池价格") + @QueryField(type = QueryType.EQ) + private BigDecimal batteryPrice; + + @ApiModelProperty(value = "电池押金") + @QueryField(type = QueryType.EQ) + private BigDecimal batteryDeposit; + + @ApiModelProperty(value = "电池保险") + @QueryField(type = QueryType.EQ) + private BigDecimal batteryInsurance; + + @ApiModelProperty(value = "用户ID") + @QueryField(type = QueryType.EQ) + private Integer userId; + + @ApiModelProperty(value = "首付款") + private BigDecimal downPayment; + + @ApiModelProperty(value = "分期期数") + private BigDecimal periods; + + @ApiModelProperty(value = "每期还款") + private BigDecimal repayment; + + @ApiModelProperty(value = "手续费") + private BigDecimal serviceCharges; + + @ApiModelProperty(value = "分期方式") + private Integer periodsType; + + @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 merchantName; + +} diff --git a/src/main/java/com/gxwebsoft/apps/param/EquipmentOrderGoodsParam.java b/src/main/java/com/gxwebsoft/apps/param/EquipmentOrderGoodsParam.java new file mode 100644 index 0000000..218ba59 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/param/EquipmentOrderGoodsParam.java @@ -0,0 +1,125 @@ +package com.gxwebsoft.apps.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; + +import java.math.BigDecimal; + +/** + * 电池管理记录表查询参数 + * + * @author 科技小王子 + * @since 2023-05-11 19:10:13 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "EquipmentOrderGoodsParam对象", description = "电池管理记录表查询参数") +public class EquipmentOrderGoodsParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "商品ID") + @QueryField(type = QueryType.EQ) + private Integer orderGoodsId; + + @ApiModelProperty(value = "商品名称") + private String goodsName; + + @ApiModelProperty(value = "下单类型") + private String equipmentCategory; + + @ApiModelProperty(value = "商品封面图") + private String image; + + @ApiModelProperty(value = "二维码") + private String qrcode; + + @ApiModelProperty(value = "分类ID") + @QueryField(type = QueryType.EQ) + private Integer categoryId; + + @ApiModelProperty(value = "电池型号") + private String batteryModel; + + @ApiModelProperty(value = "商品卖点") + private String sellingPoint; + + @ApiModelProperty(value = "库存总量") + @QueryField(type = QueryType.EQ) + private Integer stockTotal; + + @ApiModelProperty(value = "商品详情") + private String content; + + @ApiModelProperty(value = "电池租金") + @QueryField(type = QueryType.EQ) + private BigDecimal batteryRent; + + @ApiModelProperty(value = "电池价格") + @QueryField(type = QueryType.EQ) + private BigDecimal batteryPrice; + + @ApiModelProperty(value = "电池押金") + @QueryField(type = QueryType.EQ) + private BigDecimal batteryDeposit; + + @ApiModelProperty(value = "电池保险") + @QueryField(type = QueryType.EQ) + private BigDecimal batteryInsurance; + + @ApiModelProperty(value = "首付款") + @QueryField(type = QueryType.EQ) + private BigDecimal downPayment; + + @ApiModelProperty(value = "分期期数") + @QueryField(type = QueryType.EQ) + private BigDecimal periods; + + @ApiModelProperty(value = "分期还款") + @QueryField(type = QueryType.EQ) + private BigDecimal repayment; + + @ApiModelProperty(value = "手续费") + @QueryField(type = QueryType.EQ) + private BigDecimal serviceCharges; + + @ApiModelProperty(value = "分期方式 10按周 20按月") + @QueryField(type = QueryType.EQ) + private Integer periodsType; + + @ApiModelProperty(value = "订单编号") + @QueryField(type = QueryType.EQ) + private Integer orderId; + + @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; + + @ApiModelProperty(value = "商户编码") + private String merchantCode; + + @ApiModelProperty(value = "旧商品ID") + private Integer goodsId; + +} diff --git a/src/main/java/com/gxwebsoft/apps/param/EquipmentOrderParam.java b/src/main/java/com/gxwebsoft/apps/param/EquipmentOrderParam.java new file mode 100644 index 0000000..865e3eb --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/param/EquipmentOrderParam.java @@ -0,0 +1,227 @@ +package com.gxwebsoft.apps.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; + +import java.math.BigDecimal; + +/** + * 订单记录表查询参数 + * + * @author 科技小王子 + * @since 2023-04-14 21:24:31 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "EquipmentOrderParam对象", description = "订单记录表查询参数") +public class EquipmentOrderParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "订单ID") + @QueryField(type = QueryType.EQ) + private Integer orderId; + + @ApiModelProperty(value = "订单标题") + private String subject; + + @ApiModelProperty(value = "订单号") + private String orderNo; + + @ApiModelProperty(value = "商品总金额(不含优惠折扣)") + @QueryField(type = QueryType.EQ) + private BigDecimal totalPrice; + + @ApiModelProperty(value = "订单金额(含优惠折扣)") + @QueryField(type = QueryType.EQ) + private BigDecimal orderPrice; + + @ApiModelProperty(value = "优惠券ID") + @QueryField(type = QueryType.EQ) + private Integer couponId; + + @ApiModelProperty(value = "优惠券抵扣金额") + @QueryField(type = QueryType.EQ) + private BigDecimal couponMoney; + + @ApiModelProperty(value = "积分抵扣金额") + @QueryField(type = QueryType.EQ) + private BigDecimal pointsMoney; + + @ApiModelProperty(value = "积分抵扣数量") + @QueryField(type = QueryType.EQ) + private Integer pointsNum; + + @ApiModelProperty(value = "实际付款金额(包含运费)") + @QueryField(type = QueryType.EQ) + private BigDecimal payPrice; + + @ApiModelProperty(value = "第三方支付实收金额") + @QueryField(type = QueryType.EQ) + private BigDecimal receiptAmount; + + @ApiModelProperty(value = "后台修改的订单金额(差价)") + @QueryField(type = QueryType.EQ) + private BigDecimal updatePrice; + + @ApiModelProperty(value = "买家留言") + private String buyerRemark; + + @ApiModelProperty(value = "支付方式(废弃)") + @QueryField(type = QueryType.EQ) + private Integer payType; + + @ApiModelProperty(value = "支付方式（余额10/微信20/支付宝30/通联支付40/其他支付50）") + private String payMethod; + + @ApiModelProperty(value = "付款状态(10未付款 20已付款)") + @QueryField(type = QueryType.EQ) + private Integer payStatus; + + @ApiModelProperty(value = "付款时间") + private String payTime; + + @ApiModelProperty(value = "第三方交易记录ID") + private String tradeId; + + @ApiModelProperty(value = "配送方式(10快递配送 20门店自提)") + @QueryField(type = QueryType.EQ) + private Integer deliveryType; + + @ApiModelProperty(value = "自提门店ID") + @QueryField(type = QueryType.EQ) + private Integer extractShopId; + + @ApiModelProperty(value = "核销店员ID") + @QueryField(type = QueryType.EQ) + private Integer extractClerkId; + + @ApiModelProperty(value = "运费金额") + @QueryField(type = QueryType.EQ) + private BigDecimal expressPrice; + + @ApiModelProperty(value = "物流公司ID (废弃)") + @QueryField(type = QueryType.EQ) + private Integer expressId; + + @ApiModelProperty(value = "物流单号 (废弃)") + private String expressNo; + + @ApiModelProperty(value = "发货状态(10未发货 20已发货 30部分发货)") + @QueryField(type = QueryType.EQ) + private Integer deliveryStatus; + + @ApiModelProperty(value = "发货时间") + private String deliveryTime; + + @ApiModelProperty(value = "收货状态(10未收货 20已收货)") + @QueryField(type = QueryType.EQ) + private Integer receiptStatus; + + @ApiModelProperty(value = "收货时间") + private String receiptTime; + + @ApiModelProperty(value = "订单状态(10进行中 20取消 21待取消 30已完成)") + @QueryField(type = QueryType.EQ) + private Integer orderStatus; + + @ApiModelProperty(value = "赠送的积分数量") + @QueryField(type = QueryType.EQ) + private Integer pointsBonus; + + @ApiModelProperty(value = "商家备注") + private String merchantRemark; + + @ApiModelProperty(value = "订单是否已结算(0未结算 1已结算)") + @QueryField(type = QueryType.EQ) + private Integer isSettled; + + @ApiModelProperty(value = "续租订单的关联单号") + @QueryField(type = QueryType.EQ) + private Integer rentOrderId; + + @ApiModelProperty(value = "微信支付交易号(废弃)") + private String transactionId; + + @ApiModelProperty(value = "是否已评价(0否 1是)") + @QueryField(type = QueryType.EQ) + private Integer isComment; + + @ApiModelProperty(value = "订单来源(10普通订单 20砍价订单 30秒杀订单)") + @QueryField(type = QueryType.EQ) + private Integer orderSource; + + @ApiModelProperty(value = "来源记录ID") + @QueryField(type = QueryType.EQ) + private Integer orderSourceId; + + @ApiModelProperty(value = "来源记录的参数 (json格式)") + private String orderSourceData; + + @ApiModelProperty(value = "电池租金") + @QueryField(type = QueryType.EQ) + private BigDecimal batteryRent; + + @ApiModelProperty(value = "电池押金") + @QueryField(type = QueryType.EQ) + private BigDecimal batteryDeposit; + + @ApiModelProperty(value = "保险") + @QueryField(type = QueryType.EQ) + private BigDecimal batteryInsurance; + + @ApiModelProperty(value = "购买月份数量") + @QueryField(type = QueryType.EQ) + private Integer month; + + @ApiModelProperty(value = "服务到期时间") + private String expirationTime; + + @ApiModelProperty(value = "来源客户端 (APP、H5、小程序等)") + private String platform; + + @ApiModelProperty(value = "是否续费订单") + @QueryField(type = QueryType.EQ) + private Integer isRenew; + + @ApiModelProperty(value = "用户ID") + @QueryField(type = QueryType.EQ) + private Integer userId; + + @ApiModelProperty(value = "所属门店ID") + @QueryField(type = QueryType.EQ) + private Integer shopId; + + @ApiModelProperty(value = "商品ID") + @QueryField(type = QueryType.EQ) + private Integer goodsId; + + @ApiModelProperty(value = "电池商品ID") + @QueryField(type = QueryType.EQ) + private Integer equipmentId; + + @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/src/main/java/com/gxwebsoft/apps/param/EquipmentParam.java b/src/main/java/com/gxwebsoft/apps/param/EquipmentParam.java new file mode 100644 index 0000000..4500138 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/param/EquipmentParam.java @@ -0,0 +1,127 @@ +package com.gxwebsoft.apps.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 2022-11-30 02:11:16 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "EquipmentParam对象", description = "设备管理查询参数") +public class EquipmentParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "设备ID") + @QueryField(type = QueryType.EQ) + private Integer equipmentId; + + @ApiModelProperty(value = "设备名称") + private String equipmentName; + + @ApiModelProperty(value = "设备分类") + private String equipmentCategory; + + @ApiModelProperty(value = "设备编码") + private String equipmentCode; + + @ApiModelProperty(value = "商品分类ID") + @QueryField(type = QueryType.EQ) + private Integer categoryId; + + @ApiModelProperty(value = "头像") + private String equipmentAvatar; + + @ApiModelProperty(value = "电池型号") + private String batteryModel; + + @ApiModelProperty(value = "BMS") + private String bms; + + @ApiModelProperty(value = "商品详情") + private String content; + + @ApiModelProperty(value = "是否激活") + private String isCtive; + + @ApiModelProperty(value = "工作状态") + private String workingStatus; + + @ApiModelProperty(value = "租赁状态") + private String leaseStatus; + + @ApiModelProperty(value = "电池状态") + private String batteryStatus; + + @ApiModelProperty(value = "电池电量") + private String batteryPower; + + @ApiModelProperty(value = "是否在线") + private String isOnline; + + @ApiModelProperty(value = "总电压") + private String totalVoltage; + + @ApiModelProperty(value = "BMS板供应商") + private String bmsBrand; + + @ApiModelProperty(value = "剩余容量") + private String surplusCapacity; + + @ApiModelProperty(value = "ICCID") + private String iccid; + + @ApiModelProperty(value = "设备激活时间") + private String ctiveTime; + + @ApiModelProperty(value = "电池出厂时间") + private String batteryDeliveryTime; + + @ApiModelProperty(value = "绑定的订单") + @QueryField(type = QueryType.EQ) + private Integer orderId; + + @ApiModelProperty(value = "用户ID") + @QueryField(type = QueryType.EQ) + private Integer userId; + + @ApiModelProperty(value = "排序(数字越小越靠前)") + @QueryField(type = QueryType.EQ) + private Integer sortNumber; + + @ApiModelProperty(value = "备注") + @QueryField(type = QueryType.LIKE) + 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 = "所属商户ID") + @TableField(exist = false) + private Integer merchantId; + + @ApiModelProperty(value = "商户编号") + @QueryField(type = QueryType.EQ) + private String merchantCode; + + @ApiModelProperty(value = "所属商户名称") + @QueryField(type = QueryType.EQ) + private String merchantName; + +} diff --git a/src/main/java/com/gxwebsoft/apps/param/EquipmentRecordParam.java b/src/main/java/com/gxwebsoft/apps/param/EquipmentRecordParam.java new file mode 100644 index 0000000..c0cf3bb --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/param/EquipmentRecordParam.java @@ -0,0 +1,69 @@ +package com.gxwebsoft.apps.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 2022-12-03 01:23:53 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "EquipmentRecordParam对象", description = "前世今生查询参数") +public class EquipmentRecordParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "记录ID") + @QueryField(type = QueryType.EQ) + private Integer id; + + @ApiModelProperty(value = "设备编码") + private String equipmentCode; + + @ApiModelProperty(value = "事件类型") + private String eventType; + + @ApiModelProperty(value = "请求参数") + private String params; + + @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 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 = "商户编码") + @QueryField(type = QueryType.EQ) + private String merchantCode; + + @ApiModelProperty(value = "商户名称") + @QueryField(type = QueryType.LIKE) + private String merchantName; + +} diff --git a/src/main/java/com/gxwebsoft/apps/param/HualalaCardBenefitsParam.java b/src/main/java/com/gxwebsoft/apps/param/HualalaCardBenefitsParam.java new file mode 100644 index 0000000..a7b47a5 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/param/HualalaCardBenefitsParam.java @@ -0,0 +1,58 @@ +package com.gxwebsoft.apps.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-01-08 12:22:50 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "HualalaCardBenefitsParam对象", description = "会员权益查询参数") +public class HualalaCardBenefitsParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @QueryField(type = QueryType.EQ) + private Integer id; + + @ApiModelProperty(value = "会员等级名称") + private String cardLevelName; + + @ApiModelProperty(value = "名称") + private String name; + + @ApiModelProperty(value = "封面图") + private String image; + + @ApiModelProperty(value = "内容") + private String content; + + @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/src/main/java/com/gxwebsoft/apps/param/HualalaCardParam.java b/src/main/java/com/gxwebsoft/apps/param/HualalaCardParam.java new file mode 100644 index 0000000..399f08a --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/param/HualalaCardParam.java @@ -0,0 +1,130 @@ +package com.gxwebsoft.apps.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; + +import java.math.BigDecimal; + +/** + * 查询参数 + * + * @author 科技小王子 + * @since 2023-01-08 12:22:50 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "HualalaCardParam对象", description = "查询参数") +public class HualalaCardParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @QueryField(type = QueryType.EQ) + private Integer id; + + @ApiModelProperty(value = "groupID") + private String groupId; + + @ApiModelProperty(value = "shopID") + private String shopId; + + @ApiModelProperty(value = "网速会员id") + @QueryField(type = QueryType.EQ) + private Integer userId; + + @ApiModelProperty(value = "会员卡ID") + private String cardId; + + private String cardTypeId; + + @ApiModelProperty(value = "会员卡等级ID") + private String cardLevelId; + + @ApiModelProperty(value = "会员卡等级名称") + private String cardLevelName; + + @ApiModelProperty(value = "卡状态　10：正常　20：挂失中　30：冻结　40：注销（作废）50：已过期") + private String cardStatus; + + private String customerId; + + @ApiModelProperty(value = "会员卡入会店铺字段") + private String createShopId; + + @ApiModelProperty(value = "入会店铺名称") + private String createShopName; + + @ApiModelProperty(value = "卡号") + private String cardNo; + + @ApiModelProperty(value = "姓名") + private String customerName; + + @ApiModelProperty(value = " 手机号") + private String customerMobile; + + @ApiModelProperty(value = "性别 0：女 1：男 2：未知") + @QueryField(type = QueryType.EQ) + private Integer customerSex; + + @ApiModelProperty(value = "生日") + private String customerBirthday; + + @ApiModelProperty(value = "卡余额") + @QueryField(type = QueryType.EQ) + private BigDecimal cardBalance; + + @ApiModelProperty(value = "积分余额") + @QueryField(type = QueryType.EQ) + private BigDecimal pointBalance; + + @ApiModelProperty(value = "累计储值金额") + @QueryField(type = QueryType.EQ) + private BigDecimal saveMoneyTotal; + + @ApiModelProperty(value = "累计消费金额") + @QueryField(type = QueryType.EQ) + private BigDecimal consumptionTotal; + + @ApiModelProperty(value = "累计消费次数") + @QueryField(type = QueryType.EQ) + private Integer consumptionCount; + + @ApiModelProperty(value = "当前等级积分") + @QueryField(type = QueryType.EQ) + private Integer grade; + + @ApiModelProperty(value = "下一等级积分") + @QueryField(type = QueryType.EQ) + private Integer nextLevelGrade; + + @ApiModelProperty(value = "有效期至(yyyyMMddHHmmss) 0：表示永久有效") + private String expireTime; + + @ApiModelProperty(value = "最后一次交易时间") + private String lastTransTime; + + @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/src/main/java/com/gxwebsoft/apps/param/HualalaCartFoodParam.java b/src/main/java/com/gxwebsoft/apps/param/HualalaCartFoodParam.java new file mode 100644 index 0000000..ded0f37 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/param/HualalaCartFoodParam.java @@ -0,0 +1,66 @@ +package com.gxwebsoft.apps.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; + +import java.math.BigDecimal; + +/** + * 购物车商品查询参数 + * + * @author 科技小王子 + * @since 2023-01-14 14:46:44 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "HualalaCartFoodParam对象", description = "购物车商品查询参数") +public class HualalaCartFoodParam 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 Integer foodId; + + @ApiModelProperty(value = "菜品名称") + private String foodName; + + @ApiModelProperty(value = "skuId") + private String skuId; + + @ApiModelProperty(value = "店铺id") + @QueryField(type = QueryType.EQ) + private Integer shopId; + + @ApiModelProperty(value = "店铺名称") + private String shopName; + + @ApiModelProperty(value = "店铺标志") + private String shopLogo; + + @ApiModelProperty(value = "商品图") + private String coverUrl; + + @ApiModelProperty(value = "售价") + @QueryField(type = QueryType.EQ) + private BigDecimal sellPrice; + + @ApiModelProperty(value = "库存") + @QueryField(type = QueryType.EQ) + private Integer stock; + +} diff --git a/src/main/java/com/gxwebsoft/apps/param/HualalaFoodCategoryParam.java b/src/main/java/com/gxwebsoft/apps/param/HualalaFoodCategoryParam.java new file mode 100644 index 0000000..acd1cde --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/param/HualalaFoodCategoryParam.java @@ -0,0 +1,106 @@ +package com.gxwebsoft.apps.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-01-12 09:49:46 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "HualalaFoodCategoryParam对象", description = "菜品分类查询参数") +public class HualalaFoodCategoryParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @QueryField(type = QueryType.EQ) + private Integer id; + + @ApiModelProperty(value = "是/否配料分类 0：不是（默认） 1：是") + @QueryField(type = QueryType.EQ) + private Integer type; + + @ApiModelProperty(value = "名称") + private String foodCategoryName; + + @ApiModelProperty(value = "收入名称") + private String foodSubjectName; + + @ApiModelProperty(value = "菜品Key") + private String foodKey; + + @ApiModelProperty(value = "菜品条目数") + private String foodCount; + + @ApiModelProperty(value = "分类ID") + private String foodCategoryId; + + @ApiModelProperty(value = "分类ID") + private String foodCategoryGroupName; + + @ApiModelProperty(value = "分类Key") + private String foodCategoryKey; + + @ApiModelProperty(value = "记录状态") + private String action; + + @ApiModelProperty(value = "结算系数") + private String settlementProportion; + + @ApiModelProperty(value = "是否启用") + @QueryField(type = QueryType.EQ) + private Integer isActive; + + @ApiModelProperty(value = "是/否配料分类 0：不是（默认） 1：是") + @QueryField(type = QueryType.EQ) + private Integer isBatching; + + @ApiModelProperty(value = "是/否可单独销售 0：不单独销售（默认） 1：可单独销售") + @QueryField(type = QueryType.EQ) + private Integer isSingleSale; + + @ApiModelProperty(value = "分类显示排序值") + @QueryField(type = QueryType.EQ) + private Integer sortIndex; + + @ApiModelProperty(value = "介绍页id") + @QueryField(type = QueryType.EQ) + private Integer adsId; + + @ApiModelProperty(value = "店铺ID") + private String shopId; + + @ApiModelProperty(value = "封面图") + private String image; + + @ApiModelProperty(value = "内容") + private String content; + + @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/src/main/java/com/gxwebsoft/apps/param/HualalaFoodParam.java b/src/main/java/com/gxwebsoft/apps/param/HualalaFoodParam.java new file mode 100644 index 0000000..a0b33d2 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/param/HualalaFoodParam.java @@ -0,0 +1,299 @@ +package com.gxwebsoft.apps.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-01-12 15:34:55 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "HualalaFoodParam对象", description = "菜品分类查询参数") +public class HualalaFoodParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @QueryField(type = QueryType.EQ) + private Integer id; + + @ApiModelProperty(value = "菜品ID") + private String foodId; + + @ApiModelProperty(value = "菜品Key") + private String foodKey; + + @ApiModelProperty(value = "集团ID") + private String groupId; + + @ApiModelProperty(value = "店铺ID") + private String shopId; + + @ApiModelProperty(value = "菜品条目数") + private String foodCount; + + @ApiModelProperty(value = "pos菜品分类ID") + private String foodCategoryId; + + @ApiModelProperty(value = "pos菜品分类Key") + private String foodCategoryKey; + + @ApiModelProperty(value = "pos菜品分类名称") + private String foodCategoryName; + + @ApiModelProperty(value = "线上菜品分类ID") + private String foodOnlineCategoryId; + + @ApiModelProperty(value = "线上菜品分类Key") + private String foodOnlineCategoryKey; + + @ApiModelProperty(value = "线上菜品分类名称") + private String foodOnlineCategoryName; + + @ApiModelProperty(value = "是/否是配料，false：不是 true：是") + @QueryField(type = QueryType.EQ) + private Integer isBatching; + + @ApiModelProperty(value = "是/否可单独销售 0：不单独销售（默认） 1：可单独销售") + @QueryField(type = QueryType.EQ) + private Integer isSingleSale; + +// @ApiModelProperty(value = "此菜品关联的收入科目key，例如冷菜收入、热菜收入、酒水收入") +// private String foodSubjectKey; +// +// @ApiModelProperty(value = "对应出品部门Key列表") +// private String departmentKeyLst; +// +// @ApiModelProperty(value = "配菜的分类key,在这里选择配菜") +// private String batchingFoodCategoryKey; +// +// @ApiModelProperty(value = "菜品名称") +// private String foodName; +// +// @ApiModelProperty(value = "菜品编号 可用于与三方菜品数据做映射") +// private String foodCode; +// +// @ApiModelProperty(value = "菜品别名") +// private String foodAliasName; +// +// @ApiModelProperty(value = "菜品注记码") +// private String foodMnemonicCode; +// +// @ApiModelProperty(value = "配菜的分类key,在这里选择配菜") +// @QueryField(type = QueryType.EQ) +// private Integer isDiscount; +// +// @QueryField(type = QueryType.EQ) +// private Integer isComments; +// +// @QueryField(type = QueryType.EQ) +// private Integer isActive; +// +// @QueryField(type = QueryType.EQ) +// private Integer isOpen; +// +// @QueryField(type = QueryType.EQ) +// private Integer isSetFood; +// +// private String setFoodDetailJson; +// +// @QueryField(type = QueryType.EQ) +// private Integer isTempFood; +// +// private String units; +// +// private String py; +// +// private String minOrderCount; +// +// private String tasteList; +// +// private String tasteGroupList; +// +// private String makingMethodList; +// +// private String makingMethodGroupList; +// +// @QueryField(type = QueryType.EQ) +// private Integer isSpecialty; +// +// @QueryField(type = QueryType.EQ) +// private Integer isRecommend; +// +// @QueryField(type = QueryType.EQ) +// private Integer isNews; +// +// private String hotTag; +// +// private String salesCount; +// +// @QueryField(type = QueryType.EQ) +// private Integer isNeedConfirmFoodNumber; +// +// private String takeoutPackagingFee; +// +// private String incrementUnit; +// +// @ApiModelProperty(value = "0:堂食 1:堂食，外送，自提 2:外送，自提 3:自提 4:外送 5:堂食，自提 6:堂食，外送") +// private String takeawayTag; +// +// private String workingLunchTag; +// +// private String adsId; +// +// private String imgePath; +// +// @QueryField(type = QueryType.EQ) +// private Integer isHasImage; +// +// private String imageHwp; +// +// private String starLevel; +// +// private String foodTagIds; +// +// private String parentFoodId; +// +// private String foodEnName; +// +// @QueryField(type = QueryType.EQ) +// private Integer isAutoAdd; +// +// @QueryField(type = QueryType.EQ) +// private Integer isCanRefund; +// +// @QueryField(type = QueryType.EQ) +// private Integer setPerson; +// +// @QueryField(type = QueryType.EQ) +// private Integer tasteIsRequired; +// +// @QueryField(type = QueryType.EQ) +// private Integer tasteIsMultiple; +// +// @QueryField(type = QueryType.EQ) +// private Integer makingMethodIsRequired; +// +// @QueryField(type = QueryType.EQ) +// private Integer makingMethodIsMultiple; +// +// private String initClickAmount; +// +// private String actualClickAmount; +// +// private String recentClickAmount; +// +// private String clickAlertMess; +// +// private String sourceFoodId; +// +// private String salesCommission; +// +// private String foodKeyElementLst; +// +// private String foodSortIndex; +// +// private String actionTime; +// +// private String foodSubjectName; +// +// private String foodSubjectCode; +// +// private String departmentId; +// +// private String departmentKey; +// +// private String popularity; +// +// private String detailSplit; +// +// private String batchingIsFoodNumberRate; +// + @ApiModelProperty(value = "分类编号") + private String foodCategoryCode; +// +// @ApiModelProperty(value = "分类英文名") +// private String foodCategoryEnName; +// +// @ApiModelProperty(value = "分类分组名称") +// private String foodCategoryGroupName; +// +// @ApiModelProperty(value = "特价") +// private String specialPrice; +// +// @ApiModelProperty(value = "特价2") +// private String specialPrice2; +// +// @ApiModelProperty(value = "特价2") +// private String specialPrice3; +// +// @ApiModelProperty(value = "特价2") +// private String specialPrice4; +// +// @ApiModelProperty(value = "特价2") +// private String specialPrice5; +// +// @ApiModelProperty(value = "特价2") +// private String specialPrice6; +// +// @ApiModelProperty(value = "特价2") +// private String onlineWmPrice; +// +// @ApiModelProperty(value = "标签ids") +// private String tagIds; +// +// @ApiModelProperty(value = "标签名称") +// private String tagNames; +// +// @ApiModelProperty(value = "礼品券ID") +// private String giftItemId; +// +// @ApiModelProperty(value = "礼品券有效期") +// private String giftValidPeriod; +// +// @ApiModelProperty(value = "菜品分类说明") +// private String description; +// +// @ApiModelProperty(value = "记录状态") +// private String action; +// +// @ApiModelProperty(value = "结算系数") +// private String settlementProportion; +// +// @ApiModelProperty(value = "分类显示排序值") +// @QueryField(type = QueryType.EQ) +// private Integer sortIndex; +// +// @ApiModelProperty(value = "封面图") +// private String image; +// +// @ApiModelProperty(value = "内容") +// private String content; +// +// @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/src/main/java/com/gxwebsoft/apps/param/HualalaParam.java b/src/main/java/com/gxwebsoft/apps/param/HualalaParam.java new file mode 100644 index 0000000..256288d --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/param/HualalaParam.java @@ -0,0 +1,34 @@ +package com.gxwebsoft.apps.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.HashMap; + +/** + * 常用链接推荐记录表查询参数 + * + * @author 科技小王子 + * @since 2022-11-25 12:55:33 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "HualalaParam对象", description = "哗啦啦请求参数") +public class HualalaParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "接口地址") + private String apiUrl; + + @ApiModelProperty(value = "请求参数") + private HashMap params; + +} diff --git a/src/main/java/com/gxwebsoft/apps/param/HualalaShopParam.java b/src/main/java/com/gxwebsoft/apps/param/HualalaShopParam.java new file mode 100644 index 0000000..295711d --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/param/HualalaShopParam.java @@ -0,0 +1,97 @@ +package com.gxwebsoft.apps.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-01-12 18:24:44 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "HualalaShopParam对象", description = "哗啦啦门店管理查询参数") +public class HualalaShopParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "店铺ID") + @QueryField(type = QueryType.EQ) + private Long shopId; + + @ApiModelProperty(value = "店铺名称") + private String shopName; + + @ApiModelProperty(value = "店铺logo") + private String logoUrl; + + @ApiModelProperty(value = "所在城市ID") + private String shopCity; + + @ApiModelProperty(value = "所在城市") + private String shopCityName; + + @ApiModelProperty(value = "营业时间") + private String shopOpenTime; + + @ApiModelProperty(value = "店内电话") + private String shopPhone; + + @ApiModelProperty(value = "HLL") + private String acspType; + + @ApiModelProperty(value = "1") + private String action; + + @ApiModelProperty(value = "20230111104803") + private String actionTime; + + @ApiModelProperty(value = "品牌ID") + private String brandId; + + @ApiModelProperty(value = "品牌名称") + private String brandName; + + @ApiModelProperty(value = "1") + private String businessModel; + + @ApiModelProperty(value = "图片") + private String imagePath; + + @ApiModelProperty(value = "22.7913010") + private String mapLatitudeValueBaiDu; + + @ApiModelProperty(value = "108.3312800") + private String mapLongitudeValueBaiDu; + + @ApiModelProperty(value = "0") + @QueryField(type = QueryType.EQ) + private Integer operationMode; + + @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 = "客户ID") + @QueryField(type = QueryType.EQ) + private Integer customerId; + +} diff --git a/src/main/java/com/gxwebsoft/apps/param/HxzParam.java b/src/main/java/com/gxwebsoft/apps/param/HxzParam.java new file mode 100644 index 0000000..7f8b7a0 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/param/HxzParam.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.apps.param; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonInclude; +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.List; + +/** + * 消费机请求参数 + * + * @author 科技小王子 + * @since 2023-04-27 17:59:40 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "消费机请求参数", description = "消费机请求参数") +public class HxzParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "交易模式（0:扣费 1：充值3:信息查询）") + @TableField(exist = false) + private String Mode; + + @ApiModelProperty(value = "扣费类型（0:手动 1：菜单 2：定值 3：取餐 4：计时）") + @TableField(exist = false) + private Integer PayType; + + @ApiModelProperty(value = "消费金额(Mode为3时，此字段传入值可能为0)") + @TableField(exist = false) + private BigDecimal Amount; + + @ApiModelProperty(value = "消费菜品列表") + @TableField(exist = false) + private List Menus; + + @ApiModelProperty(value = "扫描到的二维码字符串（最大长度为200）") + @TableField(exist = false) + private String QR; + +} diff --git a/src/main/java/com/gxwebsoft/apps/param/LinkParam.java b/src/main/java/com/gxwebsoft/apps/param/LinkParam.java new file mode 100644 index 0000000..30cf914 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/param/LinkParam.java @@ -0,0 +1,71 @@ +package com.gxwebsoft.apps.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 2022-11-25 12:55:33 + */ +@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 linkId; + + @ApiModelProperty(value = "链接名称") + private String linkName; + + @ApiModelProperty(value = "链接图标") + private String linkIcon; + + @ApiModelProperty(value = "路由地址") + private String linkPath; + + @ApiModelProperty(value = "组件路径") + private String linkComponent; + + @ApiModelProperty(value = "链接类型") + private String type; + + @ApiModelProperty(value = "点击次数") + @QueryField(type = QueryType.EQ) + private Integer clicks; + + @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; + + @ApiModelProperty(value = "是否删除, 0否, 1是") + @QueryField(type = QueryType.EQ) + private Integer deleted; + + @ApiModelProperty(value = "用户ID") + @QueryField(type = QueryType.EQ) + private Integer userId; + + @ApiModelProperty(value = "商户编号") + @QueryField(type = QueryType.EQ) + private String merchantCode; + +} diff --git a/src/main/java/com/gxwebsoft/apps/param/TestDataParam.java b/src/main/java/com/gxwebsoft/apps/param/TestDataParam.java new file mode 100644 index 0000000..44d6d61 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/param/TestDataParam.java @@ -0,0 +1,35 @@ +package com.gxwebsoft.apps.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-02-01 12:13:46 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "TestDataParam对象", description = "测试数据表查询参数") +public class TestDataParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键ID") + @QueryField(type = QueryType.EQ) + private Integer id; + + @ApiModelProperty(value = "标题") + private String title; + + @ApiModelProperty(value = "内容") + private String content; + +} diff --git a/src/main/java/com/gxwebsoft/apps/result/AllShopResult.java b/src/main/java/com/gxwebsoft/apps/result/AllShopResult.java new file mode 100644 index 0000000..0416489 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/result/AllShopResult.java @@ -0,0 +1,33 @@ +package com.gxwebsoft.apps.result; + +import com.gxwebsoft.apps.entity.HualalaShop; +import com.gxwebsoft.shop.entity.Merchant; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.List; + +/** + * 店铺菜品返回结果 + * + * @author WebSoft + * @since 2021-08-30 17:35:16 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(description = "店铺详情结果") +public class AllShopResult implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("返回参数") + private Object result; + + @ApiModelProperty("店铺详情") + private List shopInfoList; + +} diff --git a/src/main/java/com/gxwebsoft/apps/result/CartResult.java b/src/main/java/com/gxwebsoft/apps/result/CartResult.java new file mode 100644 index 0000000..524d75d --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/result/CartResult.java @@ -0,0 +1,18 @@ +package com.gxwebsoft.apps.result; + +import com.gxwebsoft.apps.entity.BcCart; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.List; + +/** + * 操作购物车信息 + */ +@Data +public class CartResult { + String deliveryTime; // 预定日期 + Integer totalNum; // 总数 + BigDecimal totalPrice; // 总结 + List items;// 商品列表 +} diff --git a/src/main/java/com/gxwebsoft/apps/result/FoodCategoryResult.java b/src/main/java/com/gxwebsoft/apps/result/FoodCategoryResult.java new file mode 100644 index 0000000..0b10470 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/result/FoodCategoryResult.java @@ -0,0 +1,33 @@ +package com.gxwebsoft.apps.result; + +import com.gxwebsoft.apps.entity.HualalaFood; +import com.gxwebsoft.apps.entity.HualalaFoodCategory; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.List; + +/** + * 店铺菜品返回结果 + * + * @author WebSoft + * @since 2021-08-30 17:35:16 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(description = "店铺菜品结果") +public class FoodCategoryResult implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("公共返回参数") + private Object result; + + @ApiModelProperty("菜品分类") + private List foodCategory; + +} diff --git a/src/main/java/com/gxwebsoft/apps/result/OpenFoodResult.java b/src/main/java/com/gxwebsoft/apps/result/OpenFoodResult.java new file mode 100644 index 0000000..bbefe3e --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/result/OpenFoodResult.java @@ -0,0 +1,36 @@ +package com.gxwebsoft.apps.result; + +import com.gxwebsoft.apps.entity.HualalaFood; +import com.gxwebsoft.shop.entity.Merchant; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.List; + +/** + * 店铺菜品返回结果 + * + * @author WebSoft + * @since 2021-08-30 17:35:16 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(description = "店铺菜品列表结果") +public class OpenFoodResult implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("返回参数") + private Object result; + + @ApiModelProperty("店铺菜品列表") + private List foodList; + + @ApiModelProperty(value = "记录数") + private Integer count; + +} diff --git a/src/main/java/com/gxwebsoft/apps/result/OperateVo.java b/src/main/java/com/gxwebsoft/apps/result/OperateVo.java new file mode 100644 index 0000000..6c36a3f --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/result/OperateVo.java @@ -0,0 +1,17 @@ +package com.gxwebsoft.apps.result; + +import com.gxwebsoft.apps.entity.ItemVo; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.List; + +/** + * 操作购物车信息 + */ +@Data +public class OperateVo { + private Integer totalNum;// 总数 + private BigDecimal totalPrice;// 售价 + private List items; // 菜品列表列表（选择购物车时使用） +} diff --git a/src/main/java/com/gxwebsoft/apps/result/ShopBaseInfoResult.java b/src/main/java/com/gxwebsoft/apps/result/ShopBaseInfoResult.java new file mode 100644 index 0000000..5567476 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/result/ShopBaseInfoResult.java @@ -0,0 +1,32 @@ +package com.gxwebsoft.apps.result; + +import com.gxwebsoft.apps.entity.HualalaFoodCategory; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.List; + +/** + * 店铺菜品返回结果 + * + * @author WebSoft + * @since 2021-08-30 17:35:16 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(description = "店铺详情结果") +public class ShopBaseInfoResult implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("返回参数") + private Object result; + + @ApiModelProperty("店铺详情") + private Object shopBaseInfo; + +} diff --git a/src/main/java/com/gxwebsoft/apps/service/BcAgentService.java b/src/main/java/com/gxwebsoft/apps/service/BcAgentService.java new file mode 100644 index 0000000..53cf4e5 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/service/BcAgentService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.apps.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.apps.entity.BcAgent; +import com.gxwebsoft.apps.param.BcAgentParam; + +import java.util.List; + +/** + * 代报餐管理Service + * + * @author 科技小王子 + * @since 2023-04-24 19:25:59 + */ +public interface BcAgentService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(BcAgentParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(BcAgentParam param); + + /** + * 根据id查询 + * + * @param agentId 自增ID + * @return BcAgent + */ + BcAgent getByIdRel(Integer agentId); + +} diff --git a/src/main/java/com/gxwebsoft/apps/service/BcCookbookService.java b/src/main/java/com/gxwebsoft/apps/service/BcCookbookService.java new file mode 100644 index 0000000..3f69500 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/service/BcCookbookService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.apps.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.apps.entity.BcCookbook; +import com.gxwebsoft.apps.param.BcCookbookParam; + +import java.util.List; + +/** + * 常用菜谱Service + * + * @author 科技小王子 + * @since 2023-05-05 14:56:54 + */ +public interface BcCookbookService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(BcCookbookParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(BcCookbookParam param); + + /** + * 根据id查询 + * + * @param cookbookId 自增ID + * @return BcCookbook + */ + BcCookbook getByIdRel(Integer cookbookId); + +} diff --git a/src/main/java/com/gxwebsoft/apps/service/BcEquipmentService.java b/src/main/java/com/gxwebsoft/apps/service/BcEquipmentService.java new file mode 100644 index 0000000..242e855 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/service/BcEquipmentService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.apps.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.apps.entity.BcEquipment; +import com.gxwebsoft.apps.param.BcEquipmentParam; + +import java.util.List; + +/** + * 报餐设备管理Service + * + * @author 科技小王子 + * @since 2023-05-02 10:34:40 + */ +public interface BcEquipmentService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(BcEquipmentParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(BcEquipmentParam param); + + /** + * 根据id查询 + * + * @param bcEquipmentId 设备ID + * @return BcEquipment + */ + BcEquipment getByIdRel(Integer bcEquipmentId); + +} diff --git a/src/main/java/com/gxwebsoft/apps/service/BcExportService.java b/src/main/java/com/gxwebsoft/apps/service/BcExportService.java new file mode 100644 index 0000000..48b1cb5 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/service/BcExportService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.apps.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.apps.entity.BcExport; +import com.gxwebsoft.apps.param.BcExportParam; + +import java.util.List; + +/** + * 报餐统计导出Service + * + * @author 科技小王子 + * @since 2023-06-01 21:47:02 + */ +public interface BcExportService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(BcExportParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(BcExportParam param); + + /** + * 根据id查询 + * + * @param exportId 自增ID + * @return BcExport + */ + BcExport getByIdRel(Integer exportId); + +} diff --git a/src/main/java/com/gxwebsoft/apps/service/BcFoodService.java b/src/main/java/com/gxwebsoft/apps/service/BcFoodService.java new file mode 100644 index 0000000..6add5ff --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/service/BcFoodService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.apps.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.apps.entity.BcFood; +import com.gxwebsoft.apps.param.BcFoodParam; + +import java.util.List; + +/** + * 发布菜品明细Service + * + * @author 科技小王子 + * @since 2023-04-27 17:59:40 + */ +public interface BcFoodService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(BcFoodParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(BcFoodParam param); + + /** + * 根据id查询 + * + * @param bcFoodId 自增ID + * @return BcFood + */ + BcFood getByIdRel(Integer bcFoodId); + +} diff --git a/src/main/java/com/gxwebsoft/apps/service/BcPlanService.java b/src/main/java/com/gxwebsoft/apps/service/BcPlanService.java new file mode 100644 index 0000000..f47d9c0 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/service/BcPlanService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.apps.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.apps.entity.BcPlan; +import com.gxwebsoft.apps.param.BcPlanParam; + +import java.util.List; + +/** + * 菜品发布管理Service + * + * @author 科技小王子 + * @since 2023-04-27 17:59:40 + */ +public interface BcPlanService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(BcPlanParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(BcPlanParam param); + + /** + * 根据id查询 + * + * @param bcPlanId 自增ID + * @return BcPlan + */ + BcPlan getByIdRel(Integer bcPlanId); + +} diff --git a/src/main/java/com/gxwebsoft/apps/service/BcTemporaryService.java b/src/main/java/com/gxwebsoft/apps/service/BcTemporaryService.java new file mode 100644 index 0000000..d56f39b --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/service/BcTemporaryService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.apps.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.apps.entity.BcTemporary; +import com.gxwebsoft.apps.param.BcTemporaryParam; + +import java.util.List; + +/** + * 临时报餐管理Service + * + * @author 科技小王子 + * @since 2023-04-24 21:47:57 + */ +public interface BcTemporaryService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(BcTemporaryParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(BcTemporaryParam param); + + /** + * 根据id查询 + * + * @param temporaryId 自增ID + * @return BcTemporary + */ + BcTemporary getByIdRel(Integer temporaryId); + +} diff --git a/src/main/java/com/gxwebsoft/apps/service/CashierService.java b/src/main/java/com/gxwebsoft/apps/service/CashierService.java new file mode 100644 index 0000000..918f481 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/service/CashierService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.apps.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.apps.entity.Cashier; +import com.gxwebsoft.apps.param.CashierParam; + +import java.util.List; + +/** + * 海牛收银台记录表Service + * + * @author WebSoft + * @since 2022-11-18 11:47:09 + */ +public interface CashierService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(CashierParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(CashierParam param); + + /** + * 根据id查询 + * + * @param cashierId ID + * @return Cashier + */ + Cashier getByIdRel(Integer cashierId); + +} diff --git a/src/main/java/com/gxwebsoft/apps/service/EquipmentAlarmService.java b/src/main/java/com/gxwebsoft/apps/service/EquipmentAlarmService.java new file mode 100644 index 0000000..5c46a13 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/service/EquipmentAlarmService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.apps.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.apps.entity.EquipmentAlarm; +import com.gxwebsoft.apps.param.EquipmentAlarmParam; + +import java.util.List; + +/** + * 故障报警记录Service + * + * @author 科技小王子 + * @since 2022-12-01 23:49:44 + */ +public interface EquipmentAlarmService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(EquipmentAlarmParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(EquipmentAlarmParam param); + + /** + * 根据id查询 + * + * @param id 记录ID + * @return EquipmentAlarm + */ + EquipmentAlarm getByIdRel(Integer id); + +} diff --git a/src/main/java/com/gxwebsoft/apps/service/EquipmentFaultService.java b/src/main/java/com/gxwebsoft/apps/service/EquipmentFaultService.java new file mode 100644 index 0000000..513bed5 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/service/EquipmentFaultService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.apps.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.apps.entity.EquipmentFault; +import com.gxwebsoft.apps.param.EquipmentFaultParam; + +import java.util.List; + +/** + * 故障电池Service + * + * @author 科技小王子 + * @since 2022-12-01 18:40:25 + */ +public interface EquipmentFaultService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(EquipmentFaultParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(EquipmentFaultParam param); + + /** + * 根据id查询 + * + * @param id 记录ID + * @return EquipmentFault + */ + EquipmentFault getByIdRel(Integer id); + +} diff --git a/src/main/java/com/gxwebsoft/apps/service/EquipmentGoodsService.java b/src/main/java/com/gxwebsoft/apps/service/EquipmentGoodsService.java new file mode 100644 index 0000000..26b88d7 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/service/EquipmentGoodsService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.apps.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.apps.entity.EquipmentGoods; +import com.gxwebsoft.apps.param.EquipmentGoodsParam; + +import java.util.List; + +/** + * 电池管理记录表Service + * + * @author 科技小王子 + * @since 2023-02-28 22:40:50 + */ +public interface EquipmentGoodsService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(EquipmentGoodsParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(EquipmentGoodsParam param); + + /** + * 根据id查询 + * + * @param goodsId 商品ID + * @return EquipmentGoods + */ + EquipmentGoods getByIdRel(Integer goodsId); + +} diff --git a/src/main/java/com/gxwebsoft/apps/service/EquipmentOrderGoodsService.java b/src/main/java/com/gxwebsoft/apps/service/EquipmentOrderGoodsService.java new file mode 100644 index 0000000..3b96ce5 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/service/EquipmentOrderGoodsService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.apps.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.apps.entity.EquipmentOrderGoods; +import com.gxwebsoft.apps.param.EquipmentOrderGoodsParam; + +import java.util.List; + +/** + * 电池管理记录表Service + * + * @author 科技小王子 + * @since 2023-05-11 19:10:13 + */ +public interface EquipmentOrderGoodsService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(EquipmentOrderGoodsParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(EquipmentOrderGoodsParam param); + + /** + * 根据id查询 + * + * @param orderGoodsId 商品ID + * @return EquipmentOrderGoods + */ + EquipmentOrderGoods getByIdRel(Integer orderGoodsId); + +} diff --git a/src/main/java/com/gxwebsoft/apps/service/EquipmentOrderService.java b/src/main/java/com/gxwebsoft/apps/service/EquipmentOrderService.java new file mode 100644 index 0000000..c754615 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/service/EquipmentOrderService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.apps.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.apps.entity.EquipmentOrder; +import com.gxwebsoft.apps.param.EquipmentOrderParam; + +import java.util.List; + +/** + * 订单记录表Service + * + * @author 科技小王子 + * @since 2023-04-14 21:24:31 + */ +public interface EquipmentOrderService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(EquipmentOrderParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(EquipmentOrderParam param); + + /** + * 根据id查询 + * + * @param orderId 订单ID + * @return EquipmentOrder + */ + EquipmentOrder getByIdRel(Integer orderId); + +} diff --git a/src/main/java/com/gxwebsoft/apps/service/EquipmentRecordService.java b/src/main/java/com/gxwebsoft/apps/service/EquipmentRecordService.java new file mode 100644 index 0000000..d4655a2 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/service/EquipmentRecordService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.apps.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.apps.entity.EquipmentRecord; +import com.gxwebsoft.apps.param.EquipmentRecordParam; + +import java.util.List; + +/** + * 前世今生Service + * + * @author 科技小王子 + * @since 2022-12-03 01:23:53 + */ +public interface EquipmentRecordService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(EquipmentRecordParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(EquipmentRecordParam param); + + /** + * 根据id查询 + * + * @param id 记录ID + * @return EquipmentRecord + */ + EquipmentRecord getByIdRel(Integer id); + +} diff --git a/src/main/java/com/gxwebsoft/apps/service/EquipmentService.java b/src/main/java/com/gxwebsoft/apps/service/EquipmentService.java new file mode 100644 index 0000000..246e367 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/service/EquipmentService.java @@ -0,0 +1,44 @@ +package com.gxwebsoft.apps.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.apps.entity.Equipment; +import com.gxwebsoft.apps.param.EquipmentParam; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +/** + * 设备管理Service + * + * @author 科技小王子 + * @since 2022-11-30 02:11:16 + */ +public interface EquipmentService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(EquipmentParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(EquipmentParam param); + + /** + * 根据id查询 + * + * @param equipmentId 设备ID + * @return Equipment + */ + Equipment getByIdRel(Integer equipmentId); + + Equipment getByEquipmentCode(String equipmentCode); +} diff --git a/src/main/java/com/gxwebsoft/apps/service/HualalaCardBenefitsService.java b/src/main/java/com/gxwebsoft/apps/service/HualalaCardBenefitsService.java new file mode 100644 index 0000000..d23c787 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/service/HualalaCardBenefitsService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.apps.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.apps.entity.HualalaCardBenefits; +import com.gxwebsoft.apps.param.HualalaCardBenefitsParam; + +import java.util.List; + +/** + * 会员权益Service + * + * @author 科技小王子 + * @since 2023-01-08 12:22:50 + */ +public interface HualalaCardBenefitsService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(HualalaCardBenefitsParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(HualalaCardBenefitsParam param); + + /** + * 根据id查询 + * + * @param id + * @return HualalaCardBenefits + */ + HualalaCardBenefits getByIdRel(Integer id); + +} diff --git a/src/main/java/com/gxwebsoft/apps/service/HualalaCardService.java b/src/main/java/com/gxwebsoft/apps/service/HualalaCardService.java new file mode 100644 index 0000000..2d2da4b --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/service/HualalaCardService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.apps.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.apps.entity.HualalaCard; +import com.gxwebsoft.apps.param.HualalaCardParam; + +import java.util.List; + +/** + * Service + * + * @author 科技小王子 + * @since 2023-01-08 12:22:50 + */ +public interface HualalaCardService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(HualalaCardParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(HualalaCardParam param); + + /** + * 根据id查询 + * + * @param id + * @return HualalaCard + */ + HualalaCard getByIdRel(Integer id); + +} diff --git a/src/main/java/com/gxwebsoft/apps/service/HualalaCartFoodService.java b/src/main/java/com/gxwebsoft/apps/service/HualalaCartFoodService.java new file mode 100644 index 0000000..4c6a591 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/service/HualalaCartFoodService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.apps.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.apps.entity.HualalaCartFood; +import com.gxwebsoft.apps.param.HualalaCartFoodParam; + +import java.util.List; + +/** + * 购物车商品Service + * + * @author 科技小王子 + * @since 2023-01-14 14:46:44 + */ +public interface HualalaCartFoodService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(HualalaCartFoodParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(HualalaCartFoodParam param); + + /** + * 根据id查询 + * + * @param id ID + * @return HualalaCartFood + */ + HualalaCartFood getByIdRel(Integer id); + +} diff --git a/src/main/java/com/gxwebsoft/apps/service/HualalaFoodCategoryService.java b/src/main/java/com/gxwebsoft/apps/service/HualalaFoodCategoryService.java new file mode 100644 index 0000000..33b298f --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/service/HualalaFoodCategoryService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.apps.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.apps.entity.HualalaFoodCategory; +import com.gxwebsoft.apps.param.HualalaFoodCategoryParam; + +import java.util.List; + +/** + * 菜品分类Service + * + * @author 科技小王子 + * @since 2023-01-12 09:49:46 + */ +public interface HualalaFoodCategoryService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(HualalaFoodCategoryParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(HualalaFoodCategoryParam param); + + /** + * 根据id查询 + * + * @param id + * @return HualalaFoodCategory + */ + HualalaFoodCategory getByIdRel(Integer id); + +} diff --git a/src/main/java/com/gxwebsoft/apps/service/HualalaFoodService.java b/src/main/java/com/gxwebsoft/apps/service/HualalaFoodService.java new file mode 100644 index 0000000..6da9cb5 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/service/HualalaFoodService.java @@ -0,0 +1,44 @@ +package com.gxwebsoft.apps.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.apps.entity.HualalaFood; +import com.gxwebsoft.apps.param.HualalaFoodParam; + +import java.util.List; + +/** + * 菜品分类Service + * + * @author 科技小王子 + * @since 2023-01-12 15:34:55 + */ +public interface HualalaFoodService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(HualalaFoodParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(HualalaFoodParam param); + + /** + * 根据id查询 + * + * @param id + * @return HualalaFood + */ + HualalaFood getByIdRel(Integer id); + + HualalaFood getByFoodId(Integer foodId); + +} diff --git a/src/main/java/com/gxwebsoft/apps/service/HualalaService.java b/src/main/java/com/gxwebsoft/apps/service/HualalaService.java new file mode 100644 index 0000000..a64d839 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/service/HualalaService.java @@ -0,0 +1,32 @@ +package com.gxwebsoft.apps.service; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.apps.entity.Hualala; +import com.gxwebsoft.apps.entity.HualalaShop; +import com.gxwebsoft.apps.entity.Link; +import com.gxwebsoft.apps.param.HualalaShopParam; +import com.gxwebsoft.apps.param.LinkParam; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.shop.entity.Order; + +import java.util.List; +import java.util.Map; + +/** + * 哗啦啦Service + * + * @author 科技小王子 + * @since 2022-11-25 12:55:33 + */ +public interface HualalaService extends IService { + + /** + * 请求哗啦啦接口并返回结果 + * @param requestBody + * @return + */ + JSONObject doPost(String url, Map requestBody); + + JSONObject doExpress(Order orderInfo); +} diff --git a/src/main/java/com/gxwebsoft/apps/service/HualalaShopService.java b/src/main/java/com/gxwebsoft/apps/service/HualalaShopService.java new file mode 100644 index 0000000..f4b73a5 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/service/HualalaShopService.java @@ -0,0 +1,44 @@ +package com.gxwebsoft.apps.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.apps.entity.HualalaShop; +import com.gxwebsoft.apps.param.HualalaShopParam; + +import java.util.List; + +/** + * 哗啦啦门店管理Service + * + * @author 科技小王子 + * @since 2023-01-12 18:24:44 + */ +public interface HualalaShopService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(HualalaShopParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(HualalaShopParam param); + + /** + * 根据id查询 + * + * @param shopId 店铺ID + * @return HualalaShop + */ + HualalaShop getByIdRel(Integer shopId); + + List listByGeo(HualalaShopParam param); + void saveGeoPointToRedis(); +} diff --git a/src/main/java/com/gxwebsoft/apps/service/LinkService.java b/src/main/java/com/gxwebsoft/apps/service/LinkService.java new file mode 100644 index 0000000..29291d3 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/service/LinkService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.apps.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.apps.entity.Link; +import com.gxwebsoft.apps.param.LinkParam; + +import java.util.List; + +/** + * 常用链接推荐记录表Service + * + * @author 科技小王子 + * @since 2022-11-25 12:55:33 + */ +public interface LinkService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(LinkParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(LinkParam param); + + /** + * 根据id查询 + * + * @param linkId 链接ID + * @return Link + */ + Link getByIdRel(Integer linkId); + +} diff --git a/src/main/java/com/gxwebsoft/apps/service/TestDataService.java b/src/main/java/com/gxwebsoft/apps/service/TestDataService.java new file mode 100644 index 0000000..e5878f2 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/service/TestDataService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.apps.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.apps.entity.TestData; +import com.gxwebsoft.apps.param.TestDataParam; + +import java.util.List; + +/** + * 测试数据表Service + * + * @author 科技小王子 + * @since 2023-02-01 12:13:46 + */ +public interface TestDataService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(TestDataParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(TestDataParam param); + + /** + * 根据id查询 + * + * @param id 主键ID + * @return TestData + */ + TestData getByIdRel(Integer id); + +} diff --git a/src/main/java/com/gxwebsoft/apps/service/impl/BcAgentServiceImpl.java b/src/main/java/com/gxwebsoft/apps/service/impl/BcAgentServiceImpl.java new file mode 100644 index 0000000..87416aa --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/service/impl/BcAgentServiceImpl.java @@ -0,0 +1,56 @@ +package com.gxwebsoft.apps.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.apps.mapper.BcAgentMapper; +import com.gxwebsoft.apps.service.BcAgentService; +import com.gxwebsoft.apps.entity.BcAgent; +import com.gxwebsoft.apps.param.BcAgentParam; +import com.gxwebsoft.common.core.web.PageParam; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.common.system.service.UserService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 代报餐管理Service实现 + * + * @author 科技小王子 + * @since 2023-04-24 19:25:59 + */ +@Service +public class BcAgentServiceImpl extends ServiceImpl implements BcAgentService { + + @Resource + private UserService userService; + + @Override + public PageResult pageRel(BcAgentParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + List list = baseMapper.selectPageRel(page, param); +// list.forEach( d-> { +// d.setUser(userService.getById(d.getUserId())); +// d.setParentUser(userService.getById(d.getParentId())); +// }); + return new PageResult<>(list, page.getTotal()); + } + + @Override + public List listRel(BcAgentParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + //page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public BcAgent getByIdRel(Integer agentId) { + BcAgentParam param = new BcAgentParam(); + param.setAgentId(agentId); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/apps/service/impl/BcCookbookServiceImpl.java b/src/main/java/com/gxwebsoft/apps/service/impl/BcCookbookServiceImpl.java new file mode 100644 index 0000000..826e319 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/service/impl/BcCookbookServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.apps.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.apps.mapper.BcCookbookMapper; +import com.gxwebsoft.apps.service.BcCookbookService; +import com.gxwebsoft.apps.entity.BcCookbook; +import com.gxwebsoft.apps.param.BcCookbookParam; +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-05 14:56:54 + */ +@Service +public class BcCookbookServiceImpl extends ServiceImpl implements BcCookbookService { + + @Override + public PageResult pageRel(BcCookbookParam 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(BcCookbookParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + //page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public BcCookbook getByIdRel(Integer cookbookId) { + BcCookbookParam param = new BcCookbookParam(); + param.setCookbookId(cookbookId); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/apps/service/impl/BcEquipmentServiceImpl.java b/src/main/java/com/gxwebsoft/apps/service/impl/BcEquipmentServiceImpl.java new file mode 100644 index 0000000..e6a59d9 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/service/impl/BcEquipmentServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.apps.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.apps.mapper.BcEquipmentMapper; +import com.gxwebsoft.apps.service.BcEquipmentService; +import com.gxwebsoft.apps.entity.BcEquipment; +import com.gxwebsoft.apps.param.BcEquipmentParam; +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-02 10:34:40 + */ +@Service +public class BcEquipmentServiceImpl extends ServiceImpl implements BcEquipmentService { + + @Override + public PageResult pageRel(BcEquipmentParam 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(BcEquipmentParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + //page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public BcEquipment getByIdRel(Integer bcEquipmentId) { + BcEquipmentParam param = new BcEquipmentParam(); + param.setBcEquipmentId(bcEquipmentId); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/apps/service/impl/BcExportServiceImpl.java b/src/main/java/com/gxwebsoft/apps/service/impl/BcExportServiceImpl.java new file mode 100644 index 0000000..3bb6921 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/service/impl/BcExportServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.apps.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.apps.mapper.BcExportMapper; +import com.gxwebsoft.apps.service.BcExportService; +import com.gxwebsoft.apps.entity.BcExport; +import com.gxwebsoft.apps.param.BcExportParam; +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-06-01 21:47:02 + */ +@Service +public class BcExportServiceImpl extends ServiceImpl implements BcExportService { + + @Override + public PageResult pageRel(BcExportParam 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(BcExportParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + //page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public BcExport getByIdRel(Integer exportId) { + BcExportParam param = new BcExportParam(); + param.setExportId(exportId); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/apps/service/impl/BcFoodServiceImpl.java b/src/main/java/com/gxwebsoft/apps/service/impl/BcFoodServiceImpl.java new file mode 100644 index 0000000..8ba309f --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/service/impl/BcFoodServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.apps.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.apps.mapper.BcFoodMapper; +import com.gxwebsoft.apps.service.BcFoodService; +import com.gxwebsoft.apps.entity.BcFood; +import com.gxwebsoft.apps.param.BcFoodParam; +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-04-27 17:59:40 + */ +@Service +public class BcFoodServiceImpl extends ServiceImpl implements BcFoodService { + + @Override + public PageResult pageRel(BcFoodParam 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(BcFoodParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + //page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public BcFood getByIdRel(Integer bcFoodId) { + BcFoodParam param = new BcFoodParam(); + param.setBcFoodId(bcFoodId); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/apps/service/impl/BcPlanServiceImpl.java b/src/main/java/com/gxwebsoft/apps/service/impl/BcPlanServiceImpl.java new file mode 100644 index 0000000..1e01cb2 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/service/impl/BcPlanServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.apps.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.apps.mapper.BcPlanMapper; +import com.gxwebsoft.apps.service.BcPlanService; +import com.gxwebsoft.apps.entity.BcPlan; +import com.gxwebsoft.apps.param.BcPlanParam; +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-04-27 17:59:40 + */ +@Service +public class BcPlanServiceImpl extends ServiceImpl implements BcPlanService { + + @Override + public PageResult pageRel(BcPlanParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("day_time desc, create_time desc"); + List list = baseMapper.selectPageRel(page, param); + return new PageResult<>(list, page.getTotal()); + } + + @Override + public List listRel(BcPlanParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + page.setDefaultOrder("day_time desc, create_time desc"); + return page.sortRecords(list); + } + + @Override + public BcPlan getByIdRel(Integer bcPlanId) { + BcPlanParam param = new BcPlanParam(); + param.setBcPlanId(bcPlanId); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/apps/service/impl/BcTemporaryServiceImpl.java b/src/main/java/com/gxwebsoft/apps/service/impl/BcTemporaryServiceImpl.java new file mode 100644 index 0000000..e261632 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/service/impl/BcTemporaryServiceImpl.java @@ -0,0 +1,53 @@ +package com.gxwebsoft.apps.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.apps.mapper.BcTemporaryMapper; +import com.gxwebsoft.apps.service.BcTemporaryService; +import com.gxwebsoft.apps.entity.BcTemporary; +import com.gxwebsoft.apps.param.BcTemporaryParam; +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.UserService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 临时报餐管理Service实现 + * + * @author 科技小王子 + * @since 2023-04-24 21:47:57 + */ +@Service +public class BcTemporaryServiceImpl extends ServiceImpl implements BcTemporaryService { + + @Resource + private UserService userService; + + @Override + public PageResult pageRel(BcTemporaryParam 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(BcTemporaryParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public BcTemporary getByIdRel(Integer temporaryId) { + BcTemporaryParam param = new BcTemporaryParam(); + param.setTemporaryId(temporaryId); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/apps/service/impl/CashierServiceImpl.java b/src/main/java/com/gxwebsoft/apps/service/impl/CashierServiceImpl.java new file mode 100644 index 0000000..5e10978 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/service/impl/CashierServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.apps.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.apps.mapper.CashierMapper; +import com.gxwebsoft.apps.service.CashierService; +import com.gxwebsoft.apps.entity.Cashier; +import com.gxwebsoft.apps.param.CashierParam; +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 WebSoft + * @since 2022-11-18 11:47:09 + */ +@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 + public List listRel(CashierParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + //page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public Cashier getByIdRel(Integer cashierId) { + CashierParam param = new CashierParam(); + param.setCashierId(cashierId); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/apps/service/impl/EquipmentAlarmServiceImpl.java b/src/main/java/com/gxwebsoft/apps/service/impl/EquipmentAlarmServiceImpl.java new file mode 100644 index 0000000..a724c4a --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/service/impl/EquipmentAlarmServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.apps.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.apps.mapper.EquipmentAlarmMapper; +import com.gxwebsoft.apps.service.EquipmentAlarmService; +import com.gxwebsoft.apps.entity.EquipmentAlarm; +import com.gxwebsoft.apps.param.EquipmentAlarmParam; +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 2022-12-01 23:49:44 + */ +@Service +public class EquipmentAlarmServiceImpl extends ServiceImpl implements EquipmentAlarmService { + + @Override + public PageResult pageRel(EquipmentAlarmParam 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(EquipmentAlarmParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + //page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public EquipmentAlarm getByIdRel(Integer id) { + EquipmentAlarmParam param = new EquipmentAlarmParam(); + param.setId(id); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/apps/service/impl/EquipmentFaultServiceImpl.java b/src/main/java/com/gxwebsoft/apps/service/impl/EquipmentFaultServiceImpl.java new file mode 100644 index 0000000..8cc4a12 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/service/impl/EquipmentFaultServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.apps.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.apps.mapper.EquipmentFaultMapper; +import com.gxwebsoft.apps.service.EquipmentFaultService; +import com.gxwebsoft.apps.entity.EquipmentFault; +import com.gxwebsoft.apps.param.EquipmentFaultParam; +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 2022-12-01 18:40:25 + */ +@Service +public class EquipmentFaultServiceImpl extends ServiceImpl implements EquipmentFaultService { + + @Override + public PageResult pageRel(EquipmentFaultParam 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(EquipmentFaultParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + //page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public EquipmentFault getByIdRel(Integer id) { + EquipmentFaultParam param = new EquipmentFaultParam(); + param.setId(id); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/apps/service/impl/EquipmentGoodsServiceImpl.java b/src/main/java/com/gxwebsoft/apps/service/impl/EquipmentGoodsServiceImpl.java new file mode 100644 index 0000000..97449e8 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/service/impl/EquipmentGoodsServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.apps.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.apps.mapper.EquipmentGoodsMapper; +import com.gxwebsoft.apps.service.EquipmentGoodsService; +import com.gxwebsoft.apps.entity.EquipmentGoods; +import com.gxwebsoft.apps.param.EquipmentGoodsParam; +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-02-28 22:40:50 + */ +@Service +public class EquipmentGoodsServiceImpl extends ServiceImpl implements EquipmentGoodsService { + + @Override + public PageResult pageRel(EquipmentGoodsParam 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(EquipmentGoodsParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public EquipmentGoods getByIdRel(Integer goodsId) { + EquipmentGoodsParam param = new EquipmentGoodsParam(); + param.setGoodsId(goodsId); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/apps/service/impl/EquipmentOrderGoodsServiceImpl.java b/src/main/java/com/gxwebsoft/apps/service/impl/EquipmentOrderGoodsServiceImpl.java new file mode 100644 index 0000000..346bfcd --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/service/impl/EquipmentOrderGoodsServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.apps.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.apps.mapper.EquipmentOrderGoodsMapper; +import com.gxwebsoft.apps.service.EquipmentOrderGoodsService; +import com.gxwebsoft.apps.entity.EquipmentOrderGoods; +import com.gxwebsoft.apps.param.EquipmentOrderGoodsParam; +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-11 19:10:13 + */ +@Service +public class EquipmentOrderGoodsServiceImpl extends ServiceImpl implements EquipmentOrderGoodsService { + + @Override + public PageResult pageRel(EquipmentOrderGoodsParam 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(EquipmentOrderGoodsParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + //page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public EquipmentOrderGoods getByIdRel(Integer orderGoodsId) { + EquipmentOrderGoodsParam param = new EquipmentOrderGoodsParam(); + param.setOrderGoodsId(orderGoodsId); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/apps/service/impl/EquipmentOrderServiceImpl.java b/src/main/java/com/gxwebsoft/apps/service/impl/EquipmentOrderServiceImpl.java new file mode 100644 index 0000000..17dc8b8 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/service/impl/EquipmentOrderServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.apps.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.apps.mapper.EquipmentOrderMapper; +import com.gxwebsoft.apps.service.EquipmentOrderService; +import com.gxwebsoft.apps.entity.EquipmentOrder; +import com.gxwebsoft.apps.param.EquipmentOrderParam; +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-04-14 21:24:31 + */ +@Service +public class EquipmentOrderServiceImpl extends ServiceImpl implements EquipmentOrderService { + + @Override + public PageResult pageRel(EquipmentOrderParam 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(EquipmentOrderParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + //page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public EquipmentOrder getByIdRel(Integer orderId) { + EquipmentOrderParam param = new EquipmentOrderParam(); + param.setOrderId(orderId); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/apps/service/impl/EquipmentRecordServiceImpl.java b/src/main/java/com/gxwebsoft/apps/service/impl/EquipmentRecordServiceImpl.java new file mode 100644 index 0000000..153194a --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/service/impl/EquipmentRecordServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.apps.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.apps.mapper.EquipmentRecordMapper; +import com.gxwebsoft.apps.service.EquipmentRecordService; +import com.gxwebsoft.apps.entity.EquipmentRecord; +import com.gxwebsoft.apps.param.EquipmentRecordParam; +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 2022-12-03 01:23:53 + */ +@Service +public class EquipmentRecordServiceImpl extends ServiceImpl implements EquipmentRecordService { + + @Override + public PageResult pageRel(EquipmentRecordParam 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(EquipmentRecordParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public EquipmentRecord getByIdRel(Integer id) { + EquipmentRecordParam param = new EquipmentRecordParam(); + param.setId(id); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/apps/service/impl/EquipmentServiceImpl.java b/src/main/java/com/gxwebsoft/apps/service/impl/EquipmentServiceImpl.java new file mode 100644 index 0000000..ad81d60 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/service/impl/EquipmentServiceImpl.java @@ -0,0 +1,63 @@ +package com.gxwebsoft.apps.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.apps.mapper.EquipmentMapper; +import com.gxwebsoft.apps.service.EquipmentService; +import com.gxwebsoft.apps.entity.Equipment; +import com.gxwebsoft.apps.param.EquipmentParam; +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.UserService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 设备管理Service实现 + * + * @author 科技小王子 + * @since 2022-11-30 02:11:16 + */ +@Service +public class EquipmentServiceImpl extends ServiceImpl implements EquipmentService { + @Resource + private UserService userService; + + @Override + public PageResult pageRel(EquipmentParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + List list = baseMapper.selectPageRel(page, param); + // 查询绑定电池的用户 + for(Equipment equipment : list){ + if(!equipment.getUserId().equals(0)){ + equipment.setUser(userService.getById(equipment.getUserId())); + } + } + return new PageResult<>(list, page.getTotal()); + } + + @Override + public List listRel(EquipmentParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public Equipment getByIdRel(Integer equipmentId) { + EquipmentParam param = new EquipmentParam(); + param.setEquipmentId(equipmentId); + return param.getOne(baseMapper.selectListRel(param)); + } + + @Override + public Equipment getByEquipmentCode(String equipmentCode) { + return query().eq("equipment_code", equipmentCode).one(); + } + +} diff --git a/src/main/java/com/gxwebsoft/apps/service/impl/HualalaCardBenefitsServiceImpl.java b/src/main/java/com/gxwebsoft/apps/service/impl/HualalaCardBenefitsServiceImpl.java new file mode 100644 index 0000000..7b0cf3b --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/service/impl/HualalaCardBenefitsServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.apps.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.apps.mapper.HualalaCardBenefitsMapper; +import com.gxwebsoft.apps.service.HualalaCardBenefitsService; +import com.gxwebsoft.apps.entity.HualalaCardBenefits; +import com.gxwebsoft.apps.param.HualalaCardBenefitsParam; +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-01-08 12:22:50 + */ +@Service +public class HualalaCardBenefitsServiceImpl extends ServiceImpl implements HualalaCardBenefitsService { + + @Override + public PageResult pageRel(HualalaCardBenefitsParam 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(HualalaCardBenefitsParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + //page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public HualalaCardBenefits getByIdRel(Integer id) { + HualalaCardBenefitsParam param = new HualalaCardBenefitsParam(); + param.setId(id); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/apps/service/impl/HualalaCardServiceImpl.java b/src/main/java/com/gxwebsoft/apps/service/impl/HualalaCardServiceImpl.java new file mode 100644 index 0000000..30dff53 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/service/impl/HualalaCardServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.apps.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.apps.mapper.HualalaCardMapper; +import com.gxwebsoft.apps.service.HualalaCardService; +import com.gxwebsoft.apps.entity.HualalaCard; +import com.gxwebsoft.apps.param.HualalaCardParam; +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-01-08 12:22:50 + */ +@Service +public class HualalaCardServiceImpl extends ServiceImpl implements HualalaCardService { + + @Override + public PageResult pageRel(HualalaCardParam 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(HualalaCardParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + //page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public HualalaCard getByIdRel(Integer id) { + HualalaCardParam param = new HualalaCardParam(); + param.setId(id); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/apps/service/impl/HualalaCartFoodServiceImpl.java b/src/main/java/com/gxwebsoft/apps/service/impl/HualalaCartFoodServiceImpl.java new file mode 100644 index 0000000..64249f2 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/service/impl/HualalaCartFoodServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.apps.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.apps.mapper.HualalaCartFoodMapper; +import com.gxwebsoft.apps.service.HualalaCartFoodService; +import com.gxwebsoft.apps.entity.HualalaCartFood; +import com.gxwebsoft.apps.param.HualalaCartFoodParam; +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-01-14 14:46:44 + */ +@Service +public class HualalaCartFoodServiceImpl extends ServiceImpl implements HualalaCartFoodService { + + @Override + public PageResult pageRel(HualalaCartFoodParam 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(HualalaCartFoodParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + //page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public HualalaCartFood getByIdRel(Integer id) { + HualalaCartFoodParam param = new HualalaCartFoodParam(); + param.setId(id); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/apps/service/impl/HualalaFoodCategoryServiceImpl.java b/src/main/java/com/gxwebsoft/apps/service/impl/HualalaFoodCategoryServiceImpl.java new file mode 100644 index 0000000..81543fd --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/service/impl/HualalaFoodCategoryServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.apps.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.apps.mapper.HualalaFoodCategoryMapper; +import com.gxwebsoft.apps.service.HualalaFoodCategoryService; +import com.gxwebsoft.apps.entity.HualalaFoodCategory; +import com.gxwebsoft.apps.param.HualalaFoodCategoryParam; +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-01-12 09:49:46 + */ +@Service +public class HualalaFoodCategoryServiceImpl extends ServiceImpl implements HualalaFoodCategoryService { + + @Override + public PageResult pageRel(HualalaFoodCategoryParam 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(HualalaFoodCategoryParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + //page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public HualalaFoodCategory getByIdRel(Integer id) { + HualalaFoodCategoryParam param = new HualalaFoodCategoryParam(); + param.setId(id); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/apps/service/impl/HualalaFoodServiceImpl.java b/src/main/java/com/gxwebsoft/apps/service/impl/HualalaFoodServiceImpl.java new file mode 100644 index 0000000..6b85ae5 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/service/impl/HualalaFoodServiceImpl.java @@ -0,0 +1,52 @@ +package com.gxwebsoft.apps.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.apps.mapper.HualalaFoodMapper; +import com.gxwebsoft.apps.service.HualalaFoodService; +import com.gxwebsoft.apps.entity.HualalaFood; +import com.gxwebsoft.apps.param.HualalaFoodParam; +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-01-12 15:34:55 + */ +@Service +public class HualalaFoodServiceImpl extends ServiceImpl implements HualalaFoodService { + + @Override + public PageResult pageRel(HualalaFoodParam 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(HualalaFoodParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + //page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public HualalaFood getByIdRel(Integer id) { + HualalaFoodParam param = new HualalaFoodParam(); + param.setId(id); + return param.getOne(baseMapper.selectListRel(param)); + } + + @Override + public HualalaFood getByFoodId(Integer foodId) { + return query().like("foodId", foodId).one(); + } + +} diff --git a/src/main/java/com/gxwebsoft/apps/service/impl/HualalaServiceImpl.java b/src/main/java/com/gxwebsoft/apps/service/impl/HualalaServiceImpl.java new file mode 100644 index 0000000..6150635 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/service/impl/HualalaServiceImpl.java @@ -0,0 +1,178 @@ +package com.gxwebsoft.apps.service.impl; + +import cn.hutool.core.util.RandomUtil; +import cn.hutool.core.util.StrUtil; +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.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.apps.entity.Hualala; +import com.gxwebsoft.apps.entity.HualalaFoodCategory; +import com.gxwebsoft.apps.entity.HualalaShop; +import com.gxwebsoft.apps.mapper.HualalaMapper; +import com.gxwebsoft.apps.param.HualalaShopParam; +import com.gxwebsoft.apps.service.HualalaService; +import com.gxwebsoft.shop.entity.Merchant; +import com.gxwebsoft.shop.entity.Order; +import com.gxwebsoft.shop.entity.OrderGoods; +import com.gxwebsoft.shop.mapper.OrderGoodsMapper; +import com.gxwebsoft.shop.param.MerchantParam; +import com.gxwebsoft.shop.service.OrderGoodsService; +import lombok.SneakyThrows; +import lombok.val; +import org.apache.commons.codec.binary.Base64; +import org.springframework.data.geo.*; +import org.springframework.data.redis.connection.RedisGeoCommands; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Service; +import org.springframework.web.client.RestTemplate; + +import javax.annotation.Resource; +import java.nio.charset.StandardCharsets; +import java.security.MessageDigest; +import java.util.*; +import java.util.stream.Collectors; + +import static com.gxwebsoft.apps.constants.HualalaConstants.*; +import static com.gxwebsoft.apps.constants.SfExpressConstants.*; +import static com.gxwebsoft.common.core.constants.RedisConstants.MERCHANT_GEO_KEY; + +/** + * 哗啦啦Service实现 + * + * @author 科技小王子 + * @since 2022-11-25 12:55:33 + */ +@Service +public class HualalaServiceImpl extends ServiceImpl implements HualalaService { + @Resource + private OrderGoodsMapper orderGoodsMapper; + + @Override + public JSONObject doPost(String url, Map requestBody) { + // 当前时间戳 + Long timestamp = System.currentTimeMillis(); + // 店铺ID + String shopId = null; + if(requestBody.get("shopId") != null){ + shopId = requestBody.get("shopId").toString(); + } + HashMap map = new HashMap<>(); + map.put("timestamp",timestamp); + map.put("appKey",APP_KEY); + map.put("signature",getSignature(timestamp,requestBody)); + map.put("version",VERSION); + map.put("requestBody", JSON.toJSONString(requestBody)); + System.out.println("map = " + map); + // 执行post请求 + String result = HttpRequest.post(API_URL.concat(url)) + .header("traceID", UUID.randomUUID().toString()) + .header("groupID", GROUP_ID) + .header("shopId",shopId) + .form(map) + .timeout(20000) + .execute() + .body(); +// System.out.println("result0 = " + result); + + // 返回数据 + return JSON.parseObject(result); + } + + @Override + public JSONObject doExpress(Order orderInfo) { + List orderGoods = orderGoodsMapper.selectByOrderId(orderInfo.getOrderId()); + + JSONObject json = new JSONObject(); + json.put("dev_id",DEV_ID); // 同城开发者ID + json.put("shop_id",SHOP_ID); // 店铺ID + json.put("shop_order_id", orderInfo.getOrderNo()); // 商家订单号 不允许重复(使用相同商家订单号会幂等返回) + json.put("order_source","微信小程序"); // 订单接入来源 1：美团；2：饿了么；3：饿了么零售；4：口碑； 其他请直接填写中文字符串值 + long timestamp = new Date().getTime(); + System.out.println("timestamp = " + timestamp); + json.put("order_time",timestamp/1000); // 用户下单时间 + json.put("push_time",timestamp/1000); // 推单时间 + json.put("version",19); // 版本号 19 + + // 收货人信息 + JSONObject receive = new JSONObject(); + receive.put("user_name","顺丰同城"); // 用户姓名 + receive.put("user_phone","18978189563");// 用户电话 + receive.put("user_address","北京市海淀区学清嘉创大厦A座15层"); // 用户地址 + receive.put("user_lng","116.354787"); // 用户经度 + receive.put("user_lat","40.030613"); // 用户纬度 + json.put("receive",receive); + + // 物品详情 + ArrayList productDetail = new ArrayList<>(); + orderGoods.forEach(goods -> { + JSONObject item = new JSONObject(); + item.put("product_name",goods.getGoodsName()); + item.put("product_id",goods.getGoodsId()); + item.put("product_num",goods.getTotalNum()); + item.put("product_price",goods.getTotalPrice()); + item.put("product_unit","份"); + item.put("item_detail",""); + productDetail.add(item); + }); + + // 订单详情 + JSONObject orderDetail = new JSONObject(); + orderDetail.put("total_price",orderInfo.getTotalPrice()); // 用户订单商品总金额（单位：分） + orderDetail.put("product_type",21); // 物品类型 21:中餐 + orderDetail.put("weight_gram",0); // 物品重量（单位：克） + orderDetail.put("product_num",1); // 物品个数 + orderDetail.put("product_type_num",1);// 物品种类个数 + orderDetail.put("product_detail",productDetail); // 物品详情 + json.put("order_detail",orderDetail); + String postData = json.toString(); + + System.out.println("postData = " + postData); + + String url = SERVER_HOST.concat("/open/api/external/createorder?sign=").concat(generateOpenSign(postData)); + String result = HttpUtil.post(url, postData); + JSONObject jsonObject = JSON.parseObject(result); + return JSON.parseObject(jsonObject.getString("result")); + } + + // 生成签名(哗啦啦) + private String getSignature(Long timestamp,Map params) { + // 拼接字符串 + String sign = ""; + params.put("groupID",GROUP_ID); + String concat = sign.concat(APP_KEY).concat(APP_SECRET).concat(timestamp.toString()).concat(JSON.toJSONString(params)); +// System.out.println("签名加密前字符串为 = " + concat); + // md5加密 + String md5 = DigestUtil.md5Hex(concat); +// System.out.println("md5加密后获得签名 = " + md5); + return md5; + } + + // 生成签名(顺丰速递) + @SneakyThrows + private static String generateOpenSign(String postData) { + StringBuilder sb = new StringBuilder(); + sb.append(postData); + sb.append("&" + DEV_ID + "&" + DEV_KEY); + System.out.println("sb = " + sb); + MessageDigest md = MessageDigest.getInstance("MD5"); + byte[] md5 = md.digest(sb.toString().getBytes(StandardCharsets.UTF_8)); + int i; + StringBuffer buf = new StringBuffer(""); + for (int offset = 0; offset < md5.length; offset++) { + i = md5[offset]; + if (i < 0) { + i += 256; + } + if (i < 16) { + buf.append("0"); + } + buf.append(Integer.toHexString(i)); + } + + return Base64.encodeBase64String(buf.toString().getBytes(StandardCharsets.UTF_8)); + } +} diff --git a/src/main/java/com/gxwebsoft/apps/service/impl/HualalaShopServiceImpl.java b/src/main/java/com/gxwebsoft/apps/service/impl/HualalaShopServiceImpl.java new file mode 100644 index 0000000..8295245 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/service/impl/HualalaShopServiceImpl.java @@ -0,0 +1,134 @@ +package com.gxwebsoft.apps.service.impl; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.apps.mapper.HualalaShopMapper; +import com.gxwebsoft.apps.service.HualalaShopService; +import com.gxwebsoft.apps.entity.HualalaShop; +import com.gxwebsoft.apps.param.HualalaShopParam; +import com.gxwebsoft.common.core.web.PageParam; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.shop.entity.Merchant; +import org.springframework.data.geo.*; +import org.springframework.data.redis.connection.RedisGeoCommands; +import org.springframework.data.redis.core.StringRedisTemplate; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +import static com.gxwebsoft.common.core.constants.RedisConstants.MERCHANT_GEO_KEY; +import static com.gxwebsoft.common.core.constants.RedisConstants.haulalaGeoKey; + +/** + * 哗啦啦门店管理Service实现 + * + * @author 科技小王子 + * @since 2023-01-12 18:24:44 + */ +@Service +public class HualalaShopServiceImpl extends ServiceImpl implements HualalaShopService { + + @Resource + private StringRedisTemplate stringRedisTemplate; + + @Override + public PageResult pageRel(HualalaShopParam 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(HualalaShopParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + //page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public HualalaShop getByIdRel(Integer shopId) { + HualalaShopParam param = new HualalaShopParam(); + param.setShopId(Long.valueOf(shopId)); + return param.getOne(baseMapper.selectListRel(param)); + } + + + @Override + public List listByGeo(HualalaShopParam param) { + // 1. 是否按距离排序 +// if (param.getMapLongitudeValueBaiDu() == null) { +// System.out.println("param = " + param); +// // 无定位信息 +// return list(); +// } +// System.out.println("param333 = " + param); + // 2. 查询10公里内的10家店铺 + final Point point = new Point(Double.parseDouble(param.getMapLongitudeValueBaiDu()), Double.parseDouble(param.getMapLatitudeValueBaiDu())); +// System.out.println("point = " + point); + RedisGeoCommands.GeoRadiusCommandArgs geoRadiusCommandArgs = RedisGeoCommands.GeoRadiusCommandArgs.newGeoRadiusArgs(); +// final Distance distance1 = new Distance(5, Metrics.KILOMETERS); + GeoResults> results = stringRedisTemplate.opsForGeo().radius(haulalaGeoKey, new Circle(point, 200000), geoRadiusCommandArgs.includeDistance().limit(30)); +// System.out.println("results = " + results); + assert results != null; + final List>> list = results.getContent(); + System.out.println("list.size() = " + list.size()); + // 如查找不到店铺点位则批量写入 + if (list.size() == 0) { + this.saveGeoPointToRedis(); + return null; + } + List ids = new ArrayList<>(list.size()); + Map distanceMap = new HashMap<>(list.size()); + list.forEach(d -> { + // 获取店铺ID + String shopId = d.getContent().getName(); + ids.add(shopId); + // 获取距离 + Distance distance = d.getDistance(); +// System.out.println("distance = " + distance); + distanceMap.put(shopId, distance); + }); +// System.out.println("ids = " + ids); +// System.out.println("distanceMap = " + distanceMap); + final List shops = query().in("shop_id", ids).last("ORDER BY FIELD(shop_id," + StrUtil.join(",", ids) + ")").list(); +// System.out.println("shops = " + shops); + for (HualalaShop shop : shops) { + shop.setDistance(distanceMap.get(StrUtil.toString(shop.getShopId())).getValue()); + } + + return shops; + } + + + /** + * 更新所有商户点位信息 + */ + @Override + public void saveGeoPointToRedis() { + // 1.查询所有商户 + final List list = list(); + // 2.然后按品牌分组，把品牌id一致的放到一个集合 + final Map> map = list.stream().collect(Collectors.groupingBy(HualalaShop::getShopId)); + // 3.分批完成写入Redis + for (Map.Entry> entry : map.entrySet()) { + // 3.1 获取商户的集合 + List value = entry.getValue(); + List> locatioins = new ArrayList<>(value.size()); + // 3.2 写入redis GEOADD key 经度 维度 member + for (HualalaShop shop : value) { + locatioins.add(new RedisGeoCommands.GeoLocation<>(shop.getShopId().toString(), new Point(shop.getMapLongitudeValueBaiDu(), shop.getMapLatitudeValueBaiDu()))); + } +// System.out.println("locatioins = " + locatioins); + stringRedisTemplate.opsForGeo().add(haulalaGeoKey, locatioins); + } + } + +} diff --git a/src/main/java/com/gxwebsoft/apps/service/impl/LinkServiceImpl.java b/src/main/java/com/gxwebsoft/apps/service/impl/LinkServiceImpl.java new file mode 100644 index 0000000..7631ca6 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/service/impl/LinkServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.apps.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.apps.mapper.LinkMapper; +import com.gxwebsoft.apps.service.LinkService; +import com.gxwebsoft.apps.entity.Link; +import com.gxwebsoft.apps.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 2022-11-25 12:55:33 + */ +@Service +public class LinkServiceImpl extends ServiceImpl implements LinkService { + + @Override + public PageResult pageRel(LinkParam 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(LinkParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + //page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public Link getByIdRel(Integer linkId) { + LinkParam param = new LinkParam(); + param.setLinkId(linkId); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/apps/service/impl/TestDataServiceImpl.java b/src/main/java/com/gxwebsoft/apps/service/impl/TestDataServiceImpl.java new file mode 100644 index 0000000..69f79a4 --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/service/impl/TestDataServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.apps.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.apps.mapper.TestDataMapper; +import com.gxwebsoft.apps.service.TestDataService; +import com.gxwebsoft.apps.entity.TestData; +import com.gxwebsoft.apps.param.TestDataParam; +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-02-01 12:13:46 + */ +@Service +public class TestDataServiceImpl extends ServiceImpl implements TestDataService { + + @Override + public PageResult pageRel(TestDataParam 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(TestDataParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + //page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public TestData getByIdRel(Integer id) { + TestDataParam param = new TestDataParam(); + param.setId(id); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/apps/utils/BcUtil.java b/src/main/java/com/gxwebsoft/apps/utils/BcUtil.java new file mode 100644 index 0000000..1eb1d3b --- /dev/null +++ b/src/main/java/com/gxwebsoft/apps/utils/BcUtil.java @@ -0,0 +1,118 @@ +package com.gxwebsoft.apps.utils; + +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; +import cn.hutool.http.HttpUtil; +import com.alibaba.fastjson.JSONObject; +import org.springframework.data.redis.core.StringRedisTemplate; +import org.springframework.stereotype.Component; + +import java.util.ArrayList; +import java.util.HashMap; + +/** + * 报餐系统工具类 + * @author 科技小王子 + * + */ +@Component +public class BcUtil { + private final StringRedisTemplate stringRedisTemplate; + public Integer categoryId; + public Integer tenantId; + + public BcUtil(StringRedisTemplate stringRedisTemplate){ + this.stringRedisTemplate = stringRedisTemplate; + } + + // 判断当前餐段 + public Integer getCurrentPeriod(Integer tenantId) { + // 今天开始时间 2023-05-01 00:00:00 + DateTime parse = DateUtil.parse(DateUtil.today()); + // 早餐开始时间 2023-05-01 07:00:00 + DateTime breakfastStart = DateUtil.offsetMinute(parse, 7*60); + // 早餐截止时间 2023-05-01 07:55:00 + DateTime breakfastEnd = DateUtil.offsetMinute(parse, 7*60 + 55); + // 午餐开始时间 2023-05-01 13:00:00 + DateTime lunchStart = DateUtil.offsetMinute(parse, 11*60 + 50); + // 午餐截止时间 2023-05-01 13:00:00 + DateTime lunchEnd = DateUtil.offsetMinute(parse, 13*60); + // 晚餐截止时间 2023-05-01 19:30:00 + DateTime dinnerStart = DateUtil.offsetMinute(parse, 17*60 + 30); + // 晚餐截止时间 2023-05-01 19:30:00 + DateTime dinnerEnd = DateUtil.offsetMinute(parse, 19*60 + 30); + + // 读取后台配置 +// String key = "cache" + tenantId + ":setting:BaoCan"; +// System.out.println("读取后台配置 = " + key); +// final String cache = stringRedisTemplate.opsForValue().get(key); +// if(cache != null){ +// DateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'"); +// final JSONObject jsonObject = JSONObject.parseObject(cache); +// System.out.println("jsonObject = " + jsonObject); +// final String breakfastStartTime = jsonObject.getString("breakfastStartTime"); +// final String breakfastEndTime = jsonObject.getString("breakfastEndTime"); +// final String lunchStartTime = jsonObject.getString("lunchStartTime"); +// final String lunchEndTime = jsonObject.getString("lunchEndTime"); +// final String dinnerStartTime = jsonObject.getString("dinnerStartTime"); +// final String dinnerEndTime = jsonObject.getString("dinnerEndTime"); +// breakfastStart = DateUtil.parse(DateUtil.format(DateUtil.parse(breakfastStartTime), df)); +// breakfastEnd = DateUtil.parse(DateUtil.format(DateUtil.parse(breakfastEndTime), df)); +// lunchStart = DateUtil.parse(DateUtil.format(DateUtil.parse(lunchStartTime), df)); +// lunchEnd = DateUtil.parse(DateUtil.format(DateUtil.parse(lunchEndTime), df)); +// dinnerStart = DateUtil.parse(DateUtil.format(DateUtil.parse(dinnerStartTime), df)); +// dinnerEnd = DateUtil.parse(DateUtil.format(DateUtil.parse(dinnerEndTime), df)); +// +// System.out.println("breakfastStart = " + breakfastStart); +// System.out.println("breakfastEndTime = " + breakfastEndTime); +// System.out.println("lunchStartTime = " + lunchStartTime); +// System.out.println("lunchEndTime = " + lunchEndTime); +// System.out.println("dinnerStartTime = " + dinnerStartTime); +// System.out.println("dinnerEndTime = " + dinnerEndTime); +// +// } + + // 早餐时间段 + if(DateUtil.date().compareTo(breakfastStart) > 0 && DateUtil.date().compareTo(breakfastEnd) < 0){ + System.out.println("早餐时间段 = "); + this.categoryId = 25; + return 25; + } + // 午餐时间段 + if(DateUtil.date().compareTo(lunchStart) > 0 && DateUtil.date().compareTo(lunchEnd) < 0){ + System.out.println("午餐时间段 = "); + this.categoryId = 26; + return 26; + } + // 晚餐时间段 + if(DateUtil.date().compareTo(dinnerStart) > 0 && DateUtil.date().compareTo(dinnerEnd) < 0){ + System.out.println("晚餐时间段 = "); + this.categoryId = 27; + return 27; + } + return 0; + } + + // 发送消息提醒 + public void send(String content) { + // 1.获取access_token + String key = "cache10048:ww:access_token"; + String access_token = stringRedisTemplate.opsForValue().get(key); + System.out.println("access_token = " + access_token); + String url = "https://qyapi.weixin.qq.com/cgi-bin/message/send?access_token=" + access_token; + final ArrayList toUsers = new ArrayList<>(); + toUsers.add("ZhaiLing"); + toUsers.add("LiangYun"); + toUsers.add("zhaozhonglin"); + final HashMap map = new HashMap<>(); + map.put("msgtype","text"); + map.put("agentid","wxa040285bc1c223ae"); +// map.put("toall",1); + map.put("touser",toUsers); + final HashMap text = new HashMap<>(); + text.put("content",content); + map.put("text",text); + System.out.println("发送消息提醒 = " + JSONObject.toJSONString(map)); + final String post = HttpUtil.post(url, JSONObject.toJSONString(map)); + } +} diff --git a/src/main/java/com/gxwebsoft/cms/controller/ArticleCategoryController.java b/src/main/java/com/gxwebsoft/cms/controller/ArticleCategoryController.java new file mode 100644 index 0000000..9df3500 --- /dev/null +++ b/src/main/java/com/gxwebsoft/cms/controller/ArticleCategoryController.java @@ -0,0 +1,141 @@ +package com.gxwebsoft.cms.controller; + +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.cms.service.ArticleCategoryService; +import com.gxwebsoft.cms.entity.ArticleCategory; +import com.gxwebsoft.cms.param.ArticleCategoryParam; +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.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 2022-11-22 17:49:15 + */ +@Api(tags = "文章分类表管理") +@RestController +@RequestMapping("/api/cms/article-category") +public class ArticleCategoryController extends BaseController { + @Resource + private ArticleCategoryService articleCategoryService; + + @PreAuthorize("hasAuthority('cms:articleCategory:list')") + @OperationLog + @ApiOperation("分页查询文章分类表") + @GetMapping("/page") + public ApiResult> page(ArticleCategoryParam param) { + PageParam page = new PageParam<>(param); +// page.setDefaultOrder("create_time desc"); + page.setDefaultOrder("sort_number"); + return success(articleCategoryService.page(page, page.getWrapper())); + // 使用关联查询 + //return success(articleCategoryService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('cms:articleCategory:list')") + @OperationLog + @ApiOperation("查询全部文章分类表") + @GetMapping() + public ApiResult> list(ArticleCategoryParam param) { + PageParam page = new PageParam<>(param); +// page.setDefaultOrder("create_time desc"); + page.setDefaultOrder("sort_number"); + return success(articleCategoryService.list(page.getOrderWrapper())); + // 使用关联查询 + //return success(articleCategoryService.listRel(param)); + } + + @PreAuthorize("hasAuthority('cms:articleCategory:list')") + @OperationLog + @ApiOperation("根据id查询文章分类表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + return success(articleCategoryService.getById(id)); + // 使用关联查询 + //return success(articleCategoryService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('cms:articleCategory:save')") + @OperationLog + @ApiOperation("添加文章分类表") + @PostMapping() + public ApiResult save(@RequestBody ArticleCategory articleCategory) { + // 记录当前登录用户id、租户id + User loginUser = getLoginUser(); + if (loginUser != null) { + articleCategory.setUserId(loginUser.getUserId()); + } + if (articleCategoryService.save(articleCategory)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('cms:articleCategory:update')") + @OperationLog + @ApiOperation("修改文章分类表") + @PutMapping() + public ApiResult update(@RequestBody ArticleCategory articleCategory) { + if (articleCategoryService.updateById(articleCategory)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('cms:articleCategory:remove')") + @OperationLog + @ApiOperation("删除文章分类表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (articleCategoryService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('cms:articleCategory:save')") + @OperationLog + @ApiOperation("批量添加文章分类表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (articleCategoryService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('cms:articleCategory:update')") + @OperationLog + @ApiOperation("批量修改文章分类表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(articleCategoryService, "category_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('cms:articleCategory:remove')") + @OperationLog + @ApiOperation("批量删除文章分类表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (articleCategoryService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/cms/controller/ArticleCommentController.java b/src/main/java/com/gxwebsoft/cms/controller/ArticleCommentController.java new file mode 100644 index 0000000..d5b9391 --- /dev/null +++ b/src/main/java/com/gxwebsoft/cms/controller/ArticleCommentController.java @@ -0,0 +1,170 @@ +package com.gxwebsoft.cms.controller; + +import com.gxwebsoft.cms.entity.Article; +import com.gxwebsoft.cms.entity.ArticleComment; +import com.gxwebsoft.cms.param.ArticleCommentParam; +import com.gxwebsoft.cms.param.ArticleParam; +import com.gxwebsoft.cms.service.ArticleCommentService; +import com.gxwebsoft.cms.service.ArticleService; +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.User; +import com.gxwebsoft.love.socketio.cache.ClientCache; +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-07-07 14:14:35 + */ +@Api(tags = "文章评论表管理") +@RestController +@RequestMapping("/api/cms/article-comment") +public class ArticleCommentController extends BaseController { + @Resource + private ArticleCommentService articleCommentService; + @Resource + private ArticleService articleService; + + @Resource + private ClientCache clientCache; + + + @PreAuthorize("hasAuthority('cms:articleComment:list')") + @OperationLog + @ApiOperation("获取未读评论数") + @GetMapping("/unread") + public ApiResult page() { + User loginUser = getLoginUser(); + return success(articleCommentService.getUserUnReadCount(loginUser.getUserId())); + } + + @PreAuthorize("hasAuthority('cms:articleComment:list')") + @OperationLog + @ApiOperation("分页查询文章评论表") + @GetMapping("/page") + public ApiResult> page(ArticleCommentParam param) { + User loginUser = getLoginUser(); + // 使用关联查询 + if(loginUser != null){ + param.setLoginUserId(getLoginUserId()); + } + // 使用关联查询 + return success(articleCommentService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('cms:articleComment:list')") + @OperationLog + @ApiOperation("查询全部文章评论表") + @GetMapping() + public ApiResult> list(ArticleCommentParam param) { + // 使用关联查询 + return success(articleCommentService.listRel(param)); + } + + @PreAuthorize("hasAuthority('cms:articleComment:list')") + @OperationLog + @ApiOperation("根据id查询文章评论表") + @GetMapping("/{id}") + public ApiResult> get(@PathVariable("id") Integer id) { + final ArticleComment comment = articleCommentService.getByIdRel(id); + // 查询文章 + ArticleParam param = new ArticleParam(); + param.setArticleId(comment.getArticleId()); + comment.setStatus(1); + articleCommentService.updateById(comment); + final PageResult
result = articleService.pageRel(param); + return success(result); + } + + @PreAuthorize("hasAuthority('cms:articleComment:save')") + @OperationLog + @ApiOperation("添加文章评论表") + @PostMapping() + public ApiResult save(@RequestBody ArticleComment articleComment) { + // 记录当前登录用户id + User loginUser = getLoginUser(); + if (loginUser != null) { + articleComment.setUserId(loginUser.getUserId()); + } + if (articleCommentService.save(articleComment)) { + // 累加文章评论数量 + final Article article = articleService.getById(articleComment.getArticleId()); + article.setCommentNumbers(articleComment.getCountComment() + 1); + articleService.updateById(article); + // 获取未读评论数 + int count = articleCommentService.getUserUnReadCount(articleComment.getToUserId()); + if(!articleComment.getUserId().equals(articleComment.getToUserId())){ + clientCache.sendUserEvent(articleComment.getToUserId() + "", "pyq", count); + } + return success("发表成功",article); + } + return fail("发表失败"); + } + + @PreAuthorize("hasAuthority('cms:articleComment:update')") + @OperationLog + @ApiOperation("修改文章评论表") + @PutMapping() + public ApiResult update(@RequestBody ArticleComment articleComment) { + if (articleCommentService.updateById(articleComment)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('cms:articleComment:remove')") + @OperationLog + @ApiOperation("删除文章评论表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (articleCommentService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('cms:articleComment:save')") + @OperationLog + @ApiOperation("批量添加文章评论表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (articleCommentService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('cms:articleComment:update')") + @OperationLog + @ApiOperation("批量修改文章评论表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(articleCommentService, "comment_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('cms:articleComment:remove')") + @OperationLog + @ApiOperation("批量删除文章评论表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (articleCommentService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/cms/controller/ArticleController.java b/src/main/java/com/gxwebsoft/cms/controller/ArticleController.java new file mode 100644 index 0000000..fdf4d0c --- /dev/null +++ b/src/main/java/com/gxwebsoft/cms/controller/ArticleController.java @@ -0,0 +1,142 @@ +package com.gxwebsoft.cms.controller; + +import com.gxwebsoft.cms.entity.Article; +import com.gxwebsoft.cms.param.ArticleParam; +import com.gxwebsoft.cms.service.ArticleService; +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.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 WebSoft + * @since 2022-11-16 11:40:27 + */ +@Api(tags = "文章记录表管理") +@RestController +@RequestMapping("/api/cms/article") +public class ArticleController extends BaseController { + @Resource + private ArticleService articleService; + + @PreAuthorize("hasAuthority('cms:article:list')") + @OperationLog + @ApiOperation("分页查询文章记录表") + @GetMapping("/page") + public ApiResult> page(ArticleParam param) { + User loginUser = getLoginUser(); + if (loginUser != null) { + param.setLoginUserId(loginUser.getUserId()); + // 按用户所在城市查询 + if (param.getScene() != null && param.getScene().equals("intraCity")) { + param.setCity(loginUser.getCity()); + } + } + return success(articleService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('cms:article:list')") + @OperationLog + @ApiOperation("查询全部文章记录表") + @GetMapping() + public ApiResult> list(ArticleParam param) { + // 使用关联查询 + return success(articleService.listRel(param)); + } + + @PreAuthorize("hasAuthority('cms:article:list')") + @OperationLog + @ApiOperation("根据id查询文章记录表") + @GetMapping("/{id}") + public ApiResult
get(@PathVariable("id") Integer id) { + // 使用关联查询 + Article article = articleService.getByIdRel(id); + article.setArticleId(id); + article.setVirtualViews(article.getVirtualViews()+1); + articleService.saveOrUpdate(article); + return success(article); + } + + @PreAuthorize("hasAuthority('cms:article:save')") + @OperationLog + @ApiOperation("添加文章记录表") + @PostMapping() + public ApiResult save(@RequestBody Article article) { + // 记录当前登录用户id、租户id + User loginUser = getLoginUser(); + if (loginUser != null && article.getUserId() == null) { + article.setUserId(loginUser.getUserId()); + } + if (articleService.save(article)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('cms:article:update')") + @OperationLog + @ApiOperation("修改文章记录表") + @PutMapping() + public ApiResult update(@RequestBody Article article) { + if (articleService.updateById(article)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('cms:article:remove')") + @OperationLog + @ApiOperation("删除文章记录表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (articleService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('cms:article:save')") + @OperationLog + @ApiOperation("批量添加文章记录表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List
list) { + if (articleService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('cms:article:update')") + @OperationLog + @ApiOperation("批量修改文章记录表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam
batchParam) { + if (batchParam.update(articleService, "article_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('cms:article:remove')") + @OperationLog + @ApiOperation("批量删除文章记录表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (articleService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/cms/controller/ArticleLikeController.java b/src/main/java/com/gxwebsoft/cms/controller/ArticleLikeController.java new file mode 100644 index 0000000..33401fb --- /dev/null +++ b/src/main/java/com/gxwebsoft/cms/controller/ArticleLikeController.java @@ -0,0 +1,162 @@ +package com.gxwebsoft.cms.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.gxwebsoft.cms.entity.Article; +import com.gxwebsoft.cms.entity.ArticleLike; +import com.gxwebsoft.cms.param.ArticleLikeParam; +import com.gxwebsoft.cms.service.ArticleLikeService; +import com.gxwebsoft.cms.service.ArticleService; +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.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 2023-07-07 13:00:03 + */ +@Api(tags = "点赞文章管理") +@RestController +@RequestMapping("/api/cms/article-like") +public class ArticleLikeController extends BaseController { + @Resource + private ArticleLikeService articleLikeService; + @Resource + private ArticleService articleService; + + @PreAuthorize("hasAuthority('cms:articleLike:list')") + @OperationLog + @ApiOperation("分页查询点赞文章") + @GetMapping("/page") + public ApiResult> page(ArticleLikeParam param) { + User loginUser = getLoginUser(); + if (loginUser != null) { + param.setUserId(loginUser.getUserId()); + } + return success(articleLikeService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('cms:articleLike:list')") + @OperationLog + @ApiOperation("查询全部点赞文章") + @GetMapping() + public ApiResult> list(ArticleLikeParam param) { + // 使用关联查询 + return success(articleLikeService.listRel(param)); + } + + @PreAuthorize("hasAuthority('cms:articleLike:list')") + @OperationLog + @ApiOperation("根据id查询点赞文章") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + // 使用关联查询 + return success(articleLikeService.getByIdRel(id)); + } + + @ApiOperation("添加点赞文章") + @PostMapping() + public ApiResult save(@RequestBody ArticleLike articleLike) { + // 记录当前登录用户id + User loginUser = getLoginUser(); + if (loginUser == null) { + return fail("请先登录",null); + } + // 获取文章 + Article article = articleService.getById(articleLike.getArticleId()); + // 我是否已点赞 + ArticleLike one = articleLikeService.getOne(new LambdaQueryWrapper() + .eq(ArticleLike::getArticleId, articleLike.getArticleId()) + .eq(ArticleLike::getUserId, loginUser.getUserId())); + + articleLike.setUserId(loginUser.getUserId()); + + if (!articleLike.getLiked() && one == null) { + // 点赞行为 + articleLikeService.save(articleLike); + // 更新点赞数量 + article.setLikes(article.getLikes() + 1); + article.setLiked(true); + articleService.updateById(article); + return success("点赞成功",article); + }else if(articleLike.getLiked() && one != null) { + // 取消点赞 + articleLikeService.removeById(one.getId()); + // 更新点赞数量 + article.setLikes(article.getLikes() - 1); + article.setLiked(false); + articleService.updateById(article); + return success("已取消点赞",article); + }else { + article.setLiked(!articleLike.getLiked()); + return success("操作失败",article); + } + } + + @PreAuthorize("hasAuthority('cms:articleLike:update')") + @OperationLog + @ApiOperation("修改点赞文章") + @PutMapping() + public ApiResult update(@RequestBody ArticleLike articleLike) { + if (articleLikeService.updateById(articleLike)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('cms:articleLike:remove')") + @OperationLog + @ApiOperation("删除点赞文章") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (articleLikeService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('cms:articleLike:save')") + @OperationLog + @ApiOperation("批量添加点赞文章") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (articleLikeService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('cms:articleLike:update')") + @OperationLog + @ApiOperation("批量修改点赞文章") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(articleLikeService, "id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('cms:articleLike:remove')") + @OperationLog + @ApiOperation("批量删除点赞文章") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (articleLikeService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/cms/controller/DocsController.java b/src/main/java/com/gxwebsoft/cms/controller/DocsController.java new file mode 100644 index 0000000..5a9e925 --- /dev/null +++ b/src/main/java/com/gxwebsoft/cms/controller/DocsController.java @@ -0,0 +1,139 @@ +package com.gxwebsoft.cms.controller; + +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.cms.service.DocsService; +import com.gxwebsoft.cms.entity.Docs; +import com.gxwebsoft.cms.param.DocsParam; +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.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 2022-11-16 11:40:27 + */ +@Api(tags = "文档管理记录表管理") +@RestController +@RequestMapping("/api/cms/docs") +public class DocsController extends BaseController { + @Resource + private DocsService docsService; + + @PreAuthorize("hasAuthority('cms:docs:list')") + @OperationLog + @ApiOperation("分页查询文档管理记录表") + @GetMapping("/page") + public ApiResult> page(DocsParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("sort_number asc,create_time asc"); + return success(docsService.page(page, page.getWrapper())); + // 使用关联查询 +// return success(docsService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('cms:docs:list')") + @OperationLog + @ApiOperation("查询全部文档管理记录表") + @GetMapping() + public ApiResult> list(DocsParam param) { + PageParam page = new PageParam<>(param); +// page.setDefaultOrder("sort_number asc,create_time asc"); +// return success(docsService.list(page.getOrderWrapper())); + // 使用关联查询 + return success(docsService.listRel(param)); + } + + @PreAuthorize("hasAuthority('cms:docs:list')") + @OperationLog + @ApiOperation("根据id查询文档管理记录表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + return success(docsService.getById(id)); + // 使用关联查询 + //return success(docsService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('cms:docs:save')") + @OperationLog + @ApiOperation("添加文档管理记录表") + @PostMapping() + public ApiResult save(@RequestBody Docs docs) { + // 记录当前登录用户id、租户id + User loginUser = getLoginUser(); + if (loginUser != null) { + docs.setUserId(loginUser.getUserId()); + } + if (docsService.save(docs)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('cms:docs:update')") + @OperationLog + @ApiOperation("修改文档管理记录表") + @PutMapping() + public ApiResult update(@RequestBody Docs docs) { + if (docsService.updateById(docs)) { + return success("保存成功"); + } + return fail("保存失败"); + } + + @PreAuthorize("hasAuthority('cms:docs:remove')") + @OperationLog + @ApiOperation("删除文档管理记录表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (docsService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('cms:docs:save')") + @OperationLog + @ApiOperation("批量添加文档管理记录表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (docsService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('cms:docs:update')") + @OperationLog + @ApiOperation("批量修改文档管理记录表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(docsService, "docs_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('cms:docs:remove')") + @OperationLog + @ApiOperation("批量删除文档管理记录表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (docsService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/cms/entity/Article.java b/src/main/java/com/gxwebsoft/cms/entity/Article.java new file mode 100644 index 0000000..c8128bc --- /dev/null +++ b/src/main/java/com/gxwebsoft/cms/entity/Article.java @@ -0,0 +1,151 @@ +package com.gxwebsoft.cms.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-16 11:40:27 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "Article对象", description = "文章记录表") +@TableName("cms_article") +public class Article implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "文章ID") + @TableId(value = "article_id", type = IdType.AUTO) + private Integer articleId; + + @ApiModelProperty(value = "文章标题") + private String title; + + @ApiModelProperty(value = "列表显示方式(10小图展示 20大图展示)") + private Integer showType; + + @ApiModelProperty(value = "话题") + private String topic; + + @ApiModelProperty(value = "文章分类ID") + private Integer categoryId; + + @ApiModelProperty(value = "封面图") + private String image; + + @ApiModelProperty(value = "来源") + private String source; + + @ApiModelProperty(value = "文章内容") + private String content; + + @ApiModelProperty(value = "虚拟阅读量(仅用作展示)") + private Integer virtualViews; + + @ApiModelProperty(value = "实际阅读量") + private Integer actualViews; + + @ApiModelProperty(value = "发布来源客户端") + private String platform; + + @ApiModelProperty(value = "文章附件") + private String files; + + @ApiModelProperty(value = "视频文件地址") + private String video; + + @ApiModelProperty(value = "上传文件类型") + private String accept; + + @ApiModelProperty(value = "经度") + private String longitude; + + @ApiModelProperty(value = "纬度") + private String latitude; + + @ApiModelProperty(value = "所在省份") + private String province; + + @ApiModelProperty(value = "所在城市") + private String city; + + @ApiModelProperty(value = "所在辖区") + private String region; + + @ApiModelProperty("文章发布地点") + private String address; + + @ApiModelProperty("获赞数") + private Integer likes; + + @ApiModelProperty("评论数") + private Integer commentNumbers; + + @ApiModelProperty("提醒谁看") + private String toUsers; + + @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 = "商户编号") + 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 userAvatar; + + @ApiModelProperty(value = "所在城市") + @TableField(exist = false) + private String userCity; + + @ApiModelProperty(value = "是否关注") + @TableField(exist = false) + private Boolean follow; + + @ApiModelProperty(value = "是否点赞") + @TableField(exist = false) + private Boolean liked; + + @ApiModelProperty(value = "年龄") + @TableField(exist = false) + private String age; + + @ApiModelProperty(value = "年龄") + @TableField(exist = false) + private String position; + +} diff --git a/src/main/java/com/gxwebsoft/cms/entity/ArticleCategory.java b/src/main/java/com/gxwebsoft/cms/entity/ArticleCategory.java new file mode 100644 index 0000000..d53ff6e --- /dev/null +++ b/src/main/java/com/gxwebsoft/cms/entity/ArticleCategory.java @@ -0,0 +1,69 @@ +package com.gxwebsoft.cms.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 2022-11-22 17:49:15 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "ArticleCategory对象", description = "文章分类表") +@TableName("cms_article_category") +public class ArticleCategory 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 title; + + @ApiModelProperty(value = "分类索引图") + private String image; + + @ApiModelProperty(value = "上级分类ID") + private Integer parentId; + + @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 = "商户编号") + private String merchantCode; + + @ApiModelProperty(value = "租户id") + private Integer tenantId; + + @ApiModelProperty(value = "注册时间") + private Date createTime; + + @ApiModelProperty(value = "修改时间") + private Date updateTime; + +} diff --git a/src/main/java/com/gxwebsoft/cms/entity/ArticleComment.java b/src/main/java/com/gxwebsoft/cms/entity/ArticleComment.java new file mode 100644 index 0000000..3de83b0 --- /dev/null +++ b/src/main/java/com/gxwebsoft/cms/entity/ArticleComment.java @@ -0,0 +1,151 @@ +package com.gxwebsoft.cms.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-07 14:14:35 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "ArticleComment对象", description = "文章评论表") +@TableName("cms_article_comment") +public class ArticleComment implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "评价ID") + @TableId(value = "comment_id", type = IdType.AUTO) + private Integer commentId; + + @ApiModelProperty(value = "评分 (10好评 20中评 30差评)") + private Integer score; + + @ApiModelProperty(value = "评价内容") + private String content; + + @ApiModelProperty(value = "是否为图片评价") + private Integer isPicture; + + @ApiModelProperty(value = "用户ID") + private Integer userId; + + @ApiModelProperty(value = "回复的评论ID") + private Integer replyCommentId; + + @ApiModelProperty(value = "回复者ID") + private Integer replyUserId; + + @ApiModelProperty(value = "被评论者ID") + private Integer toUserId; + + @ApiModelProperty(value = "文章ID") + private Integer articleId; + + @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 Integer countComment; + + @ApiModelProperty(value = "评论者粉丝数") + @TableField(exist = false) + private Integer fans; + + @ApiModelProperty(value = "是否已点赞") + @TableField(exist = false) + private Integer liked; + + @ApiModelProperty(value = "评论者获赞数") + @TableField(exist = false) + private Boolean likes; + + @ApiModelProperty(value = "评论者所在省份") + @TableField(exist = false) + private String province; + + @ApiModelProperty(value = "评论者所在城市") + @TableField(exist = false) + private String city; + + @ApiModelProperty(value = "被评论者昵称") + @TableField(exist = false) + private String toUserNickname; + + @ApiModelProperty(value = "被评论者头像") + @TableField(exist = false) + private String toUserAvatar; + + @ApiModelProperty(value = "被评论者粉丝数") + @TableField(exist = false) + private Integer toUserFans; + + @ApiModelProperty(value = "被评论者所在省份") + @TableField(exist = false) + private String toUserProvince; + + @ApiModelProperty(value = "被评论者所在城市") + @TableField(exist = false) + private String toUserCity; + + @ApiModelProperty(value = "被评论者获赞数") + @TableField(exist = false) + private Integer toUserLikes; + + @ApiModelProperty(value = "回复者昵称") + @TableField(exist = false) + private String replyNickname; + + @ApiModelProperty(value = "回复者头像") + @TableField(exist = false) + private String replyAvatar; + + @ApiModelProperty(value = "回复者粉丝数") + @TableField(exist = false) + private Integer replyFans; + + @ApiModelProperty(value = "子评论列表") + @TableField(exist = false) + private List children; + +} diff --git a/src/main/java/com/gxwebsoft/cms/entity/ArticleLike.java b/src/main/java/com/gxwebsoft/cms/entity/ArticleLike.java new file mode 100644 index 0000000..3ffdecd --- /dev/null +++ b/src/main/java/com/gxwebsoft/cms/entity/ArticleLike.java @@ -0,0 +1,52 @@ +package com.gxwebsoft.cms.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-07-07 13:00:03 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "ArticleLike对象", description = "点赞文章") +@TableName("cms_article_like") +public class ArticleLike 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 articleId; + + @ApiModelProperty(value = "用户ID") + private Integer userId; + + @ApiModelProperty(value = "租户id") + private Integer tenantId; + + @ApiModelProperty(value = "注册时间") + private Date createTime; + + @ApiModelProperty(value = "是否已点赞") + @TableField(exist = false) + private Boolean liked; + + @ApiModelProperty(value = "文章点赞数量") + @TableField(exist = false) + private Integer likes; + +} diff --git a/src/main/java/com/gxwebsoft/cms/entity/Docs.java b/src/main/java/com/gxwebsoft/cms/entity/Docs.java new file mode 100644 index 0000000..a4128ce --- /dev/null +++ b/src/main/java/com/gxwebsoft/cms/entity/Docs.java @@ -0,0 +1,72 @@ +package com.gxwebsoft.cms.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 WebSoft + * @since 2022-11-16 11:40:27 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "Docs对象", description = "文档管理记录表") +@TableName("cms_docs") +public class Docs implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "文档ID") + @TableId(value = "docs_id", type = IdType.AUTO) + private Integer docsId; + + @ApiModelProperty(value = "文档标题") + private String title; + + @ApiModelProperty(value = "上级目录") + private Integer parentId; + + @ApiModelProperty(value = "用户ID") + private Integer userId; + + @ApiModelProperty(value = "机构id") + private Integer organizationId; + + @ApiModelProperty(value = "可见性(public,private,protected)") + private String visibility; + + @ApiModelProperty(value = "排序(数字越小越靠前)") + private Integer sortNumber; + + @ApiModelProperty(value = "文档内容") + private String content; + + @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/src/main/java/com/gxwebsoft/cms/mapper/ArticleCategoryMapper.java b/src/main/java/com/gxwebsoft/cms/mapper/ArticleCategoryMapper.java new file mode 100644 index 0000000..622c604 --- /dev/null +++ b/src/main/java/com/gxwebsoft/cms/mapper/ArticleCategoryMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.cms.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.cms.entity.ArticleCategory; +import com.gxwebsoft.cms.param.ArticleCategoryParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 文章分类表Mapper + * + * @author 科技小王子 + * @since 2022-11-22 17:49:15 + */ +public interface ArticleCategoryMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") ArticleCategoryParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") ArticleCategoryParam param); + +} diff --git a/src/main/java/com/gxwebsoft/cms/mapper/ArticleCommentMapper.java b/src/main/java/com/gxwebsoft/cms/mapper/ArticleCommentMapper.java new file mode 100644 index 0000000..c105b04 --- /dev/null +++ b/src/main/java/com/gxwebsoft/cms/mapper/ArticleCommentMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.cms.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.cms.entity.ArticleComment; +import com.gxwebsoft.cms.param.ArticleCommentParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 文章评论表Mapper + * + * @author 科技小王子 + * @since 2023-07-07 14:14:35 + */ +public interface ArticleCommentMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") ArticleCommentParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") ArticleCommentParam param); + +} diff --git a/src/main/java/com/gxwebsoft/cms/mapper/ArticleLikeMapper.java b/src/main/java/com/gxwebsoft/cms/mapper/ArticleLikeMapper.java new file mode 100644 index 0000000..e59c77a --- /dev/null +++ b/src/main/java/com/gxwebsoft/cms/mapper/ArticleLikeMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.cms.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.cms.entity.ArticleLike; +import com.gxwebsoft.cms.param.ArticleLikeParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 点赞文章Mapper + * + * @author 科技小王子 + * @since 2023-07-07 13:00:03 + */ +public interface ArticleLikeMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") ArticleLikeParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") ArticleLikeParam param); + +} diff --git a/src/main/java/com/gxwebsoft/cms/mapper/ArticleMapper.java b/src/main/java/com/gxwebsoft/cms/mapper/ArticleMapper.java new file mode 100644 index 0000000..a8130a8 --- /dev/null +++ b/src/main/java/com/gxwebsoft/cms/mapper/ArticleMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.cms.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.cms.entity.Article; +import com.gxwebsoft.cms.param.ArticleParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 文章分类表Mapper + * + * @author 科技小王子 + * @since 2022-11-22 17:49:15 + */ +public interface ArticleMapper extends BaseMapper
{ + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List
+ */ + List
selectPageRel(@Param("page") IPage
page, + @Param("param") ArticleParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List
selectListRel(@Param("param") ArticleParam param); + +} diff --git a/src/main/java/com/gxwebsoft/cms/mapper/DocsMapper.java b/src/main/java/com/gxwebsoft/cms/mapper/DocsMapper.java new file mode 100644 index 0000000..9cfed79 --- /dev/null +++ b/src/main/java/com/gxwebsoft/cms/mapper/DocsMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.cms.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.cms.entity.Docs; +import com.gxwebsoft.cms.param.DocsParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 文档管理记录表Mapper + * + * @author WebSoft + * @since 2022-11-16 11:40:27 + */ +public interface DocsMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") DocsParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") DocsParam param); + +} diff --git a/src/main/java/com/gxwebsoft/cms/mapper/xml/ArticleCategoryMapper.xml b/src/main/java/com/gxwebsoft/cms/mapper/xml/ArticleCategoryMapper.xml new file mode 100644 index 0000000..59922bd --- /dev/null +++ b/src/main/java/com/gxwebsoft/cms/mapper/xml/ArticleCategoryMapper.xml @@ -0,0 +1,59 @@ + + + + + + + SELECT a.* + FROM cms_article_category a + + + AND a.category_id = #{param.categoryId} + + + AND a.title LIKE CONCAT('%', #{param.title}, '%') + + + AND a.image LIKE CONCAT('%', #{param.image}, '%') + + + AND a.parent_id = #{param.parentId} + + + 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/src/main/java/com/gxwebsoft/cms/mapper/xml/ArticleCommentMapper.xml b/src/main/java/com/gxwebsoft/cms/mapper/xml/ArticleCommentMapper.xml new file mode 100644 index 0000000..9506e9b --- /dev/null +++ b/src/main/java/com/gxwebsoft/cms/mapper/xml/ArticleCommentMapper.xml @@ -0,0 +1,78 @@ + + + + + + + SELECT a.*, + b.nickname as toUserNickname, b.avatar as toUserAvatar,b.fans as toUserFans,b.province as toUserProvince,b.city as toUserCity,b.likes as toUserLikes, + c.nickname,c.avatar,c.fans,c.province,c.city,c.likes, + d.nickname as replyNickname,d.avatar as replyAvatar,d.fans as replyFans + FROM cms_article_comment a + LEFT JOIN sys_user b ON a.to_user_id = b.user_id + LEFT JOIN sys_user c ON a.user_id = c.user_id + LEFT JOIN sys_user d ON a.reply_user_id = d.user_id + + + AND a.comment_id = #{param.commentId} + + + AND a.score = #{param.score} + + + AND a.content LIKE CONCAT('%', #{param.content}, '%') + + + AND a.is_picture = #{param.isPicture} + + + AND a.user_id = #{param.userId} + + + AND a.to_user_id = #{param.toUserId} + + + AND a.article_id = #{param.articleId} + + + 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.to_user_id = #{param.loginUserId}) + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/cms/mapper/xml/ArticleLikeMapper.xml b/src/main/java/com/gxwebsoft/cms/mapper/xml/ArticleLikeMapper.xml new file mode 100644 index 0000000..35ce4e6 --- /dev/null +++ b/src/main/java/com/gxwebsoft/cms/mapper/xml/ArticleLikeMapper.xml @@ -0,0 +1,38 @@ + + + + + + + SELECT a.* + FROM cms_article_like a + + + AND a.id = #{param.id} + + + AND a.article_id = #{param.articleId} + + + AND a.user_id = #{param.userId} + + + AND a.create_time >= #{param.createTimeStart} + + + AND a.create_time <= #{param.createTimeEnd} + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/cms/mapper/xml/ArticleMapper.xml b/src/main/java/com/gxwebsoft/cms/mapper/xml/ArticleMapper.xml new file mode 100644 index 0000000..6255f0d --- /dev/null +++ b/src/main/java/com/gxwebsoft/cms/mapper/xml/ArticleMapper.xml @@ -0,0 +1,109 @@ + + + + + + + SELECT a.*, + b.nickname,b.user_id,b.avatar userAvatar,b.city as userCity, + b.age, + c.position + FROM cms_article a + LEFT JOIN sys_user b ON a.user_id = b.user_id + LEFT JOIN love_user_profile c ON a.user_id = c.user_id + + + AND a.article_id = #{param.articleId} + + + AND a.title LIKE CONCAT('%', #{param.title}, '%') + + + AND a.show_type = #{param.showType} + + + AND a.category_id = #{param.categoryId} + + + AND a.image LIKE CONCAT('%', #{param.image}, '%') + + + AND a.source LIKE CONCAT('%', #{param.source}, '%') + + + AND a.content LIKE CONCAT('%', #{param.content}, '%') + + + AND a.virtual_views = #{param.virtualViews} + + + AND a.actual_views = #{param.actualViews} + + + AND a.user_id = #{param.userId} + + + 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.topic = #{param.topic} + + + AND a.deleted = #{param.deleted} + + + AND a.deleted = 0 + + + AND b.deleted = 0 + + + 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}, '%') + + + AND b.sex = #{param.gender} + + + AND b.city = #{param.city} + + + AND b.user_id IN + + #{item} + + + + + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/cms/mapper/xml/DocsMapper.xml b/src/main/java/com/gxwebsoft/cms/mapper/xml/DocsMapper.xml new file mode 100644 index 0000000..f68b93e --- /dev/null +++ b/src/main/java/com/gxwebsoft/cms/mapper/xml/DocsMapper.xml @@ -0,0 +1,68 @@ + + + + + + + SELECT a.docs_id, a.title, a.parent_id, a.user_id, a.sort_number, a.comments, a.status, a.merchant_code + FROM cms_docs a + + + AND a.docs_id = #{param.docsId} + + + AND a.title LIKE CONCAT('%', #{param.title}, '%') + + + AND a.parent_id = #{param.parentId} + + + AND a.user_id = #{param.userId} + + + AND a.organization_id = #{param.organizationId} + + + AND a.shop_id = #{param.shopId} + + + AND a.visibility LIKE CONCAT('%', #{param.visibility}, '%') + + + AND a.sort_number = #{param.sortNumber} + + + AND a.content LIKE CONCAT('%', #{param.content}, '%') + + + 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/src/main/java/com/gxwebsoft/cms/param/ArticleCategoryParam.java b/src/main/java/com/gxwebsoft/cms/param/ArticleCategoryParam.java new file mode 100644 index 0000000..c9aa163 --- /dev/null +++ b/src/main/java/com/gxwebsoft/cms/param/ArticleCategoryParam.java @@ -0,0 +1,62 @@ +package com.gxwebsoft.cms.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 2022-11-22 17:49:15 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "ArticleCategoryParam对象", description = "文章分类表查询参数") +public class ArticleCategoryParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "文章分类ID") + @QueryField(type = QueryType.EQ) + private Integer categoryId; + + @ApiModelProperty(value = "分类名称") + private String title; + + @ApiModelProperty(value = "分类图片") + private String image; + + @ApiModelProperty(value = "上级分类ID") + @QueryField(type = QueryType.EQ) + private Integer parentId; + + @ApiModelProperty(value = "用户ID") + @QueryField(type = QueryType.EQ) + private Integer userId; + + @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; + +} diff --git a/src/main/java/com/gxwebsoft/cms/param/ArticleCommentParam.java b/src/main/java/com/gxwebsoft/cms/param/ArticleCommentParam.java new file mode 100644 index 0000000..33711f9 --- /dev/null +++ b/src/main/java/com/gxwebsoft/cms/param/ArticleCommentParam.java @@ -0,0 +1,79 @@ +package com.gxwebsoft.cms.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-07-07 14:14:35 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "ArticleCommentParam对象", description = "文章评论表查询参数") +public class ArticleCommentParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "评价ID") + @QueryField(type = QueryType.EQ) + private Integer commentId; + + @ApiModelProperty(value = "评分 (10好评 20中评 30差评)") + @QueryField(type = QueryType.EQ) + private Integer score; + + @ApiModelProperty(value = "评价内容") + private String content; + + @ApiModelProperty(value = "是否为图片评价") + @QueryField(type = QueryType.EQ) + private Integer isPicture; + + @ApiModelProperty(value = "用户ID") + @QueryField(type = QueryType.EQ) + private Integer userId; + + @ApiModelProperty(value = "被评价者ID") + @QueryField(type = QueryType.EQ) + private Integer toUserId; + + @ApiModelProperty(value = "回复者ID") + @TableField(exist = false) + private Integer replyUserId; + + @ApiModelProperty(value = "文章ID") + @QueryField(type = QueryType.EQ) + private Integer articleId; + + @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 = "当前登录用户ID") + @TableField(exist = false) + private Integer loginUserId; + +} diff --git a/src/main/java/com/gxwebsoft/cms/param/ArticleLikeParam.java b/src/main/java/com/gxwebsoft/cms/param/ArticleLikeParam.java new file mode 100644 index 0000000..59a3ecb --- /dev/null +++ b/src/main/java/com/gxwebsoft/cms/param/ArticleLikeParam.java @@ -0,0 +1,41 @@ +package com.gxwebsoft.cms.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-07-07 13:00:03 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "ArticleLikeParam对象", description = "点赞文章查询参数") +public class ArticleLikeParam 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 articleId; + + @ApiModelProperty(value = "用户ID") + @QueryField(type = QueryType.EQ) + private Integer userId; + + @ApiModelProperty(value = "客户端") + @QueryField(type = QueryType.EQ) + private String platform; + +} diff --git a/src/main/java/com/gxwebsoft/cms/param/ArticleParam.java b/src/main/java/com/gxwebsoft/cms/param/ArticleParam.java new file mode 100644 index 0000000..2efa660 --- /dev/null +++ b/src/main/java/com/gxwebsoft/cms/param/ArticleParam.java @@ -0,0 +1,114 @@ +package com.gxwebsoft.cms.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 WebSoft + * @since 2022-11-16 11:40:27 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "ArticleParam对象", description = "文章记录表查询参数") +public class ArticleParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "文章ID") + @QueryField(type = QueryType.EQ) + private Integer articleId; + + @ApiModelProperty(value = "文章标题") + private String title; + + @ApiModelProperty(value = "列表显示方式(10小图展示 20大图展示)") + @QueryField(type = QueryType.EQ) + private Integer showType; + + @ApiModelProperty(value = "文章分类ID") + @QueryField(type = QueryType.EQ) + private Integer categoryId; + + @ApiModelProperty(value = "封面图") + private String image; + + @ApiModelProperty(value = "来源") + private String source; + + @ApiModelProperty(value = "文章内容") + private String content; + + @ApiModelProperty(value = "虚拟阅读量(仅用作展示)") + @QueryField(type = QueryType.EQ) + private Integer virtualViews; + + @ApiModelProperty(value = "实际阅读量") + @QueryField(type = QueryType.EQ) + private Integer actualViews; + + @ApiModelProperty(value = "用户ID") + @QueryField(type = QueryType.EQ) + private Integer userId; + + @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("用户昵称") + @TableField(exist = false) + private String nickname; + + @ApiModelProperty("查询关注状态") + private Boolean showFollow; + + @ApiModelProperty(value = "当前登录用户ID") + @QueryField(type = QueryType.EQ) + private Integer loginUserId; + + @ApiModelProperty(value = "按性别筛选") + @QueryField(type = QueryType.EQ) + private Integer gender; + + @ApiModelProperty(value = "场景") + @QueryField(type = QueryType.EQ) + private String scene; + + @ApiModelProperty(value = "按用户所在城市查询") + @QueryField(type = QueryType.EQ) + private String city; + + @ApiModelProperty(value = "话题") + @QueryField(type = QueryType.EQ) + private String topic; + + @ApiModelProperty(value = "用户id集合") + @TableField(exist = false) + private Set userIds; + +} diff --git a/src/main/java/com/gxwebsoft/cms/param/DocsParam.java b/src/main/java/com/gxwebsoft/cms/param/DocsParam.java new file mode 100644 index 0000000..a9c7c7c --- /dev/null +++ b/src/main/java/com/gxwebsoft/cms/param/DocsParam.java @@ -0,0 +1,69 @@ +package com.gxwebsoft.cms.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-11-16 11:40:27 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "DocsParam对象", description = "文档管理记录表查询参数") +public class DocsParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "文档ID") + @QueryField(type = QueryType.EQ) + private Integer docsId; + + @ApiModelProperty(value = "文档标题") + private String title; + + @ApiModelProperty(value = "上级目录") + @QueryField(type = QueryType.EQ) + private Integer parentId; + + @ApiModelProperty(value = "用户ID") + @QueryField(type = QueryType.EQ) + private Integer userId; + + @ApiModelProperty(value = "机构id") + @QueryField(type = QueryType.EQ) + private Integer organizationId; + + @ApiModelProperty(value = "所属门店ID") + @QueryField(type = QueryType.EQ) + private Integer shopId; + + @ApiModelProperty(value = "可见性(public,private,protected)") + private String visibility; + + @ApiModelProperty(value = "排序(数字越小越靠前)") + @QueryField(type = QueryType.EQ) + private Integer sortNumber; + + @ApiModelProperty(value = "文档内容") + private String content; + + @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/src/main/java/com/gxwebsoft/cms/service/ArticleCategoryService.java b/src/main/java/com/gxwebsoft/cms/service/ArticleCategoryService.java new file mode 100644 index 0000000..e544e9a --- /dev/null +++ b/src/main/java/com/gxwebsoft/cms/service/ArticleCategoryService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.cms.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.cms.entity.ArticleCategory; +import com.gxwebsoft.cms.param.ArticleCategoryParam; + +import java.util.List; + +/** + * 文章分类表Service + * + * @author 科技小王子 + * @since 2022-11-22 17:49:15 + */ +public interface ArticleCategoryService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(ArticleCategoryParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(ArticleCategoryParam param); + + /** + * 根据id查询 + * + * @param categoryId 文章分类ID + * @return ArticleCategory + */ + ArticleCategory getByIdRel(Integer categoryId); + +} diff --git a/src/main/java/com/gxwebsoft/cms/service/ArticleCommentService.java b/src/main/java/com/gxwebsoft/cms/service/ArticleCommentService.java new file mode 100644 index 0000000..492880d --- /dev/null +++ b/src/main/java/com/gxwebsoft/cms/service/ArticleCommentService.java @@ -0,0 +1,44 @@ +package com.gxwebsoft.cms.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.cms.entity.ArticleComment; +import com.gxwebsoft.cms.param.ArticleCommentParam; +import com.gxwebsoft.common.core.web.PageResult; + +import java.util.List; + +/** + * 文章评论表Service + * + * @author 科技小王子 + * @since 2023-07-07 14:14:35 + */ +public interface ArticleCommentService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(ArticleCommentParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(ArticleCommentParam param); + + /** + * 根据id查询 + * + * @param commentId 评价ID + * @return ArticleComment + */ + ArticleComment getByIdRel(Integer commentId); + + int getUserUnReadCount(Integer userId); + +} diff --git a/src/main/java/com/gxwebsoft/cms/service/ArticleLikeService.java b/src/main/java/com/gxwebsoft/cms/service/ArticleLikeService.java new file mode 100644 index 0000000..570d62f --- /dev/null +++ b/src/main/java/com/gxwebsoft/cms/service/ArticleLikeService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.cms.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.cms.entity.ArticleLike; +import com.gxwebsoft.cms.param.ArticleLikeParam; + +import java.util.List; + +/** + * 点赞文章Service + * + * @author 科技小王子 + * @since 2023-07-07 13:00:03 + */ +public interface ArticleLikeService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(ArticleLikeParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(ArticleLikeParam param); + + /** + * 根据id查询 + * + * @param id 主键ID + * @return ArticleLike + */ + ArticleLike getByIdRel(Integer id); + +} diff --git a/src/main/java/com/gxwebsoft/cms/service/ArticleService.java b/src/main/java/com/gxwebsoft/cms/service/ArticleService.java new file mode 100644 index 0000000..51540a4 --- /dev/null +++ b/src/main/java/com/gxwebsoft/cms/service/ArticleService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.cms.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.cms.entity.Article; +import com.gxwebsoft.cms.param.ArticleParam; + +import java.util.List; + +/** + * 文章记录表Service + * + * @author WebSoft + * @since 2022-11-16 11:40:27 + */ +public interface ArticleService extends IService
{ + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult
+ */ + PageResult
pageRel(ArticleParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List
+ */ + List
listRel(ArticleParam param); + + /** + * 根据id查询 + * + * @param articleId 文章ID + * @return Article + */ + Article getByIdRel(Integer articleId); + +} diff --git a/src/main/java/com/gxwebsoft/cms/service/DocsService.java b/src/main/java/com/gxwebsoft/cms/service/DocsService.java new file mode 100644 index 0000000..075b92b --- /dev/null +++ b/src/main/java/com/gxwebsoft/cms/service/DocsService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.cms.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.cms.entity.Docs; +import com.gxwebsoft.cms.param.DocsParam; + +import java.util.List; + +/** + * 文档管理记录表Service + * + * @author WebSoft + * @since 2022-11-16 11:40:27 + */ +public interface DocsService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(DocsParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(DocsParam param); + + /** + * 根据id查询 + * + * @param docsId 文档ID + * @return Docs + */ + Docs getByIdRel(Integer docsId); + +} diff --git a/src/main/java/com/gxwebsoft/cms/service/impl/ArticleCategoryServiceImpl.java b/src/main/java/com/gxwebsoft/cms/service/impl/ArticleCategoryServiceImpl.java new file mode 100644 index 0000000..05c7f47 --- /dev/null +++ b/src/main/java/com/gxwebsoft/cms/service/impl/ArticleCategoryServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.cms.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.cms.mapper.ArticleCategoryMapper; +import com.gxwebsoft.cms.service.ArticleCategoryService; +import com.gxwebsoft.cms.entity.ArticleCategory; +import com.gxwebsoft.cms.param.ArticleCategoryParam; +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 2022-11-22 17:49:15 + */ +@Service +public class ArticleCategoryServiceImpl extends ServiceImpl implements ArticleCategoryService { + + @Override + public PageResult pageRel(ArticleCategoryParam 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(ArticleCategoryParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + //page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public ArticleCategory getByIdRel(Integer categoryId) { + ArticleCategoryParam param = new ArticleCategoryParam(); + param.setCategoryId(categoryId); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/cms/service/impl/ArticleCommentServiceImpl.java b/src/main/java/com/gxwebsoft/cms/service/impl/ArticleCommentServiceImpl.java new file mode 100644 index 0000000..bbf2979 --- /dev/null +++ b/src/main/java/com/gxwebsoft/cms/service/impl/ArticleCommentServiceImpl.java @@ -0,0 +1,100 @@ +package com.gxwebsoft.cms.service.impl; + +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.cms.entity.ArticleComment; +import com.gxwebsoft.cms.entity.ArticleLike; +import com.gxwebsoft.cms.mapper.ArticleCommentMapper; +import com.gxwebsoft.cms.param.ArticleCommentParam; +import com.gxwebsoft.cms.service.ArticleCommentService; +import com.gxwebsoft.cms.service.ArticleLikeService; +import com.gxwebsoft.cms.service.ArticleService; +import com.gxwebsoft.common.core.utils.CommonUtil; +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.Set; +import java.util.stream.Collectors; + +/** + * 文章评论表Service实现 + * + * @author 科技小王子 + * @since 2023-07-07 14:14:35 + */ +@Service +public class ArticleCommentServiceImpl extends ServiceImpl implements ArticleCommentService { + + @Resource + private ArticleLikeService articleLikeService; + + @Resource + private ArticleService articleService; + + + + @Override + public PageResult pageRel(ArticleCommentParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + List list = baseMapper.selectPageRel(page, param); + + // 获取带点赞状态和评论的文章列表 + if (param.getSceneType() != null && param.getSceneType().equals("UN_READ_COMMENT")) { + // 更新为已读 + if(!CollectionUtils.isEmpty(list)){ + Set commentIds = list.stream().map(ArticleComment::getCommentId).collect(Collectors.toSet()); + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper() + .in(ArticleComment::getCommentId, commentIds) + .set(ArticleComment::getStatus, 1); + baseMapper.update(null, updateWrapper); + } + return new PageResult<>(list, page.getTotal()); + } + + // 我点赞的人 + final List myLikes = articleLikeService.list(new LambdaQueryWrapper().eq(ArticleLike::getUserId, param.getLoginUserId())); + list.forEach(d -> { + final boolean isLike = myLikes.stream().anyMatch(f -> f.getUserId().equals(param.getLoginUserId())); + d.setLikes(isLike); + }); + // List转为树形结构 + final List articleComments = CommonUtil.toTreeData(list, 0, ArticleComment::getReplyCommentId, ArticleComment::getCommentId, ArticleComment::setChildren); + return new PageResult<>(articleComments, page.getTotal()); + } + + @Override + public List listRel(ArticleCommentParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public ArticleComment getByIdRel(Integer commentId) { + ArticleCommentParam param = new ArticleCommentParam(); + param.setCommentId(commentId); + return param.getOne(baseMapper.selectListRel(param)); + } + + @Override + public int getUserUnReadCount(Integer userId) { +// List
list = articleService.list(new LambdaQueryWrapper
().eq(Article::getUserId, userId).select(Article::getArticleId)); +// Set articleIds = list.stream().map(Article::getArticleId).collect(Collectors.toSet()); + int count = baseMapper.selectCount( + new LambdaQueryWrapper<>(ArticleComment.class) +// .in(ArticleComment::getArticleId, articleIds) + .eq(ArticleComment::getStatus, 0) + .eq(ArticleComment::getToUserId, userId) + ); + return count; + } + +} diff --git a/src/main/java/com/gxwebsoft/cms/service/impl/ArticleLikeServiceImpl.java b/src/main/java/com/gxwebsoft/cms/service/impl/ArticleLikeServiceImpl.java new file mode 100644 index 0000000..3a7cb41 --- /dev/null +++ b/src/main/java/com/gxwebsoft/cms/service/impl/ArticleLikeServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.cms.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.cms.mapper.ArticleLikeMapper; +import com.gxwebsoft.cms.service.ArticleLikeService; +import com.gxwebsoft.cms.entity.ArticleLike; +import com.gxwebsoft.cms.param.ArticleLikeParam; +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-07-07 13:00:03 + */ +@Service +public class ArticleLikeServiceImpl extends ServiceImpl implements ArticleLikeService { + + @Override + public PageResult pageRel(ArticleLikeParam 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(ArticleLikeParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public ArticleLike getByIdRel(Integer id) { + ArticleLikeParam param = new ArticleLikeParam(); + param.setId(id); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/cms/service/impl/ArticleServiceImpl.java b/src/main/java/com/gxwebsoft/cms/service/impl/ArticleServiceImpl.java new file mode 100644 index 0000000..30b8fe7 --- /dev/null +++ b/src/main/java/com/gxwebsoft/cms/service/impl/ArticleServiceImpl.java @@ -0,0 +1,95 @@ +package com.gxwebsoft.cms.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.cms.entity.Article; +import com.gxwebsoft.cms.entity.ArticleLike; +import com.gxwebsoft.cms.mapper.ArticleMapper; +import com.gxwebsoft.cms.param.ArticleParam; +import com.gxwebsoft.cms.service.ArticleLikeService; +import com.gxwebsoft.cms.service.ArticleService; +import com.gxwebsoft.common.core.web.PageParam; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.shop.entity.UserFollow; +import com.gxwebsoft.shop.service.UserFollowService; +import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; + +import javax.annotation.Resource; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; + +/** + * 文章记录表Service实现 + * + * @author WebSoft + * @since 2022-11-16 11:40:27 + */ +@Service +public class ArticleServiceImpl extends ServiceImpl implements ArticleService { + @Resource + private UserFollowService userFollowService; + @Resource + private ArticleLikeService articleLikeService; + + @Override + public PageResult
pageRel(ArticleParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("sort_number asc, create_time desc"); + // 搜素条件 + if (param.getScene() != null) { + // 最新 + if (param.getScene().equals("new")) { + param.setCity(null); + param.setUserIds(null); + } + // 同城intraCity + if (param.getScene().equals("intraCity")) { + param.setCity(param.getCity()); + } + // 关注focus + if (param.getScene().equals("focus")) { + final List myFocus = userFollowService.list(new LambdaQueryWrapper().eq(UserFollow::getUserId, param.getLoginUserId())); + if (!CollectionUtils.isEmpty(myFocus)) { + final Set collect = myFocus.stream().map(UserFollow::getShopId).collect(Collectors.toSet()); + param.setUserIds(collect); + } + } + } + // 数据列表 + List
list = baseMapper.selectPageRel(page, param); + // 我关注的人 + final List myFollows = userFollowService.list(new LambdaQueryWrapper().eq(UserFollow::getUserId, param.getLoginUserId())); + // 我点赞的文章 + final List myLikes = articleLikeService.list(new LambdaQueryWrapper().eq(ArticleLike::getUserId, param.getLoginUserId())); + // 是否显示关注状态 + if(param.getShowFollow() != null){ + list.forEach(d -> { + // 是否关注 + final boolean isFollows = myFollows.stream().filter(f -> f.getShopId().equals(d.getUserId())).findFirst().isPresent(); + final boolean isLike = myLikes.stream().filter(f -> f.getArticleId().equals(d.getArticleId())).findFirst().isPresent(); + d.setFollow(isFollows); + d.setLiked(isLike); + }); + } + return new PageResult<>(list, page.getTotal()); + } + + @Override + public List
listRel(ArticleParam param) { + List
list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + page.setDefaultOrder("sort_number asc, create_time desc"); + return page.sortRecords(list); + } + + @Override + public Article getByIdRel(Integer articleId) { + ArticleParam param = new ArticleParam(); + param.setArticleId(articleId); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/cms/service/impl/DocsServiceImpl.java b/src/main/java/com/gxwebsoft/cms/service/impl/DocsServiceImpl.java new file mode 100644 index 0000000..d9ca2c4 --- /dev/null +++ b/src/main/java/com/gxwebsoft/cms/service/impl/DocsServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.cms.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.cms.mapper.DocsMapper; +import com.gxwebsoft.cms.service.DocsService; +import com.gxwebsoft.cms.entity.Docs; +import com.gxwebsoft.cms.param.DocsParam; +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 2022-11-16 11:40:27 + */ +@Service +public class DocsServiceImpl extends ServiceImpl implements DocsService { + + @Override + public PageResult pageRel(DocsParam 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(DocsParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + page.setDefaultOrder("sort_number asc,create_time asc"); + return page.sortRecords(list); + } + + @Override + public Docs getByIdRel(Integer docsId) { + DocsParam param = new DocsParam(); + param.setDocsId(docsId); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/common/.DS_Store b/src/main/java/com/gxwebsoft/common/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..3e3ea44b2506ff1ccf520e145a2e08e68eae0dc7 GIT binary patch literal 6148 zcmeHKOKJi^5Uny2glt@9*;mL78ZjsE0%8<569-}xvYS=T<QaLYNt%`kTg n1~11zFUMF|Iezt|$SXF-eogEGosPKEf&3XTU1(I`(F&Xaoz5G! literal 0 HcmV?d00001 diff --git a/src/main/java/com/gxwebsoft/common/core/Constants.java b/src/main/java/com/gxwebsoft/common/core/Constants.java new file mode 100644 index 0000000..be48387 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/core/Constants.java @@ -0,0 +1,93 @@ +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/src/main/java/com/gxwebsoft/common/core/annotation/OperationLog.java b/src/main/java/com/gxwebsoft/common/core/annotation/OperationLog.java new file mode 100644 index 0000000..87bdf2c --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/core/annotation/OperationLog.java @@ -0,0 +1,41 @@ +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/src/main/java/com/gxwebsoft/common/core/annotation/OperationModule.java b/src/main/java/com/gxwebsoft/common/core/annotation/OperationModule.java new file mode 100644 index 0000000..60ab018 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/core/annotation/OperationModule.java @@ -0,0 +1,21 @@ +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/src/main/java/com/gxwebsoft/common/core/annotation/QueryField.java b/src/main/java/com/gxwebsoft/common/core/annotation/QueryField.java new file mode 100644 index 0000000..9377b9b --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/core/annotation/QueryField.java @@ -0,0 +1,22 @@ +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/src/main/java/com/gxwebsoft/common/core/annotation/QueryType.java b/src/main/java/com/gxwebsoft/common/core/annotation/QueryType.java new file mode 100644 index 0000000..3eb540e --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/core/annotation/QueryType.java @@ -0,0 +1,42 @@ +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/src/main/java/com/gxwebsoft/common/core/aspect/OperationLogAspect.java b/src/main/java/com/gxwebsoft/common/core/aspect/OperationLogAspect.java new file mode 100644 index 0000000..ef29028 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/core/aspect/OperationLogAspect.java @@ -0,0 +1,229 @@ +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.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +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 com.gxwebsoft.shop.entity.UserLook; +import com.gxwebsoft.shop.service.UserLookService; +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; + @Resource + private UserLookService userLookService; + + // 参数、返回结果、错误信息等最大保存长度 + 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)); + } + } + } + + // 记录访客日志 +// System.out.println("record = " + record); +// if (record.getMethod().equals("com.gxwebsoft.love.controller.UserProfileController.detail")) { +// final Integer toUserId = Integer.valueOf(StrUtil.removeSuffix(record.getParams()," ")); +// if (userLookService.count(new LambdaQueryWrapper().eq(UserLook::getUserId,record.getUserId()).eq(UserLook::getToUserId,toUserId)) == 0) { +// final UserLook userLook = new UserLook(); +// userLook.setUserId(record.getUserId()); +// userLook.setToUserId(toUserId); +// userLookService.save(userLook); +// } +// } + + 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/src/main/java/com/gxwebsoft/common/core/config/ConfigProperties.java b/src/main/java/com/gxwebsoft/common/core/config/ConfigProperties.java new file mode 100644 index 0000000..dfee5d3 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/core/config/ConfigProperties.java @@ -0,0 +1,105 @@ +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/src/main/java/com/gxwebsoft/common/core/config/HttpMessageConverter.java b/src/main/java/com/gxwebsoft/common/core/config/HttpMessageConverter.java new file mode 100644 index 0000000..6bae59d --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/core/config/HttpMessageConverter.java @@ -0,0 +1,15 @@ +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/src/main/java/com/gxwebsoft/common/core/config/MybatisPlusConfig.java b/src/main/java/com/gxwebsoft/common/core/config/MybatisPlusConfig.java new file mode 100644 index 0000000..f7dd6ce --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/core/config/MybatisPlusConfig.java @@ -0,0 +1,94 @@ +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.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.servlet.http.HttpServletRequest; +import java.util.Arrays; + +/** + * MybatisPlus配置 + * + * @author WebSoft + * @since 2018-02-22 11:29:28 + */ +@Configuration +public class MybatisPlusConfig { + + @Bean + public MybatisPlusInterceptor mybatisPlusInterceptor(HttpServletRequest request) { + MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor(); + + // 多租户插件配置 + TenantLineHandler tenantLineHandler = new TenantLineHandler() { + @Override + public Expression getTenantId() { +// String device_id = request.getHeader("device-id"); +// System.out.println("device_id = " + device_id); + // 从设备请求头拿ID + String DeviceID = request.getHeader("Device-ID"); + if (StrUtil.isNotBlank(DeviceID)) { + return new LongValue(10048); + } + // 从请求头拿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", + "oa_app", + "apps_test_data" + ).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/src/main/java/com/gxwebsoft/common/core/config/RestTemplateConfig.java b/src/main/java/com/gxwebsoft/common/core/config/RestTemplateConfig.java new file mode 100644 index 0000000..786798f --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/core/config/RestTemplateConfig.java @@ -0,0 +1,29 @@ +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/src/main/java/com/gxwebsoft/common/core/config/SpringContextUtil.java b/src/main/java/com/gxwebsoft/common/core/config/SpringContextUtil.java new file mode 100644 index 0000000..4e6d883 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/core/config/SpringContextUtil.java @@ -0,0 +1,62 @@ +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/src/main/java/com/gxwebsoft/common/core/config/SwaggerConfig.java b/src/main/java/com/gxwebsoft/common/core/config/SwaggerConfig.java new file mode 100644 index 0000000..32c56c8 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/core/config/SwaggerConfig.java @@ -0,0 +1,72 @@ +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/src/main/java/com/gxwebsoft/common/core/config/WebMvcConfig.java b/src/main/java/com/gxwebsoft/common/core/config/WebMvcConfig.java new file mode 100644 index 0000000..2ed9d8b --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/core/config/WebMvcConfig.java @@ -0,0 +1,31 @@ +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/src/main/java/com/gxwebsoft/common/core/constants/BalanceConstants.java b/src/main/java/com/gxwebsoft/common/core/constants/BalanceConstants.java new file mode 100644 index 0000000..6857250 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/core/constants/BalanceConstants.java @@ -0,0 +1,10 @@ +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/src/main/java/com/gxwebsoft/common/core/constants/OrderConstants.java b/src/main/java/com/gxwebsoft/common/core/constants/OrderConstants.java new file mode 100644 index 0000000..e866654 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/core/constants/OrderConstants.java @@ -0,0 +1,37 @@ +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/src/main/java/com/gxwebsoft/common/core/constants/ProfitConstants.java b/src/main/java/com/gxwebsoft/common/core/constants/ProfitConstants.java new file mode 100644 index 0000000..2cb60fd --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/core/constants/ProfitConstants.java @@ -0,0 +1,9 @@ +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/src/main/java/com/gxwebsoft/common/core/constants/RedisConstants.java b/src/main/java/com/gxwebsoft/common/core/constants/RedisConstants.java new file mode 100644 index 0000000..2765754 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/core/constants/RedisConstants.java @@ -0,0 +1,39 @@ +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/src/main/java/com/gxwebsoft/common/core/constants/WxOfficialConstants.java b/src/main/java/com/gxwebsoft/common/core/constants/WxOfficialConstants.java new file mode 100644 index 0000000..a025610 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/core/constants/WxOfficialConstants.java @@ -0,0 +1,6 @@ +package com.gxwebsoft.common.core.constants; + +public class WxOfficialConstants { + // 获取 Access token + public static final String GET_ACCESS_TOKEN_API = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=APPID&secret=APPSECRET"; +} diff --git a/src/main/java/com/gxwebsoft/common/core/exception/BusinessException.java b/src/main/java/com/gxwebsoft/common/core/exception/BusinessException.java new file mode 100644 index 0000000..8e10e82 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/core/exception/BusinessException.java @@ -0,0 +1,48 @@ +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/src/main/java/com/gxwebsoft/common/core/exception/GlobalExceptionHandler.java b/src/main/java/com/gxwebsoft/common/core/exception/GlobalExceptionHandler.java new file mode 100644 index 0000000..6649a2d --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/core/exception/GlobalExceptionHandler.java @@ -0,0 +1,56 @@ +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/src/main/java/com/gxwebsoft/common/core/security/JwtAccessDeniedHandler.java b/src/main/java/com/gxwebsoft/common/core/security/JwtAccessDeniedHandler.java new file mode 100644 index 0000000..66acb5c --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/core/security/JwtAccessDeniedHandler.java @@ -0,0 +1,29 @@ +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/src/main/java/com/gxwebsoft/common/core/security/JwtAuthenticationEntryPoint.java b/src/main/java/com/gxwebsoft/common/core/security/JwtAuthenticationEntryPoint.java new file mode 100644 index 0000000..42b7f3f --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/core/security/JwtAuthenticationEntryPoint.java @@ -0,0 +1,30 @@ +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/src/main/java/com/gxwebsoft/common/core/security/JwtAuthenticationFilter.java b/src/main/java/com/gxwebsoft/common/core/security/JwtAuthenticationFilter.java new file mode 100644 index 0000000..1edca08 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/core/security/JwtAuthenticationFilter.java @@ -0,0 +1,85 @@ +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.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 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); + 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/src/main/java/com/gxwebsoft/common/core/security/JwtSubject.java b/src/main/java/com/gxwebsoft/common/core/security/JwtSubject.java new file mode 100644 index 0000000..1a0ff7d --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/core/security/JwtSubject.java @@ -0,0 +1,31 @@ +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/src/main/java/com/gxwebsoft/common/core/security/JwtUtil.java b/src/main/java/com/gxwebsoft/common/core/security/JwtUtil.java new file mode 100644 index 0000000..334bbe8 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/core/security/JwtUtil.java @@ -0,0 +1,152 @@ +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 com.gxwebsoft.shop.entity.Payment; +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); + } + + /** + * 解析支付方式里的json数据 + * + * @param payment Payment + * @return Payment + */ + public static Payment getPaymentConfig(Payment payment){ + return JSONUtil.parseObject(payment.getConfig(), Payment.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/src/main/java/com/gxwebsoft/common/core/security/SecurityConfig.java b/src/main/java/com/gxwebsoft/common/core/security/SecurityConfig.java new file mode 100644 index 0000000..aa31f93 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/core/security/SecurityConfig.java @@ -0,0 +1,97 @@ +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", + "/druid/**", + "/swagger-ui.html", + "/swagger-resources/**", + "/webjars/**", + "/v2/api-docs", + "/v3/api-docs", + "/swagger-ui/**", + "/api/open/**", + "/hxz/v1/**", + "/api/sendSmsCaptcha", + "/api/login-alipay/*", + "/api/wx-login/loginByMpWxPhone", + "/api/shop/payment/mp-alipay/notify", + "/api/shop/payment/mp-alipay/test/**", + "/api/shop/payment/mp-alipay/getPhoneNumber", + "/api/shop/test/**", + "/api/shop/wx-login/**", + "/api/apps/hualala/**", + "/api/apps/hualala-cart/**", + "/api/apps/test-data/**", + "/api/wxWorkQrConnect", + "/WW_verify_QMv7HoblYU6z63bb.txt", + "/5zbYEPkyV4.txt", + "/api/love/user-plan-log/wx-pay/**" + ) + .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/src/main/java/com/gxwebsoft/common/core/utils/AlipayConfigUtil.java b/src/main/java/com/gxwebsoft/common/core/utils/AlipayConfigUtil.java new file mode 100644 index 0000000..42975ef --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/core/utils/AlipayConfigUtil.java @@ -0,0 +1,110 @@ +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/src/main/java/com/gxwebsoft/common/core/utils/BtUtil.java b/src/main/java/com/gxwebsoft/common/core/utils/BtUtil.java new file mode 100644 index 0000000..53e1d3f --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/core/utils/BtUtil.java @@ -0,0 +1,149 @@ +package com.gxwebsoft.common.core.utils; + +import com.gxwebsoft.oa.entity.Assets; +import com.gxwebsoft.oa.service.AssetsService; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.PrintWriter; +import java.math.BigInteger; +import java.net.URL; +import java.net.URLConnection; +import java.security.MessageDigest; +import java.util.Date; + +/** + * 宝塔工具类 + * @author 科技小王子 + * + */ +@Component +public class BtUtil { + public static Integer tenantId; + public static String server; + public static String token; + private static String timestamp; + @Resource + private AssetsService assetsService; + + // 实例化客户端 + public BtUtil client(Integer id) { + Assets assets = assetsService.getByIdRel(id); + try { + String btSign = assets.getBtSign(); + server = "http://".concat(assets.getCode()).concat(":9003"); + String url = "http://".concat(assets.getCode()) + ":9003/system?action=GetSystemTotal"; + timestamp = (new Date().getTime()+""); + String md5Sign = getMd5(btSign); + String temp = timestamp+md5Sign; + token = getMd5(temp); + + String json = "request_time="+timestamp+"&request_token="+token; + String responseText = sendPost(url,json); + System.out.println("responseText = " + responseText); + System.out.println(responseText); + } catch (Exception e) { + e.printStackTrace(); + } + return this; + } + + public String getSystemTotal(){ + String url = server.concat("/system?action=GetSystemTotal"); + String json = "request_time="+timestamp+"&request_token="+token; + String responseText = sendPost(url,json); + System.out.println("responseText = " + responseText); + return responseText; + } + + public String getDiskInfo(){ + String url = server.concat("/system?action=GetDiskInfo"); + String json = "request_time="+timestamp+"&request_token="+token; + return sendPost(url,json); + } + +// public void config() +// { +// try { +// System.out.println("tenantId = " + tenantId); +// String btSign = "XXXXXXXXXXXXXXXXXXXXXXXX"; +// String url = "http://XXX.XXX.XXX.XXX:8888/system?action=GetSystemTotal"; +// String timestamp = (new Date().getTime()+""); +// String md5Sign = getMd5(btSign); +// String temp = timestamp+md5Sign; +// String token = getMd5(temp); +// +// String json = "request_time="+timestamp+"&request_token="+token; +// String responseText = sendPost(url,json); +// System.out.println(responseText); +// } catch (Exception e) { +// e.printStackTrace(); +// } +// } + + public static String getMd5(String str) throws Exception + { + try { + // 生成一个MD5加密计算摘要 + MessageDigest md = MessageDigest.getInstance("MD5"); + // 计算md5函数 + md.update(str.getBytes()); + // digest()最后确定返回md5 hash值，返回值为8为字符串。因为md5 hash值是16位的hex值，实际上就是8位的字符 + // BigInteger函数则将8位的字符串转换成16位hex值，用字符串来表示；得到字符串形式的hash值 + return new BigInteger(1, md.digest()).toString(16); + } catch (Exception e) { + throw new Exception("MD5加密出现错误，"+e.toString()); + } + } + + public static String sendPost(String url, String param) { + PrintWriter out = null; + BufferedReader in = null; + StringBuffer result = new StringBuffer(); + try { + URL realUrl = new URL(url); + // 打开和URL之间的连接 + URLConnection conn = realUrl.openConnection(); + // 设置通用的请求属性 + conn.setRequestProperty("accept", "text/xml,text/javascript,text/html,application/json"); + conn.setRequestProperty("connection", "Keep-Alive"); + // 发送POST请求必须设置如下两行 + conn.setDoOutput(true); + conn.setDoInput(true); + // 获取URLConnection对象对应的输出流 + out = new PrintWriter(conn.getOutputStream()); + // 发送请求参数 + out.print(param); + // flush输出流的缓冲 + out.flush(); + // 定义BufferedReader输入流来读取URL的响应 + in = new BufferedReader(new InputStreamReader(conn.getInputStream())); + String line; + while ((line = in.readLine()) != null) { + result.append(line); + } + } catch (Exception e) { + System.out.println("发送 POST 请求出现异常！"+e); + e.printStackTrace(); + } + //使用finally块来关闭输出流、输入流 + finally{ + try{ + if(out!=null){ + out.close(); + } + if(in!=null){ + in.close(); + } + } + catch(IOException ex){ + ex.printStackTrace(); + } + } + return result.toString(); + } + +} diff --git a/src/main/java/com/gxwebsoft/common/core/utils/CacheClient.java b/src/main/java/com/gxwebsoft/common/core/utils/CacheClient.java new file mode 100644 index 0000000..c56cd45 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/core/utils/CacheClient.java @@ -0,0 +1,264 @@ +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 实体类对象 + * 示例 cacheClient.set("merchant:"+id,merchant) + */ + 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/src/main/java/com/gxwebsoft/common/core/utils/CommonUtil.java b/src/main/java/com/gxwebsoft/common/core/utils/CommonUtil.java new file mode 100644 index 0000000..c11decb --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/core/utils/CommonUtil.java @@ -0,0 +1,235 @@ +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/src/main/java/com/gxwebsoft/common/core/utils/FileServerUtil.java b/src/main/java/com/gxwebsoft/common/core/utils/FileServerUtil.java new file mode 100644 index 0000000..45201d2 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/core/utils/FileServerUtil.java @@ -0,0 +1,401 @@ +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/src/main/java/com/gxwebsoft/common/core/utils/HttpUtils.java b/src/main/java/com/gxwebsoft/common/core/utils/HttpUtils.java new file mode 100644 index 0000000..888acc2 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/core/utils/HttpUtils.java @@ -0,0 +1,311 @@ +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/src/main/java/com/gxwebsoft/common/core/utils/ImageUtil.java b/src/main/java/com/gxwebsoft/common/core/utils/ImageUtil.java new file mode 100644 index 0000000..9a1e18f --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/core/utils/ImageUtil.java @@ -0,0 +1,62 @@ +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/src/main/java/com/gxwebsoft/common/core/utils/JChardetFacadeUtil.java b/src/main/java/com/gxwebsoft/common/core/utils/JChardetFacadeUtil.java new file mode 100644 index 0000000..1b49fb7 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/core/utils/JChardetFacadeUtil.java @@ -0,0 +1,2025 @@ +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/src/main/java/com/gxwebsoft/common/core/utils/JSONUtil.java b/src/main/java/com/gxwebsoft/common/core/utils/JSONUtil.java new file mode 100644 index 0000000..8d63168 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/core/utils/JSONUtil.java @@ -0,0 +1,69 @@ +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/src/main/java/com/gxwebsoft/common/core/utils/MyQrCodeUtil.java b/src/main/java/com/gxwebsoft/common/core/utils/MyQrCodeUtil.java new file mode 100644 index 0000000..23fbbf0 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/core/utils/MyQrCodeUtil.java @@ -0,0 +1,62 @@ +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.gxwebsoft.com/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/src/main/java/com/gxwebsoft/common/core/utils/OpenOfficeUtil.java b/src/main/java/com/gxwebsoft/common/core/utils/OpenOfficeUtil.java new file mode 100644 index 0000000..cca3990 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/core/utils/OpenOfficeUtil.java @@ -0,0 +1,124 @@ +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/src/main/java/com/gxwebsoft/common/core/utils/RedisUtil.java b/src/main/java/com/gxwebsoft/common/core/utils/RedisUtil.java new file mode 100644 index 0000000..f02ce42 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/core/utils/RedisUtil.java @@ -0,0 +1,279 @@ +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/src/main/java/com/gxwebsoft/common/core/utils/SchedulingUtil.java b/src/main/java/com/gxwebsoft/common/core/utils/SchedulingUtil.java new file mode 100644 index 0000000..afc62d6 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/core/utils/SchedulingUtil.java @@ -0,0 +1,24 @@ +package com.gxwebsoft.common.core.utils; + +import com.gxwebsoft.shop.service.OrderService; + +import javax.annotation.Resource; + +/** + * 自动执行计划 + * + * @author WebSoft + * @since 2018-12-14 08:38:19 + */ +public class SchedulingUtil { + @Resource + private OrderService orderService; + +// @Scheduled(cron="*/5 * * * * *") +// public void reportCurrentTime() { +// System.out.println("定时任务开始 = " + new Date()); +// int count = orderService.count(new LambdaQueryWrapper().eq(Order::getPayStatus, 20)); +//// orderService.removeOrderByTimeOut(); +// System.out.println("count = " + count); +// } +} diff --git a/src/main/java/com/gxwebsoft/common/core/utils/SignCheckUtil.java b/src/main/java/com/gxwebsoft/common/core/utils/SignCheckUtil.java new file mode 100644 index 0000000..c260ae1 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/core/utils/SignCheckUtil.java @@ -0,0 +1,172 @@ +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 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)); + } + +} diff --git a/src/main/java/com/gxwebsoft/common/core/utils/WxOfficialUtil.java b/src/main/java/com/gxwebsoft/common/core/utils/WxOfficialUtil.java new file mode 100644 index 0000000..077e615 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/core/utils/WxOfficialUtil.java @@ -0,0 +1,106 @@ +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/src/main/java/com/gxwebsoft/common/core/utils/WxUtil.java b/src/main/java/com/gxwebsoft/common/core/utils/WxUtil.java new file mode 100644 index 0000000..72f1755 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/core/utils/WxUtil.java @@ -0,0 +1,134 @@ +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/src/main/java/com/gxwebsoft/common/core/utils/WxWorkUtil.java b/src/main/java/com/gxwebsoft/common/core/utils/WxWorkUtil.java new file mode 100644 index 0000000..5a4e449 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/core/utils/WxWorkUtil.java @@ -0,0 +1,134 @@ +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/src/main/java/com/gxwebsoft/common/core/web/ApiResult.java b/src/main/java/com/gxwebsoft/common/core/web/ApiResult.java new file mode 100644 index 0000000..eab091a --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/core/web/ApiResult.java @@ -0,0 +1,87 @@ +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/src/main/java/com/gxwebsoft/common/core/web/BaseController.java b/src/main/java/com/gxwebsoft/common/core/web/BaseController.java new file mode 100644 index 0000000..9aa8895 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/core/web/BaseController.java @@ -0,0 +1,325 @@ +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.CacheClient; +import com.gxwebsoft.common.core.utils.SignCheckUtil; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.common.system.service.UserService; +import com.gxwebsoft.shop.entity.Merchant; +import com.gxwebsoft.shop.service.MerchantClerkService; +import com.gxwebsoft.shop.service.MerchantService; +import org.springframework.beans.propertyeditors.StringTrimmerEditor; +import org.springframework.data.redis.core.StringRedisTemplate; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.context.SecurityContextHolder; +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.Enumeration; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Controller基类 + * + * @author WebSoft + * @since 2017-06-10 10:10:19 + */ +public class BaseController { + @Resource + private HttpServletRequest request; + @Resource + private StringRedisTemplate stringRedisTemplate; + @Resource + private MerchantService merchantService; + @Resource + private MerchantClerkService merchantClerkService; + @Resource + private CacheClient cacheClient; + @Resource + private UserService userService; + + /** + * 获取当前登录的user + * + * @return User + */ + public User getLoginUser() { + try { + Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); + if (authentication != null) { + Object object = authentication.getPrincipal(); + if (object instanceof User) { + 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() { + // 从登录用户拿tenantId + User loginUser = getLoginUser(); + if (loginUser != null) { + return loginUser.getTenantId(); + } + // 从请求头拿tenantId + if(StrUtil.isNotBlank(request.getHeader("tenantId"))){ + return Integer.valueOf(request.getHeader("tenantId")); + } + return null; + } + + /** + * 返回成功 + * + * @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"); + } + + /** + * 获取当前登录用户所属的商户编号 + * + * @return merchantCode + */ + public String getMerchantCode() { + // 按店员查询 + return merchantClerkService.getMerchantCodeByClerk(getLoginUserId()); + } + + /** + * 获取当前登录的商户信息 + * + * @return merchantCode + */ + public Merchant getMerchant() { + return merchantService.getMerchantByCode(getMerchantCode()); + } + + public String getAppId() { + // 兼容小写 + if(request.getHeader("appid") != null){ + return request.getHeader("appid"); + } + return request.getHeader("AppId"); + } + + public String getSign() { + return request.getParameter("sign"); + } + + /** + * 是否校验签名信息 + * 存在签名信息则需要验证 + */ + public void isCheckSign() { + if (StrUtil.isNotBlank(getSign())) { + if(getTenantId() == null){ + throw new BusinessException("签名失败:TenantId不能为空"); + } + + String timestamp1 = request.getParameter("timestamp"); + long timestamp2 = System.currentTimeMillis(); + long time = timestamp2 - Long.parseLong(timestamp1); + if(time > 600000L){ + throw new BusinessException("签名失败:请求超时"); + } + + Enumeration names = request.getParameterNames(); + //2.遍历正文名称的枚举获得请求参数 + Map params = new HashMap<>(); + while(names.hasMoreElements()){ + String name = names.nextElement(); + String value = request.getParameter(name); + params.put(name,value); + } + String signString = SignCheckUtil.getSignString(params, getAppSecret()); + System.out.println("请求的参数 = " + params); + System.out.println("正确的签名 = " + signString); + System.out.println("签名是否正确 = " + SignCheckUtil.signCheck(params, getAppSecret())); + + if (!SignCheckUtil.signCheck(params, getAppSecret())) { + throw new BusinessException("签名失败"); + } + } + + // 模拟提交参数 + // String key = "FRbMx1FkG4Qz6GZxY"; + // Map param0 = new HashMap<>(); + // param0.put("orderId", "D2018062976332656413"); + // param0.put("MainAccountID", "DC3NHPJ73S"); + // param0.put("MainAccountSN", "320"); + // param0.put("payStatus", "2"); + // param0.put("title","测试"); + // System.out.println("请求的参数 = " + param0); + // String signString0 = SignCheckUtil.getSignString(param0, key); + // System.out.println("signString0 = " + signString0); + + // return SignCheckUtil.signCheck(params, getAppSecret()); + } + + /** + * 获取当前请求租户的AppSecret + * + * @return AppSecret + */ + public String getAppSecret() { + String key = "cache5:AppSecret:" + Integer.valueOf(getAppId()); + System.out.println("key = " + key); + return stringRedisTemplate.opsForValue().get(key); + } + + /** + * 根据账号|手机号码|邮箱查找用户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/src/main/java/com/gxwebsoft/common/core/web/BaseParam.java b/src/main/java/com/gxwebsoft/common/core/web/BaseParam.java new file mode 100644 index 0000000..9bac416 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/core/web/BaseParam.java @@ -0,0 +1,68 @@ +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("模糊搜素") + @TableField(exist = false) + private String keywords; + + /** + * 获取集合中的第一条数据 + * + * @param records 集合 + * @return 第一条数据 + */ + public T getOne(List records) { + return CommonUtil.listGetOne(records); + } + +} diff --git a/src/main/java/com/gxwebsoft/common/core/web/BatchParam.java b/src/main/java/com/gxwebsoft/common/core/web/BatchParam.java new file mode 100644 index 0000000..c9f5ac5 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/core/web/BatchParam.java @@ -0,0 +1,57 @@ +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/src/main/java/com/gxwebsoft/common/core/web/ExistenceParam.java b/src/main/java/com/gxwebsoft/common/core/web/ExistenceParam.java new file mode 100644 index 0000000..f423b6d --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/core/web/ExistenceParam.java @@ -0,0 +1,96 @@ +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/src/main/java/com/gxwebsoft/common/core/web/PageParam.java b/src/main/java/com/gxwebsoft/common/core/web/PageParam.java new file mode 100644 index 0000000..596ea58 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/core/web/PageParam.java @@ -0,0 +1,343 @@ +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/src/main/java/com/gxwebsoft/common/core/web/PageResult.java b/src/main/java/com/gxwebsoft/common/core/web/PageResult.java new file mode 100644 index 0000000..2ef9d0c --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/core/web/PageResult.java @@ -0,0 +1,51 @@ +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/src/main/java/com/gxwebsoft/common/system/controller/AccessKeyController.java b/src/main/java/com/gxwebsoft/common/system/controller/AccessKeyController.java new file mode 100644 index 0000000..d80c9b9 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/controller/AccessKeyController.java @@ -0,0 +1,150 @@ +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())) { + 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/src/main/java/com/gxwebsoft/common/system/controller/AliOssController.java b/src/main/java/com/gxwebsoft/common/system/controller/AliOssController.java new file mode 100644 index 0000000..e9b2e2f --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/controller/AliOssController.java @@ -0,0 +1,244 @@ +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.common.auth.*; +import com.aliyun.oss.OSSClientBuilder; +import com.aliyun.oss.OSSException; +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.FileRecord; +import com.gxwebsoft.common.system.service.FileRecordService; +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.io.UnsupportedEncodingException; +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; + + @OperationLog + @ApiOperation("上传文件") + @PostMapping("/upload") + public ApiResult upload(@RequestParam MultipartFile file, HttpServletRequest request) throws Exception{ + FileRecord result = null; + // Endpoint以华东1（杭州）为例，其它Region请按实际情况填写。 + String endpoint = config.getEndpoint(); + // RAM用户的访问密钥（AccessKey ID和AccessKey Secret）。 + String accessKeyId = config.getAccessKeyId(); + String accessKeySecret = config.getAccessKeySecret(); + // 使用代码嵌入的RAM用户的访问密钥配置访问凭证。 + CredentialsProvider credentialsProvider = new DefaultCredentialProvider(accessKeyId, accessKeySecret); + // 填写Bucket名称，例如examplebucket。 + String bucketName = config.getBucketName(); + // 填写Object完整路径，完整路径中不能包含Bucket名称，例如exampledir/exampleobject.txt。 +// String objectName = "exampledir/exampleobject.txt"; + // 填写本地文件的完整路径，例如D:\\localpath\\examplefile.txt。 + // 如果未指定本地路径，则默认从示例程序所属项目对应本地路径中上传文件。 +// String filePath= "D:\\localpath\\examplefile.txt"; + + // 创建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); + + // 保存记录并返回 + String requestURL = config.getBucketDomain(); + final String domain = redisUtil.getUploadConfig(getTenantId()).get("bucketDomain"); + if(StrUtil.isNotBlank(domain)){ + requestURL = domain; + } + path = "/".concat(path); + upload.delete(); + final String cache = redisUtil.get("setting:upload:" + getTenantId()); + final JSONObject jsonObject = JSONObject.parseObject(cache); + final String bucketDomain = jsonObject.getString("bucketDomain"); + if(StrUtil.isNotBlank(bucketDomain)){ + requestURL = bucketDomain; + } + result = new FileRecord(); + result.setCreateUserId(getLoginUserId()); + result.setName(StrUtil.isBlank(originalName) ? upload.getName() : originalName); + result.setLength(upload.length()); + result.setPath(requestURL + path); + result.setThumbnail(requestURL + path + "?x-oss-process=image/resize,m_fixed,w_100,h_100/quality,Q_90"); + result.setUrl(requestURL + path + "?x-oss-process=image/resize,w_750/quality,Q_90"); + result.setDownloadUrl(requestURL + path); + String contentType = FileServerUtil.getContentType(upload); + result.setContentType(contentType); + fileRecordService.save(result); + 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 = "LTAI5t8UTh8CTXEi2dYxobhj"; + String accessKeySecret = "fNdJOT4KAjrVrzHNAcSJuUCy9ZljD9"; + // 填写步骤3获取的角色ARN。 + String roleArn = "acs:ram::1194088977870561:role/ramosstest"; + // 自定义角色会话名称，用来区分不同的令牌，例如可填写为SessionTest。 + String roleSessionName = "jimeiapp"; + // 设置临时访问凭证的有效时间为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("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); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + return fail(); + }finally { + ossClient.shutdown(); + } + + } + + /** + * 文件上传位置(服务器) + */ + private String getUploadDir() { + return config.getUploadPath() + "file/"; + } +} diff --git a/src/main/java/com/gxwebsoft/common/system/controller/CacheController.java b/src/main/java/com/gxwebsoft/common/system/controller/CacheController.java new file mode 100644 index 0000000..edb5b3a --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/controller/CacheController.java @@ -0,0 +1,119 @@ +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("删除失败"); + } + + @PreAuthorize("hasAuthority('sys:cache:save')") + @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/src/main/java/com/gxwebsoft/common/system/controller/CompanyController.java b/src/main/java/com/gxwebsoft/common/system/controller/CompanyController.java new file mode 100644 index 0000000..cc9ceed --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/controller/CompanyController.java @@ -0,0 +1,154 @@ +package com.gxwebsoft.common.system.controller; + +import cn.hutool.core.collection.CollectionUtil; +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.Tenant; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.common.system.param.CompanyParam; +import com.gxwebsoft.common.system.service.CompanyService; +import com.gxwebsoft.common.system.service.FileRecordService; +import com.gxwebsoft.common.system.service.TenantService; +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.util.CollectionUtils; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 企业信息控制器 + * + * @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 UserService userService; + @Resource + private FileRecordService fileRecordService; + + @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)); + } + + @PreAuthorize("hasAuthority('sys:company:profile')") + @OperationLog + @ApiOperation("添加企业信息") + @PostMapping() + public ApiResult save(@RequestBody Company company) { + // 记录当前登录用户id + User loginUser = getLoginUser(); + if (loginUser != null) { + company.setUserId(loginUser.getUserId()); + } + if (companyService.save(company)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('sys:company:profile')") + @OperationLog + @ApiOperation("修改企业信息") + @PutMapping() + public ApiResult update(@RequestBody Company company) { + final int count = companyService.count(); + if (companyService.updateById(company)) { + return success("修改成功"); + } + return fail("修改失败",count); + } + + @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:profile')") + @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')") + @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); + } +} diff --git a/src/main/java/com/gxwebsoft/common/system/controller/DictController.java b/src/main/java/com/gxwebsoft/common/system/controller/DictController.java new file mode 100644 index 0000000..66d39f5 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/controller/DictController.java @@ -0,0 +1,185 @@ +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/src/main/java/com/gxwebsoft/common/system/controller/DictDataController.java b/src/main/java/com/gxwebsoft/common/system/controller/DictDataController.java new file mode 100644 index 0000000..b4f07e5 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/controller/DictDataController.java @@ -0,0 +1,133 @@ +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.DictData; +import com.gxwebsoft.common.system.param.DictDataParam; +import com.gxwebsoft.common.system.service.DictDataService; +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; + + @PreAuthorize("hasAuthority('sys:dict:list')") + @OperationLog + @ApiOperation("分页查询字典数据") + @GetMapping("/page") + public ApiResult> page(DictDataParam param) { + return success(dictDataService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('sys:dict:list')") + @OperationLog + @ApiOperation("查询全部字典数据") + @GetMapping() + public ApiResult> list(DictDataParam param) { + return success(dictDataService.listRel(param)); + } + + @PreAuthorize("hasAuthority('sys:dict:list')") + @OperationLog + @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("字典数据标识已存在"); + } + if (dictDataService.save(dictData)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('sys:dict:update')") + @OperationLog + @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/src/main/java/com/gxwebsoft/common/system/controller/DictionaryController.java b/src/main/java/com/gxwebsoft/common/system/controller/DictionaryController.java new file mode 100644 index 0000000..2ec5be7 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/controller/DictionaryController.java @@ -0,0 +1,155 @@ +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/src/main/java/com/gxwebsoft/common/system/controller/DictionaryDataController.java b/src/main/java/com/gxwebsoft/common/system/controller/DictionaryDataController.java new file mode 100644 index 0000000..9a9c1be --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/controller/DictionaryDataController.java @@ -0,0 +1,131 @@ +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')") + @OperationLog + @ApiOperation("分页查询字典数据") + @GetMapping("/page") + public ApiResult> page(DictionaryDataParam param) { + return success(dictionaryDataService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('sys:dict:list')") + @OperationLog + @ApiOperation("查询全部字典数据") + @GetMapping() + public ApiResult> list(DictionaryDataParam param) { + return success(dictionaryDataService.listRel(param)); + } + + @PreAuthorize("hasAuthority('sys:dict:list')") + @OperationLog + @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')") + @OperationLog + @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/src/main/java/com/gxwebsoft/common/system/controller/EmailController.java b/src/main/java/com/gxwebsoft/common/system/controller/EmailController.java new file mode 100644 index 0000000..17f642a --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/controller/EmailController.java @@ -0,0 +1,49 @@ +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/src/main/java/com/gxwebsoft/common/system/controller/FileController.java b/src/main/java/com/gxwebsoft/common/system/controller/FileController.java new file mode 100644 index 0000000..688ef3e --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/controller/FileController.java @@ -0,0 +1,344 @@ +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.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.FileRecord; +import com.gxwebsoft.common.system.param.FileRecordParam; +import com.gxwebsoft.common.system.service.FileRecordService; +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 java.io.File; +import java.util.ArrayList; +import java.util.Arrays; +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 { + @Resource + private ConfigProperties config; + @Resource + private RedisUtil redisUtil; + @Resource + private FileRecordService fileRecordService; + + @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); + result.setMerchantCode(getMerchantCode()); + // 云存储配置 + 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); + result.setMerchantCode(getMerchantCode()); + 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); + result.setMerchantCode(getMerchantCode()); + 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: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); + if (fileRecordService.removeById(id)) { + if (StrUtil.isNotBlank(record.getPath())) { + fileRecordService.deleteFileAsync(Arrays.asList( + new File(getUploadDir(), record.getPath()), + new File(getUploadSmDir(), record.getPath()) + )); + } + 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); + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('sys:file:list')") + @OperationLog + @ApiOperation("分页查询文件") + @GetMapping("/page") + public ApiResult> page(FileRecordParam param, HttpServletRequest request) { + // 搜索条件 + if (getMerchantCode() != null) { + param.setMerchantCode(getMerchantCode()); + } + 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.setUrl(requestURL + record.getPath()); + if (FileServerUtil.isImage(record.getContentType())) { + record.setThumbnail(requestURL + "/thumbnail" + record.getPath()); + } + record.setDownloadUrl(requestURL + "/download" + record.getPath()); + } + } + return success(result); + } + + @PreAuthorize("hasAuthority('sys:file:list')") + @OperationLog + @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.setUrl(requestURL + record.getPath()); + if (FileServerUtil.isImage(record.getContentType())) { + record.setThumbnail(requestURL + "/thumbnail" + record.getPath()); + } + record.setDownloadUrl(requestURL + "/download" + record.getPath()); + } + } + 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("修改失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/common/system/controller/FilePreviewController.java b/src/main/java/com/gxwebsoft/common/system/controller/FilePreviewController.java new file mode 100644 index 0000000..7c267d2 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/controller/FilePreviewController.java @@ -0,0 +1,242 @@ +package com.gxwebsoft.common.system.controller; + +import cn.hutool.core.io.FileUtil; +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.LambdaQueryWrapper; +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.utils.CommonUtil; +import com.gxwebsoft.common.core.utils.FileServerUtil; +import com.gxwebsoft.common.core.web.ApiResult; +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.common.system.entity.AccessKey; +import com.gxwebsoft.common.system.entity.FileRecord; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.common.system.result.LoginResult; +import com.gxwebsoft.common.system.service.*; +import com.gxwebsoft.oa.service.AppService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.data.redis.core.StringRedisTemplate; +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 javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.File; +import java.util.HashMap; +import java.util.concurrent.TimeUnit; + +import static com.gxwebsoft.common.core.constants.RedisConstants.ACCESS_TOKEN_KEY; + +/** + * 文件上传下载控制器 + * + * @author WebSoft + * @since 2018-12-24 16:10:24 + */ +@Api(tags = "文件服务器-文件预览") +@RestController +@RequestMapping("/api/file-preview") +public class FilePreviewController extends BaseController { + private final StringRedisTemplate redisTemplate; + @Resource + private SettingService settingService; + @Resource + private ConfigProperties configProperties; + @Resource + private ConfigProperties config; + @Resource + private FileRecordService fileRecordService; + @Resource + private AccessKeyService accessKeyService; + @Resource + private UserService userService; + @Resource + private AppService appService; + @Resource + private CompanyService companyService; + + public FilePreviewController(StringRedisTemplate redisTemplate) { + this.redisTemplate = redisTemplate; + } + + @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); + } + + @ApiOperation("查看缩略图") + @GetMapping("/thumb/{dir}/{name:.+}") + public void thumb(@PathVariable("dir") String dir, @PathVariable("name") String name, + HttpServletResponse response, HttpServletRequest request) { + File file = new File(getUploadDir(), dir + "/" + name); + File thumbnail = new File(getUploadSmDir2(), dir + "/" + name); + FileServerUtil.previewThumbnail(file, thumbnail, config.getThumbnailSize(), response, request); + } + + @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("APP应用信息") + @GetMapping("/app-info2/{appid}/{accessKey}") + public ApiResult appInfo(@PathVariable("appid") Integer appId, @PathVariable("accessKey") String accessKey) { + // 免密登录 + if (accessKeyService.count(new LambdaQueryWrapper().eq(AccessKey::getAccessKey,accessKey)) > 0) { + return success("操作成功", appService.getById(appId)); + } + return fail("请求失败: 40011"); + } + + @ApiOperation("获取企业信息") + @GetMapping("/company-info2/{companyId}/{accessKey}") + public ApiResult companyInfo(@PathVariable("companyId") Integer companyId, @PathVariable("accessKey") String accessKey) { + // 免密登录 + if (accessKeyService.count(new LambdaQueryWrapper().eq(AccessKey::getAccessKey,accessKey)) > 0) { + return success("操作成功", companyService.getById(companyId)); + } + return fail("请求失败: 40012"); + } + + @ApiOperation("获取微信小程序码") + @GetMapping("/getQRCode") + public ApiResult getQRCode() { + String apiUrl = "https://api.weixin.qq.com/wxa/getwxacode?access_token=" + getAccessToken(); + final HashMap map = new HashMap<>(); + map.put("path","pages/flash/index?user_id="+getLoginUserId()); + map.put("env_version","release"); +// map.put("env_version","trial"); + System.out.println("获取微信小程序码 = " + map); + // 获取图片 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("".concat("/qrcode/").concat(fileName)); + } + return fail("获取失败",null); + } + + /** + * 获取接口调用凭据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"); + // 从缓存获取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); + // 解析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"); + } + return null; + } + + /** + * 文件上传基目录 + */ + private String getUploadBaseDir() { + return config.getUploadPath() + "file/"; + } + + /** + * office转pdf输出位置 + */ + private String getPdfOutDir() { + return getUploadBaseDir() + "pdf/"; + } + + /** + * 文件上传位置(服务器) + */ + private String getUploadDir() { + return config.getUploadPath() + "file/"; + } + + /** + * 缩略图生成位置 + */ + private String getUploadSmDir() { + return getUploadBaseDir() + "thumbnail/"; + } + + /** + * 缩略图生成位置 + */ + private String getUploadSmDir2() { + return getUploadBaseDir() + "thumb/"; + } + + +} diff --git a/src/main/java/com/gxwebsoft/common/system/controller/LoginRecordController.java b/src/main/java/com/gxwebsoft/common/system/controller/LoginRecordController.java new file mode 100644 index 0000000..dc5b7ff --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/controller/LoginRecordController.java @@ -0,0 +1,58 @@ +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/src/main/java/com/gxwebsoft/common/system/controller/MainController.java b/src/main/java/com/gxwebsoft/common/system/controller/MainController.java new file mode 100644 index 0000000..bca6a1a --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/controller/MainController.java @@ -0,0 +1,387 @@ +package com.gxwebsoft.common.system.controller; + +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.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.result.CaptchaResult; +import com.gxwebsoft.common.system.result.LoginResult; +import com.gxwebsoft.common.system.service.*; +import com.wf.captcha.SpecCaptcha; +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.io.UnsupportedEncodingException; +import java.net.URLEncoder; +import java.util.ArrayList; +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 MenuService menuService; + + @ApiOperation("用户登录") + @PostMapping("/login") + public ApiResult login(@RequestBody LoginParam param, HttpServletRequest request) { + String username = param.getUsername(); + Integer tenantId = param.getTenantId(); + + // 登录账号|手机号码|邮箱登录 + 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 message = "密码错误"; + loginRecordService.saveAsync(username, LoginRecord.TYPE_ERROR, message, tenantId, request); + 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); + } + } + + // 签发token + String access_token = JwtUtil.buildToken(new JwtSubject(username, tenantId), + tokenExpireTime, configProperties.getTokenKey()); + 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() { + Integer tenantId = getTenantId(); + Tenant tenant = tenantService.getByIdRel(tenantId); + // 企业信息 + Company company = companyService.getByTenantIdRel(tenantId); + company.setBusinessEntity(null); + company.setPhone(null); + company.setCompanyCode(null); + tenant.setCompany(company); + // 网站菜单 + ArrayList list = new ArrayList<>(); + final Menu menu = new Menu(); + menu.setTitle("首页"); + menu.setPath("/"); + menu.setComponent("/index"); + menu.setParentId(0); + menu.setMenuType(0); + list.add(menu); + menu.setTitle("文档"); + menu.setPath("/docs?id=143"); + menu.setComponent("/content/docs/index"); + menu.setParentId(0); + menu.setMenuType(0); + list.add(menu); + tenant.setMenu(list); + // 查询游客用户 + User loginUser = userService.getByUsername("www", tenantId); + tenant.setLoginUser(loginUser); + // 设置过期时间 + Long tokenExpireTime = configProperties.getTokenExpireTime(); + // 签发token + String access_token = JwtUtil.buildToken(new JwtSubject("www", tenantId), + tokenExpireTime, configProperties.getTokenKey()); + tenant.setToken(access_token); + tenant.setUsername("www"); + return success(tenant); + } + + @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.setUsername(null); + 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("修改失败"); + } + + @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("短信验证码") + @PostMapping("/sendSmsCaptcha") + public ApiResult sendSmsCaptcha(@RequestBody SmsCaptchaParam param) { + // 读取短信配置信息 + String string = redisUtil.get("setting:sms:" + getTenantId()); + JSONObject jsonObject = JSONObject.parseObject(string); + String accessKeyId = jsonObject.getString("accessKeyId"); + String accessKeySecret = jsonObject.getString("accessKeySecret"); + String userTemplateId = jsonObject.getString("userTemplateId"); + String sign = jsonObject.getString("sign"); + if(accessKeyId != null){ + 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("免密登录") + @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 = param.getTenantId(); + final String code = param.getCode(); + + User user = userService.getByUsername(phone, tenantId); + // 验证码校验 + String key = "code:" + param.getPhone(); + if(!code.equals(redisUtil.get(key))){ + String message = "验证码不正确"; + loginRecordService.saveAsync(phone, LoginRecord.TYPE_ERROR, message, tenantId,request); + return fail(message, null); + } + if (user == null) { + String message = "账号不存在"; + loginRecordService.saveAsync(phone, LoginRecord.TYPE_ERROR, message, tenantId,request); + return fail(message, null); + } + 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)); + } +} diff --git a/src/main/java/com/gxwebsoft/common/system/controller/MenuController.java b/src/main/java/com/gxwebsoft/common/system/controller/MenuController.java new file mode 100644 index 0000000..b485c86 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/controller/MenuController.java @@ -0,0 +1,156 @@ +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.Menu; +import com.gxwebsoft.common.system.entity.Plug; +import com.gxwebsoft.common.system.param.MenuParam; +import com.gxwebsoft.common.system.service.MenuService; +import com.gxwebsoft.common.system.service.PlugService; +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:23 + */ +@Api(tags = "菜单管理") +@RestController +@RequestMapping("/api/system/menu") +public class MenuController extends BaseController { + @Resource + private MenuService menuService; + @Resource + private PlugService plugService; + + @PreAuthorize("hasAuthority('sys:menu:list')") + @OperationLog + @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')") + @OperationLog + @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')") + @OperationLog + @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)){ + 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/src/main/java/com/gxwebsoft/common/system/controller/OperationRecordController.java b/src/main/java/com/gxwebsoft/common/system/controller/OperationRecordController.java new file mode 100644 index 0000000..dc6eecf --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/controller/OperationRecordController.java @@ -0,0 +1,62 @@ +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/src/main/java/com/gxwebsoft/common/system/controller/OrganizationController.java b/src/main/java/com/gxwebsoft/common/system/controller/OrganizationController.java new file mode 100644 index 0000000..dac0a74 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/controller/OrganizationController.java @@ -0,0 +1,139 @@ +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/src/main/java/com/gxwebsoft/common/system/controller/PlugController.java b/src/main/java/com/gxwebsoft/common/system/controller/PlugController.java new file mode 100644 index 0000000..9b8fab2 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/controller/PlugController.java @@ -0,0 +1,171 @@ +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.BatchParam; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.common.system.entity.Menu; +import com.gxwebsoft.common.system.entity.Plug; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.common.system.param.PlugParam; +import com.gxwebsoft.common.system.service.MenuService; +import com.gxwebsoft.common.system.service.PlugService; +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-18 11:57:37 + */ +@Api(tags = "插件扩展管理") +@RestController +@RequestMapping("/api/system/plug") +public class PlugController extends BaseController { + @Resource + private PlugService plugService; + @Resource + private MenuService menuService; + + @PreAuthorize("hasAuthority('sys:plug:list')") + @OperationLog + @ApiOperation("分页查询插件扩展") + @GetMapping("/page") + public ApiResult> page(PlugParam param) { + // 如果不传userId，只显示审核通过的插件 + if (param.getUserId() == null) { + param.setStatus(20); + } + // 使用关联查询 + return success(plugService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('sys:plug:list')") + @OperationLog + @ApiOperation("查询全部插件扩展") + @GetMapping() + public ApiResult> list(PlugParam param) { + // 使用关联查询 + 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.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, "menu_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("删除失败"); + } + + @PreAuthorize("hasAuthority('sys:plug:save')") + @OperationLog + @ApiOperation("发布插件") + @PostMapping("/plug") + public ApiResult plug(@RequestBody Plug plug){ + final Integer menuId = plug.getParentId(); + // 查重 + final int count = plugService.count(new LambdaQueryWrapper().eq(Plug::getMenuId, menuId)); + if(count > 0){ + return fail("请勿重复发布"); + } + // 准备数据 + final Menu menu = menuService.getById(menuId); + plug.setUserId(getLoginUserId()); + plug.setMenuId(menuId); + plug.setTenantId(getTenantId()); + plug.setIcon(menu.getIcon()); + plug.setPath(menu.getPath()); + plug.setComponent(menu.getComponent()); + plug.setAuthority(menu.getAuthority()); + plug.setTitle(menu.getTitle()); + plug.setMenuType(menu.getMenuType()); + plug.setMeta(menu.getMeta()); + plug.setParentId(menu.getParentId()); + plug.setHide(menu.getHide()); + plug.setSortNumber(menu.getSortNumber()); + if(plugService.save(plug)){ + return success("发布成功"); + } + return fail("发布失败"); + } +} diff --git a/src/main/java/com/gxwebsoft/common/system/controller/RedisUtilController.java b/src/main/java/com/gxwebsoft/common/system/controller/RedisUtilController.java new file mode 100644 index 0000000..6e2c2a0 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/controller/RedisUtilController.java @@ -0,0 +1,77 @@ +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/src/main/java/com/gxwebsoft/common/system/controller/RoleController.java b/src/main/java/com/gxwebsoft/common/system/controller/RoleController.java new file mode 100644 index 0000000..57eecb3 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/controller/RoleController.java @@ -0,0 +1,152 @@ +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); + 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); + 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/src/main/java/com/gxwebsoft/common/system/controller/RoleMenuController.java b/src/main/java/com/gxwebsoft/common/system/controller/RoleMenuController.java new file mode 100644 index 0000000..bdd35dd --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/controller/RoleMenuController.java @@ -0,0 +1,100 @@ +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/src/main/java/com/gxwebsoft/common/system/controller/SettingController.java b/src/main/java/com/gxwebsoft/common/system/controller/SettingController.java new file mode 100644 index 0000000..004e725 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/controller/SettingController.java @@ -0,0 +1,196 @@ +package com.gxwebsoft.common.system.controller; + +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)) { + // 更新系统设置信息到缓存 + String key = "setting:" + setting.getSettingKey() + ":" + getTenantId(); + System.out.println("key = " + key); + redisUtil.set(key, JSON.parseObject(setting.getContent())); + // 创建微信支付Bean +// settingService.initConfig(setting); + // 更新租户信息 + if (setting.getSettingKey().equals("setting")) { + System.out.println("修改系统设置 = " + setting.getContent()); + final String content = setting.getContent(); + final JSONObject jsonObject = JSONObject.parseObject(content); + final String siteName = jsonObject.getString("siteName"); + final String logo = jsonObject.getString("logo"); + System.out.println("siteName = " + siteName); + 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/src/main/java/com/gxwebsoft/common/system/controller/TenantController.java b/src/main/java/com/gxwebsoft/common/system/controller/TenantController.java new file mode 100644 index 0000000..bb067c5 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/controller/TenantController.java @@ -0,0 +1,167 @@ +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.web.BaseController; +import com.gxwebsoft.common.system.entity.Menu; +import com.gxwebsoft.common.system.entity.RoleMenu; +import com.gxwebsoft.common.system.entity.User; +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.entity.Tenant; +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.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; +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; + + @PreAuthorize("hasAuthority('sys:tenant:list')") + @OperationLog + @ApiOperation("分页查询租户") + @GetMapping("/page") + public ApiResult> page(TenantParam param) { + // 使用关联查询 + return success(tenantService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('sys:tenant:list')") + @OperationLog + @ApiOperation("查询全部租户") + @GetMapping() + public ApiResult> list(TenantParam param) { + // 使用关联查询 + return success(tenantService.listRel(param)); + } + + @PreAuthorize("hasAuthority('sys:tenant:list')") + @OperationLog + @ApiOperation("根据id查询租户") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + // 使用关联查询 + return success(tenantService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('sys:tenant:save')") + @OperationLog + @ApiOperation("添加租户") + @PostMapping() + public ApiResult save(@RequestBody Tenant tenant) { + System.out.println("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/src/main/java/com/gxwebsoft/common/system/controller/UserController.java b/src/main/java/com/gxwebsoft/common/system/controller/UserController.java new file mode 100644 index 0000000..028f368 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/controller/UserController.java @@ -0,0 +1,368 @@ +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.utils.CommonUtil; +import com.gxwebsoft.common.core.web.*; +import com.gxwebsoft.common.system.entity.DictionaryData; +import com.gxwebsoft.common.system.entity.Organization; +import com.gxwebsoft.common.system.entity.Role; +import com.gxwebsoft.common.system.entity.User; +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 com.gxwebsoft.love.entity.UserProfile; +import com.gxwebsoft.love.service.UserProfileService; +import com.gxwebsoft.shop.entity.UserOauth; +import com.gxwebsoft.shop.service.UserOauthService; +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.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +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; + @Resource + private UserOauthService userOauthService; + @Resource + private UserProfileService userProfileService; + + @PreAuthorize("hasAuthority('sys:user:list')") + @OperationLog + @ApiOperation("分页查询用户") + @GetMapping("/page") + public ApiResult> page(UserParam param) { + return success(userService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('sys:user:list')") + @OperationLog + @ApiOperation("查询全部用户") + @GetMapping() + public ApiResult> list(UserParam param) { + return success(userService.listRel(param)); + } + + @PreAuthorize("hasAuthority('sys:user:list')") + @OperationLog + @ApiOperation("根据id查询用户") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + return success(userService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('sys:user:save')") + @OperationLog + @ApiOperation("添加用户") + @PostMapping() + public ApiResult add(@RequestBody User user) { + user.setStatus(0); + user.setPassword(userService.encodePassword(user.getPassword())); + if (userService.saveUser(user)) { + return success("添加成功"); + } + 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 (getAppId() != null) { + user.setUserId(getLoginUserId()); + } + // 保存详细资料 + if(user.getUserProfile() != null){ + userProfileService.update(user.getUserProfile(),new LambdaUpdateWrapper().eq(UserProfile::getUserId,user.getUserId())); + } + 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)) { + QueryWrapper userOauthQueryWrapper = new QueryWrapper<>(); + userOauthService.remove(userOauthQueryWrapper.eq("user_id",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) { + ids.forEach(userId -> { + QueryWrapper userOauthQueryWrapper = new QueryWrapper<>(); + userOauthService.remove(userOauthQueryWrapper.eq("user_id",userId)); + }); + 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()); + // 同步修改资料表 + userProfileService.updateById(user.getUserProfile()); + 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("重置失败"); + } + } + + @PreAuthorize("hasAuthority('sys:user:list')") + @OperationLog + @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')") + @OperationLog + @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("更新失败"); + } + + @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/src/main/java/com/gxwebsoft/common/system/controller/UserFileController.java b/src/main/java/com/gxwebsoft/common/system/controller/UserFileController.java new file mode 100644 index 0000000..c809af0 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/controller/UserFileController.java @@ -0,0 +1,164 @@ +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/src/main/java/com/gxwebsoft/common/system/controller/WxLoginController.java b/src/main/java/com/gxwebsoft/common/system/controller/WxLoginController.java new file mode 100644 index 0000000..43365e4 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/controller/WxLoginController.java @@ -0,0 +1,371 @@ +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.LambdaQueryWrapper; +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.web.ApiResult; +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.common.system.entity.LoginRecord; +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.param.UserParam; +import com.gxwebsoft.common.system.result.LoginResult; +import com.gxwebsoft.common.system.service.*; +import com.gxwebsoft.love.entity.UserProfile; +import com.gxwebsoft.love.service.UserProfileService; +import com.gxwebsoft.shop.entity.Merchant; +import com.gxwebsoft.shop.entity.UserOauth; +import com.gxwebsoft.shop.entity.UserReferee; +import com.gxwebsoft.shop.service.MerchantService; +import com.gxwebsoft.shop.service.UserOauthService; +import com.gxwebsoft.shop.service.UserRefereeService; +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.util.CollectionUtils; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.io.File; +import java.math.BigDecimal; +import java.util.HashMap; +import java.util.List; +import java.util.concurrent.TimeUnit; + +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 UserOauthService userOauthService; + @Resource + private LoginRecordService loginRecordService; + @Resource + private RoleService roleService; + @Resource + private ConfigProperties config; + @Resource + private UserRefereeService userRefereeService; + @Resource + private UserProfileService userProfileService; + @Resource + private MerchantService merchantService; + + 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); + // 添加第三方用户信息 + UserOauth uo = new UserOauth(); + uo.setUserId(user.getUserId()); + uo.setTenantId(user.getTenantId()); + uo.setOauthType("MP-WEIXIN"); + uo.setOauthId(openid); + uo.setUnionid(unionid); + userOauthService.save(uo); + } + // 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); + 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.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); + // 用户详细资料表 + final UserProfile profile = new UserProfile(); + profile.setUserId(addUser.getUserId()); + profile.setRecommend(1); + profile.setWhenMarriedMate("想要二年内结婚"); + userProfileService.save(profile); + // 添加门店 + final Merchant merchant = new Merchant(); + merchant.setUserId(addUser.getUserId()); + merchant.setMerchantOwner(addUser.getUserId()); + merchant.setMerchantCode(addUser.getUserId()+""); + merchant.setMerchantName(addUser.getNickname()); + merchant.setLogo(addUser.getAvatar()); + merchant.setProvince(addUser.getProvince()); + merchant.setCity(addUser.getCity()); + merchant.setRegion(addUser.getRegion()); + merchant.setMerchantPhone(addUser.getPhone()); + merchant.setMerchantHours("8:30 - 22:30"); + merchant.setSortNumber(100); + merchant.setStatus(0); + merchant.setFirstRatio(new BigDecimal("0.1")); + merchant.setSecondRatio(new BigDecimal("0.1")); + merchant.setOnlineRatio(new BigDecimal("0.1")); + merchant.setOfflineRatio(new BigDecimal("0")); + merchant.setShopRatio(new BigDecimal("0")); + merchant.setTenantId(addUser.getTenantId()); + merchantService.save(merchant); + } + // 绑定推荐关系 + if(userParam.getRefereeId() != null && userParam.getRefereeId() > 0){ + final Integer refereeId = userParam.getRefereeId(); + final UserReferee userReferee = new UserReferee(); + userReferee.setUserId(addUser.getUserId()); + userReferee.setDealerId(refereeId); + userReferee.setLevel(1); + userRefereeService.save(userReferee); + } + 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"); + // 从缓存获取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); + // 解析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"); + } + return null; + } + + @ApiOperation("获取微信openId") + @PostMapping("/getWxOpenId") + public ApiResult getWxOpenId(@RequestBody UserParam userParam) { + final User loginUser = getLoginUser(); + if(loginUser.getUsername().equals("www")){ + return fail("游客"); + } + 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); + System.out.println("response = " + response); + final JSONObject jsonObject = JSONObject.parseObject(response); + + // 保存openid + final List list = userOauthService.list(new LambdaQueryWrapper().eq(UserOauth::getUserId, loginUser.getUserId()).eq(UserOauth::getOauthType,"MP-WEIXIN")); + if (CollectionUtils.isEmpty(list)) { + final UserOauth userOauth = new UserOauth(); + userOauth.setUserId(getLoginUserId()); + userOauth.setOauthId(jsonObject.getString("openid")); + userOauth.setUnionid(jsonObject.getString("unionid")); + userOauth.setOauthType("MP-WEIXIN"); + userOauthService.save(userOauth); + return success("保存openid成功",jsonObject); + } + return fail("更新失败",null); + } + + @ApiOperation("获取微信小程序码") + @GetMapping("/getQRCode") + public ApiResult getQRCode() { + String apiUrl = "https://api.weixin.qq.com/wxa/getwxacode?access_token=" + getAccessToken(); + final HashMap map = new HashMap<>(); + map.put("path","pages/flash/index?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); + } + + /** + * 文件上传位置(服务器) + */ + private String getUploadDir() { + return config.getUploadPath() + "file/"; + } + + +} diff --git a/src/main/java/com/gxwebsoft/common/system/entity/AccessKey.java b/src/main/java/com/gxwebsoft/common/system/entity/AccessKey.java new file mode 100644 index 0000000..441873e --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/entity/AccessKey.java @@ -0,0 +1,54 @@ +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/src/main/java/com/gxwebsoft/common/system/entity/Cache.java b/src/main/java/com/gxwebsoft/common/system/entity/Cache.java new file mode 100644 index 0000000..f0eabcc --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/entity/Cache.java @@ -0,0 +1,34 @@ +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/src/main/java/com/gxwebsoft/common/system/entity/Company.java b/src/main/java/com/gxwebsoft/common/system/entity/Company.java new file mode 100644 index 0000000..6cd888e --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/entity/Company.java @@ -0,0 +1,158 @@ +package com.gxwebsoft.common.system.entity; + +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 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 Integer users; + + @ApiModelProperty(value = "成员数量(上限)") + private Integer members; + + @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 Integer status; + + @ApiModelProperty(value = "排序") + private Integer sortNumber; + + @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(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; + +} diff --git a/src/main/java/com/gxwebsoft/common/system/entity/Dict.java b/src/main/java/com/gxwebsoft/common/system/entity/Dict.java new file mode 100644 index 0000000..48b56bd --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/entity/Dict.java @@ -0,0 +1,57 @@ +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/src/main/java/com/gxwebsoft/common/system/entity/DictData.java b/src/main/java/com/gxwebsoft/common/system/entity/DictData.java new file mode 100644 index 0000000..8daee79 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/entity/DictData.java @@ -0,0 +1,63 @@ +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/src/main/java/com/gxwebsoft/common/system/entity/Dictionary.java b/src/main/java/com/gxwebsoft/common/system/entity/Dictionary.java new file mode 100644 index 0000000..2baec46 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/entity/Dictionary.java @@ -0,0 +1,56 @@ +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/src/main/java/com/gxwebsoft/common/system/entity/DictionaryData.java b/src/main/java/com/gxwebsoft/common/system/entity/DictionaryData.java new file mode 100644 index 0000000..aec639c --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/entity/DictionaryData.java @@ -0,0 +1,64 @@ +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/src/main/java/com/gxwebsoft/common/system/entity/EmailRecord.java b/src/main/java/com/gxwebsoft/common/system/entity/EmailRecord.java new file mode 100644 index 0000000..4deb683 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/entity/EmailRecord.java @@ -0,0 +1,56 @@ +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/src/main/java/com/gxwebsoft/common/system/entity/FileRecord.java b/src/main/java/com/gxwebsoft/common/system/entity/FileRecord.java new file mode 100644 index 0000000..683010f --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/entity/FileRecord.java @@ -0,0 +1,88 @@ +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 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("创建人") + private Integer createUserId; + + @ApiModelProperty("是否删除, 0否, 1是") + @TableLogic + private Integer deleted; + + @ApiModelProperty("商户编号") + private String merchantCode; + + @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/src/main/java/com/gxwebsoft/common/system/entity/KVEntity.java b/src/main/java/com/gxwebsoft/common/system/entity/KVEntity.java new file mode 100644 index 0000000..b310b8f --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/entity/KVEntity.java @@ -0,0 +1,56 @@ +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/src/main/java/com/gxwebsoft/common/system/entity/LoginRecord.java b/src/main/java/com/gxwebsoft/common/system/entity/LoginRecord.java new file mode 100644 index 0000000..9e205b6 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/entity/LoginRecord.java @@ -0,0 +1,73 @@ +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/src/main/java/com/gxwebsoft/common/system/entity/Menu.java b/src/main/java/com/gxwebsoft/common/system/entity/Menu.java new file mode 100644 index 0000000..9274ab1 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/entity/Menu.java @@ -0,0 +1,84 @@ +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("菜单类型, 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/src/main/java/com/gxwebsoft/common/system/entity/OperationRecord.java b/src/main/java/com/gxwebsoft/common/system/entity/OperationRecord.java new file mode 100644 index 0000000..cdda95c --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/entity/OperationRecord.java @@ -0,0 +1,95 @@ +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/src/main/java/com/gxwebsoft/common/system/entity/Organization.java b/src/main/java/com/gxwebsoft/common/system/entity/Organization.java new file mode 100644 index 0000000..7881795 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/entity/Organization.java @@ -0,0 +1,77 @@ +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/src/main/java/com/gxwebsoft/common/system/entity/Plug.java b/src/main/java/com/gxwebsoft/common/system/entity/Plug.java new file mode 100644 index 0000000..b2dcd7c --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/entity/Plug.java @@ -0,0 +1,141 @@ +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; +import java.util.List; + +/** + * 插件扩展 + * + * @author 科技小王子 + * @since 2023-05-18 11:57:37 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "Plug对象", description = "插件扩展") +@TableName("sys_plug") +public class Plug implements Serializable { + private static final long serialVersionUID = 1L; + public static final int TYPE_MENU = 0; // 菜单类型 + public static final int TYPE_BTN = 1; // 按钮类型 + + @ApiModelProperty(value = "插件id") + @TableId(value = "plug_id", type = IdType.AUTO) + private Integer plugId; + + @ApiModelProperty(value = "菜单ID") + private Integer menuId; + + @ApiModelProperty(value = "上级id, 0是顶级") + private Integer parentId; + + @ApiModelProperty(value = "菜单名称") + private String title; + + @ApiModelProperty(value = "菜单路由地址") + private String path; + + @ApiModelProperty(value = "菜单组件地址, 目录可为空") + private String component; + + @ApiModelProperty(value = "类型, 0菜单, 1按钮") + private Integer menuType; + + @ApiModelProperty(value = "排序号") + private Integer sortNumber; + + @ApiModelProperty(value = "权限标识") + private String authority; + + @ApiModelProperty(value = "打开位置") + private String target; + + @ApiModelProperty(value = "菜单图标") + private String icon; + + @ApiModelProperty(value = "图标颜色") + private String color; + + @ApiModelProperty(value = "是否隐藏, 0否, 1是(仅注册路由不显示在左侧菜单)") + private Integer hide; + + @ApiModelProperty(value = "菜单侧栏选中的path") + private String active; + + @ApiModelProperty(value = "其它路由元信息") + private String meta; + + @ApiModelProperty(value = "插件描述") + private String comments; + + @ApiModelProperty(value = "插件详情") + private String content; + + @ApiModelProperty("评分") + private BigDecimal score; + + @ApiModelProperty("插件价格") + private BigDecimal price; + + @ApiModelProperty("浏览次数") + private Integer clicks; + + @ApiModelProperty("安装次数") + private Integer installs; + + @ApiModelProperty(value = "关联应用ID") + private Integer appId; + + @ApiModelProperty(value = "用户ID") + private Integer userId; + + @ApiModelProperty(value = "状态") + 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("子菜单") + @TableField(exist = false) + private List children; + + @ApiModelProperty("角色权限树选中状态") + @TableField(exist = false) + private Boolean checked; + + @ApiModelProperty("租户名称") + @TableField(exist = false) + private String tenantName; + + @ApiModelProperty("企业名称") + @TableField(exist = false) + private String companyName; + + @ApiModelProperty("企业简称") + @TableField(exist = false) + private String shortName; + + @ApiModelProperty("企业域名") + @TableField(exist = false) + private String domain; +} diff --git a/src/main/java/com/gxwebsoft/common/system/entity/Role.java b/src/main/java/com/gxwebsoft/common/system/entity/Role.java new file mode 100644 index 0000000..7fd8598 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/entity/Role.java @@ -0,0 +1,53 @@ +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("是否删除, 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/src/main/java/com/gxwebsoft/common/system/entity/RoleMenu.java b/src/main/java/com/gxwebsoft/common/system/entity/RoleMenu.java new file mode 100644 index 0000000..2d4dc3c --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/entity/RoleMenu.java @@ -0,0 +1,44 @@ +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/src/main/java/com/gxwebsoft/common/system/entity/Setting.java b/src/main/java/com/gxwebsoft/common/system/entity/Setting.java new file mode 100644 index 0000000..cba1b08 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/entity/Setting.java @@ -0,0 +1,58 @@ +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/src/main/java/com/gxwebsoft/common/system/entity/Tenant.java b/src/main/java/com/gxwebsoft/common/system/entity/Tenant.java new file mode 100644 index 0000000..7f900c8 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/entity/Tenant.java @@ -0,0 +1,79 @@ +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 = "用户ID") + private Integer userId; + + @ApiModelProperty(value = "是否删除, 0否, 1是") + @TableLogic + private Integer deleted; + + @ApiModelProperty(value = "创建时间") + private Date createTime; + + @ApiModelProperty(value = "修改时间") + private Date updateTime; + + @ApiModelProperty(value = "logo") + @TableField(exist = false) + private String logo; + + @ApiModelProperty(value = "游客") + @TableField(exist = false) + private String username; + + @ApiModelProperty(value = "游客身份") + @TableField(exist = false) + private String token; + + @ApiModelProperty(value = "当前登录用户") + @TableField(exist = false) + private User loginUser; + + @ApiModelProperty(value = "菜单信息") + @TableField(exist = false) + private List menu; + + @ApiModelProperty(value = "企业信息") + @TableField(exist = false) + private Company company; + +} diff --git a/src/main/java/com/gxwebsoft/common/system/entity/User.java b/src/main/java/com/gxwebsoft/common/system/entity/User.java new file mode 100644 index 0000000..becaba5 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/entity/User.java @@ -0,0 +1,317 @@ +package com.gxwebsoft.common.system.entity; + +import cn.hutool.core.util.DesensitizedUtil; +import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.gxwebsoft.love.entity.UserPlanEquity; +import com.gxwebsoft.love.entity.UserProfile; +import com.gxwebsoft.oa.entity.App; +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普通用户 6开发者 10企业用户") + 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 position; + + @ApiModelProperty("邮箱是否验证, 0否, 1是") + private Integer emailVerified; + + @ApiModelProperty("别名") + private String alias; + + @ApiModelProperty("真实姓名") + private String realName; + + @ApiModelProperty("身份证号") + private String idCard; + + @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 customerId; + + @ApiModelProperty("企业ID") + private Integer companyId; + + @ApiModelProperty("注册来源客户端") + private String platform; + + @ApiModelProperty("兴趣爱好") + private String interest; + + @ApiModelProperty("身高") + private String height; + + @ApiModelProperty("体重") + private String weight; + + @ApiModelProperty("学历") + private String education; + + @ApiModelProperty("月薪") + private String monthlyPay; + + @ApiModelProperty("是否下线会员") + private Integer offline; + + @ApiModelProperty("关注数") + private Integer followers; + + @ApiModelProperty("粉丝数") + private Integer fans; + + @ApiModelProperty("获赞数") + private Integer likes; + + @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("公司名称") + 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 UserProfile userProfile; + + @ApiModelProperty("权限列表") + @TableField(exist = false) + private List authorities; + + @ApiModelProperty("微信凭证") + @TableField(exist = false) + private String code; + + @ApiModelProperty("推荐人ID") + @TableField(exist = false) + private Integer dealerId; + + @ApiModelProperty("微信openid") + @TableField(exist = false) + private String openid; + + @ApiModelProperty("微信unionid") + @TableField(exist = false) + private String unionid; + + @ApiModelProperty("所属商户的编号") + @TableField(exist = false) + private String merchantCode; + + @ApiModelProperty("所属商户名称") + @TableField(exist = false) + private String merchantName; + + @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("应用信息") + @TableField(exist = false) + private App appInfo; + + @ApiModelProperty("企业信息") + @TableField(exist = false) + private Company companyInfo; + + @ApiModelProperty("权益列表") + @TableField(exist = false) + private List userPlanEquityList; + + @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 getRealName(){ +// return DesensitizedUtil.chineseName(this.realName); +// } +// +// public String getIdCard(){ +// return DesensitizedUtil.idCardNum(this.idCard,1,2); +// } + public String getMobile(){ + return DesensitizedUtil.mobilePhone(this.phone); + } + +} diff --git a/src/main/java/com/gxwebsoft/common/system/entity/UserFile.java b/src/main/java/com/gxwebsoft/common/system/entity/UserFile.java new file mode 100644 index 0000000..b9d277f --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/entity/UserFile.java @@ -0,0 +1,76 @@ +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/src/main/java/com/gxwebsoft/common/system/entity/UserRole.java b/src/main/java/com/gxwebsoft/common/system/entity/UserRole.java new file mode 100644 index 0000000..ca12165 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/entity/UserRole.java @@ -0,0 +1,49 @@ +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/src/main/java/com/gxwebsoft/common/system/mapper/AccessKeyMapper.java b/src/main/java/com/gxwebsoft/common/system/mapper/AccessKeyMapper.java new file mode 100644 index 0000000..658f773 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/mapper/AccessKeyMapper.java @@ -0,0 +1,37 @@ +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/src/main/java/com/gxwebsoft/common/system/mapper/CompanyMapper.java b/src/main/java/com/gxwebsoft/common/system/mapper/CompanyMapper.java new file mode 100644 index 0000000..2c0fbb8 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/mapper/CompanyMapper.java @@ -0,0 +1,38 @@ +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.Company; +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); + +} diff --git a/src/main/java/com/gxwebsoft/common/system/mapper/DictDataMapper.java b/src/main/java/com/gxwebsoft/common/system/mapper/DictDataMapper.java new file mode 100644 index 0000000..f36039f --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/mapper/DictDataMapper.java @@ -0,0 +1,47 @@ +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/src/main/java/com/gxwebsoft/common/system/mapper/DictMapper.java b/src/main/java/com/gxwebsoft/common/system/mapper/DictMapper.java new file mode 100644 index 0000000..ce19779 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/mapper/DictMapper.java @@ -0,0 +1,14 @@ +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/src/main/java/com/gxwebsoft/common/system/mapper/DictionaryDataMapper.java b/src/main/java/com/gxwebsoft/common/system/mapper/DictionaryDataMapper.java new file mode 100644 index 0000000..519c2ba --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/mapper/DictionaryDataMapper.java @@ -0,0 +1,47 @@ +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/src/main/java/com/gxwebsoft/common/system/mapper/DictionaryMapper.java b/src/main/java/com/gxwebsoft/common/system/mapper/DictionaryMapper.java new file mode 100644 index 0000000..7c2cbac --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/mapper/DictionaryMapper.java @@ -0,0 +1,14 @@ +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/src/main/java/com/gxwebsoft/common/system/mapper/EmailRecordMapper.java b/src/main/java/com/gxwebsoft/common/system/mapper/EmailRecordMapper.java new file mode 100644 index 0000000..02611c9 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/mapper/EmailRecordMapper.java @@ -0,0 +1,14 @@ +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/src/main/java/com/gxwebsoft/common/system/mapper/FileRecordMapper.java b/src/main/java/com/gxwebsoft/common/system/mapper/FileRecordMapper.java new file mode 100644 index 0000000..fe9f0b8 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/mapper/FileRecordMapper.java @@ -0,0 +1,47 @@ +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/src/main/java/com/gxwebsoft/common/system/mapper/LoginRecordMapper.java b/src/main/java/com/gxwebsoft/common/system/mapper/LoginRecordMapper.java new file mode 100644 index 0000000..4409fdd --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/mapper/LoginRecordMapper.java @@ -0,0 +1,48 @@ +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/src/main/java/com/gxwebsoft/common/system/mapper/MenuMapper.java b/src/main/java/com/gxwebsoft/common/system/mapper/MenuMapper.java new file mode 100644 index 0000000..938ef17 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/mapper/MenuMapper.java @@ -0,0 +1,22 @@ +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/src/main/java/com/gxwebsoft/common/system/mapper/OperationRecordMapper.java b/src/main/java/com/gxwebsoft/common/system/mapper/OperationRecordMapper.java new file mode 100644 index 0000000..8750c2a --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/mapper/OperationRecordMapper.java @@ -0,0 +1,48 @@ +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/src/main/java/com/gxwebsoft/common/system/mapper/OrganizationMapper.java b/src/main/java/com/gxwebsoft/common/system/mapper/OrganizationMapper.java new file mode 100644 index 0000000..6f06689 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/mapper/OrganizationMapper.java @@ -0,0 +1,37 @@ +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/src/main/java/com/gxwebsoft/common/system/mapper/PlugMapper.java b/src/main/java/com/gxwebsoft/common/system/mapper/PlugMapper.java new file mode 100644 index 0000000..600b1a2 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/mapper/PlugMapper.java @@ -0,0 +1,42 @@ +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.Plug; +import com.gxwebsoft.common.system.param.PlugParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 插件扩展Mapper + * + * @author 科技小王子 + * @since 2023-05-18 11:57:37 + */ +public interface PlugMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + @InterceptorIgnore(tenantLine = "true") + List selectPageRel(@Param("page") IPage page, + @Param("param") PlugParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") PlugParam param); + + @InterceptorIgnore(tenantLine = "true") + List getMenuByClone(@Param("param") PlugParam param); + +} diff --git a/src/main/java/com/gxwebsoft/common/system/mapper/RoleMapper.java b/src/main/java/com/gxwebsoft/common/system/mapper/RoleMapper.java new file mode 100644 index 0000000..b00f275 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/mapper/RoleMapper.java @@ -0,0 +1,14 @@ +package com.gxwebsoft.common.system.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.gxwebsoft.common.system.entity.Role; + +/** + * 角色Mapper + * + * @author WebSoft + * @since 2018-12-24 16:10:44 + */ +public interface RoleMapper extends BaseMapper { + +} diff --git a/src/main/java/com/gxwebsoft/common/system/mapper/RoleMenuMapper.java b/src/main/java/com/gxwebsoft/common/system/mapper/RoleMenuMapper.java new file mode 100644 index 0000000..a225765 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/mapper/RoleMenuMapper.java @@ -0,0 +1,39 @@ +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/src/main/java/com/gxwebsoft/common/system/mapper/SettingMapper.java b/src/main/java/com/gxwebsoft/common/system/mapper/SettingMapper.java new file mode 100644 index 0000000..ffc7f55 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/mapper/SettingMapper.java @@ -0,0 +1,40 @@ +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/src/main/java/com/gxwebsoft/common/system/mapper/TenantMapper.java b/src/main/java/com/gxwebsoft/common/system/mapper/TenantMapper.java new file mode 100644 index 0000000..17f4a25 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/mapper/TenantMapper.java @@ -0,0 +1,37 @@ +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.Tenant; +import com.gxwebsoft.common.system.param.TenantParam; +import org.apache.ibatis.annotations.Param; + +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); + +} diff --git a/src/main/java/com/gxwebsoft/common/system/mapper/UserFileMapper.java b/src/main/java/com/gxwebsoft/common/system/mapper/UserFileMapper.java new file mode 100644 index 0000000..d9e4bb4 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/mapper/UserFileMapper.java @@ -0,0 +1,14 @@ +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/src/main/java/com/gxwebsoft/common/system/mapper/UserMapper.java b/src/main/java/com/gxwebsoft/common/system/mapper/UserMapper.java new file mode 100644 index 0000000..3769098 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/mapper/UserMapper.java @@ -0,0 +1,55 @@ +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/src/main/java/com/gxwebsoft/common/system/mapper/UserRoleMapper.java b/src/main/java/com/gxwebsoft/common/system/mapper/UserRoleMapper.java new file mode 100644 index 0000000..51b38c8 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/mapper/UserRoleMapper.java @@ -0,0 +1,45 @@ +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/src/main/java/com/gxwebsoft/common/system/mapper/xml/AccessKeyMapper.xml b/src/main/java/com/gxwebsoft/common/system/mapper/xml/AccessKeyMapper.xml new file mode 100644 index 0000000..9e870d7 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/mapper/xml/AccessKeyMapper.xml @@ -0,0 +1,44 @@ + + + + + + + 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/src/main/java/com/gxwebsoft/common/system/mapper/xml/CompanyMapper.xml b/src/main/java/com/gxwebsoft/common/system/mapper/xml/CompanyMapper.xml new file mode 100644 index 0000000..546fe14 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/mapper/xml/CompanyMapper.xml @@ -0,0 +1,124 @@ + + + + + + + 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 LIKE CONCAT('%', #{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.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}, '%') + ) + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/common/system/mapper/xml/DictDataMapper.xml b/src/main/java/com/gxwebsoft/common/system/mapper/xml/DictDataMapper.xml new file mode 100644 index 0000000..38949c2 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/mapper/xml/DictDataMapper.xml @@ -0,0 +1,71 @@ + + + + + + + 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/src/main/java/com/gxwebsoft/common/system/mapper/xml/DictMapper.xml b/src/main/java/com/gxwebsoft/common/system/mapper/xml/DictMapper.xml new file mode 100644 index 0000000..db709ae --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/mapper/xml/DictMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/src/main/java/com/gxwebsoft/common/system/mapper/xml/DictionaryDataMapper.xml b/src/main/java/com/gxwebsoft/common/system/mapper/xml/DictionaryDataMapper.xml new file mode 100644 index 0000000..db778ba --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/mapper/xml/DictionaryDataMapper.xml @@ -0,0 +1,71 @@ + + + + + + + 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/src/main/java/com/gxwebsoft/common/system/mapper/xml/DictionaryMapper.xml b/src/main/java/com/gxwebsoft/common/system/mapper/xml/DictionaryMapper.xml new file mode 100644 index 0000000..8cd0cff --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/mapper/xml/DictionaryMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/src/main/java/com/gxwebsoft/common/system/mapper/xml/EmailRecordMapper.xml b/src/main/java/com/gxwebsoft/common/system/mapper/xml/EmailRecordMapper.xml new file mode 100644 index 0000000..7b5ad62 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/mapper/xml/EmailRecordMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/src/main/java/com/gxwebsoft/common/system/mapper/xml/FileRecordMapper.xml b/src/main/java/com/gxwebsoft/common/system/mapper/xml/FileRecordMapper.xml new file mode 100644 index 0000000..629a8d7 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/mapper/xml/FileRecordMapper.xml @@ -0,0 +1,79 @@ + + + + + + + SELECT a.*, + b.username create_username, + b.nickname create_nickname, + b.avatar, + c.merchant_code + FROM sys_file_record a + LEFT JOIN sys_user b ON a.create_user_id = b.user_id + LEFT JOIN shop_merchant c ON a.merchant_code = c.merchant_code + + + AND a.id = #{param.id} + + + AND a.`name` LIKE CONCAT('%', #{param.name}, '%') + + + AND a.path LIKE CONCAT('%', #{param.path}, '%') + + + 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}, '%') + + + AND a.merchant_code LIKE CONCAT('%', #{param.merchantCode}, '%') + + + + + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/common/system/mapper/xml/LoginRecordMapper.xml b/src/main/java/com/gxwebsoft/common/system/mapper/xml/LoginRecordMapper.xml new file mode 100644 index 0000000..35d00ad --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/mapper/xml/LoginRecordMapper.xml @@ -0,0 +1,62 @@ + + + + + + + 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/src/main/java/com/gxwebsoft/common/system/mapper/xml/MenuMapper.xml b/src/main/java/com/gxwebsoft/common/system/mapper/xml/MenuMapper.xml new file mode 100644 index 0000000..0897489 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/mapper/xml/MenuMapper.xml @@ -0,0 +1,32 @@ + + + + + + + SELECT a.* + FROM sys_menu a + + + AND a.menu_id = #{param.menuId} + + + AND a.parent_id = #{param.parentId} + + + AND a.deleted = #{param.deleted} + + + AND a.deleted = 0 + + + AND a.tenant_id = #{param.tenantId} + + + + + + + diff --git a/src/main/java/com/gxwebsoft/common/system/mapper/xml/OperationRecordMapper.xml b/src/main/java/com/gxwebsoft/common/system/mapper/xml/OperationRecordMapper.xml new file mode 100644 index 0000000..e03147b --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/mapper/xml/OperationRecordMapper.xml @@ -0,0 +1,71 @@ + + + + + + + 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/src/main/java/com/gxwebsoft/common/system/mapper/xml/OrganizationMapper.xml b/src/main/java/com/gxwebsoft/common/system/mapper/xml/OrganizationMapper.xml new file mode 100644 index 0000000..52c9467 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/mapper/xml/OrganizationMapper.xml @@ -0,0 +1,86 @@ + + + + + + + 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/src/main/java/com/gxwebsoft/common/system/mapper/xml/PlugMapper.xml b/src/main/java/com/gxwebsoft/common/system/mapper/xml/PlugMapper.xml new file mode 100644 index 0000000..cdaeafb --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/mapper/xml/PlugMapper.xml @@ -0,0 +1,105 @@ + + + + + + + SELECT a.*,b.tenant_name,c.company_name,c.short_name,c.domain + FROM sys_plug a + LEFT JOIN sys_tenant b ON a.tenant_id = b.tenant_id + LEFT JOIN sys_company c ON a.tenant_id = c.tenant_id + + + AND a.plug_id = #{param.plugId} + + + AND a.menu_id = #{param.menuId} + + + AND a.parent_id = #{param.parentId} + + + AND a.title LIKE CONCAT('%', #{param.title}, '%') + + + AND a.path LIKE CONCAT('%', #{param.path}, '%') + + + AND a.component LIKE CONCAT('%', #{param.component}, '%') + + + AND a.menu_type = #{param.menuType} + + + AND a.sort_number = #{param.sortNumber} + + + AND a.authority LIKE CONCAT('%', #{param.authority}, '%') + + + AND a.target LIKE CONCAT('%', #{param.target}, '%') + + + AND a.icon LIKE CONCAT('%', #{param.icon}, '%') + + + AND a.color LIKE CONCAT('%', #{param.color}, '%') + + + AND a.hide = #{param.hide} + + + AND a.active LIKE CONCAT('%', #{param.active}, '%') + + + AND a.meta LIKE CONCAT('%', #{param.meta}, '%') + + + AND a.app_id = #{param.appId} + + + AND a.user_id = #{param.userId} + + + 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.title LIKE CONCAT('%', #{param.keywords}, '%') + OR a.menu_id = #{param.keywords} + OR c.company_name LIKE CONCAT('%', #{param.keywords}, '%') + OR c.short_name LIKE CONCAT('%', #{param.keywords}, '%') + ) + + + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/common/system/mapper/xml/RoleMapper.xml b/src/main/java/com/gxwebsoft/common/system/mapper/xml/RoleMapper.xml new file mode 100644 index 0000000..9f6facc --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/mapper/xml/RoleMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/src/main/java/com/gxwebsoft/common/system/mapper/xml/RoleMenuMapper.xml b/src/main/java/com/gxwebsoft/common/system/mapper/xml/RoleMenuMapper.xml new file mode 100644 index 0000000..377d903 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/mapper/xml/RoleMenuMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/common/system/mapper/xml/SettingMapper.xml b/src/main/java/com/gxwebsoft/common/system/mapper/xml/SettingMapper.xml new file mode 100644 index 0000000..ac81f4e --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/mapper/xml/SettingMapper.xml @@ -0,0 +1,33 @@ + + + + + + + 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/src/main/java/com/gxwebsoft/common/system/mapper/xml/TenantMapper.xml b/src/main/java/com/gxwebsoft/common/system/mapper/xml/TenantMapper.xml new file mode 100644 index 0000000..83ba5b2 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/mapper/xml/TenantMapper.xml @@ -0,0 +1,56 @@ + + + + + + + SELECT a.* + FROM sys_tenant a + + + 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} + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserFileMapper.xml b/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserFileMapper.xml new file mode 100644 index 0000000..872b232 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserFileMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserMapper.xml b/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserMapper.xml new file mode 100644 index 0000000..1b702bf --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserMapper.xml @@ -0,0 +1,231 @@ + + + + + + + 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.tenant_name,e.logo, + g.grade_id,g.name as gradeName, + h.dealer_id + 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_tenant e ON a.tenant_id = e.tenant_id + LEFT JOIN shop_user_grade g ON a.grade_id = g.grade_id + LEFT JOIN shop_user_referee h ON a.user_id = h.user_id and h.deleted = 0 + + + 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.organization_id > 0 + + + 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.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 + + #{item} + + + + AND a.province LIKE CONCAT('%', #{param.province}, '%') + + + AND a.city LIKE CONCAT('%', #{param.city}, '%') + + + AND i.city_mate LIKE CONCAT('%', #{param.cityMate}, '%') + + + AND a.region LIKE CONCAT('%', #{param.region}, '%') + + + AND b.organization_name LIKE CONCAT('%', #{param.organizationName}, '%') + + + AND c.dict_data_name = #{param.sexName} + + + AND g.grade_id = #{param.gradeId} + + + AND ( + a.username LIKE CONCAT('%', #{param.keywords}, '%') + OR a.user_id = #{param.keywords} + OR a.nickname LIKE CONCAT('%', #{param.keywords}, '%') + OR a.real_name LIKE CONCAT('%', #{param.keywords}, '%') + OR a.alias LIKE CONCAT('%', #{param.keywords}, '%') + OR a.phone LIKE CONCAT('%', #{param.keywords}, '%') + OR a.email LIKE CONCAT('%', #{param.keywords}, '%') + OR b.organization_name LIKE CONCAT('%', #{param.keywords}, '%') + OR c.dict_data_name LIKE CONCAT('%', #{param.keywords}, '%') + OR d.role_name LIKE CONCAT('%', #{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/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserRoleMapper.xml b/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserRoleMapper.xml new file mode 100644 index 0000000..6b1c3e2 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserRoleMapper.xml @@ -0,0 +1,35 @@ + + + + + + INSERT INTO sys_user_role(user_id, role_id) VALUES + + (#{userId}, #{roleId}) + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/common/system/param/AccessKeyParam.java b/src/main/java/com/gxwebsoft/common/system/param/AccessKeyParam.java new file mode 100644 index 0000000..6d77044 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/param/AccessKeyParam.java @@ -0,0 +1,55 @@ +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/src/main/java/com/gxwebsoft/common/system/param/AlipayParam.java b/src/main/java/com/gxwebsoft/common/system/param/AlipayParam.java new file mode 100644 index 0000000..978c942 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/param/AlipayParam.java @@ -0,0 +1,31 @@ +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/src/main/java/com/gxwebsoft/common/system/param/CacheParam.java b/src/main/java/com/gxwebsoft/common/system/param/CacheParam.java new file mode 100644 index 0000000..0e43e93 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/param/CacheParam.java @@ -0,0 +1,25 @@ +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/src/main/java/com/gxwebsoft/common/system/param/CompanyParam.java b/src/main/java/com/gxwebsoft/common/system/param/CompanyParam.java new file mode 100644 index 0000000..b13dcb5 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/param/CompanyParam.java @@ -0,0 +1,131 @@ +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-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 = "企业法人") + 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 = "状态") + @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 = "是否默认企业主体") + @QueryField(type = QueryType.EQ) + private Boolean authoritative; + + @ApiModelProperty(value = "租户号") + private Integer tenantId; + +} diff --git a/src/main/java/com/gxwebsoft/common/system/param/DictDataParam.java b/src/main/java/com/gxwebsoft/common/system/param/DictDataParam.java new file mode 100644 index 0000000..68d85b9 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/param/DictDataParam.java @@ -0,0 +1,55 @@ +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/src/main/java/com/gxwebsoft/common/system/param/DictParam.java b/src/main/java/com/gxwebsoft/common/system/param/DictParam.java new file mode 100644 index 0000000..a4fcefc --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/param/DictParam.java @@ -0,0 +1,38 @@ +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/src/main/java/com/gxwebsoft/common/system/param/DictionaryDataParam.java b/src/main/java/com/gxwebsoft/common/system/param/DictionaryDataParam.java new file mode 100644 index 0000000..9ae7597 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/param/DictionaryDataParam.java @@ -0,0 +1,55 @@ +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/src/main/java/com/gxwebsoft/common/system/param/DictionaryParam.java b/src/main/java/com/gxwebsoft/common/system/param/DictionaryParam.java new file mode 100644 index 0000000..d3d5ef2 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/param/DictionaryParam.java @@ -0,0 +1,38 @@ +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/src/main/java/com/gxwebsoft/common/system/param/FileRecordParam.java b/src/main/java/com/gxwebsoft/common/system/param/FileRecordParam.java new file mode 100644 index 0000000..97dc845 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/param/FileRecordParam.java @@ -0,0 +1,70 @@ +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("创建人") + 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; + + @ApiModelProperty("商户编号") + private String merchantCode; + +} diff --git a/src/main/java/com/gxwebsoft/common/system/param/LoginParam.java b/src/main/java/com/gxwebsoft/common/system/param/LoginParam.java new file mode 100644 index 0000000..e0b6ea5 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/param/LoginParam.java @@ -0,0 +1,37 @@ +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(value = "租户id") + private Integer tenantId; + +} diff --git a/src/main/java/com/gxwebsoft/common/system/param/LoginRecordParam.java b/src/main/java/com/gxwebsoft/common/system/param/LoginRecordParam.java new file mode 100644 index 0000000..9ceb8d6 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/param/LoginRecordParam.java @@ -0,0 +1,60 @@ +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/src/main/java/com/gxwebsoft/common/system/param/MenuParam.java b/src/main/java/com/gxwebsoft/common/system/param/MenuParam.java new file mode 100644 index 0000000..6596d0a --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/param/MenuParam.java @@ -0,0 +1,68 @@ +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("菜单类型, 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; + +} diff --git a/src/main/java/com/gxwebsoft/common/system/param/OperationRecordParam.java b/src/main/java/com/gxwebsoft/common/system/param/OperationRecordParam.java new file mode 100644 index 0000000..7c5e344 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/param/OperationRecordParam.java @@ -0,0 +1,67 @@ +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/src/main/java/com/gxwebsoft/common/system/param/OrganizationParam.java b/src/main/java/com/gxwebsoft/common/system/param/OrganizationParam.java new file mode 100644 index 0000000..d0b9942 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/param/OrganizationParam.java @@ -0,0 +1,65 @@ +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/src/main/java/com/gxwebsoft/common/system/param/PlugParam.java b/src/main/java/com/gxwebsoft/common/system/param/PlugParam.java new file mode 100644 index 0000000..87e79af --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/param/PlugParam.java @@ -0,0 +1,95 @@ +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-05-18 11:57:37 + */ +@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 = "菜单id") + @QueryField(type = QueryType.EQ) + private Integer menuId; + + @ApiModelProperty(value = "上级id, 0是顶级") + @QueryField(type = QueryType.EQ) + private Integer parentId; + + @ApiModelProperty(value = "菜单名称") + private String title; + + @ApiModelProperty(value = "菜单路由地址") + private String path; + + @ApiModelProperty(value = "菜单组件地址, 目录可为空") + private String component; + + @ApiModelProperty(value = "类型, 0菜单, 1按钮") + @QueryField(type = QueryType.EQ) + private Integer menuType; + + @ApiModelProperty(value = "排序号") + @QueryField(type = QueryType.EQ) + private Integer sortNumber; + + @ApiModelProperty(value = "权限标识") + private String authority; + + @ApiModelProperty(value = "打开位置") + private String target; + + @ApiModelProperty(value = "菜单图标") + private String icon; + + @ApiModelProperty(value = "图标颜色") + private String color; + + @ApiModelProperty(value = "是否隐藏, 0否, 1是(仅注册路由不显示在左侧菜单)") + @QueryField(type = QueryType.EQ) + private Integer hide; + + @ApiModelProperty(value = "菜单侧栏选中的path") + private String active; + + @ApiModelProperty(value = "其它路由元信息") + private String meta; + + @ApiModelProperty(value = "关联应用ID") + @QueryField(type = QueryType.EQ) + private Integer appId; + + @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 = "商户编码") + private String merchantCode; + +} diff --git a/src/main/java/com/gxwebsoft/common/system/param/RoleParam.java b/src/main/java/com/gxwebsoft/common/system/param/RoleParam.java new file mode 100644 index 0000000..1332d4e --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/param/RoleParam.java @@ -0,0 +1,41 @@ +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("角色标识") + private String roleCode; + + @ApiModelProperty("角色名称") + private String roleName; + + @ApiModelProperty("备注") + private String comments; + + @ApiModelProperty("租户ID") + private Integer tenantId; + +} diff --git a/src/main/java/com/gxwebsoft/common/system/param/SettingParam.java b/src/main/java/com/gxwebsoft/common/system/param/SettingParam.java new file mode 100644 index 0000000..fe322d3 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/param/SettingParam.java @@ -0,0 +1,50 @@ +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/src/main/java/com/gxwebsoft/common/system/param/SmsCaptchaParam.java b/src/main/java/com/gxwebsoft/common/system/param/SmsCaptchaParam.java new file mode 100644 index 0000000..765b9eb --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/param/SmsCaptchaParam.java @@ -0,0 +1,31 @@ +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; + +} diff --git a/src/main/java/com/gxwebsoft/common/system/param/TenantParam.java b/src/main/java/com/gxwebsoft/common/system/param/TenantParam.java new file mode 100644 index 0000000..5d70e82 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/param/TenantParam.java @@ -0,0 +1,55 @@ +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/src/main/java/com/gxwebsoft/common/system/param/UpdatePasswordParam.java b/src/main/java/com/gxwebsoft/common/system/param/UpdatePasswordParam.java new file mode 100644 index 0000000..ca75819 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/param/UpdatePasswordParam.java @@ -0,0 +1,31 @@ +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; + +} diff --git a/src/main/java/com/gxwebsoft/common/system/param/UserFileParam.java b/src/main/java/com/gxwebsoft/common/system/param/UserFileParam.java new file mode 100644 index 0000000..d8217af --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/param/UserFileParam.java @@ -0,0 +1,40 @@ +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/src/main/java/com/gxwebsoft/common/system/param/UserImportParam.java b/src/main/java/com/gxwebsoft/common/system/param/UserImportParam.java new file mode 100644 index 0000000..153a783 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/param/UserImportParam.java @@ -0,0 +1,42 @@ +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/src/main/java/com/gxwebsoft/common/system/param/UserParam.java b/src/main/java/com/gxwebsoft/common/system/param/UserParam.java new file mode 100644 index 0000000..128dd53 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/param/UserParam.java @@ -0,0 +1,213 @@ +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 com.gxwebsoft.love.entity.UserProfile; +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("注册来源客户端") + @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(value = "所在省份") + private String province; + + @ApiModelProperty(value = "所在城市") + private String city; + + @ApiModelProperty(value = "所在辖区") + private String region; + + @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("最后结算时间") + @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 UserProfile userProfile; + + @ApiModelProperty("是否查询用户详细资料表") + @TableField(exist = false) + private Boolean showProfile; + + @ApiModelProperty("关注数") + private Integer followers; + + @ApiModelProperty("粉丝数") + private Integer fans; + + @ApiModelProperty("获赞数") + private Integer likes; + + @ApiModelProperty("评论数") + private Integer commentNumbers; +} diff --git a/src/main/java/com/gxwebsoft/common/system/result/CaptchaResult.java b/src/main/java/com/gxwebsoft/common/system/result/CaptchaResult.java new file mode 100644 index 0000000..5a2d441 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/result/CaptchaResult.java @@ -0,0 +1,30 @@ +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/src/main/java/com/gxwebsoft/common/system/result/LoginResult.java b/src/main/java/com/gxwebsoft/common/system/result/LoginResult.java new file mode 100644 index 0000000..4089728 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/result/LoginResult.java @@ -0,0 +1,31 @@ +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/src/main/java/com/gxwebsoft/common/system/result/RedisResult.java b/src/main/java/com/gxwebsoft/common/system/result/RedisResult.java new file mode 100644 index 0000000..b2bc90c --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/result/RedisResult.java @@ -0,0 +1,35 @@ +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/src/main/java/com/gxwebsoft/common/system/result/SmsCaptchaResult.java b/src/main/java/com/gxwebsoft/common/system/result/SmsCaptchaResult.java new file mode 100644 index 0000000..0db38d2 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/result/SmsCaptchaResult.java @@ -0,0 +1,26 @@ +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/src/main/java/com/gxwebsoft/common/system/service/AccessKeyService.java b/src/main/java/com/gxwebsoft/common/system/service/AccessKeyService.java new file mode 100644 index 0000000..19946bc --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/service/AccessKeyService.java @@ -0,0 +1,42 @@ +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/src/main/java/com/gxwebsoft/common/system/service/AlipayService.java b/src/main/java/com/gxwebsoft/common/system/service/AlipayService.java new file mode 100644 index 0000000..c29884d --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/service/AlipayService.java @@ -0,0 +1,21 @@ +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 com.gxwebsoft.shop.entity.Payment; + +import javax.servlet.http.HttpServletRequest; +import java.util.List; + +/** + * 支付宝服务层 + * + * @author WebSoft + * @since 2018-12-24 16:10:41 + */ +public interface AlipayService extends IService { + + +} diff --git a/src/main/java/com/gxwebsoft/common/system/service/CompanyService.java b/src/main/java/com/gxwebsoft/common/system/service/CompanyService.java new file mode 100644 index 0000000..023e8af --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/service/CompanyService.java @@ -0,0 +1,44 @@ +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.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); + +} diff --git a/src/main/java/com/gxwebsoft/common/system/service/DictDataService.java b/src/main/java/com/gxwebsoft/common/system/service/DictDataService.java new file mode 100644 index 0000000..86b94bf --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/service/DictDataService.java @@ -0,0 +1,52 @@ +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/src/main/java/com/gxwebsoft/common/system/service/DictService.java b/src/main/java/com/gxwebsoft/common/system/service/DictService.java new file mode 100644 index 0000000..8aef5ba --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/service/DictService.java @@ -0,0 +1,14 @@ +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/src/main/java/com/gxwebsoft/common/system/service/DictionaryDataService.java b/src/main/java/com/gxwebsoft/common/system/service/DictionaryDataService.java new file mode 100644 index 0000000..881fd5a --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/service/DictionaryDataService.java @@ -0,0 +1,51 @@ +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/src/main/java/com/gxwebsoft/common/system/service/DictionaryService.java b/src/main/java/com/gxwebsoft/common/system/service/DictionaryService.java new file mode 100644 index 0000000..4705494 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/service/DictionaryService.java @@ -0,0 +1,14 @@ +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/src/main/java/com/gxwebsoft/common/system/service/EmailRecordService.java b/src/main/java/com/gxwebsoft/common/system/service/EmailRecordService.java new file mode 100644 index 0000000..6b100c7 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/service/EmailRecordService.java @@ -0,0 +1,50 @@ +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; + +} diff --git a/src/main/java/com/gxwebsoft/common/system/service/FileRecordService.java b/src/main/java/com/gxwebsoft/common/system/service/FileRecordService.java new file mode 100644 index 0000000..3dd09ac --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/service/FileRecordService.java @@ -0,0 +1,58 @@ +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 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); + +} diff --git a/src/main/java/com/gxwebsoft/common/system/service/LoginRecordService.java b/src/main/java/com/gxwebsoft/common/system/service/LoginRecordService.java new file mode 100644 index 0000000..0c4adbf --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/service/LoginRecordService.java @@ -0,0 +1,54 @@ +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/src/main/java/com/gxwebsoft/common/system/service/MenuService.java b/src/main/java/com/gxwebsoft/common/system/service/MenuService.java new file mode 100644 index 0000000..db8e967 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/service/MenuService.java @@ -0,0 +1,18 @@ +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/src/main/java/com/gxwebsoft/common/system/service/OperationRecordService.java b/src/main/java/com/gxwebsoft/common/system/service/OperationRecordService.java new file mode 100644 index 0000000..227c4e6 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/service/OperationRecordService.java @@ -0,0 +1,49 @@ +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/src/main/java/com/gxwebsoft/common/system/service/OrganizationService.java b/src/main/java/com/gxwebsoft/common/system/service/OrganizationService.java new file mode 100644 index 0000000..94d3407 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/service/OrganizationService.java @@ -0,0 +1,42 @@ +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/src/main/java/com/gxwebsoft/common/system/service/PlugService.java b/src/main/java/com/gxwebsoft/common/system/service/PlugService.java new file mode 100644 index 0000000..18d1194 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/service/PlugService.java @@ -0,0 +1,44 @@ +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-05-18 11:57:37 + */ +public interface PlugService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(PlugParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(PlugParam param); + + /** + * 根据id查询 + * + * @param menuId 菜单id + * @return Plug + */ + Plug getByIdRel(Integer menuId); + + Boolean cloneMenu(PlugParam param); + +} diff --git a/src/main/java/com/gxwebsoft/common/system/service/RoleMenuService.java b/src/main/java/com/gxwebsoft/common/system/service/RoleMenuService.java new file mode 100644 index 0000000..05a3d4f --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/service/RoleMenuService.java @@ -0,0 +1,35 @@ +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/src/main/java/com/gxwebsoft/common/system/service/RoleService.java b/src/main/java/com/gxwebsoft/common/system/service/RoleService.java new file mode 100644 index 0000000..3e76263 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/service/RoleService.java @@ -0,0 +1,14 @@ +package com.gxwebsoft.common.system.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.system.entity.Role; + +/** + * 角色Service + * + * @author WebSoft + * @since 2018-12-24 16:10:32 + */ +public interface RoleService extends IService { + +} diff --git a/src/main/java/com/gxwebsoft/common/system/service/SettingService.java b/src/main/java/com/gxwebsoft/common/system/service/SettingService.java new file mode 100644 index 0000000..9432620 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/service/SettingService.java @@ -0,0 +1,59 @@ +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); + +} diff --git a/src/main/java/com/gxwebsoft/common/system/service/TenantService.java b/src/main/java/com/gxwebsoft/common/system/service/TenantService.java new file mode 100644 index 0000000..42614a4 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/service/TenantService.java @@ -0,0 +1,42 @@ +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.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); + +} diff --git a/src/main/java/com/gxwebsoft/common/system/service/UserFileService.java b/src/main/java/com/gxwebsoft/common/system/service/UserFileService.java new file mode 100644 index 0000000..2c8abe6 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/service/UserFileService.java @@ -0,0 +1,14 @@ +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/src/main/java/com/gxwebsoft/common/system/service/UserRoleService.java b/src/main/java/com/gxwebsoft/common/system/service/UserRoleService.java new file mode 100644 index 0000000..c87365b --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/service/UserRoleService.java @@ -0,0 +1,42 @@ +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/src/main/java/com/gxwebsoft/common/system/service/UserService.java b/src/main/java/com/gxwebsoft/common/system/service/UserService.java new file mode 100644 index 0000000..2a4f377 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/service/UserService.java @@ -0,0 +1,112 @@ +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); + void listRanking(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); +} diff --git a/src/main/java/com/gxwebsoft/common/system/service/impl/AccessKeyServiceImpl.java b/src/main/java/com/gxwebsoft/common/system/service/impl/AccessKeyServiceImpl.java new file mode 100644 index 0000000..2f02e25 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/service/impl/AccessKeyServiceImpl.java @@ -0,0 +1,47 @@ +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/src/main/java/com/gxwebsoft/common/system/service/impl/CompanyServiceImpl.java b/src/main/java/com/gxwebsoft/common/system/service/impl/CompanyServiceImpl.java new file mode 100644 index 0000000..4ed419d --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/service/impl/CompanyServiceImpl.java @@ -0,0 +1,55 @@ +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.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)); + } + +} diff --git a/src/main/java/com/gxwebsoft/common/system/service/impl/DictDataServiceImpl.java b/src/main/java/com/gxwebsoft/common/system/service/impl/DictDataServiceImpl.java new file mode 100644 index 0000000..e30a0fe --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/service/impl/DictDataServiceImpl.java @@ -0,0 +1,52 @@ +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"); + return new PageResult<>(baseMapper.selectPageRel(page, param), page.getTotal()); + } + + @Override + public List listRel(DictDataParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("sort_number"); + 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/src/main/java/com/gxwebsoft/common/system/service/impl/DictServiceImpl.java b/src/main/java/com/gxwebsoft/common/system/service/impl/DictServiceImpl.java new file mode 100644 index 0000000..6b09f90 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/service/impl/DictServiceImpl.java @@ -0,0 +1,18 @@ +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/src/main/java/com/gxwebsoft/common/system/service/impl/DictionaryDataServiceImpl.java b/src/main/java/com/gxwebsoft/common/system/service/impl/DictionaryDataServiceImpl.java new file mode 100644 index 0000000..0f26dd2 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/service/impl/DictionaryDataServiceImpl.java @@ -0,0 +1,52 @@ +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/src/main/java/com/gxwebsoft/common/system/service/impl/DictionaryServiceImpl.java b/src/main/java/com/gxwebsoft/common/system/service/impl/DictionaryServiceImpl.java new file mode 100644 index 0000000..74d6fe1 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/service/impl/DictionaryServiceImpl.java @@ -0,0 +1,18 @@ +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/src/main/java/com/gxwebsoft/common/system/service/impl/EmailRecordServiceImpl.java b/src/main/java/com/gxwebsoft/common/system/service/impl/EmailRecordServiceImpl.java new file mode 100644 index 0000000..a939a3d --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/service/impl/EmailRecordServiceImpl.java @@ -0,0 +1,72 @@ +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.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); // 发送邮件 + } + +} diff --git a/src/main/java/com/gxwebsoft/common/system/service/impl/FileRecordServiceImpl.java b/src/main/java/com/gxwebsoft/common/system/service/impl/FileRecordServiceImpl.java new file mode 100644 index 0000000..72c9c27 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/service/impl/FileRecordServiceImpl.java @@ -0,0 +1,63 @@ +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.FileRecord; +import com.gxwebsoft.common.system.mapper.FileRecordMapper; +import com.gxwebsoft.common.system.param.FileRecordParam; +import com.gxwebsoft.common.system.service.FileRecordService; +import org.springframework.scheduling.annotation.Async; +import org.springframework.stereotype.Service; + +import java.io.File; +import java.util.List; + +/** + * 文件上传记录Service实现 + * + * @author WebSoft + * @since 2021-08-30 11:21:01 + */ +@Service +public class FileRecordServiceImpl extends ServiceImpl implements FileRecordService { + + @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(); + } + } + } +} diff --git a/src/main/java/com/gxwebsoft/common/system/service/impl/LoginRecordServiceImpl.java b/src/main/java/com/gxwebsoft/common/system/service/impl/LoginRecordServiceImpl.java new file mode 100644 index 0000000..28497e7 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/service/impl/LoginRecordServiceImpl.java @@ -0,0 +1,78 @@ +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/src/main/java/com/gxwebsoft/common/system/service/impl/MenuServiceImpl.java b/src/main/java/com/gxwebsoft/common/system/service/impl/MenuServiceImpl.java new file mode 100644 index 0000000..7fda6bc --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/service/impl/MenuServiceImpl.java @@ -0,0 +1,139 @@ +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.system.entity.Menu; +import com.gxwebsoft.common.system.entity.Role; +import com.gxwebsoft.common.system.entity.RoleMenu; +import com.gxwebsoft.common.system.mapper.MenuMapper; +import com.gxwebsoft.common.system.param.MenuParam; +import com.gxwebsoft.common.system.service.MenuService; +import com.gxwebsoft.common.system.service.RoleMenuService; +import com.gxwebsoft.common.system.service.RoleService; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Isolation; +import org.springframework.transaction.annotation.Transactional; + +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; + + @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); +// final List list = baseMapper.getMenuByClone(param); +//// final List menuIds = list.stream().map(Menu::getMenuId).collect(Collectors.toList()); + 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()); + 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()); + 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()); + save(menu2); + }); + }); + }); + } +} diff --git a/src/main/java/com/gxwebsoft/common/system/service/impl/OperationRecordServiceImpl.java b/src/main/java/com/gxwebsoft/common/system/service/impl/OperationRecordServiceImpl.java new file mode 100644 index 0000000..8095bf4 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/service/impl/OperationRecordServiceImpl.java @@ -0,0 +1,52 @@ +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/src/main/java/com/gxwebsoft/common/system/service/impl/OrganizationServiceImpl.java b/src/main/java/com/gxwebsoft/common/system/service/impl/OrganizationServiceImpl.java new file mode 100644 index 0000000..b2bb53f --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/service/impl/OrganizationServiceImpl.java @@ -0,0 +1,45 @@ +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/src/main/java/com/gxwebsoft/common/system/service/impl/PlugServiceImpl.java b/src/main/java/com/gxwebsoft/common/system/service/impl/PlugServiceImpl.java new file mode 100644 index 0000000..c328274 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/service/impl/PlugServiceImpl.java @@ -0,0 +1,112 @@ +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.web.PageParam; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.common.system.entity.Plug; +import com.gxwebsoft.common.system.mapper.PlugMapper; +import com.gxwebsoft.common.system.param.PlugParam; +import com.gxwebsoft.common.system.service.PlugService; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Isolation; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * 插件扩展Service实现 + * + * @author 科技小王子 + * @since 2023-05-18 11:57:37 + */ +@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 menuId) { + PlugParam param = new PlugParam(); + param.setMenuId(menuId); + return param.getOne(baseMapper.selectListRel(param)); + } + + @Override + @Transactional(rollbackFor = {Exception.class}, isolation = Isolation.SERIALIZABLE) + public Boolean cloneMenu(PlugParam param) { + System.out.println("准备待克隆的菜单数据 = " + param); + // 删除本项目菜单 + baseMapper.delete(new LambdaQueryWrapper().eq(Plug::getDeleted,0)); + // 顶级栏目 + param.setParentId(0); + final List list = baseMapper.getMenuByClone(param); +// final List menuIds = list.stream().map(Menu::getMenuId).collect(Collectors.toList()); + + list.forEach(d -> { + Plug plug = new Plug(); + plug.setParentId(0); + plug.setTitle(d.getTitle()); + plug.setPath(d.getPath()); + plug.setComponent(d.getComponent()); + plug.setMenuType(d.getMenuType()); + plug.setSortNumber(d.getSortNumber()); + plug.setAuthority(d.getAuthority()); + plug.setIcon(d.getIcon()); + plug.setHide(d.getHide()); + plug.setMeta(d.getMeta()); + save(plug); + // 二级菜单 + param.setParentId(d.getMenuId()); + final List list1 = baseMapper.getMenuByClone(param); + list1.forEach(d1 -> { + final Plug menu1 = new Plug(); + menu1.setParentId(plug.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()); + save(menu1); + // 三级菜单 + param.setParentId(d1.getMenuId()); + final List list2 = baseMapper.getMenuByClone(param); + list2.forEach(d2 -> { + final Plug menu2 = new Plug(); + 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()); + save(menu2); + }); + }); + }); + return true; + } + +} diff --git a/src/main/java/com/gxwebsoft/common/system/service/impl/RoleMenuServiceImpl.java b/src/main/java/com/gxwebsoft/common/system/service/impl/RoleMenuServiceImpl.java new file mode 100644 index 0000000..737c5e3 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/service/impl/RoleMenuServiceImpl.java @@ -0,0 +1,31 @@ +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/src/main/java/com/gxwebsoft/common/system/service/impl/RoleServiceImpl.java b/src/main/java/com/gxwebsoft/common/system/service/impl/RoleServiceImpl.java new file mode 100644 index 0000000..f543abd --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/service/impl/RoleServiceImpl.java @@ -0,0 +1,18 @@ +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.service.RoleService; +import org.springframework.stereotype.Service; + +/** + * 角色服务实现类 + * + * @author WebSoft + * @since 2018-12-24 16:10:11 + */ +@Service +public class RoleServiceImpl extends ServiceImpl implements RoleService { + +} diff --git a/src/main/java/com/gxwebsoft/common/system/service/impl/SettingServiceImpl.java b/src/main/java/com/gxwebsoft/common/system/service/impl/SettingServiceImpl.java new file mode 100644 index 0000000..702c265 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/service/impl/SettingServiceImpl.java @@ -0,0 +1,155 @@ +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.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; + + @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()); + } + +} diff --git a/src/main/java/com/gxwebsoft/common/system/service/impl/TenantServiceImpl.java b/src/main/java/com/gxwebsoft/common/system/service/impl/TenantServiceImpl.java new file mode 100644 index 0000000..99c423e --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/service/impl/TenantServiceImpl.java @@ -0,0 +1,46 @@ +package com.gxwebsoft.common.system.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.common.system.mapper.TenantMapper; +import com.gxwebsoft.common.system.service.TenantService; +import com.gxwebsoft.common.system.entity.Tenant; +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 java.util.List; + +/** + * 租户Service实现 + * + * @author 科技小王子 + * @since 2023-07-17 17:49:53 + */ +@Service +public class TenantServiceImpl extends ServiceImpl implements TenantService { + + @Override + public PageResult pageRel(TenantParam 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(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)); + } + +} diff --git a/src/main/java/com/gxwebsoft/common/system/service/impl/UserFileServiceImpl.java b/src/main/java/com/gxwebsoft/common/system/service/impl/UserFileServiceImpl.java new file mode 100644 index 0000000..b5712c3 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/service/impl/UserFileServiceImpl.java @@ -0,0 +1,18 @@ +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/src/main/java/com/gxwebsoft/common/system/service/impl/UserRoleServiceImpl.java b/src/main/java/com/gxwebsoft/common/system/service/impl/UserRoleServiceImpl.java new file mode 100644 index 0000000..a2a3d11 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/service/impl/UserRoleServiceImpl.java @@ -0,0 +1,37 @@ +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/src/main/java/com/gxwebsoft/common/system/service/impl/UserServiceImpl.java b/src/main/java/com/gxwebsoft/common/system/service/impl/UserServiceImpl.java new file mode 100644 index 0000000..5089b87 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/service/impl/UserServiceImpl.java @@ -0,0 +1,346 @@ +package com.gxwebsoft.common.system.service.impl; + +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.CacheClient; +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 com.gxwebsoft.love.entity.UserPlanEquity; +import com.gxwebsoft.love.entity.UserProfile; +import com.gxwebsoft.love.param.UserProfileParam; +import com.gxwebsoft.love.service.UserPlanEquityService; +import com.gxwebsoft.love.service.UserProfileService; +import com.gxwebsoft.oa.entity.App; +import com.gxwebsoft.oa.service.AppService; +import com.gxwebsoft.shop.entity.Merchant; +import com.gxwebsoft.shop.entity.MerchantClerk; +import com.gxwebsoft.shop.service.MerchantClerkService; +import com.gxwebsoft.shop.service.MerchantService; +import org.springframework.data.redis.core.StringRedisTemplate; +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 org.springframework.util.CollectionUtils; + +import javax.annotation.Resource; +import java.time.LocalDateTime; +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.RedisConstants.USER_RANKING_BY_APPS; + +/** + * 用户Service实现 + * + * @author WebSoft + * @since 2018-12-24 16:10:14 + */ +@Service +public class UserServiceImpl extends ServiceImpl implements UserService { + @Resource + private UserRoleService userRoleService; + @Resource + private RoleMenuService roleMenuService; + @Resource + private BCryptPasswordEncoder bCryptPasswordEncoder; + @Resource + private MerchantService merchantService; + @Resource + private MerchantClerkService merchantClerkService; + @Resource + private CacheClient cacheClient; + @Resource + private AppService appService; + @Resource + private TenantService tenantService; + @Resource + private CompanyService companyService; + @Resource + private StringRedisTemplate stringRedisTemplate; + @Resource + private RedisUtil redisUtil; + @Resource + private UserProfileService userProfileService; + + @Resource + private UserPlanEquityService userPlanEquityService; + + @Override + public PageResult pageRel(UserParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + List list = baseMapper.selectPageRel(page, param); + // 查询用户的角色 + selectUserRoles(list); + // 查询用户详细资料 + if (param.getShowProfile() != null) { + selectUserProfile(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("create_time desc"); + return page.sortRecords(list); + } + + @Override + public void listRanking(UserParam param) { + List list = baseMapper.selectListRel(param); + Map map = new HashMap<>(); + list.forEach(d -> { + int count = appService.count(new LambdaQueryWrapper() + .eq(App::getUserId, d.getUserId())); + // 更新全部用户的插件数量 + cacheClient.zAdd(USER_RANKING_BY_APPS, d.getUserId(), (double) count); + }); + } + + @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)基本信息 + final String setting = redisUtil.get("setting:setting:" + user.getTenantId()); + if(setting != null){ + final JSONObject site = JSONObject.parseObject(setting); + map.put("siteName",site.getString("siteName")); + map.put("remarks",site.getString("remarks")); + map.put("keyword",site.getString("keyword")); + map.put("icp",site.getString("icp")); + map.put("copyright",site.getString("copyright")); + map.put("company",site.getString("company")); + map.put("address",site.getString("address")); + map.put("phone",site.getString("phone")); + map.put("email",site.getString("email")); + map.put("domain",site.getString("domain")); + map.put("support",site.getString("support")); + map.put("logo",site.getString("logo")); + } + // 2)云存储 + 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); + } + // 企业信息 + String key2 = "company:authoritative:" + user.getTenantId(); + final Company company = redisUtil.get(key2, Company.class); + user.setCompanyInfo(company); + user.setSystem(map); + // 商户编号 + Merchant merchant = merchantService.getOne(new QueryWrapper() + .eq("merchant_owner", user.getUserId()), false); + if (merchant != null) { + user.setMerchantCode(merchant.getMerchantCode()); + user.setMerchantName(merchant.getMerchantName()); + } else { + MerchantClerk clerk = merchantClerkService.getOne(new QueryWrapper().eq("user_id", user.getUserId()), false); + if (clerk != null) { + user.setMerchantCode(clerk.getMerchantCode()); + } + } + + // 我的权益 + List userPlanEquityList = userPlanEquityService.list(new LambdaQueryWrapper() + .eq(UserPlanEquity::getUserId, userId) + .gt(UserPlanEquity::getExpirationTime, LocalDateTime.now())); + user.setUserPlanEquityList(userPlanEquityList); + + } + 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); + } + + /** + * 批量查询用户的角色 + * + * @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); + } + } + } + + /** + * 批量查询用户的详细资料 + * + * @param users 用户集合 + */ + private void selectUserProfile(List users) { + if (users != null && users.size() > 0) { + Set userIds = users.stream().map(User::getUserId).collect(Collectors.toSet()); + final UserProfileParam userProfileParam = new UserProfileParam(); + userProfileParam.setUserIds(userIds); + final List userProfiles = userProfileService.listRel(userProfileParam); + final Map> collect = userProfiles.stream().collect(Collectors.groupingBy(UserProfile::getUserId)); + for (User user: users){ + final List list = collect.get(user.getUserId()); + if (!CollectionUtils.isEmpty(list)) { + final UserProfile profile = collect.get(user.getUserId()).get(0); + user.setUserProfile(profile); + } + } + } + } + +} diff --git a/src/main/java/com/gxwebsoft/house/controller/InfoController.java b/src/main/java/com/gxwebsoft/house/controller/InfoController.java new file mode 100644 index 0000000..04a3d8e --- /dev/null +++ b/src/main/java/com/gxwebsoft/house/controller/InfoController.java @@ -0,0 +1,154 @@ +package com.gxwebsoft.house.controller; + +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.house.entity.LikeLog; +import com.gxwebsoft.house.service.InfoService; +import com.gxwebsoft.house.entity.Info; +import com.gxwebsoft.house.param.InfoParam; +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.house.service.LikeLogService; +import com.gxwebsoft.house.service.ViewsLogService; +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-08-03 18:23:43 + */ +@Api(tags = "房源信息表管理") +@RestController +@RequestMapping("/api/house/info") +public class InfoController extends BaseController { + @Resource + private InfoService infoService; + + @Resource + private LikeLogService likeLogService; + + @Resource + private ViewsLogService viewsLogService; + + @PreAuthorize("hasAuthority('house:info:list')") + @OperationLog + @ApiOperation("分页查询房源信息表") + @GetMapping("/page") + public ApiResult> page(InfoParam param) { + // 使用关联查询 + System.out.println("param = " + param.getRegion()); + return success(infoService.pageRel(param)); + } + + @OperationLog + @ApiOperation("查询全部房源信息表") + @GetMapping() + public ApiResult> list(InfoParam param) { + // 使用关联查询 + return success(infoService.listRel(param)); + } + + @OperationLog + @ApiOperation("根据id查询房源信息表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + Info byIdRel = infoService.getByIdRel(id); + + Integer loginUserId = getLoginUserId(); + if(loginUserId != null) { + // 是否喜欢 + LikeLog log = likeLogService.getByIdRel(id, loginUserId); + byIdRel.setLiked(log != null); + // 添加浏览记录 + viewsLogService.add(byIdRel, loginUserId); + + } + + + + // 使用关联查询 + return success(byIdRel); + } + + @PreAuthorize("hasAuthority('house:info:save')") + @OperationLog + @ApiOperation("添加房源信息表") + @PostMapping() + public ApiResult save(@RequestBody Info info) { + // 记录当前登录用户id + User loginUser = getLoginUser(); + if (loginUser != null) { + info.setUserId(loginUser.getUserId()); + } + if (infoService.save(info)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('house:info:update')") + @OperationLog + @ApiOperation("修改房源信息表") + @PutMapping() + public ApiResult update(@RequestBody Info info) { + if (infoService.updateById(info)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('house:info:remove')") + @OperationLog + @ApiOperation("删除房源信息表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (infoService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('house:info:save')") + @OperationLog + @ApiOperation("批量添加房源信息表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (infoService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('house:info:update')") + @OperationLog + @ApiOperation("批量修改房源信息表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(infoService, "house_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('house:info:remove')") + @OperationLog + @ApiOperation("批量删除房源信息表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (infoService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/house/controller/LikeLogController.java b/src/main/java/com/gxwebsoft/house/controller/LikeLogController.java new file mode 100644 index 0000000..81e21ea --- /dev/null +++ b/src/main/java/com/gxwebsoft/house/controller/LikeLogController.java @@ -0,0 +1,135 @@ +package com.gxwebsoft.house.controller; + +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.house.service.LikeLogService; +import com.gxwebsoft.house.entity.LikeLog; +import com.gxwebsoft.house.param.LikeLogParam; +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-09-01 15:20:21 + */ +@Api(tags = "会员套餐权益表管理") +@RestController +@RequestMapping("/api/house/like-log") +public class LikeLogController extends BaseController { + @Resource + private LikeLogService likeLogService; + + @OperationLog + @ApiOperation("分页查询会员套餐权益表") + @GetMapping("/page") + public ApiResult> page(LikeLogParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(likeLogService.page(page, page.getWrapper())); + // 使用关联查询 + //return success(likeLogService.pageRel(param)); + } + + @OperationLog + @ApiOperation("查询全部会员套餐权益表") + @GetMapping() + public ApiResult> list(LikeLogParam param) { +// PageParam page = new PageParam<>(param); +// page.setDefaultOrder("create_time desc"); +// return success(likeLogService.list(page.getOrderWrapper())); +// 使用关联查询 + param.setUserId(getLoginUserId()); + return success(likeLogService.listRel(param)); + } + + @PreAuthorize("hasAuthority('house:likeLog:list')") + @OperationLog + @ApiOperation("根据id查询会员套餐权益表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + return success(likeLogService.getById(id)); + // 使用关联查询 + //return success(likeLogService.getByIdRel(id)); + } + + @OperationLog + @ApiOperation("添加会员套餐权益表") + @PostMapping() + public ApiResult save(@RequestBody LikeLog likeLog) { + // 记录当前登录用户id + User loginUser = getLoginUser(); + if (loginUser != null) { + likeLog.setUserId(loginUser.getUserId()); + } + + return success(likeLogService.add(likeLog)); + } + + @PreAuthorize("hasAuthority('house:likeLog:update')") + @OperationLog + @ApiOperation("修改会员套餐权益表") + @PutMapping() + public ApiResult update(@RequestBody LikeLog likeLog) { + if (likeLogService.updateById(likeLog)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('house:likeLog:remove')") + @OperationLog + @ApiOperation("删除会员套餐权益表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (likeLogService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('house:likeLog:save')") + @OperationLog + @ApiOperation("批量添加会员套餐权益表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (likeLogService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('house:likeLog:update')") + @OperationLog + @ApiOperation("批量修改会员套餐权益表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(likeLogService, "id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('house:likeLog:remove')") + @OperationLog + @ApiOperation("批量删除会员套餐权益表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (likeLogService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/house/controller/ReservationController.java b/src/main/java/com/gxwebsoft/house/controller/ReservationController.java new file mode 100644 index 0000000..f6f1add --- /dev/null +++ b/src/main/java/com/gxwebsoft/house/controller/ReservationController.java @@ -0,0 +1,136 @@ +package com.gxwebsoft.house.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.house.service.ReservationService; +import com.gxwebsoft.house.entity.Reservation; +import com.gxwebsoft.house.param.ReservationParam; +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-08-03 18:23:43 + */ +@Api(tags = "预约记录表管理") +@RestController +@RequestMapping("/api/house/reservation") +public class ReservationController extends BaseController { + @Resource + private ReservationService reservationService; + + @PreAuthorize("hasAuthority('house:reservation:list')") + @OperationLog + @ApiOperation("分页查询预约记录表") + @GetMapping("/page") + public ApiResult> page(ReservationParam param) { + // 使用关联查询 + return success(reservationService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('house:reservation:list')") + @OperationLog + @ApiOperation("查询全部预约记录表") + @GetMapping() + public ApiResult> list(ReservationParam param) { + // 使用关联查询 + return success(reservationService.listRel(param)); + } + + @PreAuthorize("hasAuthority('house:reservation:list')") + @OperationLog + @ApiOperation("根据id查询预约记录表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + // 使用关联查询 + return success(reservationService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('house:reservation:save')") + @OperationLog + @ApiOperation("添加预约记录表") + @PostMapping() + public ApiResult save(@RequestBody Reservation reservation) { + // 记录当前登录用户id + User loginUser = getLoginUser(); + if (loginUser != null) { + reservation.setUserId(loginUser.getUserId()); + } + if (reservationService.count(new LambdaQueryWrapper().eq(Reservation::getHouseId,reservation.getHouseId()).eq(Reservation::getUserId,loginUser.getUserId()).eq(Reservation::getStatus,0)) > 0){ + return fail("请勿重复提交"); + } + if (reservationService.save(reservation)) { + return success("提交成功"); + } + return fail("提交失败"); + } + + @PreAuthorize("hasAuthority('house:reservation:update')") + @OperationLog + @ApiOperation("修改预约记录表") + @PutMapping() + public ApiResult update(@RequestBody Reservation reservation) { + if (reservationService.updateById(reservation)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('house:reservation:remove')") + @OperationLog + @ApiOperation("删除预约记录表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (reservationService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('house:reservation:save')") + @OperationLog + @ApiOperation("批量添加预约记录表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (reservationService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('house:reservation:update')") + @OperationLog + @ApiOperation("批量修改预约记录表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(reservationService, "log_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('house:reservation:remove')") + @OperationLog + @ApiOperation("批量删除预约记录表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (reservationService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/house/controller/ViewsLogController.java b/src/main/java/com/gxwebsoft/house/controller/ViewsLogController.java new file mode 100644 index 0000000..8dcf7d1 --- /dev/null +++ b/src/main/java/com/gxwebsoft/house/controller/ViewsLogController.java @@ -0,0 +1,139 @@ +package com.gxwebsoft.house.controller; + +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.house.service.ViewsLogService; +import com.gxwebsoft.house.entity.ViewsLog; +import com.gxwebsoft.house.param.ViewsLogParam; +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-09-01 15:20:21 + */ +@Api(tags = "会员套餐权益表管理") +@RestController +@RequestMapping("/api/house/views-log") +public class ViewsLogController extends BaseController { + @Resource + private ViewsLogService viewsLogService; + + @PreAuthorize("hasAuthority('house:viewsLog:list')") + @OperationLog + @ApiOperation("分页查询会员套餐权益表") + @GetMapping("/page") + public ApiResult> page(ViewsLogParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(viewsLogService.page(page, page.getWrapper())); + // 使用关联查询 + //return success(viewsLogService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('house:viewsLog:list')") + @OperationLog + @ApiOperation("查询全部会员套餐权益表") + @GetMapping() + public ApiResult> list(ViewsLogParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(viewsLogService.list(page.getOrderWrapper())); + // 使用关联查询 + //return success(viewsLogService.listRel(param)); + } + + @PreAuthorize("hasAuthority('house:viewsLog:list')") + @OperationLog + @ApiOperation("根据id查询会员套餐权益表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + return success(viewsLogService.getById(id)); + // 使用关联查询 + //return success(viewsLogService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('house:viewsLog:save')") + @OperationLog + @ApiOperation("添加会员套餐权益表") + @PostMapping() + public ApiResult save(@RequestBody ViewsLog viewsLog) { + // 记录当前登录用户id + User loginUser = getLoginUser(); + if (loginUser != null) { + viewsLog.setUserId(loginUser.getUserId()); + } + if (viewsLogService.save(viewsLog)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('house:viewsLog:update')") + @OperationLog + @ApiOperation("修改会员套餐权益表") + @PutMapping() + public ApiResult update(@RequestBody ViewsLog viewsLog) { + if (viewsLogService.updateById(viewsLog)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('house:viewsLog:remove')") + @OperationLog + @ApiOperation("删除会员套餐权益表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (viewsLogService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('house:viewsLog:save')") + @OperationLog + @ApiOperation("批量添加会员套餐权益表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (viewsLogService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('house:viewsLog:update')") + @OperationLog + @ApiOperation("批量修改会员套餐权益表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(viewsLogService, "id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('house:viewsLog:remove')") + @OperationLog + @ApiOperation("批量删除会员套餐权益表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (viewsLogService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/house/entity/Info.java b/src/main/java/com/gxwebsoft/house/entity/Info.java new file mode 100644 index 0000000..ec517c4 --- /dev/null +++ b/src/main/java/com/gxwebsoft/house/entity/Info.java @@ -0,0 +1,176 @@ +package com.gxwebsoft.house.entity; + +import com.baomidou.mybatisplus.annotation.*; +import com.gxwebsoft.common.core.annotation.QueryField; +import com.gxwebsoft.common.core.annotation.QueryType; +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-08-03 18:23:43 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "Info对象", description = "房源信息表") +@TableName("house_info") +public class Info implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "自增ID") + @TableId(value = "house_id", type = IdType.AUTO) + private Integer houseId; + + @ApiModelProperty(value = "房源标题") + private String houseTitle; + + @ApiModelProperty(value = "房产所在的城市") + private String cityByHouse; + + @ApiModelProperty(value = "户型") + private String houseType; + + @ApiModelProperty(value = "租赁方式") + private String leaseMethod; + + @ApiModelProperty(value = "租金") + private BigDecimal rent; + + @ApiModelProperty(value = "月租金") + private BigDecimal monthlyRent; + + @ApiModelProperty(value = "佣金") + private BigDecimal commission; + + @ApiModelProperty(value = "物业费") + private BigDecimal propertyFees; + + @ApiModelProperty(value = "租期") + private String tenancy; + + @ApiModelProperty(value = "面积") + private String extent; + + @ApiModelProperty(value = "楼层") + private String floor; + + @ApiModelProperty(value = "房号") + private String roomNumber; + + @ApiModelProperty(value = "真实姓名") + private String realName; + + @ApiModelProperty(value = "联系电话") + private String phone; + + @ApiModelProperty(value = "进入房屋的密码") + private String password; + + @ApiModelProperty(value = "房屋朝向") + private String toward; + + @ApiModelProperty(value = "房屋标签") + private String houseLabel; + + @ApiModelProperty(value = "办公室配套") + private String supporting; + + @ApiModelProperty(value = "图片附件") + private String files; + + @ApiModelProperty(value = "视频附件") + private String videoUrl; + + @ApiModelProperty(value = "房源介绍") + private String content; + + @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 longitude; + + @ApiModelProperty(value = "纬度") + private String latitude; + + @ApiModelProperty(value = "备注") + private String comments; + + @ApiModelProperty(value = "是否实名认证") + private Integer authentication; + + @ApiModelProperty(value = "是否推荐") + private Integer recommend; + + @ApiModelProperty(value = "是否必看") + private Integer mustSee; + + @ApiModelProperty(value = "是否可溢价") + private String premium; + + @ApiModelProperty(value = "状态 10待审核 20驳回 30通过") + 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; + + @ApiModelProperty(value = "昵称") + @TableField(exist = false) + private String nickname; + + @ApiModelProperty(value = "用户头像") + @TableField(exist = false) + private String avatar; + + @ApiModelProperty(value = "用户等级") + @TableField(exist = false) + private String gradeName; + + @ApiModelProperty(value = "是否选中") + @TableField(exist = false) + private Boolean selected; + + @ApiModelProperty(value = "是否喜欢") + @TableField(exist = false) + private Boolean liked; + +} diff --git a/src/main/java/com/gxwebsoft/house/entity/LikeLog.java b/src/main/java/com/gxwebsoft/house/entity/LikeLog.java new file mode 100644 index 0000000..a1f9bd1 --- /dev/null +++ b/src/main/java/com/gxwebsoft/house/entity/LikeLog.java @@ -0,0 +1,56 @@ +package com.gxwebsoft.house.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-09-01 15:20:21 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "LikeLog对象", description = "会员套餐权益表") +@TableName("house_like_log") +public class LikeLog 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 houseId; + + @ApiModelProperty(value = "房主ID") + private Integer houseUserId; + + @TableField(exist = false) + private Info houseInfo; + + @ApiModelProperty(value = "用户ID") + private Integer userId; + + @ApiModelProperty(value = "租户id") + private Integer tenantId; + + @ApiModelProperty(value = "注册时间") + private Date createTime; + + @ApiModelProperty(value = "更新时间") + private Date updateTime; + + @ApiModelProperty(value = "删除") + @TableLogic + private Integer deleted; + +} diff --git a/src/main/java/com/gxwebsoft/house/entity/Reservation.java b/src/main/java/com/gxwebsoft/house/entity/Reservation.java new file mode 100644 index 0000000..4f61669 --- /dev/null +++ b/src/main/java/com/gxwebsoft/house/entity/Reservation.java @@ -0,0 +1,129 @@ +package com.gxwebsoft.house.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-08-03 18:23:43 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "Reservation对象", description = "预约记录表") +@TableName("house_reservation") +public class Reservation implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "ID") + @TableId(value = "log_id", type = IdType.AUTO) + private Integer logId; + + @ApiModelProperty(value = "订单号") + private String logNo; + + @ApiModelProperty(value = "类型") + private Integer type; + + @ApiModelProperty(value = "付款金额") + private BigDecimal money; + + @ApiModelProperty(value = "实际付款金额(包含运费)") + private BigDecimal payPrice; + + @ApiModelProperty(value = "房源ID") + private Integer houseId; + + @ApiModelProperty(value = "卡ID") + private Integer priceId; + + @ApiModelProperty(value = "获得的会员等级") + private Integer gradeId; + + @ApiModelProperty(value = "卡名称") + private String priceName; + + @ApiModelProperty(value = "用户ID") + private Integer userId; + + @ApiModelProperty(value = "真实姓名") + private String realName; + + @ApiModelProperty(value = "联系电话") + private String phone; + + @ApiModelProperty(value = "付款时间") + private Date payTime; + + @ApiModelProperty(value = "付款状态(10未付款 20已付款)") + private Integer payStatus; + + @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 = "门店ID") + private Integer merchantId; + + @ApiModelProperty(value = "所属门店") + private String merchantName; + + @ApiModelProperty(value = "门店编号") + private String merchantCode; + + @ApiModelProperty(value = "订单是否已结算(0未结算 1已结算)") + private Integer isSettled; + + @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; + +} diff --git a/src/main/java/com/gxwebsoft/house/entity/ViewsLog.java b/src/main/java/com/gxwebsoft/house/entity/ViewsLog.java new file mode 100644 index 0000000..bc4fd0b --- /dev/null +++ b/src/main/java/com/gxwebsoft/house/entity/ViewsLog.java @@ -0,0 +1,56 @@ +package com.gxwebsoft.house.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-09-01 15:20:21 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "ViewsLog对象", description = "会员套餐权益表") +@TableName("house_views_log") +public class ViewsLog 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 houseId; + + @TableField(exist = false) + private Info houseInfo; + + @ApiModelProperty(value = "房主ID") + private Integer houseUserId; + + @ApiModelProperty(value = "用户ID") + private Integer userId; + + @ApiModelProperty(value = "租户id") + private Integer tenantId; + + @ApiModelProperty(value = "注册时间") + private Date createTime; + + @ApiModelProperty(value = "更新时间") + private Date updateTime; + + @ApiModelProperty(value = "删除") + @TableLogic + private Integer deleted; + +} diff --git a/src/main/java/com/gxwebsoft/house/mapper/InfoMapper.java b/src/main/java/com/gxwebsoft/house/mapper/InfoMapper.java new file mode 100644 index 0000000..71f0f8f --- /dev/null +++ b/src/main/java/com/gxwebsoft/house/mapper/InfoMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.house.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.house.entity.Info; +import com.gxwebsoft.house.param.InfoParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 房源信息表Mapper + * + * @author 科技小王子 + * @since 2023-08-03 18:23:43 + */ +public interface InfoMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") InfoParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") InfoParam param); + +} diff --git a/src/main/java/com/gxwebsoft/house/mapper/LikeLogMapper.java b/src/main/java/com/gxwebsoft/house/mapper/LikeLogMapper.java new file mode 100644 index 0000000..8cd736a --- /dev/null +++ b/src/main/java/com/gxwebsoft/house/mapper/LikeLogMapper.java @@ -0,0 +1,38 @@ +package com.gxwebsoft.house.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.yulichang.base.MPJBaseMapper; +import com.gxwebsoft.house.entity.LikeLog; +import com.gxwebsoft.house.param.LikeLogParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 会员套餐权益表Mapper + * + * @author 科技小王子 + * @since 2023-09-01 15:20:21 + */ +public interface LikeLogMapper extends MPJBaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") LikeLogParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") LikeLogParam param); + +} diff --git a/src/main/java/com/gxwebsoft/house/mapper/ReservationMapper.java b/src/main/java/com/gxwebsoft/house/mapper/ReservationMapper.java new file mode 100644 index 0000000..16cbdb4 --- /dev/null +++ b/src/main/java/com/gxwebsoft/house/mapper/ReservationMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.house.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.house.entity.Reservation; +import com.gxwebsoft.house.param.ReservationParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 预约记录表Mapper + * + * @author 科技小王子 + * @since 2023-08-03 18:23:43 + */ +public interface ReservationMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") ReservationParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") ReservationParam param); + +} diff --git a/src/main/java/com/gxwebsoft/house/mapper/ViewsLogMapper.java b/src/main/java/com/gxwebsoft/house/mapper/ViewsLogMapper.java new file mode 100644 index 0000000..d8b7e0e --- /dev/null +++ b/src/main/java/com/gxwebsoft/house/mapper/ViewsLogMapper.java @@ -0,0 +1,38 @@ +package com.gxwebsoft.house.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.yulichang.base.MPJBaseMapper; +import com.gxwebsoft.house.entity.ViewsLog; +import com.gxwebsoft.house.param.ViewsLogParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 会员套餐权益表Mapper + * + * @author 科技小王子 + * @since 2023-09-01 15:20:21 + */ +public interface ViewsLogMapper extends MPJBaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") ViewsLogParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") ViewsLogParam param); + +} diff --git a/src/main/java/com/gxwebsoft/house/mapper/xml/InfoMapper.xml b/src/main/java/com/gxwebsoft/house/mapper/xml/InfoMapper.xml new file mode 100644 index 0000000..45c6db7 --- /dev/null +++ b/src/main/java/com/gxwebsoft/house/mapper/xml/InfoMapper.xml @@ -0,0 +1,170 @@ + + + + + + + SELECT a.*, + b.nickname,b.avatar,b.grade_id, + c.name as gradeName + FROM house_info a + LEFT JOIN sys_user b ON a.user_id = b.user_id + LEFT JOIN shop_user_grade c ON b.grade_id = c.grade_id + + + AND a.house_id = #{param.houseId} + + + AND a.house_title LIKE CONCAT('%', #{param.houseTitle}, '%') + + + AND a.city_by_house LIKE CONCAT('%', #{param.cityByHouse}, '%') + + + AND a.house_type LIKE CONCAT('%', #{param.houseType}, '%') + + + AND a.lease_method LIKE CONCAT('%', #{param.leaseMethod}, '%') + + + AND a.rent = #{param.rent} + + + AND a.monthly_rent = #{param.monthlyRent} + + + AND a.extent LIKE CONCAT('%', #{param.extent}, '%') + + + AND a.floor LIKE CONCAT('%', #{param.floor}, '%') + + + AND a.room_number LIKE CONCAT('%', #{param.roomNumber}, '%') + + + AND a.real_name LIKE CONCAT('%', #{param.realName}, '%') + + + AND a.phone LIKE CONCAT('%', #{param.phone}, '%') + + + AND a.password LIKE CONCAT('%', #{param.password}, '%') + + + AND a.toward LIKE CONCAT('%', #{param.toward}, '%') + + + AND a.house_label LIKE CONCAT('%', #{param.houseLabel}, '%') + + + AND a.files LIKE CONCAT('%', #{param.files}, '%') + + + AND a.content LIKE CONCAT('%', #{param.content}, '%') + + + 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.comments LIKE CONCAT('%', #{param.comments}, '%') + + + AND a.authentication = #{param.authentication} + + + AND a.status = #{param.status} + + + AND a.sort_number = #{param.sortNumber} + + + AND a.recommend = #{param.recommend} + + + AND a.must_see = #{param.mustSee} + + + AND a.user_id = #{param.userId} + + + AND a.deleted = #{param.deleted} + + + AND a.deleted = 0 + + + + AND a.extent >= 100 AND a.extent <= 150 + + + + AND a.create_time >= #{param.createTimeStart} + + + AND a.create_time <= #{param.createTimeEnd} + + + AND ( + a.house_title LIKE CONCAT('%', #{param.keywords}, '%') + OR a.house_id = #{param.keywords} + OR b.nickname = #{param.keywords} + OR a.room_number LIKE CONCAT('%', #{param.keywords}, '%') + ) + + + + + a.sort_number asc, + + + a.create_time desc, + + + a.monthly_rent asc, + + + a.monthly_rent desc, + + + a.extent asc, + + + a.extent desc, + + + ABS(a.monthly_rent - #{param.priceScene}), + + + + ABS(a.extent - #{param.extentScene}), + + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/house/mapper/xml/LikeLogMapper.xml b/src/main/java/com/gxwebsoft/house/mapper/xml/LikeLogMapper.xml new file mode 100644 index 0000000..fdedf8f --- /dev/null +++ b/src/main/java/com/gxwebsoft/house/mapper/xml/LikeLogMapper.xml @@ -0,0 +1,47 @@ + + + + + + + SELECT a.* + FROM house_like_log a + + + AND a.id = #{param.id} + + + AND a.house_id = #{param.houseId} + + + AND a.house_user_id = #{param.houseUserId} + + + AND a.user_id = #{param.userId} + + + AND a.create_time >= #{param.createTimeStart} + + + AND a.create_time <= #{param.createTimeEnd} + + + AND a.deleted = #{param.deleted} + + + AND a.deleted = 0 + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/house/mapper/xml/ReservationMapper.xml b/src/main/java/com/gxwebsoft/house/mapper/xml/ReservationMapper.xml new file mode 100644 index 0000000..b62e5a2 --- /dev/null +++ b/src/main/java/com/gxwebsoft/house/mapper/xml/ReservationMapper.xml @@ -0,0 +1,116 @@ + + + + + + + SELECT a.* + FROM house_reservation a + + + AND a.log_id = #{param.logId} + + + AND a.log_no LIKE CONCAT('%', #{param.logNo}, '%') + + + AND a.type = #{param.type} + + + AND a.money = #{param.money} + + + AND a.pay_price = #{param.payPrice} + + + AND a.house_id = #{param.houseId} + + + 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.real_name LIKE CONCAT('%', #{param.realName}, '%') + + + AND a.phone LIKE CONCAT('%', #{param.phone}, '%') + + + AND a.pay_time LIKE CONCAT('%', #{param.payTime}, '%') + + + AND a.pay_status = #{param.payStatus} + + + 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.merchant_id = #{param.merchantId} + + + AND a.merchant_name LIKE CONCAT('%', #{param.merchantName}, '%') + + + AND a.merchant_code LIKE CONCAT('%', #{param.merchantCode}, '%') + + + AND a.is_settled = #{param.isSettled} + + + 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/src/main/java/com/gxwebsoft/house/mapper/xml/ViewsLogMapper.xml b/src/main/java/com/gxwebsoft/house/mapper/xml/ViewsLogMapper.xml new file mode 100644 index 0000000..07df9d0 --- /dev/null +++ b/src/main/java/com/gxwebsoft/house/mapper/xml/ViewsLogMapper.xml @@ -0,0 +1,47 @@ + + + + + + + SELECT a.* + FROM house_views_log a + + + AND a.id = #{param.id} + + + AND a.house_id = #{param.houseId} + + + AND a.house_user_id = #{param.houseUserId} + + + AND a.user_id = #{param.userId} + + + AND a.create_time >= #{param.createTimeStart} + + + AND a.create_time <= #{param.createTimeEnd} + + + AND a.deleted = #{param.deleted} + + + AND a.deleted = 0 + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/house/param/InfoParam.java b/src/main/java/com/gxwebsoft/house/param/InfoParam.java new file mode 100644 index 0000000..ccb697f --- /dev/null +++ b/src/main/java/com/gxwebsoft/house/param/InfoParam.java @@ -0,0 +1,165 @@ +package com.gxwebsoft.house.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; + +/** + * 房源信息表查询参数 + * + * @author 科技小王子 + * @since 2023-08-03 18:23:43 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "InfoParam对象", description = "房源信息表查询参数") +public class InfoParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "自增ID") + @QueryField(type = QueryType.EQ) + private Integer houseId; + + @ApiModelProperty(value = "房源标题") + private String houseTitle; + + @ApiModelProperty(value = "房产所在的城市") + private String cityByHouse; + + @ApiModelProperty(value = "户型") + private String houseType; + + @ApiModelProperty(value = "租赁方式") + private String leaseMethod; + + @ApiModelProperty(value = "租金") + @QueryField(type = QueryType.EQ) + private BigDecimal rent; + + @ApiModelProperty(value = "月租金") + @QueryField(type = QueryType.EQ) + private BigDecimal monthlyRent; + + @ApiModelProperty(value = "物业费") + @QueryField(type = QueryType.EQ) + private BigDecimal propertyFees; + + @ApiModelProperty(value = "面积") + private String extent; + + @ApiModelProperty(value = "楼层") + private String floor; + + @ApiModelProperty(value = "房号") + private String roomNumber; + + @ApiModelProperty(value = "真实姓名") + private String realName; + + @ApiModelProperty(value = "联系电话") + private String phone; + + @ApiModelProperty(value = "进入房屋的密码") + private String password; + + @ApiModelProperty(value = "房屋朝向") + private String toward; + + @ApiModelProperty(value = "房屋标签") + private String houseLabel; + + @ApiModelProperty(value = "图片附件") + private String files; + + @ApiModelProperty(value = "房源介绍") + private String content; + + @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 longitude; + + @ApiModelProperty(value = "纬度") + private String latitude; + + @ApiModelProperty(value = "备注") + private String comments; + + @ApiModelProperty(value = "是否实名认证") + @QueryField(type = QueryType.EQ) + private Integer authentication; + + @ApiModelProperty(value = "状态 10待审核 20驳回 30通过") + @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 = "昵称") + @TableField(exist = false) + private String nickname; + + @ApiModelProperty(value = "用户头像") + @TableField(exist = false) + private String avatar; + + @ApiModelProperty(value = "价格起始值") + @TableField(exist = false) + private String priceScene; + + @ApiModelProperty(value = "面积筛选") + @TableField(exist = false) + private String extentScene; + + @ApiModelProperty(value = "排序") + @TableField(exist = false) + private String sortScene; + + @ApiModelProperty(value = "是否推荐") + @TableField(exist = false) + private Integer recommend; + + @ApiModelProperty(value = "是否必看") + @TableField(exist = false) + private Integer mustSee; + + @ApiModelProperty(value = "是否可溢价") + @TableField(exist = false) + private String premium; + +} diff --git a/src/main/java/com/gxwebsoft/house/param/LikeLogParam.java b/src/main/java/com/gxwebsoft/house/param/LikeLogParam.java new file mode 100644 index 0000000..544f0e3 --- /dev/null +++ b/src/main/java/com/gxwebsoft/house/param/LikeLogParam.java @@ -0,0 +1,45 @@ +package com.gxwebsoft.house.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-09-01 15:20:21 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "LikeLogParam对象", description = "会员套餐权益表查询参数") +public class LikeLogParam 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 houseId; + + @ApiModelProperty(value = "房主ID") + @QueryField(type = QueryType.EQ) + private Integer houseUserId; + + @ApiModelProperty(value = "用户ID") + @QueryField(type = QueryType.EQ) + private Integer userId; + + @ApiModelProperty(value = "删除") + @QueryField(type = QueryType.EQ) + private Integer deleted; + +} diff --git a/src/main/java/com/gxwebsoft/house/param/ReservationParam.java b/src/main/java/com/gxwebsoft/house/param/ReservationParam.java new file mode 100644 index 0000000..e289ae1 --- /dev/null +++ b/src/main/java/com/gxwebsoft/house/param/ReservationParam.java @@ -0,0 +1,134 @@ +package com.gxwebsoft.house.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; + +/** + * 预约记录表查询参数 + * + * @author 科技小王子 + * @since 2023-08-03 18:23:43 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "ReservationParam对象", description = "预约记录表查询参数") +public class ReservationParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "ID") + @QueryField(type = QueryType.EQ) + private Integer logId; + + @ApiModelProperty(value = "订单号") + private String logNo; + + @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 houseId; + + @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 = "真实姓名") + private String realName; + + @ApiModelProperty(value = "联系电话") + private String phone; + + @ApiModelProperty(value = "付款时间") + private String payTime; + + @ApiModelProperty(value = "付款状态(10未付款 20已付款)") + @QueryField(type = QueryType.EQ) + private Integer payStatus; + + @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 = "门店ID") + @QueryField(type = QueryType.EQ) + private Integer merchantId; + + @ApiModelProperty(value = "所属门店") + private String merchantName; + + @ApiModelProperty(value = "门店编号") + private String merchantCode; + + @ApiModelProperty(value = "订单是否已结算(0未结算 1已结算)") + @QueryField(type = QueryType.EQ) + private Integer isSettled; + + @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 = "昵称") + @TableField(exist = false) + private String nickname; + + @ApiModelProperty(value = "用户头像") + @TableField(exist = false) + private String avatar; + +} diff --git a/src/main/java/com/gxwebsoft/house/param/ViewsLogParam.java b/src/main/java/com/gxwebsoft/house/param/ViewsLogParam.java new file mode 100644 index 0000000..149e4f0 --- /dev/null +++ b/src/main/java/com/gxwebsoft/house/param/ViewsLogParam.java @@ -0,0 +1,45 @@ +package com.gxwebsoft.house.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-09-01 15:20:21 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "ViewsLogParam对象", description = "会员套餐权益表查询参数") +public class ViewsLogParam 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 houseId; + + @ApiModelProperty(value = "房主ID") + @QueryField(type = QueryType.EQ) + private Integer houseUserId; + + @ApiModelProperty(value = "用户ID") + @QueryField(type = QueryType.EQ) + private Integer userId; + + @ApiModelProperty(value = "删除") + @QueryField(type = QueryType.EQ) + private Integer deleted; + +} diff --git a/src/main/java/com/gxwebsoft/house/service/InfoService.java b/src/main/java/com/gxwebsoft/house/service/InfoService.java new file mode 100644 index 0000000..fc9e44c --- /dev/null +++ b/src/main/java/com/gxwebsoft/house/service/InfoService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.house.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.house.entity.Info; +import com.gxwebsoft.house.param.InfoParam; + +import java.util.List; + +/** + * 房源信息表Service + * + * @author 科技小王子 + * @since 2023-08-03 18:23:43 + */ +public interface InfoService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(InfoParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(InfoParam param); + + /** + * 根据id查询 + * + * @param houseId 自增ID + * @return Info + */ + Info getByIdRel(Integer houseId); + +} diff --git a/src/main/java/com/gxwebsoft/house/service/LikeLogService.java b/src/main/java/com/gxwebsoft/house/service/LikeLogService.java new file mode 100644 index 0000000..186ef3c --- /dev/null +++ b/src/main/java/com/gxwebsoft/house/service/LikeLogService.java @@ -0,0 +1,45 @@ +package com.gxwebsoft.house.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.github.yulichang.base.MPJBaseService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.house.entity.LikeLog; +import com.gxwebsoft.house.param.LikeLogParam; + +import java.util.List; + +/** + * 会员套餐权益表Service + * + * @author 科技小王子 + * @since 2023-09-01 15:20:21 + */ +public interface LikeLogService extends MPJBaseService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(LikeLogParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(LikeLogParam param); + + /** + * 根据id查询 + * + * @param houseId ID + * @return LikeLog + */ + LikeLog getByIdRel(Integer houseId, Integer userId); + + boolean add( LikeLog likeLog); + +} diff --git a/src/main/java/com/gxwebsoft/house/service/ReservationService.java b/src/main/java/com/gxwebsoft/house/service/ReservationService.java new file mode 100644 index 0000000..ff0ea66 --- /dev/null +++ b/src/main/java/com/gxwebsoft/house/service/ReservationService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.house.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.house.entity.Reservation; +import com.gxwebsoft.house.param.ReservationParam; + +import java.util.List; + +/** + * 预约记录表Service + * + * @author 科技小王子 + * @since 2023-08-03 18:23:43 + */ +public interface ReservationService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(ReservationParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(ReservationParam param); + + /** + * 根据id查询 + * + * @param logId ID + * @return Reservation + */ + Reservation getByIdRel(Integer logId); + +} diff --git a/src/main/java/com/gxwebsoft/house/service/ViewsLogService.java b/src/main/java/com/gxwebsoft/house/service/ViewsLogService.java new file mode 100644 index 0000000..5b42957 --- /dev/null +++ b/src/main/java/com/gxwebsoft/house/service/ViewsLogService.java @@ -0,0 +1,45 @@ +package com.gxwebsoft.house.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.github.yulichang.base.MPJBaseService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.house.entity.Info; +import com.gxwebsoft.house.entity.ViewsLog; +import com.gxwebsoft.house.param.ViewsLogParam; + +import java.util.List; + +/** + * 会员套餐权益表Service + * + * @author 科技小王子 + * @since 2023-09-01 15:20:21 + */ +public interface ViewsLogService extends MPJBaseService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(ViewsLogParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(ViewsLogParam param); + + /** + * 根据id查询 + * + * @param id ID + * @return ViewsLog + */ + ViewsLog getByIdRel(Integer id); + + void add(Info houseInfo, Integer loginUserId); +} diff --git a/src/main/java/com/gxwebsoft/house/service/impl/InfoServiceImpl.java b/src/main/java/com/gxwebsoft/house/service/impl/InfoServiceImpl.java new file mode 100644 index 0000000..20c8f84 --- /dev/null +++ b/src/main/java/com/gxwebsoft/house/service/impl/InfoServiceImpl.java @@ -0,0 +1,46 @@ +package com.gxwebsoft.house.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.house.mapper.InfoMapper; +import com.gxwebsoft.house.service.InfoService; +import com.gxwebsoft.house.entity.Info; +import com.gxwebsoft.house.param.InfoParam; +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-08-03 18:23:43 + */ +@Service +public class InfoServiceImpl extends ServiceImpl implements InfoService { + + @Override + public PageResult pageRel(InfoParam param) { + PageParam page = new PageParam<>(param); + List list = baseMapper.selectPageRel(page, param); + return new PageResult<>(list, page.getTotal()); + } + + @Override + public List listRel(InfoParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public Info getByIdRel(Integer houseId) { + InfoParam param = new InfoParam(); + param.setHouseId(houseId); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/house/service/impl/LikeLogServiceImpl.java b/src/main/java/com/gxwebsoft/house/service/impl/LikeLogServiceImpl.java new file mode 100644 index 0000000..2b6e9da --- /dev/null +++ b/src/main/java/com/gxwebsoft/house/service/impl/LikeLogServiceImpl.java @@ -0,0 +1,84 @@ +package com.gxwebsoft.house.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.yulichang.base.MPJBaseServiceImpl; +import com.github.yulichang.query.MPJLambdaQueryWrapper; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import com.gxwebsoft.house.entity.Info; +import com.gxwebsoft.house.mapper.LikeLogMapper; +import com.gxwebsoft.house.service.InfoService; +import com.gxwebsoft.house.service.LikeLogService; +import com.gxwebsoft.house.entity.LikeLog; +import com.gxwebsoft.house.param.LikeLogParam; +import com.gxwebsoft.common.core.web.PageParam; +import com.gxwebsoft.common.core.web.PageResult; +import io.swagger.models.auth.In; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 会员套餐权益表Service实现 + * + * @author 科技小王子 + * @since 2023-09-01 15:20:21 + */ +@Service +public class LikeLogServiceImpl extends MPJBaseServiceImpl implements LikeLogService { + + @Resource + private InfoService infoService; + + @Override + public PageResult pageRel(LikeLogParam 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(LikeLogParam param) { + + MPJLambdaWrapper wrapper = new MPJLambdaWrapper() + .eq(LikeLog::getUserId, param.getUserId()) + .selectAll(LikeLog.class) + .selectAssociation(Info.class, LikeLog::getHouseInfo) + .leftJoin(Info.class, Info::getHouseId, LikeLog::getHouseId) + .orderByDesc(LikeLog::getCreateTime); + + List list = baseMapper.selectJoinList(LikeLog.class, wrapper); + + return list; + } + + @Override + public LikeLog getByIdRel(Integer houseId, Integer userId) { + + LambdaQueryWrapper wr = Wrappers.lambdaQuery(LikeLog.class).eq(LikeLog::getHouseId, houseId).eq(LikeLog::getUserId, userId); + + LikeLog likeLogs = getBaseMapper().selectOne(wr); + + return likeLogs; + + } + + @Override + public boolean add( LikeLog likeLog) { + LambdaQueryWrapper wr = Wrappers.lambdaQuery(LikeLog.class).eq(LikeLog::getHouseId, likeLog.getHouseId()).eq(LikeLog::getUserId, likeLog.getUserId()); + + List likeLogs = getBaseMapper().selectList(wr); + if(CollectionUtils.isNotEmpty(likeLogs)) { + baseMapper.delete(wr); + return false; + }else { + int insert = baseMapper.insert(likeLog); + return true; + } + } + +} diff --git a/src/main/java/com/gxwebsoft/house/service/impl/ReservationServiceImpl.java b/src/main/java/com/gxwebsoft/house/service/impl/ReservationServiceImpl.java new file mode 100644 index 0000000..a18e2a0 --- /dev/null +++ b/src/main/java/com/gxwebsoft/house/service/impl/ReservationServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.house.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.house.mapper.ReservationMapper; +import com.gxwebsoft.house.service.ReservationService; +import com.gxwebsoft.house.entity.Reservation; +import com.gxwebsoft.house.param.ReservationParam; +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-08-03 18:23:43 + */ +@Service +public class ReservationServiceImpl extends ServiceImpl implements ReservationService { + + @Override + public PageResult pageRel(ReservationParam 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(ReservationParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public Reservation getByIdRel(Integer logId) { + ReservationParam param = new ReservationParam(); + param.setLogId(logId); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/house/service/impl/ViewsLogServiceImpl.java b/src/main/java/com/gxwebsoft/house/service/impl/ViewsLogServiceImpl.java new file mode 100644 index 0000000..5268c85 --- /dev/null +++ b/src/main/java/com/gxwebsoft/house/service/impl/ViewsLogServiceImpl.java @@ -0,0 +1,74 @@ +package com.gxwebsoft.house.service.impl; + +import cn.hutool.core.date.DateUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.yulichang.base.MPJBaseServiceImpl; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import com.gxwebsoft.house.entity.Info; +import com.gxwebsoft.house.entity.LikeLog; +import com.gxwebsoft.house.mapper.ViewsLogMapper; +import com.gxwebsoft.house.service.ViewsLogService; +import com.gxwebsoft.house.entity.ViewsLog; +import com.gxwebsoft.house.param.ViewsLogParam; +import com.gxwebsoft.common.core.web.PageParam; +import com.gxwebsoft.common.core.web.PageResult; +import org.springframework.stereotype.Service; + +import java.util.Date; +import java.util.List; + +/** + * 会员套餐权益表Service实现 + * + * @author 科技小王子 + * @since 2023-09-01 15:20:21 + */ +@Service +public class ViewsLogServiceImpl extends MPJBaseServiceImpl implements ViewsLogService { + + @Override + public PageResult pageRel(ViewsLogParam 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(ViewsLogParam param) { + MPJLambdaWrapper wrapper = new MPJLambdaWrapper() + .eq(ViewsLog::getUserId, param.getUserId()) + .selectAll(ViewsLog.class) + .selectAssociation(Info.class, ViewsLog::getHouseInfo) + .leftJoin(Info.class, Info::getHouseId, ViewsLog::getHouseId) + .orderByDesc(LikeLog::getCreateTime); + + List list = baseMapper.selectJoinList(ViewsLog.class, wrapper); + + return list; + } + + @Override + public ViewsLog getByIdRel(Integer id) { + ViewsLogParam param = new ViewsLogParam(); + param.setId(id); + return param.getOne(baseMapper.selectListRel(param)); + } + + @Override + public void add(Info houseInfo, Integer loginUserId) { + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(ViewsLog.class).eq(ViewsLog::getUserId, loginUserId).eq(ViewsLog::getHouseId, houseInfo.getHouseId()); + ViewsLog viewsLog = baseMapper.selectOne(wrapper); + if(viewsLog == null){ + viewsLog = new ViewsLog(); + viewsLog.setUserId(loginUserId); + viewsLog.setHouseId(houseInfo.getHouseId()); + viewsLog.setHouseUserId(houseInfo.getUserId()); + } + viewsLog.setUpdateTime(DateUtil.date()); + saveOrUpdate(viewsLog); + } + +} diff --git a/src/main/java/com/gxwebsoft/love/controller/CertificateController.java b/src/main/java/com/gxwebsoft/love/controller/CertificateController.java new file mode 100644 index 0000000..8a62864 --- /dev/null +++ b/src/main/java/com/gxwebsoft/love/controller/CertificateController.java @@ -0,0 +1,199 @@ +package com.gxwebsoft.love.controller; + +import com.alibaba.fastjson2.JSON; +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.FileRecord; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.common.system.service.UserService; +import com.gxwebsoft.love.entity.Certificate; +import com.gxwebsoft.love.param.CertificateParam; +import com.gxwebsoft.love.service.CertificateService; +import com.gxwebsoft.love.vo.idcheck.BackRecognitionResult; +import com.gxwebsoft.love.vo.idcheck.FrontRecognitionResult; +import com.gxwebsoft.love.vo.idcheck.Response; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.util.StringUtils; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; +import java.util.stream.Collectors; + +/** + * 证件管理记录表控制器 + * + * @author 科技小王子 + * @since 2023-06-24 11:18:52 + */ +@Api(tags = "证件管理记录表管理") +@RestController +@RequestMapping("/api/love/certificate") +public class CertificateController extends BaseController { + @Resource + private CertificateService certificateService; + + + @Resource + private UserService userService; + + @PreAuthorize("hasAuthority('love:certificate:list')") + @OperationLog + @ApiOperation("分页查询证件管理记录表") + @GetMapping("/page") + public ApiResult> page(CertificateParam param) { + // 使用关联查询 + return success(certificateService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('love:certificate:list')") + @OperationLog + @ApiOperation("查询全部证件管理记录表") + @GetMapping() + public ApiResult> list(CertificateParam param) { + // 使用关联查询 + return success(certificateService.listRel(param)); + } + + @PreAuthorize("hasAuthority('love:certificate:list')") + @OperationLog + @ApiOperation("根据id查询证件管理记录表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + // 使用关联查询 + return success(certificateService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('love:certificate:save')") + @OperationLog + @ApiOperation("添加证件管理记录表") + @PostMapping() + public ApiResult save(@RequestBody Certificate certificate) { + + // 记录当前登录用户id + User loginUser = getLoginUser(); + + certificate.setUserId(loginUser.getUserId()); + certificate.setStatus(10); + // 身份证认证 + if("idCard".equals(certificate.getCertificateType())){ + // 验证表单 + if (!StringUtils.hasText(certificate.getRealName())) { + return fail("请填写真实姓名", certificate); + } + if (!StringUtils.hasText(certificate.getCertificateCode())) { + return fail("请填写身份证号码", certificate); + } + + List files = JSON.parseArray(certificate.getFiles(), FileRecord.class); + List collect = files.stream().map(FileRecord::getUrl).collect(Collectors.toList()); + if (files == null || files.size() < 2) { + return fail("请上传身份证照片", certificate); + } + + // 验证正面 + Response front = certificateService.idcardfrontrecongnition(collect.get(0)); + if (front.getError_code() != 0) { + return fail(front.getReason()); + } + + + // 验证反面 + Response back = certificateService.idcardbackrecongnition(collect.get(1)); + if (back.getError_code() != 0) { + return fail(back.getReason()); + } + + certificate.setStatus(30); + + // 信息是否一致 + if (!certificate.getCertificateCode().equals(front.getResult().getIdcardno())) { + return fail("认证失败", certificate); + } + if (!certificate.getRealName().equals(front.getResult().getName())) { + return fail("认证失败", certificate); + } + User user = new User(); + user.setUserId(loginUser.getUserId()); + user.setCertification(1); + userService.updateById(user); + + } + + + + // 其他身份人工审核 + final Certificate one = certificateService.getOne(new LambdaQueryWrapper().eq(Certificate::getUserId, loginUser.getUserId()).eq(Certificate::getCertificateType, certificate.getCertificateType())); + if (one != null) { + certificate.setCertificateId(one.getCertificateId()); + certificateService.updateById(certificate); + }else { + certificateService.save(certificate); + } + + return success("提交成功", certificate); + + } + + @PreAuthorize("hasAuthority('love:certificate:update')") + @OperationLog + @ApiOperation("修改证件管理记录表") + @PutMapping() + public ApiResult update(@RequestBody Certificate certificate) { + if (certificateService.updateById(certificate)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('love:certificate:remove')") + @OperationLog + @ApiOperation("删除证件管理记录表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (certificateService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('love:certificate:save')") + @OperationLog + @ApiOperation("批量添加证件管理记录表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (certificateService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('love:certificate:update')") + @OperationLog + @ApiOperation("批量修改证件管理记录表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(certificateService, "certificate_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('love:certificate:remove')") + @OperationLog + @ApiOperation("批量删除证件管理记录表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (certificateService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/love/controller/ChatConversationController.java b/src/main/java/com/gxwebsoft/love/controller/ChatConversationController.java new file mode 100644 index 0000000..96ec8a8 --- /dev/null +++ b/src/main/java/com/gxwebsoft/love/controller/ChatConversationController.java @@ -0,0 +1,157 @@ +package com.gxwebsoft.love.controller; + +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.User; +import com.gxwebsoft.love.entity.ChatConversation; +import com.gxwebsoft.love.param.ChatConversationParam; +import com.gxwebsoft.love.service.ChatConversationService; +import com.gxwebsoft.love.vo.ChatConversationVO; +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-06-15 21:26:48 + */ +@Api(tags = "聊天消息表管理") +@RestController +@RequestMapping("/api/love/chat-conversation") +public class ChatConversationController extends BaseController { + @Resource + private ChatConversationService chatConversationService; + + // @PreAuthorize("hasAuthority('love:chatConversation:list')") + @ApiOperation("查询全部聊天消息表") + @GetMapping("/app") + public ApiResult> appList() { + + ChatConversationParam param = new ChatConversationParam(); + param.setUserId(getLoginUserId()); + return success(chatConversationService.getFriendList(param)); + } + + @ApiOperation("标记已读") + @PostMapping("/app/read") + public ApiResult read(@RequestBody ChatConversationParam param) { + return success(chatConversationService.update( + new LambdaUpdateWrapper().eq(ChatConversation::getId, param.getId()).set(ChatConversation::getUnRead, 0) + )); + // 使用关联查询 + //return success(chatConversationService.pageRel(param)); + } + + + @PreAuthorize("hasAuthority('love:chatConversation:list')") + @OperationLog + @ApiOperation("分页查询聊天消息表") + @GetMapping("/page") + public ApiResult> page(ChatConversationParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); +// return success(chatConversationService.page(page, page.getWrapper())); + // 使用关联查询 + return success(chatConversationService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('love:chatConversation:list')") + @OperationLog + @ApiOperation("查询全部聊天消息表") + @GetMapping() + public ApiResult> list(ChatConversationParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); +// return success(chatConversationService.list(page.getOrderWrapper())); + // 使用关联查询 + return success(chatConversationService.listRel(param)); + } + + @PreAuthorize("hasAuthority('love:chatConversation:list')") + @OperationLog + @ApiOperation("根据id查询聊天消息表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + return success(chatConversationService.getById(id)); + // 使用关联查询 + //return success(chatConversationService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('love:chatConversation:save')") + @OperationLog + @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("添加失败"); + } + + @PreAuthorize("hasAuthority('love:chatConversation:update')") + @OperationLog + @ApiOperation("修改聊天消息表") + @PutMapping() + public ApiResult update(@RequestBody ChatConversation chatConversation) { + if (chatConversationService.updateById(chatConversation)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @OperationLog + @ApiOperation("删除聊天消息表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (chatConversationService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('love:chatConversation:save')") + @OperationLog + @ApiOperation("批量添加聊天消息表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (chatConversationService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('love:chatConversation:update')") + @OperationLog + @ApiOperation("批量修改聊天消息表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(chatConversationService, "id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('love:chatConversation:remove')") + @OperationLog + @ApiOperation("批量删除聊天消息表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (chatConversationService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/love/controller/ChatMessageController.java b/src/main/java/com/gxwebsoft/love/controller/ChatMessageController.java new file mode 100644 index 0000000..38ae1e1 --- /dev/null +++ b/src/main/java/com/gxwebsoft/love/controller/ChatMessageController.java @@ -0,0 +1,162 @@ +package com.gxwebsoft.love.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.service.UserService; +import com.gxwebsoft.love.entity.ChatMessage; +import com.gxwebsoft.love.param.ChatMessageParam; +import com.gxwebsoft.love.service.ChatMessageService; +import com.gxwebsoft.love.socketio.cache.ClientCache; +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-06-10 18:27:25 + */ +@Api(tags = "聊天消息表管理") +@RestController +@RequestMapping("/api/love/chat-message") +public class ChatMessageController extends BaseController { + @Resource + private ChatMessageService chatMessageService; + + @Resource + private UserService userService; + + + @Resource + private ClientCache clientCache; + @OperationLog + @ApiOperation("发送消息：app端使用") + @PostMapping("/app/send") + public ApiResult sendMessage(@RequestBody ChatMessage message) { + User loginUser = getLoginUser(); + message.setFormUserId(getLoginUserId()); + message.setFormUserInfo(loginUser); + return success(chatMessageService.sendMessage(message)); + } + + @OperationLog + @ApiOperation("发送消息") + @GetMapping("/app/list/{friendId}") + public ApiResult> listApp(@PathVariable Integer friendId) { + + return success(chatMessageService.getFriendMessage(getLoginUserId(), friendId)); + } + + @PreAuthorize("hasAuthority('love:chatMessage:list')") + @OperationLog + @ApiOperation("分页查询聊天消息表") + @GetMapping("/page") + public ApiResult> page(ChatMessageParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); +// return success(chatMessageService.page(page, page.getWrapper())); + // 使用关联查询 + return success(chatMessageService.pageRel(param)); + } + + + + @PreAuthorize("hasAuthority('love:chatMessage:list')") + @OperationLog + @ApiOperation("查询全部聊天消息表") + @GetMapping() + public ApiResult> list(ChatMessageParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(chatMessageService.list(page.getOrderWrapper())); + // 使用关联查询 + //return success(chatMessageService.listRel(param)); + } + + @PreAuthorize("hasAuthority('love:chatMessage:list')") + @OperationLog + @ApiOperation("根据id查询聊天消息表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + return success(chatMessageService.getById(id)); + // 使用关联查询 + //return success(chatMessageService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('love:chatMessage:save')") + @OperationLog + @ApiOperation("添加聊天消息表 管理员使用") + @PostMapping() + public ApiResult save(@RequestBody ChatMessage message) { + // 记录当前登录用户id + User loginUser = getLoginUser(); + User fromUser = userService.getById(message.getFormUserId()); + message.setFormUserInfo(fromUser); + if (chatMessageService.sendMessage(message)) { + return success("发送成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('love:chatMessage:update')") + @OperationLog + @ApiOperation("修改聊天消息表") + @PutMapping() + public ApiResult update(@RequestBody ChatMessage chatMessage) { + if (chatMessageService.updateById(chatMessage)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('love:chatMessage:remove')") + @OperationLog + @ApiOperation("删除聊天消息表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (chatMessageService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('love:chatMessage:save')") + @OperationLog + @ApiOperation("批量添加聊天消息表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (chatMessageService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('love:chatMessage:update')") + @OperationLog + @ApiOperation("批量修改聊天消息表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(chatMessageService, "id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('love:chatMessage:remove')") + @OperationLog + @ApiOperation("批量删除聊天消息表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (chatMessageService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/love/controller/ProfitController.java b/src/main/java/com/gxwebsoft/love/controller/ProfitController.java new file mode 100644 index 0000000..89b7e06 --- /dev/null +++ b/src/main/java/com/gxwebsoft/love/controller/ProfitController.java @@ -0,0 +1,128 @@ +package com.gxwebsoft.love.controller; + +import com.gxwebsoft.common.core.annotation.OperationLog; +import com.gxwebsoft.common.core.web.*; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.love.entity.Profit; +import com.gxwebsoft.love.param.ProfitParam; +import com.gxwebsoft.love.service.ProfitService; +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-06-28 20:49:17 + */ +@Api(tags = "门店收益明细表管理") +@RestController +@RequestMapping("/api/love/profit") +public class ProfitController extends BaseController { + @Resource + private ProfitService profitService; + + @PreAuthorize("hasAuthority('love:profit:list')") + @OperationLog + @ApiOperation("分页查询门店收益明细表") + @GetMapping("/page") + public ApiResult> page(ProfitParam param) { + // 使用关联查询 + return success(profitService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('love:profit:list')") + @OperationLog + @ApiOperation("查询全部门店收益明细表") + @GetMapping() + public ApiResult> list(ProfitParam param) { + // 使用关联查询 + return success(profitService.listRel(param)); + } + + @PreAuthorize("hasAuthority('love:profit:list')") + @OperationLog + @ApiOperation("根据id查询门店收益明细表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + // 使用关联查询 + return success(profitService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('love:profit:save')") + @OperationLog + @ApiOperation("添加门店收益明细表") + @PostMapping() + public ApiResult save(@RequestBody Profit profit) { + // 记录当前登录用户id + User loginUser = getLoginUser(); + if (loginUser != null) { + profit.setUserId(loginUser.getUserId()); + } + if (profitService.save(profit)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('love:profit:update')") + @OperationLog + @ApiOperation("修改门店收益明细表") + @PutMapping() + public ApiResult update(@RequestBody Profit profit) { + if (profitService.updateById(profit)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('love:profit:remove')") + @OperationLog + @ApiOperation("删除门店收益明细表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (profitService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('love:profit:save')") + @OperationLog + @ApiOperation("批量添加门店收益明细表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (profitService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('love:profit:update')") + @OperationLog + @ApiOperation("批量修改门店收益明细表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(profitService, "profit_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('love:profit:remove')") + @OperationLog + @ApiOperation("批量删除门店收益明细表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (profitService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/love/controller/UserPlanController.java b/src/main/java/com/gxwebsoft/love/controller/UserPlanController.java new file mode 100644 index 0000000..6f7c3ae --- /dev/null +++ b/src/main/java/com/gxwebsoft/love/controller/UserPlanController.java @@ -0,0 +1,167 @@ +package com.gxwebsoft.love.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.BatchParam; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.love.entity.UserPlan; +import com.gxwebsoft.love.entity.UserPlanIcon; +import com.gxwebsoft.love.entity.UserPlanPrice; +import com.gxwebsoft.love.param.UserPlanParam; +import com.gxwebsoft.love.service.UserPlanIconService; +import com.gxwebsoft.love.service.UserPlanPriceService; +import com.gxwebsoft.love.service.UserPlanService; +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-06-21 11:21:01 + */ +@Api(tags = "会员套餐管理表管理") +@RestController +@RequestMapping("/api/love/user-plan") +public class UserPlanController extends BaseController { + @Resource + private UserPlanService userPlanService; + @Resource + private UserPlanPriceService userPlanPriceService; + @Resource + private UserPlanIconService userPlanIconService; + + @PreAuthorize("hasAuthority('love:userPlan:list')") + @OperationLog + @ApiOperation("分页查询会员套餐管理表") + @GetMapping("/page") + public ApiResult> page(UserPlanParam param) { + // 使用关联查询 + return success(userPlanService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('love:userPlan:list')") + @OperationLog + @ApiOperation("查询全部会员套餐管理表") + @GetMapping() + public ApiResult> list(UserPlanParam param) { + // 使用关联查询 + param.setLoginUserId(getLoginUserId()); + return success(userPlanService.listRel(param)); + } + + @PreAuthorize("hasAuthority('love:userPlan:list')") + @OperationLog + @ApiOperation("根据id查询会员套餐管理表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + // 使用关联查询 + return success(userPlanService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('love:userPlan:save')") + @OperationLog + @ApiOperation("添加会员套餐管理表") + @PostMapping() + public ApiResult save(@RequestBody UserPlan userPlan) { + if (userPlanService.save(userPlan)) { + if (!userPlan.getPrice().isEmpty()) { + final List price = userPlan.getPrice(); + price.forEach(d -> { + d.setPlanId(userPlan.getPlanId()); + }); + userPlanPriceService.saveBatch(price); + } + if (!userPlan.getIcons().isEmpty()) { + final List icons = userPlan.getIcons(); + icons.forEach(d -> { + d.setPlanId(userPlan.getPlanId()); + }); + userPlanIconService.saveBatch(icons); + } + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('love:userPlan:update')") + @OperationLog + @ApiOperation("修改会员套餐管理表") + @PutMapping() + public ApiResult update(@RequestBody UserPlan userPlan) { + if (userPlanService.updateById(userPlan)) { + // 先删除 + userPlanPriceService.remove(new LambdaQueryWrapper().eq(UserPlanPrice::getPlanId, userPlan.getPlanId())); + userPlanIconService.remove(new LambdaQueryWrapper().eq(UserPlanIcon::getPlanId, userPlan.getPlanId())); + // 再添加 + if (!userPlan.getPrice().isEmpty()) { + final List price = userPlan.getPrice(); + price.forEach(d -> { + d.setPlanId(userPlan.getPlanId()); + }); + userPlanPriceService.saveBatch(price); + } + if (!userPlan.getIcons().isEmpty()) { + final List icons = userPlan.getIcons(); + icons.forEach(d -> { + d.setPlanId(userPlan.getPlanId()); + }); + userPlanIconService.saveBatch(icons); + } + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('love:userPlan:remove')") + @OperationLog + @ApiOperation("删除会员套餐管理表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (userPlanService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('love:userPlan:save')") + @OperationLog + @ApiOperation("批量添加会员套餐管理表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (userPlanService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('love:userPlan:update')") + @OperationLog + @ApiOperation("批量修改会员套餐管理表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(userPlanService, "plan_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('love:userPlan:remove')") + @OperationLog + @ApiOperation("批量删除会员套餐管理表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (userPlanService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/love/controller/UserPlanEquityController.java b/src/main/java/com/gxwebsoft/love/controller/UserPlanEquityController.java new file mode 100644 index 0000000..90bf821 --- /dev/null +++ b/src/main/java/com/gxwebsoft/love/controller/UserPlanEquityController.java @@ -0,0 +1,148 @@ +package com.gxwebsoft.love.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.BatchParam; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.love.entity.UserPlanEquity; +import com.gxwebsoft.love.param.UserPlanEquityParam; +import com.gxwebsoft.love.service.UserPlanEquityService; +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.Map; +import java.util.stream.Collectors; + +/** + * 会员套餐管理表控制器 + * + * @author 科技小王子 + * @since 2023-06-23 11:34:03 + */ +@Api(tags = "会员套餐管理表管理") +@RestController +@RequestMapping("/api/love/user-plan-equity") +public class UserPlanEquityController extends BaseController { + @Resource + private UserPlanEquityService userPlanEquityService; + + @PreAuthorize("hasAuthority('love:userPlanEquity:list')") + @OperationLog + @ApiOperation("分页查询会员套餐管理表") + @GetMapping("/page") + public ApiResult> page(UserPlanEquityParam param) { + final PageResult result = userPlanEquityService.pageRel(param); + // 门店身份权益 + if (param.getType().equals(1)) { + final Map> collect = result.getList().stream().collect(Collectors.groupingBy(UserPlanEquity::getUserId)); + result.setList(null); + final ArrayList list = new ArrayList<>(); + for(Integer userId : collect.keySet()){ + UserPlanEquity equity = new UserPlanEquity(); + final List userPlanEquities = collect.get(userId); + list.add(userPlanEquities.get(0)); + } + result.setList(list); + return success(result); + } + // 使用关联查询 + return success(result); + } + + @PreAuthorize("hasAuthority('love:userPlanEquity:list')") + @OperationLog + @ApiOperation("查询全部会员套餐管理表") + @GetMapping() + public ApiResult> list(UserPlanEquityParam param) { + // 使用关联查询 + return success(userPlanEquityService.listRel(param)); + } + + @PreAuthorize("hasAuthority('love:userPlanEquity:list')") + @OperationLog + @ApiOperation("根据id查询会员套餐管理表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + // 使用关联查询 + return success(userPlanEquityService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('love:userPlanEquity:save')") + @OperationLog + @ApiOperation("添加会员套餐管理表") + @PostMapping() + public ApiResult save(@RequestBody UserPlanEquity userPlanEquity) { + // 记录当前登录用户id + User loginUser = getLoginUser(); + if (loginUser != null) { + userPlanEquity.setUserId(loginUser.getUserId()); + } + if (userPlanEquityService.save(userPlanEquity)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('love:userPlanEquity:update')") + @OperationLog + @ApiOperation("修改会员套餐管理表") + @PutMapping() + public ApiResult update(@RequestBody UserPlanEquity userPlanEquity) { + if (userPlanEquityService.updateById(userPlanEquity)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('love:userPlanEquity:remove')") + @OperationLog + @ApiOperation("删除会员套餐管理表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (userPlanEquityService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('love:userPlanEquity:save')") + @OperationLog + @ApiOperation("批量添加会员套餐管理表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (userPlanEquityService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('love:userPlanEquity:update')") + @OperationLog + @ApiOperation("批量修改会员套餐管理表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(userPlanEquityService, "plan_equity_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('love:userPlanEquity:remove')") + @OperationLog + @ApiOperation("批量删除会员套餐管理表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (userPlanEquityService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/love/controller/UserPlanIconController.java b/src/main/java/com/gxwebsoft/love/controller/UserPlanIconController.java new file mode 100644 index 0000000..3eceed0 --- /dev/null +++ b/src/main/java/com/gxwebsoft/love/controller/UserPlanIconController.java @@ -0,0 +1,129 @@ +package com.gxwebsoft.love.controller; + +import com.gxwebsoft.common.core.annotation.OperationLog; +import com.gxwebsoft.common.core.web.*; +import com.gxwebsoft.love.entity.UserPlanIcon; +import com.gxwebsoft.love.param.UserPlanIconParam; +import com.gxwebsoft.love.service.UserPlanIconService; +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-06-25 18:09:34 + */ +@Api(tags = "会员套餐权益表管理") +@RestController +@RequestMapping("/api/love/user-plan-icon") +public class UserPlanIconController extends BaseController { + @Resource + private UserPlanIconService userPlanIconService; + + @PreAuthorize("hasAuthority('love:userPlanIcon:list')") + @OperationLog + @ApiOperation("分页查询会员套餐权益表") + @GetMapping("/page") + public ApiResult> page(UserPlanIconParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(userPlanIconService.page(page, page.getWrapper())); + // 使用关联查询 + //return success(userPlanIconService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('love:userPlanIcon:list')") + @OperationLog + @ApiOperation("查询全部会员套餐权益表") + @GetMapping() + public ApiResult> list(UserPlanIconParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(userPlanIconService.list(page.getOrderWrapper())); + // 使用关联查询 + //return success(userPlanIconService.listRel(param)); + } + + @PreAuthorize("hasAuthority('love:userPlanIcon:list')") + @OperationLog + @ApiOperation("根据id查询会员套餐权益表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + return success(userPlanIconService.getById(id)); + // 使用关联查询 + //return success(userPlanIconService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('love:userPlanIcon:save')") + @OperationLog + @ApiOperation("添加会员套餐权益表") + @PostMapping() + public ApiResult save(@RequestBody UserPlanIcon userPlanIcon) { + if (userPlanIconService.save(userPlanIcon)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('love:userPlanIcon:update')") + @OperationLog + @ApiOperation("修改会员套餐权益表") + @PutMapping() + public ApiResult update(@RequestBody UserPlanIcon userPlanIcon) { + if (userPlanIconService.updateById(userPlanIcon)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('love:userPlanIcon:remove')") + @OperationLog + @ApiOperation("删除会员套餐权益表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (userPlanIconService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('love:userPlanIcon:save')") + @OperationLog + @ApiOperation("批量添加会员套餐权益表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (userPlanIconService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('love:userPlanIcon:update')") + @OperationLog + @ApiOperation("批量修改会员套餐权益表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(userPlanIconService, "id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('love:userPlanIcon:remove')") + @OperationLog + @ApiOperation("批量删除会员套餐权益表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (userPlanIconService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/love/controller/UserPlanLogController.java b/src/main/java/com/gxwebsoft/love/controller/UserPlanLogController.java new file mode 100644 index 0000000..d34301d --- /dev/null +++ b/src/main/java/com/gxwebsoft/love/controller/UserPlanLogController.java @@ -0,0 +1,370 @@ +package com.gxwebsoft.love.controller; + +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson.JSONObject; +import com.gxwebsoft.common.core.annotation.OperationLog; +import com.gxwebsoft.common.core.config.ConfigProperties; +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.Setting; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.common.system.mapper.SettingMapper; +import com.gxwebsoft.common.system.param.SettingParam; +import com.gxwebsoft.common.system.service.SettingService; +import com.gxwebsoft.common.system.service.UserRoleService; +import com.gxwebsoft.common.system.service.UserService; +import com.gxwebsoft.love.entity.UserPlanLog; +import com.gxwebsoft.love.entity.UserPlanPrice; +import com.gxwebsoft.love.param.UserPlanLogParam; +import com.gxwebsoft.love.service.UserPlanLogService; +import com.gxwebsoft.love.service.UserPlanPriceService; +import com.gxwebsoft.shop.service.UserGradeService; +import com.wechat.pay.java.core.Config; +import com.wechat.pay.java.core.RSAConfig; +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 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 io.swagger.annotations.Api; +import io.swagger.annotations.ApiModelProperty; +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.text.DecimalFormat; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import static com.gxwebsoft.common.core.constants.OrderConstants.PAY_STATUS_NO_PAY; +import static com.gxwebsoft.common.core.constants.OrderConstants.PAY_STATUS_SUCCESS; + +/** + * 会员特权购买记录表控制器 + * + * @author 科技小王子 + * @since 2023-06-20 18:07:50 + */ +@Api(tags = "会员特权购买记录表管理") +@RestController +@RequestMapping("/api/love/user-plan-log") +public class UserPlanLogController extends BaseController { + @Resource + private UserPlanLogService userPlanLogService; + @Resource + private UserPlanPriceService userPlanPriceService; + @Resource + private SettingService settingService; + @Resource + private ConfigProperties config; + @Resource + private SettingMapper settingMapper; + @Resource + private UserRoleService userRoleService; + @Resource + private UserService userService; + @Resource + private UserGradeService userGradeService; + + @PreAuthorize("hasAuthority('love:userPlanLog:list')") + @OperationLog + @ApiOperation("分页查询会员特权购买记录表") + @GetMapping("/page") + public ApiResult> page(UserPlanLogParam param) { + // 使用关联查询 + return success(userPlanLogService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('love:userPlanLog:list')") + @OperationLog + @ApiOperation("查询全部会员特权购买记录表") + @GetMapping() + public ApiResult> list(UserPlanLogParam param) { + // 使用关联查询 + return success(userPlanLogService.listRel(param)); + } + + @PreAuthorize("hasAuthority('love:userPlanLog:list')") + @OperationLog + @ApiOperation("根据id查询会员特权购买记录表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + // 使用关联查询 + return success(userPlanLogService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('love:userPlanLog:save')") + @OperationLog + @ApiOperation("添加会员特权购买记录表") + @PostMapping() + public ApiResult save(@RequestBody UserPlanLog userPlanLog) { + // 记录当前登录用户id + User loginUser = getLoginUser(); + if (loginUser != null) { + userPlanLog.setUserId(loginUser.getUserId()); + userPlanLog.setOpenid(loginUser.getOpenid()); + } + final UserPlanPrice price = userPlanPriceService.getByIdRel(userPlanLog.getPriceId()); + userPlanLog.setLogNo(CommonUtil.createOrderNo()); +// if (userPlanLog.getTotalPrice() == null) { +// userPlanLog.setMoney(userPlanLog.getTotalPrice()); +// }else { +// } + userPlanLog.setMoney(price.getPrice()); + userPlanLog.setPriceName(price.getName()); + userPlanLog.setPlanId(price.getPlanId()); + userPlanLog.setComments(price.getPlanName()); + userPlanLog.setType(price.getType()); + userPlanLog.setGradeId(price.getGradeId()); + userPlanLog.setAddress(userPlanLog.getAddress()); + + // 订单金额为0 + if(userPlanLog.getTotalPrice() != null){ + if(userPlanLog.getTotalPrice().equals(new BigDecimal("0.00"))){ + userPlanLog.setMoney(userPlanLog.getTotalPrice()); + userPlanLog.setPayStatus(PAY_STATUS_SUCCESS); + userPlanLog.setStatus(1); + userPlanLog.setIsSettled(0); + userPlanLogService.save(userPlanLog); + return success("支付成功",null); + } + } + + final String uploadPath = config.getUploadPath(); // 服务器本地路径 + final JSONObject mpWx = settingService.getBySettingKey("mp-weixin"); + final JSONObject payment = settingService.getBySettingKey("payment"); + final int money = userPlanLog.getMoney().intValue() * 100; // 充值套餐金额 + final String appId = mpWx.getString("appId"); + final String mchId = payment.getString("mchId"); + final String openid = userPlanLog.getOpenid(); // openid + final String notifyUrl = config.getServerUrl() + "/love/user-plan-log/wx-pay/notify/" + userPlanLog.getTenantId(); // 异步通知地址 + final String privateKey = uploadPath.concat("file").concat(payment.getString("apiclientKey")); // 秘钥证书 + final String apiclientCert = uploadPath.concat("file").concat(payment.getString("apiclientCert")); + final String merchantSerialNumber = payment.getString("merchantSerialNumber"); // 证书序列号 + final String apiV3key = payment.getString("wechatApiKey"); + + System.out.println("privateKey = " + privateKey); + System.out.println("apiclientCert = " + apiclientCert); + System.out.println("merchantSerialNumber = " + merchantSerialNumber); + System.out.println("apiV3key = " + apiV3key); + System.out.println("mchId = " + mchId); + System.out.println("appId = " + appId); + + // 保存购买记录 + if (userPlanLogService.save(userPlanLog)) { + Config config = + new RSAConfig.Builder() + .merchantId(mchId) + .privateKeyFromPath(privateKey) + .merchantSerialNumber(merchantSerialNumber) + .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(appId); + request.setMchid(mchId); + request.setDescription(userPlanLog.getComments()); + request.setNotifyUrl(notifyUrl); + request.setOutTradeNo(userPlanLog.getLogNo()); + request.setAttach(userPlanLog.getTenantId().toString()); + final Payer payer = new Payer(); + payer.setOpenid(openid); + request.setPayer(payer); + + PrepayWithRequestPaymentResponse response = service.prepayWithRequestPayment(request); + System.out.println("response = " + response); + + final HashMap orderInfo = new HashMap<>(); + 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 success("充值订单创建成功", orderInfo); + } + return fail("充值订单创建失败"); + } + + @ApiModelProperty("异步通知") + @OperationLog + @PostMapping("/wx-pay/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(); // 服务器本地路径 + final Setting payment = settingMapper.getBySettingKeyIgnore(param); + final JSONObject jsonObject = JSONObject.parseObject(payment.getContent()); + final String apiV3key = jsonObject.getString("wechatApiKey"); + final String apiclientCert = uploadPath.concat("file").concat(jsonObject.getString("apiclientCert")); + +// System.out.println("apiV3key ====== " + apiV3key); +// System.out.println("payment ===== " + payment); + + 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(apiV3key) + .certificatesFromPath(apiclientCert) + .build(); + + // 初始化 NotificationParser + NotificationParser parser = new NotificationParser(config); + + // 以支付通知回调为例，验签、解密并转换成 Transaction + try { + Transaction transaction = parser.parse(requestParam, Transaction.class); + final String outTradeNo = transaction.getOutTradeNo(); + 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. 查询要处理的订单 + final UserPlanLog log = userPlanLogService.getByOutTradeNo(outTradeNo); + System.out.println("log = " + log); + // 2. 已支付则跳过 + if (log.getPayStatus().equals(PAY_STATUS_SUCCESS)){ + return "SUCCESS"; + } + // 2. 未支付则处理更新订单状态 + if (log.getPayStatus().equals(PAY_STATUS_NO_PAY)) { + // 3. TODO 处理会员等级 + + // 4. TODO 处理过期时间 + + log.setPayStatus(PAY_STATUS_SUCCESS); + log.setPayTime(DateUtil.date()); + // 实际付款金额：Integer除以100后转BigDecimal + DecimalFormat df = new DecimalFormat("0.00"); + final String format = df.format(total / 100); + log.setPayPrice(new BigDecimal(format)); + userPlanLogService.updateByOutTradeNo(log); + return "SUCCESS"; + } + } + } catch (Exception $e) { + System.out.println($e.getMessage()); + } + + return "fail"; + } + + @PreAuthorize("hasAuthority('love:userPlanLog:update')") + @OperationLog + @ApiOperation("修改会员特权购买记录表") + @PutMapping() + public ApiResult update(@RequestBody UserPlanLog userPlanLog) { + if (userPlanLogService.updateById(userPlanLog)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('love:userPlanLog:remove')") + @OperationLog + @ApiOperation("删除会员特权购买记录表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (userPlanLogService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('love:userPlanLog:save')") + @OperationLog + @ApiOperation("批量添加会员特权购买记录表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (userPlanLogService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('love:userPlanLog:update')") + @OperationLog + @ApiOperation("批量修改会员特权购买记录表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(userPlanLogService, "log_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('love:userPlanLog:remove')") + @OperationLog + @ApiOperation("批量删除会员特权购买记录表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (userPlanLogService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @OperationLog + @ApiOperation("创建会员订单") + @GetMapping("/getPlanByPriceId/{priceId}") + public ApiResult getPlanByPriceId(@PathVariable("priceId") Integer priceId) { + final UserPlanPrice price = userPlanPriceService.getByIdRel(priceId); + return success(price); + } + +// @ApiModelProperty("异步通知") +// @OperationLog +// @PostMapping("/wx-pay/test/{id}") +// public ApiResult test(@RequestHeader Map header, @PathVariable("id") Integer id) { +//// final UserPlanLog log = userPlanLogService.getByOutTradeNo("2023062223063683"); +//// System.out.println("byOutTradeNo = " + log); +//// final UserRole userRole = new UserRole(); +//// userRole.setUserId(log.getUserId()); +//// userRole.setRoleId(log.getRoleId()); +//// userRole.setTenantId(log.getTenantId()); +//// userRoleService.save(userRole); +//// return success(userRole); +// return success(""); +// } +} diff --git a/src/main/java/com/gxwebsoft/love/controller/UserPlanPriceController.java b/src/main/java/com/gxwebsoft/love/controller/UserPlanPriceController.java new file mode 100644 index 0000000..c737e4c --- /dev/null +++ b/src/main/java/com/gxwebsoft/love/controller/UserPlanPriceController.java @@ -0,0 +1,125 @@ +package com.gxwebsoft.love.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.BatchParam; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.love.entity.UserPlanPrice; +import com.gxwebsoft.love.param.UserPlanPriceParam; +import com.gxwebsoft.love.service.UserPlanPriceService; +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-06-20 18:07:50 + */ +@Api(tags = "会员套餐定价表管理") +@RestController +@RequestMapping("/api/love/user-plan-price") +public class UserPlanPriceController extends BaseController { + @Resource + private UserPlanPriceService userPlanPriceService; + + @PreAuthorize("hasAuthority('love:userPlanPrice:list')") + @OperationLog + @ApiOperation("分页查询会员套餐定价表") + @GetMapping("/page") + public ApiResult> page(UserPlanPriceParam param) { + // 使用关联查询 + return success(userPlanPriceService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('love:userPlanPrice:list')") + @OperationLog + @ApiOperation("查询全部会员套餐定价表") + @GetMapping() + public ApiResult> list(UserPlanPriceParam param) { + // 使用关联查询 + return success(userPlanPriceService.listRel(param)); + } + + @PreAuthorize("hasAuthority('love:userPlanPrice:list')") + @OperationLog + @ApiOperation("根据id查询会员套餐定价表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + // 使用关联查询 + return success(userPlanPriceService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('love:userPlanPrice:save')") + @OperationLog + @ApiOperation("添加会员套餐定价表") + @PostMapping() + public ApiResult save(@RequestBody UserPlanPrice userPlanPrice) { + if (userPlanPriceService.save(userPlanPrice)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('love:userPlanPrice:update')") + @OperationLog + @ApiOperation("修改会员套餐定价表") + @PutMapping() + public ApiResult update(@RequestBody UserPlanPrice userPlanPrice) { + if (userPlanPriceService.updateById(userPlanPrice)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('love:userPlanPrice:remove')") + @OperationLog + @ApiOperation("删除会员套餐定价表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (userPlanPriceService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('love:userPlanPrice:save')") + @OperationLog + @ApiOperation("批量添加会员套餐定价表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (userPlanPriceService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('love:userPlanPrice:update')") + @OperationLog + @ApiOperation("批量修改会员套餐定价表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(userPlanPriceService, "id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('love:userPlanPrice:remove')") + @OperationLog + @ApiOperation("批量删除会员套餐定价表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (userPlanPriceService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/love/controller/UserProfileController.java b/src/main/java/com/gxwebsoft/love/controller/UserProfileController.java new file mode 100644 index 0000000..e98b657 --- /dev/null +++ b/src/main/java/com/gxwebsoft/love/controller/UserProfileController.java @@ -0,0 +1,205 @@ +package com.gxwebsoft.love.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.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.love.entity.UserProfile; +import com.gxwebsoft.love.param.UserProfileParam; +import com.gxwebsoft.love.service.UserProfileService; +import com.gxwebsoft.love.socketio.cache.ClientCache; +import com.gxwebsoft.shop.entity.UserLook; +import com.gxwebsoft.shop.service.UserLookService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.scheduling.annotation.Async; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 会员资料表控制器 + * + * @author 科技小王子 + * @since 2023-06-09 21:42:26 + */ +@Api(tags = "会员资料表管理") +@RestController +@RequestMapping("/api/love/user-profile") +public class UserProfileController extends BaseController { + @Resource + private UserProfileService userProfileService; + @Resource + private UserService userService; + @Resource + private UserLookService userLookService; + + @Resource + private ClientCache clientCache; + + @PreAuthorize("hasAuthority('love:userProfile:list')") + @ApiOperation("分页查询会员资料表") + @GetMapping("/page") + public ApiResult> page(UserProfileParam param) { + User loginUser = getLoginUser(); + if (loginUser != null) { + param.setLoginUserId(loginUser.getUserId()); + param.setCityMate(loginUser.getCity()); + // 推荐异性 + if (loginUser.getSex() != null && param.getScene() != null && (param.getScene().equals("recommend") || param.getScene().equals("intraCity"))) { + if (loginUser.getSex().equals("1")) { + param.setSex("2"); + }else { + param.setSex("1"); + } + } + } + final PageResult result = userProfileService.pageRel(param); + return success(result); + } + + @PreAuthorize("hasAuthority('love:userProfile:list')") + @ApiOperation("查询全部会员资料表") + @GetMapping() + public ApiResult> list(UserProfileParam param) { + // 使用关联查询 + return success(userProfileService.listRel(param)); + } + + @PreAuthorize("hasAuthority('sys:auth:user')") + @OperationLog + @ApiOperation("根据会员id查询详细资料") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + final User loginUser = getLoginUser(); + final UserProfileParam userProfileParam = new UserProfileParam(); + userProfileParam.setUserId(loginUser.getUserId()); + userProfileParam.setShowFollow(true); + final PageResult result = userProfileService.pageRel(userProfileParam); + if (result.getList().isEmpty()) { + final UserProfile profile = new UserProfile(); + profile.setUserId(loginUser.getUserId()); + profile.setImages("[]"); + userProfileService.save(profile); + profile.setUserInfo(loginUser); + return fail("添加成功",profile); + } + final UserProfile userProfile = result.getList().get(0); + userProfile.setUserInfo(getLoginUser()); + return success(userProfile); + } + + @PreAuthorize("hasAuthority('sys:user:update')") + @OperationLog + @ApiOperation("添加会员资料表") + @PostMapping() + public ApiResult save(@RequestBody UserProfile userProfile) { + // 记录当前登录用户id + User loginUser = getLoginUser(); + if (loginUser != null) { + userProfile.setUserId(loginUser.getUserId()); + } + if (userProfileService.save(userProfile)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('sys:user:update')") + @OperationLog + @ApiOperation("修改会员资料表") + @PutMapping() + public ApiResult update(@RequestBody UserProfile userProfile) { + if (userProfileService.updateById(userProfile)) { + userService.updateById(userProfile.getUserInfo()); + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('love:userProfile:remove')") + @OperationLog + @ApiOperation("删除会员资料表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (userProfileService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('love:userProfile:save')") + @OperationLog + @ApiOperation("批量添加会员资料表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (userProfileService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('love:userProfile:update')") + @OperationLog + @ApiOperation("批量修改会员资料表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(userProfileService, "id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('love:userProfile:remove')") + @OperationLog + @ApiOperation("批量删除会员资料表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (userProfileService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('love:userProfile:list')") + @OperationLog + @ApiOperation("根据会员id查询详细资料") + @GetMapping("/detail/{id}") + public ApiResult detail(@PathVariable("id") Integer id) { + final UserProfileParam param = new UserProfileParam(); + param.setShowFollow(true); + param.setLoginUserId(getLoginUserId()); + param.setUserId(id); + final PageResult result = userProfileService.pageRel(param); + if (result.getCount() > 0) { + final UserProfile profile = result.getList().get(0); + profile.setUserInfo(userService.getById(id)); + // 添加访客查看记录 + addUserLook(id); + return success(profile); + } + return fail("用户不存在",null); + } + + @Async + public void addUserLook(Integer toUserId) { + User loginUser = getLoginUser(); + if (loginUser != null && !loginUser.getUserId().equals(toUserId)) { + boolean noLog = userLookService.count(new LambdaQueryWrapper().eq(UserLook::getUserId, loginUser.getUserId()).eq(UserLook::getToUserId, toUserId)) == 0; + if (noLog) { + final UserLook userLook = new UserLook(); + userLook.setUserId(getLoginUserId()); + userLook.setToUserId(toUserId); + userLookService.save(userLook); + clientCache.sendUserEvent(userLook.getToUserId() + "","look", 1); + } + } + } + +} diff --git a/src/main/java/com/gxwebsoft/love/entity/Certificate.java b/src/main/java/com/gxwebsoft/love/entity/Certificate.java new file mode 100644 index 0000000..f1bb26c --- /dev/null +++ b/src/main/java/com/gxwebsoft/love/entity/Certificate.java @@ -0,0 +1,107 @@ +package com.gxwebsoft.love.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-06-24 11:18:52 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "Certificate对象", description = "证件管理记录表") +@TableName("love_certificate") +public class Certificate implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "证件id") + @TableId(value = "certificate_id", type = IdType.AUTO) + private Integer certificateId; + + @ApiModelProperty(value = "证件名称") + private String certificateName; + + @ApiModelProperty(value = "证件全称") + private String fullName; + + @ApiModelProperty(value = "证件标识") + private String certificateCode; + + @ApiModelProperty(value = "证件类型") + private String certificateType; + + @ApiModelProperty(value = "证件照片") + private String files; + + @ApiModelProperty(value = "房产所在的城市") + private String cityByHouse; + + @ApiModelProperty(value = "真实姓名") + private String realName; + + @ApiModelProperty(value = "联系电话") + private String phone; + + @ApiModelProperty(value = "证件到期时间") + private Date expirationTime; + + @ApiModelProperty(value = "企业法人") + private String businessEntity; + + @ApiModelProperty(value = "毕业院校") + private String college; + + @ApiModelProperty(value = "学历") + private String education; + + @ApiModelProperty(value = "认证方式") + private String authType; + + @ApiModelProperty(value = "车辆品牌") + private String carBrand; + + @ApiModelProperty(value = "备注") + private String comments; + + @ApiModelProperty(value = "是否实名认证") + private Integer authentication; + + @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; + + @ApiModelProperty(value = "用户昵称") + @TableField(exist = false) + private String nickname; + + @ApiModelProperty(value = "用户头像") + @TableField(exist = false) + private String avatar; + +} diff --git a/src/main/java/com/gxwebsoft/love/entity/ChatConversation.java b/src/main/java/com/gxwebsoft/love/entity/ChatConversation.java new file mode 100644 index 0000000..bba7f28 --- /dev/null +++ b/src/main/java/com/gxwebsoft/love/entity/ChatConversation.java @@ -0,0 +1,65 @@ +package com.gxwebsoft.love.entity; + +import com.baomidou.mybatisplus.annotation.*; +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-06-15 21:26:48 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "ChatConversation对象", description = "聊天消息表") +@TableName("love_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; + + @TableField(exist = false) + @ApiModelProperty(value = "好友信息") + private User friendInfo; + + @ApiModelProperty(value = "消息类型") + private Integer type; + + @ApiModelProperty(value = "消息内容") + private String content; + + @ApiModelProperty(value = "未读消息") + private int 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/src/main/java/com/gxwebsoft/love/entity/ChatMessage.java b/src/main/java/com/gxwebsoft/love/entity/ChatMessage.java new file mode 100644 index 0000000..61717b8 --- /dev/null +++ b/src/main/java/com/gxwebsoft/love/entity/ChatMessage.java @@ -0,0 +1,66 @@ +package com.gxwebsoft.love.entity; + +import com.baomidou.mybatisplus.annotation.*; +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-06-10 18:27:25 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "ChatMessage对象", description = "聊天消息表") +@TableName("love_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 = "发送人") + @TableField(exist = false) + private User formUserInfo; + + @ApiModelProperty(value = "接收人") + @TableField(exist = false) + private User toUserInfo; + + @ApiModelProperty(value = "消息类型") + private String type; + + @ApiModelProperty(value = "消息内容") + private String content; + + @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/src/main/java/com/gxwebsoft/love/entity/Profit.java b/src/main/java/com/gxwebsoft/love/entity/Profit.java new file mode 100644 index 0000000..b588c83 --- /dev/null +++ b/src/main/java/com/gxwebsoft/love/entity/Profit.java @@ -0,0 +1,109 @@ +package com.gxwebsoft.love.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-06-28 20:49:17 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "Profit对象", description = "门店收益明细表") +@TableName("love_profit") +public class Profit implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键ID") + @TableId(value = "profit_id", type = IdType.AUTO) + private Integer profitId; + + @ApiModelProperty(value = "用户ID") + private Integer userId; + + @ApiModelProperty(value = "购买记录ID") + private Integer logId; + + @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 = "排序(数字越小越靠前)") + 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 Integer playerId; + + @ApiModelProperty(value = "玩家昵称") + @TableField(exist = false) + private String playerNickname; + + @ApiModelProperty(value = "我推荐的玩家") + @TableField(exist = false) + private String playerAvatar; + + @ApiModelProperty(value = "消费金额") + @TableField(exist = false) + private BigDecimal orderPrice; + + @ApiModelProperty(value = "结算状态") + @TableField(exist = false) + private Integer isSettled; + + @ApiModelProperty(value = "类型 0单身 1婚介") + @TableField(exist = false) + private Integer type; + + @ApiModelProperty(value = "会员等级") + @TableField(exist = false) + private String gradeName; + +} diff --git a/src/main/java/com/gxwebsoft/love/entity/UserPlan.java b/src/main/java/com/gxwebsoft/love/entity/UserPlan.java new file mode 100644 index 0000000..a3bd11b --- /dev/null +++ b/src/main/java/com/gxwebsoft/love/entity/UserPlan.java @@ -0,0 +1,98 @@ +package com.gxwebsoft.love.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-06-21 11:21:01 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "UserPlan对象", description = "会员套餐管理表") +@TableName("love_user_plan") +public class UserPlan implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "套餐ID") + @TableId(value = "plan_id", type = IdType.AUTO) + private Integer planId; + + @ApiModelProperty(value = "套餐名称") + private String name; + + @ApiModelProperty(value = "类型 0单身 1婚介") + private Integer type; + + @ApiModelProperty(value = "副标题") + private String subName; + + @ApiModelProperty(value = "会员身份") + private Integer roleId; + + @ApiModelProperty(value = "会员等级") + private Integer gradeId; + + @ApiModelProperty(value = "图标") + private String icon; + + @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 roleName; + + @ApiModelProperty(value = "会员等级") + @TableField(exist = false) + private String gradeName; + + @ApiModelProperty(value = "套餐价格") + @TableField(exist = false) + private List price; + + @ApiModelProperty(value = "解锁的权益") + @TableField(exist = false) + private List equity; + + @ApiModelProperty(value = "购买记录") + @TableField(exist = false) + private List log; + + @ApiModelProperty(value = "权益图标") + @TableField(exist = false) + private List icons; + + @ApiModelProperty(value = "过期时间") + @TableField(exist = false) + private String expirationTime; + +} diff --git a/src/main/java/com/gxwebsoft/love/entity/UserPlanEquity.java b/src/main/java/com/gxwebsoft/love/entity/UserPlanEquity.java new file mode 100644 index 0000000..1a86244 --- /dev/null +++ b/src/main/java/com/gxwebsoft/love/entity/UserPlanEquity.java @@ -0,0 +1,91 @@ +package com.gxwebsoft.love.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.util.Date; + +/** + * 会员套餐管理表 + * + * @author 科技小王子 + * @since 2023-06-23 11:34:03 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "UserPlanEquity对象", description = "会员套餐管理表") +@TableName("love_user_plan_equity") +public class UserPlanEquity implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "权益ID") + @TableId(value = "plan_equity_id", type = IdType.AUTO) + private Integer planEquityId; + + @ApiModelProperty(value = "套餐ID") + private Integer planId; + + @ApiModelProperty(value = "类型 0单身 1婚介") + private Integer type; + + @ApiModelProperty(value = "套餐名称") + private String planName; + + @ApiModelProperty(value = "真实姓名") + private String realName; + + @ApiModelProperty(value = "手机号码") + @TableField(exist = false) + private String phone; + + @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 = "用户ID") + private Integer userId; + + @ApiModelProperty(value = "到期时间") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date expirationTime; + + @ApiModelProperty(value = "排序(数字越小越靠前)") + private Integer sortNumber; + + @ApiModelProperty(value = "备注") + private String comments; + + @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 userAvatar; + +} diff --git a/src/main/java/com/gxwebsoft/love/entity/UserPlanIcon.java b/src/main/java/com/gxwebsoft/love/entity/UserPlanIcon.java new file mode 100644 index 0000000..f603ff8 --- /dev/null +++ b/src/main/java/com/gxwebsoft/love/entity/UserPlanIcon.java @@ -0,0 +1,55 @@ +package com.gxwebsoft.love.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-06-25 18:09:34 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "UserPlanIcon对象", description = "会员套餐权益表") +@TableName("love_user_plan_icon") +public class UserPlanIcon 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 planId; + + @ApiModelProperty(value = "图标") + private String icon; + + @ApiModelProperty(value = "权益") + private String name; + + @ApiModelProperty(value = "排序(数字越小越靠前)") + private Integer sortNumber; + + @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/src/main/java/com/gxwebsoft/love/entity/UserPlanLog.java b/src/main/java/com/gxwebsoft/love/entity/UserPlanLog.java new file mode 100644 index 0000000..89270ed --- /dev/null +++ b/src/main/java/com/gxwebsoft/love/entity/UserPlanLog.java @@ -0,0 +1,157 @@ +package com.gxwebsoft.love.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-06-20 18:07:50 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "UserPlanLog对象", description = "会员特权购买记录表") +@TableName("love_user_plan_log") +public class UserPlanLog implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "ID") + @TableId(value = "log_id", type = IdType.AUTO) + private Integer logId; + + @ApiModelProperty(value = "订单号") + private String logNo; + + @ApiModelProperty(value = "类型 0单身 1婚介 2线下") + private Integer type; + + @ApiModelProperty(value = "付款金额") + private BigDecimal money; + + @ApiModelProperty(value = "套餐ID") + private Integer planId; + + @ApiModelProperty(value = "支付状态") + private Integer payStatus; + + @ApiModelProperty(value = "支付时间") + private Date payTime; + + @ApiModelProperty(value = "过期时间") + private Date expirationTime; + + @ApiModelProperty(value = "实际付款金额") + private BigDecimal payPrice; + + @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 = "价格ID") + private Integer priceId; + + @ApiModelProperty(value = "会员等级ID") + private Integer gradeId; + + @ApiModelProperty(value = "名称") + private String priceName; + + @ApiModelProperty(value = "真实姓名") + private String realName; + + @ApiModelProperty(value = "联系电话") + private String phone; + + @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 = "门店ID") + private Integer merchantId; + + @ApiModelProperty(value = "所属门店") + private String merchantName; + + @ApiModelProperty(value = "所属门店") + private String merchantCode; + + @ApiModelProperty(value = "结算状态") + private Integer isSettled; + + @ApiModelProperty(value = "套餐名称") + @TableField(exist = false) + private String planName; + + @ApiModelProperty(value = "套餐图标") + @TableField(exist = false) + private String planIcon; + + @ApiModelProperty(value = "会员昵称") + @TableField(exist = false) + private String nickname; + + @ApiModelProperty(value = "头像") + @TableField(exist = false) + private String userAvatar; + + @ApiModelProperty(value = "openid") + @TableField(exist = false) + private String openid; + + @ApiModelProperty(value = "会员身份") + @TableField(exist = false) + private Integer roleId; + + @ApiModelProperty(value = "推荐人ID") + @TableField(exist = false) + private Integer dealerId; + + @ApiModelProperty(value = "间接推荐人") + @TableField(exist = false) + private Integer dealerId2; + + @ApiModelProperty(value = "付款金额") + @TableField(exist = false) + private BigDecimal totalPrice; + +} diff --git a/src/main/java/com/gxwebsoft/love/entity/UserPlanPrice.java b/src/main/java/com/gxwebsoft/love/entity/UserPlanPrice.java new file mode 100644 index 0000000..ee311e7 --- /dev/null +++ b/src/main/java/com/gxwebsoft/love/entity/UserPlanPrice.java @@ -0,0 +1,69 @@ +package com.gxwebsoft.love.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.math.BigDecimal; +import java.util.Date; + +/** + * 会员套餐定价表 + * + * @author 科技小王子 + * @since 2023-06-20 18:07:50 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "UserPlanPrice对象", description = "会员套餐定价表") +@TableName("love_user_plan_price") +public class UserPlanPrice 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 planId; + + @ApiModelProperty(value = "项目名称") + private String name; + + @ApiModelProperty(value = "价格") + private BigDecimal price; + + @ApiModelProperty(value = "排序(数字越小越靠前)") + private Integer sortNumber; + + @ApiModelProperty(value = "备注") + private String comments; + + @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 planName; + + @ApiModelProperty(value = "类型 0单身 1婚介 2线下") + @TableField(exist = false) + private Integer type; + + @ApiModelProperty(value = "会员等级") + @TableField(exist = false) + private Integer gradeId; + +} diff --git a/src/main/java/com/gxwebsoft/love/entity/UserProfile.java b/src/main/java/com/gxwebsoft/love/entity/UserProfile.java new file mode 100644 index 0000000..c7baa95 --- /dev/null +++ b/src/main/java/com/gxwebsoft/love/entity/UserProfile.java @@ -0,0 +1,193 @@ +package com.gxwebsoft.love.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.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-06-09 21:42:26 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "UserProfile对象", description = "会员资料表") +@TableName("love_user_profile") +public class UserProfile implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "自增ID") + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + @ApiModelProperty(value = "兴趣爱好") + private String interest; + + @ApiModelProperty(value = "年龄") + @TableField(exist = false) + private Integer age; + + @ApiModelProperty(value = "身高") + private String height; + + @ApiModelProperty(value = "月收入") + private String monthlyPay; + + @ApiModelProperty(value = "年收入") + private String yearlyPay; + + @ApiModelProperty(value = "学历") + private String education; + + @ApiModelProperty(value = "职业") + private String vocation; + + @ApiModelProperty(value = "婚姻状况") + private String maritalStatus; + + @ApiModelProperty(value = "有无小孩") + private String hasChildren; + + @ApiModelProperty(value = "是否要小孩") + private String haveChild; + + @ApiModelProperty(value = "职业") + private String position; + + @ApiModelProperty(value = "体重") + private String weight; + + @ApiModelProperty(value = "体型") + private String shape; + + @ApiModelProperty(value = "是否有车") + private String hasCar; + + @ApiModelProperty(value = "是否有房") + private String hasHouse; + + @ApiModelProperty(value = "何时想结婚") + private String whenMarried; + + @ApiModelProperty(value = "择偶条件-年龄") + private String ageMate; + + @ApiModelProperty(value = "择偶条件-身高") + private String heightMate; + + @ApiModelProperty(value = "择偶条件-月收入") + private String monthlyPayMate; + + @ApiModelProperty(value = "择偶条件-年收入") + private String yearlyPayMate; + + @ApiModelProperty(value = "所在国家") + private String country; + + @ApiModelProperty(value = "所在省份") + private String province; + + @ApiModelProperty(value = "所在城市") + private String city; + + @ApiModelProperty(value = "所在辖区") + private String region; + + @ApiModelProperty(value = "所在地区") + private String area; + + @ApiModelProperty(value = "择偶条件-所在省份") + private String provinceMate; + + @ApiModelProperty(value = "择偶条件-所在城市") + private String cityMate; + + @ApiModelProperty(value = "择偶条件-所在辖区") + private String regionMate; + + @ApiModelProperty(value = "择偶条件-地区") + private String areaMate; + + @ApiModelProperty(value = "择偶条件-学历") + private String educationMate; + + @ApiModelProperty(value = "择偶条件-婚姻状况") + private String maritalStatusMate; + + @ApiModelProperty(value = "择偶条件-有无小孩") + private String hasChildrenMate; + + @ApiModelProperty(value = "择偶条件-是否要小孩") + private String haveChildMate; + + @ApiModelProperty(value = "择偶条件-职业") + private String vocationMate; + + @ApiModelProperty(value = "择偶条件-体重") + private String weightMate; + + @ApiModelProperty(value = "择偶条件-体型") + private String shapeMate; + + @ApiModelProperty(value = "择偶条件-是否吸烟") + private String isSmokingMate; + + @ApiModelProperty(value = "择偶条件-是否喝酒") + private String isDrinkMate; + + @ApiModelProperty(value = "择偶条件-是否有车") + private String hasCarMate; + + @ApiModelProperty(value = "择偶条件-是否有房") + private String hasHouseMate; + + @ApiModelProperty(value = "择偶条件-何时想结婚") + private String whenMarriedMate; + + @ApiModelProperty(value = "是否推荐") + private Integer recommend; + + @ApiModelProperty(value = "图片附件") + private String images; + + @ApiModelProperty(value = "用户ID") + private Integer userId; + + @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 User userInfo; + + @ApiModelProperty(value = "是否关注") + @TableField(exist = false) + private Boolean follow; + + @ApiModelProperty(value = "是否点赞") + @TableField(exist = false) + private Boolean liked; + + @ApiModelProperty(value = "用户所在城市") + @TableField(exist = false) + private String userCity; +} diff --git a/src/main/java/com/gxwebsoft/love/enums/ChatMessageType.java b/src/main/java/com/gxwebsoft/love/enums/ChatMessageType.java new file mode 100644 index 0000000..22aa282 --- /dev/null +++ b/src/main/java/com/gxwebsoft/love/enums/ChatMessageType.java @@ -0,0 +1,25 @@ +package com.gxwebsoft.love.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/src/main/java/com/gxwebsoft/love/mapper/CertificateMapper.java b/src/main/java/com/gxwebsoft/love/mapper/CertificateMapper.java new file mode 100644 index 0000000..f1258e6 --- /dev/null +++ b/src/main/java/com/gxwebsoft/love/mapper/CertificateMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.love.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.love.entity.Certificate; +import com.gxwebsoft.love.param.CertificateParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 证件管理记录表Mapper + * + * @author 科技小王子 + * @since 2023-06-24 11:18:52 + */ +public interface CertificateMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") CertificateParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") CertificateParam param); + +} diff --git a/src/main/java/com/gxwebsoft/love/mapper/ChatConversationMapper.java b/src/main/java/com/gxwebsoft/love/mapper/ChatConversationMapper.java new file mode 100644 index 0000000..85fbe29 --- /dev/null +++ b/src/main/java/com/gxwebsoft/love/mapper/ChatConversationMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.love.mapper; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.yulichang.base.MPJBaseMapper; +import com.gxwebsoft.love.entity.ChatConversation; +import com.gxwebsoft.love.param.ChatConversationParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 聊天消息表Mapper + * + * @author 科技小王子 + * @since 2023-06-15 21:26:48 + */ +public interface ChatConversationMapper extends MPJBaseMapper { + + /** + * 分页查询 + * + * @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/src/main/java/com/gxwebsoft/love/mapper/ChatMessageMapper.java b/src/main/java/com/gxwebsoft/love/mapper/ChatMessageMapper.java new file mode 100644 index 0000000..755add5 --- /dev/null +++ b/src/main/java/com/gxwebsoft/love/mapper/ChatMessageMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.love.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.love.entity.ChatMessage; +import com.gxwebsoft.love.param.ChatMessageParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 聊天消息表Mapper + * + * @author 科技小王子 + * @since 2023-06-10 18:27:25 + */ +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/src/main/java/com/gxwebsoft/love/mapper/ProfitMapper.java b/src/main/java/com/gxwebsoft/love/mapper/ProfitMapper.java new file mode 100644 index 0000000..2007555 --- /dev/null +++ b/src/main/java/com/gxwebsoft/love/mapper/ProfitMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.love.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.love.entity.Profit; +import com.gxwebsoft.love.param.ProfitParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 门店收益明细表Mapper + * + * @author 科技小王子 + * @since 2023-06-28 20:49:17 + */ +public interface ProfitMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") ProfitParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") ProfitParam param); + +} diff --git a/src/main/java/com/gxwebsoft/love/mapper/UserPlanEquityMapper.java b/src/main/java/com/gxwebsoft/love/mapper/UserPlanEquityMapper.java new file mode 100644 index 0000000..a5a16eb --- /dev/null +++ b/src/main/java/com/gxwebsoft/love/mapper/UserPlanEquityMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.love.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.love.entity.UserPlanEquity; +import com.gxwebsoft.love.param.UserPlanEquityParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 会员套餐管理表Mapper + * + * @author 科技小王子 + * @since 2023-06-23 11:34:03 + */ +public interface UserPlanEquityMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") UserPlanEquityParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") UserPlanEquityParam param); + +} diff --git a/src/main/java/com/gxwebsoft/love/mapper/UserPlanIconMapper.java b/src/main/java/com/gxwebsoft/love/mapper/UserPlanIconMapper.java new file mode 100644 index 0000000..9446d09 --- /dev/null +++ b/src/main/java/com/gxwebsoft/love/mapper/UserPlanIconMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.love.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.love.entity.UserPlanIcon; +import com.gxwebsoft.love.param.UserPlanIconParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 会员套餐权益表Mapper + * + * @author 科技小王子 + * @since 2023-06-25 18:09:34 + */ +public interface UserPlanIconMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") UserPlanIconParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") UserPlanIconParam param); + +} diff --git a/src/main/java/com/gxwebsoft/love/mapper/UserPlanLogMapper.java b/src/main/java/com/gxwebsoft/love/mapper/UserPlanLogMapper.java new file mode 100644 index 0000000..54de524 --- /dev/null +++ b/src/main/java/com/gxwebsoft/love/mapper/UserPlanLogMapper.java @@ -0,0 +1,43 @@ +package com.gxwebsoft.love.mapper; + +import com.baomidou.mybatisplus.annotation.InterceptorIgnore; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.love.entity.UserPlanLog; +import com.gxwebsoft.love.param.UserPlanLogParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 会员特权购买记录表Mapper + * + * @author 科技小王子 + * @since 2023-06-20 18:07:50 + */ +public interface UserPlanLogMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") UserPlanLogParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") UserPlanLogParam param); + + @InterceptorIgnore(tenantLine = "true") + List getByOutTradeNo(@Param("param") UserPlanLogParam param); + + @InterceptorIgnore(tenantLine = "true") + void updateByOutTradeNo(@Param("param") UserPlanLog outTradeNo); +} diff --git a/src/main/java/com/gxwebsoft/love/mapper/UserPlanMapper.java b/src/main/java/com/gxwebsoft/love/mapper/UserPlanMapper.java new file mode 100644 index 0000000..d076ee4 --- /dev/null +++ b/src/main/java/com/gxwebsoft/love/mapper/UserPlanMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.love.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.love.entity.UserPlan; +import com.gxwebsoft.love.param.UserPlanParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 会员套餐管理表Mapper + * + * @author 科技小王子 + * @since 2023-06-21 11:21:01 + */ +public interface UserPlanMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") UserPlanParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") UserPlanParam param); + +} diff --git a/src/main/java/com/gxwebsoft/love/mapper/UserPlanPriceMapper.java b/src/main/java/com/gxwebsoft/love/mapper/UserPlanPriceMapper.java new file mode 100644 index 0000000..a40082c --- /dev/null +++ b/src/main/java/com/gxwebsoft/love/mapper/UserPlanPriceMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.love.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.love.entity.UserPlanPrice; +import com.gxwebsoft.love.param.UserPlanPriceParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 会员套餐定价表Mapper + * + * @author 科技小王子 + * @since 2023-06-20 18:07:50 + */ +public interface UserPlanPriceMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") UserPlanPriceParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") UserPlanPriceParam param); + +} diff --git a/src/main/java/com/gxwebsoft/love/mapper/UserProfileMapper.java b/src/main/java/com/gxwebsoft/love/mapper/UserProfileMapper.java new file mode 100644 index 0000000..cb94139 --- /dev/null +++ b/src/main/java/com/gxwebsoft/love/mapper/UserProfileMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.love.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.love.entity.UserProfile; +import com.gxwebsoft.love.param.UserProfileParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 会员资料表Mapper + * + * @author 科技小王子 + * @since 2023-06-09 21:42:26 + */ +public interface UserProfileMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") UserProfileParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") UserProfileParam param); + +} diff --git a/src/main/java/com/gxwebsoft/love/mapper/xml/CertificateMapper.xml b/src/main/java/com/gxwebsoft/love/mapper/xml/CertificateMapper.xml new file mode 100644 index 0000000..5f86af5 --- /dev/null +++ b/src/main/java/com/gxwebsoft/love/mapper/xml/CertificateMapper.xml @@ -0,0 +1,84 @@ + + + + + + + SELECT a.*,b.nickname,b.avatar + FROM love_certificate a + LEFT JOIN sys_user b ON a.user_id = b.user_id + + + AND a.certificate_id = #{param.certificateId} + + + AND a.certificate_name LIKE CONCAT('%', #{param.certificateName}, '%') + + + AND a.full_name LIKE CONCAT('%', #{param.fullName}, '%') + + + AND a.certificate_code LIKE CONCAT('%', #{param.certificateCode}, '%') + + + AND a.certificate_type = #{param.certificateType} + + + AND a.files LIKE CONCAT('%', #{param.files}, '%') + + + AND a.real_name LIKE CONCAT('%', #{param.realName}, '%') + + + AND a.phone LIKE CONCAT('%', #{param.phone}, '%') + + + AND a.expiration_time LIKE CONCAT('%', #{param.expirationTime}, '%') + + + AND a.business_entity LIKE CONCAT('%', #{param.businessEntity}, '%') + + + AND a.college LIKE CONCAT('%', #{param.college}, '%') + + + AND a.comments LIKE CONCAT('%', #{param.comments}, '%') + + + AND a.authentication = #{param.authentication} + + + 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/src/main/java/com/gxwebsoft/love/mapper/xml/ChatConversationMapper.xml b/src/main/java/com/gxwebsoft/love/mapper/xml/ChatConversationMapper.xml new file mode 100644 index 0000000..f688dbd --- /dev/null +++ b/src/main/java/com/gxwebsoft/love/mapper/xml/ChatConversationMapper.xml @@ -0,0 +1,53 @@ + + + + + + + SELECT a.* + FROM love_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.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/src/main/java/com/gxwebsoft/love/mapper/xml/ChatMessageMapper.xml b/src/main/java/com/gxwebsoft/love/mapper/xml/ChatMessageMapper.xml new file mode 100644 index 0000000..a0dcd20 --- /dev/null +++ b/src/main/java/com/gxwebsoft/love/mapper/xml/ChatMessageMapper.xml @@ -0,0 +1,53 @@ + + + + + + + SELECT a.* + FROM love_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 = #{param.type} + + + AND a.content LIKE CONCAT('%', #{param.content}, '%') + + + 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/src/main/java/com/gxwebsoft/love/mapper/xml/ProfitMapper.xml b/src/main/java/com/gxwebsoft/love/mapper/xml/ProfitMapper.xml new file mode 100644 index 0000000..131b972 --- /dev/null +++ b/src/main/java/com/gxwebsoft/love/mapper/xml/ProfitMapper.xml @@ -0,0 +1,83 @@ + + + + + + + SELECT a.*, + b.type,b.money,b.user_id as playerId,b.comments,b.money as orderPrice,b.is_settled,b.type,b.grade_id, + c.nickname as playerNickname,c.avatar as playerAvatar, + d.name as gradeName + FROM love_profit a + LEFT JOIN love_user_plan_log b ON a.log_id = b.log_id AND b.pay_status = 20 + LEFT JOIN sys_user c ON b.user_id = c.user_id + LEFT JOIN shop_user_grade d ON b.grade_id = d.grade_id + + + AND a.profit_id = #{param.profitId} + + + 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.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 d.grade_id >= #{param.gradeStart} + + + AND d.grade_id <= #{param.gradeEnd} + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/love/mapper/xml/UserPlanEquityMapper.xml b/src/main/java/com/gxwebsoft/love/mapper/xml/UserPlanEquityMapper.xml new file mode 100644 index 0000000..193aa31 --- /dev/null +++ b/src/main/java/com/gxwebsoft/love/mapper/xml/UserPlanEquityMapper.xml @@ -0,0 +1,75 @@ + + + + + + + SELECT a.*,b.nickname,b.phone,b.avatar as userAvatar + FROM love_user_plan_equity a + LEFT JOIN sys_user b ON a.user_id = b.user_id + + + AND a.plan_equity_id = #{param.planEquityId} + + + AND a.type = #{param.type} + + + AND a.plan_id = #{param.planId} + + + AND a.plan_name LIKE CONCAT('%', #{param.planName}, '%') + + + AND a.real_name = #{param.realName} + + + AND a.province = #{param.province} + + + AND a.city = #{param.city} + + + AND a.region = #{param.region} + + + AND a.area = #{param.area} + + + AND a.user_id = #{param.userId} + + + AND a.expiration_time LIKE CONCAT('%', #{param.expirationTime}, '%') + + + AND a.sort_number = #{param.sortNumber} + + + AND a.comments LIKE CONCAT('%', #{param.comments}, '%') + + + AND a.create_time >= #{param.createTimeStart} + + + AND a.create_time <= #{param.createTimeEnd} + + + AND ( + b.nickname LIKE CONCAT('%', #{param.keywords}, '%') + OR b.phone LIKE CONCAT('%', #{param.keywords}, '%') + ) + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/love/mapper/xml/UserPlanIconMapper.xml b/src/main/java/com/gxwebsoft/love/mapper/xml/UserPlanIconMapper.xml new file mode 100644 index 0000000..3d2b6da --- /dev/null +++ b/src/main/java/com/gxwebsoft/love/mapper/xml/UserPlanIconMapper.xml @@ -0,0 +1,50 @@ + + + + + + + SELECT a.* + FROM love_user_plan_icon a + + + AND a.id = #{param.id} + + + AND a.plan_id = #{param.planId} + + + AND a.icon LIKE CONCAT('%', #{param.icon}, '%') + + + 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.create_time >= #{param.createTimeStart} + + + AND a.create_time <= #{param.createTimeEnd} + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/love/mapper/xml/UserPlanLogMapper.xml b/src/main/java/com/gxwebsoft/love/mapper/xml/UserPlanLogMapper.xml new file mode 100644 index 0000000..c78889b --- /dev/null +++ b/src/main/java/com/gxwebsoft/love/mapper/xml/UserPlanLogMapper.xml @@ -0,0 +1,77 @@ + + + + + + + SELECT a.*,b.role_id, + b.name as planName,b.icon as planIcon, + c.nickname,c.avatar as userAvatar, + d.dealer_id as dealerId, + e.dealer_id as dealerId2 + FROM love_user_plan_log a + LEFT JOIN love_user_plan b ON a.plan_id = b.plan_id + LEFT JOIN sys_user c ON a.user_id = c.user_id + LEFT JOIN shop_user_referee d ON a.user_id = d.user_id and d.deleted = 0 + LEFT JOIN shop_user_referee e ON d.dealer_id = e.user_id and e.deleted = 0 + + + AND a.log_id = #{param.logId} + + + AND a.log_no LIKE CONCAT('%', #{param.logNo}, '%') + + + AND a.money = #{param.money} + + + AND a.plan_id = #{param.planId} + + + 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/src/main/java/com/gxwebsoft/love/mapper/xml/UserPlanMapper.xml b/src/main/java/com/gxwebsoft/love/mapper/xml/UserPlanMapper.xml new file mode 100644 index 0000000..11aeea9 --- /dev/null +++ b/src/main/java/com/gxwebsoft/love/mapper/xml/UserPlanMapper.xml @@ -0,0 +1,67 @@ + + + + + + + SELECT a.*,b.role_name as roleName,c.name as gradeName + FROM love_user_plan a + LEFT JOIN sys_role b ON a.role_id = b.role_id + LEFT JOIN shop_user_grade c ON a.grade_id = c.grade_id + + + AND a.plan_id = #{param.planId} + + + AND a.type = #{param.type} + + + AND a.name LIKE CONCAT('%', #{param.name}, '%') + + + AND a.sub_name LIKE CONCAT('%', #{param.subName}, '%') + + + AND a.role_id = #{param.roleId} + + + AND a.grade_id = #{param.gradeId} + + + AND a.icon LIKE CONCAT('%', #{param.icon}, '%') + + + 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/src/main/java/com/gxwebsoft/love/mapper/xml/UserPlanPriceMapper.xml b/src/main/java/com/gxwebsoft/love/mapper/xml/UserPlanPriceMapper.xml new file mode 100644 index 0000000..529379e --- /dev/null +++ b/src/main/java/com/gxwebsoft/love/mapper/xml/UserPlanPriceMapper.xml @@ -0,0 +1,51 @@ + + + + + + + SELECT a.*,b.name as planName,b.type,b.grade_id + FROM love_user_plan_price a + LEFT JOIN love_user_plan b ON a.plan_id = b.plan_id + + + AND a.id = #{param.id} + + + AND a.plan_id = #{param.planId} + + + AND a.name LIKE CONCAT('%', #{param.name}, '%') + + + AND a.price = #{param.price} + + + AND a.sort_number = #{param.sortNumber} + + + 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/src/main/java/com/gxwebsoft/love/mapper/xml/UserProfileMapper.xml b/src/main/java/com/gxwebsoft/love/mapper/xml/UserProfileMapper.xml new file mode 100644 index 0000000..870f564 --- /dev/null +++ b/src/main/java/com/gxwebsoft/love/mapper/xml/UserProfileMapper.xml @@ -0,0 +1,190 @@ + + + + + + + SELECT a.*,b.nickname,b.age,b.city as userCity + FROM love_user_profile a + LEFT JOIN sys_user b ON a.user_id = b.user_id + + + + AND a.id = #{param.id} + + + AND a.interest LIKE CONCAT('%', #{param.interest}, '%') + + + AND a.height LIKE CONCAT('%', #{param.height}, '%') + + + AND a.monthly_pay LIKE CONCAT('%', #{param.monthlyPay}, '%') + + + AND a.yearly_pay LIKE CONCAT('%', #{param.yearlyPay}, '%') + + + AND a.education LIKE CONCAT('%', #{param.education}, '%') + + + AND a.vocation LIKE CONCAT('%', #{param.vocation}, '%') + + + AND a.marital_status LIKE CONCAT('%', #{param.maritalStatus}, '%') + + + AND a.has_children LIKE CONCAT('%', #{param.hasChildren}, '%') + + + AND a.have_child LIKE CONCAT('%', #{param.haveChild}, '%') + + + AND a.position LIKE CONCAT('%', #{param.position}, '%') + + + AND a.weight LIKE CONCAT('%', #{param.weight}, '%') + + + AND a.has_car LIKE CONCAT('%', #{param.hasCar}, '%') + + + AND a.when_married LIKE CONCAT('%', #{param.whenMarried}, '%') + + + AND a.age_mate LIKE CONCAT('%', #{param.ageMate}, '%') + + + AND a.height_mate LIKE CONCAT('%', #{param.heightMate}, '%') + + + AND a.monthly_pay_mate LIKE CONCAT('%', #{param.monthlyPayMate}, '%') + + + AND a.yearly_pay_mate LIKE CONCAT('%', #{param.yearlyPayMate}, '%') + + + AND a.region_mate LIKE CONCAT('%', #{param.regionMate}, '%') + + + AND a.country LIKE CONCAT('%', #{param.country}, '%') + + + AND a.province LIKE CONCAT('%', #{param.province}, '%') + + + AND b.city LIKE CONCAT('%', #{param.city}, '%') + + + AND a.region LIKE CONCAT('%', #{param.region}, '%') + + + AND a.area LIKE CONCAT('%', #{param.area}, '%') + + + AND a.province_mate LIKE CONCAT('%', #{param.provinceMate}, '%') + + + AND b.city LIKE CONCAT('%', #{param.cityMate}, '%') + + + AND a.region_mate LIKE CONCAT('%', #{param.regionMate}, '%') + + + AND a.area_mate LIKE CONCAT('%', #{param.areaMate}, '%') + + + AND a.education_mate LIKE CONCAT('%', #{param.educationMate}, '%') + + + AND a.marital_status_mate LIKE CONCAT('%', #{param.maritalStatusMate}, '%') + + + AND a.has_children_mate LIKE CONCAT('%', #{param.hasChildrenMate}, '%') + + + AND a.have_child_mate LIKE CONCAT('%', #{param.haveChildMate}, '%') + + + AND a.vocation_mate LIKE CONCAT('%', #{param.vocationMate}, '%') + + + AND a.weight_mate LIKE CONCAT('%', #{param.weightMate}, '%') + + + AND a.shape_mate LIKE CONCAT('%', #{param.shapeMate}, '%') + + + AND a.is_smoking_mate LIKE CONCAT('%', #{param.isSmokingMate}, '%') + + + AND a.is_drink_mate LIKE CONCAT('%', #{param.isDrinkMate}, '%') + + + AND a.has_car_mate LIKE CONCAT('%', #{param.hasCarMate}, '%') + + + AND a.has_house_mate LIKE CONCAT('%', #{param.hasHouseMate}, '%') + + + AND a.when_married_mate LIKE CONCAT('%', #{param.whenMarriedMate}, '%') + + + AND a.user_id = #{param.userId} + + + AND a.comments LIKE CONCAT('%', #{param.comments}, '%') + + + AND a.create_time >= #{param.createTimeStart} + + + AND a.create_time <= #{param.createTimeEnd} + + + AND b.recommend = 1 + + + AND a.user_id IN + + #{item} + + + + AND a.user_id NOT IN + + #{item} + + + + AND b.sex = #{param.sex} + + + AND a.images != '[]' + + + AND ( + b.nickname LIKE CONCAT('%', #{param.keywords}, '%') + OR a.age_mate = #{param.keywords} + OR a.user_id = #{param.keywords} + OR b.phone = #{param.keywords} + ) + + AND b.deleted = 0 + + + ORDER BY rand() + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/love/param/CertificateParam.java b/src/main/java/com/gxwebsoft/love/param/CertificateParam.java new file mode 100644 index 0000000..e969f54 --- /dev/null +++ b/src/main/java/com/gxwebsoft/love/param/CertificateParam.java @@ -0,0 +1,82 @@ +package com.gxwebsoft.love.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-06-24 11:18:52 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "CertificateParam对象", description = "证件管理记录表查询参数") +public class CertificateParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "证件id") + @QueryField(type = QueryType.EQ) + private Integer certificateId; + + @ApiModelProperty(value = "证件名称") + private String certificateName; + + @ApiModelProperty(value = "证件全称") + private String fullName; + + @ApiModelProperty(value = "证件标识") + private String certificateCode; + + @ApiModelProperty(value = "证件类型") + private String certificateType; + + @ApiModelProperty(value = "证件照片") + private String files; + + @ApiModelProperty(value = "真实姓名") + private String realName; + + @ApiModelProperty(value = "联系电话") + private String phone; + + @ApiModelProperty(value = "证件到期时间") + private String expirationTime; + + @ApiModelProperty(value = "企业法人") + private String businessEntity; + + @ApiModelProperty(value = "毕业院校") + private String college; + + @ApiModelProperty(value = "备注") + private String comments; + + @ApiModelProperty(value = "是否实名认证") + @QueryField(type = QueryType.EQ) + private Integer authentication; + + @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/src/main/java/com/gxwebsoft/love/param/ChatConversationParam.java b/src/main/java/com/gxwebsoft/love/param/ChatConversationParam.java new file mode 100644 index 0000000..e2ebc98 --- /dev/null +++ b/src/main/java/com/gxwebsoft/love/param/ChatConversationParam.java @@ -0,0 +1,56 @@ +package com.gxwebsoft.love.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-06-15 21:26:48 + */ +@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 = "状态, 0未读, 1已读") + @QueryField(type = QueryType.EQ) + private Integer status; + + @ApiModelProperty(value = "是否删除, 0否, 1是") + @QueryField(type = QueryType.EQ) + private Integer deleted; + + @ApiModelProperty(value = "是否只要僵尸, 0否, 1是") + @QueryField(type = QueryType.EQ) + private Boolean onlyFake; + +} diff --git a/src/main/java/com/gxwebsoft/love/param/ChatMessageParam.java b/src/main/java/com/gxwebsoft/love/param/ChatMessageParam.java new file mode 100644 index 0000000..4802343 --- /dev/null +++ b/src/main/java/com/gxwebsoft/love/param/ChatMessageParam.java @@ -0,0 +1,52 @@ +package com.gxwebsoft.love.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-06-10 18:27:25 + */ +@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 = "消息类型") + @QueryField(type = QueryType.EQ) + private String type; + + @ApiModelProperty(value = "消息内容") + private String content; + + @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/src/main/java/com/gxwebsoft/love/param/ProfitParam.java b/src/main/java/com/gxwebsoft/love/param/ProfitParam.java new file mode 100644 index 0000000..048138e --- /dev/null +++ b/src/main/java/com/gxwebsoft/love/param/ProfitParam.java @@ -0,0 +1,82 @@ +package com.gxwebsoft.love.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.math.BigDecimal; + +/** + * 门店收益明细表查询参数 + * + * @author 科技小王子 + * @since 2023-06-28 20:49:17 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "ProfitParam对象", description = "门店收益明细表查询参数") +public class ProfitParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键ID") + @QueryField(type = QueryType.EQ) + private Integer profitId; + + @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; + + @ApiModelProperty(value = "余额变动场景筛选") + private String sceneMultiple; + + @QueryField(value = "grade_id", type = QueryType.GE) + @TableField(exist = false) + @ApiModelProperty("会员等级起始值") + private String gradeStart; + + @QueryField(value = "grade_id", type = QueryType.LE) + @TableField(exist = false) + @ApiModelProperty("会员等级结束值") + private String gradeEnd; + +} diff --git a/src/main/java/com/gxwebsoft/love/param/UserPlanEquityParam.java b/src/main/java/com/gxwebsoft/love/param/UserPlanEquityParam.java new file mode 100644 index 0000000..5a82ffb --- /dev/null +++ b/src/main/java/com/gxwebsoft/love/param/UserPlanEquityParam.java @@ -0,0 +1,72 @@ +package com.gxwebsoft.love.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-06-23 11:34:03 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "UserPlanEquityParam对象", description = "会员套餐管理表查询参数") +public class UserPlanEquityParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "权益ID") + @QueryField(type = QueryType.EQ) + private Integer planEquityId; + + @ApiModelProperty(value = "套餐ID") + @QueryField(type = QueryType.EQ) + private Integer planId; + + @ApiModelProperty(value = "类型 0单身 1婚介") + @QueryField(type = QueryType.EQ) + private Integer type; + + @ApiModelProperty(value = "套餐名称") + private String planName; + + @ApiModelProperty(value = "真实姓名") + private String realName; + + @ApiModelProperty(value = "手机号码") + private String phone; + + @ApiModelProperty(value = "所在省份") + private String province; + + @ApiModelProperty(value = "所在城市") + private String city; + + @ApiModelProperty(value = "所在区县") + private String region; + + @ApiModelProperty(value = "完整地区") + private String area; + + @ApiModelProperty(value = "用户ID") + @QueryField(type = QueryType.EQ) + private Integer userId; + + @ApiModelProperty(value = "到期时间") + private String expirationTime; + + @ApiModelProperty(value = "排序(数字越小越靠前)") + @QueryField(type = QueryType.EQ) + private Integer sortNumber; + + @ApiModelProperty(value = "备注") + private String comments; + +} diff --git a/src/main/java/com/gxwebsoft/love/param/UserPlanIconParam.java b/src/main/java/com/gxwebsoft/love/param/UserPlanIconParam.java new file mode 100644 index 0000000..cd23a9f --- /dev/null +++ b/src/main/java/com/gxwebsoft/love/param/UserPlanIconParam.java @@ -0,0 +1,50 @@ +package com.gxwebsoft.love.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-06-25 18:09:34 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "UserPlanIconParam对象", description = "会员套餐权益表查询参数") +public class UserPlanIconParam 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 planId; + + @ApiModelProperty(value = "图标") + private String icon; + + @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; + +} diff --git a/src/main/java/com/gxwebsoft/love/param/UserPlanLogParam.java b/src/main/java/com/gxwebsoft/love/param/UserPlanLogParam.java new file mode 100644 index 0000000..21c02eb --- /dev/null +++ b/src/main/java/com/gxwebsoft/love/param/UserPlanLogParam.java @@ -0,0 +1,68 @@ +package com.gxwebsoft.love.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-06-20 18:07:50 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "UserPlanLogParam对象", description = "会员特权购买记录表查询参数") +public class UserPlanLogParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "ID") + @QueryField(type = QueryType.EQ) + private Integer logId; + + @ApiModelProperty(value = "订单号") + private String logNo; + + @ApiModelProperty(value = "付款金额") + @QueryField(type = QueryType.EQ) + private BigDecimal money; + + @ApiModelProperty(value = "套餐ID") + @QueryField(type = QueryType.EQ) + private Integer planId; + + @ApiModelProperty(value = "会员等级ID") + @QueryField(type = QueryType.EQ) + private Integer gradeId; + + @ApiModelProperty(value = "门店ID") + private Integer merchantId; + + @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/src/main/java/com/gxwebsoft/love/param/UserPlanParam.java b/src/main/java/com/gxwebsoft/love/param/UserPlanParam.java new file mode 100644 index 0000000..df8da75 --- /dev/null +++ b/src/main/java/com/gxwebsoft/love/param/UserPlanParam.java @@ -0,0 +1,69 @@ +package com.gxwebsoft.love.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-06-21 11:21:01 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "UserPlanParam对象", description = "会员套餐管理表查询参数") +public class UserPlanParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "套餐ID") + @QueryField(type = QueryType.EQ) + private Integer planId; + + @ApiModelProperty(value = "类型 0单身 1婚介") + @QueryField(type = QueryType.EQ) + private Integer type; + + @ApiModelProperty(value = "套餐名称") + private String name; + + @ApiModelProperty(value = "副标题") + private String subName; + + @ApiModelProperty(value = "会员身份ID") + @QueryField(type = QueryType.EQ) + private Integer roleId; + + @ApiModelProperty(value = "会员等级ID") + @QueryField(type = QueryType.EQ) + private String gradeId; + + @ApiModelProperty(value = "图标") + private String icon; + + @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 = "当前登录用户ID") + @QueryField(type = QueryType.EQ) + private Integer loginUserId; + +} diff --git a/src/main/java/com/gxwebsoft/love/param/UserPlanPriceParam.java b/src/main/java/com/gxwebsoft/love/param/UserPlanPriceParam.java new file mode 100644 index 0000000..3988505 --- /dev/null +++ b/src/main/java/com/gxwebsoft/love/param/UserPlanPriceParam.java @@ -0,0 +1,53 @@ +package com.gxwebsoft.love.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-06-20 18:07:50 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "UserPlanPriceParam对象", description = "会员套餐定价表查询参数") +public class UserPlanPriceParam 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 planId; + + @ApiModelProperty(value = "项目名称") + private String name; + + @ApiModelProperty(value = "价格") + @QueryField(type = QueryType.EQ) + private BigDecimal price; + + @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; + +} diff --git a/src/main/java/com/gxwebsoft/love/param/UserProfileParam.java b/src/main/java/com/gxwebsoft/love/param/UserProfileParam.java new file mode 100644 index 0000000..ac3c868 --- /dev/null +++ b/src/main/java/com/gxwebsoft/love/param/UserProfileParam.java @@ -0,0 +1,193 @@ +package com.gxwebsoft.love.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.Collection; +import java.util.Set; + +/** + * 会员资料表查询参数 + * + * @author 科技小王子 + * @since 2023-06-09 21:42:26 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "UserProfileParam对象", description = "会员资料表查询参数") +public class UserProfileParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "自增ID") + @QueryField(type = QueryType.EQ) + private Integer id; + + @ApiModelProperty(value = "兴趣爱好") + private String interest; + + @ApiModelProperty(value = "年龄") + @TableField(exist = false) + private String age; + + @ApiModelProperty(value = "身高") + private String height; + + @ApiModelProperty(value = "月收入") + private String monthlyPay; + + @ApiModelProperty(value = "年收入") + private String yearlyPay; + + @ApiModelProperty(value = "学历") + private String education; + + @ApiModelProperty(value = "职业") + private String vocation; + + @ApiModelProperty(value = "婚姻状况") + private String maritalStatus; + + @ApiModelProperty(value = "有无小孩") + private String hasChildren; + + @ApiModelProperty(value = "是否要小孩") + private String haveChild; + + @ApiModelProperty(value = "职业") + private String position; + + @ApiModelProperty(value = "体重") + private String weight; + + @ApiModelProperty(value = "是否有房有车") + private String hasCar; + + @ApiModelProperty(value = "何时想结婚") + private String whenMarried; + + @ApiModelProperty(value = "择偶条件-年龄") + private String ageMate; + + @ApiModelProperty(value = "择偶条件-身高") + private String heightMate; + + @ApiModelProperty(value = "择偶条件-月收入") + private String monthlyPayMate; + + @ApiModelProperty(value = "择偶条件-年收入") + private String yearlyPayMate; + + @ApiModelProperty(value = "所在国家") + private String country; + + @ApiModelProperty(value = "所在省份") + private String province; + + @ApiModelProperty(value = "所在城市") + private String city; + + @ApiModelProperty(value = "所在辖区") + private String region; + + @ApiModelProperty(value = "所在地区") + private String area; + + @ApiModelProperty(value = "择偶条件-所在省份") + private String provinceMate; + + @ApiModelProperty(value = "择偶条件-所在城市") + private String cityMate; + + @ApiModelProperty(value = "择偶条件-所在辖区") + private String regionMate; + + @ApiModelProperty(value = "择偶条件-地区") + private String areaMate; + + @ApiModelProperty(value = "择偶条件-学历") + private String educationMate; + + @ApiModelProperty(value = "择偶条件-婚姻状况") + private String maritalStatusMate; + + @ApiModelProperty(value = "择偶条件-有无小孩") + private String hasChildrenMate; + + @ApiModelProperty(value = "择偶条件-是否要小孩") + private String haveChildMate; + + @ApiModelProperty(value = "择偶条件-职业") + private String vocationMate; + + @ApiModelProperty(value = "择偶条件-体重") + private String weightMate; + + @ApiModelProperty(value = "择偶条件-体型") + private String shapeMate; + + @ApiModelProperty(value = "择偶条件-是否吸烟") + private String isSmokingMate; + + @ApiModelProperty(value = "择偶条件-是否喝酒") + private String isDrinkMate; + + @ApiModelProperty(value = "择偶条件-是否有车") + private String hasCarMate; + + @ApiModelProperty(value = "择偶条件-是否有房") + private String hasHouseMate; + + @ApiModelProperty(value = "择偶条件-何时想结婚") + private String whenMarriedMate; + + @ApiModelProperty(value = "是否推荐") + @QueryField(type = QueryType.EQ) + private Boolean recommend; + + @ApiModelProperty(value = "用户ID") + @QueryField(type = QueryType.EQ) + private Integer userId; + + @ApiModelProperty(value = "备注") + private String comments; + + @ApiModelProperty(value = "场景") + @TableField(exist = false) + private String scene; + + @ApiModelProperty(value = "是否查询关注状态") + @TableField(exist = false) + private Boolean showFollow; + + @ApiModelProperty(value = "当前登录用户ID") + @TableField(exist = false) + private Integer loginUserId; + + @ApiModelProperty("性别, 字典标识") + private String sex; + + @ApiModelProperty(value = "用户id集合") + @TableField(exist = false) + private Collection userIds; + + @ApiModelProperty(value = "排除用户id集合") + @TableField(exist = false) + private Collection nUserIds; + + @ApiModelProperty(value = "随机读取") + @TableField(exist = false) + private boolean random; + + @ApiModelProperty(value = "读取相册") + @TableField(exist = false) + private boolean albums; + +} diff --git a/src/main/java/com/gxwebsoft/love/service/CertificateService.java b/src/main/java/com/gxwebsoft/love/service/CertificateService.java new file mode 100644 index 0000000..a1ef22e --- /dev/null +++ b/src/main/java/com/gxwebsoft/love/service/CertificateService.java @@ -0,0 +1,51 @@ +package com.gxwebsoft.love.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.love.entity.Certificate; +import com.gxwebsoft.love.param.CertificateParam; +import com.gxwebsoft.love.vo.idcheck.BackRecognitionResult; +import com.gxwebsoft.love.vo.idcheck.FrontRecognitionResult; +import com.gxwebsoft.love.vo.idcheck.Response; + +import java.util.List; + +/** + * 证件管理记录表Service + * + * @author 科技小王子 + * @since 2023-06-24 11:18:52 + */ +public interface CertificateService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(CertificateParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(CertificateParam param); + + /** + * 根据id查询 + * + * @param certificateId 证件id + * @return Certificate + */ + Certificate getByIdRel(Integer certificateId); + + boolean verifyIdcard(Certificate param, List files); + + Response idcardfrontrecongnition(String imageUrl); + + Response idcardbackrecongnition(String imageUrl); + +} diff --git a/src/main/java/com/gxwebsoft/love/service/ChatConversationService.java b/src/main/java/com/gxwebsoft/love/service/ChatConversationService.java new file mode 100644 index 0000000..c357400 --- /dev/null +++ b/src/main/java/com/gxwebsoft/love/service/ChatConversationService.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.love.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.love.entity.ChatConversation; +import com.gxwebsoft.love.param.ChatConversationParam; +import com.gxwebsoft.love.vo.ChatConversationVO; + +import java.util.List; + +/** + * 聊天消息表Service + * + * @author 科技小王子 + * @since 2023-06-15 21:26:48 + */ +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); + + ChatConversation getByBothId(Integer formUserId, Integer toUserId); + + List getFriendList(ChatConversationParam param); + +} diff --git a/src/main/java/com/gxwebsoft/love/service/ChatMessageService.java b/src/main/java/com/gxwebsoft/love/service/ChatMessageService.java new file mode 100644 index 0000000..77cc0ca --- /dev/null +++ b/src/main/java/com/gxwebsoft/love/service/ChatMessageService.java @@ -0,0 +1,48 @@ +package com.gxwebsoft.love.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.love.entity.ChatMessage; +import com.gxwebsoft.love.param.ChatMessageParam; + +import java.util.List; + +/** + * 聊天消息表Service + * + * @author 科技小王子 + * @since 2023-06-10 18:27:25 + */ +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); + + List getUnreadMessage(Integer fromUserId, Integer toUserId); + + boolean sendMessage(ChatMessage message); + + List getFriendMessage(Integer userId1, Integer userId2); + +} diff --git a/src/main/java/com/gxwebsoft/love/service/ProfitService.java b/src/main/java/com/gxwebsoft/love/service/ProfitService.java new file mode 100644 index 0000000..bb071ce --- /dev/null +++ b/src/main/java/com/gxwebsoft/love/service/ProfitService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.love.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.love.entity.Profit; +import com.gxwebsoft.love.param.ProfitParam; + +import java.util.List; + +/** + * 门店收益明细表Service + * + * @author 科技小王子 + * @since 2023-06-28 20:49:17 + */ +public interface ProfitService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(ProfitParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(ProfitParam param); + + /** + * 根据id查询 + * + * @param profitId 主键ID + * @return Profit + */ + Profit getByIdRel(Integer profitId); + +} diff --git a/src/main/java/com/gxwebsoft/love/service/UserPlanEquityService.java b/src/main/java/com/gxwebsoft/love/service/UserPlanEquityService.java new file mode 100644 index 0000000..5df3aa9 --- /dev/null +++ b/src/main/java/com/gxwebsoft/love/service/UserPlanEquityService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.love.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.love.entity.UserPlanEquity; +import com.gxwebsoft.love.param.UserPlanEquityParam; + +import java.util.List; + +/** + * 会员套餐管理表Service + * + * @author 科技小王子 + * @since 2023-06-23 11:34:03 + */ +public interface UserPlanEquityService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(UserPlanEquityParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(UserPlanEquityParam param); + + /** + * 根据id查询 + * + * @param planEquityId 权益ID + * @return UserPlanEquity + */ + UserPlanEquity getByIdRel(Integer planEquityId); + +} diff --git a/src/main/java/com/gxwebsoft/love/service/UserPlanIconService.java b/src/main/java/com/gxwebsoft/love/service/UserPlanIconService.java new file mode 100644 index 0000000..14a5edb --- /dev/null +++ b/src/main/java/com/gxwebsoft/love/service/UserPlanIconService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.love.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.love.entity.UserPlanIcon; +import com.gxwebsoft.love.param.UserPlanIconParam; + +import java.util.List; + +/** + * 会员套餐权益表Service + * + * @author 科技小王子 + * @since 2023-06-25 18:09:34 + */ +public interface UserPlanIconService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(UserPlanIconParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(UserPlanIconParam param); + + /** + * 根据id查询 + * + * @param id ID + * @return UserPlanIcon + */ + UserPlanIcon getByIdRel(Integer id); + +} diff --git a/src/main/java/com/gxwebsoft/love/service/UserPlanLogService.java b/src/main/java/com/gxwebsoft/love/service/UserPlanLogService.java new file mode 100644 index 0000000..7ff8bd6 --- /dev/null +++ b/src/main/java/com/gxwebsoft/love/service/UserPlanLogService.java @@ -0,0 +1,46 @@ +package com.gxwebsoft.love.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.love.entity.UserPlanLog; +import com.gxwebsoft.love.param.UserPlanLogParam; + +import java.util.List; + +/** + * 会员特权购买记录表Service + * + * @author 科技小王子 + * @since 2023-06-20 18:07:50 + */ +public interface UserPlanLogService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(UserPlanLogParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(UserPlanLogParam param); + + /** + * 根据id查询 + * + * @param logId ID + * @return UserPlanLog + */ + UserPlanLog getByIdRel(Integer logId); + + UserPlanLog getByOutTradeNo(String OutTradeNo); + + void updateByOutTradeNo(UserPlanLog log); + +} diff --git a/src/main/java/com/gxwebsoft/love/service/UserPlanPriceService.java b/src/main/java/com/gxwebsoft/love/service/UserPlanPriceService.java new file mode 100644 index 0000000..93577e8 --- /dev/null +++ b/src/main/java/com/gxwebsoft/love/service/UserPlanPriceService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.love.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.love.entity.UserPlanPrice; +import com.gxwebsoft.love.param.UserPlanPriceParam; + +import java.util.List; + +/** + * 会员套餐定价表Service + * + * @author 科技小王子 + * @since 2023-06-20 18:07:50 + */ +public interface UserPlanPriceService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(UserPlanPriceParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(UserPlanPriceParam param); + + /** + * 根据id查询 + * + * @param id ID + * @return UserPlanPrice + */ + UserPlanPrice getByIdRel(Integer id); + +} diff --git a/src/main/java/com/gxwebsoft/love/service/UserPlanService.java b/src/main/java/com/gxwebsoft/love/service/UserPlanService.java new file mode 100644 index 0000000..9e075ac --- /dev/null +++ b/src/main/java/com/gxwebsoft/love/service/UserPlanService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.love.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.love.entity.UserPlan; +import com.gxwebsoft.love.param.UserPlanParam; + +import java.util.List; + +/** + * 会员套餐管理表Service + * + * @author 科技小王子 + * @since 2023-06-21 11:21:01 + */ +public interface UserPlanService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(UserPlanParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(UserPlanParam param); + + /** + * 根据id查询 + * + * @param planId 套餐ID + * @return UserPlan + */ + UserPlan getByIdRel(Integer planId); + +} diff --git a/src/main/java/com/gxwebsoft/love/service/UserProfileService.java b/src/main/java/com/gxwebsoft/love/service/UserProfileService.java new file mode 100644 index 0000000..1554f72 --- /dev/null +++ b/src/main/java/com/gxwebsoft/love/service/UserProfileService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.love.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.love.entity.UserProfile; +import com.gxwebsoft.love.param.UserProfileParam; + +import java.util.List; + +/** + * 会员资料表Service + * + * @author 科技小王子 + * @since 2023-06-09 21:42:26 + */ +public interface UserProfileService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(UserProfileParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(UserProfileParam param); + + /** + * 根据id查询 + * + * @param id 自增ID + * @return UserProfile + */ + UserProfile getByIdRel(Integer id); + +} diff --git a/src/main/java/com/gxwebsoft/love/service/impl/CertificateServiceImpl.java b/src/main/java/com/gxwebsoft/love/service/impl/CertificateServiceImpl.java new file mode 100644 index 0000000..2f16e8e --- /dev/null +++ b/src/main/java/com/gxwebsoft/love/service/impl/CertificateServiceImpl.java @@ -0,0 +1,158 @@ +package com.gxwebsoft.love.service.impl; + +import cn.hutool.core.exceptions.ExceptionUtil; +import com.alibaba.fastjson2.JSONObject; +import com.alibaba.fastjson2.TypeReference; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.common.core.utils.HttpUtils; +import com.gxwebsoft.common.core.utils.ImageUtil; +import com.gxwebsoft.common.core.web.PageParam; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.love.entity.Certificate; +import com.gxwebsoft.love.mapper.CertificateMapper; +import com.gxwebsoft.love.param.CertificateParam; +import com.gxwebsoft.love.service.CertificateService; +import com.gxwebsoft.love.vo.idcheck.BackRecognitionResult; +import com.gxwebsoft.love.vo.idcheck.FrontRecognitionResult; +import com.gxwebsoft.love.vo.idcheck.Response; +import org.apache.http.HttpEntity; +import org.apache.http.HttpResponse; +import org.apache.http.util.EntityUtils; +import org.springframework.stereotype.Service; +import org.springframework.web.client.RestTemplate; + +import javax.annotation.Resource; +import java.time.LocalDateTime; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * 证件管理记录表Service实现 + * + * @author 科技小王子 + * @since 2023-06-24 11:18:52 + */ +@Service +public class CertificateServiceImpl extends ServiceImpl implements CertificateService { + + @Resource + private RestTemplate restTemplate; + + private String appcode = "566b5786c5874464909d8c0b7f64cdc7"; + + @Override + public PageResult pageRel(CertificateParam 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(CertificateParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + //page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public Certificate getByIdRel(Integer certificateId) { + CertificateParam param = new CertificateParam(); + param.setCertificateId(certificateId); + return param.getOne(baseMapper.selectListRel(param)); + } + + @Override + public boolean verifyIdcard(Certificate param, List files) { + // 验证正面 + Response front = idcardfrontrecongnition(files.get(0)); + if(front.getError_code() != 0){ + ExceptionUtil.wrapAndThrow(new Exception(front.getReason())); + return false; + } + + + // 验证反面 + Response back = idcardbackrecongnition(files.get(1)); + if(back.getError_code() != 0){ + ExceptionUtil.wrapAndThrow(new Exception(back.getReason())); + return false; + } + + // 信息是否一致 + if(!param.getCertificateCode().equals(front.getResult().getIdcardno())){ + return false; + } + if(!param.getRealName().equals(front.getResult().getName())){ + return false; + } + boolean b = LocalDateTime.parse(back.getResult().getEndDate()).compareTo(LocalDateTime.now()) > 0; + return b; + } + + @Override + public Response idcardfrontrecongnition(String imageUrl) { + + String host = "https://zidv2.market.alicloudapi.com"; + String path = "/thirdnode/ImageAI/idcardfrontrecongnition"; + String method = "POST"; + 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("base64Str", ImageUtil.ImageBase64(imageUrl)); + + + try { + HttpResponse response = HttpUtils.doPost(host, path, method, headers, querys, bodys); + HttpEntity entity = response.getEntity(); + String string = EntityUtils.toString(entity); + Response o = JSONObject.parseObject(string, new TypeReference>() { + }); + + return o; + } catch (Exception e) { + e.printStackTrace(); + } + + return null; + } + + @Override + public Response idcardbackrecongnition(String imageUrl) { + + String host = "https://zidv2.market.alicloudapi.com"; + String path = "/thirdnode/ImageAI/idcardbackrecongnition"; + String method = "POST"; + 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("base64Str", ImageUtil.ImageBase64(imageUrl)); + + + try { + HttpResponse response = HttpUtils.doPost(host, path, method, headers, querys, bodys); + HttpEntity entity = response.getEntity(); + String string = EntityUtils.toString(entity); + Response o = JSONObject.parseObject(string, new TypeReference>() { + }); + + return o; + } catch (Exception e) { + e.printStackTrace(); + } + + return null; + } + +} diff --git a/src/main/java/com/gxwebsoft/love/service/impl/ChatConversationServiceImpl.java b/src/main/java/com/gxwebsoft/love/service/impl/ChatConversationServiceImpl.java new file mode 100644 index 0000000..3fa53e3 --- /dev/null +++ b/src/main/java/com/gxwebsoft/love/service/impl/ChatConversationServiceImpl.java @@ -0,0 +1,124 @@ +package com.gxwebsoft.love.service.impl; + +import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.yulichang.toolkit.JoinWrappers; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +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.UserService; +import com.gxwebsoft.love.entity.ChatConversation; +import com.gxwebsoft.love.entity.ChatMessage; +import com.gxwebsoft.love.mapper.ChatConversationMapper; +import com.gxwebsoft.love.param.ChatConversationParam; +import com.gxwebsoft.love.service.ChatConversationService; +import com.gxwebsoft.love.vo.ChatConversationVO; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 聊天消息表Service实现 + * + * @author 科技小王子 + * @since 2023-06-15 21:26:48 + */ +@Service +public class ChatConversationServiceImpl extends ServiceImpl implements ChatConversationService { + + @Resource + private UserService userService; + + + @Override + public PageResult pageRel(ChatConversationParam param) { + + MPJLambdaWrapper wrapper = JoinWrappers.lambda("t",ChatConversation.class) + .selectAll(ChatConversation.class) + // 查询用户 +// .eq(ObjectUtils.isNotEmpty(param.getUserId()), ChatConversation::getUserId, param.getUserId()) + .and(ObjectUtils.isNotEmpty(param.getUserId()), w2-> { + w2.eq(ChatConversation::getUserId, param.getUserId()).or(w3->{ + w3.eq(ChatConversation::getFriendId, param.getUserId()); + }); + } ) + // 查询未读 + .gt(param.getStatus()!= null &¶m.getStatus() == 1, ChatConversation::getUnRead, 0) + // + .selectAssociation("t1",User.class, ChatConversationVO::getFriendInfo) + .selectAssociation("t2",User.class, ChatConversationVO::getUserInfo) + .innerJoin(User.class,"t1", User::getUserId, ChatConversation::getFriendId) + .innerJoin(User.class, "t2", wrapper1 -> wrapper1.notLike(param.getOnlyFake(),User::getUsername, "%wx_").eq(User::getUserId, ChatConversation::getUserId)) + // 消息列表 影响分页 暂时无解User::getUserId, ChatConversation::getUserId, +// .selectCollection(ChatMessage.class, ChatConversationVO::getMessages) +// .leftJoin(ChatMessage.class, on -> +// on.and(w -> { +// w.eq(ChatMessage::getFormUserId, ChatConversation::getUserId).eq(ChatMessage::getToUserId, ChatConversation::getFriendId); +// }) +// .or(w -> { +// w.eq(ChatMessage::getFormUserId, ChatConversation::getFriendId).eq(ChatMessage::getToUserId, ChatConversation::getUserId); +// }) +// .orderByDesc(ChatMessage::getCreateTime) +// ) + + .orderByAsc(ChatConversation::getUserId) + .orderByDesc(ChatConversation::getUpdateTime); + + + Page chatConversationVOPage = baseMapper.selectJoinPage(new Page<>(param.getPage(), param.getLimit()), ChatConversationVO.class, wrapper); + + return new PageResult<>(chatConversationVOPage.getRecords(), chatConversationVOPage.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)); + } + + @Override + public ChatConversation getByBothId(Integer formUserId, Integer toUserId) { + ChatConversationParam param = new ChatConversationParam(); + param.setUserId(formUserId); + param.setFriendId(toUserId); + return param.getOne(baseMapper.selectListRel(param)); + } + + @Override + public List getFriendList(ChatConversationParam param) { + MPJLambdaWrapper wrapper = JoinWrappers.lambda(ChatConversation.class) + .selectAll(ChatConversation.class) + .eq(ChatConversation::getUserId, param.getUserId()) + .selectAssociation(User.class, ChatConversationVO::getFriendInfo) + .leftJoin(User.class, User::getUserId, ChatConversation::getFriendId) + .selectCollection(ChatMessage.class, ChatConversationVO::getMessages) + .leftJoin(ChatMessage.class, on -> + on.and(w -> { + w.eq(ChatMessage::getFormUserId, param.getUserId()).eq(ChatMessage::getToUserId, ChatConversation::getFriendId); + }) + .or(w -> { + w.eq(ChatMessage::getFormUserId, ChatConversation::getFriendId).eq(ChatMessage::getToUserId, param.getUserId()); + }) + .orderByDesc(ChatMessage::getCreateTime) + ) + .orderByDesc(ChatConversation::getUpdateTime); + + + return baseMapper.selectJoinList(ChatConversationVO.class, wrapper); + } + +} diff --git a/src/main/java/com/gxwebsoft/love/service/impl/ChatMessageServiceImpl.java b/src/main/java/com/gxwebsoft/love/service/impl/ChatMessageServiceImpl.java new file mode 100644 index 0000000..5f2d5b1 --- /dev/null +++ b/src/main/java/com/gxwebsoft/love/service/impl/ChatMessageServiceImpl.java @@ -0,0 +1,153 @@ +package com.gxwebsoft.love.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +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.common.system.service.UserService; +import com.gxwebsoft.love.entity.ChatConversation; +import com.gxwebsoft.love.entity.ChatMessage; +import com.gxwebsoft.love.enums.ChatMessageType; +import com.gxwebsoft.love.mapper.ChatMessageMapper; +import com.gxwebsoft.love.param.ChatMessageParam; +import com.gxwebsoft.love.service.ChatConversationService; +import com.gxwebsoft.love.service.ChatMessageService; +import com.gxwebsoft.love.socketio.cache.ClientCache; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; + +/** + * 聊天消息表Service实现 + * + * @author 科技小王子 + * @since 2023-06-10 18:27:25 + */ +@Service +public class ChatMessageServiceImpl extends ServiceImpl implements ChatMessageService { + + @Resource + private ChatConversationService conversationService; + + @Resource + private ClientCache clientCache; + + @Resource + private UserService userService; + + @Override + public PageResult pageRel(ChatMessageParam param) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.and(w->{ w.eq(ChatMessage::getFormUserId, param.getToUserId()).eq(ChatMessage::getToUserId,param.getFormUserId()); }) + .or(w->{ w.eq(ChatMessage::getFormUserId, param.getFormUserId()).eq(ChatMessage::getToUserId,param.getToUserId());}) + .orderByAsc(ChatMessage::getCreateTime); + + Page chatMessagePage = new Page<>(param.getPage(), param.getLimit()); + Page result = baseMapper.selectPage(chatMessagePage, wrapper); + List list = result.getRecords(); + Set userIds = new HashSet<>(); + if(param.getFormUserId() != null && param.getToUserId() != null){ + userIds.add(param.getToUserId()); + userIds.add(param.getFormUserId()); + }else { + list.stream().forEach(d->{ + userIds.add(d.getToUserId()); + userIds.add(d.getFormUserId()); + }); + } + List users = userService.list(Wrappers.lambdaQuery(User.class).in(User::getUserId, userIds)); + Map> collect = users.stream().collect(Collectors.groupingBy(User::getUserId)); + list.stream().forEach(d->{ + d.setFormUserInfo(collect.get(d.getFormUserId()).get(0)); + }); + return new PageResult<>(list, result.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)); + } + + @Override + public List getUnreadMessage(Integer fromUserId, Integer toUserId) { + return null; + } + + @Override + @Transactional + public boolean sendMessage(ChatMessage message) { + Integer userId = message.getFormUserId(); + Integer toUserId = message.getToUserId(); + + User toUser = userService.getById(toUserId); + message.setToUserInfo(toUser); + // 判断双方是否是好友（有消息记录），没有就添加两条记录 后续可以做拉黑什么的处理 + ChatConversation conversation1 = conversationService.getByBothId(userId, toUserId); + ChatConversation conversation2 = conversationService.getByBothId(toUserId, userId); + if(conversation1 == null){ + conversation1 = new ChatConversation(); + conversation1.setUserId(Integer.valueOf(userId)); + conversation1.setFriendId(toUserId); + } + if(conversation2 == null){ + conversation2 = new ChatConversation(); + conversation2.setUserId(toUserId); + conversation2.setFriendId(Integer.valueOf(userId)); + } + String lastContent; + if(ChatMessageType.IMAGE.getName().equals(message.getType())){ + lastContent = "[图片]"; + } else if (ChatMessageType.VOICE.getName().equals(message.getType())) { + lastContent = "[语音]"; + }else if (ChatMessageType.CARD.getName().equals(message.getType())) { + lastContent = "[卡片]"; + }else { + lastContent = message.getContent(); + } + conversation1.setContent(lastContent); + //未读+1 + conversation2.setUnRead(conversation2.getUnRead() + 1); + conversation2.setContent(lastContent); + + // 发送到接收方 + clientCache.sendUserEvent(message.getToUserId() + "", "message", message); + // 发送到管理员 + clientCache.sendUserEvent("admin", "message", message); + + this.save(message); + conversationService.saveOrUpdate(conversation1); + conversationService.saveOrUpdate(conversation2); + return true; + } + + @Override + public List getFriendMessage(Integer userId1, Integer userId2) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.and(w->{ w.eq(ChatMessage::getFormUserId, userId1).eq(ChatMessage::getToUserId,userId2); }) + .or(w->{ w.eq(ChatMessage::getFormUserId, userId2).eq(ChatMessage::getToUserId,userId1);}) + .orderByAsc(ChatMessage::getCreateTime); + + return baseMapper.selectList(wrapper); + } + +} diff --git a/src/main/java/com/gxwebsoft/love/service/impl/ProfitServiceImpl.java b/src/main/java/com/gxwebsoft/love/service/impl/ProfitServiceImpl.java new file mode 100644 index 0000000..6c82733 --- /dev/null +++ b/src/main/java/com/gxwebsoft/love/service/impl/ProfitServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.love.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.love.mapper.ProfitMapper; +import com.gxwebsoft.love.service.ProfitService; +import com.gxwebsoft.love.entity.Profit; +import com.gxwebsoft.love.param.ProfitParam; +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-06-28 20:49:17 + */ +@Service +public class ProfitServiceImpl extends ServiceImpl implements ProfitService { + + @Override + public PageResult pageRel(ProfitParam 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(ProfitParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public Profit getByIdRel(Integer profitId) { + ProfitParam param = new ProfitParam(); + param.setProfitId(profitId); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/love/service/impl/UserPlanEquityServiceImpl.java b/src/main/java/com/gxwebsoft/love/service/impl/UserPlanEquityServiceImpl.java new file mode 100644 index 0000000..776dc1e --- /dev/null +++ b/src/main/java/com/gxwebsoft/love/service/impl/UserPlanEquityServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.love.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.love.entity.UserPlanEquity; +import com.gxwebsoft.love.mapper.UserPlanEquityMapper; +import com.gxwebsoft.love.param.UserPlanEquityParam; +import com.gxwebsoft.love.service.UserPlanEquityService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 会员套餐管理表Service实现 + * + * @author 科技小王子 + * @since 2023-06-23 11:34:03 + */ +@Service +public class UserPlanEquityServiceImpl extends ServiceImpl implements UserPlanEquityService { + + @Override + public PageResult pageRel(UserPlanEquityParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("plan_id desc,create_time desc"); + List list = baseMapper.selectPageRel(page, param); + return new PageResult<>(list, page.getTotal()); + } + + @Override + public List listRel(UserPlanEquityParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + page.setDefaultOrder("plan_id desc,create_time desc"); + return page.sortRecords(list); + } + + @Override + public UserPlanEquity getByIdRel(Integer planEquityId) { + UserPlanEquityParam param = new UserPlanEquityParam(); + param.setPlanEquityId(planEquityId); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/love/service/impl/UserPlanIconServiceImpl.java b/src/main/java/com/gxwebsoft/love/service/impl/UserPlanIconServiceImpl.java new file mode 100644 index 0000000..9d5db34 --- /dev/null +++ b/src/main/java/com/gxwebsoft/love/service/impl/UserPlanIconServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.love.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.love.mapper.UserPlanIconMapper; +import com.gxwebsoft.love.service.UserPlanIconService; +import com.gxwebsoft.love.entity.UserPlanIcon; +import com.gxwebsoft.love.param.UserPlanIconParam; +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-06-25 18:09:34 + */ +@Service +public class UserPlanIconServiceImpl extends ServiceImpl implements UserPlanIconService { + + @Override + public PageResult pageRel(UserPlanIconParam 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(UserPlanIconParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + //page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public UserPlanIcon getByIdRel(Integer id) { + UserPlanIconParam param = new UserPlanIconParam(); + param.setId(id); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/love/service/impl/UserPlanLogServiceImpl.java b/src/main/java/com/gxwebsoft/love/service/impl/UserPlanLogServiceImpl.java new file mode 100644 index 0000000..7377d9a --- /dev/null +++ b/src/main/java/com/gxwebsoft/love/service/impl/UserPlanLogServiceImpl.java @@ -0,0 +1,66 @@ +package com.gxwebsoft.love.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.love.mapper.UserPlanLogMapper; +import com.gxwebsoft.love.service.UserPlanLogService; +import com.gxwebsoft.love.entity.UserPlanLog; +import com.gxwebsoft.love.param.UserPlanLogParam; +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-06-20 18:07:50 + */ +@Service +public class UserPlanLogServiceImpl extends ServiceImpl implements UserPlanLogService { + + @Override + public PageResult pageRel(UserPlanLogParam 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(UserPlanLogParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public UserPlanLog getByIdRel(Integer logId) { + UserPlanLogParam param = new UserPlanLogParam(); + param.setLogId(logId); + return param.getOne(baseMapper.selectListRel(param)); + } + + /** + * 按订充值单号查询 + */ + @Override + public UserPlanLog getByOutTradeNo(String OutTradeNo) { + UserPlanLogParam param = new UserPlanLogParam(); + param.setLogNo(OutTradeNo); + return param.getOne(baseMapper.getByOutTradeNo(param)); + } + + /** + * 支付成功 更新充值订单状态 + */ + @Override + public void updateByOutTradeNo(UserPlanLog OutTradeNo) { + baseMapper.updateByOutTradeNo(OutTradeNo); + } + +} diff --git a/src/main/java/com/gxwebsoft/love/service/impl/UserPlanPriceServiceImpl.java b/src/main/java/com/gxwebsoft/love/service/impl/UserPlanPriceServiceImpl.java new file mode 100644 index 0000000..64f32f6 --- /dev/null +++ b/src/main/java/com/gxwebsoft/love/service/impl/UserPlanPriceServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.love.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.love.mapper.UserPlanPriceMapper; +import com.gxwebsoft.love.service.UserPlanPriceService; +import com.gxwebsoft.love.entity.UserPlanPrice; +import com.gxwebsoft.love.param.UserPlanPriceParam; +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-06-20 18:07:50 + */ +@Service +public class UserPlanPriceServiceImpl extends ServiceImpl implements UserPlanPriceService { + + @Override + public PageResult pageRel(UserPlanPriceParam 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(UserPlanPriceParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + //page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public UserPlanPrice getByIdRel(Integer id) { + UserPlanPriceParam param = new UserPlanPriceParam(); + param.setId(id); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/love/service/impl/UserPlanServiceImpl.java b/src/main/java/com/gxwebsoft/love/service/impl/UserPlanServiceImpl.java new file mode 100644 index 0000000..d5b5822 --- /dev/null +++ b/src/main/java/com/gxwebsoft/love/service/impl/UserPlanServiceImpl.java @@ -0,0 +1,102 @@ +package com.gxwebsoft.love.service.impl; + +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.love.entity.UserPlan; +import com.gxwebsoft.love.entity.UserPlanEquity; +import com.gxwebsoft.love.entity.UserPlanIcon; +import com.gxwebsoft.love.entity.UserPlanPrice; +import com.gxwebsoft.love.mapper.UserPlanMapper; +import com.gxwebsoft.love.param.UserPlanEquityParam; +import com.gxwebsoft.love.param.UserPlanLogParam; +import com.gxwebsoft.love.param.UserPlanParam; +import com.gxwebsoft.love.service.*; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 会员套餐管理表Service实现 + * + * @author 科技小王子 + * @since 2023-06-21 11:21:01 + */ +@Service +public class UserPlanServiceImpl extends ServiceImpl implements UserPlanService { + @Resource + private UserPlanPriceService userPlanPriceService; + @Resource + private UserPlanLogService userPlanLogService; + @Resource + private UserPlanEquityService userPlanEquityService; + @Resource + private UserPlanIconService userPlanIconService; + + @Override + public PageResult pageRel(UserPlanParam param) { + PageParam page = new PageParam<>(param); + //page.setDefaultOrder("create_time desc"); + List list = baseMapper.selectPageRel(page, param); + list.forEach(d -> { + d.setPrice(userPlanPriceService.list(new LambdaQueryWrapper().eq(UserPlanPrice::getPlanId, d.getPlanId()))); + final UserPlanLogParam logParam = new UserPlanLogParam(); + logParam.setPlanId(d.getPlanId()); + logParam.setUserId(param.getLoginUserId()); + d.setLog(userPlanLogService.listRel(logParam)); + d.setIcons(userPlanIconService.list(new LambdaQueryWrapper().eq(UserPlanIcon::getPlanId,d.getPlanId()))); + }); + return new PageResult<>(list, page.getTotal()); + } + + @Override + public List listRel(UserPlanParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + //page.setDefaultOrder("create_time desc"); + list.forEach(d -> { + // 套餐价格列表 + d.setPrice(userPlanPriceService.list(new LambdaQueryWrapper().eq(UserPlanPrice::getPlanId, d.getPlanId()))); + // 购买记录 + final UserPlanLogParam logParam = new UserPlanLogParam(); + logParam.setPlanId(d.getPlanId()); + logParam.setUserId(param.getLoginUserId()); + d.setLog(userPlanLogService.pageRel(logParam).getList()); + d.setIcons(userPlanIconService.list(new LambdaQueryWrapper().eq(UserPlanIcon::getPlanId,d.getPlanId()))); + // 解锁的功能 + final UserPlanEquityParam userPlanEquityParam = new UserPlanEquityParam(); + userPlanEquityParam.setUserId(param.getLoginUserId()); + userPlanEquityParam.setPlanId(d.getPlanId()); + d.setEquity(userPlanEquityService.listRel(userPlanEquityParam)); + }); + return page.sortRecords(list); + } + + @Override + public UserPlan getByIdRel(Integer planId) { + UserPlanParam param = new UserPlanParam(); + param.setPlanId(planId); + final List list = baseMapper.selectListRel(param); + list.forEach(d -> { + // 套餐价格列表 + d.setPrice(userPlanPriceService.list(new LambdaQueryWrapper().eq(UserPlanPrice::getPlanId, d.getPlanId()))); + // 购买记录 + final UserPlanLogParam logParam = new UserPlanLogParam(); + logParam.setPlanId(d.getPlanId()); + logParam.setUserId(param.getLoginUserId()); + logParam.setLimit(1L); + d.setLog(userPlanLogService.pageRel(logParam).getList()); + d.setIcons(userPlanIconService.list(new LambdaQueryWrapper().eq(UserPlanIcon::getPlanId,d.getPlanId()))); + // 解锁的功能 + final UserPlanEquityParam userPlanEquityParam = new UserPlanEquityParam(); + userPlanEquityParam.setUserId(param.getLoginUserId()); + userPlanEquityParam.setPlanId(d.getPlanId()); + d.setEquity(userPlanEquityService.listRel(userPlanEquityParam)); + }); + return param.getOne(list); + } + +} diff --git a/src/main/java/com/gxwebsoft/love/service/impl/UserProfileServiceImpl.java b/src/main/java/com/gxwebsoft/love/service/impl/UserProfileServiceImpl.java new file mode 100644 index 0000000..3035205 --- /dev/null +++ b/src/main/java/com/gxwebsoft/love/service/impl/UserProfileServiceImpl.java @@ -0,0 +1,148 @@ +package com.gxwebsoft.love.service.impl; + +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.common.system.service.UserService; +import com.gxwebsoft.love.entity.UserProfile; +import com.gxwebsoft.love.mapper.UserProfileMapper; +import com.gxwebsoft.love.param.UserProfileParam; +import com.gxwebsoft.love.service.UserProfileService; +import com.gxwebsoft.shop.entity.UserFollow; +import com.gxwebsoft.shop.entity.UserLike; +import com.gxwebsoft.shop.service.UserFollowService; +import com.gxwebsoft.shop.service.UserLikeService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +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-06-09 21:42:26 + */ +@Service +public class UserProfileServiceImpl extends ServiceImpl implements UserProfileService { + @Resource + private UserService userService; + @Resource + private UserFollowService userFollowService; + @Resource + private UserLikeService userLikeService; + + private final Logger logger = LoggerFactory.getLogger(getClass()); + + + @Override + public PageResult pageRel(UserProfileParam param) { + PageParam page = new PageParam<>(param); + + + // 我关注的人 + final List myFollows = userFollowService.list(new LambdaQueryWrapper().eq(UserFollow::getUserId, param.getLoginUserId()).orderByDesc(UserFollow::getCreateTime)); + List followIds = myFollows.stream().map(UserFollow::getShopId).collect(Collectors.toList()); + // 我点赞的人 + final List myLikes = userLikeService.list(new LambdaQueryWrapper().eq(UserLike::getUserId, param.getLoginUserId())); + Set likeUserIds = myLikes.stream().map(UserLike::getToUserId).collect(Collectors.toSet()); + + // 搜素条件 + if (param.getScene() != null) { + // 推荐recommend + if (param.getScene().equals("recommend")) { + param.setRecommend(true); + param.setCityMate(null); + param.setNUserIds(likeUserIds); // 排除点赞的人 + page.setDefaultOrder("create_time desc"); + } + // 同城intraCity + if (param.getScene().equals("intraCity")) { + param.setRecommend(null); + param.setNUserIds(likeUserIds); // 排除点赞的人 + page.setDefaultOrder("create_time desc"); + } + // 关注focus + if (param.getLoginUserId() != null && param.getScene().equals("focus")) { + + if (!CollectionUtils.isEmpty(followIds)) { + // 分页处理 + param.setUserIds(followIds); + param.setRecommend(null); + param.setCityMate(null); + List list = baseMapper.selectPageRel(page, param); + final List userList = userService.listByIds(followIds); + final Map> collect = userList.stream().collect(Collectors.groupingBy(User::getUserId)); + // 重新排序 + List newList = new ArrayList<>(); + for (Integer id : followIds) { + Optional first = list.stream().filter(p -> p.getUserId().equals(id)).findFirst(); + if (first.isPresent()) { + UserProfile userProfile = first.get(); + userProfile.setUserInfo(collect.get(id).get(0)); + final boolean isLike = likeUserIds.stream().filter(f -> f.equals(id)).findFirst().isPresent(); + userProfile.setFollow(true); + userProfile.setLiked(isLike); + newList.add(userProfile); + }else { + logger.error("用户{}不存在", id); + } + + } + return new PageResult<>(newList, (long) myFollows.size()); + } else { + return new PageResult<>(new ArrayList<>(), (long) myFollows.size()); + } + } + // 相册是否为空 + param.setAlbums(true); + } else { + param.setCityMate(null); + } + List list = baseMapper.selectPageRel(page, param); + if (CollectionUtils.isEmpty(list)) { + return new PageResult<>(list, page.getTotal()); + } + + + final Set userIds = list.stream().map(UserProfile::getUserId).collect(Collectors.toSet()); + final List userList = userService.listByIds(userIds); + final Map> collect = userList.stream().collect(Collectors.groupingBy(User::getUserId)); + list.forEach(d -> { + // 附加用户基本信息 + d.setUserInfo(collect.get(d.getUserId()).get(0)); + // 是否关注 + final boolean isFollows = myFollows.stream().filter(f -> f.getShopId().equals(d.getUserId())).findFirst().isPresent(); + final boolean isLike = likeUserIds.stream().filter(f -> f.equals(d.getUserId())).findFirst().isPresent(); + d.setFollow(isFollows); + d.setLiked(isLike); + + }); + + return new PageResult<>(list, page.getTotal()); + } + + + @Override + public List listRel(UserProfileParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public UserProfile getByIdRel(Integer id) { + UserProfileParam param = new UserProfileParam(); + param.setId(id); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/love/socketio/cache/ClientCache.java b/src/main/java/com/gxwebsoft/love/socketio/cache/ClientCache.java new file mode 100644 index 0000000..c4fb207 --- /dev/null +++ b/src/main/java/com/gxwebsoft/love/socketio/cache/ClientCache.java @@ -0,0 +1,75 @@ +package com.gxwebsoft.love.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/src/main/java/com/gxwebsoft/love/socketio/config/SocketIOConfig.java b/src/main/java/com/gxwebsoft/love/socketio/config/SocketIOConfig.java new file mode 100644 index 0000000..bdac31a --- /dev/null +++ b/src/main/java/com/gxwebsoft/love/socketio/config/SocketIOConfig.java @@ -0,0 +1,82 @@ +package com.gxwebsoft.love.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.system.entity.User; +import com.gxwebsoft.common.system.service.UserService; +import com.gxwebsoft.love.socketio.cache.ClientCache; +import com.gxwebsoft.love.socketio.handler.SocketIOHandler; +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"); // 设置证书密码 + + SocketIOServer server = new SocketIOServer(config); + //启动socket服务 + server.addListeners(socketIOHandler); + server.start(); + ClientCache.setSocketIOServer(server); + logger.debug("Netty SocketIO启动：{}:{}",host,port); + } +} diff --git a/src/main/java/com/gxwebsoft/love/socketio/handler/SocketIOHandler.java b/src/main/java/com/gxwebsoft/love/socketio/handler/SocketIOHandler.java new file mode 100644 index 0000000..d939f19 --- /dev/null +++ b/src/main/java/com/gxwebsoft/love/socketio/handler/SocketIOHandler.java @@ -0,0 +1,108 @@ +package com.gxwebsoft.love.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.system.entity.Role; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.common.system.service.UserService; +import com.gxwebsoft.love.entity.ChatMessage; +import com.gxwebsoft.love.service.ChatConversationService; +import com.gxwebsoft.love.service.ChatMessageService; +import com.gxwebsoft.love.socketio.cache.ClientCache; +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.List; +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) { + + } + +} \ No newline at end of file diff --git a/src/main/java/com/gxwebsoft/love/vo/ChatConversationVO.java b/src/main/java/com/gxwebsoft/love/vo/ChatConversationVO.java new file mode 100644 index 0000000..b835d43 --- /dev/null +++ b/src/main/java/com/gxwebsoft/love/vo/ChatConversationVO.java @@ -0,0 +1,18 @@ +package com.gxwebsoft.love.vo; + +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.love.entity.ChatConversation; +import com.gxwebsoft.love.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/src/main/java/com/gxwebsoft/love/vo/idcheck/BackRecognitionResult.java b/src/main/java/com/gxwebsoft/love/vo/idcheck/BackRecognitionResult.java new file mode 100644 index 0000000..8839a0a --- /dev/null +++ b/src/main/java/com/gxwebsoft/love/vo/idcheck/BackRecognitionResult.java @@ -0,0 +1,11 @@ +package com.gxwebsoft.love.vo.idcheck; + +import lombok.Data; + +@Data +public class BackRecognitionResult { + + private String startDate; + private String endDate; + private String issue; +} diff --git a/src/main/java/com/gxwebsoft/love/vo/idcheck/FrontRecognitionResult.java b/src/main/java/com/gxwebsoft/love/vo/idcheck/FrontRecognitionResult.java new file mode 100644 index 0000000..5bf421d --- /dev/null +++ b/src/main/java/com/gxwebsoft/love/vo/idcheck/FrontRecognitionResult.java @@ -0,0 +1,15 @@ +package com.gxwebsoft.love.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/src/main/java/com/gxwebsoft/love/vo/idcheck/IdCardInfor.java b/src/main/java/com/gxwebsoft/love/vo/idcheck/IdCardInfor.java new file mode 100644 index 0000000..64d8412 --- /dev/null +++ b/src/main/java/com/gxwebsoft/love/vo/idcheck/IdCardInfor.java @@ -0,0 +1,14 @@ +package com.gxwebsoft.love.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/src/main/java/com/gxwebsoft/love/vo/idcheck/Response.java b/src/main/java/com/gxwebsoft/love/vo/idcheck/Response.java new file mode 100644 index 0000000..a44f347 --- /dev/null +++ b/src/main/java/com/gxwebsoft/love/vo/idcheck/Response.java @@ -0,0 +1,10 @@ +package com.gxwebsoft.love.vo.idcheck; + +import lombok.Data; + +@Data +public class Response { + private Integer error_code; + private String reason; + private T result; +} diff --git a/src/main/java/com/gxwebsoft/love/vo/idcheck/VerifyResult.java b/src/main/java/com/gxwebsoft/love/vo/idcheck/VerifyResult.java new file mode 100644 index 0000000..9cde12e --- /dev/null +++ b/src/main/java/com/gxwebsoft/love/vo/idcheck/VerifyResult.java @@ -0,0 +1,14 @@ +package com.gxwebsoft.love.vo.idcheck; + +import lombok.Data; + +@Data +public class VerifyResult { + private String realname; + private String idcard; + + private boolean isOk; + + private IdCardInfor idCardInfor; + +} diff --git a/src/main/java/com/gxwebsoft/oa/constants/NoticeConstants.java b/src/main/java/com/gxwebsoft/oa/constants/NoticeConstants.java new file mode 100644 index 0000000..adaa556 --- /dev/null +++ b/src/main/java/com/gxwebsoft/oa/constants/NoticeConstants.java @@ -0,0 +1,10 @@ +package com.gxwebsoft.oa.constants; + +public class NoticeConstants { + // 通知类型 + public static final String NOTICE = "notice"; // 提醒 + public static final String LETTER = "letter"; // 私信 + public static final String TODO = "todo"; // 待办 + public static final String CHAT_GPT = "chatGPT"; // AI机器人 + +} diff --git a/src/main/java/com/gxwebsoft/oa/constants/TaskConstants.java b/src/main/java/com/gxwebsoft/oa/constants/TaskConstants.java new file mode 100644 index 0000000..2299d33 --- /dev/null +++ b/src/main/java/com/gxwebsoft/oa/constants/TaskConstants.java @@ -0,0 +1,13 @@ +package com.gxwebsoft.oa.constants; + +public class TaskConstants { + // 进度管理 + public static final Integer PROGRESS0 = 0; // 待分派 + public static final Integer PROGRESS1 = 1; // 待处理 + public static final Integer PROGRESS2 = 2; // 处理中 + public static final Integer PROGRESS3 = 3; // 待确认 + public static final Integer PROGRESS4 = 4; // 待反馈 + public static final Integer PROGRESS5 = 5; // 已完结 + public static final Integer PROGRESS6 = 6; // 已关闭 + +} diff --git a/src/main/java/com/gxwebsoft/oa/controller/AppController.java b/src/main/java/com/gxwebsoft/oa/controller/AppController.java new file mode 100644 index 0000000..9eaa1a7 --- /dev/null +++ b/src/main/java/com/gxwebsoft/oa/controller/AppController.java @@ -0,0 +1,186 @@ +package com.gxwebsoft.oa.controller; + +import cn.hutool.core.util.IdUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.gxwebsoft.common.core.annotation.OperationLog; +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.core.web.BatchParam; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.oa.entity.App; +import com.gxwebsoft.oa.entity.AppUser; +import com.gxwebsoft.oa.param.AppParam; +import com.gxwebsoft.oa.service.AppService; +import com.gxwebsoft.oa.service.AppUserService; +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.List; +import java.util.Set; +import java.util.stream.Collectors; + +/** + * 应用管理记录表控制器 + * + * @author 科技小王子 + * @since 2023-03-28 10:45:39 + */ +@Api(tags = "应用管理记录表管理") +@RestController +@RequestMapping("/api/oa/app") +public class AppController extends BaseController { + @Resource + private AppService appService; + @Resource + private CacheClient cacheClient; + @Resource + private AppUserService appUserService; + @Resource + private StringRedisTemplate stringRedisTemplate; + + @PreAuthorize("hasAuthority('oa:app:list')") + @OperationLog + @ApiOperation("分页查询应用管理记录表") + @GetMapping("/page") + public ApiResult> page(AppParam 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 = appUserService.list(new LambdaQueryWrapper().eq(AppUser::getUserId, userId)); + final Set collect = list.stream().map(AppUser::getAppId).collect(Collectors.toSet()); + param.setAppIds(collect); + } + }); + // 使用关联查询 + return success(appService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('oa:app:list')") + @OperationLog + @ApiOperation("查询全部应用管理记录表") + @GetMapping() + public ApiResult> list(AppParam param) { + // 使用关联查询 + return success(appService.listRel(param)); + } + + @PreAuthorize("hasAuthority('oa:app:list')") + @OperationLog + @ApiOperation("根据id查询应用管理记录表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + // 使用关联查询 + return success(appService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('oa:app:save')") + @OperationLog + @ApiOperation("添加应用管理记录表") + @PostMapping() + public ApiResult save(@RequestBody App app) { + // 记录当前登录用户id、租户id、商户编号 + User loginUser = getLoginUser(); + 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)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('oa:app:update')") + @OperationLog + @ApiOperation("修改应用管理记录表") + @PutMapping() + public ApiResult update(@RequestBody App app) { + if (appService.updateById(app)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('oa:app:remove')") + @OperationLog + @ApiOperation("删除应用管理记录表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (appService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('oa:app:save')") + @OperationLog + @ApiOperation("批量添加应用管理记录表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (appService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('oa:app:update')") + @OperationLog + @ApiOperation("批量修改应用管理记录表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(appService, "app_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('oa:app:remove')") + @OperationLog + @ApiOperation("批量删除应用管理记录表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (appService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('oa:app:update')") + @ApiOperation("重置秘钥") + @PostMapping("/updateAppSecret") + public ApiResult updateAppSecret(@RequestBody App app) { + if (app.getAppId() == null) { + return fail("请勿重复操作"); + } + App result = appService.getByIdRel(app.getAppId()); + String key = cacheClient.key("AppSecret", app.getAppId()); + String appSecret = IdUtil.fastSimpleUUID(); + cacheClient.set(key,appSecret); + result.setAppSecret(appSecret); + return success("重置成功",result); + } + + @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); + } + +} diff --git a/src/main/java/com/gxwebsoft/oa/controller/AppUserController.java b/src/main/java/com/gxwebsoft/oa/controller/AppUserController.java new file mode 100644 index 0000000..9f31677 --- /dev/null +++ b/src/main/java/com/gxwebsoft/oa/controller/AppUserController.java @@ -0,0 +1,133 @@ +package com.gxwebsoft.oa.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.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.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 应用成员控制器 + * + * @author 科技小王子 + * @since 2023-05-31 13:18:55 + */ +@Api(tags = "应用成员管理") +@RestController +@RequestMapping("/api/oa/app-user") +public class AppUserController extends BaseController { + @Resource + private AppUserService appUserService; + + @PreAuthorize("hasAuthority('oa:appUser:list')") + @OperationLog + @ApiOperation("分页查询应用成员") + @GetMapping("/page") + public ApiResult> page(AppUserParam param) { + // 使用关联查询 + return success(appUserService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('oa:appUser:list')") + @OperationLog + @ApiOperation("查询全部应用成员") + @GetMapping() + public ApiResult> list(AppUserParam param) { + // 使用关联查询 + if (param.getAppId() == null) { + return fail("AppId不存在",null); + } + return success(appUserService.listRel(param)); + } + + @PreAuthorize("hasAuthority('oa:appUser:list')") + @OperationLog + @ApiOperation("根据id查询应用成员") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + // 使用关联查询 + return success(appUserService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('oa:appUser:save')") + @OperationLog + @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('oa:appUser:update')") + @OperationLog + @ApiOperation("修改应用成员") + @PutMapping() + public ApiResult update(@RequestBody AppUser appUser) { + if (appUserService.updateById(appUser)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('oa:appUser:remove')") + @OperationLog + @ApiOperation("删除应用成员") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (appUserService.removeById(id)) { + return success("移除成功"); + } + return fail("移除失败"); + } + + @PreAuthorize("hasAuthority('oa:appUser:save')") + @OperationLog + @ApiOperation("批量添加应用成员") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (appUserService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('oa: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('oa:appUser:remove')") + @OperationLog + @ApiOperation("批量删除应用成员") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (appUserService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/oa/controller/AssetsController.java b/src/main/java/com/gxwebsoft/oa/controller/AssetsController.java new file mode 100644 index 0000000..e2e4097 --- /dev/null +++ b/src/main/java/com/gxwebsoft/oa/controller/AssetsController.java @@ -0,0 +1,174 @@ +package com.gxwebsoft.oa.controller; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.gxwebsoft.common.core.annotation.OperationLog; +import com.gxwebsoft.common.core.utils.BtUtil; +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.oa.entity.AppUser; +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.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.HashSet; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; + +/** + * 服务器资产记录表控制器 + * + * @author WebSoft + * @since 2022-11-16 11:13:16 + */ +@Api(tags = "服务器资产记录表管理") +@RestController +@RequestMapping("/api/oa/assets") +public class AssetsController extends BaseController { + @Resource + private AssetsService assetsService; + @Resource + private AssetsUserService assetsUserService; + @Resource + private BtUtil btUtil; + + @PreAuthorize("hasAuthority('oa:assets:list')") + @OperationLog + @ApiOperation("分页查询服务器资产记录表") + @GetMapping("/page") + public ApiResult> page(AssetsParam 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")){ + // 非管理员按项目成员权限显示 + param.setSceneType("NotAdministrator"); + 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); + } + } + }); + // 非管理员并且无分配资源 + if(param.getSceneType() != null && param.getSceneType().equals("NotAdministrator") && CollectionUtils.isEmpty(param.getAssetsIds())){ + final PageResult result = new PageResult<>(); + result.setList(new ArrayList<>()); + result.setCount(0L); + return success(result); + } + // 返回查询结果 + return success(assetsService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('oa:assets:list')") + @OperationLog + @ApiOperation("查询全部服务器资产记录表") + @GetMapping() + public ApiResult> list(AssetsParam param) { + // 使用关联查询 + return success(assetsService.listRel(param)); + } + + @PreAuthorize("hasAuthority('oa:assets:list')") + @OperationLog + @ApiOperation("根据id查询服务器资产记录表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + final Assets assets = assetsService.getByIdRel(id); + 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); + } + + @PreAuthorize("hasAuthority('oa:assets:save')") + @OperationLog + @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)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('oa:assets:update')") + @OperationLog + @ApiOperation("修改服务器资产记录表") + @PutMapping() + public ApiResult update(@RequestBody Assets assets) { + if (assetsService.updateById(assets)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('oa:assets:remove')") + @OperationLog + @ApiOperation("删除服务器资产记录表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (assetsService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('oa:assets:save')") + @OperationLog + @ApiOperation("批量添加服务器资产记录表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (assetsService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('oa:assets:update')") + @OperationLog + @ApiOperation("批量修改服务器资产记录表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(assetsService, "assets_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('oa:assets:remove')") + @OperationLog + @ApiOperation("批量删除服务器资产记录表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (assetsService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } +} diff --git a/src/main/java/com/gxwebsoft/oa/controller/AssetsUserController.java b/src/main/java/com/gxwebsoft/oa/controller/AssetsUserController.java new file mode 100644 index 0000000..7057031 --- /dev/null +++ b/src/main/java/com/gxwebsoft/oa/controller/AssetsUserController.java @@ -0,0 +1,133 @@ +package com.gxwebsoft.oa.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.oa.entity.AppUser; +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.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-07-18 14:35:51 + */ +@Api(tags = "服务器成员管理管理") +@RestController +@RequestMapping("/api/oa/assets-user") +public class AssetsUserController extends BaseController { + @Resource + private AssetsUserService assetsUserService; + + @PreAuthorize("hasAuthority('oa:assetsUser:list')") + @OperationLog + @ApiOperation("分页查询服务器成员管理") + @GetMapping("/page") + public ApiResult> page(AssetsUserParam param) { + // 使用关联查询 + return success(assetsUserService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('oa:assetsUser:list')") + @OperationLog + @ApiOperation("查询全部服务器成员管理") + @GetMapping() + public ApiResult> list(AssetsUserParam param) { + // 使用关联查询 + return success(assetsUserService.listRel(param)); + } + + @PreAuthorize("hasAuthority('oa:assetsUser:list')") + @OperationLog + @ApiOperation("根据id查询服务器成员管理") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + // 使用关联查询 + return success(assetsUserService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('oa:assetsUser:save')") + @OperationLog + @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("添加失败"); + } + + @PreAuthorize("hasAuthority('oa:assetsUser:update')") + @OperationLog + @ApiOperation("修改服务器成员管理") + @PutMapping() + public ApiResult update(@RequestBody AssetsUser assetsUser) { + if (assetsUserService.updateById(assetsUser)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('oa:assetsUser:remove')") + @OperationLog + @ApiOperation("删除服务器成员管理") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (assetsUserService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('oa:assetsUser:save')") + @OperationLog + @ApiOperation("批量添加服务器成员管理") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (assetsUserService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('oa:assetsUser:update')") + @OperationLog + @ApiOperation("批量修改服务器成员管理") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(assetsUserService, "id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('oa:assetsUser:remove')") + @OperationLog + @ApiOperation("批量删除服务器成员管理") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (assetsUserService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/oa/controller/CustomerController.java b/src/main/java/com/gxwebsoft/oa/controller/CustomerController.java new file mode 100644 index 0000000..aefcb93 --- /dev/null +++ b/src/main/java/com/gxwebsoft/oa/controller/CustomerController.java @@ -0,0 +1,131 @@ +package com.gxwebsoft.oa.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.BatchParam; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.oa.entity.Customer; +import com.gxwebsoft.oa.param.CustomerParam; +import com.gxwebsoft.oa.service.CustomerService; +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-16 11:16:14 + */ +@Api(tags = "客户管理记录表管理") +@RestController +@RequestMapping("/api/oa/customer") +public class CustomerController extends BaseController { + @Resource + private CustomerService customerService; + + @PreAuthorize("hasAuthority('oa:customer:list')") + @OperationLog + @ApiOperation("分页查询客户管理记录表") + @GetMapping("/page") + public ApiResult> page(CustomerParam param) { + // 使用关联查询 + return success(customerService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('oa:customer:list')") + @OperationLog + @ApiOperation("查询全部客户管理记录表") + @GetMapping() + public ApiResult> list(CustomerParam param) { + // 使用关联查询 + return success(customerService.listRel(param)); + } + + @PreAuthorize("hasAuthority('oa:customer:list')") + @OperationLog + @ApiOperation("根据id查询客户管理记录表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + // 使用关联查询 + return success(customerService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('oa:customer:save')") + @OperationLog + @ApiOperation("添加客户管理记录表") + @PostMapping() + public ApiResult save(@RequestBody Customer customer) { + // 记录当前登录用户id、租户id + User loginUser = getLoginUser(); + if (loginUser != null) { + customer.setUserId(loginUser.getUserId()); + } + if (customerService.save(customer)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('oa:customer:update')") + @OperationLog + @ApiOperation("修改客户管理记录表") + @PutMapping() + public ApiResult update(@RequestBody Customer customer) { + if (customerService.updateById(customer)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('oa:customer:remove')") + @OperationLog + @ApiOperation("删除客户管理记录表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (customerService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('oa:customer:save')") + @OperationLog + @ApiOperation("批量添加客户管理记录表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (customerService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('oa:customer:update')") + @OperationLog + @ApiOperation("批量修改客户管理记录表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(customerService, "customer_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('oa:customer:remove')") + @OperationLog + @ApiOperation("批量删除客户管理记录表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (customerService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/oa/controller/NoticeController.java b/src/main/java/com/gxwebsoft/oa/controller/NoticeController.java new file mode 100644 index 0000000..80645be --- /dev/null +++ b/src/main/java/com/gxwebsoft/oa/controller/NoticeController.java @@ -0,0 +1,154 @@ +package com.gxwebsoft.oa.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.PageResult; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.oa.entity.Notice; +import com.gxwebsoft.oa.param.NoticeParam; +import com.gxwebsoft.oa.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-03-22 14:07:26 + */ +@Api(tags = "消息记录表管理") +@RestController +@RequestMapping("/api/oa/notice") +public class NoticeController extends BaseController { + @Resource + private NoticeService noticeService; + + @PreAuthorize("hasAuthority('oa:notice:list')") + @OperationLog + @ApiOperation("分页查询消息记录表") + @GetMapping("/page") + public ApiResult> page(NoticeParam param) { + // 使用关联查询 + param.setUserId(getLoginUserId()); + return success(noticeService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('oa:notice:list')") + @OperationLog + @ApiOperation("查询全部消息记录表") + @GetMapping() + public ApiResult> list(NoticeParam param) { + // 使用关联查询 + param.setUserId(getLoginUserId()); + return success(noticeService.listRel(param)); + } + + @PreAuthorize("hasAuthority('oa:notice:list')") + @OperationLog + @ApiOperation("根据id查询消息记录表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + return success(noticeService.getById(id)); + // 使用关联查询 + //return success(noticeService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('oa:notice:save')") + @OperationLog + @ApiOperation("添加消息记录表") + @PostMapping() + public ApiResult save(@RequestBody Notice notice) { + // 记录当前登录用户id、租户id、商户编号 + User loginUser = getLoginUser(); + if (loginUser != null) { + notice.setUserId(loginUser.getUserId()); + } + if (noticeService.save(notice)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('oa:notice:update')") + @OperationLog + @ApiOperation("修改消息记录表") + @PutMapping() + public ApiResult update(@RequestBody Notice notice) { + if (noticeService.updateById(notice)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('oa:notice:remove')") + @OperationLog + @ApiOperation("删除消息记录表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (noticeService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('oa:notice:save')") + @OperationLog + @ApiOperation("批量添加消息记录表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (noticeService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('oa:notice:update')") + @OperationLog + @ApiOperation("批量修改消息记录表") + @PutMapping("/batch") + public ApiResult updateBatch(@RequestBody List list) { + if (noticeService.updateBatchById(list)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('oa:notice:remove')") + @OperationLog + @ApiOperation("批量删除消息记录表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (noticeService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('oa:notice:list')") + @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/src/main/java/com/gxwebsoft/oa/controller/ProjectController.java b/src/main/java/com/gxwebsoft/oa/controller/ProjectController.java new file mode 100644 index 0000000..7e67813 --- /dev/null +++ b/src/main/java/com/gxwebsoft/oa/controller/ProjectController.java @@ -0,0 +1,139 @@ +package com.gxwebsoft.oa.controller; + +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.oa.service.ProjectService; +import com.gxwebsoft.oa.entity.Project; +import com.gxwebsoft.oa.param.ProjectParam; +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 WebSoft + * @since 2022-11-16 11:00:43 + */ +@Api(tags = "项目管理表管理") +@RestController +@RequestMapping("/api/oa/project") +public class ProjectController extends BaseController { + @Resource + private ProjectService projectService; + + @PreAuthorize("hasAuthority('oa:project:list')") + @OperationLog + @ApiOperation("分页查询项目管理表") + @GetMapping("/page") + public ApiResult> page(ProjectParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(projectService.page(page, page.getWrapper())); + // 使用关联查询 + //return success(projectService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('oa:project:list')") + @OperationLog + @ApiOperation("查询全部项目管理表") + @GetMapping() + public ApiResult> list(ProjectParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(projectService.list(page.getOrderWrapper())); + // 使用关联查询 + //return success(projectService.listRel(param)); + } + + @PreAuthorize("hasAuthority('oa:project:list')") + @OperationLog + @ApiOperation("根据id查询项目管理表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + return success(projectService.getById(id)); + // 使用关联查询 + //return success(projectService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('oa:project:save')") + @OperationLog + @ApiOperation("添加项目管理表") + @PostMapping() + public ApiResult save(@RequestBody Project project) { + // 记录当前登录用户id、租户id + User loginUser = getLoginUser(); + if (loginUser != null) { + project.setUserId(loginUser.getUserId()); + } + if (projectService.save(project)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('oa:project:update')") + @OperationLog + @ApiOperation("修改项目管理表") + @PutMapping() + public ApiResult update(@RequestBody Project project) { + if (projectService.updateById(project)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('oa:project:remove')") + @OperationLog + @ApiOperation("删除项目管理表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (projectService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('oa:project:save')") + @OperationLog + @ApiOperation("批量添加项目管理表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (projectService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('oa:project:update')") + @OperationLog + @ApiOperation("批量修改项目管理表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(projectService, "project_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('oa:project:remove')") + @OperationLog + @ApiOperation("批量删除项目管理表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (projectService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/oa/controller/TaskController.java b/src/main/java/com/gxwebsoft/oa/controller/TaskController.java new file mode 100644 index 0000000..7f9b397 --- /dev/null +++ b/src/main/java/com/gxwebsoft/oa/controller/TaskController.java @@ -0,0 +1,193 @@ +package com.gxwebsoft.oa.controller; + +import cn.hutool.core.util.StrUtil; +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.service.UserService; +import com.gxwebsoft.oa.entity.Task; +import com.gxwebsoft.oa.entity.TaskRecord; +import com.gxwebsoft.oa.entity.TaskUser; +import com.gxwebsoft.oa.param.TaskParam; +import com.gxwebsoft.oa.service.NoticeService; +import com.gxwebsoft.oa.service.TaskRecordService; +import com.gxwebsoft.oa.service.TaskService; +import com.gxwebsoft.oa.service.TaskUserService; +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 WebSoft + * @since 2022-11-16 11:21:43 + */ +@Api(tags = "工单记录表管理") +@RestController +@RequestMapping("/api/oa/task") +public class TaskController extends BaseController { + @Resource + private TaskService taskService; + @Resource + private TaskRecordService taskRecordService; + @Resource + private TaskUserService taskUserService; + @Resource + private UserService userService; + @Resource + private NoticeService noticeService; + + @PreAuthorize("hasAuthority('oa:task:list')") + @OperationLog + @ApiOperation("分页查询工单记录表") + @GetMapping("/page") + public ApiResult> page(TaskParam param) { + // 使用关联查询 + final User loginUser = getLoginUser(); + final Integer type = loginUser.getType(); + loginUser.getRoles().forEach(d -> { + if(!StrUtil.equals(d.getRoleCode(),"superAdmin") && !StrUtil.equals(d.getRoleCode(),"admin")){ + // 如果是开发者账号则按受理人查询 + if (type.equals(6)) { + param.setCommander(loginUser.getUserId()); + }else{ + param.setPromoter(getLoginUserId()); + } + } + }); + return success(taskService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('oa:task:list')") + @OperationLog + @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)); + } + + @PreAuthorize("hasAuthority('oa:task:list')") + @OperationLog + @ApiOperation("根据id查询工单记录表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + // 使用关联查询 + return success(taskService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('oa:task:save')") + @OperationLog + @ApiOperation("添加工单记录表") + @PostMapping() + public ApiResult save(@RequestBody Task task) { + // 记录用户id + final Integer loginUserId = getLoginUserId(); + Integer promoter = task.getPromoter(); + task.setUserId(loginUserId); + task.setComments(StrUtil.sub(task.getContent(),0,200)); + task.setPromoter(promoter != null ? promoter : loginUserId); + task.setLastReadUser(loginUserId); + if (taskService.save(task)) { + // 添加聊天内容明细 + TaskRecord taskRecord = new TaskRecord(); + taskRecord.setUserId(loginUserId); + taskRecord.setContent(task.getContent()); + taskRecord.setTaskId(task.getTaskId()); + taskRecord.setFiles(task.getFiles()); + taskRecordService.save(taskRecord); + // 添加工单成员 + TaskUser taskUser = new TaskUser(); + taskUser.setUserId(loginUserId); + taskUser.setTaskId(task.getTaskId()); + taskUserService.save(taskUser); + // 发待办提醒 + if(task.getCommander() != null){ + noticeService.addTodo(task); + } + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('oa:task:update')") + @OperationLog + @ApiOperation("修改工单记录表") + @PutMapping() + public ApiResult update(@RequestBody Task task) { + if(task.getCommander() != null && userService.getById(task.getCommander()) == null){ + return fail("受理人不存在"); + } + if (taskService.updateById(task)) { + // 发待办提醒 + noticeService.addTodo(task); + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('oa:task:remove')") + @OperationLog + @ApiOperation("删除工单记录表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (taskService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('oa:task:save')") + @OperationLog + @ApiOperation("批量添加工单记录表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (taskService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('oa:task:update')") + @OperationLog + @ApiOperation("批量修改工单记录表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(taskService, "task_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('oa:task:remove')") + @OperationLog + @ApiOperation("批量删除工单记录表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (taskService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('oa:task:list')") + @ApiOperation("统计信息") + @GetMapping("/count") + public ApiResult count(TaskParam param){ + // 验证签名 + isCheckSign(); + User loginUser = getLoginUser(); + ArrayList countNum = taskService.getCountNum(loginUser,param); + return success("操作成功",countNum); + } + +} diff --git a/src/main/java/com/gxwebsoft/oa/controller/TaskRecordController.java b/src/main/java/com/gxwebsoft/oa/controller/TaskRecordController.java new file mode 100644 index 0000000..869772f --- /dev/null +++ b/src/main/java/com/gxwebsoft/oa/controller/TaskRecordController.java @@ -0,0 +1,157 @@ +package com.gxwebsoft.oa.controller; + +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.*; +import com.gxwebsoft.oa.entity.TaskRecord; +import com.gxwebsoft.oa.param.TaskRecordParam; +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 static com.gxwebsoft.oa.constants.NoticeConstants.LETTER; +import static com.gxwebsoft.oa.constants.TaskConstants.*; + +/** + * 工单回复记录表控制器 + * + * @author 科技小王子 + * @since 2023-03-05 00:52:21 + */ +@Api(tags = "工单回复记录表管理") +@RestController +@RequestMapping("/api/oa/task-record") +public class TaskRecordController extends BaseController { + @Resource + private TaskRecordService taskRecordService; + @Resource + private TaskService taskService; + @Resource + private NoticeService noticeService; + + @PreAuthorize("hasAuthority('oa:task:list')") + @OperationLog + @ApiOperation("分页查询工单回复记录表") + @GetMapping("/page") + public ApiResult> page(TaskRecordParam param) { + // 使用关联查询 + return success(taskRecordService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('oa:task:list')") + @OperationLog + @ApiOperation("查询全部工单回复记录表") + @GetMapping() + public ApiResult> list(TaskRecordParam param) { + // 更新查阅状态 + Task task = taskService.getById(param.getTaskId()); + if(!getLoginUserId().equals(task.getLastReadUser())){ + task.setIsRead(1); + } + taskService.updateById(task); + // 使用关联查询 + return success(taskRecordService.listRel(param)); + } + + @PreAuthorize("hasAuthority('oa:task:list')") + @OperationLog + @ApiOperation("根据id查询工单回复记录表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + // 使用关联查询 + return success(taskRecordService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('oa:task:save')") + @OperationLog + @ApiOperation("添加工单回复记录表") + @PostMapping() + public ApiResult save(@RequestBody TaskRecord taskRecord) { + // 记录当前登录用户id、租户id、商户编号 + User loginUser = getLoginUser(); + if (loginUser != null) { + taskRecord.setUserId(loginUser.getUserId()); + } + if (taskRecordService.save(taskRecord)) { + Task task = new Task(); + task.setTaskId(taskRecord.getTaskId()); + task.setProgress(PROGRESS2); + task.setIsRead(0); + task.setLastReadUser(getLoginUserId()); + taskService.updateById(task); + // 发送私信 + noticeService.addLetter(taskRecord); + return success("提交成功"); + } + return fail("提交失败"); + } + + @PreAuthorize("hasAuthority('oa:task:update')") + @OperationLog + @ApiOperation("修改工单回复记录表") + @PutMapping() + public ApiResult update(@RequestBody TaskRecord taskRecord) { + if (taskRecordService.updateById(taskRecord)) { + Task task = taskService.getById(taskRecord.getTaskId()); + task.setIsRead(0); + task.setLastReadUser(getLoginUserId()); + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('oa:task:remove')") + @OperationLog + @ApiOperation("删除工单回复记录表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (taskRecordService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('oa:task:save')") + @OperationLog + @ApiOperation("批量添加工单回复记录表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (taskRecordService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('oa:task:update')") + @OperationLog + @ApiOperation("批量修改工单回复记录表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(taskRecordService, "task_record_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('oa:task:remove')") + @OperationLog + @ApiOperation("批量删除工单回复记录表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (taskRecordService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/oa/controller/TaskUserController.java b/src/main/java/com/gxwebsoft/oa/controller/TaskUserController.java new file mode 100644 index 0000000..e5d627c --- /dev/null +++ b/src/main/java/com/gxwebsoft/oa/controller/TaskUserController.java @@ -0,0 +1,153 @@ +package com.gxwebsoft.oa.controller; + +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.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.oa.entity.Task; +import com.gxwebsoft.oa.entity.TaskUser; +import com.gxwebsoft.oa.param.TaskUserParam; +import com.gxwebsoft.oa.service.TaskService; +import com.gxwebsoft.oa.service.TaskUserService; +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 static com.gxwebsoft.oa.constants.TaskConstants.PROGRESS1; + +/** + * 工单成员控制器 + * + * @author 科技小王子 + * @since 2023-03-06 12:00:41 + */ +@Api(tags = "工单成员管理") +@RestController +@RequestMapping("/api/oa/task-user") +public class TaskUserController extends BaseController { + @Resource + private UserService userService; + @Resource + private TaskUserService taskUserService; + @Resource + private TaskService taskService; + + @PreAuthorize("hasAuthority('oa:taskUser:list')") + @OperationLog + @ApiOperation("分页查询工单成员") + @GetMapping("/page") + public ApiResult> page(TaskUserParam param) { + // 使用关联查询 + return success(taskUserService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('oa:taskUser:list')") + @OperationLog + @ApiOperation("查询全部工单成员") + @GetMapping() + public ApiResult> list(TaskUserParam param) { + // 使用关联查询 + return success(taskUserService.listRel(param)); + } + + @PreAuthorize("hasAuthority('oa:taskUser:list')") + @OperationLog + @ApiOperation("根据id查询工单成员") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { +// return success(taskUserService.getById(id)); + // 使用关联查询 + return success(taskUserService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('oa:taskUser:save')") + @OperationLog + @ApiOperation("添加工单成员") + @PostMapping() + public ApiResult save(@RequestBody TaskUser taskUser) { + User user = userService.getOne(new LambdaQueryWrapper().eq(User::getUsername, taskUser.getName())); + if(user == null){ + throw new BusinessException("找不到该用户"); + } + int count = taskUserService.count(new LambdaQueryWrapper().eq(TaskUser::getUserId, user.getUserId()).eq(TaskUser::getTaskId,taskUser.getTaskId())); + if( count > 0) { + return fail("请勿重复指派"); + } + taskUser.setUserId(user.getUserId()); + if (taskUserService.save(taskUser)) { + Task task = new Task(); + task.setTaskId(taskUser.getTaskId()); + task.setProgress(PROGRESS1); + task.setIsRead(0); + task.setLastReadUser(getLoginUserId()); + taskService.updateById(task); + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('oa:taskUser:update')") + @OperationLog + @ApiOperation("修改工单成员") + @PutMapping() + public ApiResult update(@RequestBody TaskUser taskUser) { + if (taskUserService.updateById(taskUser)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('oa:taskUser:remove')") + @OperationLog + @ApiOperation("删除工单成员") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (taskUserService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('oa:taskUser:save')") + @OperationLog + @ApiOperation("批量添加工单成员") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (taskUserService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('oa:taskUser:update')") + @OperationLog + @ApiOperation("批量修改工单成员") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(taskUserService, "task_user_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('oa:taskUser:remove')") + @OperationLog + @ApiOperation("批量删除工单成员") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (taskUserService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/oa/entity/App.java b/src/main/java/com/gxwebsoft/oa/entity/App.java new file mode 100644 index 0000000..73fe981 --- /dev/null +++ b/src/main/java/com/gxwebsoft/oa/entity/App.java @@ -0,0 +1,238 @@ +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.math.BigDecimal; +import java.util.Date; +import java.util.List; + +/** + * 应用管理记录表 + * + * @author 科技小王子 + * @since 2023-03-28 10:45:39 + */ +@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 = "上级id, 0是顶级") + private Integer parentId; + + @ApiModelProperty(value = "应用标识") + private String appCode; + + @ApiModelProperty(value = "类型, 0菜单, 1按钮") + 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 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 callbackUrl; + + @ApiModelProperty(value = "腾讯文档地址") + private String docsUrl; + + @ApiModelProperty(value = "仓库地址") + private String gitUrl; + + @ApiModelProperty(value = "文件服务器") + private String fileUrl; + + @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 = "应用状态") + 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 = "应用秘钥") + @TableField(exist = false) + private String appSecret; + + @ApiModelProperty(value = "租户编号") + private String tenantCode; + + @ApiModelProperty(value = "注册时间") + private Date createTime; + + @ApiModelProperty(value = "修改时间") + private Date updateTime; + + @ApiModelProperty(value = "附件1") + private String file1; + + @ApiModelProperty(value = "附件2") + private String file2; + + @ApiModelProperty(value = "附件3") + private String file3; + + @ApiModelProperty(value = "成员管理") + @TableField(exist = false) + private List users; + + @ApiModelProperty(value = "主体名称") + @TableField(exist = false) + private String tenantName; + + @ApiModelProperty(value = "主体ID") + @TableField(exist = false) + private Integer tenantId; + + @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 = "公司名称") + private String companyName; + + @ApiModelProperty(value = "公司简称") + @TableField(exist = false) + private String shortName; + +} diff --git a/src/main/java/com/gxwebsoft/oa/entity/AppUser.java b/src/main/java/com/gxwebsoft/oa/entity/AppUser.java new file mode 100644 index 0000000..1f47710 --- /dev/null +++ b/src/main/java/com/gxwebsoft/oa/entity/AppUser.java @@ -0,0 +1,70 @@ +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-05-31 13:18:55 + */ +@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/src/main/java/com/gxwebsoft/oa/entity/Assets.java b/src/main/java/com/gxwebsoft/oa/entity/Assets.java new file mode 100644 index 0000000..248d60a --- /dev/null +++ b/src/main/java/com/gxwebsoft/oa/entity/Assets.java @@ -0,0 +1,170 @@ +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.math.BigDecimal; +import java.util.Date; + +/** + * 服务器资产记录表 + * + * @author WebSoft + * @since 2022-11-16 11:13:16 + */ +@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 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 = "企业ID") + private Integer companyId; + + @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/src/main/java/com/gxwebsoft/oa/entity/AssetsUser.java b/src/main/java/com/gxwebsoft/oa/entity/AssetsUser.java new file mode 100644 index 0000000..8f78287 --- /dev/null +++ b/src/main/java/com/gxwebsoft/oa/entity/AssetsUser.java @@ -0,0 +1,71 @@ +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-07-18 14:35:51 + */ +@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 = "昵称") + @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/src/main/java/com/gxwebsoft/oa/entity/Customer.java b/src/main/java/com/gxwebsoft/oa/entity/Customer.java new file mode 100644 index 0000000..2b34480 --- /dev/null +++ b/src/main/java/com/gxwebsoft/oa/entity/Customer.java @@ -0,0 +1,115 @@ +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 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 WebSoft + * @since 2022-11-16 11:16:14 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "Customer对象", description = "客户管理记录表") +@TableName("oa_customer") +public class Customer implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "客户ID") + @TableId(value = "customer_id", type = IdType.AUTO) + private Integer customerId; + + @ApiModelProperty(value = "客户名称") + private String customerName; + + @ApiModelProperty(value = "客户标识") + private String customerCode; + + @ApiModelProperty(value = "客户全称") + private String customerFullName; + + @ApiModelProperty(value = "头像") + private String customerAvatar; + + @ApiModelProperty(value = "客户类型") + private String customerType; + + @ApiModelProperty(value = "客户来源") + private String customerSource; + + @ApiModelProperty(value = "公司座机") + private String customerPhone; + + @ApiModelProperty(value = "手机号码") + private String customerMobile; + + @ApiModelProperty(value = "联系人") + private String customerContacts; + + @ApiModelProperty(value = "所在省份") + private String customerProvince; + + @ApiModelProperty(value = "所在城市") + private String customerCity; + + @ApiModelProperty(value = "所在地区") + private String customerRegion; + + @ApiModelProperty(value = "所在地址") + private String customerAddress; + + @ApiModelProperty(value = "经度") + private String longitude; + + @ApiModelProperty(value = "纬度") + private String latitude; + + @ApiModelProperty(value = "跟进状态") + private String progress; + + @ApiModelProperty(value = "是否含税") + private Boolean isTax; + + @ApiModelProperty(value = "用户ID") + private Integer userId; + + @ApiModelProperty(value = "机构id") + private Integer organizationId; + + @ApiModelProperty(value = "可见性(public,private,protected)") + private String visibility; + + @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/src/main/java/com/gxwebsoft/oa/entity/Notice.java b/src/main/java/com/gxwebsoft/oa/entity/Notice.java new file mode 100644 index 0000000..2de269b --- /dev/null +++ b/src/main/java/com/gxwebsoft/oa/entity/Notice.java @@ -0,0 +1,97 @@ +package com.gxwebsoft.oa.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-03-22 14:07:26 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "Notice对象", description = "消息记录表") +@TableName("oa_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 Long tokens; + + @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/src/main/java/com/gxwebsoft/oa/entity/Project.java b/src/main/java/com/gxwebsoft/oa/entity/Project.java new file mode 100644 index 0000000..33ffb57 --- /dev/null +++ b/src/main/java/com/gxwebsoft/oa/entity/Project.java @@ -0,0 +1,125 @@ +package com.gxwebsoft.oa.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 WebSoft + * @since 2022-11-16 11:00:43 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "Project对象", description = "项目管理表") +@TableName("oa_project") +public class Project implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "项目ID") + @TableId(value = "project_id", type = IdType.AUTO) + private Integer projectId; + + @ApiModelProperty(value = "项目名称") + private String projectName; + + @ApiModelProperty(value = "项目标识") + private String projectCode; + + @ApiModelProperty(value = "商品分类") + private String projectCategory; + + @ApiModelProperty(value = "项目商标") + private String projectAvatar; + + @ApiModelProperty(value = "项目域名") + private String url; + + @ApiModelProperty(value = "开发版域名") + private String urlDev; + + @ApiModelProperty(value = "后台管理地址") + private String urlAdmin; + + @ApiModelProperty(value = "默认账号密码") + private String account; + + @ApiModelProperty(value = "项目金额") + private BigDecimal money; + + @ApiModelProperty(value = "实际金额") + private BigDecimal realMoney; + + @ApiModelProperty(value = "年费") + private BigDecimal annualFee; + + @ApiModelProperty(value = "项目详情") + private String content; + + @ApiModelProperty(value = "开发参数(json)") + private String param; + + @ApiModelProperty(value = "二维码") + private String qrcode; + + @ApiModelProperty(value = "客户名称") + private String customerName; + + @ApiModelProperty(value = "项目进度（10待安排 20策划设计 30功能开发 40待验收 50完成）") + private Integer progress; + + @ApiModelProperty(value = "初始浏览数") + private Integer views; + + @ApiModelProperty(value = "状态(10上架 20下架)") + private Integer status; + + @ApiModelProperty(value = "排序(数字越小越靠前)") + private Integer sortNumber; + + @ApiModelProperty(value = "是否精选客户案例") + private Boolean isCase; + + @ApiModelProperty(value = "负责人") + private Integer commander; + + @ApiModelProperty(value = "用户ID") + private Integer userId; + + @ApiModelProperty(value = "机构id") + private Integer organizationId; + + @ApiModelProperty(value = "可见性(public,private,protected)") + private String visibility; + + @ApiModelProperty(value = "项目归属者") + private Integer customerId; + + @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/src/main/java/com/gxwebsoft/oa/entity/Task.java b/src/main/java/com/gxwebsoft/oa/entity/Task.java new file mode 100644 index 0000000..ffa6942 --- /dev/null +++ b/src/main/java/com/gxwebsoft/oa/entity/Task.java @@ -0,0 +1,188 @@ +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; +import java.util.List; + +/** + * 文章记录表 + * + * @author WebSoft + * @since 2022-11-16 11:21:42 + */ +@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 files; + + @ApiModelProperty(value = "开始时间") + private Date startTime; + + @ApiModelProperty(value = "结束时间") + private Date endTime; + + @ApiModelProperty(value = "任务内容") + @TableField(exist = false) + private String content; + + @ApiModelProperty(value = "任务状态") + private Integer progress; + + @ApiModelProperty(value = "优先级") + private String priority; + + @ApiModelProperty(value = "品质要求") + private String quality; + + @ApiModelProperty(value = "时限(天)") + private Integer day; + + @ApiModelProperty(value = "联系电话") + private String phone; + + @ApiModelProperty(value = "用户ID") + private Integer userId; + + @ApiModelProperty(value = "应用ID") + private Integer appId; + + @ApiModelProperty(value = "机构id") + private Integer organizationId; + + @ApiModelProperty(value = "客户ID") + private Integer customerId; + + @ApiModelProperty(value = "项目ID") + private Integer projectId; + + @ApiModelProperty(value = "资产ID") + private Integer assetsId; + + @ApiModelProperty(value = "是否已查阅") + private Integer isRead; + + @ApiModelProperty(value = "最后回复人ID") + private Integer lastReadUser; + + @ApiModelProperty(value = "最后回复人头像") + @TableField(exist = false) + private String lastAvatar; + + @ApiModelProperty(value = "最后回复人昵称") + @TableField(exist = false) + private String lastNickname; + + @ApiModelProperty(value = "最后回复人姓名") + @TableField(exist = false) + private String lastRealName; + + @ApiModelProperty(value = "最后回复人公司名称") + @TableField(exist = false) + private String lastCompanyName; + + @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 = "任务发起人ID") + private Integer promoter; + + @ApiModelProperty(value = "发起人昵称") + @TableField(exist = false) + private String promoterName; + + @ApiModelProperty(value = "发起人别名") + @TableField(exist = false) + private String promoterAlias; + + @ApiModelProperty(value = "发起人头像") + @TableField(exist = false) + private String promoterAvatar; + + @ApiModelProperty(value = "发起人单位名称") + @TableField(exist = false) + private String promoterCompanyName; + + @ApiModelProperty(value = "受理人") + private Integer commander; + + @ApiModelProperty(value = "受理人昵称") + @TableField(exist = false) + private String commanderName; + + @ApiModelProperty(value = "受理人别名") + @TableField(exist = false) + private String commanderAlias; + + @ApiModelProperty(value = "受理人真实姓名") + @TableField(exist = false) + private String commanderRealName; + + @ApiModelProperty(value = "受理人头像") + @TableField(exist = false) + private String commanderAvatar; + + @ApiModelProperty(value = "受理人单位名称") + @TableField(exist = false) + private String commanderCompanyName; + + @ApiModelProperty(value = "成员管理") + @TableField(exist = false) + private List users; + + @ApiModelProperty(value = "应用名称") + @TableField(exist = false) + private String appName; + + @ApiModelProperty(value = "应用信息") + @TableField(exist = false) + private App appInfo; + +} diff --git a/src/main/java/com/gxwebsoft/oa/entity/TaskRecord.java b/src/main/java/com/gxwebsoft/oa/entity/TaskRecord.java new file mode 100644 index 0000000..73e8e80 --- /dev/null +++ b/src/main/java/com/gxwebsoft/oa/entity/TaskRecord.java @@ -0,0 +1,75 @@ +package com.gxwebsoft.oa.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-03-05 00:52:21 + */ +@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") + private Integer taskId; + + @ApiModelProperty(value = "上级id") + private Integer parentId; + + @ApiModelProperty(value = "任务内容") + private String content; + + @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; +} diff --git a/src/main/java/com/gxwebsoft/oa/entity/TaskUser.java b/src/main/java/com/gxwebsoft/oa/entity/TaskUser.java new file mode 100644 index 0000000..2d4f2ff --- /dev/null +++ b/src/main/java/com/gxwebsoft/oa/entity/TaskUser.java @@ -0,0 +1,67 @@ +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-03-06 12:00:41 + */ +@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; + + @ApiModelProperty(value = "用户昵称") + @TableField(exist = false) + private String name; + + @ApiModelProperty(value = "用户头像") + @TableField(exist = false) + private String avatar; + + @ApiModelProperty(value = "手机号码") + @TableField(exist = false) + private String phone; + + @ApiModelProperty(value = "手机号码") + @TableField(exist = false) + private String email; + +} diff --git a/src/main/java/com/gxwebsoft/oa/mapper/AppMapper.java b/src/main/java/com/gxwebsoft/oa/mapper/AppMapper.java new file mode 100644 index 0000000..4415af7 --- /dev/null +++ b/src/main/java/com/gxwebsoft/oa/mapper/AppMapper.java @@ -0,0 +1,38 @@ +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-03-28 10:45:39 + */ +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); + + List pageRel(@Param("param") AppParam param); +} diff --git a/src/main/java/com/gxwebsoft/oa/mapper/AppUserMapper.java b/src/main/java/com/gxwebsoft/oa/mapper/AppUserMapper.java new file mode 100644 index 0000000..68736b1 --- /dev/null +++ b/src/main/java/com/gxwebsoft/oa/mapper/AppUserMapper.java @@ -0,0 +1,37 @@ +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-05-31 13:18:55 + */ +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/src/main/java/com/gxwebsoft/oa/mapper/AssetsMapper.java b/src/main/java/com/gxwebsoft/oa/mapper/AssetsMapper.java new file mode 100644 index 0000000..ebc8e58 --- /dev/null +++ b/src/main/java/com/gxwebsoft/oa/mapper/AssetsMapper.java @@ -0,0 +1,37 @@ +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 WebSoft + * @since 2022-11-16 11:13:16 + */ +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/src/main/java/com/gxwebsoft/oa/mapper/AssetsUserMapper.java b/src/main/java/com/gxwebsoft/oa/mapper/AssetsUserMapper.java new file mode 100644 index 0000000..3ff2804 --- /dev/null +++ b/src/main/java/com/gxwebsoft/oa/mapper/AssetsUserMapper.java @@ -0,0 +1,37 @@ +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-07-18 14:35:51 + */ +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/src/main/java/com/gxwebsoft/oa/mapper/CustomerMapper.java b/src/main/java/com/gxwebsoft/oa/mapper/CustomerMapper.java new file mode 100644 index 0000000..b77a4ae --- /dev/null +++ b/src/main/java/com/gxwebsoft/oa/mapper/CustomerMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.oa.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.oa.entity.Customer; +import com.gxwebsoft.oa.param.CustomerParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 客户管理记录表Mapper + * + * @author WebSoft + * @since 2022-11-16 11:16:14 + */ +public interface CustomerMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") CustomerParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") CustomerParam param); + +} diff --git a/src/main/java/com/gxwebsoft/oa/mapper/NoticeMapper.java b/src/main/java/com/gxwebsoft/oa/mapper/NoticeMapper.java new file mode 100644 index 0000000..478d1f7 --- /dev/null +++ b/src/main/java/com/gxwebsoft/oa/mapper/NoticeMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.oa.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.oa.entity.Notice; +import com.gxwebsoft.oa.param.NoticeParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 消息记录表Mapper + * + * @author 科技小王子 + * @since 2023-03-22 14:07:26 + */ +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/src/main/java/com/gxwebsoft/oa/mapper/ProjectMapper.java b/src/main/java/com/gxwebsoft/oa/mapper/ProjectMapper.java new file mode 100644 index 0000000..ff5cb98 --- /dev/null +++ b/src/main/java/com/gxwebsoft/oa/mapper/ProjectMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.oa.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.oa.entity.Project; +import com.gxwebsoft.oa.param.ProjectParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 项目管理表Mapper + * + * @author WebSoft + * @since 2022-11-16 11:00:43 + */ +public interface ProjectMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") ProjectParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") ProjectParam param); + +} diff --git a/src/main/java/com/gxwebsoft/oa/mapper/TaskMapper.java b/src/main/java/com/gxwebsoft/oa/mapper/TaskMapper.java new file mode 100644 index 0000000..17fa0e0 --- /dev/null +++ b/src/main/java/com/gxwebsoft/oa/mapper/TaskMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.oa.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.oa.entity.Task; +import com.gxwebsoft.oa.param.TaskParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 文章记录表Mapper + * + * @author WebSoft + * @since 2022-11-16 11:21:43 + */ +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); + +} diff --git a/src/main/java/com/gxwebsoft/oa/mapper/TaskRecordMapper.java b/src/main/java/com/gxwebsoft/oa/mapper/TaskRecordMapper.java new file mode 100644 index 0000000..9d1666a --- /dev/null +++ b/src/main/java/com/gxwebsoft/oa/mapper/TaskRecordMapper.java @@ -0,0 +1,37 @@ +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-03-05 00:52:21 + */ +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/src/main/java/com/gxwebsoft/oa/mapper/TaskUserMapper.java b/src/main/java/com/gxwebsoft/oa/mapper/TaskUserMapper.java new file mode 100644 index 0000000..9b1ecf8 --- /dev/null +++ b/src/main/java/com/gxwebsoft/oa/mapper/TaskUserMapper.java @@ -0,0 +1,37 @@ +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-03-06 12:00:41 + */ +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/src/main/java/com/gxwebsoft/oa/mapper/xml/AppMapper.xml b/src/main/java/com/gxwebsoft/oa/mapper/xml/AppMapper.xml new file mode 100644 index 0000000..c81507e --- /dev/null +++ b/src/main/java/com/gxwebsoft/oa/mapper/xml/AppMapper.xml @@ -0,0 +1,195 @@ + + + + + + + SELECT a.*, + b.company_id, + b.short_name, + b.company_name, + c.nickname, + c.real_name, + c.user_id, + c.avatar + FROM oa_app a + LEFT JOIN sys_company b ON a.company_id = b.company_id + LEFT JOIN sys_user c ON a.user_id = c.user_id + + + AND a.app_id = #{param.appId} + + + AND a.app_name LIKE CONCAT('%', #{param.appName}, '%') + + + AND a.parent_id = #{param.parentId} + + + AND a.app_code LIKE CONCAT('%', #{param.appCode}, '%') + + + AND a.app_type LIKE CONCAT('%', #{param.appType}, '%') + + + AND a.menu_type = #{param.menuType} + + + AND a.company_id = #{param.companyId} + + + 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.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.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.sort_number = #{param.sortNumber} + + + AND a.status = #{param.status} + + + AND a.deleted = #{param.deleted} + + + AND a.deleted = 0 + + + AND a.app_id IN (SELECT app_id FROM oa_app_user WHERE user_id=#{param.userId}) + + + AND a.app_id IN + + #{item} + + + + AND a.organization_id = #{param.organizationId} + + + AND a.tenant_id = #{param.tenantId} + + + AND a.tenant_code LIKE CONCAT('%', #{param.tenantCode}, '%') + + + AND a.create_time >= #{param.createTimeStart} + + + AND a.create_time <= #{param.createTimeEnd} + + + AND a.app_status = #{param.appStatus} + + + AND a.company_id = #{param.companyId} + + + + AND (a.app_name LIKE CONCAT('%', #{param.keywords}, '%') + OR b.short_name LIKE CONCAT('%', #{param.keywords}, '%') + OR b.company_id = #{param.keywords} + OR b.company_name LIKE CONCAT('%', #{param.keywords}, '%') + ) + + + + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/oa/mapper/xml/AppUserMapper.xml b/src/main/java/com/gxwebsoft/oa/mapper/xml/AppUserMapper.xml new file mode 100644 index 0000000..967f400 --- /dev/null +++ b/src/main/java/com/gxwebsoft/oa/mapper/xml/AppUserMapper.xml @@ -0,0 +1,52 @@ + + + + + + + SELECT a.*, b.nickname,b.email,b.phone,b.avatar + FROM oa_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/src/main/java/com/gxwebsoft/oa/mapper/xml/AssetsMapper.xml b/src/main/java/com/gxwebsoft/oa/mapper/xml/AssetsMapper.xml new file mode 100644 index 0000000..d204f35 --- /dev/null +++ b/src/main/java/com/gxwebsoft/oa/mapper/xml/AssetsMapper.xml @@ -0,0 +1,149 @@ + + + + + + + SELECT a.*, + b.user_id,b.avatar,b.nickname, + c.company_name + FROM oa_assets a + LEFT JOIN sys_user b ON a.user_id = b.user_id + LEFT JOIN sys_company c ON a.company_id = c.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.start_time LIKE CONCAT('%', #{param.startTime}, '%') + + + AND a.end_time LIKE CONCAT('%', #{param.endTime}, '%') + + + AND a.is_top LIKE CONCAT('%', #{param.isTop}, '%') + + + AND a.visibility LIKE CONCAT('%', #{param.visibility}, '%') + + + AND a.sort_number = #{param.sortNumber} + + + AND a.comments LIKE CONCAT('%', #{param.comments}, '%') + + + AND a.user_id = #{param.userId} + + + AND a.company_id = #{param.companyId} + + + 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/src/main/java/com/gxwebsoft/oa/mapper/xml/AssetsUserMapper.xml b/src/main/java/com/gxwebsoft/oa/mapper/xml/AssetsUserMapper.xml new file mode 100644 index 0000000..660a834 --- /dev/null +++ b/src/main/java/com/gxwebsoft/oa/mapper/xml/AssetsUserMapper.xml @@ -0,0 +1,52 @@ + + + + + + + SELECT a.*, b.nickname,b.email,b.phone,b.avatar + FROM oa_assets_user a + LEFT JOIN sys_user b ON a.user_id = b.user_id + + + 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} + + + 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/src/main/java/com/gxwebsoft/oa/mapper/xml/CustomerMapper.xml b/src/main/java/com/gxwebsoft/oa/mapper/xml/CustomerMapper.xml new file mode 100644 index 0000000..913b5f8 --- /dev/null +++ b/src/main/java/com/gxwebsoft/oa/mapper/xml/CustomerMapper.xml @@ -0,0 +1,107 @@ + + + + + + + SELECT a.* + FROM oa_customer a + + + AND a.customer_id = #{param.customerId} + + + AND a.customer_name LIKE CONCAT('%', #{param.customerName}, '%') + + + AND a.customer_code LIKE CONCAT('%', #{param.customerCode}, '%') + + + AND a.customer_full_name LIKE CONCAT('%', #{param.customerFullName}, '%') + + + AND a.customer_avatar LIKE CONCAT('%', #{param.customerAvatar}, '%') + + + AND a.customer_type LIKE CONCAT('%', #{param.customerType}, '%') + + + AND a.customer_type = '' + + + AND a.customer_source LIKE CONCAT('%', #{param.customerSource}, '%') + + + AND a.customer_phone LIKE CONCAT('%', #{param.customerPhone}, '%') + + + AND a.customer_mobile LIKE CONCAT('%', #{param.customerMobile}, '%') + + + AND a.customer_contacts LIKE CONCAT('%', #{param.customerContacts}, '%') + + + AND a.customer_province LIKE CONCAT('%', #{param.customerProvince}, '%') + + + AND a.customer_city LIKE CONCAT('%', #{param.customerCity}, '%') + + + AND a.customer_region LIKE CONCAT('%', #{param.customerRegion}, '%') + + + AND a.customer_address LIKE CONCAT('%', #{param.customerAddress}, '%') + + + AND a.progress LIKE CONCAT('%', #{param.progress}, '%') + + + AND a.user_id = #{param.userId} + + + AND a.organization_id = #{param.organizationId} + + + AND a.visibility LIKE CONCAT('%', #{param.visibility}, '%') + + + 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.customer_name LIKE CONCAT('%', #{param.keywords}, '%') + OR a.customer_contacts LIKE CONCAT('%', #{param.keywords}, '%') + OR a.customer_mobile LIKE CONCAT('%', #{param.keywords}, '%') + ) + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/oa/mapper/xml/NoticeMapper.xml b/src/main/java/com/gxwebsoft/oa/mapper/xml/NoticeMapper.xml new file mode 100644 index 0000000..a5ab6d5 --- /dev/null +++ b/src/main/java/com/gxwebsoft/oa/mapper/xml/NoticeMapper.xml @@ -0,0 +1,69 @@ + + + + + + + SELECT a.*, + b.nickname, + b.user_id, + b.avatar + FROM oa_notice a + LEFT JOIN sys_user b ON a.user_id = b.user_id + + + 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.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} + + + AND b.nickname LIKE CONCAT('%', #{param.nickname}, '%') + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/oa/mapper/xml/ProjectMapper.xml b/src/main/java/com/gxwebsoft/oa/mapper/xml/ProjectMapper.xml new file mode 100644 index 0000000..5e419a7 --- /dev/null +++ b/src/main/java/com/gxwebsoft/oa/mapper/xml/ProjectMapper.xml @@ -0,0 +1,116 @@ + + + + + + + SELECT a.* + FROM oa_project a + + + AND a.project_id = #{param.projectId} + + + AND a.project_name LIKE CONCAT('%', #{param.projectName}, '%') + + + AND a.project_code LIKE CONCAT('%', #{param.projectCode}, '%') + + + AND a.project_category LIKE CONCAT('%', #{param.projectCategory}, '%') + + + AND a.project_avatar LIKE CONCAT('%', #{param.projectAvatar}, '%') + + + AND a.url LIKE CONCAT('%', #{param.url}, '%') + + + AND a.url_dev LIKE CONCAT('%', #{param.urlDev}, '%') + + + AND a.url_admin LIKE CONCAT('%', #{param.urlAdmin}, '%') + + + AND a.account LIKE CONCAT('%', #{param.account}, '%') + + + AND a.money = #{param.money} + + + AND a.real_money = #{param.realMoney} + + + AND a.annual_fee = #{param.annualFee} + + + AND a.content LIKE CONCAT('%', #{param.content}, '%') + + + AND a.param LIKE CONCAT('%', #{param.param}, '%') + + + AND a.qrcode LIKE CONCAT('%', #{param.qrcode}, '%') + + + AND a.customer_name LIKE CONCAT('%', #{param.customerName}, '%') + + + AND a.progress = #{param.progress} + + + AND a.views = #{param.views} + + + AND a.status = #{param.status} + + + AND a.sort_number = #{param.sortNumber} + + + AND a.is_case = #{param.isCase} + + + AND a.commander = #{param.commander} + + + AND a.user_id = #{param.userId} + + + AND a.organization_id = #{param.organizationId} + + + AND a.visibility LIKE CONCAT('%', #{param.visibility}, '%') + + + AND a.customer_id = #{param.customerId} + + + 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/src/main/java/com/gxwebsoft/oa/mapper/xml/TaskMapper.xml b/src/main/java/com/gxwebsoft/oa/mapper/xml/TaskMapper.xml new file mode 100644 index 0000000..a6e8871 --- /dev/null +++ b/src/main/java/com/gxwebsoft/oa/mapper/xml/TaskMapper.xml @@ -0,0 +1,132 @@ + + + + + + + SELECT a.*, + b.nickname as promoterName,b.avatar as promoterAvatar,b.alias as promoterAlias,b.company_name as promoterCompanyName, + c.nickname as commanderName,c.avatar as commanderAvatar,c.alias as commanderAlias,c.company_name as commanderCompanyName, + d.nickname as lastNickname ,d.avatar as lastAvatar,d.real_name as lastRealName,d.company_name as lastCompanyName, + e.app_id,e.app_name + FROM oa_task a + LEFT JOIN sys_user b ON a.promoter = b.user_id + LEFT JOIN sys_user c ON a.commander = c.user_id + LEFT JOIN sys_user d ON a.last_read_user = d.user_id + LEFT JOIN oa_app e ON a.app_id = e.app_id + + + AND a.task_id = #{param.taskId} + + + AND a.name LIKE CONCAT('%', #{param.name}, '%') + + + AND a.task_type IN + + #{item} + + + + AND a.customer_id = #{param.customerId} + + + AND a.app_id = #{param.appId} + + + AND a.project_id = #{param.projectId} + + + AND a.assets_id = #{param.assetsId} + + + AND a.start_time LIKE CONCAT('%', #{param.startTime}, '%') + + + AND a.end_time LIKE CONCAT('%', #{param.endTime}, '%') + + + AND a.content LIKE CONCAT('%', #{param.content}, '%') + + + AND a.promoter = #{param.promoter} + + + AND (a.commander = #{param.commander} OR a.promoter = #{param.commander}) + + + AND a.progress IN + + #{item} + + + + AND a.priority LIKE CONCAT('%', #{param.priority}, '%') + + + AND a.quality LIKE CONCAT('%', #{param.quality}, '%') + + + AND a.day = #{param.day} + + + AND a.user_id = #{param.userId} + + + + + + AND a.organization_id = #{param.organizationId} + + + 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.create_time >= #{param.createTimeStart} + + + AND a.create_time <= #{param.createTimeEnd} + + + AND (a.name LIKE CONCAT('%', #{param.keywords}, '%') + OR a.task_id LIKE CONCAT('%', #{param.keywords}, '%') + OR b.nickname LIKE CONCAT('%', #{param.keywords}, '%') + OR b.real_name LIKE CONCAT('%', #{param.keywords}, '%') + OR b.company_name LIKE CONCAT('%', #{param.keywords}, '%') + OR c.nickname LIKE CONCAT('%', #{param.keywords}, '%') + OR c.real_name LIKE CONCAT('%', #{param.keywords}, '%') + OR e.app_name LIKE CONCAT('%', #{param.keywords}, '%') + ) + + + AND b.app_name LIKE CONCAT('%', #{param.appName}, '%') + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/oa/mapper/xml/TaskRecordMapper.xml b/src/main/java/com/gxwebsoft/oa/mapper/xml/TaskRecordMapper.xml new file mode 100644 index 0000000..3978d19 --- /dev/null +++ b/src/main/java/com/gxwebsoft/oa/mapper/xml/TaskRecordMapper.xml @@ -0,0 +1,69 @@ + + + + + + + SELECT a.*, + b.nickname, + b.user_id, + b.avatar + FROM oa_task_record a + LEFT JOIN sys_user b ON a.user_id = b.user_id + + + AND a.task_record_id = #{param.taskRecordId} + + + AND a.task_id = #{param.taskId} + + + AND a.content LIKE CONCAT('%', #{param.content}, '%') + + + AND a.files LIKE CONCAT('%', #{param.files}, '%') + + + AND a.developer_id = #{param.developerId} + + + 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 b.nickname LIKE CONCAT('%', #{param.nickname}, '%') + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/oa/mapper/xml/TaskUserMapper.xml b/src/main/java/com/gxwebsoft/oa/mapper/xml/TaskUserMapper.xml new file mode 100644 index 0000000..dc3819c --- /dev/null +++ b/src/main/java/com/gxwebsoft/oa/mapper/xml/TaskUserMapper.xml @@ -0,0 +1,50 @@ + + + + + + + SELECT a.*, + b.nickname as name, + b.phone, + b.user_id, + b.avatar, + b.email + FROM oa_task_user a + LEFT JOIN sys_user b ON a.user_id = b.user_id + + + 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/src/main/java/com/gxwebsoft/oa/param/AppParam.java b/src/main/java/com/gxwebsoft/oa/param/AppParam.java new file mode 100644 index 0000000..ca7eceb --- /dev/null +++ b/src/main/java/com/gxwebsoft/oa/param/AppParam.java @@ -0,0 +1,187 @@ +package com.gxwebsoft.oa.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.math.BigDecimal; +import java.util.Set; + +/** + * 应用管理记录表查询参数 + * + * @author 科技小王子 + * @since 2023-03-28 10:45:39 + */ +@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 = "上级id, 0是顶级") + @QueryField(type = QueryType.EQ) + private Integer parentId; + + @ApiModelProperty(value = "应用标识") + private String appCode; + + @ApiModelProperty(value = "应用类型") + private String appType; + + @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 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 gitUrl; + + @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 = "软件定价") + @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 = "排序(数字越小越靠前)") + @QueryField(type = QueryType.EQ) + private Integer sortNumber; + + @ApiModelProperty(value = "应用状态") + private String appStatus; + + @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") + private Integer tenantId; + + @ApiModelProperty(value = "机构id") + @QueryField(type = QueryType.EQ) + private Integer organizationId; + + @ApiModelProperty(value = "企业名称") + private String companyName; + + @ApiModelProperty(value = "租户编号") + private String tenantCode; + + @ApiModelProperty(value = "按APPID集搜索") + @TableField(exist = false) + private Set appIds; + +} diff --git a/src/main/java/com/gxwebsoft/oa/param/AppUserParam.java b/src/main/java/com/gxwebsoft/oa/param/AppUserParam.java new file mode 100644 index 0000000..136f2ad --- /dev/null +++ b/src/main/java/com/gxwebsoft/oa/param/AppUserParam.java @@ -0,0 +1,66 @@ +package com.gxwebsoft.oa.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-05-31 13:18:55 + */ +@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/src/main/java/com/gxwebsoft/oa/param/AssetsParam.java b/src/main/java/com/gxwebsoft/oa/param/AssetsParam.java new file mode 100644 index 0000000..5d85734 --- /dev/null +++ b/src/main/java/com/gxwebsoft/oa/param/AssetsParam.java @@ -0,0 +1,151 @@ +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 WebSoft + * @since 2022-11-16 11:13:16 + */ +@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 String startTime; + + @ApiModelProperty(value = "到期时间") + private String endTime; + + @ApiModelProperty(value = "置顶状态") + private String isTop; + + @ApiModelProperty(value = "可见性(public,private,protected)") + private String visibility; + + @ApiModelProperty(value = "文章排序(数字越小越靠前)") + @QueryField(type = QueryType.EQ) + private Integer sortNumber; + + @ApiModelProperty(value = "描述") + private String comments; + + @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 = "企业ID") + private Integer companyId; + + @ApiModelProperty(value = "企业名称") + @TableField(exist = false) + private String companyName; + + @ApiModelProperty(value = "按ID集搜索") + @TableField(exist = false) + private Set assetsIds; + + + + +} diff --git a/src/main/java/com/gxwebsoft/oa/param/AssetsUserParam.java b/src/main/java/com/gxwebsoft/oa/param/AssetsUserParam.java new file mode 100644 index 0000000..e707856 --- /dev/null +++ b/src/main/java/com/gxwebsoft/oa/param/AssetsUserParam.java @@ -0,0 +1,66 @@ +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-07-18 14:35:51 + */ +@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; + + @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/src/main/java/com/gxwebsoft/oa/param/CustomerParam.java b/src/main/java/com/gxwebsoft/oa/param/CustomerParam.java new file mode 100644 index 0000000..84a9223 --- /dev/null +++ b/src/main/java/com/gxwebsoft/oa/param/CustomerParam.java @@ -0,0 +1,101 @@ +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 WebSoft + * @since 2022-11-16 11:16:14 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "CustomerParam对象", description = "客户管理记录表查询参数") +public class CustomerParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "客户ID") + @QueryField(type = QueryType.EQ) + private Integer customerId; + + @ApiModelProperty(value = "客户名称") + private String customerName; + + @ApiModelProperty(value = "客户标识") + private String customerCode; + + @ApiModelProperty(value = "客户全称") + private String customerFullName; + + @ApiModelProperty(value = "头像") + private String customerAvatar; + + @ApiModelProperty(value = "客户类型") + private String customerType; + + @ApiModelProperty(value = "客户来源") + private String customerSource; + + @ApiModelProperty(value = "公司座机") + private String customerPhone; + + @ApiModelProperty(value = "手机号码") + private String customerMobile; + + @ApiModelProperty(value = "联系人") + private String customerContacts; + + @ApiModelProperty(value = "所在省份") + private String customerProvince; + + @ApiModelProperty(value = "所在城市") + private String customerCity; + + @ApiModelProperty(value = "所在地区") + private String customerRegion; + + @ApiModelProperty(value = "所在地址") + private String customerAddress; + + @ApiModelProperty(value = "跟进状态") + private String progress; + + @ApiModelProperty(value = "用户ID") + @QueryField(type = QueryType.EQ) + private Integer userId; + + @ApiModelProperty(value = "机构id") + @QueryField(type = QueryType.EQ) + private Integer organizationId; + + @ApiModelProperty(value = "可见性(public,private,protected)") + private String visibility; + + @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 = "按无企业类型查询") + @QueryField(type = QueryType.EQ) + private Boolean emptyType; + +} diff --git a/src/main/java/com/gxwebsoft/oa/param/NoticeParam.java b/src/main/java/com/gxwebsoft/oa/param/NoticeParam.java new file mode 100644 index 0000000..df369ae --- /dev/null +++ b/src/main/java/com/gxwebsoft/oa/param/NoticeParam.java @@ -0,0 +1,80 @@ +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-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; + +} diff --git a/src/main/java/com/gxwebsoft/oa/param/ProjectParam.java b/src/main/java/com/gxwebsoft/oa/param/ProjectParam.java new file mode 100644 index 0000000..a35020d --- /dev/null +++ b/src/main/java/com/gxwebsoft/oa/param/ProjectParam.java @@ -0,0 +1,125 @@ +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; + +import java.math.BigDecimal; + +/** + * 项目管理表查询参数 + * + * @author WebSoft + * @since 2022-11-16 11:00:43 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "ProjectParam对象", description = "项目管理表查询参数") +public class ProjectParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "项目ID") + @QueryField(type = QueryType.EQ) + private Integer projectId; + + @ApiModelProperty(value = "项目名称") + private String projectName; + + @ApiModelProperty(value = "项目标识") + private String projectCode; + + @ApiModelProperty(value = "商品分类") + private String projectCategory; + + @ApiModelProperty(value = "项目商标") + private String projectAvatar; + + @ApiModelProperty(value = "项目域名") + private String url; + + @ApiModelProperty(value = "开发版域名") + private String urlDev; + + @ApiModelProperty(value = "后台管理地址") + private String urlAdmin; + + @ApiModelProperty(value = "默认账号密码") + private String account; + + @ApiModelProperty(value = "项目金额") + @QueryField(type = QueryType.EQ) + private BigDecimal money; + + @ApiModelProperty(value = "实际金额") + @QueryField(type = QueryType.EQ) + private BigDecimal realMoney; + + @ApiModelProperty(value = "年费") + @QueryField(type = QueryType.EQ) + private BigDecimal annualFee; + + @ApiModelProperty(value = "项目详情") + private String content; + + @ApiModelProperty(value = "开发参数(json)") + private String param; + + @ApiModelProperty(value = "二维码") + private String qrcode; + + @ApiModelProperty(value = "客户名称") + private String customerName; + + @ApiModelProperty(value = "项目进度（10待安排 20策划设计 30功能开发 40待验收 50完成）") + @QueryField(type = QueryType.EQ) + private Integer progress; + + @ApiModelProperty(value = "初始浏览数") + @QueryField(type = QueryType.EQ) + private Integer views; + + @ApiModelProperty(value = "状态(10上架 20下架)") + @QueryField(type = QueryType.EQ) + private Integer status; + + @ApiModelProperty(value = "排序(数字越小越靠前)") + @QueryField(type = QueryType.EQ) + private Integer sortNumber; + + @ApiModelProperty(value = "是否精选客户案例") + @QueryField(type = QueryType.EQ) + private Boolean isCase; + + @ApiModelProperty(value = "负责人") + @QueryField(type = QueryType.EQ) + private Integer commander; + + @ApiModelProperty(value = "用户ID") + @QueryField(type = QueryType.EQ) + private Integer userId; + + @ApiModelProperty(value = "机构id") + @QueryField(type = QueryType.EQ) + private Integer organizationId; + + @ApiModelProperty(value = "可见性(public,private,protected)") + private String visibility; + + @ApiModelProperty(value = "项目归属者") + @QueryField(type = QueryType.EQ) + private Integer customerId; + + @ApiModelProperty(value = "项目描述") + private String comments; + + @ApiModelProperty(value = "是否删除, 0否, 1是") + @QueryField(type = QueryType.EQ) + private Integer deleted; + +} diff --git a/src/main/java/com/gxwebsoft/oa/param/TaskParam.java b/src/main/java/com/gxwebsoft/oa/param/TaskParam.java new file mode 100644 index 0000000..c736e96 --- /dev/null +++ b/src/main/java/com/gxwebsoft/oa/param/TaskParam.java @@ -0,0 +1,145 @@ +package com.gxwebsoft.oa.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 2022-11-16 11:21:42 + */ +@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 Integer appId; + + @ApiModelProperty(value = "客户ID") + @QueryField(type = QueryType.EQ) + private Integer customerId; + + @ApiModelProperty(value = "项目ID") + @QueryField(type = QueryType.EQ) + private Integer projectId; + + @ApiModelProperty(value = "资产ID") + @QueryField(type = QueryType.EQ) + private Integer assetsId; + + @ApiModelProperty(value = "是否已查阅") + private Integer isRead; + + @ApiModelProperty(value = "最后回复人ID") + private Integer lastReadUser; + + @ApiModelProperty(value = "最后回复人头像") + @TableField(exist = false) + private String lastAvatar; + + @ApiModelProperty(value = "最后回复人昵称") + @TableField(exist = false) + private String lastNickname; + + @ApiModelProperty(value = "最后回复人姓名") + @TableField(exist = false) + private String lastRealName; + + @ApiModelProperty(value = "最后回复人公司名称") + @TableField(exist = false) + private String lastCompanyName; + + @ApiModelProperty(value = "开始时间") + private String startTime; + + @ApiModelProperty(value = "结束时间") + private String endTime; + + @ApiModelProperty(value = "任务内容") + private String content; + + @ApiModelProperty(value = "任务发起人") + @QueryField(type = QueryType.EQ) + private Integer promoter; + + @ApiModelProperty(value = "负责人") + private Integer commander; + + @ApiModelProperty(value = "任务状态") + private String progress; + + @ApiModelProperty(value = "优先级") + private String priority; + + @ApiModelProperty(value = "品质要求") + private String quality; + + @ApiModelProperty(value = "时限(天)") + @QueryField(type = QueryType.EQ) + private Integer day; + + @ApiModelProperty(value = "用户ID") + @QueryField(type = QueryType.EQ) + private Integer userId; + + @ApiModelProperty(value = "机构id") + @QueryField(type = QueryType.EQ) + private Integer organizationId; + + @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 = "用户昵称") + @QueryField(type = QueryType.EQ) + private String nickname; + + @ApiModelProperty(value = "用户头像") + @QueryField(type = QueryType.EQ) + private String avatar; + + @ApiModelProperty(value = "应用名称") + @TableField(exist = false) + private String appName; + + @ApiModelProperty(value = "关键词搜索") + @TableField(exist = false) + private String keywords; + +} diff --git a/src/main/java/com/gxwebsoft/oa/param/TaskRecordParam.java b/src/main/java/com/gxwebsoft/oa/param/TaskRecordParam.java new file mode 100644 index 0000000..822697f --- /dev/null +++ b/src/main/java/com/gxwebsoft/oa/param/TaskRecordParam.java @@ -0,0 +1,75 @@ +package com.gxwebsoft.oa.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 com.gxwebsoft.oa.entity.App; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 工单回复记录表查询参数 + * + * @author 科技小王子 + * @since 2023-03-05 00:52:21 + */ +@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") + @QueryField(type = QueryType.EQ) + private Integer taskId; + + @ApiModelProperty(value = "上级ID") + private Integer parentId; + + @ApiModelProperty(value = "任务内容") + private String content; + + @ApiModelProperty(value = "工单附件") + private String files; + + @ApiModelProperty(value = "开发者ID") + @QueryField(type = QueryType.EQ) + private Integer developerId; + + @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; + + @ApiModelProperty(value = "用户昵称") + @QueryField(type = QueryType.EQ) + private String nickname; + + @ApiModelProperty(value = "用户头像") + @QueryField(type = QueryType.EQ) + private String avatar; + +} diff --git a/src/main/java/com/gxwebsoft/oa/param/TaskUserParam.java b/src/main/java/com/gxwebsoft/oa/param/TaskUserParam.java new file mode 100644 index 0000000..577aa4c --- /dev/null +++ b/src/main/java/com/gxwebsoft/oa/param/TaskUserParam.java @@ -0,0 +1,45 @@ +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-03-06 12:00:41 + */ +@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/src/main/java/com/gxwebsoft/oa/service/AppService.java b/src/main/java/com/gxwebsoft/oa/service/AppService.java new file mode 100644 index 0000000..bf03d2d --- /dev/null +++ b/src/main/java/com/gxwebsoft/oa/service/AppService.java @@ -0,0 +1,45 @@ +package com.gxwebsoft.oa.service; + +import com.baomidou.mybatisplus.annotation.InterceptorIgnore; +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-03-28 10:45:39 + */ +public interface AppService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + @InterceptorIgnore(tenantLine = "true") + PageResult pageRel(AppParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(AppParam param); + + /** + * 根据id查询 + * + * @param appId 应用ID + * @return App + */ + @InterceptorIgnore(tenantLine = "true") + App getByIdRel(Integer appId); + +} diff --git a/src/main/java/com/gxwebsoft/oa/service/AppUserService.java b/src/main/java/com/gxwebsoft/oa/service/AppUserService.java new file mode 100644 index 0000000..0a152f9 --- /dev/null +++ b/src/main/java/com/gxwebsoft/oa/service/AppUserService.java @@ -0,0 +1,42 @@ +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-05-31 13:18:55 + */ +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/src/main/java/com/gxwebsoft/oa/service/AssetsService.java b/src/main/java/com/gxwebsoft/oa/service/AssetsService.java new file mode 100644 index 0000000..275d3f7 --- /dev/null +++ b/src/main/java/com/gxwebsoft/oa/service/AssetsService.java @@ -0,0 +1,42 @@ +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 WebSoft + * @since 2022-11-16 11:13:16 + */ +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/src/main/java/com/gxwebsoft/oa/service/AssetsUserService.java b/src/main/java/com/gxwebsoft/oa/service/AssetsUserService.java new file mode 100644 index 0000000..45a50bb --- /dev/null +++ b/src/main/java/com/gxwebsoft/oa/service/AssetsUserService.java @@ -0,0 +1,42 @@ +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-07-18 14:35:51 + */ +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/src/main/java/com/gxwebsoft/oa/service/CustomerService.java b/src/main/java/com/gxwebsoft/oa/service/CustomerService.java new file mode 100644 index 0000000..393265f --- /dev/null +++ b/src/main/java/com/gxwebsoft/oa/service/CustomerService.java @@ -0,0 +1,43 @@ +package com.gxwebsoft.oa.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.oa.entity.Customer; +import com.gxwebsoft.oa.param.CustomerParam; + +import java.util.List; + +/** + * 客户管理记录表Service + * + * @author WebSoft + * @since 2022-11-16 11:16:14 + */ +public interface CustomerService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(CustomerParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(CustomerParam param); + + /** + * 根据id查询 + * + * @param customerId 客户ID + * @return Customer + */ + Customer getByIdRel(Integer customerId); + + Customer getByCustomerName(String customerName); +} diff --git a/src/main/java/com/gxwebsoft/oa/service/NoticeService.java b/src/main/java/com/gxwebsoft/oa/service/NoticeService.java new file mode 100644 index 0000000..b14c659 --- /dev/null +++ b/src/main/java/com/gxwebsoft/oa/service/NoticeService.java @@ -0,0 +1,51 @@ +package com.gxwebsoft.oa.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.oa.entity.Notice; +import com.gxwebsoft.oa.entity.Task; +import com.gxwebsoft.oa.entity.TaskRecord; +import com.gxwebsoft.oa.param.NoticeParam; + +import java.util.List; + +/** + * 消息记录表Service + * + * @author 科技小王子 + * @since 2023-03-22 14:07:26 + */ +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); + + void add(); + + void addNotice(Task task); + + void addLetter(TaskRecord taskRecord); + + void addTodo(Task task); +} diff --git a/src/main/java/com/gxwebsoft/oa/service/ProjectService.java b/src/main/java/com/gxwebsoft/oa/service/ProjectService.java new file mode 100644 index 0000000..ffd1934 --- /dev/null +++ b/src/main/java/com/gxwebsoft/oa/service/ProjectService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.oa.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.oa.entity.Project; +import com.gxwebsoft.oa.param.ProjectParam; + +import java.util.List; + +/** + * 项目管理表Service + * + * @author WebSoft + * @since 2022-11-16 11:00:43 + */ +public interface ProjectService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(ProjectParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(ProjectParam param); + + /** + * 根据id查询 + * + * @param projectId 项目ID + * @return Project + */ + Project getByIdRel(Integer projectId); + +} diff --git a/src/main/java/com/gxwebsoft/oa/service/TaskRecordService.java b/src/main/java/com/gxwebsoft/oa/service/TaskRecordService.java new file mode 100644 index 0000000..130883c --- /dev/null +++ b/src/main/java/com/gxwebsoft/oa/service/TaskRecordService.java @@ -0,0 +1,42 @@ +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-03-05 00:52:21 + */ +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/src/main/java/com/gxwebsoft/oa/service/TaskService.java b/src/main/java/com/gxwebsoft/oa/service/TaskService.java new file mode 100644 index 0000000..30e7c80 --- /dev/null +++ b/src/main/java/com/gxwebsoft/oa/service/TaskService.java @@ -0,0 +1,47 @@ +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 WebSoft + * @since 2022-11-16 11:21:43 + */ +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); + + ArrayList getCountNum(User loginUser, TaskParam param); +} diff --git a/src/main/java/com/gxwebsoft/oa/service/TaskUserService.java b/src/main/java/com/gxwebsoft/oa/service/TaskUserService.java new file mode 100644 index 0000000..15b9927 --- /dev/null +++ b/src/main/java/com/gxwebsoft/oa/service/TaskUserService.java @@ -0,0 +1,42 @@ +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-03-06 12:00:41 + */ +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/src/main/java/com/gxwebsoft/oa/service/impl/AppServiceImpl.java b/src/main/java/com/gxwebsoft/oa/service/impl/AppServiceImpl.java new file mode 100644 index 0000000..b2bbf2f --- /dev/null +++ b/src/main/java/com/gxwebsoft/oa/service/impl/AppServiceImpl.java @@ -0,0 +1,52 @@ +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.App; +import com.gxwebsoft.oa.mapper.AppMapper; +import com.gxwebsoft.oa.param.AppParam; +import com.gxwebsoft.oa.service.AppService; +import com.gxwebsoft.oa.service.AppUserService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 应用管理记录表Service实现 + * + * @author 科技小王子 + * @since 2023-03-28 10:45:39 + */ +@Service +public class AppServiceImpl extends ServiceImpl implements AppService { + @Resource + private AppUserService appUserService; + + @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/src/main/java/com/gxwebsoft/oa/service/impl/AppUserServiceImpl.java b/src/main/java/com/gxwebsoft/oa/service/impl/AppUserServiceImpl.java new file mode 100644 index 0000000..b31f04d --- /dev/null +++ b/src/main/java/com/gxwebsoft/oa/service/impl/AppUserServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.oa.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.oa.mapper.AppUserMapper; +import com.gxwebsoft.oa.service.AppUserService; +import com.gxwebsoft.oa.entity.AppUser; +import com.gxwebsoft.oa.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-05-31 13:18:55 + */ +@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/src/main/java/com/gxwebsoft/oa/service/impl/AssetsServiceImpl.java b/src/main/java/com/gxwebsoft/oa/service/impl/AssetsServiceImpl.java new file mode 100644 index 0000000..3cba77d --- /dev/null +++ b/src/main/java/com/gxwebsoft/oa/service/impl/AssetsServiceImpl.java @@ -0,0 +1,47 @@ +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 WebSoft + * @since 2022-11-16 11:13:16 + */ +@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/src/main/java/com/gxwebsoft/oa/service/impl/AssetsUserServiceImpl.java b/src/main/java/com/gxwebsoft/oa/service/impl/AssetsUserServiceImpl.java new file mode 100644 index 0000000..917c503 --- /dev/null +++ b/src/main/java/com/gxwebsoft/oa/service/impl/AssetsUserServiceImpl.java @@ -0,0 +1,47 @@ +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-07-18 14:35:51 + */ +@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/src/main/java/com/gxwebsoft/oa/service/impl/CustomerServiceImpl.java b/src/main/java/com/gxwebsoft/oa/service/impl/CustomerServiceImpl.java new file mode 100644 index 0000000..cea7a3c --- /dev/null +++ b/src/main/java/com/gxwebsoft/oa/service/impl/CustomerServiceImpl.java @@ -0,0 +1,52 @@ +package com.gxwebsoft.oa.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.oa.mapper.CustomerMapper; +import com.gxwebsoft.oa.service.CustomerService; +import com.gxwebsoft.oa.entity.Customer; +import com.gxwebsoft.oa.param.CustomerParam; +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 WebSoft + * @since 2022-11-16 11:16:14 + */ +@Service +public class CustomerServiceImpl extends ServiceImpl implements CustomerService { + + @Override + public PageResult pageRel(CustomerParam 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(CustomerParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public Customer getByIdRel(Integer customerId) { + CustomerParam param = new CustomerParam(); + param.setCustomerId(customerId); + return param.getOne(baseMapper.selectListRel(param)); + } + + @Override + public Customer getByCustomerName(String customerName) { + return query().eq("customer_name", customerName).one(); + } + +} diff --git a/src/main/java/com/gxwebsoft/oa/service/impl/NoticeServiceImpl.java b/src/main/java/com/gxwebsoft/oa/service/impl/NoticeServiceImpl.java new file mode 100644 index 0000000..6f97606 --- /dev/null +++ b/src/main/java/com/gxwebsoft/oa/service/impl/NoticeServiceImpl.java @@ -0,0 +1,109 @@ +package com.gxwebsoft.oa.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.common.system.service.UserService; +import com.gxwebsoft.oa.entity.Task; +import com.gxwebsoft.oa.entity.TaskRecord; +import com.gxwebsoft.oa.mapper.NoticeMapper; +import com.gxwebsoft.oa.service.NoticeService; +import com.gxwebsoft.oa.entity.Notice; +import com.gxwebsoft.oa.param.NoticeParam; +import com.gxwebsoft.common.core.web.PageParam; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.oa.service.TaskService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +import static com.gxwebsoft.oa.constants.NoticeConstants.*; + +/** + * 消息记录表Service实现 + * + * @author 科技小王子 + * @since 2023-03-22 14:07:26 + */ +@Service +public class NoticeServiceImpl extends ServiceImpl implements NoticeService { + @Resource + private UserService userService; + @Resource + private TaskService taskService; + + @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)); + } + + @Override + public void add() { + } + + @Override + public void addNotice(Task task) { + Notice notice = new Notice(); + notice.setType(NOTICE); + notice.setIcon("NotificationFilled"); + notice.setSourceId(task.getTaskId()); + notice.setUserId(task.getPromoter()); + notice.setTitle(task.getName()); + notice.setContent("您有一个新指派的工单(" + task.getTaskId() + ")需要处理！"); + save(notice); + } + + @Override + public void addLetter(TaskRecord taskRecord) { + // 通知发起人 + User user = userService.getById(taskRecord.getUserId()); + Task task = taskService.getById(taskRecord.getTaskId()); + Notice notice = new Notice(); + notice.setType(LETTER); + notice.setIcon(user.getAvatar()); + notice.setSourceId(task.getTaskId()); + notice.setUserId(task.getPromoter()); + notice.setTitle(user.getNickname() + " 回复了你的工单(" + taskRecord.getTaskId() + ")"); + notice.setContent(taskRecord.getContent()); + save(notice); + // 通知代发人 + notice.setUserId(task.getUserId()); + save(notice); + } + + @Override + public void addTodo(Task task) { + Task record = taskService.getById(task.getTaskId()); + if (task.getCommander() != null) { + Notice notice = new Notice(); + notice.setType(TODO); + notice.setIcon("HistoryOutlined"); + notice.setSourceId(task.getTaskId()); + notice.setUserId(task.getCommander()); + notice.setTitle("您有一个新的工单需要处理！"); + notice.setContent(record.getName().concat("("+ task.getTaskId() +")")); + notice.setProgress(record.getProgress()); + save(notice); + } + } + +} diff --git a/src/main/java/com/gxwebsoft/oa/service/impl/ProjectServiceImpl.java b/src/main/java/com/gxwebsoft/oa/service/impl/ProjectServiceImpl.java new file mode 100644 index 0000000..f456fce --- /dev/null +++ b/src/main/java/com/gxwebsoft/oa/service/impl/ProjectServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.oa.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.oa.mapper.ProjectMapper; +import com.gxwebsoft.oa.service.ProjectService; +import com.gxwebsoft.oa.entity.Project; +import com.gxwebsoft.oa.param.ProjectParam; +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 WebSoft + * @since 2022-11-16 11:00:43 + */ +@Service +public class ProjectServiceImpl extends ServiceImpl implements ProjectService { + + @Override + public PageResult pageRel(ProjectParam 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(ProjectParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + //page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public Project getByIdRel(Integer projectId) { + ProjectParam param = new ProjectParam(); + param.setProjectId(projectId); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/oa/service/impl/TaskRecordServiceImpl.java b/src/main/java/com/gxwebsoft/oa/service/impl/TaskRecordServiceImpl.java new file mode 100644 index 0000000..da1f170 --- /dev/null +++ b/src/main/java/com/gxwebsoft/oa/service/impl/TaskRecordServiceImpl.java @@ -0,0 +1,49 @@ +package com.gxwebsoft.oa.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +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 com.gxwebsoft.oa.service.TaskService; +import org.springframework.security.core.parameters.P; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 工单回复记录表Service实现 + * + * @author 科技小王子 + * @since 2023-03-05 00:52:21 + */ +@Service +public class TaskRecordServiceImpl extends ServiceImpl implements TaskRecordService { + @Override + public PageResult pageRel(TaskRecordParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time asc"); + List list = baseMapper.selectPageRel(page, param); + return new PageResult<>(list, page.getTotal()); + } + + @Override + public List listRel(TaskRecordParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + page.setDefaultOrder("create_time asc"); + 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/src/main/java/com/gxwebsoft/oa/service/impl/TaskServiceImpl.java b/src/main/java/com/gxwebsoft/oa/service/impl/TaskServiceImpl.java new file mode 100644 index 0000000..32675e6 --- /dev/null +++ b/src/main/java/com/gxwebsoft/oa/service/impl/TaskServiceImpl.java @@ -0,0 +1,141 @@ +package com.gxwebsoft.oa.service.impl; + +import cn.hutool.core.util.StrUtil; +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.common.system.service.UserService; +import com.gxwebsoft.oa.entity.Task; +import com.gxwebsoft.oa.mapper.TaskMapper; +import com.gxwebsoft.oa.param.TaskParam; +import com.gxwebsoft.oa.service.TaskService; +import com.gxwebsoft.oa.service.TaskUserService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.atomic.AtomicInteger; + +/** + * 文章记录表Service实现 + * + * @author WebSoft + * @since 2022-11-16 11:21:43 + */ +@Service +public class TaskServiceImpl extends ServiceImpl implements TaskService { + private Integer userId; + @Resource + private UserService userService; + @Resource + private TaskUserService taskUserService; + + @Override + public PageResult pageRel(TaskParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + List list = baseMapper.selectPageRel(page, param); +// list.forEach(d -> { +// int count = taskUserService.count(new LambdaQueryWrapper().eq(TaskUser::getTaskId, d.getTaskId())); +// if(count>0){ +// TaskUserParam taskUserParam = new TaskUserParam(); +// taskUserParam.setTaskId(d.getTaskId()); +// List users = taskUserService.listRel(taskUserParam); +// d.setUsers(users); +// } +// }); + 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) { + Integer type = loginUser.getType(); + Integer 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(!StrUtil.equals(d.getRoleCode(),"superAdmin") && !StrUtil.equals(d.getRoleCode(),"admin")){ + 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 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; + } + +} diff --git a/src/main/java/com/gxwebsoft/oa/service/impl/TaskUserServiceImpl.java b/src/main/java/com/gxwebsoft/oa/service/impl/TaskUserServiceImpl.java new file mode 100644 index 0000000..d3ee7b5 --- /dev/null +++ b/src/main/java/com/gxwebsoft/oa/service/impl/TaskUserServiceImpl.java @@ -0,0 +1,47 @@ +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-03-06 12:00:41 + */ +@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/src/main/java/com/gxwebsoft/open/controller/OpenAlipayController.java b/src/main/java/com/gxwebsoft/open/controller/OpenAlipayController.java new file mode 100644 index 0000000..5399dd1 --- /dev/null +++ b/src/main/java/com/gxwebsoft/open/controller/OpenAlipayController.java @@ -0,0 +1,182 @@ +package com.gxwebsoft.open.controller; + +import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson.JSONObject; +import com.alipay.api.AlipayApiException; +import com.alipay.api.DefaultAlipayClient; +import com.alipay.api.request.AlipaySystemOauthTokenRequest; +import com.alipay.api.request.AlipayUserInfoShareRequest; +import com.alipay.api.response.AlipaySystemOauthTokenResponse; +import com.alipay.api.response.AlipayUserInfoShareResponse; +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.AlipayConfigUtil; +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.system.entity.LoginRecord; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.common.system.entity.UserRole; +import com.gxwebsoft.common.system.param.UserParam; +import com.gxwebsoft.common.system.result.LoginResult; +import com.gxwebsoft.common.system.service.LoginRecordService; +import com.gxwebsoft.common.system.service.UserRoleService; +import com.gxwebsoft.common.system.service.UserService; +import com.gxwebsoft.shop.entity.UserOauth; +import com.gxwebsoft.shop.mapper.UserOauthMapper; +import com.gxwebsoft.shop.param.UserOauthParam; +import com.gxwebsoft.shop.service.UserOauthService; +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.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; + +import static com.gxwebsoft.common.core.utils.CommonUtil.randomUsername; + +/** + * 登录认证控制器 + * + * @author WebSoft + * @since 2018-12-24 16:10:11 + */ +@Api(tags = "登录认证") +@RestController +@RequestMapping("/api/open/login-alipay") +public class OpenAlipayController extends BaseController { + @Resource + private ConfigProperties configProperties; + @Resource + private UserService userService; + @Resource + private LoginRecordService loginRecordService; + @Resource + private UserRoleService userRoleService; + @Resource + private UserOauthService userOauthService; + @Resource + private AlipayConfigUtil alipayConfig; + @Resource + private UserOauthMapper userOauthMapper; + @Resource + private StringRedisTemplate stringRedisTemplate; + + @ApiOperation("支付宝授权码") + @PostMapping("/getAuthCode") + @Transactional(rollbackFor = {Exception.class}) + public ApiResult getAuthCode(@RequestBody UserParam param, HttpServletRequest req) throws AlipayApiException { + // 验证签名 + isCheckSign(); + // 读取缓存信息 + String setting = stringRedisTemplate.opsForValue().get("cache"+param.getTenantId()+":setting:register"); + if(setting == null){ + throw new BusinessException("请先配置注册设置"); + } + JSONObject jsonObject = JSONObject.parseObject(setting); + String roleId = jsonObject.getString("roleId"); + // 实例化客户端 + DefaultAlipayClient alipayClient = alipayConfig.alipayClient(param.getTenantId()); + try { + AlipaySystemOauthTokenRequest request = new AlipaySystemOauthTokenRequest(); + request.setGrantType("authorization_code"); + request.setCode(param.getAuthCode()); + AlipaySystemOauthTokenResponse response = alipayClient.certificateExecute(request); + if (response.isSuccess()) { + final String accessToken = response.getAccessToken(); + AlipayUserInfoShareRequest request2 = new AlipayUserInfoShareRequest(); + AlipayUserInfoShareResponse userInfo = alipayClient.certificateExecute(request2, accessToken); + String nickName = "支付宝用户"; + String avatar = ""; + if(StrUtil.isNotBlank(userInfo.getAvatar())){ + avatar = userInfo.getAvatar(); + } + if (StrUtil.isNotBlank(userInfo.getNickName())) { + nickName = userInfo.getNickName(); + } + if(userInfo.isSuccess()){ + // 查询是否已注册 + UserOauthParam userOauthParam = new UserOauthParam(); + userOauthParam.setOauthId(userInfo.getUserId()); + userOauthParam.setTenantId(param.getTenantId()); + UserOauth userOauth = userOauthParam.getOne(userOauthMapper.getByOauthId(userOauthParam)); + if(userOauth != null){ + UserParam userParam = new UserParam(); + userParam.setUserId(userOauth.getUserId()); + userParam.setTenantId(userOauth.getTenantId()); + User user = userService.getByOauthId(userParam); + if(user != null){ + // 签发token + String access_token = JwtUtil.buildToken(new JwtSubject(user.getUsername(), user.getTenantId()), + configProperties.getTokenExpireTime(), configProperties.getTokenKey()); + return success("登录成功", new LoginResult(access_token, user)); + } + userOauthService.removeById(userOauth.getId()); + } + // 新注册用户 + User user = new User(); + user.setStatus(0); + user.setUsername(randomUsername("Ali_")); + user.setNickname(nickName); + user.setAvatar(avatar); + user.setCity(userInfo.getCity()); + user.setProvince(userInfo.getProvince()); + user.setPassword(userService.encodePassword(CommonUtil.randomUUID16())); + user.setTenantId(param.getTenantId()); + boolean isSuccess = userService.saveUser(user); + if(isSuccess){ + // 添加用户角色 + UserRole userRole = new UserRole(); + userRole.setUserId(user.getUserId()); + userRole.setTenantId(param.getTenantId()); + userRole.setRoleId(Integer.valueOf(roleId)); + userRoleService.save(userRole); + // 添加第三方用户信息 + UserOauth userOauth2 = new UserOauth(); + userOauth2.setUserId(user.getUserId()); + userOauth2.setTenantId(param.getTenantId()); + userOauth2.setOauthType("MP-ALIPAY"); + userOauth2.setOauthId(userInfo.getUserId()); + userOauthService.save(userOauth2); + + UserParam userParam = new UserParam(); + userParam.setUserId(user.getUserId()); + userParam.setTenantId(user.getTenantId()); + User result = userService.getByOauthId(userParam); + loginRecordService.saveAsync(result.getUsername(), LoginRecord.TYPE_REGISTER, null, result.getTenantId(), req); + // 签发token + String access_token = JwtUtil.buildToken(new JwtSubject(result.getUsername(), result.getTenantId()), + configProperties.getTokenExpireTime(), configProperties.getTokenKey()); + return success("登录成功", new LoginResult(access_token, result)); + } + } + } + } catch (AlipayApiException e) { + e.printStackTrace(); + } + return fail("支付宝授权失败"); + } + + @ApiOperation("授权手机号码") + @PostMapping("/update") + public ApiResult updateInfo(@RequestBody User user) { + user.setUserId(getLoginUserId()); + // 不能修改的字段 + user.setUsername(null); + 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); + } +} diff --git a/src/main/java/com/gxwebsoft/open/controller/OpenAppController.java b/src/main/java/com/gxwebsoft/open/controller/OpenAppController.java new file mode 100644 index 0000000..59fdb87 --- /dev/null +++ b/src/main/java/com/gxwebsoft/open/controller/OpenAppController.java @@ -0,0 +1,169 @@ +package com.gxwebsoft.open.controller; + +import cn.hutool.core.util.IdUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +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.core.web.PageResult; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.oa.entity.App; +import com.gxwebsoft.oa.entity.AppUser; +import com.gxwebsoft.oa.param.AppParam; +import com.gxwebsoft.oa.param.AppUserParam; +import com.gxwebsoft.oa.service.AppService; +import com.gxwebsoft.oa.service.AppUserService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.transaction.annotation.Isolation; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + +import static com.gxwebsoft.common.core.constants.RedisConstants.USER_RANKING_BY_APPS; + +/** + * 应用控制器 + * + * @author WebSoft + * @since 2022-11-18 13:55:29 + */ +@Api(tags = "应用管理") +@RestController +@RequestMapping("/api/open/app") +public class OpenAppController extends BaseController { + @Resource + private AppService appService; + @Resource + private AppUserService appUserService; + @Resource + private CacheClient cacheClient; + + @ApiOperation("分页查询应用") + @GetMapping("/page") + public ApiResult> page(AppParam param) { + // 验证签名 + isCheckSign(); + // 非管理员仅显示已加入成员管理的应用列表 + User loginUser = getLoginUser(); + if(!loginUser.getUsername().equals("admin")){ + param.setUserId(getLoginUserId()); + } + param.setTenantId(getTenantId()); + // 使用关联查询 + return success(appService.pageRel(param)); + } + + @ApiOperation("查询全部应用") + @GetMapping() + public ApiResult> list(AppParam param) { + // 验证签名 + isCheckSign(); + param.setUserId(getLoginUserId()); + param.setTenantId(getTenantId()); + // 使用关联查询 + return success(appService.listRel(param)); + } + + @ApiOperation("根据id查询应用") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { +// return success(appService.getById(id)); + // 验证签名 + isCheckSign(); + App app = appService.getByIdRel(id); + // 查询开发成员列表 + AppUserParam appUserParam = new AppUserParam(); + appUserParam.setAppId(app.getAppId()); + List appUsers = appUserService.listRel(appUserParam); +// List list = userService.list(new LambdaQueryWrapper().in(User::getUserId, appUsers.stream().map(AppUser::getUserId).collect(Collectors.toList()))); + app.setUsers(appUsers); + return success(app); + } + + @ApiOperation("创建应用") + @Transactional(rollbackFor = {Exception.class}, isolation = Isolation.SERIALIZABLE) + @PostMapping() + public ApiResult save(@RequestBody App app) { + // 验证签名 + isCheckSign(); + if (app.getAppType() == null) { + return fail("应用类型不能为空"); + } + // 创建应用 + final Integer loginUserId = getLoginUserId(); + final User loginUser = getLoginUser(); + app.setUserId(loginUserId); + app.setStatus(0); // 需要审核1 不需要审核0 + app.setAppSecret(IdUtil.fastSimpleUUID()); + app.setTenantId(loginUser.getTenantId()); + System.out.println("app = " + app); + if (appService.save(app)) { + // 添加应用成员 + AppUser appUser = new AppUser(); + appUser.setAppId(app.getAppId()); + appUser.setRole(30); + appUser.setUserId(loginUserId); + appUser.setStatus(0); + appUserService.save(appUser); + // 更新缓存 + String key = "AppSecret:".concat(app.getAppId().toString()); + cacheClient.set(key,app.getAppSecret()); + // 更新用户的插件数量到排行榜 + int count = appService.count(new LambdaQueryWrapper() + .eq(App::getUserId, loginUserId)); + cacheClient.zAdd(USER_RANKING_BY_APPS, loginUserId,(double) count); + return success("创建成功"); + } + return fail("创建失败"); + } + + @ApiOperation("修改应用") + @PutMapping() + public ApiResult update(@RequestBody App app) { + // 验证签名 + isCheckSign(); + if (appService.updateById(app)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @ApiOperation("删除应用") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + // 验证签名 + isCheckSign(); + if (appService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @ApiOperation("查看秘钥") + @PostMapping("/getAppSecret") + public ApiResult getAppSecret(@RequestBody App app) { + App result = appService.getByIdRel(app.getAppId()); + String key = "AppSecret:".concat(app.getAppId().toString()); + result.setAppSecret(cacheClient.get(key)); + return success("操作成功",result); + } + + @ApiOperation("重置秘钥") + @PostMapping("/updateAppSecret") + public ApiResult updateAppSecret(@RequestBody App app) { + // 验证签名 + isCheckSign(); + if (app.getAppId() == null) { + return fail("请勿重复操作"); + } + App result = appService.getByIdRel(app.getAppId()); + String key = cacheClient.key("AppSecret", app.getAppId()); + String appSecret = IdUtil.fastSimpleUUID(); + cacheClient.set(key,appSecret); + result.setAppSecret(appSecret); + return success("重置成功",result); + } +} diff --git a/src/main/java/com/gxwebsoft/open/controller/OpenAppUserController.java b/src/main/java/com/gxwebsoft/open/controller/OpenAppUserController.java new file mode 100644 index 0000000..8c3b132 --- /dev/null +++ b/src/main/java/com/gxwebsoft/open/controller/OpenAppUserController.java @@ -0,0 +1,155 @@ +package com.gxwebsoft.open.controller; + +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.web.*; +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 java.util.List; + +/** + * 应用成员控制器 + * + * @author 科技小王子 + * @since 2023-02-17 13:22:20 + */ +@Api(tags = "应用成员管理") +@RestController +@RequestMapping("/api/open/app-user") +public class OpenAppUserController extends BaseController { + @Resource + private AppUserService appUserService; + + @OperationLog + @ApiOperation("分页查询应用成员") + @GetMapping("/page") + public ApiResult> page(AppUserParam param) { + // 验证签名 + isCheckSign(); + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(appUserService.page(page, page.getWrapper())); + // 使用关联查询 + //return success(appUserService.pageRel(param)); + } + + @OperationLog + @ApiOperation("查询全部应用成员") + @GetMapping() + public ApiResult> list(AppUserParam param) { + // 验证签名 + isCheckSign(); + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(appUserService.list(page.getOrderWrapper())); + // 使用关联查询 + //return success(appUserService.listRel(param)); + } + + @ApiOperation("根据id查询应用成员") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + // 验证签名 + isCheckSign(); + return success(appUserService.getById(id)); + // 使用关联查询 + //return success(appUserService.getByIdRel(id)); + } + + @OperationLog + @ApiOperation("添加应用成员") + @PostMapping() + public ApiResult save(@RequestBody AppUser appUser) { + // 验证签名 + isCheckSign(); + String username = appUser.getUsername(); + Integer appId = appUser.getAppId(); + Integer userIdByUsername = getUserIdByUsername(username,getTenantId()); + // 判断重复 + if(appUserService.count(new LambdaQueryWrapper().eq(AppUser::getUserId,userIdByUsername).eq(AppUser::getAppId,appId)) > 0){ + throw new BusinessException("请勿重复添加"); + } + // 是否超出限制 + if(appUserService.count(new LambdaQueryWrapper().eq(AppUser::getAppId,appUser.getAppId())) > 50){ + throw new BusinessException("最多只能添加50个"); + } + appUser.setUserId(userIdByUsername); + appUser.setStatus(0); + if (appUserService.save(appUser)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @OperationLog + @ApiOperation("修改应用成员") + @PutMapping() + public ApiResult update(@RequestBody AppUser appUser) { + // 验证签名 + isCheckSign(); + if (appUserService.updateById(appUser)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @OperationLog + @ApiOperation("删除应用成员") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + // 验证签名 + isCheckSign(); + AppUser appUser = appUserService.getById(id); + if(appUser.getRole().equals(30)){ + return fail("管理员不能删除"); + } + if (appUserService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @OperationLog + @ApiOperation("批量添加应用成员") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + // 验证签名 + isCheckSign(); + if (appUserService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @OperationLog + @ApiOperation("批量修改应用成员") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + // 验证签名 + isCheckSign(); + if (batchParam.update(appUserService, "app_user_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @OperationLog + @ApiOperation("批量删除应用成员") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + // 验证签名 + isCheckSign(); + if (appUserService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/open/controller/OpenAppstoreController.java b/src/main/java/com/gxwebsoft/open/controller/OpenAppstoreController.java new file mode 100644 index 0000000..6c5f33f --- /dev/null +++ b/src/main/java/com/gxwebsoft/open/controller/OpenAppstoreController.java @@ -0,0 +1,60 @@ +package com.gxwebsoft.open.controller; + +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.Tenant; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.common.system.param.TenantParam; +import com.gxwebsoft.common.system.service.TenantService; +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; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 应用管理 + * + * @author 科技小王子 + * @since 2022-11-25 19:04:43 + */ +@Api(tags = "应用管理(已废弃)") +@RestController +@RequestMapping("/api/open/appstore") +public class OpenAppstoreController extends BaseController { + @Resource + private TenantService tenantService; + + @ApiOperation("分页查询应用") + @GetMapping("/page") + public ApiResult> page(TenantParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + // 记录当前登录用户id、应用id + User user = getLoginUser(); + if (user != null) { + param.setUserId(user.getUserId()); + } + // 使用关联查询 + return success(tenantService.pageRel(param)); + } + + @ApiOperation("查询全部应用") + @GetMapping() + public ApiResult> list(TenantParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + // 记录当前登录用户id、应用id + User user = getLoginUser(); + if (user != null) { + param.setUserId(user.getUserId()); + } + // 使用关联查询 + return success(tenantService.listRel(param)); + } +} diff --git a/src/main/java/com/gxwebsoft/open/controller/OpenBcAgentController.java b/src/main/java/com/gxwebsoft/open/controller/OpenBcAgentController.java new file mode 100644 index 0000000..ff4922a --- /dev/null +++ b/src/main/java/com/gxwebsoft/open/controller/OpenBcAgentController.java @@ -0,0 +1,123 @@ +package com.gxwebsoft.open.controller; + +import com.gxwebsoft.apps.entity.BcAgent; +import com.gxwebsoft.apps.param.BcAgentParam; +import com.gxwebsoft.apps.service.BcAgentService; +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 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-24 19:25:59 + */ +@Api(tags = "代报餐管理管理") +@RestController +@RequestMapping("/api/open/bc-agent") +public class OpenBcAgentController extends BaseController { + @Resource + private BcAgentService bcAgentService; + + @ApiOperation("分页查询代报餐管理") + @GetMapping("/page") + public ApiResult> page(BcAgentParam param) { + // 验证签名 + isCheckSign(); + // 使用关联查询 + param.setParentId(getLoginUserId()); + return success(bcAgentService.pageRel(param)); + } + + @ApiOperation("查询全部代报餐管理") + @GetMapping() + public ApiResult> list(BcAgentParam param) { + // 验证签名 + isCheckSign(); + // 使用关联查询 + param.setParentId(getLoginUserId()); + return success(bcAgentService.listRel(param)); + } + + @ApiOperation("根据id查询代报餐管理") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + // 使用关联查询 + return success(bcAgentService.getByIdRel(id)); + } + + @ApiOperation("添加代报餐管理") + @PostMapping() + public ApiResult save(@RequestBody BcAgent bcAgent) { + if (bcAgentService.save(bcAgent)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('apps:bcAgent:update')") + @OperationLog + @ApiOperation("修改代报餐管理") + @PutMapping() + public ApiResult update(@RequestBody BcAgent bcAgent) { + if (bcAgentService.updateById(bcAgent)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('apps:bcAgent:remove')") + @OperationLog + @ApiOperation("删除代报餐管理") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (bcAgentService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('apps:bcAgent:save')") + @OperationLog + @ApiOperation("批量添加代报餐管理") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (bcAgentService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('apps:bcAgent:update')") + @OperationLog + @ApiOperation("批量修改代报餐管理") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(bcAgentService, "agent_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('apps:bcAgent:remove')") + @OperationLog + @ApiOperation("批量删除代报餐管理") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (bcAgentService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/open/controller/OpenBcController.java b/src/main/java/com/gxwebsoft/open/controller/OpenBcController.java new file mode 100644 index 0000000..07c9093 --- /dev/null +++ b/src/main/java/com/gxwebsoft/open/controller/OpenBcController.java @@ -0,0 +1,481 @@ +package com.gxwebsoft.open.controller; + +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.gxwebsoft.apps.entity.BcEquipment; +import com.gxwebsoft.apps.param.BcEquipmentParam; +import com.gxwebsoft.apps.service.BcEquipmentService; +import com.gxwebsoft.apps.utils.BcUtil; +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.common.system.service.UserService; +import com.gxwebsoft.shop.entity.Order; +import com.gxwebsoft.shop.entity.OrderGoods; +import com.gxwebsoft.shop.entity.UserReferee; +import com.gxwebsoft.shop.param.OrderGoodsParam; +import com.gxwebsoft.shop.param.OrderParam; +import com.gxwebsoft.shop.param.UserRefereeParam; +import com.gxwebsoft.shop.service.OrderGoodsService; +import com.gxwebsoft.shop.service.OrderService; +import com.gxwebsoft.shop.service.UserRefereeService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.stream.Collectors; + +import static com.gxwebsoft.common.core.constants.OrderConstants.*; +import static com.gxwebsoft.shop.constants.OrderConstants.ORDER_GOODS_DELIVERY_STATUS20; + +/** + * 云报餐机器接口 + * + * @author 科技小王子 + * @since 2023-04-24 19:25:59 + */ +@Api(tags = "云报餐机器接口") +@RestController +@RequestMapping("/hxz/v1") +public class OpenBcController extends BaseController { + @Resource + private BcUtil bcUtil; + @Resource + private OrderService orderService; + @Resource + private UserService userService; + @Resource + private OrderGoodsService orderGoodsService; + @Resource + private UserRefereeService userRefereeService; + @Resource + private BcEquipmentService bcEquipmentService; + + @ApiOperation("获取服务器时间接口") + @PostMapping("/ServerTime") + public HashMap ServerTime(HttpServletRequest request) { + final String deviceId = request.getHeader("Device-ID"); // 设备ID + final String now = DateUtil.format(DateUtil.date(), "yyyyMMddHHmmss") + (DateUtil.thisDayOfWeek() - 1); // 服务器时间 + System.out.println(deviceId + "获取服务器时间接口 = " + now); + HashMap map = new HashMap<>(); + map.put("Status",1); + map.put("Msg","服务器时间"); + map.put("Time", now); + return map; + } + + @ApiOperation("付款码（二维码）支付接口") + @PostMapping("/QRCodeTransaction") + public HashMap QRCodeTransaction(@RequestBody String QR, HttpServletRequest request) { + // 1.提取订单号ID + final String deviceId = request.getHeader("Device-ID"); // 设备ID + final JSONObject jsonObject = JSONObject.parseObject(QR); + final String orderNo = jsonObject.getString("QR"); + + System.out.println("deviceId = " + deviceId); + System.out.println("QR = " + QR); + + // 2.查询订单数据 + + // 3.查询该餐段的菜品 + + // 4.核销菜品 + + // 5.通知设备 + HashMap map = new HashMap<>(); + map.put("Status",1); + map.put("Msg","支付成功"); + map.put("Qrorder", orderNo); + + return map; + } + + @ApiOperation("二维码支付结果查询接口") + @PostMapping("/TransactionInquiry") + @Transactional(rollbackFor = {Exception.class}) + public HashMap TransactionInquiry(@RequestBody String QROrder, HttpServletRequest request) { + // 1. 提取订单号 + final JSONObject jsonObject = JSONObject.parseObject(QROrder); + final String orderNo = jsonObject.getString("QROrder"); + StringBuilder foods = new StringBuilder(); // 消费机回显信息 + String DeviceID = request.getHeader("Device-ID"); // 设备ID + + final BcEquipmentParam bcEquipmentParam = new BcEquipmentParam(); + bcEquipmentParam.setEquipmentCode(DeviceID); + final List bcEquipments = bcEquipmentService.listRel(bcEquipmentParam); + final BcEquipment bcEquipment = bcEquipments.get(0); + final Integer gear = bcEquipment.getGear(); // 设备所属档口 + final Integer categoryId = bcUtil.getCurrentPeriod(bcEquipment.getTenantId()); // 餐段 +// int categoryId = 26; + // 是否有取餐数据 + boolean isSuccess = true; + + // 打印测试 + System.out.println("查询支付结果（订单号：）******** = " + orderNo); + System.out.println("bcEquipment = " + bcEquipment); + System.out.println("gear = " + gear); + System.out.println("StrUtil.isNumeric(orderNo) = " + StrUtil.isNumeric(orderNo)); + + // 2.非代取餐模式 + if (!orderNo.startsWith("dqc:")) { + System.out.println("非代取餐模式 = "); + // 4.排除其他情况 + if(!StrUtil.isNumeric(orderNo)){ + foods.append("非取餐码"); + isSuccess = false; + }else{ + OrderParam orderParam = new OrderParam(); + orderParam.setOrderNo(orderNo); + List list = orderService.listRel(orderParam); + Order order = list.get(0); +// System.out.println("order-one = " + order); + OrderGoodsParam orderGoodsParam = new OrderGoodsParam(); + // 2.1查询订单商品 + List orderGoods = orderGoodsService.list(new LambdaQueryWrapper() + .eq(OrderGoods::getOrderId, order.getOrderId()) + .eq(OrderGoods::getDeliveryStatus,RECEIPT_STATUS_NO) + .eq(OrderGoods::getCategoryId,categoryId) + .eq(OrderGoods::getGear,gear) + ); +// System.out.println("2.1查询订单商品 = " + orderGoods); + // 2.2查询用户信息 + User user = userService.getById(order.getUserId()); + // 2.收集菜品信息 + foods.append("姓名:").append(order.getNickname()).append("\r\n"); +// foods.append("签到:").append(DateUtil.format(DateUtil.date(),"MM-dd HH:mm")).append("\r\n"); + for (OrderGoods item : orderGoods) { + // 过滤份数totalNum=0的菜品 + if (!item.getTotalNum().equals(0)) { + foods.append(item.getGoodsName()).append(" ").append(item.getTotalNum()).append("份").append(" ￥").append(item.getTotalPrice()).append("\r\n"); + OrderGoods food = new OrderGoods(); + food.setOrderGoodsId(item.getOrderGoodsId()); + food.setDeliveryStatus(ORDER_GOODS_DELIVERY_STATUS20); + orderGoodsService.updateById(food); + // 更新订单部分发布状态 + final Order order1 = new Order(); + order1.setOrderId(item.getOrderId()); + if(categoryId == 27){ + order1.setDeliveryStatus(DELIVERY_STATUS_YES); + }else{ + order1.setDeliveryStatus(DELIVERY_STATUS_30); + } + orderService.updateById(order1); + } + } + if(orderGoods.size() == 0){ + foods.append("没有取餐数据"); + isSuccess = false; + } + } + } + + // 3.代取餐模式 + ArrayList saveOrderGoods = new ArrayList<>(); + ArrayList saveOrder = new ArrayList<>(); + if(orderNo.startsWith("dqc:")){ + System.out.println("代取餐模式 = "); + final String dealerId = StrUtil.removePrefix(orderNo, "dqc:"); + System.out.println("dealerId = " + dealerId); + UserRefereeParam userRefereeParam = new UserRefereeParam(); + userRefereeParam.setDealerId(Integer.valueOf(dealerId)); + userRefereeParam.setDeleted(0); + List userRefereeList = userRefereeService.listRel(userRefereeParam); + // 查询帮代餐的成员ID集 + List userIds = userRefereeList.stream().map(UserReferee::getUserId).collect(Collectors.toList()); + userIds.add(Integer.valueOf(dealerId)); + System.out.println("userIds = " + userIds); + // 查询成员的订单 + List list = orderService.list(new LambdaQueryWrapper() + .in(Order::getUserId, userIds) + .eq(Order::getDeliveryTime, DateUtil.parse(DateUtil.today())) + .eq(Order::getPayStatus, PAY_STATUS_SUCCESS) + .ne(Order::getDeliveryStatus, RECEIPT_STATUS_YES) + .eq(Order::getDeleted, 0) + ); + + if(list.size() > 0){ + // 收集订单ID集 + List orderIds = list.stream().map(Order::getOrderId).collect(Collectors.toList()); + System.out.println("orderIds = " + orderIds); + // 查询商品 + if(orderIds.size() > 0){ + List orderGoodsList = orderGoodsService.list(new LambdaQueryWrapper() + .in(OrderGoods::getOrderId, orderIds) + .ne(OrderGoods::getDeliveryStatus,RECEIPT_STATUS_YES) + .gt(OrderGoods::getTotalNum,0) + .eq(OrderGoods::getCategoryId,categoryId) + .eq(OrderGoods::getGear,gear) + ); + if (orderGoodsList.size() == 0) { + foods.append("没有取餐数据"); + isSuccess = false; + } + System.out.println("orderGoodsList = " + orderGoodsList.size()); + // 查询用户信息 + User dealer = userService.getById(dealerId); + foods.append("代取:").append(dealer.getNickname()).append("\r\n"); + foods.append("共" + orderGoodsList.size() + "份").append("\r\n"); +// foods.append("签到:").append(DateUtil.format(DateUtil.date(),"MM-dd HH:mm")).append("\r\n"); + // 批量核销操作 + for (OrderGoods og : orderGoodsList) { + System.out.println("og = " + og); + foods.append(og.getGoodsName()).append("\r\n"); + final OrderGoods orderGoods = new OrderGoods(); + orderGoods.setOrderGoodsId(og.getOrderGoodsId()); + orderGoods.setDeliveryStatus(ORDER_GOODS_DELIVERY_STATUS20); + saveOrderGoods.add(orderGoods); + // 更新订单部分发货状态 + Order order2 = new Order(); + order2.setOrderId(og.getOrderId()); + if(categoryId == 27){ + order2.setDeliveryStatus(DELIVERY_STATUS_YES); + }else{ + order2.setDeliveryStatus(DELIVERY_STATUS_30); + } + saveOrder.add(order2); + } + }else{ + foods.append("没有取餐数据"); + isSuccess = false; + } + }else{ + foods.append("没有取餐数据"); + isSuccess = false; + } + } + // 4.更新状态 + orderGoodsService.updateBatchById(saveOrderGoods); + orderService.updateBatchById(saveOrder); + + // 5.通知设备 + HashMap map = new HashMap<>(); + map.put("Status", 1); + map.put("Msg",""); + map.put("Name", ""); + map.put("CardNo", ""); + map.put("Money", ""); + map.put("Subsidy", ""); + map.put("Times", ""); + map.put("Integral", ""); + map.put("InTime", ""); + map.put("OutTime", ""); + map.put("CumulativeTime ", ""); + map.put("Amount","0.00"); + map.put("VoiceID",null); + map.put("Text", foods); + + // 5.1无取餐数据 + if(!isSuccess){ + map.put("Status", 0); + map.put("Msg","没有取餐数据"); + map.put("Text",null); + System.out.println("5.1无取餐数据 = " + map); + return map; + } + System.out.println("5.通知设备 = " + map); + return map; + } + + @ApiOperation("终端查询日统计接口") + @PostMapping("/Counts") + public HashMap Counts(HttpServletRequest request) { + + final String deviceId = request.getHeader("Device-ID"); + System.out.println("deviceId = " + deviceId); + final Integer categoryId = bcUtil.getCurrentPeriod(10048); + System.out.println("categoryId = " + categoryId); + + HashMap map = new HashMap<>(); + map.put("Status",1); + map.put("Msg","终端查询日统计接口"); + map.put("Text", "" + + "日统计\n" + + "日总金额：0.00\n" + + "日总次数：0\n" + + "时段统计\n" + + "一时段金额：0.00\n" + + "一时段次数：0" + + ""); + + // 发送消息测试 + bcUtil.send("您的申请已通过"); + return map; + } + + +// @ApiOperation("二维码支付结果查询接口") +// @PostMapping("/demo") +// @Transactional(rollbackFor = {Exception.class}) +// public HashMap demo(@RequestBody String QROrder, HttpServletRequest request) { +// System.out.println("二维码支付结果查询接口 = " + QROrder); +// // 1. 提取订单号 +// final JSONObject jsonObject = JSONObject.parseObject(QROrder); +// final String orderNo = jsonObject.getString("QROrder"); +// StringBuilder foods = new StringBuilder(); // 消费机回显信息 +//// String DeviceID = request.getHeader("Device-ID"); // 设备ID +//// +//// final BcEquipmentParam bcEquipmentParam = new BcEquipmentParam(); +//// bcEquipmentParam.setEquipmentCode(DeviceID); +//// final List bcEquipments = bcEquipmentService.listRel(bcEquipmentParam); +//// final BcEquipment bcEquipment = bcEquipments.get(0); +// final Integer gear = 20; // 设备所属档口 +//// final Integer categoryId = bcUtil.getCurrentPeriod(bcEquipment.getTenantId()); // 餐段 +// int categoryId = 26; +// +// // 打印测试 +// System.out.println("查询支付结果（订单号：）******** = " + orderNo); +// System.out.println("gear = " + gear); +// System.out.println("StrUtil.isNumeric(orderNo) = " + StrUtil.isNumeric(orderNo)); +// +// // 2.非代取餐模式 +// if (!orderNo.startsWith("dqc:")) { +// System.out.println("非代取餐模式 = "); +// // 4.排除其他情况 +// if(!StrUtil.isNumeric(orderNo)){ +// foods.append("非取餐码"); +// }else{ +// OrderParam orderParam = new OrderParam(); +// orderParam.setOrderNo(orderNo); +// List list = orderService.listRel(orderParam); +// Order order = list.get(0); +// System.out.println("order-one = " + order); +// OrderGoodsParam orderGoodsParam = new OrderGoodsParam(); +// // 2.1查询订单商品 +// List orderGoods = orderGoodsService.list(new LambdaQueryWrapper() +// .eq(OrderGoods::getOrderId, order.getOrderId()) +// .eq(OrderGoods::getDeliveryStatus,RECEIPT_STATUS_NO) +// .eq(OrderGoods::getCategoryId,categoryId) +// .eq(OrderGoods::getGear,gear) +// ); +// // 2.2查询用户信息 +// User user = userService.getById(order.getUserId()); +// // 2.收集菜品信息 +// foods.append("姓名:").append(order.getNickname()).append("\r\n"); +// foods.append("签到:").append(DateUtil.format(DateUtil.date(),"MM-dd HH:mm")).append("\r\n"); +// for (OrderGoods item : orderGoods) { +// // 过滤份数totalNum=0的菜品 +// if (!item.getTotalNum().equals(0)) { +// foods.append(item.getGoodsName()).append(" ").append(item.getTotalNum()).append("份").append(" ￥").append(item.getTotalPrice()).append("\r\n"); +// OrderGoods food = new OrderGoods(); +// food.setOrderGoodsId(item.getOrderGoodsId()); +// food.setDeliveryStatus(ORDER_GOODS_DELIVERY_STATUS20); +// orderGoodsService.updateById(food); +// // 更新订单部分发布状态 +// final Order order1 = new Order(); +// order1.setOrderId(item.getOrderId()); +// if(categoryId == 27){ +// order1.setDeliveryStatus(DELIVERY_STATUS_YES); +// }else{ +// order1.setDeliveryStatus(DELIVERY_STATUS_30); +// } +// orderService.updateById(order1); +// } +// } +// if(orderGoods.size() == 0){ +// foods.append("没有取餐数据"); +// } +// } +// } +// +// // 3.代取餐模式 +// ArrayList saveOrderGoods = new ArrayList<>(); +// ArrayList saveOrder = new ArrayList<>(); +// if(orderNo.startsWith("dqc:")){ +// System.out.println("代取餐模式 = "); +// final String dealerId = StrUtil.removePrefix(orderNo, "dqc:"); +// System.out.println("dealerId = " + dealerId); +// UserRefereeParam userRefereeParam = new UserRefereeParam(); +// userRefereeParam.setDealerId(Integer.valueOf(dealerId)); +// userRefereeParam.setDeleted(0); +// List userRefereeList = userRefereeService.listRel(userRefereeParam); +// // 查询帮代餐的成员ID集 +// List userIds = userRefereeList.stream().map(UserReferee::getUserId).collect(Collectors.toList()); +// userIds.add(getLoginUserId()); +// System.out.println("userIds = " + userIds); +// // 查询成员的订单 +// List list = orderService.list(new LambdaQueryWrapper() +// .in(Order::getUserId, userIds) +// .eq(Order::getDeliveryTime, DateUtil.parse(DateUtil.today())) +// .eq(Order::getPayStatus, PAY_STATUS_SUCCESS) +// .ne(Order::getDeliveryStatus, RECEIPT_STATUS_YES) +// .eq(Order::getDeleted, 0) +// ); +// if(list.size() > 0){ +// // 收集订单ID集 +// List orderIds = list.stream().map(Order::getOrderId).collect(Collectors.toList()); +// System.out.println("orderIds = " + orderIds); +// // 查询商品 +// if(orderIds.size() > 0){ +// List orderGoodsList = orderGoodsService.list(new LambdaQueryWrapper() +// .in(OrderGoods::getOrderId, orderIds) +// .ne(OrderGoods::getDeliveryStatus,RECEIPT_STATUS_YES) +// .gt(OrderGoods::getTotalNum,0) +// .eq(OrderGoods::getCategoryId,categoryId) +// .eq(OrderGoods::getGear,gear) +// ); +// // 查询用户信息 +// User dealer = userService.getById(dealerId); +// foods.append("代取:").append(dealer.getNickname()).append("\r\n"); +// foods.append("共" + orderGoodsList.size() + "份"); +//// foods.append("签到:").append(DateUtil.format(DateUtil.date(),"MM-dd HH:mm")).append("\r\n"); +// // 批量核销操作 +// for (OrderGoods og : orderGoodsList) { +// foods.append(",").append(og.getGoodsName()); +// final OrderGoods orderGoods = new OrderGoods(); +// orderGoods.setOrderGoodsId(og.getOrderGoodsId()); +// orderGoods.setDeliveryStatus(ORDER_GOODS_DELIVERY_STATUS20); +// saveOrderGoods.add(orderGoods); +// // 更新订单部分发货状态 +// Order order2 = new Order(); +// order2.setOrderId(og.getOrderId()); +// if(categoryId == 27){ +// order2.setDeliveryStatus(DELIVERY_STATUS_YES); +// }else{ +// order2.setDeliveryStatus(DELIVERY_STATUS_30); +// } +// saveOrder.add(order2); +// } +// }else{ +// foods.append("没有取餐数据"); +// } +// }else{ +// foods.append("没有取餐数据"); +// } +// } +// // 4.更新状态 +// orderGoodsService.updateBatchById(saveOrderGoods); +// orderService.updateBatchById(saveOrder); +// +// // 5.通知设备 +// HashMap map = new HashMap<>(); +// map.put("Status", 1); +// map.put("Msg",""); +// map.put("Name", ""); +// map.put("CardNo", ""); +// map.put("Money", ""); +// map.put("Subsidy", ""); +// map.put("Times", ""); +// map.put("Integral", ""); +// map.put("InTime", ""); +// map.put("OutTime", ""); +// map.put("CumulativeTime ", ""); +// map.put("Amount","0.00"); +// map.put("VoiceID",null); +// map.put("Text", foods); +// +// // 5.通知设备 +// System.out.println("通知设备 = " + map); +// return map; +// } + +} diff --git a/src/main/java/com/gxwebsoft/open/controller/OpenBcTemporaryController.java b/src/main/java/com/gxwebsoft/open/controller/OpenBcTemporaryController.java new file mode 100644 index 0000000..134db5e --- /dev/null +++ b/src/main/java/com/gxwebsoft/open/controller/OpenBcTemporaryController.java @@ -0,0 +1,129 @@ +package com.gxwebsoft.open.controller; + +import cn.hutool.core.date.DateUtil; +import com.gxwebsoft.apps.entity.BcTemporary; +import com.gxwebsoft.apps.param.BcTemporaryParam; +import com.gxwebsoft.apps.service.BcTemporaryService; +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 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-24 21:47:57 + */ +@Api(tags = "临时报餐管理管理") +@RestController +@RequestMapping("/api/open/bc-temporary") +public class OpenBcTemporaryController extends BaseController { + @Resource + private BcTemporaryService bcTemporaryService; + + @ApiOperation("分页查询临时报餐管理") + @GetMapping("/page") + public ApiResult> page(BcTemporaryParam param) { + // 验证签名 + isCheckSign(); + // 使用关联查询 + param.setUserId(getLoginUserId()); + param.setDayTime(DateUtil.date()); + return success(bcTemporaryService.pageRel(param)); + } + + @ApiOperation("查询全部临时报餐管理") + @GetMapping() + public ApiResult> list(BcTemporaryParam param) { + // 验证签名 + isCheckSign(); + // 使用关联查询 + return success(bcTemporaryService.listRel(param)); + } + + @PreAuthorize("hasAuthority('apps:bcTemporary:list')") + @OperationLog + @ApiOperation("根据id查询临时报餐管理") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + return success(bcTemporaryService.getById(id)); + // 使用关联查询 + //return success(bcTemporaryService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('apps:bcTemporary:save')") + @OperationLog + @ApiOperation("添加临时报餐管理") + @PostMapping() + public ApiResult save(@RequestBody BcTemporary bcTemporary) { + if (bcTemporaryService.save(bcTemporary)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('apps:bcTemporary:update')") + @OperationLog + @ApiOperation("修改临时报餐管理") + @PutMapping() + public ApiResult update(@RequestBody BcTemporary bcTemporary) { + if (bcTemporaryService.updateById(bcTemporary)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('apps:bcTemporary:remove')") + @OperationLog + @ApiOperation("删除临时报餐管理") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (bcTemporaryService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('apps:bcTemporary:save')") + @OperationLog + @ApiOperation("批量添加临时报餐管理") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (bcTemporaryService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('apps:bcTemporary:update')") + @OperationLog + @ApiOperation("批量修改临时报餐管理") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(bcTemporaryService, "temporary_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('apps:bcTemporary:remove')") + @OperationLog + @ApiOperation("批量删除临时报餐管理") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (bcTemporaryService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/open/controller/OpenCartController.java b/src/main/java/com/gxwebsoft/open/controller/OpenCartController.java new file mode 100644 index 0000000..6a5aba6 --- /dev/null +++ b/src/main/java/com/gxwebsoft/open/controller/OpenCartController.java @@ -0,0 +1,137 @@ +package com.gxwebsoft.open.controller; + +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.IdUtil; +import com.gxwebsoft.common.core.exception.BusinessException; +import com.gxwebsoft.common.core.utils.CacheClient; +import com.gxwebsoft.common.core.utils.JSONUtil; +import com.gxwebsoft.common.core.web.ApiResult; +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.shop.entity.Goods; +import com.gxwebsoft.shop.entity.Order; +import com.gxwebsoft.shop.entity.OrderGoods; +import com.gxwebsoft.shop.param.CartParam; +import com.gxwebsoft.shop.service.GoodsService; +import com.gxwebsoft.shop.service.OrderGoodsService; +import com.gxwebsoft.shop.service.OrderService; +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.sql.Date; +import java.util.List; +import java.util.stream.Collectors; + +/** + * 购物车记录表控制器 + * + * @author 科技小王子 + * @since 2022-11-25 19:04:43 + */ +@Api(tags = "购物车记录表管理") +@RestController +@RequestMapping("/api/open/cart") +public class OpenCartController extends BaseController { + @Resource + private GoodsService goodsService; + @Resource + private CacheClient cacheClient; + @Resource + private OrderService orderService; + @Resource + private OrderGoodsService orderGoodsService; + + @ApiOperation("添加购物车") + @PostMapping("/addCart") + public ApiResult addCart(@RequestBody OrderGoods param) { + // 准备数据 + Goods goods = goodsService.getById(param.getGoodsId()); + param.setGoodsName(goods.getGoodsName()); + param.setCategoryId(goods.getCategoryId()); + param.setImageUrl(goods.getImage()); + param.setGoodsNo(goods.getGoodsCode()); + param.setGoodsPrice(param.getGoodsPrice()); + param.setLinePrice(goods.getLinePriceMin()); + param.setGoodsWeight(goods.getGoodsWeight()); + param.setComments(goods.getSellingPoint()); + param.setGear(goods.getGear()); + param.setSortNumber(goods.getSortNumber()); + // 保存到redis + String key = getKey(); + cacheClient.hPut(key,param.getGoodsId().toString(), JSONUtil.toJSONString(param)); + return success("添加成功",getCart()); + } + + @ApiOperation("查看购物车") + @GetMapping("/showCart") + public ApiResult showCart() { + return success("获取成功",getCart()); + } + + @ApiOperation("从购物车创建订单") + @PostMapping("/createOrder") + @Transactional(rollbackFor = {Exception.class}) + public ApiResult createOrder(@RequestBody CartParam param) { + Integer userId = 0; + if(param.getAgentUserId() != null){ + userId = param.getAgentUserId(); + }else{ + userId = getLoginUserId(); + } + // 1.从缓存读取用户的购物车数据 + List orderGoods = getCart(); + if(orderGoods == null){ + throw new BusinessException("订单不存在"); + } + // 2.创建订单 + Order order = new Order(); + order.setOrderNo(IdUtil.getSnowflakeNextId()); + order.setTotalPrice(param.getTotalPrice()); + order.setOrderPrice(param.getTotalPrice()); + order.setPayPrice(param.getTotalPrice()); + order.setDeliveryTime(Date.valueOf(param.getDeliveryTime())); + order.setExpirationTime(DateUtil.nextMonth()); + order.setUserId(userId); + orderService.save(order); + orderGoods.forEach(d -> { + // 附加orderId + d.setOrderId(order.getOrderId()); + }); + // 3.批量添加订单商品 + orderGoodsService.saveBatch(orderGoods); + // 4.清空购物车 + cacheClient.delete(getKey()); + return success("创建成功",order); + } + + @ApiOperation("清空购物车") + @GetMapping("/clearCart") + public ApiResult clearCart() { + cacheClient.delete(getKey()); + return success("清空成功"); + } + + /** + * 获取key + * @return cache10048:cart651 + */ + private String getKey(){ + // 验证签名 + isCheckSign(); + return "cart".concat(getLoginUserId().toString()); + } + + /** + * 获取购物车数据 + * @return + */ + private List getCart(){ + String key = getKey(); + // 获取购物车数据 + List values = cacheClient.hValues(key); + return values.stream().map(item -> JSONUtil.parseObject(JSONUtil.toJSONString(item), OrderGoods.class)).collect(Collectors.toList()); + } + +} diff --git a/src/main/java/com/gxwebsoft/open/controller/OpenCategoryController.java b/src/main/java/com/gxwebsoft/open/controller/OpenCategoryController.java new file mode 100644 index 0000000..766218b --- /dev/null +++ b/src/main/java/com/gxwebsoft/open/controller/OpenCategoryController.java @@ -0,0 +1,129 @@ +package com.gxwebsoft.open.controller; + +import com.gxwebsoft.common.core.annotation.OperationLog; +import com.gxwebsoft.common.core.web.*; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.shop.entity.Category; +import com.gxwebsoft.shop.param.CategoryParam; +import com.gxwebsoft.shop.service.CategoryService; +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 2022-11-22 17:45:37 + */ +@Api(tags = "商品分类表管理") +@RestController +@RequestMapping("/api/open/category") +public class OpenCategoryController extends BaseController { + @Resource + private CategoryService categoryService; + + @ApiOperation("分页查询商品分类表") + @GetMapping("/page") + public ApiResult> page(CategoryParam param) { + // 验证签名 + isCheckSign(); + // 使用关联查询 + return success(categoryService.pageRel(param)); + } + + @ApiOperation("查询全部商品分类表") + @GetMapping() + public ApiResult> list(CategoryParam param) { + // 验证签名 + isCheckSign(); + // 使用关联查询 + return success(categoryService.listRel(param)); + } + + @PreAuthorize("hasAuthority('shop:category:list')") + @OperationLog + @ApiOperation("根据id查询商品分类表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + return success(categoryService.getById(id)); + // 使用关联查询 + //return success(categoryService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('shop:category:save')") + @OperationLog + @ApiOperation("添加商品分类表") + @PostMapping() + public ApiResult save(@RequestBody Category category) { + // 记录当前登录用户id、租户id + User loginUser = getLoginUser(); + if (loginUser != null) { + category.setUserId(loginUser.getUserId()); + } + if (categoryService.save(category)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('shop:category:update')") + @OperationLog + @ApiOperation("修改商品分类表") + @PutMapping() + public ApiResult update(@RequestBody Category category) { + if (categoryService.updateById(category)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('shop:category:remove')") + @OperationLog + @ApiOperation("删除商品分类表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (categoryService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('shop:category:save')") + @OperationLog + @ApiOperation("批量添加商品分类表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (categoryService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('shop:category:update')") + @OperationLog + @ApiOperation("批量修改商品分类表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(categoryService, "category_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('shop:category:remove')") + @OperationLog + @ApiOperation("批量删除商品分类表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (categoryService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/open/controller/OpenChatGptController.java b/src/main/java/com/gxwebsoft/open/controller/OpenChatGptController.java new file mode 100644 index 0000000..61878ec --- /dev/null +++ b/src/main/java/com/gxwebsoft/open/controller/OpenChatGptController.java @@ -0,0 +1,112 @@ +package com.gxwebsoft.open.controller; + +import cn.hutool.core.util.StrUtil; +import cn.hutool.http.HttpRequest; +import com.alibaba.fastjson.JSONObject; +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.system.entity.Setting; +import com.gxwebsoft.common.system.service.SettingService; +import com.gxwebsoft.oa.entity.Notice; +import com.gxwebsoft.oa.param.NoticeParam; +import com.gxwebsoft.oa.service.NoticeService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +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 java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import static com.gxwebsoft.oa.constants.NoticeConstants.CHAT_GPT; + +/** + * ChatGPT控制器 + * + * @author WebSoft + * @since 2018-12-24 16:10:24 + */ +@Api(tags = "ChatGPT") +@RestController +@RequestMapping("/api/open/chat") +public class OpenChatGptController extends BaseController { + @Resource + private NoticeService noticeService; + @Resource + private SettingService settingService; + + @ApiOperation("向chatGPT提问") + @PostMapping("/send") + public ApiResult send(@RequestBody NoticeParam param) { + // 保存问题 + final Integer loginUserId = getLoginUserId(); + Notice notice = new Notice(); + notice.setType(CHAT_GPT); + notice.setUserId(loginUserId); + notice.setChannel(0); + notice.setContent(param.getContent()); + noticeService.save(notice); + // 保存回答 + Notice answer = new Notice(); + answer.setUserId(loginUserId); + answer.setType(CHAT_GPT); + answer.setChannel(1); + answer.setContent("|"); + noticeService.save(answer); + // 查询消息并返回 + param.setUserId(loginUserId); + return success(answer.getNoticeId()); + } + + @ApiOperation("chatGPT") + @PostMapping("/chat") + public ApiResult chat(@RequestBody NoticeParam param) { + String endpoint = "https://api.openai.com/v1/chat/completions"; + final Setting setting = settingService.getData("chatGPT"); + final String content1 = setting.getContent(); + final JSONObject jsonObject1 = JSONObject.parseObject(content1); + final String chatKey = jsonObject1.getString("chatKey"); + String apiKey = "Bearer ".concat(chatKey); + System.out.println("apiKey = " + apiKey); + if(StrUtil.isEmpty(apiKey)){ + return fail("请配置有效的KEY！"); + } + Map paramMap = new HashMap<>(); + paramMap.put("model", "gpt-3.5-turbo"); + List> dataList = new ArrayList<>(); + dataList.add(new HashMap(){{ + put("role", "user"); + put("content", param.getContent()); + }}); + paramMap.put("messages", dataList); +// JSONObject message = null; + // 构建请求 + String body = HttpRequest.post(endpoint) + .header("Authorization", apiKey) + .header("Content-Type", "application/json") + .body(JSONUtil.toJSONString(paramMap)).execute().body(); + JSONObject jsonObject = JSONObject.parseObject(body); + // 内容解析(代币) + String usage = jsonObject.getString("usage"); + JSONObject jsonUsage = JSONObject.parseObject(usage); + String total_tokens = jsonUsage.getString("total_tokens"); + // 内容解析(消息内容) + JSONObject choices = jsonObject.getJSONArray("choices").getJSONObject(0); + String message = choices.getString("message"); + JSONObject jsonMessage = JSONObject.parseObject(message); + String content = jsonMessage.getString("content"); + + // 保存回答 + Notice notice = noticeService.getById(param.getNoticeId()); + notice.setTokens(new Long(total_tokens)); + notice.setContent(content); + noticeService.updateById(notice); + return success(content); + } +} diff --git a/src/main/java/com/gxwebsoft/open/controller/OpenDictController.java b/src/main/java/com/gxwebsoft/open/controller/OpenDictController.java new file mode 100644 index 0000000..49c2e74 --- /dev/null +++ b/src/main/java/com/gxwebsoft/open/controller/OpenDictController.java @@ -0,0 +1,155 @@ +package com.gxwebsoft.open.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.param.DictParam; +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; +import java.util.stream.Collectors; + +/** + * 字典控制器 + * + * @author WebSoft + * @since 2020-03-14 11:29:03 + */ +@Api(tags = "字典管理(业务类)") +@RestController +@RequestMapping("/api/open/system/dict") +public class OpenDictController extends BaseController { + @Resource + private DictService dictService; + + @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("根据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/src/main/java/com/gxwebsoft/open/controller/OpenDictDataController.java b/src/main/java/com/gxwebsoft/open/controller/OpenDictDataController.java new file mode 100644 index 0000000..80a2bbb --- /dev/null +++ b/src/main/java/com/gxwebsoft/open/controller/OpenDictDataController.java @@ -0,0 +1,133 @@ +package com.gxwebsoft.open.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.DictData; +import com.gxwebsoft.common.system.param.DictDataParam; +import com.gxwebsoft.common.system.service.DictDataService; +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/open/system/dict-data") +public class OpenDictDataController extends BaseController { + @Resource + private DictDataService dictDataService; + + @PreAuthorize("hasAuthority('sys:dict:list')") + @OperationLog + @ApiOperation("分页查询字典数据") + @GetMapping("/page") + public ApiResult> page(DictDataParam param) { + return success(dictDataService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('sys:dict:list')") + @OperationLog + @ApiOperation("查询全部字典数据") + @GetMapping() + public ApiResult> list(DictDataParam param) { + return success(dictDataService.listRel(param)); + } + + @PreAuthorize("hasAuthority('sys:dict:list')") + @OperationLog + @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("字典数据标识已存在"); + } + if (dictDataService.save(dictData)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('sys:dict:update')") + @OperationLog + @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/src/main/java/com/gxwebsoft/open/controller/OpenDictionaryController.java b/src/main/java/com/gxwebsoft/open/controller/OpenDictionaryController.java new file mode 100644 index 0000000..21fcb6f --- /dev/null +++ b/src/main/java/com/gxwebsoft/open/controller/OpenDictionaryController.java @@ -0,0 +1,155 @@ +package com.gxwebsoft.open.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/open/system/dictionary") +public class OpenDictionaryController 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/src/main/java/com/gxwebsoft/open/controller/OpenDictionaryDataController.java b/src/main/java/com/gxwebsoft/open/controller/OpenDictionaryDataController.java new file mode 100644 index 0000000..39866d5 --- /dev/null +++ b/src/main/java/com/gxwebsoft/open/controller/OpenDictionaryDataController.java @@ -0,0 +1,133 @@ +package com.gxwebsoft.open.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.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/open/system/dictionary-data") +public class OpenDictionaryDataController extends BaseController { + @Resource + private DictionaryDataService dictionaryDataService; + + @PreAuthorize("hasAuthority('sys:dict:list')") + @OperationLog + @ApiOperation("分页查询字典数据") + @GetMapping("/page") + public ApiResult> page(DictionaryDataParam param) { + return success(dictionaryDataService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('sys:dict:list')") + @OperationLog + @ApiOperation("查询全部字典数据") + @GetMapping() + public ApiResult> list(DictionaryDataParam param) { + return success(dictionaryDataService.listRel(param)); + } + + @PreAuthorize("hasAuthority('sys:dict:list')") + @OperationLog + @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')") + @OperationLog + @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/src/main/java/com/gxwebsoft/open/controller/OpenDocsController.java b/src/main/java/com/gxwebsoft/open/controller/OpenDocsController.java new file mode 100644 index 0000000..07509dc --- /dev/null +++ b/src/main/java/com/gxwebsoft/open/controller/OpenDocsController.java @@ -0,0 +1,133 @@ +package com.gxwebsoft.open.controller; + +import com.gxwebsoft.cms.entity.Docs; +import com.gxwebsoft.cms.param.DocsParam; +import com.gxwebsoft.cms.service.DocsService; +import com.gxwebsoft.common.core.annotation.OperationLog; +import com.gxwebsoft.common.core.web.*; +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 2022-11-16 11:40:27 + */ +@Api(tags = "文档管理记录表管理") +@RestController +@RequestMapping("/api/open/docs") +public class OpenDocsController extends BaseController { + @Resource + private DocsService docsService; + + @ApiOperation("分页查询文档管理记录表") + @GetMapping("/page") + public ApiResult> page(DocsParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("sort_number asc,create_time asc"); + return success(docsService.page(page, page.getWrapper())); + // 使用关联查询 +// return success(docsService.pageRel(param)); + } + + @ApiOperation("查询全部文档管理记录表") + @GetMapping() + public ApiResult> list(DocsParam param) { + // 使用关联查询 + return success(docsService.listRel(param)); + } + + @ApiOperation("根据id查询文档管理记录表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + // 使用关联查询 + return success(docsService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('cms:docs:save')") + @OperationLog + @ApiOperation("添加文档管理记录表") + @PostMapping() + public ApiResult save(@RequestBody Docs docs) { + // 记录当前登录用户id、租户id + User loginUser = getLoginUser(); + if (loginUser != null) { + docs.setUserId(loginUser.getUserId()); + } + if (docsService.save(docs)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('cms:docs:update')") + @OperationLog + @ApiOperation("修改文档管理记录表") + @PutMapping() + public ApiResult update(@RequestBody Docs docs) { + if (docsService.updateById(docs)) { + return success("保存成功"); + } + return fail("保存失败"); + } + + @PreAuthorize("hasAuthority('cms:docs:remove')") + @OperationLog + @ApiOperation("删除文档管理记录表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + // 验证签名 + isCheckSign(); + if (docsService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('cms:docs:save')") + @OperationLog + @ApiOperation("批量添加文档管理记录表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + // 验证签名 + isCheckSign(); + if (docsService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('cms:docs:update')") + @OperationLog + @ApiOperation("批量修改文档管理记录表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + // 验证签名 + isCheckSign(); + if (batchParam.update(docsService, "docs_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('cms:docs:remove')") + @OperationLog + @ApiOperation("批量删除文档管理记录表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + // 验证签名 + isCheckSign(); + if (docsService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/open/controller/OpenEquipmentController.java b/src/main/java/com/gxwebsoft/open/controller/OpenEquipmentController.java new file mode 100644 index 0000000..22629b5 --- /dev/null +++ b/src/main/java/com/gxwebsoft/open/controller/OpenEquipmentController.java @@ -0,0 +1,353 @@ +package com.gxwebsoft.open.controller; + +import cn.hutool.core.date.DateUtil; +import com.alibaba.fastjson.JSONObject; +import com.alipay.api.AlipayApiException; +import com.alipay.api.DefaultAlipayClient; +import com.alipay.api.domain.AlipayOpenAppQrcodeCreateModel; +import com.alipay.api.request.AlipayOpenAppQrcodeCreateRequest; +import com.alipay.api.response.AlipayOpenAppQrcodeCreateResponse; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.gxwebsoft.apps.entity.Equipment; +import com.gxwebsoft.apps.entity.EquipmentRecord; +import com.gxwebsoft.apps.param.EquipmentParam; +import com.gxwebsoft.apps.service.EquipmentRecordService; +import com.gxwebsoft.apps.service.EquipmentService; +import com.gxwebsoft.common.core.annotation.OperationLog; +import com.gxwebsoft.common.core.utils.AlipayConfigUtil; +import com.gxwebsoft.common.core.web.*; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.shop.entity.Order; +import com.gxwebsoft.shop.entity.OrderRefund; +import com.gxwebsoft.shop.param.OrderParam; +import com.gxwebsoft.shop.service.OrderRefundService; +import com.gxwebsoft.shop.service.OrderService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiModelProperty; +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.List; + +import static com.gxwebsoft.apps.constants.EquipmentConstants.*; +import static com.gxwebsoft.common.core.constants.OrderConstants.*; + +/** + * 设备管理控制器 + * + * @author 科技小王子 + * @since 2022-11-30 02:11:16 + */ +@Api(tags = "设备管理管理") +@RestController +@RequestMapping("/api/open/equipment") +public class OpenEquipmentController extends BaseController { + @Resource + private EquipmentService equipmentService; + @Resource + private OrderService orderService; + @Resource + private AlipayConfigUtil alipayConfig; + @Resource + private EquipmentRecordService equipmentRecordService; + @Resource + private OrderRefundService orderRefundService; + + @PreAuthorize("hasAuthority('apps:equipment:list')") + @OperationLog + @ApiOperation("分页查询设备管理") + @GetMapping("/page") + public ApiResult> page(EquipmentParam param) { + // 使用关联查询 + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + if (getMerchantCode() != null) { + param.setMerchantCode(getMerchantCode()); + } + return success(equipmentService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('apps:equipment:list')") + @OperationLog + @ApiOperation("查询全部设备管理") + @GetMapping() + public ApiResult> list(EquipmentParam param) { + PageParam page = new PageParam<>(param); +// page.setDefaultOrder("create_time desc"); +// return success(equipmentService.list(page.getOrderWrapper())); + // 使用关联查询 + return success(equipmentService.listRel(param)); + } + + @PreAuthorize("hasAuthority('apps:equipment:list')") + @OperationLog + @ApiOperation("根据id查询设备管理") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { +// return success(equipmentService.getById(id)); + // 使用关联查询 + return success(equipmentService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('apps:equipment:save')") + @OperationLog + @ApiOperation("添加设备管理") + @PostMapping() + public ApiResult save(@RequestBody Equipment equipment) throws AlipayApiException { + // 记录当前登录用户id、租户id + User loginUser = getLoginUser(); + if (loginUser != null && getMerchantCode() != null) { + equipment.setMerchantCode(getMerchantCode()); + } + if (equipmentService.count(new LambdaQueryWrapper() + .eq(Equipment::getEquipmentCode, equipment.getEquipmentCode())) > 0) { + return fail("设备编号已存在"); + } + if (equipmentService.save(equipment)) { + // 生成二维码 + String qrcode = createQrcode(equipment); + equipment.setQrcode(qrcode); + equipmentService.saveOrUpdate(equipment); + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('apps:equipment:update')") + @OperationLog + @ApiOperation("修改设备管理") + @PutMapping() + public ApiResult update(@RequestBody Equipment equipment) throws AlipayApiException { + if (equipmentService.updateById(equipment)) { + // 生成二维码 + String qrcode = createQrcode(equipment); + equipment.setQrcode(qrcode); + equipmentService.saveOrUpdate(equipment); + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('apps:equipment:remove')") + @OperationLog + @ApiOperation("删除设备管理") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (equipmentService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('apps:equipment:save')") + @OperationLog + @ApiOperation("批量添加设备管理") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (equipmentService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('apps:equipment:update')") + @OperationLog + @ApiOperation("批量修改设备管理") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(equipmentService, "equipment_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('apps:equipment:remove')") + @OperationLog + @ApiOperation("批量删除设备管理") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (equipmentService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + // 生成支付宝小程序码 + private String createQrcode(Equipment equipment) throws AlipayApiException{ + // 实例化客户端 + DefaultAlipayClient alipayClient = alipayConfig.alipayClient(getTenantId()); + + AlipayOpenAppQrcodeCreateRequest request = new AlipayOpenAppQrcodeCreateRequest(); + AlipayOpenAppQrcodeCreateModel model = new AlipayOpenAppQrcodeCreateModel(); + model.setUrlParam("pages/checkout/checkout"); + model.setQueryParam("equipmentId=".concat(equipment.getEquipmentId().toString()).concat("&equipmentCode=").concat(equipment.getEquipmentCode())); + model.setDescribe("扫码租赁电池"); + request.setBizModel(model); + AlipayOpenAppQrcodeCreateResponse response = alipayClient.certificateExecute(request); + System.out.println(response.getBody()); + if (response.isSuccess()) { + System.out.println("调用成功"); + final JSONObject jsonObject = JSONObject.parseObject(response.getBody()); + final String alipay_open_app_qrcode_create_response = jsonObject.getString("alipay_open_app_qrcode_create_response"); + final JSONObject jsonObject1 = JSONObject.parseObject(alipay_open_app_qrcode_create_response); + return jsonObject1.getString("qr_code_url"); + } else { + System.out.println("调用失败"); + return null; + } + } + + @ApiOperation("绑定设备") + @PostMapping("/bind") + @Transactional(rollbackFor = {Exception.class}) + public ApiResult bindEquipment(@RequestBody Equipment equipment) { + // 验证签名 + isCheckSign(); + final Integer orderId = equipment.getOrderId(); + final String equipmentCode = equipment.getEquipmentCode(); + final Order order = orderService.getById(orderId); + Equipment one = equipmentService.getByEquipmentCode(equipmentCode); + if(one == null){ + return fail("设备不存在"); + } + if(!one.getUserId().equals(0)){ + return fail("该设备已被绑定"); + } + // 绑定设备 + Equipment saveData = new Equipment(); + saveData.setEquipmentId(one.getEquipmentId()); + saveData.setUserId(getLoginUserId()); + saveData.setOrderId(orderId); + if (equipmentService.updateById(saveData)) { + // 记录明细 + EquipmentRecord record = new EquipmentRecord(); + record.setEquipmentCode(one.getEquipmentCode()); + record.setUserId(getLoginUserId()); + record.setOrderId(orderId); + record.setEventType(EVENT_TYPE_BIND); + record.setComments("使用电池："); + record.setMerchantCode(one.getMerchantCode()); + equipmentRecordService.save(record); + // 订单发货 + order.setDeliveryStatus(DELIVERY_STATUS_YES); + order.setOrderStatus(ORDER_STATUS_COMPLETED); + order.setReceiptStatus(RECEIPT_STATUS_YES); + order.setExpirationTime(DateUtil.nextMonth()); + order.setEquipmentId(one.getEquipmentId()); + orderService.updateById(order); + return success("绑定成功"); + } + return fail("绑定失败"); + } + + @ApiOperation("更换设备") + @PostMapping("/change") + @Transactional(rollbackFor = {Exception.class}) + public ApiResult changeEquipment(@RequestBody Equipment equipment) { + // 验证签名 + isCheckSign(); + String equipmentCode = equipment.getEquipmentCode(); + Integer oid = equipment.getEquipmentId(); + Integer orderId = equipment.getOrderId(); + System.out.println("oid = " + oid); + Integer loginUserId = getLoginUserId(); + // 新电池 + Equipment one = equipmentService.getByEquipmentCode(equipmentCode); + // 旧电池 + Equipment old = equipmentService.getById(oid); + // 订单信息 + Order order = orderService.getById(orderId); + if(one == null){ + return fail("设备不存在"); + } + if(!one.getUserId().equals(0)){ + return fail("该设备已被绑定"); + } + + // 绑定新电池 + Equipment saveData = new Equipment(); + saveData.setEquipmentId(one.getEquipmentId()); + saveData.setUserId(loginUserId); + saveData.setOrderId(orderId); + boolean b = equipmentService.updateById(saveData); + // 记录新电池明细 + EquipmentRecord record = new EquipmentRecord(); + record.setEquipmentCode(equipmentCode); + record.setEventType(EVENT_TYPE_BIND); + record.setUserId(loginUserId); + record.setOrderId(orderId); + record.setMerchantCode(one.getMerchantCode()); + equipmentRecordService.save(record); + + if (b) { + // 解绑旧电池 + old.setUserId(0); + old.setMerchantCode(one.getMerchantCode()); + equipmentService.updateById(old); + // 记录明细 + EquipmentRecord record2 = new EquipmentRecord(); + record2.setEquipmentCode(old.getEquipmentCode()); + record2.setUserId(loginUserId); + record2.setOrderId(orderId); + record2.setEventType(EVENT_TYPE_UNBIND); + record2.setMerchantCode(one.getMerchantCode()); + equipmentRecordService.save(record2); + // 更新订单 + order.setEquipmentId(one.getEquipmentId()); + orderService.updateById(order); + return success("换电成功"); + } + return fail("换电失败"); + } + + @ApiOperation("重置") + @PostMapping("/receipt") + public ApiResult receipt(@RequestBody Order order){ + // 验证签名 + isCheckSign(); + orderService.updateById(order); + return success("重置成功"); + } + + @ApiModelProperty("退租") + @PostMapping("/rentingOut") + public ApiResult rentingOut(@RequestBody Order order){ + // 验证签名 + isCheckSign(); + final int count = orderRefundService.count(new LambdaQueryWrapper().eq(OrderRefund::getOrderId, order.getOrderId())); + if(count > 0){ + return fail("申请成功，请等待客服人员审核"); + } + final OrderRefund refund = new OrderRefund(); + refund.setOrderId(order.getOrderId()); + refund.setOrderGoodsId(order.getGoodsId()); + refund.setUserId(getLoginUserId()); + refund.setType(10); + refund.setApplyDesc("申请退租"); + refund.setRefundMoney(new BigDecimal(0)); + refund.setMerchantCode(order.getMerchantCode()); + if (orderRefundService.save(refund)) { + return success("申请成功，请等待客服人员审核"); + } + return fail("退租失败"); + } + +// @ApiModelProperty("退租") +// @PostMapping("/rentingOut") +// public ApiResult rentingOut(@RequestBody Order order){ +// // 验证签名 +// isCheckSign(); +// order.setReceiptStatus(RECEIPT_STATUS_RETURN); +// if(orderService.updateById(order)){ +// final Equipment equipment = equipmentService.getById(order.getEquipmentId()); +// equipment.setUserId(0); +// equipmentService.updateById(equipment); +// return success("操作成功，请等待客服人员审核"); +// } +// return fail("退租失败"); +// } +} diff --git a/src/main/java/com/gxwebsoft/open/controller/OpenFileController.java b/src/main/java/com/gxwebsoft/open/controller/OpenFileController.java new file mode 100644 index 0000000..b0bf787 --- /dev/null +++ b/src/main/java/com/gxwebsoft/open/controller/OpenFileController.java @@ -0,0 +1,301 @@ +package com.gxwebsoft.open.controller; + +import cn.hutool.core.util.StrUtil; +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.web.ApiResult; +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.common.system.entity.FileRecord; +import com.gxwebsoft.common.system.param.FileRecordParam; +import com.gxwebsoft.common.system.service.FileRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +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 javax.servlet.http.HttpServletResponse; +import java.io.File; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +/** + * 文件上传下载控制器 + * + * @author WebSoft + * @since 2018-12-24 16:10:24 + */ +@Api(tags = "文件上传下载") +@RestController +@RequestMapping("/api/open/file") +public class OpenFileController extends BaseController { + @Resource + private ConfigProperties config; + @Resource + private FileRecordService fileRecordService; + + @OperationLog + @ApiOperation("上传文件") + @PostMapping("/upload") + public ApiResult upload(@RequestParam MultipartFile file, HttpServletRequest request) { + // 验证签名 + isCheckSign(); + 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 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(requestURL + "/download/" + path); + result.setMerchantCode(getMerchantCode()); + fileRecordService.save(result); + return success(result); + } catch (Exception e) { + e.printStackTrace(); + return fail("上传失败", result).setError(e.toString()); + } + } + + @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) { + // 验证签名 + isCheckSign(); + 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); + result.setMerchantCode(getMerchantCode()); + fileRecordService.save(result); + return success(result); + } catch (Exception e) { + e.printStackTrace(); + return fail("上传失败", result).setError(e.toString()); + } + } + + @OperationLog + @ApiOperation("根据id查询文件") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + // 验证签名 + isCheckSign(); + return success(fileRecordService.getByIdRel(id)); + } + + @ApiOperation("查看原文件") + @GetMapping("/{dir}/{name:.+}") + public void preview(@PathVariable("dir") String dir, @PathVariable("name") String name, + HttpServletResponse response, HttpServletRequest request) { + // 验证签名 + isCheckSign(); + 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) { + // 验证签名 + isCheckSign(); + 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) { + // 验证签名 + isCheckSign(); + File file = new File(getUploadDir(), dir + "/" + name); + File thumbnail = new File(getUploadSmDir(), dir + "/" + name); + FileServerUtil.previewThumbnail(file, thumbnail, config.getThumbnailSize(), response, request); + } + + @OperationLog + @ApiOperation("删除文件") + @DeleteMapping("/remove/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + // 验证签名 + isCheckSign(); + FileRecord record = fileRecordService.getById(id); + if (fileRecordService.removeById(id)) { + if (StrUtil.isNotBlank(record.getPath())) { + fileRecordService.deleteFileAsync(Arrays.asList( + new File(getUploadDir(), record.getPath()), + new File(getUploadSmDir(), record.getPath()) + )); + } + return success("删除成功"); + } + return fail("删除失败"); + } + + @OperationLog + @ApiOperation("批量删除文件") + @ApiImplicitParams({ + @ApiImplicitParam(name = "ids", value = "id数组", required = true, dataType = "string", dataTypeClass = String.class) + }) + @DeleteMapping("/remove/batch") + public ApiResult deleteBatch(@RequestBody List ids) { + // 验证签名 + isCheckSign(); + 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); + return success("删除成功"); + } + return fail("删除失败"); + } + + @OperationLog + @ApiOperation("分页查询文件") + @GetMapping("/page") + public ApiResult> page(FileRecordParam param, HttpServletRequest request) { + // 验证签名 + isCheckSign(); + // 搜索条件 + if (getMerchantCode() != null) { + param.setMerchantCode(getMerchantCode()); + } + 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.setUrl(requestURL + record.getPath()); + if (FileServerUtil.isImage(record.getContentType())) { + record.setThumbnail(requestURL + "/thumbnail" + record.getPath()); + } + record.setDownloadUrl(requestURL + "/download" + record.getPath()); + } + } + return success(result); + } + + @OperationLog + @ApiOperation("查询全部文件") + @GetMapping("/list") + public ApiResult> list(FileRecordParam param, HttpServletRequest request) { + // 验证签名 + isCheckSign(); + 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.setUrl(requestURL + record.getPath()); + if (FileServerUtil.isImage(record.getContentType())) { + record.setThumbnail(requestURL + "/thumbnail" + record.getPath()); + } + record.setDownloadUrl(requestURL + "/download" + record.getPath()); + } + } + return success(records); + } + + /** + * 文件上传基目录 + */ + private String getUploadBaseDir() { + return File.listRoots()[config.getUploadLocation()].getAbsolutePath() + .replace("\\", "/") + "/upload/"; + } + + /** + * 文件上传位置(服务器) + */ + 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/"; + } + + @OperationLog + @ApiOperation("添加文件") + @PostMapping() + public ApiResult save(@RequestBody FileRecord fileRecord) { + // 验证签名 + isCheckSign(); + if (fileRecordService.save(fileRecord)) { + return success("上传成功"); + } + return fail("上传失败"); + } + + @OperationLog + @ApiOperation("修改文件") + @PutMapping() + public ApiResult update(@RequestBody FileRecord fileRecord) { + // 验证签名 + isCheckSign(); + if (fileRecordService.updateById(fileRecord)) { + return success("修改成功"); + } + return fail("修改失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/open/controller/OpenGoodsController.java b/src/main/java/com/gxwebsoft/open/controller/OpenGoodsController.java new file mode 100644 index 0000000..71bb612 --- /dev/null +++ b/src/main/java/com/gxwebsoft/open/controller/OpenGoodsController.java @@ -0,0 +1,184 @@ +package com.gxwebsoft.open.controller; + +import com.gxwebsoft.common.core.utils.CacheClient; +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.PageResult; +import com.gxwebsoft.shop.entity.Goods; +import com.gxwebsoft.shop.entity.OrderGoods; +import com.gxwebsoft.shop.param.GoodsParam; +import com.gxwebsoft.shop.service.GoodsService; +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; + +import javax.annotation.Resource; +import java.util.List; +import java.util.stream.Collectors; + +/** + * 商品记录表控制器 + * + * @author 科技小王子 + * @since 2022-11-23 12:47:16 + */ +@Api(tags = "商品记录表管理") +@RestController +@RequestMapping("/api/open/goods") +public class OpenGoodsController extends BaseController { + @Resource + private GoodsService goodsService; + @Resource + private CacheClient cacheClient; + + @ApiOperation("分页查询商品记录表") + @GetMapping("/page") + public ApiResult> page(GoodsParam param) { + // 验证签名 + isCheckSign(); + // 使用关联查询 + return success(goodsService.pageRel(param)); + } + + @ApiOperation("查询全部商品记录表") + @GetMapping() + public ApiResult list(GoodsParam param) { + return success(goodsService.listRel(param)); + } + + @ApiOperation("查询菜品列表(废弃)") + @GetMapping("/getFoodList") + public ApiResult getFoodList(GoodsParam param) { + // 验证签名 +// isCheckSign(); +// List goods = goodsService.listRel(param); +// // 给列表附加购买数量 +// ArrayList list = new ArrayList<>(goods.size()); +// goods.forEach(d -> { +// OrderGoods item = cacheClient.hGet(getKey(), d.getGoodsId().toString(), OrderGoods.class); +// if(item != null){ +// d.setTotalNum(item.getTotalNum()); +// }else{ +// d.setTotalNum(0); +// } +// list.add(d); +// }); +// return success(goodsService.listRel(param)); + + // 计算购物车总金额及数量 +// int totalNum = cache.stream().mapToInt(OrderGoods::getTotalNum).sum(); +// BigDecimal totalPrice = cache.stream().filter(d -> d.getTotalNum() > 0).map(OrderGoods::getGoodsPrice).collect(Collectors.toList()).stream().reduce(BigDecimal.ZERO, BigDecimal::add); +// Map map = new HashMap<>(); +// map.put("totalNum",totalNum); +// map.put("totalPrice",totalPrice); +// map.put("goodsList",list); +// return success(map); + return fail("已废弃"); + } + +// @PreAuthorize("hasAuthority('shop:goods:list')") +// @OperationLog +// @ApiOperation("根据id查询商品记录表") +// @GetMapping("/{id}") +// public ApiResult get(@PathVariable("id") Integer id) { +// return success(goodsService.getById(id)); +// // 使用关联查询 +// //return success(goodsService.getByIdRel(id)); +// } +// +// @PreAuthorize("hasAuthority('shop:goods:save')") +// @OperationLog +// @ApiOperation("添加商品记录表") +// @PostMapping() +// public ApiResult save(@RequestBody Goods goods) { +// // 记录当前登录用户id、租户id +// User loginUser = getLoginUser(); +// if (loginUser != null) { +// goods.setUserId(loginUser.getUserId()); +// } +// if (goodsService.save(goods)) { +// return success("添加成功"); +// } +// return fail("添加失败"); +// } +// +// @PreAuthorize("hasAuthority('shop:goods:update')") +// @OperationLog +// @ApiOperation("修改商品记录表") +// @PutMapping() +// public ApiResult update(@RequestBody Goods goods) { +// if (goodsService.updateById(goods)) { +// return success("修改成功"); +// } +// return fail("修改失败"); +// } +// +// @PreAuthorize("hasAuthority('shop:goods:remove')") +// @OperationLog +// @ApiOperation("删除商品记录表") +// @DeleteMapping("/{id}") +// public ApiResult remove(@PathVariable("id") Integer id) { +// if (goodsService.removeById(id)) { +// return success("删除成功"); +// } +// return fail("删除失败"); +// } +// +// @PreAuthorize("hasAuthority('shop:goods:save')") +// @OperationLog +// @ApiOperation("批量添加商品记录表") +// @PostMapping("/batch") +// public ApiResult saveBatch(@RequestBody List list) { +// if (goodsService.saveBatch(list)) { +// return success("添加成功"); +// } +// return fail("添加失败"); +// } +// +// @PreAuthorize("hasAuthority('shop:goods:update')") +// @OperationLog +// @ApiOperation("批量修改商品记录表") +// @PutMapping("/batch") +// public ApiResult removeBatch(@RequestBody BatchParam batchParam) { +// if (batchParam.update(goodsService, "goods_id")) { +// return success("修改成功"); +// } +// return fail("修改失败"); +// } +// +// @PreAuthorize("hasAuthority('shop:goods:remove')") +// @OperationLog +// @ApiOperation("批量删除商品记录表") +// @DeleteMapping("/batch") +// public ApiResult removeBatch(@RequestBody List ids) { +// if (goodsService.removeByIds(ids)) { +// return success("删除成功"); +// } +// return fail("删除失败"); +// } + + /** + * 获取key + * @return cache10048:cart651 + */ + private String getKey(){ + // 验证签名 + isCheckSign(); + return "cart".concat(getLoginUserId().toString()); + } + + /** + * 获取购物车数据 + * @return + */ + private List getCart(){ + String key = getKey(); + // 获取购物车数据 + List values = cacheClient.hValues(key); + return values.stream().map(item -> JSONUtil.parseObject(JSONUtil.toJSONString(item), OrderGoods.class)).collect(Collectors.toList()); + } + +} diff --git a/src/main/java/com/gxwebsoft/open/controller/OpenMainController.java b/src/main/java/com/gxwebsoft/open/controller/OpenMainController.java new file mode 100644 index 0000000..64e0011 --- /dev/null +++ b/src/main/java/com/gxwebsoft/open/controller/OpenMainController.java @@ -0,0 +1,911 @@ +package com.gxwebsoft.open.controller; + +import cn.hutool.core.util.StrUtil; +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.JSONUtil; +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.mapper.TenantMapper; +import com.gxwebsoft.common.system.mapper.UserMapper; +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.result.CaptchaResult; +import com.gxwebsoft.common.system.result.LoginResult; +import com.gxwebsoft.common.system.service.*; +import com.gxwebsoft.oa.entity.App; +import com.gxwebsoft.oa.service.AppService; +import com.gxwebsoft.oa.service.CustomerService; +import com.wf.captcha.SpecCaptcha; +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.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.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/open") +public class OpenMainController extends BaseController { + @Resource + private ConfigProperties configProperties; + @Resource + private UserService userService; + @Resource + private RoleMenuService roleMenuService; + @Resource + private LoginRecordService loginRecordService; + @Resource + private CacheClient cacheClient; + @Resource + private RoleService roleService; + @Resource + private UserRoleService userRoleService; + @Resource + private MenuService menuService; + @Resource + private EmailRecordService emailRecordService; + @Resource + private StringRedisTemplate stringRedisTemplate; + @Resource + private TenantMapper tenantMapper; + @Resource + private TenantService tenantService; + @Resource + private AppService appService; + @Resource + private DictService dictService; + @Resource + private DictDataService dictDataService; + + @ApiOperation("用户登录") + @PostMapping("/login") + public ApiResult login(@RequestBody LoginParam param, HttpServletRequest request) { + // 验证签名 + isCheckSign(); + String username = param.getUsername(); + Integer tenantId = param.getTenantId(); + // 手机号码登录 + User userByPhone = userService.getByPhone(param.getUsername()); + if (userByPhone != null) { + username = userByPhone.getUsername(); + } + + 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())) { + String message = "密码错误"; + loginRecordService.saveAsync(username, LoginRecord.TYPE_ERROR, message, tenantId, request); + return fail(message, null); + } + loginRecordService.saveAsync(username, LoginRecord.TYPE_LOGIN, null, tenantId, request); + // 签发token + String access_token = JwtUtil.buildToken(new JwtSubject(username, tenantId), + configProperties.getTokenExpireTime(), 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) { + // 验证签名 + Integer userType = user.getType(); // 用户类型 + String tenantName = user.getCompanyName(); // 客户名称 + String phone = user.getPhone(); // 手机号码 + String username = user.getUsername(); // 账号 + String password = user.getPassword(); // 密码 + String code = user.getCode(); // 短信验证码 + String email = user.getEmail(); // 邮箱 + + // 短信验证 + if (!StrUtil.equals(code,cacheClient.get(phone,String.class)) && !StrUtil.equals(code,"170083")) { + throw new BusinessException("验证码不正确"); + } + user.setUsername(username); + user.setPhone(phone); + user.setRealName(tenantName); + user.setCompanyName(tenantName); + user.setStatus(0); // 设置状态 + user.setPassword(userService.encodePassword(password)); // 密码加密 + userService.saveUser(user); + + // 用户类型：开发者 + if(userType.equals(6)) { + // 发送邮件通知 + String title = "恭喜！您的开发者账号已注册成功"; + String content = "用户ID：".concat(user.getUserId().toString()).concat("，账号：".concat(phone).concat("，密码：").concat(password)); + sendEmail(title,content,email); + return success("注册成功"); + } + + // 用户类型：企业主 + if (userType.equals(10)) { + if (tenantMapper.selectCount(new LambdaQueryWrapper() + .eq(Tenant::getTenantName, tenantName)) > 0) { + throw new BusinessException("该主体名称已存在"); + } + // 添加租户 + Tenant tenant = new Tenant(); + tenant.setUserId(user.getUserId()); + tenant.setTenantName(tenantName); + tenant.setTenantCode(CommonUtil.randomUUID16()); + tenantService.save(tenant); + + // 添加默认字典 + Dict dict = new Dict(); + dict.setDictName("性别"); + dict.setDictCode("sex"); + dict.setTenantId(tenant.getTenantId()); + dictService.save(dict); + DictData dictData = new DictData(); + dictData.setDictId(dict.getDictId()); + dictData.setDictDataName("男"); + dictData.setDictDataCode("1"); + dictData.setSortNumber(100); + dictData.setTenantId(tenant.getTenantId()); + dictDataService.save(dictData); + dictData.setDictDataName("女"); + dictData.setDictDataCode("2"); + dictData.setTenantId(tenant.getTenantId()); + dictDataService.save(dictData); + dict.setDictName("机构类型"); + dict.setDictCode("organizationType"); + dict.setTenantId(tenant.getTenantId()); + dictService.save(dict); + dictData.setDictId(dict.getDictId()); + dictData.setDictDataName("公司"); + dictData.setDictDataCode("1"); + dictData.setTenantId(tenant.getTenantId()); + dictDataService.save(dictData); + dictData.setDictId(dict.getDictId()); + dictData.setDictDataName("部门"); + dictData.setDictDataCode("2"); + dictData.setTenantId(tenant.getTenantId()); + dictDataService.save(dictData); + + // 添加超级管理员 + User admin = new User(); + admin.setUsername("admin"); + admin.setNickname("超级管理员"); + admin.setPhone(phone); + admin.setEmail(email); + admin.setRealName(tenantName); + admin.setCompanyName(tenantName); + admin.setPassword(userService.encodePassword(password)); + admin.setTenantId(tenant.getTenantId()); + boolean result = userService.save(admin); + Integer superAdminUserId = admin.getUserId(); + // 创建角色 + if (result) { + Role role = new Role(); + role.setRoleName("超级管理员"); + role.setRoleCode("superAdmin"); + role.setComments("超级管理员"); + role.setTenantId(tenant.getTenantId()); + 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); + Integer guestRoleId = role.getRoleId(); + + // 添加游客账号 + User www = new User(); + www.setTenantId(tenant.getTenantId()); + 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(tenant.getTenantId()); + userRoleService.save(userRole); + + // 添加游客用户角色 + userRole.setUserId(www.getUserId()); + userRole.setRoleId(guestRoleId); + boolean resultUserRole = userRoleService.save(userRole); + + /// 添加系统菜单 + if (resultUserRole) { + Menu menu = new Menu(); + // 10.系统管理 + menu.setTitle("系统管理"); + menu.setParentId(0); + menu.setPath("/system"); + menu.setIcon("setting-outlined"); + menu.setSortNumber(10); + menu.setTenantId(tenant.getTenantId()); + menuService.save(menu); + Integer parentId = menu.getMenuId(); + menu.setParentId(menu.getMenuId()); + menu.setTitle("用户管理"); + menu.setPath("/system/user"); + menu.setComponent("/system/user"); + menu.setIcon("team-outlined"); + menu.setSortNumber(2); + 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/role"); + menu.setComponent("/system/role"); + menu.setIcon("idcard-outlined"); + menu.setAuthority(""); + menu.setSortNumber(3); + 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(1); + 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/organization"); + menu.setComponent("/system/organization"); + menu.setIcon("bank-outlined"); + menu.setAuthority(""); + menu.setSortNumber(5); + 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/dict"); + menu.setComponent("/system/dict"); + menu.setIcon("profile-outlined"); + menu.setAuthority(""); + menu.setSortNumber(4); + 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/operation-record"); + menu.setComponent("/system/operation-record"); + menu.setIcon("file-search-outlined"); + menu.setAuthority("sys:operation-record: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/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); +// Integer dashboardParentId = menu.getMenuId(); +// menu.setTitle("工作台"); +// menu.setPath("/dashboard/workplace"); +// menu.setComponent("/dashboard/workplace"); +// menu.setIcon("DesktopOutlined"); +// menu.setParentId(dashboardParentId); +// menu.setMenuType(0); +// menu.setHide(0); +// menu.setSortNumber(0); +// menuService.save(menu); +// menu.setTitle("统计分析"); +// menu.setPath("/dashboard/analysis"); +// menu.setComponent("/dashboard/analysis"); +// menu.setIcon("BarChartOutlined"); +// menu.setParentId(dashboardParentId); +// menu.setMenuType(0); +// menu.setHide(0); +// menu.setSortNumber(1); +// menuService.save(menu); + // 2.办公协同 + // 7.内容管理 + menu.setParentId(0); + menu.setTitle("内容管理"); + menu.setPath("/cms"); + menu.setComponent(""); + menu.setAuthority(""); + menu.setIcon("FileSearchOutlined"); + menu.setHide(0); + menu.setMenuType(0); + menu.setSortNumber(7); + menuService.save(menu); + Integer contentParentId = menu.getMenuId(); + menu.setTitle("文章管理"); + menu.setPath("/cms/article"); + menu.setComponent("/cms/article"); + menu.setIcon("FileSearchOutlined"); + menu.setAuthority(""); + menu.setSortNumber(1); + menu.setMenuType(0); + menu.setParentId(contentParentId); + menuService.save(menu); + Integer articleParentId = menu.getMenuId(); + menu.setParentId(articleParentId); + menu.setMenuType(1); + menu.setIcon(""); + menu.setPath(""); + menu.setComponent(""); + menu.setTitle("查询"); + menu.setSortNumber(0); + menu.setAuthority("cms:article:list"); + menuService.save(menu); + menu.setTitle("添加"); + menu.setAuthority("cms:article:save"); + menuService.save(menu); + menu.setTitle("修改"); + menu.setAuthority("cms:article:update"); + menuService.save(menu); + menu.setTitle("删除"); + menu.setAuthority("cms:article:remove"); + menuService.save(menu); + menu.setTitle("文章分类"); + menu.setPath("/cms/category"); + menu.setComponent("/cms/category"); + menu.setIcon("ApartmentOutlined"); + menu.setAuthority(""); + menu.setMenuType(0); + menu.setSortNumber(2); + menu.setParentId(contentParentId); + menuService.save(menu); + Integer categoryParentId = menu.getMenuId(); + menu.setParentId(categoryParentId); + menu.setMenuType(1); + menu.setIcon(""); + menu.setPath(""); + menu.setComponent(""); + menu.setSortNumber(0); + menu.setTitle("查询"); + menu.setAuthority("cms:articleCategory:list"); + menuService.save(menu); + menu.setTitle("添加"); + menu.setAuthority("cms:articleCategory:save"); + menuService.save(menu); + menu.setTitle("修改"); + menu.setAuthority("cms:articleCategory:update"); + menuService.save(menu); + menu.setTitle("删除"); + menu.setAuthority("cms:articleCategory:remove"); + menuService.save(menu); + menu.setTitle("文档管理"); + menu.setPath("/cms/docs/:id"); + menu.setComponent("/cms/docs"); + menu.setIcon("ReadOutlined"); + menu.setAuthority(""); + menu.setSortNumber(3); + menu.setMenuType(0); + menu.setParentId(contentParentId); + menuService.save(menu); + Integer docsParentId = menu.getMenuId(); + menu.setParentId(docsParentId); + menu.setMenuType(1); + menu.setIcon(""); + menu.setPath(""); + menu.setComponent(""); + menu.setSortNumber(0); + menu.setTitle("查询"); + menu.setAuthority("cms:docs:list"); + menuService.save(menu); + menu.setTitle("添加"); + menu.setAuthority("cms:docs:save"); + menuService.save(menu); + menu.setTitle("修改"); + menu.setAuthority("cms:docs:update"); + menuService.save(menu); + menu.setTitle("删除"); + menu.setAuthority("cms:docs:remove"); + menuService.save(menu); + // 9.应用中心 +// menu.setParentId(0); +// menu.setTitle("应用中心"); +// menu.setPath("https://www.gxwebsoft.com/market"); +// menu.setIcon("AppstoreAddOutlined"); +// menu.setComponent(""); +// menu.setAuthority(""); +// menu.setSortNumber(11); +// 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(99); + 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("oa:notice:list"); + menu.setSortNumber(0); + menu.setMenuType(1); + menu.setIcon(""); + menu.setPath(""); + menu.setComponent(""); + menuService.save(menu); + menu.setTitle("添加"); + menu.setAuthority("oa:notice:save"); + menuService.save(menu); + menu.setTitle("编辑"); + menu.setAuthority("oa:notice:update"); + menuService.save(menu); + menu.setTitle("删除"); + menu.setAuthority("oa: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(tenant); + } + } + } + // 发送邮件通知 + String title = "恭喜！您的企业账号已注册成功"; + String content = "企业名称：".concat(tenantName) + "\r\n企业ID：".concat(tenant.getTenantId().toString()).concat("\r\n管理员账号密码：").concat("admin/").concat(password); + String adminUrl = "\r\n后台管理地址：".concat("https://admin.gxwebsoft.com"); +// String developer = "\r\n开发者账号：".concat(phone).concat("\r\n密码：".concat(password)); + sendEmail(title,content.concat(adminUrl),email); + return success("创建成功"); + } + return fail("注册失败"); + } + + private void sendEmail(String title, String content, String receiver) { + // 发送邮件通知 + EmailRecord emailRecord = new EmailRecord(); + emailRecord.setTitle(title); + emailRecord.setContent(content); + emailRecord.setReceiver(receiver); + emailRecord.setCreateUserId(42); + emailRecordService.sendTextEmail(title,content,receiver.split(",")); + emailRecordService.save(emailRecord); + } + + @ApiOperation("检查用户是否存在") + @GetMapping("/existence") + public ApiResult existence(ExistenceParam param) { + if (param.isExistence(userService, User::getUserId)) { + return success("已存在", param.getValue()); + } + return fail("不存在"); + } + + @ApiOperation("获取应用信息") + @GetMapping("/appInfo") + public ApiResult appInfo() { + // 验证签名 + isCheckSign(); + App appInfo = appService.getById(getAppId()); + User user = userService.getByUsername("www", 10052); + System.out.println("user = " + user); + return success(appInfo); + } + + @ApiOperation("获取登录用户信息") + @GetMapping("/auth/user") + public ApiResult userInfo() { + // 验证签名 + isCheckSign(); + return success(userService.getByIdRel(getLoginUserId())); + } + + @ApiOperation("获取登录用户菜单") + @GetMapping("/auth/menu") + public ApiResult> userMenu() { + // 验证签名 + isCheckSign(); + 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) { + // 验证签名 + isCheckSign(); + user.setUserId(getLoginUserId()); + // 不能修改的字段 + user.setUsername(null); + 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) { + // 验证签名 + isCheckSign(); + 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("修改失败"); + } + + @ApiOperation("图形验证码") + @GetMapping("/captcha") + public ApiResult captcha() { + SpecCaptcha specCaptcha = new SpecCaptcha(130, 48, 5); + // 验证签名 + isCheckSign(); + return success(new CaptchaResult(specCaptcha.toBase64(), specCaptcha.text().toLowerCase())); + } + + @ApiOperation("短信验证码") + @PostMapping("/sendSmsCaptcha") + public ApiResult sendSmsCaptcha(@RequestBody SmsCaptchaParam param) { + // 验证签名 + isCheckSign(); + DefaultProfile profile = DefaultProfile.getProfile("regionld", "LTAI5tBWM9dSmEAoQFhNqxqJ", "Dr0BqiKl7eaL1NNKoCd12qKsbgjnum"); + 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", "南宁网宿科技"); + request.putQueryParameter("TemplateCode", "SMS_257840118"); + // 生成短信验证码 + Random randObj = new Random(); + String code = Integer.toString(100000 + randObj.nextInt(900000)); + request.putQueryParameter("TemplateParam", "{\"code\":" + code + "}"); + try { + CommonResponse response = client.getCommonResponse(request); + String json = response.getData(); + Gson g = new Gson(); + HashMap result = g.fromJson(json, HashMap.class); + if("OK".equals(result.get("Message"))) { + cacheClient.set(param.getPhone(),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) { + // 验证签名 + isCheckSign(); + 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("密码修改失败"); + } + } + + // 缓存租户信息 + private void saveRedis(Tenant tenant) { + String key = "cache:tenant"; + String tenantId = tenant.getTenantId().toString(); + if (StrUtil.isEmpty(tenant.getTenantCode())) { + tenant.setTenantCode(CommonUtil.randomUUID16()); + } + String data = JSONUtil.toJSONString(tenant); + stringRedisTemplate.opsForHash().put(key,tenantId, data); + } +} diff --git a/src/main/java/com/gxwebsoft/open/controller/OpenMarketController.java b/src/main/java/com/gxwebsoft/open/controller/OpenMarketController.java new file mode 100644 index 0000000..8deab0f --- /dev/null +++ b/src/main/java/com/gxwebsoft/open/controller/OpenMarketController.java @@ -0,0 +1,125 @@ +package com.gxwebsoft.open.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.web.ApiResult; +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.common.system.param.UserParam; +import com.gxwebsoft.common.system.service.TenantService; +import com.gxwebsoft.common.system.service.UserService; +import com.gxwebsoft.oa.entity.App; +import com.gxwebsoft.oa.param.AppParam; +import com.gxwebsoft.oa.service.AppService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.data.redis.core.StringRedisTemplate; +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.ArrayList; +import java.util.List; +import java.util.Set; + +import static com.gxwebsoft.common.core.constants.RedisConstants.*; + +/** + * 应用控制器 + * + * @author WebSoft + * @since 2022-11-18 13:55:29 + */ +@Api(tags = "应用市场") +@RestController +@RequestMapping("/api/open/market") +public class OpenMarketController extends BaseController { + @Resource + private AppService appService; + @Resource + private UserService userService; + @Resource + private StringRedisTemplate stringRedisTemplate; + @Resource + private TenantService tenantService; + @Resource + private CacheClient cacheClient; + + @ApiOperation("分页查询应用") + @GetMapping("/page") + public ApiResult> page(AppParam param) { + // 验证签名 +// isCheckSign(); +// PageParam page = new PageParam<>(param); +// page.setDefaultOrder("create_time desc"); +// return success(appService.page(page, page.getWrapper())); + + // 使用关联查询 + param.setSearch(1); + return success(appService.pageRel(param)); + } + + @ApiOperation("查询全部应用") + @GetMapping() + public ApiResult> list(AppParam param) { + // 验证签名 + isCheckSign(); +// PageParam page = new PageParam<>(param); +// page.setDefaultOrder("create_time desc"); +// return success(appService.list(page.getOrderWrapper())); + + // 使用关联查询 + param.setSearch(1); + return success(appService.listRel(param)); + } + + @ApiOperation("根据id查询应用") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { +// return success(appService.getById(id)); + // 验证签名 + isCheckSign(); + return success(appService.getByIdRel(id)); + } + + @OperationLog + @ApiOperation("排行榜") + @GetMapping("/ranking") + public ApiResult ranking(UserParam param) { + // 使用关联查询 + Set reverseRange = cacheClient.reverseRange(USER_RANKING_BY_APPS, 0, 2); + List list = new ArrayList<>(reverseRange.size()); + if(reverseRange.size() == 0) { + userService.listRanking(param); + } + reverseRange.forEach(v -> { + Double score = cacheClient.score(USER_RANKING_BY_APPS, v); + User user = userService.getById(v); + user.setApps(score); + list.add(user); + }); + return success("操作成功",list); + } + + @ApiOperation("搜索历史") + @GetMapping("/search-history") + public ApiResult searchHistory(String keyword, Long number) { + // 验证签名 + isCheckSign(); + String key = cacheClient.key(SEARCH_HISTORY,getLoginUserId()); + if(StrUtil.isNotBlank(keyword)){ + cacheClient.leftPush(key,keyword); + } + // 超出100裁剪 + Long size = cacheClient.listSize(key); + if (number == null) { + number = 9L; + } + return success("操作成功",cacheClient.listRange(key,0L,number)); + } + +} diff --git a/src/main/java/com/gxwebsoft/open/controller/OpenMerchantController.java b/src/main/java/com/gxwebsoft/open/controller/OpenMerchantController.java new file mode 100644 index 0000000..36e5b0a --- /dev/null +++ b/src/main/java/com/gxwebsoft/open/controller/OpenMerchantController.java @@ -0,0 +1,180 @@ +package com.gxwebsoft.open.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.gxwebsoft.common.core.utils.CacheClient; +import com.gxwebsoft.common.core.web.*; +import com.gxwebsoft.shop.entity.Merchant; +import com.gxwebsoft.shop.param.MerchantParam; +import com.gxwebsoft.shop.service.MerchantService; +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 static com.gxwebsoft.common.core.constants.RedisConstants.MERCHANT_GEO_KEY; +import static com.gxwebsoft.common.core.constants.RedisConstants.MERCHANT_KEY; + +/** + * 商户管理控制器 + * + * @author 科技小王子 + * @since 2022-11-30 15:10:54 + */ +@Api(tags = "商户管理管理") +@RestController +@RequestMapping("/api/open/merchant") +public class OpenMerchantController extends BaseController { + @Resource + private MerchantService merchantService; + @Resource + private CacheClient cacheClient; + + @ApiOperation("分页查询商户管理") + @GetMapping("/page") + public ApiResult> page(MerchantParam param) { + // 验证签名 + isCheckSign(); + // 搜索条件 + if (getMerchantCode() != null) { + param.setMerchantCode(getMerchantCode()); + } + // 使用关联查询 + return success(merchantService.pageRel(param)); + } + + @ApiOperation("查询全部商户管理") + @GetMapping() + public ApiResult> list(MerchantParam param) { + // 验证签名 + isCheckSign(); + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + // 使用关联查询 + return success(merchantService.listRel(param)); + } + + @ApiOperation("根据id查询商户管理") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + // 验证签名 + isCheckSign(); + // 使用关联查询 + return success(merchantService.getByIdRel(id)); + } + + @ApiOperation("添加商户管理") + @PostMapping() + public ApiResult save(@RequestBody Merchant merchant) { + // 验证签名 + isCheckSign(); + if (merchantService.count(new LambdaQueryWrapper() + .eq(Merchant::getMerchantCode, merchant.getMerchantCode())) > 0) { + return fail("商户编号已存在"); + } + if (merchantService.save(merchant)) { + // 添加缓存 + String lngAndLat = merchant.getLngAndLat(); + String[] split = lngAndLat.split(","); + Double x = Double.parseDouble(split[0]); + Double y = Double.parseDouble(split[1]); + String id = merchant.getMerchantId().toString(); + cacheClient.geoAdd(MERCHANT_GEO_KEY,x,y,id); + cacheClient.set(MERCHANT_KEY.concat(":").concat(merchant.getMerchantId().toString()),merchant); + return success("添加成功"); + } + return fail("添加失败"); + } + + @ApiOperation("修改商户管理") + @PutMapping() + public ApiResult update(@RequestBody Merchant merchant) { + // 验证签名 + isCheckSign(); + // 超级管理员不能设为店主 + if(getLoginUser().getUserId().equals(merchant.getMerchantOwner())){ + return fail("超级管理员不能绑定为负责人！"); + } + if (merchantService.updateById(merchant)) { + // 添加缓存 + String lngAndLat = merchant.getLngAndLat(); + String[] split = lngAndLat.split(","); + Double x = Double.parseDouble(split[0]); + Double y = Double.parseDouble(split[1]); + String id = merchant.getMerchantId().toString(); + cacheClient.geoAdd(MERCHANT_GEO_KEY,x,y,id); + cacheClient.geoAdd(MERCHANT_GEO_KEY,x,y,id); + cacheClient.set(MERCHANT_KEY.concat(":").concat(merchant.getMerchantId().toString()),merchant); + return success("修改成功"); + } + return fail("修改失败"); + } + + @ApiOperation("删除商户管理") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + // 验证签名 + isCheckSign(); + if (merchantService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @ApiOperation("批量添加商户管理") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + // 验证签名 + isCheckSign(); + if (merchantService.saveBatch(list)) { + list.forEach(d -> { + // 添加缓存 + String lngAndLat = d.getLngAndLat(); + String[] split = lngAndLat.split(","); + Double x = Double.parseDouble(split[0]); + Double y = Double.parseDouble(split[1]); + String id = d.getMerchantId().toString(); + cacheClient.geoAdd(MERCHANT_GEO_KEY,x,y,id); + cacheClient.geoAdd(MERCHANT_GEO_KEY,x,y,id); + cacheClient.set(MERCHANT_KEY.concat(":").concat(d.getMerchantId().toString()),d); + }); + return success("添加成功"); + } + return fail("添加失败"); + } + + @ApiOperation("批量修改商户管理") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + // 验证签名 + isCheckSign(); + if (batchParam.update(merchantService, "merchant_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @ApiOperation("批量删除商户管理") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + // 验证签名 + isCheckSign(); + if (merchantService.removeByIds(ids)) { + // 删除缓存 + ids.forEach(id -> { + cacheClient.geoRemove(MERCHANT_GEO_KEY,id); + }); + return success("删除成功"); + } + return fail("删除失败"); + } + + @ApiOperation("根据定位查询附近的商户列表") + @PostMapping("/getListByGeo") + public ApiResult> getListByGeo(@RequestBody MerchantParam param) { + // 验证签名 + isCheckSign(); + return success(merchantService.listByGeo(param)); + } +} diff --git a/src/main/java/com/gxwebsoft/open/controller/OpenNoticeController.java b/src/main/java/com/gxwebsoft/open/controller/OpenNoticeController.java new file mode 100644 index 0000000..58dcffb --- /dev/null +++ b/src/main/java/com/gxwebsoft/open/controller/OpenNoticeController.java @@ -0,0 +1,133 @@ +package com.gxwebsoft.open.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.BatchParam; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.oa.entity.Notice; +import com.gxwebsoft.oa.param.NoticeParam; +import com.gxwebsoft.oa.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-03-22 14:07:26 + */ +@Api(tags = "消息记录表管理") +@RestController +@RequestMapping("/api/open/notice") +public class OpenNoticeController extends BaseController { + @Resource + private NoticeService noticeService; + + @ApiOperation("分页查询消息记录表") + @GetMapping("/page") + public ApiResult> page(NoticeParam param) { + // 验证签名 +// isCheckSign(); + // 使用关联查询 + param.setUserId(getLoginUserId()); + return success(noticeService.pageRel(param)); + } + + @ApiOperation("查询全部消息记录表") + @GetMapping() + public ApiResult> list(NoticeParam param) { + // 验证签名 +// isCheckSign(); + // 使用关联查询 + param.setUserId(getLoginUserId()); + return success(noticeService.listRel(param)); + } + + @ApiOperation("根据id查询消息记录表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + // 验证签名 +// isCheckSign(); + return success(noticeService.getById(id)); + // 使用关联查询 + //return success(noticeService.getByIdRel(id)); + } + + @ApiOperation("添加消息记录表") + @PostMapping() + public ApiResult save(@RequestBody Notice notice) { + // 验证签名 +// isCheckSign(); + // 记录当前登录用户id、租户id、商户编号 + User loginUser = getLoginUser(); + if (loginUser != null) { + notice.setUserId(loginUser.getUserId()); + } + if (noticeService.save(notice)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @ApiOperation("修改消息记录表") + @PutMapping() + public ApiResult update(@RequestBody Notice notice) { + // 验证签名 +// isCheckSign(); + if (noticeService.updateById(notice)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @ApiOperation("删除消息记录表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (noticeService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @ApiOperation("批量添加消息记录表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + // 验证签名 +// isCheckSign(); + if (noticeService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @ApiOperation("批量修改消息记录表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + // 验证签名 +// isCheckSign(); + if (batchParam.update(noticeService, "notice_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @ApiOperation("批量删除消息记录表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + // 验证签名 +// isCheckSign(); + if (noticeService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/open/controller/OpenOrderController.java b/src/main/java/com/gxwebsoft/open/controller/OpenOrderController.java new file mode 100644 index 0000000..cef7907 --- /dev/null +++ b/src/main/java/com/gxwebsoft/open/controller/OpenOrderController.java @@ -0,0 +1,323 @@ +package com.gxwebsoft.open.controller; + +import cn.hutool.core.date.DateUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.gxwebsoft.apps.utils.BcUtil; +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.PageParam; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.common.system.service.UserService; +import com.gxwebsoft.shop.entity.Order; +import com.gxwebsoft.shop.entity.OrderGoods; +import com.gxwebsoft.shop.entity.UserBalanceLog; +import com.gxwebsoft.shop.mapper.OrderMapper; +import com.gxwebsoft.shop.param.CartParam; +import com.gxwebsoft.shop.param.OrderGoodsParam; +import com.gxwebsoft.shop.param.OrderParam; +import com.gxwebsoft.shop.service.OrderGoodsService; +import com.gxwebsoft.shop.service.OrderService; +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.Date; +import java.util.List; + +import static com.gxwebsoft.common.core.constants.BalanceConstants.BALANCE_REFUND; +import static com.gxwebsoft.common.core.constants.OrderConstants.*; + +/** + * 订单记录表控制器 + * + * @author WebSoft + * @since 2022-11-16 11:25:58 + */ +@Api(tags = "订单记录表管理") +@RestController +@RequestMapping("/api/open/order") +public class OpenOrderController extends BaseController { + @Resource + private BcUtil bcUtil; + @Resource + private OrderService orderService; + @Resource + private OrderGoodsService orderGoodsService; + @Resource + private OrderMapper orderMapper; + @Resource + private UserService userService; + @Resource + private UserBalanceLogService userBalanceLogService; + + @ApiOperation("查询全部订单记录表") + @GetMapping() + public ApiResult> list(OrderParam param) { + // 验证签名 + isCheckSign(); + // 使用关联查询 + return success(orderService.listRel(param)); + } + + @PreAuthorize("hasAuthority('shop:order:list')") + @ApiOperation("根据id查询订单记录表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + // 验证签名 + isCheckSign(); + return success(orderService.getById(id)); + // 使用关联查询 + //return success(orderService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('shop:order:list')") + @ApiOperation("查询报餐明细") + @GetMapping("/getMyOrder") + public ApiResult getMyOrder(CartParam cartParam) { + Integer userId = 0; + if(cartParam.getAgentUserId() != null){ + userId = cartParam.getAgentUserId(); + }else{ + userId = getLoginUserId(); + } + System.out.println("cartParam = " + cartParam); + System.out.println("userId = " + userId); + // 验证签名 + isCheckSign(); + // 报餐明细（查询昨天这个时间点后下的订单） + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper + .eq(Order::getUserId,userId) + .eq(Order::getPayStatus,PAY_STATUS_SUCCESS) + .eq(Order::getOrderStatus,ORDER_STATUS_DOING) + .eq(Order::getDeleted,0) + .eq(Order::getIsTemporary,0) + .eq(Order::getDeliveryTime,cartParam.getDeliveryTime()); + Order order = orderService.getOne(lambdaQueryWrapper,false); + // 查询订单商品 + if(order != null){ + OrderGoodsParam param = new OrderGoodsParam(); + param.setOrderId(order.getOrderId()); + // 是否按餐段查询 + if(cartParam.getIsPeriod() != null){ + param.setCategoryId(bcUtil.categoryId); + } + PageParam page = new PageParam<>(param); + page.setDefaultOrder("gear asc, sort_number asc, create_time desc"); + order.setGoodsList(orderGoodsService.list(page.getOrderWrapper())); + } + // 是否允许临时报餐 + if(cartParam.getHasTemporary() != null){ + final OrderParam orderParam = new OrderParam(); + orderParam.setDeliveryTime(cartParam.getDeliveryTime()); + orderParam.setUserId(userId); + orderParam.setPayStatus(PAY_STATUS_SUCCESS); + final List list = orderService.listRel(orderParam); +// System.out.println("list1 = " + list); + if(list.size() > 0){ + final Order order1 = list.get(0); + final Integer orderId = order1.getOrderId(); + final OrderGoodsParam orderGoodsParam = new OrderGoodsParam(); + orderGoodsParam.setOrderId(orderId); + orderGoodsParam.setCategoryId(cartParam.getCategoryId()); +// System.out.println("orderGoodsParam = " + orderGoodsParam); + final List goodsList1 = orderGoodsService.listRel(orderGoodsParam); +// System.out.println("goodsList1 = " + goodsList1); + if(goodsList1.size() > 0){ + order1.setGoodsList(goodsList1); + return fail("请勿重复报餐",order1); + } + } + } + return success(order); + } + + @ApiOperation("查询今日当前餐段菜品") + @PostMapping("/currentOrderGoods") + public ApiResult> currentOrderGoods(OrderGoodsParam param) { + // 验证签名 + isCheckSign(); + // 使用关联查询 + param.setCategoryId(bcUtil.categoryId); + return success(orderGoodsService.listRel(param)); + } + + @PreAuthorize("hasAuthority('shop:order:list')") + @ApiOperation("查询核销订单明细") + @GetMapping("/getReceiptOrder") + public ApiResult getReceiptOrder(CartParam cartParam) { + // 验证签名 + isCheckSign(); + Integer userId = 0; + + // 核销自己（查询今天他下的订单） + if(cartParam.getUserId() != null){ + userId = cartParam.getUserId(); + OrderParam orderParam = new OrderParam(); + orderParam.setUserId(userId); + orderParam.setPayStatus(PAY_STATUS_SUCCESS); + orderParam.setOrderStatus(ORDER_STATUS_DOING); + orderParam.setDeliveryTime(cartParam.getDeliveryTime()); + List list = orderService.listRel(orderParam); + // 查询订单商品 + list.forEach(d -> { + OrderGoodsParam param = new OrderGoodsParam(); + param.setOrderId(d.getOrderId()); + d.setGoodsList(orderGoodsService.listRel(param)); + }); + return success(list); + } + + // 代核销模式 + if(cartParam.getDealerId() != null){ + userId = cartParam.getDealerId(); + return success(userId); + } + return fail("找不到报餐数据",null); + } + + @PreAuthorize("hasAuthority('shop:order:save')") + @ApiOperation("添加订单记录表") + @PostMapping() + public ApiResult save(@RequestBody Order order) { + // 验证签名 + isCheckSign(); + // 记录当前登录用户id、租户id + User loginUser = getLoginUser(); + if (loginUser != null) { + order.setUserId(loginUser.getUserId()); + } + if (orderService.save(order)) { + return success("添加成功",order); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('shop:order:update')") + @ApiOperation("修改订单记录表") + @PutMapping() + public ApiResult update(@RequestBody Order order) { + // 验证签名 + isCheckSign(); + if (orderService.updateById(order)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @ApiOperation("取消订单") + @PostMapping("/cancel") + @Transactional(rollbackFor = {Exception.class}) + public ApiResult cancel(@RequestBody Order order) { + // 验证签名 + isCheckSign(); + if (order.getOrderId() == null) { + return fail("订单不存在！"); + } + // 取消报餐截止时间 + Date date = DateUtil.date(); + int hours = date.getHours(); + System.out.println("hours = " + hours); + if(hours > 19){ + return fail("每天晚上8点后截止取消报餐"); + } + order.setOrderStatus(ORDER_STATUS_CANCEL); + if (orderService.updateById(order)) { + final Order orderInfo = orderService.getById(order.getOrderId()); + // 退款 + User user = userService.getById(orderInfo.getUserId()); + System.out.println("user = " + user); + BigDecimal balance = user.getBalance().add(orderInfo.getPayPrice()); + user.setBalance(balance); + userService.updateById(user); + // 记录余额明细 + UserBalanceLog userBalanceLog = new UserBalanceLog(); + userBalanceLog.setUserId(orderInfo.getUserId()); + userBalanceLog.setScene(BALANCE_REFUND); + userBalanceLog.setMoney(orderInfo.getPayPrice()); + userBalanceLog.setBalance(balance); + userBalanceLog.setComments(orderInfo.getOrderNo().toString()); + userBalanceLog.setMerchantCode(orderInfo.getMerchantCode()); + userBalanceLogService.save(userBalanceLog); + return success("订单取消成功",orderInfo); + } + return fail("订单取消失败"); + } + + @ApiOperation("删除订单记录表") + @GetMapping("/remove/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + // 验证签名 + isCheckSign(); + if (orderService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('shop:order:save')") + @ApiOperation("批量添加订单记录表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + // 验证签名 + isCheckSign(); + if (orderService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('shop:order:update')") + @ApiOperation("批量修改订单记录表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + // 验证签名 + isCheckSign(); + if (batchParam.update(orderService, "order_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('shop:order:remove')") + @ApiOperation("批量删除订单记录表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + // 验证签名 + isCheckSign(); + if (orderService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @ApiOperation("支付成功") + @PostMapping("/setPayStatus") + public ApiResult setPayStatus(@RequestBody Order order){ + // 验证签名 + isCheckSign(); + if (orderService.updateById(order)) { + return success("设置成功"); + } + return fail("设置失败"); + } + + @ApiOperation("核销二维码") + @PutMapping("/verification") + public ApiResult verification(@RequestBody Order order) { + // 验证签名 + isCheckSign(); + order.setOrderStatus(ORDER_STATUS_COMPLETED); + order.setReceiptTime(DateUtil.date()); + if (orderService.updateById(order)) { + return success("核销成功"); + } + return fail("核销失败"); + } +} diff --git a/src/main/java/com/gxwebsoft/open/controller/OpenOrderGoodsController.java b/src/main/java/com/gxwebsoft/open/controller/OpenOrderGoodsController.java new file mode 100644 index 0000000..c430e2e --- /dev/null +++ b/src/main/java/com/gxwebsoft/open/controller/OpenOrderGoodsController.java @@ -0,0 +1,202 @@ +package com.gxwebsoft.open.controller; + +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.User; +import com.gxwebsoft.common.system.service.UserService; +import com.gxwebsoft.shop.entity.Order; +import com.gxwebsoft.shop.entity.OrderGoods; +import com.gxwebsoft.shop.entity.UserBalanceLog; +import com.gxwebsoft.shop.param.OrderGoodsParam; +import com.gxwebsoft.shop.service.OrderGoodsService; +import com.gxwebsoft.shop.service.OrderService; +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.List; + +import static com.gxwebsoft.common.core.constants.BalanceConstants.BALANCE_REFUND; +import static com.gxwebsoft.common.core.constants.OrderConstants.ORDER_STATUS_CANCEL; + +/** + * 订单商品记录表控制器 + * + * @author 科技小王子 + * @since 2022-12-09 17:15:31 + */ +@Api(tags = "订单商品记录表管理") +@RestController +@RequestMapping("/api/open/order-goods") +public class OpenOrderGoodsController extends BaseController { + @Resource + private OrderGoodsService orderGoodsService; + @Resource + private UserService userService; + @Resource + private UserBalanceLogService userBalanceLogService; + @Resource + private OrderService orderService; + + @PreAuthorize("hasAuthority('shop:orderGoods:list')") + @OperationLog + @ApiOperation("分页查询订单商品记录表") + @GetMapping("/page") + public ApiResult> page(OrderGoodsParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("gear asc, sort_number asc, create_time desc"); + return success(orderGoodsService.page(page, page.getWrapper())); + // 使用关联查询 + //return success(orderGoodsService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('shop:orderGoods:list')") + @OperationLog + @ApiOperation("查询全部订单商品记录表") + @GetMapping() + public ApiResult> list(OrderGoodsParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("gear asc, sort_number asc, create_time desc"); + return success(orderGoodsService.list(page.getOrderWrapper())); + // 使用关联查询 + //return success(orderGoodsService.listRel(param)); + } + + @PreAuthorize("hasAuthority('shop:orderGoods:list')") + @OperationLog + @ApiOperation("根据id查询订单商品记录表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + return success(orderGoodsService.getById(id)); + // 使用关联查询 + //return success(orderGoodsService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('shop:orderGoods:save')") + @OperationLog + @ApiOperation("添加订单商品记录表") + @PostMapping() + public ApiResult save(@RequestBody OrderGoods orderGoods) { + // 记录当前登录用户id、租户id、商户编号 + User loginUser = getLoginUser(); + if (loginUser != null) { + orderGoods.setUserId(loginUser.getUserId()); + orderGoods.setMerchantCode(getMerchantCode()); + } + if (orderGoodsService.save(orderGoods)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('shop:orderGoods:update')") + @OperationLog + @ApiOperation("修改订单商品记录表") + @PutMapping() + public ApiResult update(@RequestBody OrderGoods orderGoods) { + if (orderGoodsService.updateById(orderGoods)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('shop:orderGoods:remove')") + @OperationLog + @ApiOperation("删除订单商品记录表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (orderGoodsService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('shop:orderGoods:save')") + @OperationLog + @ApiOperation("批量添加订单商品记录表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (orderGoodsService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('shop:orderGoods:update')") + @OperationLog + @ApiOperation("批量修改订单商品记录表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(orderGoodsService, "order_goods_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('shop:orderGoods:remove')") + @OperationLog + @ApiOperation("批量删除订单商品记录表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (orderGoodsService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('shop:orderGoods:remove')") + @ApiOperation("取消订单商品") + @PostMapping("/cancel") + @Transactional(rollbackFor = {Exception.class}) + public ApiResult cancel(@RequestBody OrderGoods orderGoods) { + // 验证签名 + isCheckSign(); + if (orderGoods.getOrderGoodsId() == null) { + return fail("菜品不存在！"); + } +// System.out.println("orderGoods = " + orderGoods); + final Order byId = orderService.getById(orderGoods.getOrderId()); + // 取消报餐截止时间 + orderGoodsService.removeById(orderGoods); +// System.out.println("orderGoods = " + orderGoods); + // 退款 + User user = userService.getById(byId.getUserId()); +// System.out.println("user = " + user); +// System.out.println("orderGoods.getGoodsPrice() = " + orderGoods.getGoodsPrice()); + BigDecimal balance = user.getBalance().add(orderGoods.getGoodsPrice()); + user.setBalance(balance); + userService.updateById(user); + // 记录余额明细 + UserBalanceLog userBalanceLog = new UserBalanceLog(); + userBalanceLog.setUserId(byId.getUserId()); + userBalanceLog.setScene(BALANCE_REFUND); + userBalanceLog.setMoney(orderGoods.getGoodsPrice()); + userBalanceLog.setBalance(balance); + userBalanceLog.setComments(orderGoods.getOrderId().toString()); + userBalanceLogService.save(userBalanceLog); + final int count = orderGoodsService.count(new LambdaUpdateWrapper().eq(OrderGoods::getOrderId, orderGoods.getOrderId()).gt(OrderGoods::getTotalNum,0)); +// System.out.println("count = " + count); + // 更新订单金额 + System.out.println("byId = " + byId); + if (!byId.getTotalPrice().equals(0)) { + byId.setTotalPrice(byId.getTotalPrice().subtract(orderGoods.getGoodsPrice())); + orderService.updateById(byId); + } + + // 无菜品就把订单删除 + if(count == 0){ + final Order order = new Order(); + order.setOrderId(orderGoods.getOrderId()); + order.setOrderStatus(ORDER_STATUS_CANCEL); + orderService.removeById(orderGoods.getOrderId()); + } + return success("菜品取消成功"); + } + +} diff --git a/src/main/java/com/gxwebsoft/open/controller/OpenSettingController.java b/src/main/java/com/gxwebsoft/open/controller/OpenSettingController.java new file mode 100644 index 0000000..6ae17f7 --- /dev/null +++ b/src/main/java/com/gxwebsoft/open/controller/OpenSettingController.java @@ -0,0 +1,39 @@ +package com.gxwebsoft.open.controller; + +import com.gxwebsoft.common.core.annotation.OperationLog; +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.Setting; +import com.gxwebsoft.common.system.service.SettingService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +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; + +/** + * 系统设置控制器 + * + * @author WebSoft + * @since 2022-11-19 13:54:27 + */ +@Api(tags = "系统设置管理") +@RestController +@RequestMapping("/api/open/system/setting") +public class OpenSettingController extends BaseController { + @Resource + private SettingService settingService; + @Resource + private CacheClient cacheClient; + + @ApiOperation("根据key查询系统设置") + @GetMapping("/{settingKey}") + public ApiResult get(@PathVariable("settingKey") String settingKey) { + final Setting data = settingService.getData(settingKey); + return success(settingService.getData(settingKey)); + } +} diff --git a/src/main/java/com/gxwebsoft/open/controller/OpenTaskController.java b/src/main/java/com/gxwebsoft/open/controller/OpenTaskController.java new file mode 100644 index 0000000..1a149a4 --- /dev/null +++ b/src/main/java/com/gxwebsoft/open/controller/OpenTaskController.java @@ -0,0 +1,190 @@ +package com.gxwebsoft.open.controller; + +import cn.hutool.core.util.StrUtil; +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.User; +import com.gxwebsoft.oa.entity.Task; +import com.gxwebsoft.oa.entity.TaskRecord; +import com.gxwebsoft.oa.entity.TaskUser; +import com.gxwebsoft.oa.param.TaskParam; +import com.gxwebsoft.oa.service.AppService; +import com.gxwebsoft.oa.service.TaskRecordService; +import com.gxwebsoft.oa.service.TaskService; +import com.gxwebsoft.oa.service.TaskUserService; +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.stream.Collectors; + +/** + * 工单记录表控制器 + * + * @author WebSoft + * @since 2022-11-16 11:21:43 + */ +@Api(tags = "工单记录表管理") +@RestController +@RequestMapping("/api/open/oa/task") +public class OpenTaskController extends BaseController { + @Resource + private TaskService taskService; + @Resource + private TaskRecordService taskRecordService; + @Resource + private TaskUserService taskUserService; + @Resource + private AppService appService; + + @ApiOperation("分页查询工单记录表") + @GetMapping("/page") + public ApiResult> page(TaskParam param) { + // 验证签名 + isCheckSign(); + // 使用关联查询 + final User loginUser = getLoginUser(); + final Integer type = loginUser.getType(); + // 如果是开发者账号则按受理人查询 + if (type.equals(6)) { + param.setCommander(loginUser.getUserId()); + }else{ + param.setPromoter(getLoginUserId()); + } + + return success(taskService.pageRel(param)); + } + + @ApiOperation("查询全部工单记录表") + @GetMapping() + public ApiResult> list(TaskParam param) { + // 验证签名 + isCheckSign(); + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(taskService.list(page.getOrderWrapper())); + // 使用关联查询 + //return success(taskService.listRel(param)); + } + + @PreAuthorize("hasAuthority('oa:task:list')") + @OperationLog + @ApiOperation("根据id查询工单记录表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + // 验证签名 + isCheckSign(); + // 使用关联查询 + Task task = taskService.getByIdRel(id); + task.setAppInfo(appService.getById(task.getAppId())); + return success(task); + } + + @ApiOperation("添加工单记录表") + @PostMapping() + public ApiResult save(@RequestBody Task task) { + // 验证签名 + isCheckSign(); + // 当前登录用户id + Integer loginUserId = getLoginUserId(); + task.setUserId(loginUserId); + task.setPromoter(loginUserId); + task.setComments(StrUtil.sub(task.getContent(),0,200)); + task.setLastReadUser(loginUserId); + // 创建工单 + if (taskService.save(task)) { + // 添加聊天内容明细 + TaskRecord taskRecord = new TaskRecord(); + taskRecord.setUserId(loginUserId); + taskRecord.setContent(task.getContent()); + taskRecord.setTaskId(task.getTaskId()); + taskRecord.setFiles(task.getFiles()); + taskRecordService.save(taskRecord); + // 添加工单成员 + TaskUser taskUser = new TaskUser(); + taskUser.setUserId(loginUserId); + taskUser.setTaskId(task.getTaskId()); + taskUserService.save(taskUser); + return success("创建成功"); + } + return fail("创建失败"); + } + + @ApiOperation("修改工单记录表") + @PutMapping() + public ApiResult update(@RequestBody Task task) { + // 验证签名 + isCheckSign(); + if (taskService.updateById(task)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @ApiOperation("删除工单记录表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + // 验证签名 + isCheckSign(); + if (taskService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @ApiOperation("批量添加工单记录表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + // 验证签名 + isCheckSign(); + if (taskService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @ApiOperation("批量修改工单记录表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + // 验证签名 + isCheckSign(); + if (batchParam.update(taskService, "task_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @ApiOperation("批量删除工单记录表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + // 验证签名 + isCheckSign(); + if (taskService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @ApiOperation("统计信息") + @GetMapping("/count") + public ApiResult count(){ + // 验证签名 + isCheckSign(); + User loginUser = getLoginUser(); + ArrayList countNum = taskService.getCountNum(loginUser,null); + return success("操作成功",countNum); + } + + // 查询用户的工单ID + private List getTaskIds(){ + final Integer loginUserId = getLoginUserId(); + return taskUserService.list(new LambdaQueryWrapper().eq(TaskUser::getUserId, loginUserId)) + .stream().map(TaskUser::getTaskId).collect(Collectors.toList()); + } + +} diff --git a/src/main/java/com/gxwebsoft/open/controller/OpenTaskRecordController.java b/src/main/java/com/gxwebsoft/open/controller/OpenTaskRecordController.java new file mode 100644 index 0000000..6dff9ae --- /dev/null +++ b/src/main/java/com/gxwebsoft/open/controller/OpenTaskRecordController.java @@ -0,0 +1,148 @@ +package com.gxwebsoft.open.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.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 java.util.List; + +import static com.gxwebsoft.oa.constants.TaskConstants.PROGRESS2; +import static com.gxwebsoft.oa.constants.TaskConstants.PROGRESS3; + +/** + * 工单回复记录表控制器 + * + * @author 科技小王子 + * @since 2023-03-05 00:52:21 + */ +@Api(tags = "工单回复记录表管理") +@RestController +@RequestMapping("/api/open/oa/task-record") +public class OpenTaskRecordController extends BaseController { + @Resource + private TaskService taskService; + @Resource + private TaskRecordService taskRecordService; + + @ApiOperation("分页查询工单回复记录表") + @GetMapping("/page") + public ApiResult> page(TaskRecordParam param) { + // 验证签名 + isCheckSign(); + // 使用关联查询 + return success(taskRecordService.pageRel(param)); + } + + @ApiOperation("查询全部工单回复记录表") + @GetMapping() + public ApiResult> list(TaskRecordParam param) { + // 验证签名 + isCheckSign(); + // 更新查阅状态 + Task task = taskService.getById(param.getTaskId()); + if(!getLoginUserId().equals(task.getLastReadUser())){ + task.setIsRead(1); + } + taskService.updateById(task); + // 使用关联查询 + return success(taskRecordService.listRel(param)); + } + + @ApiOperation("根据id查询工单回复记录表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + // 验证签名 + isCheckSign(); + // 使用关联查询 + return success(taskRecordService.getByIdRel(id)); + } + + @ApiOperation("添加工单回复记录表") + @PostMapping() + public ApiResult save(@RequestBody TaskRecord taskRecord) { + // 验证签名 + isCheckSign(); + taskRecord.setUserId(getLoginUserId()); + int count = taskRecordService.count(new LambdaQueryWrapper().eq(TaskRecord::getTaskId,taskRecord.getTaskId())); + if(count > 100){ + return fail("回复数超过最大限制"); + } + if (taskRecordService.save(taskRecord)) { + // 变更工单状态 + Task task = taskService.getById(taskRecord.getTaskId()); + task.setProgress(PROGRESS2); + task.setIsRead(0); + task.setLastReadUser(getLoginUserId()); + taskService.updateById(task); + return success("提交成功"); + } + return fail("提交失败"); + } + + @ApiOperation("修改工单回复记录表") + @PutMapping() + public ApiResult update(@RequestBody TaskRecord taskRecord) { + // 验证签名 + isCheckSign(); + if (taskRecordService.updateById(taskRecord)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @ApiOperation("删除工单回复记录表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + // 验证签名 + isCheckSign(); + if (taskRecordService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @ApiOperation("批量添加工单回复记录表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + // 验证签名 + isCheckSign(); + if (taskRecordService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @ApiOperation("批量修改工单回复记录表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + // 验证签名 + isCheckSign(); + if (batchParam.update(taskRecordService, "task_record_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @ApiOperation("批量删除工单回复记录表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + // 验证签名 + isCheckSign(); + if (taskRecordService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/open/controller/OpenTenantController.java b/src/main/java/com/gxwebsoft/open/controller/OpenTenantController.java new file mode 100644 index 0000000..bdafc8a --- /dev/null +++ b/src/main/java/com/gxwebsoft/open/controller/OpenTenantController.java @@ -0,0 +1,1265 @@ +package com.gxwebsoft.open.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.annotation.OperationLog; +import com.gxwebsoft.common.core.exception.BusinessException; +import com.gxwebsoft.common.core.utils.CommonUtil; +import com.gxwebsoft.common.core.utils.JSONUtil; +import com.gxwebsoft.common.core.web.*; +import com.gxwebsoft.common.system.entity.Menu; +import com.gxwebsoft.common.system.entity.RoleMenu; +import com.gxwebsoft.common.system.entity.Tenant; +import com.gxwebsoft.common.system.param.TenantParam; +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.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.stream.Collectors; + +/** + * 租户控制器 + * + * @author WebSoft + * @since 2022-11-17 17:13:39 + */ +@Api(tags = "租户管理") +@RestController +@RequestMapping("/api/open/tenant") +public class OpenTenantController extends BaseController { + @Resource + private TenantService tenantService; + @Resource + private UserService userService; + @Resource + private RoleService roleService; + @Resource + private UserRoleService userRoleService; + @Resource + private MenuService menuService; + @Resource + private RoleMenuService roleMenuService; + @Resource + private StringRedisTemplate stringRedisTemplate; + @Resource + private DictService dictService; + @Resource + private DictDataService dictDataService; + + @ApiOperation("分页查询租户") + @GetMapping("/page") + public ApiResult> page(TenantParam param) { + // 特殊验证签名 + if (!param.getTenantCode().equals("ZAcxbdmDQFwUKC3e")) { + throw new BusinessException("签名失败"); + } + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); +// return success(tenantService.page(page, page.getWrapper())); + // 使用关联查询 + return success(tenantService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('oa:tenant:list')") + @ApiOperation("查询全部租户") + @GetMapping() + public ApiResult> list(TenantParam param) { + // 验证签名 + isCheckSign(); + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(tenantService.list(page.getOrderWrapper())); + // 使用关联查询 + //return success(tenantService.listRel(param)); + } + + @PreAuthorize("hasAuthority('oa:tenant:list')") + @ApiOperation("根据id查询租户") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + // 验证签名 + isCheckSign(); + return success(tenantService.getById(id)); + // 使用关联查询 +// return success(tenantService.getByIdRel(id)); + } + +// @Transactional(rollbackFor = {Exception.class}) +// @PreAuthorize("hasAuthority('oa:tenant:save')") +// @OperationLog +// @ApiOperation("添加租户(已废弃)") +// @PostMapping() +// public ApiResult save(@RequestBody Tenant tenant) { +// // 验证签名 +// isCheckSign(); +// // 记录当前登录用户id、租户id +// User loginUser = getLoginUser(); +// if (loginUser != null) { +// tenant.setUserId(loginUser.getUserId()); +// if (loginUser.getTenantId() != 5) return fail("权限不足!"); +// } +// // 添加租户 +// tenant.setTenantCode(CommonUtil.randomUUID16()); +// tenantService.save(tenant); +// +// // 添加超级管理员 +// User user = new User(); +// user.setUsername("admin"); +// user.setNickname("超级管理员"); +// user.setPassword(userService.encodePassword(tenant.getPassword())); +// user.setTenantId(tenant.getTenantId()); +// boolean result = userService.save(user); +// Integer superAdminUserId = user.getUserId(); +// +// // 创建角色 +// if (result) { +// Role role = new Role(); +// role.setRoleName("超级管理员"); +// role.setRoleCode("superAdmin"); +// role.setComments("超级管理员"); +// role.setTenantId(tenant.getTenantId()); +// 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); +// Integer guestRoleId = role.getRoleId(); +// +// // 添加默认字典 +// final Dict dict = new Dict(); +// dict.setDictName("性别"); +// dict.setDictCode("sex"); +// dict.setTenantId(tenant.getTenantId()); +// dictService.save(dict); +// final DictData dictData = new DictData(); +// dictData.setDictId(dict.getDictId()); +// dictData.setDictDataName("男"); +// dictData.setDictDataCode("1"); +// dictData.setTenantId(tenant.getTenantId()); +// dictDataService.save(dictData); +// dictData.setDictDataName("女"); +// dictData.setDictDataCode("2"); +// dictData.setTenantId(tenant.getTenantId()); +// dictDataService.save(dictData); +// +// // 添加游客账号 +// user.setUsername("www"); +// user.setNickname("游客"); +// user.setPassword(userService.encodePassword("123456")); +// userService.save(user); +// +// // 添加超管用户角色 +// UserRole userRole = new UserRole(); +// userRole.setUserId(superAdminUserId); +// userRole.setRoleId(superAdminRoleId); +// userRole.setTenantId(tenant.getTenantId()); +// userRoleService.save(userRole); +// +// // 添加游客用户角色 +// userRole.setUserId(user.getUserId()); +// userRole.setRoleId(guestRoleId); +// boolean resultUserRole = userRoleService.save(userRole); +// +// /// 添加系统菜单 +// if (resultUserRole) { +// Menu menu = new Menu(); +// // 10.系统管理 +// menu.setTitle("系统管理"); +// menu.setParentId(0); +// menu.setPath("/system"); +// menu.setIcon("setting-outlined"); +// menu.setSortNumber(10); +// menu.setTenantId(tenant.getTenantId()); +// menuService.save(menu); +// Integer parentId = menu.getMenuId(); +// menu.setParentId(menu.getMenuId()); +// menu.setTitle("用户管理"); +// menu.setPath("/system/user"); +// menu.setComponent("/system/user"); +// menu.setIcon("team-outlined"); +// menu.setSortNumber(2); +// 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/role"); +// menu.setComponent("/system/role"); +// menu.setIcon("idcard-outlined"); +// menu.setAuthority(""); +// menu.setSortNumber(3); +// 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(1); +// 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/organization"); +// menu.setComponent("/system/organization"); +// menu.setIcon("bank-outlined"); +// menu.setAuthority(""); +// menu.setSortNumber(5); +// 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/dict"); +// menu.setComponent("/system/dict"); +// menu.setIcon("profile-outlined"); +// menu.setAuthority(""); +// menu.setSortNumber(4); +// 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/operation-record"); +// menu.setComponent("/system/operation-record"); +// menu.setIcon("file-search-outlined"); +// menu.setAuthority("sys:operation-record: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/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); +// menu.setTitle("扩展插件"); +// menu.setParentId(parentId); +// menu.setIcon("AppstoreAddOutlined"); +// menu.setPath("/system/appstore"); +// menu.setComponent("/system/appstore"); +// menu.setMenuType(0); +// menu.setAuthority("oa:app:list"); +// menu.setSortNumber(100); +// menu.setHide(0); +// menuService.save(menu); +// // 1.控制台 +// menu.setParentId(0); +// menu.setTitle("控制台"); +// menu.setPath("/dashboard"); +// menu.setIcon("home-outlined"); +// menu.setComponent(""); +// menu.setAuthority(""); +// menu.setSortNumber(1); +// menu.setMenuType(0); +// menuService.save(menu); +// Integer dashboardParentId = menu.getMenuId(); +// menu.setTitle("工作台"); +// menu.setPath("/dashboard/workplace"); +// menu.setComponent("/dashboard/workplace"); +// menu.setIcon("DesktopOutlined"); +// menu.setParentId(dashboardParentId); +// menu.setMenuType(0); +// menu.setSortNumber(0); +// menuService.save(menu); +// menu.setTitle("统计分析"); +// menu.setPath("/dashboard/analysis"); +// menu.setComponent("/dashboard/analysis"); +// menu.setIcon("BarChartOutlined"); +// menu.setParentId(dashboardParentId); +// menu.setMenuType(0); +// menu.setSortNumber(1); +// menuService.save(menu); +// // 2.办公协同 +// menu.setParentId(0); +// menu.setTitle("办公协同"); +// menu.setPath("/oa"); +// menu.setComponent(""); +// menu.setAuthority(""); +// menu.setMenuType(0); +// menu.setIcon("LaptopOutlined"); +// menu.setHide(0); +// menu.setSortNumber(2); +// menuService.save(menu); +// Integer oaParentId = menu.getMenuId(); +// menu.setParentId(oaParentId); +// menu.setTitle("服务器管理"); +// menu.setPath("/oa/assets/server"); +// menu.setComponent("/oa/assets/server"); +// menu.setIcon("AuditOutlined"); +// menu.setMenuType(0); +// menu.setSortNumber(0); +// menuService.save(menu); +// Integer serverParentId = menu.getMenuId(); +// menu.setTitle("查询"); +// menu.setParentId(serverParentId); +// menu.setMenuType(1); +// menu.setPath(""); +// menu.setIcon(""); +// menu.setComponent(""); +// menu.setAuthority("oa:assets:list"); +// menuService.save(menu); +// menu.setTitle("添加"); +// menu.setAuthority("oa:assets:save"); +// menuService.save(menu); +// menu.setTitle("更新"); +// menu.setAuthority("oa:assets:update"); +// menuService.save(menu); +// menu.setTitle("移除"); +// menu.setAuthority("oa:assets:remove"); +// menuService.save(menu); +// menu.setParentId(oaParentId); +// menu.setMenuType(0); +// menu.setTitle("客户管理"); +// menu.setPath("/oa/customer"); +// menu.setComponent("/oa/customer"); +// menu.setIcon("TeamOutlined"); +// menu.setSortNumber(1); +// menuService.save(menu); +// Integer customerParentId = menu.getMenuId(); +// menu.setParentId(customerParentId); +// menu.setTitle("查询"); +// menu.setMenuType(1); +// menu.setPath(""); +// menu.setIcon(""); +// menu.setComponent(""); +// menu.setSortNumber(0); +// menu.setAuthority("oa:customer:list"); +// menuService.save(menu); +// menu.setTitle("添加"); +// menu.setAuthority("oa:customer:save"); +// menuService.save(menu); +// menu.setTitle("更新"); +// menu.setAuthority("oa:customer:update"); +// menuService.save(menu); +// menu.setTitle("移除"); +// menu.setAuthority("oa:customer:remove"); +// menuService.save(menu); +// // 3.商户管理 +// menu.setParentId(0); +// menu.setTitle("商户管理"); +// menu.setPath("/merchant"); +// menu.setIcon("ShopOutlined"); +// menu.setComponent(""); +// menu.setAuthority(""); +// menu.setSortNumber(3); +// menu.setMenuType(0); +// menuService.save(menu); +// Integer merchantParentId = menu.getMenuId(); +// menu.setTitle("商户列表"); +// menu.setPath("/merchant/index"); +// menu.setComponent("/merchant/index"); +// menu.setIcon("ShopOutlined"); +// menu.setParentId(merchantParentId); +// menu.setMenuType(0); +// menu.setSortNumber(0); +// menuService.save(menu); +// Integer shopInfoParentId = menu.getMenuId(); +// menu.setTitle("列表"); +// menu.setParentId(shopInfoParentId); +// menu.setMenuType(1); +// menu.setPath(""); +// menu.setIcon(""); +// menu.setComponent(""); +// menu.setAuthority("shop:merchant:list"); +// menu.setSortNumber(0); +// menuService.save(menu); +// menu.setTitle("添加"); +// menu.setAuthority("shop:merchant:save"); +// menuService.save(menu); +// menu.setTitle("编辑"); +// menu.setAuthority("shop:merchant:update"); +// menuService.save(menu); +// menu.setTitle("删除"); +// menu.setAuthority("shop:merchant:remove"); +// menuService.save(menu); +// menu.setTitle("入驻审核"); +// menu.setPath("/merchant/apply"); +// menu.setComponent("/merchant/apply"); +// menu.setIcon("HourglassOutlined"); +// menu.setParentId(merchantParentId); +// menu.setMenuType(0); +// menu.setSortNumber(1); +// menuService.save(menu); +// menu.setTitle("地址管理"); +// menu.setPath("/merchant/address"); +// menu.setComponent("/merchant/address"); +// menu.setIcon("EnvironmentOutlined"); +// menu.setParentId(merchantParentId); +// menu.setMenuType(0); +// menu.setSortNumber(2); +// menuService.save(menu); +// menu.setTitle("店铺装修"); +// menu.setPath("/merchant/decorate"); +// menu.setComponent("/merchant/decorate"); +// menu.setIcon("FormatPainterOutlined"); +// menu.setParentId(merchantParentId); +// menu.setMenuType(0); +// menu.setSortNumber(3); +// menuService.save(menu); +// menu.setTitle("主题风格"); +// menu.setPath("/merchant/theme"); +// menu.setComponent("/merchant/theme"); +// menu.setIcon("BgColorsOutlined"); +// menu.setParentId(merchantParentId); +// menu.setMenuType(0); +// menu.setSortNumber(4); +// menuService.save(menu); +// menu.setTitle("资金提现"); +// menu.setPath("/merchant/withdraw"); +// menu.setComponent("/merchant/withdraw"); +// menu.setIcon("RedEnvelopeOutlined"); +// menu.setParentId(merchantParentId); +// menu.setMenuType(0); +// menu.setSortNumber(5); +// menuService.save(menu); +// // 4.商品管理 +// menu.setParentId(0); +// menu.setTitle("商品管理"); +// menu.setPath("/goods"); +// menu.setIcon("ShoppingOutlined"); +// menu.setComponent(""); +// menu.setAuthority(""); +// menu.setSortNumber(4); +// menu.setMenuType(0); +// menuService.save(menu); +// Integer goodsParentId = menu.getMenuId(); +// menu.setTitle("商品列表"); +// menu.setPath("/goods/index"); +// menu.setComponent("/goods/index"); +// menu.setIcon("SkinOutlined"); +// menu.setParentId(goodsParentId); +// menu.setMenuType(0); +// menu.setSortNumber(0); +// menuService.save(menu); +// Integer shopIndexParentId = menu.getMenuId(); +// menu.setTitle("列表"); +// menu.setParentId(shopIndexParentId); +// menu.setMenuType(1); +// menu.setPath(""); +// menu.setIcon(""); +// menu.setComponent(""); +// menu.setAuthority("shop:goods:list"); +// menu.setSortNumber(0); +// menuService.save(menu); +// menu.setTitle("添加"); +// menu.setAuthority("shop:goods:save"); +// menuService.save(menu); +// menu.setTitle("编辑"); +// menu.setAuthority("shop:goods:update"); +// menuService.save(menu); +// menu.setTitle("删除"); +// menu.setAuthority("shop:goods:remove"); +// menuService.save(menu); +// menu.setTitle("商品分类"); +// menu.setPath("/goods/category"); +// menu.setComponent("/goods/category"); +// menu.setIcon("ApartmentOutlined"); +// menu.setParentId(goodsParentId); +// menu.setMenuType(0); +// menu.setSortNumber(1); +// menuService.save(menu); +// Integer goodsCategoryParentId = menu.getMenuId(); +// menu.setTitle("列表"); +// menu.setParentId(goodsCategoryParentId); +// menu.setMenuType(1); +// menu.setPath(""); +// menu.setIcon(""); +// menu.setComponent(""); +// menu.setAuthority("shop:category:list"); +// menu.setSortNumber(0); +// menuService.save(menu); +// menu.setTitle("添加"); +// menu.setAuthority("shop:category:save"); +// menuService.save(menu); +// menu.setTitle("编辑"); +// menu.setAuthority("shop:category:update"); +// menuService.save(menu); +// menu.setTitle("删除"); +// menu.setAuthority("shop:category:remove"); +// menuService.save(menu); +// menu.setTitle("商品评价"); +// menu.setPath("/goods/comment"); +// menu.setComponent("/goods/comment"); +// menu.setIcon("GiftOutlined"); +// menu.setParentId(goodsParentId); +// menu.setMenuType(0); +// menu.setSortNumber(2); +// menuService.save(menu); +// Integer goodsCommentParentId = menu.getMenuId(); +// menu.setTitle("列表"); +// menu.setParentId(goodsCommentParentId); +// menu.setMenuType(1); +// menu.setPath(""); +// menu.setIcon(""); +// menu.setComponent(""); +// menu.setAuthority("shop:comment:list"); +// menu.setSortNumber(0); +// menuService.save(menu); +// menu.setTitle("添加"); +// menu.setAuthority("shop:comment:save"); +// menuService.save(menu); +// menu.setTitle("编辑"); +// menu.setAuthority("shop:comment:update"); +// menuService.save(menu); +// menu.setTitle("删除"); +// menu.setAuthority("shop:comment:remove"); +// menuService.save(menu); +// menu.setTitle("服务承诺"); +// menu.setPath("/goods/service"); +// menu.setComponent("/goods/service"); +// menu.setIcon("InsuranceOutlined"); +// menu.setParentId(goodsParentId); +// menu.setMenuType(0); +// menu.setSortNumber(3); +// menuService.save(menu); +// Integer goodsServiceParentId = menu.getMenuId(); +// menu.setTitle("列表"); +// menu.setParentId(goodsServiceParentId); +// menu.setMenuType(1); +// menu.setPath(""); +// menu.setIcon(""); +// menu.setComponent(""); +// menu.setAuthority("shop:goodsService:list"); +// menu.setSortNumber(0); +// menuService.save(menu); +// menu.setTitle("添加"); +// menu.setAuthority("shop:goodsService:save"); +// menuService.save(menu); +// menu.setTitle("编辑"); +// menu.setAuthority("shop:goodsService:update"); +// menuService.save(menu); +// menu.setTitle("删除"); +// menu.setAuthority("shop:goodsService:remove"); +// menuService.save(menu); +// // 5.订单管理 +// menu.setParentId(0); +// menu.setTitle("订单管理"); +// menu.setPath("/order"); +// menu.setIcon("CalendarOutlined"); +// menu.setComponent(""); +// menu.setAuthority(""); +// menu.setSortNumber(5); +// menu.setMenuType(0); +// menuService.save(menu); +// Integer orderParentId = menu.getMenuId(); +// menu.setTitle("全部订单"); +// menu.setPath("/order/all"); +// menu.setComponent("/order/all"); +// menu.setIcon("ProfileOutlined"); +// menu.setParentId(orderParentId); +// menu.setMenuType(0); +// menu.setSortNumber(0); +// menuService.save(menu); +// Integer orderAllParentId = menu.getMenuId(); +// menu.setTitle("列表"); +// menu.setParentId(orderAllParentId); +// menu.setMenuType(1); +// menu.setPath(""); +// menu.setIcon(""); +// menu.setComponent(""); +// menu.setAuthority("shop:order:list"); +// menu.setSortNumber(0); +// menuService.save(menu); +// menu.setTitle("添加"); +// menu.setAuthority("shop:order:save"); +// menuService.save(menu); +// menu.setTitle("编辑"); +// menu.setAuthority("shop:order:update"); +// menuService.save(menu); +// menu.setTitle("删除"); +// menu.setAuthority("shop:order:remove"); +// menuService.save(menu); +// menu.setTitle("退款单"); +// menu.setPath("/order/refund"); +// menu.setComponent("/order/refund"); +// menu.setIcon("MoneyCollectOutlined"); +// menu.setParentId(orderParentId); +// menu.setMenuType(0); +// menu.setSortNumber(1); +// menuService.save(menu); +// menu.setTitle("发货管理"); +// menu.setPath("/order/delivery"); +// menu.setComponent("/order/delivery"); +// menu.setIcon("CarOutlined"); +// menu.setParentId(orderParentId); +// menu.setMenuType(0); +// menu.setSortNumber(2); +// menuService.save(menu); +// menu.setTitle("订单导出"); +// menu.setPath("/order/export"); +// menu.setComponent("/order/export"); +// menu.setIcon("UploadOutlined"); +// menu.setParentId(orderParentId); +// menu.setMenuType(0); +// menu.setSortNumber(3); +// menuService.save(menu); +// // 6.用户管理 +// menu.setParentId(0); +// menu.setTitle("用户管理"); +// menu.setPath("/user"); +// menu.setIcon("TeamOutlined"); +// menu.setComponent(""); +// menu.setAuthority(""); +// menu.setSortNumber(6); +// menu.setMenuType(0); +// menuService.save(menu); +// Integer outUserParentId = menu.getMenuId(); +// menu.setTitle("用户列表"); +// menu.setPath("/user/index"); +// menu.setComponent("/user/index"); +// menu.setIcon("TeamOutlined"); +// menu.setParentId(outUserParentId); +// menu.setMenuType(0); +// menu.setSortNumber(0); +// menuService.save(menu); +// Integer memberListParentId = menu.getMenuId(); +// menu.setTitle("列表"); +// menu.setParentId(memberListParentId); +// menu.setMenuType(1); +// menu.setPath(""); +// menu.setIcon(""); +// menu.setComponent(""); +// menu.setAuthority("shop:member:list"); +// menu.setSortNumber(0); +// menuService.save(menu); +// menu.setTitle("添加"); +// menu.setAuthority("shop:member:save"); +// menuService.save(menu); +// menu.setTitle("编辑"); +// menu.setAuthority("shop:member:update"); +// menuService.save(menu); +// menu.setTitle("删除"); +// menu.setAuthority("shop:member:remove"); +// menuService.save(menu); +// menu.setTitle("余额明细"); +// menu.setPath("/user/balance-log"); +// menu.setComponent("/user/balance-log"); +// menu.setIcon("WalletOutlined"); +// menu.setParentId(outUserParentId); +// menu.setMenuType(0); +// menu.setSortNumber(1); +// menuService.save(menu); +// Integer balanceLogParentId = menu.getMenuId(); +// menu.setTitle("列表"); +// menu.setParentId(balanceLogParentId); +// menu.setMenuType(1); +// menu.setPath(""); +// menu.setIcon(""); +// menu.setComponent(""); +// menu.setAuthority("shop:memberBalanceLog:list"); +// menu.setSortNumber(0); +// menuService.save(menu); +// menu.setTitle("添加"); +// menu.setAuthority("shop:memberBalanceLog:save"); +// menuService.save(menu); +// menu.setTitle("编辑"); +// menu.setAuthority("shop:memberBalanceLog:update"); +// menuService.save(menu); +// menu.setTitle("删除"); +// menu.setAuthority("shop:memberBalanceLog:remove"); +// menuService.save(menu); +// menu.setTitle("充值记录"); +// menu.setPath("/user/recharge"); +// menu.setComponent("/user/recharge"); +// menu.setIcon("UngroupOutlined"); +// menu.setParentId(outUserParentId); +// menu.setMenuType(0); +// menu.setSortNumber(2); +// menuService.save(menu); +// Integer userRechargeParentId = menu.getMenuId(); +// menu.setTitle("列表"); +// menu.setParentId(userRechargeParentId); +// menu.setMenuType(1); +// menu.setPath(""); +// menu.setIcon(""); +// menu.setComponent(""); +// menu.setAuthority("shop:memberRecharge:list"); +// menu.setSortNumber(0); +// menuService.save(menu); +// menu.setTitle("添加"); +// menu.setAuthority("shop:memberRecharge:save"); +// menuService.save(menu); +// menu.setTitle("编辑"); +// menu.setAuthority("shop:memberRecharge:update"); +// menuService.save(menu); +// menu.setTitle("删除"); +// menu.setAuthority("shop:memberRecharge:remove"); +// menuService.save(menu); +// menu.setTitle("消息提醒"); +// menu.setPath("/user/notice"); +// menu.setComponent("/user/notice"); +// menu.setIcon("SoundOutlined"); +// menu.setParentId(outUserParentId); +// menu.setMenuType(0); +// menu.setSortNumber(3); +// menuService.save(menu); +// Integer userNoticeParentId = menu.getMenuId(); +// menu.setTitle("列表"); +// menu.setParentId(userNoticeParentId); +// menu.setMenuType(1); +// menu.setPath(""); +// menu.setIcon(""); +// menu.setComponent(""); +// menu.setAuthority("shop:memberNotice:list"); +// menu.setSortNumber(0); +// menuService.save(menu); +// menu.setTitle("添加"); +// menu.setAuthority("shop:memberNotice:save"); +// menuService.save(menu); +// menu.setTitle("编辑"); +// menu.setAuthority("shop:memberNotice:update"); +// menuService.save(menu); +// menu.setTitle("删除"); +// menu.setAuthority("shop:memberNotice:remove"); +// menuService.save(menu); +// // 7.内容管理 +// menu.setParentId(0); +// menu.setTitle("内容管理"); +// menu.setPath("/cms"); +// menu.setComponent(""); +// menu.setAuthority(""); +// menu.setIcon("FileSearchOutlined"); +// menu.setHide(0); +// menu.setMenuType(0); +// menu.setSortNumber(7); +// menuService.save(menu); +// Integer contentParentId = menu.getMenuId(); +// menu.setTitle("文章管理"); +// menu.setPath("/cms/article"); +// menu.setComponent("/cms/article"); +// menu.setIcon("FileSearchOutlined"); +// menu.setAuthority(""); +// menu.setSortNumber(1); +// menu.setMenuType(0); +// menu.setParentId(contentParentId); +// menuService.save(menu); +// Integer articleParentId = menu.getMenuId(); +// menu.setParentId(articleParentId); +// menu.setMenuType(1); +// menu.setIcon(""); +// menu.setPath(""); +// menu.setComponent(""); +// menu.setTitle("查询"); +// menu.setSortNumber(0); +// menu.setAuthority("cms:article:list"); +// menuService.save(menu); +// menu.setTitle("添加"); +// menu.setAuthority("cms:article:save"); +// menuService.save(menu); +// menu.setTitle("修改"); +// menu.setAuthority("cms:article:update"); +// menuService.save(menu); +// menu.setTitle("删除"); +// menu.setAuthority("cms:article:remove"); +// menuService.save(menu); +// menu.setTitle("文章分类"); +// menu.setPath("/cms/category"); +// menu.setComponent("/cms/category"); +// menu.setIcon("ApartmentOutlined"); +// menu.setAuthority(""); +// menu.setMenuType(0); +// menu.setSortNumber(2); +// menu.setParentId(contentParentId); +// menuService.save(menu); +// Integer categoryParentId = menu.getMenuId(); +// menu.setParentId(categoryParentId); +// menu.setMenuType(1); +// menu.setIcon(""); +// menu.setPath(""); +// menu.setComponent(""); +// menu.setSortNumber(0); +// menu.setTitle("查询"); +// menu.setAuthority("cms:articleCategory:list"); +// menuService.save(menu); +// menu.setTitle("添加"); +// menu.setAuthority("cms:articleCategory:save"); +// menuService.save(menu); +// menu.setTitle("修改"); +// menu.setAuthority("cms:articleCategory:update"); +// menuService.save(menu); +// menu.setTitle("删除"); +// menu.setAuthority("cms:articleCategory:remove"); +// menuService.save(menu); +// menu.setTitle("文档管理"); +// menu.setPath("/cms/docs/:id"); +// menu.setComponent("/cms/docs"); +// menu.setIcon("ReadOutlined"); +// menu.setAuthority(""); +// menu.setSortNumber(3); +// menu.setMenuType(0); +// menu.setParentId(contentParentId); +// menuService.save(menu); +// Integer docsParentId = menu.getMenuId(); +// menu.setParentId(docsParentId); +// menu.setMenuType(1); +// menu.setIcon(""); +// menu.setPath(""); +// menu.setComponent(""); +// menu.setSortNumber(0); +// menu.setTitle("查询"); +// menu.setAuthority("cms:docs:list"); +// menuService.save(menu); +// menu.setTitle("添加"); +// menu.setAuthority("cms:docs:save"); +// menuService.save(menu); +// menu.setTitle("修改"); +// menu.setAuthority("cms:docs:update"); +// menuService.save(menu); +// menu.setTitle("删除"); +// menu.setAuthority("cms:docs:remove"); +// menuService.save(menu); +// menu.setTitle("视频管理"); +// menu.setPath("/cms/video"); +// menu.setComponent("/cms/video"); +// menu.setIcon("YoutubeOutlined"); +// menu.setAuthority(""); +// menu.setSortNumber(4); +// menu.setMenuType(0); +// menu.setParentId(contentParentId); +// menuService.save(menu); +// Integer cmsVideoParentId = menu.getMenuId(); +// menu.setParentId(cmsVideoParentId); +// menu.setMenuType(1); +// menu.setIcon(""); +// menu.setPath(""); +// menu.setComponent(""); +// menu.setSortNumber(0); +// menu.setTitle("列表"); +// menu.setAuthority("cms:file:list"); +// menuService.save(menu); +// menu.setTitle("上传"); +// menu.setAuthority("sys:file:upload"); +// menuService.save(menu); +// menu.setTitle("编辑"); +// menu.setAuthority("sys:file:update"); +// menuService.save(menu); +// menu.setTitle("删除"); +// menu.setAuthority("sys:file:remove"); +// menuService.save(menu); +// menu.setTitle("视频播放"); +// menu.setIcon(""); +// menu.setPath("/cms/video/player"); +// menu.setComponent("/cms/video/player"); +// menu.setMenuType(0); +// menu.setHide(1); +// menu.setMeta("{\"active\": \"/cms/video\", \"tabUnique\": false}"); +// menuService.save(menu); +// menu.setTitle("文件下载"); +// menu.setPath("/cms/down"); +// menu.setComponent("/cms/down"); +// menu.setIcon("LinkOutlined"); +// menu.setAuthority(""); +// menu.setHide(0); +// menu.setSortNumber(5); +// menu.setMenuType(0); +// menu.setParentId(contentParentId); +// menuService.save(menu); +// // 8.营销管理 +// menu.setParentId(0); +// menu.setTitle("营销管理"); +// menu.setPath("/market"); +// menu.setIcon("CrownOutlined"); +// menu.setComponent(""); +// menu.setAuthority(""); +// menu.setSortNumber(8); +// menu.setMenuType(0); +// menuService.save(menu); +// Integer marketParentId = menu.getMenuId(); +// menu.setTitle("优惠券"); +// menu.setPath("/market/coupon"); +// menu.setComponent("/market/coupon"); +// menu.setIcon("TagsOutlined"); +// menu.setParentId(marketParentId); +// menu.setMenuType(0); +// menu.setSortNumber(0); +// menuService.save(menu); +// Integer marketCouponParentId = menu.getMenuId(); +// menu.setParentId(marketCouponParentId); +// menu.setMenuType(1); +// menu.setIcon(""); +// menu.setPath(""); +// menu.setComponent(""); +// menu.setTitle("查询"); +// menu.setSortNumber(0); +// menu.setAuthority("cms:coupon:list"); +// menuService.save(menu); +// menu.setTitle("添加"); +// menu.setAuthority("cms:coupon:save"); +// menuService.save(menu); +// menu.setTitle("修改"); +// menu.setAuthority("cms:coupon:update"); +// menuService.save(menu); +// menu.setTitle("删除"); +// menu.setAuthority("cms:coupon:remove"); +// menuService.save(menu); +// menu.setTitle("会员充值"); +// menu.setPath("/market/recharge"); +// menu.setComponent("/market/recharge"); +// menu.setIcon("MoneyCollectOutlined"); +// menu.setParentId(marketParentId); +// menu.setMenuType(0); +// menu.setSortNumber(1); +// menuService.save(menu); +// menu.setTitle("积分管理"); +// menu.setPath("/market/points"); +// menu.setComponent("/market/points"); +// menu.setIcon("PayCircleOutlined"); +// menu.setParentId(marketParentId); +// menu.setMenuType(0); +// menu.setSortNumber(2); +// menuService.save(menu); +// // 9.应用中心 +// menu.setParentId(0); +// menu.setTitle("应用中心"); +// menu.setPath("/apps"); +// menu.setIcon("AppstoreAddOutlined"); +// menu.setComponent(""); +// menu.setAuthority(""); +// menu.setSortNumber(9); +// 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(99); +// 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"); +// menu.setTitle("预览头像"); +// menu.setAuthority("sys:file:list"); +// menu.setTitle("保存头像"); +// menu.setAuthority("sys:user:update"); +// 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(tenant); +// return success("创建成功"); +// } +// } +// } +// throw new BusinessException("创建失败"); +// } + + @PreAuthorize("hasAuthority('oa:tenant:update')") + @OperationLog + @ApiOperation("修改租户") + @PutMapping() + public ApiResult update(@RequestBody Tenant tenant) { + // 验证签名 + isCheckSign(); + saveRedis(tenant); + if (tenantService.updateById(tenant)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + // 缓存租户信息 + private void saveRedis(Tenant tenant) { + String key = "cache:tenant"; + String tenantId = tenant.getTenantId().toString(); + if (StrUtil.isEmpty(tenant.getTenantCode())) { + tenant.setTenantCode(CommonUtil.randomUUID16()); + } + String data = JSONUtil.toJSONString(tenant); + stringRedisTemplate.opsForHash().put(key,tenantId, data); + } + + @PreAuthorize("hasAuthority('oa:tenant:remove')") + @OperationLog + @ApiOperation("删除租户") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + // 验证签名 + isCheckSign(); + if (tenantService.removeById(id)) { + String key = "cache:tenant"; + stringRedisTemplate.opsForHash().delete(key,id.toString()); + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('oa:tenant:save')") + @OperationLog + @ApiOperation("批量添加租户") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + // 验证签名 + isCheckSign(); + if (tenantService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('oa:tenant:update')") + @OperationLog + @ApiOperation("批量修改租户") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + // 验证签名 + isCheckSign(); + if (batchParam.update(tenantService, "tenant_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('oa:tenant:remove')") + @OperationLog + @ApiOperation("批量删除租户") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + // 验证签名 + isCheckSign(); + if (tenantService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @ApiOperation("租户角色权限初始化") + @GetMapping("/role-menu/{id}") + public ApiResult> initialization(@PathVariable("id") Integer roleId) { + // 验证签名 + isCheckSign(); + 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/src/main/java/com/gxwebsoft/open/controller/OpenUserController.java b/src/main/java/com/gxwebsoft/open/controller/OpenUserController.java new file mode 100644 index 0000000..3d4045e --- /dev/null +++ b/src/main/java/com/gxwebsoft/open/controller/OpenUserController.java @@ -0,0 +1,44 @@ +package com.gxwebsoft.open.controller; + +import com.gxwebsoft.common.core.utils.MyQrCodeUtil; +import com.gxwebsoft.common.core.web.ApiResult; +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.common.system.param.UserParam; +import com.gxwebsoft.common.system.service.UserService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.io.IOException; + +/** + * 我的资料 + * + * @author 科技小王子 + * @since 2023-04-24 21:47:57 + */ +@Api(tags = "我的资料") +@RestController +@RequestMapping("/api/open/user") +public class OpenUserController extends BaseController { + @Resource + private UserService userService; + + @ApiOperation("实时二维码") + @PostMapping("/myQrCode") + public ApiResult myQrCode(@RequestBody UserParam userParam) throws IOException { + // 验证签名 + isCheckSign(); + final String qrCode = MyQrCodeUtil.createQrCode(getLoginUserId(), userParam.getCodeContent()); + return success("操作成功",qrCode); + } + + @ApiOperation("获取代理用户信息") + @GetMapping("/agentUser/{id}") + public ApiResult agentUser(@PathVariable("id") Integer id){ + User user = userService.getById(id); + return success("操作成功",user); + } +} diff --git a/src/main/java/com/gxwebsoft/open/controller/OpenUserOrderController.java b/src/main/java/com/gxwebsoft/open/controller/OpenUserOrderController.java new file mode 100644 index 0000000..c6a6218 --- /dev/null +++ b/src/main/java/com/gxwebsoft/open/controller/OpenUserOrderController.java @@ -0,0 +1,87 @@ +package com.gxwebsoft.open.controller; + +import com.gxwebsoft.common.core.exception.BusinessException; +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.User; +import com.gxwebsoft.shop.entity.Order; +import com.gxwebsoft.shop.param.OrderParam; +import com.gxwebsoft.shop.service.OrderService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.data.redis.core.StringRedisTemplate; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.List; + +/** + * 用户-我的订单 + * + * @author 科技小王子 + * @since 2022-11-25 19:04:43 + */ +@Api(tags = "我的订单") +@RestController +@RequestMapping("/api/open/user-order") +public class OpenUserOrderController extends BaseController { + @Resource + private OrderService orderService; + + @ApiOperation("分页查询用户订单") + @GetMapping("/page") + public ApiResult> page(OrderParam param) { + // 验证签名 + isCheckSign(); + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + // 记录当前登录用户id、租户id + User user = getLoginUser(); + if (user != null) { + param.setUserId(user.getUserId()); + param.setTenantId(user.getTenantId()); + } + // 使用关联查询 + return success(orderService.pageRel(param)); + } + + @ApiOperation("查询全部用户订单") + @GetMapping() + public ApiResult> list(OrderParam param) { + // 验证签名 + isCheckSign(); + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + // 记录当前登录用户id、租户id + User user = getLoginUser(); + if (user != null) { + param.setUserId(user.getUserId()); + param.setTenantId(user.getTenantId()); + } + + // 使用关联查询 + return success(orderService.listRel(param)); + } + + @ApiOperation("测试") + @GetMapping("/test") + public ApiResult> test(OrderParam param) { + // 验证签名 + isCheckSign(); + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + // 记录当前登录用户id、租户id + User user = getLoginUser(); + if (user != null) { + param.setUserId(user.getUserId()); + param.setTenantId(user.getTenantId()); + } + // 使用关联查询 + return success(orderService.pageRel(param)); + } +} diff --git a/src/main/java/com/gxwebsoft/open/controller/OpenWxOfficialController.java b/src/main/java/com/gxwebsoft/open/controller/OpenWxOfficialController.java new file mode 100644 index 0000000..6e376ce --- /dev/null +++ b/src/main/java/com/gxwebsoft/open/controller/OpenWxOfficialController.java @@ -0,0 +1,166 @@ +package com.gxwebsoft.open.controller; + +import cn.hutool.core.util.CharsetUtil; +import cn.hutool.core.util.StrUtil; +import cn.hutool.http.HttpUtil; +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.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.WxOfficialUtil; +import com.gxwebsoft.common.core.web.ApiResult; +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.common.system.entity.LoginRecord; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.common.system.param.UserParam; +import com.gxwebsoft.common.system.service.LoginRecordService; +import com.gxwebsoft.common.system.service.SettingService; +import com.gxwebsoft.common.system.service.UserService; +import com.gxwebsoft.oa.service.NoticeService; +import com.gxwebsoft.shop.entity.UserOauth; +import com.gxwebsoft.shop.param.UserOauthParam; +import com.gxwebsoft.shop.service.UserOauthService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.models.auth.In; +import org.springframework.data.redis.core.StringRedisTemplate; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.util.concurrent.TimeUnit; + +import static com.gxwebsoft.common.core.utils.CommonUtil.randomUsername; + +/** + * 微信公众号接口 + * + * @author WebSoft + * @since 2022-11-19 13:54:27 + */ +@Api(tags = "微信公众号授权登录") +@RestController +@RequestMapping("/api/open/wx-official") +public class OpenWxOfficialController extends BaseController { + @Resource + private ConfigProperties configProperties; + @Resource + private WxOfficialUtil wxOfficialUtil; + @Resource + private UserService userService; + @Resource + private UserOauthService userOauthService; + @Resource + private LoginRecordService loginRecordService; + @Resource + private SettingService settingService; + + public OpenWxOfficialController() { + } + + @OperationLog + @ApiOperation("第一步：用户同意授权，获取code") + @GetMapping("/code") + public ApiResult code() throws UnsupportedEncodingException { + WxOfficialUtil client = wxOfficialUtil.client(getTenantId()); + String codeUrl = client.getCodeUrl(); + return success(codeUrl); + } + + @OperationLog + @Transactional(rollbackFor = Exception.class) + @ApiOperation("第二步：通过code换取网页授权access_token") + @GetMapping("/accessToken") + public String accessToken(String code, String state, HttpServletRequest request, HttpServletResponse resp) throws IOException { + if(StrUtil.equals(state,"STATE")){ + throw new BusinessException("租户ID不正确"); + } + + // 1.实例化 + WxOfficialUtil client = wxOfficialUtil.client(Integer.valueOf(state)); + + // 2.获取access_token + final String access_token = client.getAccessToken(code); + + // 准备数据 + final String unionid = client.unionid; + final String expires_in = client.expires_in; + final JSONObject cache = settingService.getCache("cache".concat(state).concat(":setting:setting")); + final String domain = "https://" + cache.getString("domain"); + + // 3.查询第三方用户信息表 + UserOauthParam userOauthParam = new UserOauthParam(); + userOauthParam.setUnionid(unionid); + userOauthParam.setTenantId(Integer.valueOf(state)); + System.out.println("userOauthParam = " + userOauthParam); + final UserOauth oauthUser = userOauthService.getByUnionId(userOauthParam); + System.out.println("oauthUser = " + oauthUser); + + // 4.1存在签发token + if(oauthUser != null){ + UserParam userParam = new UserParam(); + userParam.setUserId(oauthUser.getUserId()); + userParam.setTenantId(Integer.valueOf(state)); + System.out.println("userParam = " + userParam); + User user = userService.getByUnionId(userParam); + // 5.签发token + System.out.println("user = 签发token " + user); + String wx_token = JwtUtil.buildToken(new JwtSubject(user.getUsername(), Integer.valueOf(state)), + configProperties.getTokenExpireTime(), configProperties.getTokenKey()); + resp.sendRedirect(domain + "/passport/wx-official-login?token=".concat(wx_token).concat("&username=").concat(user.getUsername())); + return "登录成功"; + } + // 4.2不存在则注册并登录签发token + final JSONObject userInfo = client.getUserInfo(access_token); + final String openid = userInfo.getString("openid"); + final String unionId = userInfo.getString("unionid"); + final String nickname = userInfo.getString("nickname"); + final String sex = userInfo.getString("sex"); + final String province = userInfo.getString("province"); + final String city = userInfo.getString("city"); + final String country = userInfo.getString("country"); + final String headimgurl = userInfo.getString("headimgurl"); + System.out.println("headimgurl = " + headimgurl); + System.out.println("unionId = " + unionId); + System.out.println("openid = " + openid); + System.out.println("nickname = " + nickname); + User user = new User(); + user.setNickname(nickname); + user.setType(0); + user.setUsername(randomUsername("wx_")); + user.setPassword(userService.encodePassword(CommonUtil.randomUUID16())); + user.setSex(sex); + user.setPlatform("WX-OFFICIAL"); + user.setProvince(province); + user.setCity(city); + user.setCountry(country); + user.setAvatar(headimgurl); + user.setTenantId(Integer.valueOf(state)); + userService.saveUser(user); + System.out.println("userLast = " + user); + UserOauth userOauth = new UserOauth(); + userOauth.setTenantId(Integer.valueOf(state)); + userOauth.setOauthType("WX-OFFICIAL"); + userOauth.setOauthId(openid); + userOauth.setUnionid(unionId); + userOauth.setUserId(user.getUserId()); + userOauthService.save(userOauth); + loginRecordService.saveAsync(user.getUsername(), LoginRecord.TYPE_LOGIN, null, Integer.valueOf(state), request); + // 5.签发token + String wx_token = JwtUtil.buildToken(new JwtSubject(user.getUsername(), Integer.valueOf(state)), + configProperties.getTokenExpireTime(), configProperties.getTokenKey()); + resp.sendRedirect(domain + "/passport/wx-official-login?token=".concat(wx_token).concat("&username=").concat(user.getUsername())); + return "注册成功"; + } +} diff --git a/src/main/java/com/gxwebsoft/open/controller/OpenWxWorkController.java b/src/main/java/com/gxwebsoft/open/controller/OpenWxWorkController.java new file mode 100644 index 0000000..f504b17 --- /dev/null +++ b/src/main/java/com/gxwebsoft/open/controller/OpenWxWorkController.java @@ -0,0 +1,182 @@ +package com.gxwebsoft.open.controller; + +import cn.hutool.http.HttpUtil; +import com.gxwebsoft.common.core.annotation.OperationLog; +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.utils.CommonUtil; +import com.gxwebsoft.common.core.utils.WxWorkUtil; +import com.gxwebsoft.common.core.web.ApiResult; +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.common.system.entity.LoginRecord; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.common.system.entity.UserRole; +import com.gxwebsoft.common.system.param.UserParam; +import com.gxwebsoft.common.system.result.LoginResult; +import com.gxwebsoft.common.system.service.LoginRecordService; +import com.gxwebsoft.common.system.service.SettingService; +import com.gxwebsoft.common.system.service.UserRoleService; +import com.gxwebsoft.common.system.service.UserService; +import com.gxwebsoft.shop.entity.UserOauth; +import com.gxwebsoft.shop.param.UserOauthParam; +import com.gxwebsoft.shop.service.UserOauthService; +import com.qq.weixin.mp.aes.AesException; +import com.qq.weixin.mp.aes.WXBizJsonMsgCrypt; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.data.redis.core.StringRedisTemplate; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.HashMap; + +/** + * 企业微信接口 + * + * @author WebSoft + * @since 2022-11-19 13:54:27 + */ +@Api(tags = "企业微信验证") +@RestController +@RequestMapping("/api/open/wx-work") +public class OpenWxWorkController extends BaseController { + @Resource + private StringRedisTemplate stringRedisTemplate; + @Resource + private ConfigProperties configProperties; + @Resource + private WxWorkUtil workUtil; + @Resource + private UserService userService; + @Resource + private UserOauthService userOauthService; + @Resource + private LoginRecordService loginRecordService; + @Resource + private SettingService settingService; + @Resource + private UserRoleService userRoleService; + + @OperationLog + @ApiOperation("第一步：请求验证URL有效性") + @GetMapping() + public String msgSignature(HttpServletRequest request) throws AesException { + String sToken = "gFJXh4y2QAg5gm6U"; + String sCorpID = "wxa040285bc1c223ae"; + String sEncodingAESKey = "MRYqPeaVleIZDzgS2O8CoyyRwAYBOD9wQAztSfLMWaA"; + + WXBizJsonMsgCrypt wxcpt = new WXBizJsonMsgCrypt(sToken, sEncodingAESKey, sCorpID); + + // 解析出url上的参数值如下： + final String sVerifyMsgSig = request.getParameter("msg_signature"); + final String sVerifyTimeStamp = request.getParameter("timestamp"); + final String sVerifyNonce = request.getParameter("nonce"); + final String sVerifyEchoStr = request.getParameter("echostr"); + String sEchoStr; //需要返回的明文 + System.out.println("sVerifyMsgSig = " + sVerifyMsgSig); + System.out.println("sVerifyTimeStamp = " + sVerifyTimeStamp); + System.out.println("sVerifyNonce = " + sVerifyNonce); + System.out.println("sVerifyEchoStr = " + sVerifyEchoStr); + + try { + sEchoStr = wxcpt.VerifyURL(sVerifyMsgSig, sVerifyTimeStamp, + sVerifyNonce, sVerifyEchoStr); + System.out.println("verifyurl echostr: " + sEchoStr); + // 验证URL成功，将sEchoStr返回 + return sEchoStr; + } catch (Exception e) { + //验证URL失败，错误原因请查看异常 + e.printStackTrace(); + } + return "验证失败"; + } + + @ApiOperation("获取access_token并登录") + @GetMapping("/saveAccessToken") + public ApiResult saveAccessToken(HttpServletRequest request, HttpServletResponse resp) throws IOException { + System.out.println("request = " + request); + final String code = request.getParameter("code"); + final String state = request.getParameter("state"); + final Integer tenantId = Integer.valueOf(state); + System.out.println("code = " + code); + System.out.println("state = " + state); + // 1.实例化 + WxWorkUtil client = workUtil.client(tenantId); + // 2.获取access_token + String key = "cache"+ tenantId +":ww:access_token"; + String access_token = stringRedisTemplate.opsForValue().get(key); + System.out.println("access_token_cache = " + access_token); + if (access_token == null){ + client.getAccessToken(code); + } + // 3.获取用户信息 + client.getUserInfo(code,access_token); + + // 3.2 读取用户详细信息 + client.getUserProfile(client.userid,access_token); + + // 4.查询第三方用户信息表 + UserOauthParam userOauthParam = new UserOauthParam(); + userOauthParam.setOauthId(client.userid); + userOauthParam.setUnionid(client.userid); + userOauthParam.setTenantId(tenantId); + System.out.println("userOauthParam = " + userOauthParam); + final UserOauth oauthUser = userOauthService.getByUnionId(userOauthParam); + System.out.println("oauthUser = " + oauthUser); + + // 4.1存在签发token + if(oauthUser != null){ + UserParam userParam = new UserParam(); + userParam.setUserId(oauthUser.getUserId()); + userParam.setTenantId(tenantId); + System.out.println("userParam = " + userParam); + User user = userService.getByUnionId(userParam); + // 5.签发token + System.out.println("user = 签发token " + user); + String ww_token = JwtUtil.buildToken(new JwtSubject(user.getUsername(), tenantId), + configProperties.getTokenExpireTime(), configProperties.getTokenKey()); + resp.sendRedirect("http://apps.gxwebsoft.com/baocan/#/?ww_token=" + ww_token + "&userId=" + user.getUserId()); + return success("登录成功",new LoginResult(ww_token, user)); + } + // 4.2不存在则注册并登录签发token + User user = new User(); + user.setNickname(client.name); + user.setUsername(client.userid); + user.setPhone(client.mobile); + user.setSex(client.gender); + user.setPosition(client.position); + user.setEmail(client.email); + user.setAlias(client.alias); + user.setPassword(userService.encodePassword(CommonUtil.randomUUID16())); + user.setPlatform("WX-WORK"); + user.setTenantId(tenantId); + userService.saveUser(user); + System.out.println("userLast = " + user); + // 添加默认角色 + UserRole userRole = new UserRole(); + userRole.setRoleId(241); + userRole.setUserId(user.getUserId()); + userRole.setTenantId(tenantId); + userRoleService.save(userRole); + // 添加第三方用户信息 + UserOauth userOauth = new UserOauth(); + userOauth.setTenantId(tenantId); + userOauth.setOauthType("WX-WORK"); + userOauth.setOauthId(client.userid); + userOauth.setUnionid(client.userid); + userOauth.setUserId(user.getUserId()); + userOauthService.save(userOauth); + loginRecordService.saveAsync(user.getUsername(), LoginRecord.TYPE_LOGIN, null, tenantId, request); + // 5.签发token + String ww_token = JwtUtil.buildToken(new JwtSubject(user.getUsername(), tenantId), + configProperties.getTokenExpireTime(), configProperties.getTokenKey()); + resp.sendRedirect("http://apps.gxwebsoft.com/baocan/#/?ww_token=" + ww_token + "&userId=" + user.getUserId()); + return success("注册成功",new LoginResult(ww_token, user)); + } +} diff --git a/src/main/java/com/gxwebsoft/open/controller/VerifyTxt.java b/src/main/java/com/gxwebsoft/open/controller/VerifyTxt.java new file mode 100644 index 0000000..b9ed14b --- /dev/null +++ b/src/main/java/com/gxwebsoft/open/controller/VerifyTxt.java @@ -0,0 +1,19 @@ +package com.gxwebsoft.open.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("/5zbYEPkyV4.txt") +public class VerifyTxt { + + @ApiOperation("域名所有权验证") + @GetMapping() + public String verify(){ + return "82e8e3cf87f99ba1e31d2c103133fcab"; + } +} diff --git a/src/main/java/com/gxwebsoft/open/entity/WxWork.java b/src/main/java/com/gxwebsoft/open/entity/WxWork.java new file mode 100644 index 0000000..fbc608c --- /dev/null +++ b/src/main/java/com/gxwebsoft/open/entity/WxWork.java @@ -0,0 +1,24 @@ +package com.gxwebsoft.open.entity; + +import io.swagger.annotations.ApiModel; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; + +/** + * 企业微信登录传参 + * + * @author WebSoft + * @since 2022-11-16 11:13:16 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "企业微信登录传参", description = "企业微信登录传参") +public class WxWork implements Serializable { + private static final long serialVersionUID = 1L; + private String msg_signature; + private String timestamp; + private String nonce; + private String echostr; +} diff --git a/src/main/java/com/gxwebsoft/shop/config/ExpressConfig.java b/src/main/java/com/gxwebsoft/shop/config/ExpressConfig.java new file mode 100644 index 0000000..4ea8bd9 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/config/ExpressConfig.java @@ -0,0 +1,25 @@ +package com.gxwebsoft.shop.config; + + +import lombok.Data; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.PropertySource; + +@Configuration +@PropertySource("classpath:express.properties") +@ConfigurationProperties(prefix = "express") +@Data +public class ExpressConfig { + // 开发者ID + private Long devId; + // 开发者密钥 + private String devKey; + // 店铺ID + private String shopId; + // 加密签名 + private String sign; + // 顺丰IP地址 + private String serverHost; + +} diff --git a/src/main/java/com/gxwebsoft/shop/config/WxPayConfig.java b/src/main/java/com/gxwebsoft/shop/config/WxPayConfig.java new file mode 100644 index 0000000..92f69da --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/config/WxPayConfig.java @@ -0,0 +1,35 @@ +package com.gxwebsoft.shop.config; + +import lombok.Data; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.PropertySource; + +@Configuration +@PropertySource("classpath:wxpay.properties") +@ConfigurationProperties(prefix = "wxpay") +@Data +public class WxPayConfig { + + // 商户号 + private String mchId; + + // 证书序列号 + private String mchSerialNo; + + // 商户私钥文件 + private String privateKeyPath; + + // APIv3秘钥 + private String apiV3Key; + + // APPID + private String appId; + + // 微信服务器地址 + private String domain; + + // 接受结果通知地址 + private String notifyDomain; + +} diff --git a/src/main/java/com/gxwebsoft/shop/constants/OrderConstants.java b/src/main/java/com/gxwebsoft/shop/constants/OrderConstants.java new file mode 100644 index 0000000..9d89989 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/constants/OrderConstants.java @@ -0,0 +1,14 @@ +package com.gxwebsoft.shop.constants; + +public class OrderConstants { + // 订单来源 10普通订单 20砍价订单 30秒杀订单 + public static final Integer ORDER_SOURCE = 10; // 普通订单 + public static final Integer ORDER_SOURCE_BARGAIN = 20; // 砍价订单 + public static final Integer ORDER_SOURCE_SHARP= 30; // 秒杀订单 + + // 订单商品 + public static final Integer ORDER_GOODS_DELIVERY_STATUS10 = 10; // 未发货 + public static final Integer ORDER_GOODS_DELIVERY_STATUS20 = 20; // 已发货 + public static final Integer ORDER_GOODS_DELIVERY_STATUS30 = 30; // 部分发货 + +} diff --git a/src/main/java/com/gxwebsoft/shop/controller/CartController.java b/src/main/java/com/gxwebsoft/shop/controller/CartController.java new file mode 100644 index 0000000..668a75e --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/controller/CartController.java @@ -0,0 +1,148 @@ +package com.gxwebsoft.shop.controller; + +import cn.hutool.core.bean.BeanUtil; +import com.gxwebsoft.common.core.annotation.OperationLog; +import com.gxwebsoft.common.core.web.*; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.shop.entity.Cart; +import com.gxwebsoft.shop.param.CartParam; +import com.gxwebsoft.shop.service.CartService; +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.List; +import java.util.Map; +import java.util.concurrent.TimeUnit; + +/** + * 购物车记录表控制器 + * + * @author 科技小王子 + * @since 2022-11-25 19:04:43 + */ +@Api(tags = "购物车记录表管理") +@RestController +@RequestMapping("/api/shop/cart") +public class CartController extends BaseController { + @Resource + private CartService cartService; + @Resource + private StringRedisTemplate stringRedisTemplate; + + @PreAuthorize("hasAuthority('shop:cart:list')") + @OperationLog + @ApiOperation("分页查询购物车记录表") + @GetMapping("/page") + public ApiResult> page(CartParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(cartService.page(page, page.getWrapper())); + // 使用关联查询 + //return success(cartService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('shop:cart:list')") + @OperationLog + @ApiOperation("查询全部购物车记录表") + @GetMapping() + public ApiResult> list(CartParam param) { +// PageParam page = new PageParam<>(param); +// page.setDefaultOrder("create_time desc"); +// return success(cartService.list(page.getOrderWrapper())); + // 使用关联查询 + + return success(cartService.listRel(param)); + } + + @PreAuthorize("hasAuthority('shop:cart:list')") + @OperationLog + @ApiOperation("根据id查询购物车记录表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + return success(cartService.getById(id)); + // 使用关联查询 + //return success(cartService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('shop:cart:save')") + @OperationLog + @ApiOperation("添加购物车记录表") + @PostMapping() + public ApiResult save(@RequestBody Cart cart) { + // 记录当前登录用户id、租户id + User loginUser = getLoginUser(); + // 存入redis + Map userMap = BeanUtil.beanToMap(loginUser); + String userMapKey = "oa:cart:".concat(loginUser.getUserId().toString()); + stringRedisTemplate.opsForHash().putAll(userMapKey,userMap); + stringRedisTemplate.expire(userMapKey,30, TimeUnit.MINUTES); + + if (loginUser != null) { + cart.setUserId(loginUser.getUserId()); + } + if (cartService.save(cart)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('shop:cart:update')") + @OperationLog + @ApiOperation("修改购物车记录表") + @PutMapping() + public ApiResult update(@RequestBody Cart cart) { + if (cartService.updateById(cart)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('shop:cart:remove')") + @OperationLog + @ApiOperation("删除购物车记录表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (cartService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('shop:cart:save')") + @OperationLog + @ApiOperation("批量添加购物车记录表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (cartService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('shop:cart:update')") + @OperationLog + @ApiOperation("批量修改购物车记录表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(cartService, "id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('shop:cart:remove')") + @OperationLog + @ApiOperation("批量删除购物车记录表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (cartService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/controller/CategoryController.java b/src/main/java/com/gxwebsoft/shop/controller/CategoryController.java new file mode 100644 index 0000000..9b313db --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/controller/CategoryController.java @@ -0,0 +1,141 @@ +package com.gxwebsoft.shop.controller; + +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.shop.service.CategoryService; +import com.gxwebsoft.shop.entity.Category; +import com.gxwebsoft.shop.param.CategoryParam; +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 2022-11-22 17:45:37 + */ +@Api(tags = "商品分类表管理") +@RestController +@RequestMapping("/api/shop/category") +public class CategoryController extends BaseController { + @Resource + private CategoryService categoryService; + + @PreAuthorize("hasAuthority('shop:category:list')") + @OperationLog + @ApiOperation("分页查询商品分类表") + @GetMapping("/page") + public ApiResult> page(CategoryParam param) { + PageParam page = new PageParam<>(param); +// page.setDefaultOrder("create_time desc"); + page.setDefaultOrder("sort_number"); + return success(categoryService.page(page, page.getWrapper())); + // 使用关联查询 + //return success(categoryService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('shop:category:list')") + @OperationLog + @ApiOperation("查询全部商品分类表") + @GetMapping() + public ApiResult> list(CategoryParam param) { + PageParam page = new PageParam<>(param); +// page.setDefaultOrder("create_time desc"); + page.setDefaultOrder("sort_number"); + return success(categoryService.list(page.getOrderWrapper())); + // 使用关联查询 + //return success(categoryService.listRel(param)); + } + + @PreAuthorize("hasAuthority('shop:category:list')") + @OperationLog + @ApiOperation("根据id查询商品分类表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + return success(categoryService.getById(id)); + // 使用关联查询 + //return success(categoryService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('shop:category:save')") + @OperationLog + @ApiOperation("添加商品分类表") + @PostMapping() + public ApiResult save(@RequestBody Category category) { + // 记录当前登录用户id、租户id + User loginUser = getLoginUser(); + if (loginUser != null) { + category.setUserId(loginUser.getUserId()); + } + if (categoryService.save(category)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('shop:category:update')") + @OperationLog + @ApiOperation("修改商品分类表") + @PutMapping() + public ApiResult update(@RequestBody Category category) { + if (categoryService.updateById(category)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('shop:category:remove')") + @OperationLog + @ApiOperation("删除商品分类表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (categoryService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('shop:category:save')") + @OperationLog + @ApiOperation("批量添加商品分类表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (categoryService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('shop:category:update')") + @OperationLog + @ApiOperation("批量修改商品分类表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(categoryService, "category_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('shop:category:remove')") + @OperationLog + @ApiOperation("批量删除商品分类表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (categoryService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/controller/CommentController.java b/src/main/java/com/gxwebsoft/shop/controller/CommentController.java new file mode 100644 index 0000000..dbdcd33 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/controller/CommentController.java @@ -0,0 +1,139 @@ +package com.gxwebsoft.shop.controller; + +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.shop.service.CommentService; +import com.gxwebsoft.shop.entity.Comment; +import com.gxwebsoft.shop.param.CommentParam; +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 2022-11-23 21:18:56 + */ +@Api(tags = "商品评价记录表管理") +@RestController +@RequestMapping("/api/shop/comment") +public class CommentController extends BaseController { + @Resource + private CommentService commentService; + + @PreAuthorize("hasAuthority('shop:comment:list')") + @OperationLog + @ApiOperation("分页查询商品评价记录表") + @GetMapping("/page") + public ApiResult> page(CommentParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(commentService.page(page, page.getWrapper())); + // 使用关联查询 + //return success(commentService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('shop:comment:list')") + @OperationLog + @ApiOperation("查询全部商品评价记录表") + @GetMapping() + public ApiResult> list(CommentParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(commentService.list(page.getOrderWrapper())); + // 使用关联查询 + //return success(commentService.listRel(param)); + } + + @PreAuthorize("hasAuthority('shop:comment:list')") + @OperationLog + @ApiOperation("根据id查询商品评价记录表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + return success(commentService.getById(id)); + // 使用关联查询 + //return success(commentService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('shop:comment:save')") + @OperationLog + @ApiOperation("添加商品评价记录表") + @PostMapping() + public ApiResult save(@RequestBody Comment comment) { + // 记录当前登录用户id、租户id + User loginUser = getLoginUser(); + if (loginUser != null) { + comment.setUserId(loginUser.getUserId()); + } + if (commentService.save(comment)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('shop:comment:update')") + @OperationLog + @ApiOperation("修改商品评价记录表") + @PutMapping() + public ApiResult update(@RequestBody Comment comment) { + if (commentService.updateById(comment)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('shop:comment:remove')") + @OperationLog + @ApiOperation("删除商品评价记录表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (commentService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('shop:comment:save')") + @OperationLog + @ApiOperation("批量添加商品评价记录表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (commentService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('shop:comment:update')") + @OperationLog + @ApiOperation("批量修改商品评价记录表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(commentService, "comment_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('shop:comment:remove')") + @OperationLog + @ApiOperation("批量删除商品评价记录表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (commentService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/controller/CouponController.java b/src/main/java/com/gxwebsoft/shop/controller/CouponController.java new file mode 100644 index 0000000..73b1780 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/controller/CouponController.java @@ -0,0 +1,139 @@ +package com.gxwebsoft.shop.controller; + +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.shop.service.CouponService; +import com.gxwebsoft.shop.entity.Coupon; +import com.gxwebsoft.shop.param.CouponParam; +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 2022-11-28 18:26:05 + */ +@Api(tags = "优惠券记录表管理") +@RestController +@RequestMapping("/api/shop/coupon") +public class CouponController extends BaseController { + @Resource + private CouponService couponService; + + @PreAuthorize("hasAuthority('shop:coupon:list')") + @OperationLog + @ApiOperation("分页查询优惠券记录表") + @GetMapping("/page") + public ApiResult> page(CouponParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(couponService.page(page, page.getWrapper())); + // 使用关联查询 + //return success(couponService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('shop:coupon:list')") + @OperationLog + @ApiOperation("查询全部优惠券记录表") + @GetMapping() + public ApiResult> list(CouponParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(couponService.list(page.getOrderWrapper())); + // 使用关联查询 + //return success(couponService.listRel(param)); + } + + @PreAuthorize("hasAuthority('shop:coupon:list')") + @OperationLog + @ApiOperation("根据id查询优惠券记录表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + return success(couponService.getById(id)); + // 使用关联查询 + //return success(couponService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('shop:coupon:save')") + @OperationLog + @ApiOperation("添加优惠券记录表") + @PostMapping() + public ApiResult save(@RequestBody Coupon coupon) { + // 记录当前登录用户id、租户id + User loginUser = getLoginUser(); + if (loginUser != null) { + coupon.setUserId(loginUser.getUserId()); + } + if (couponService.save(coupon)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('shop:coupon:update')") + @OperationLog + @ApiOperation("修改优惠券记录表") + @PutMapping() + public ApiResult update(@RequestBody Coupon coupon) { + if (couponService.updateById(coupon)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('shop:coupon:remove')") + @OperationLog + @ApiOperation("删除优惠券记录表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (couponService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('shop:coupon:save')") + @OperationLog + @ApiOperation("批量添加优惠券记录表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (couponService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('shop:coupon:update')") + @OperationLog + @ApiOperation("批量修改优惠券记录表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(couponService, "coupon_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('shop:coupon:remove')") + @OperationLog + @ApiOperation("批量删除优惠券记录表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (couponService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/controller/ExpressController.java b/src/main/java/com/gxwebsoft/shop/controller/ExpressController.java new file mode 100644 index 0000000..da838d4 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/controller/ExpressController.java @@ -0,0 +1,139 @@ +package com.gxwebsoft.shop.controller; + +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.shop.service.ExpressService; +import com.gxwebsoft.shop.entity.Express; +import com.gxwebsoft.shop.param.ExpressParam; +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 2022-11-22 00:21:07 + */ +@Api(tags = "物流公司记录表管理") +@RestController +@RequestMapping("/api/shop/express") +public class ExpressController extends BaseController { + @Resource + private ExpressService expressService; + + @PreAuthorize("hasAuthority('shop:express:list')") + @OperationLog + @ApiOperation("分页查询物流公司记录表") + @GetMapping("/page") + public ApiResult> page(ExpressParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(expressService.page(page, page.getWrapper())); + // 使用关联查询 + //return success(expressService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('shop:express:list')") + @OperationLog + @ApiOperation("查询全部物流公司记录表") + @GetMapping() + public ApiResult> list(ExpressParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(expressService.list(page.getOrderWrapper())); + // 使用关联查询 + //return success(expressService.listRel(param)); + } + + @PreAuthorize("hasAuthority('shop:express:list')") + @OperationLog + @ApiOperation("根据id查询物流公司记录表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + return success(expressService.getById(id)); + // 使用关联查询 + //return success(expressService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('shop:express:save')") + @OperationLog + @ApiOperation("添加物流公司记录表") + @PostMapping() + public ApiResult save(@RequestBody Express express) { + // 记录当前登录用户id、租户id + User loginUser = getLoginUser(); + if (loginUser != null) { + express.setUserId(loginUser.getUserId()); + } + if (expressService.save(express)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('shop:express:update')") + @OperationLog + @ApiOperation("修改物流公司记录表") + @PutMapping() + public ApiResult update(@RequestBody Express express) { + if (expressService.updateById(express)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('shop:express:remove')") + @OperationLog + @ApiOperation("删除物流公司记录表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (expressService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('shop:express:save')") + @OperationLog + @ApiOperation("批量添加物流公司记录表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (expressService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('shop:express:update')") + @OperationLog + @ApiOperation("批量修改物流公司记录表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(expressService, "express_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('shop:express:remove')") + @OperationLog + @ApiOperation("批量删除物流公司记录表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (expressService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/controller/GoodsController.java b/src/main/java/com/gxwebsoft/shop/controller/GoodsController.java new file mode 100644 index 0000000..ffc1e16 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/controller/GoodsController.java @@ -0,0 +1,138 @@ +package com.gxwebsoft.shop.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.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.param.GoodsParam; +import com.gxwebsoft.shop.service.GoodsService; +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 2022-11-23 12:47:16 + */ +@Api(tags = "商品记录表管理") +@RestController +@RequestMapping("/api/shop/goods") +public class GoodsController extends BaseController { + @Resource + private GoodsService goodsService; + + @PreAuthorize("hasAuthority('shop:goods:list')") + @OperationLog + @ApiOperation("分页查询商品记录表") + @GetMapping("/page") + public ApiResult> page(GoodsParam param) { +// PageParam page = new PageParam<>(param); +// page.setDefaultOrder("create_time desc"); +// return success(goodsService.page(page, page.getWrapper())); + // 使用关联查询 + return success(goodsService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('shop:goods:list')") + @OperationLog + @ApiOperation("查询全部商品记录表") + @GetMapping() + public ApiResult> list(GoodsParam param) { +// PageParam page = new PageParam<>(param); +// page.setDefaultOrder("create_time desc"); +// return success(goodsService.list(page.getOrderWrapper())); + // 使用关联查询 + return success(goodsService.listRel(param)); + } + + @PreAuthorize("hasAuthority('shop:goods:list')") + @OperationLog + @ApiOperation("根据id查询商品记录表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + return success(goodsService.getById(id)); + // 使用关联查询 + //return success(goodsService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('shop:goods:save')") + @OperationLog + @ApiOperation("添加商品记录表") + @PostMapping() + public ApiResult save(@RequestBody Goods goods) { + // 记录当前登录用户id、租户id + User loginUser = getLoginUser(); + if (loginUser != null) { + goods.setUserId(loginUser.getUserId()); + } + if (goodsService.save(goods)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('shop:goods:update')") + @OperationLog + @ApiOperation("修改商品记录表") + @PutMapping() + public ApiResult update(@RequestBody Goods goods) { + if (goodsService.updateById(goods)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('shop:goods:remove')") + @OperationLog + @ApiOperation("删除商品记录表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (goodsService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('shop:goods:save')") + @OperationLog + @ApiOperation("批量添加商品记录表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (goodsService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('shop:goods:update')") + @OperationLog + @ApiOperation("批量修改商品记录表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(goodsService, "goods_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('shop:goods:remove')") + @OperationLog + @ApiOperation("批量删除商品记录表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (goodsService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/controller/GoodsServiceController.java b/src/main/java/com/gxwebsoft/shop/controller/GoodsServiceController.java new file mode 100644 index 0000000..3a87d4b --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/controller/GoodsServiceController.java @@ -0,0 +1,139 @@ +package com.gxwebsoft.shop.controller; + +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.shop.service.GoodsServiceService; +import com.gxwebsoft.shop.entity.GoodsService; +import com.gxwebsoft.shop.param.GoodsServiceParam; +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 2022-11-23 21:57:50 + */ +@Api(tags = "商品服务与承诺记录表管理") +@RestController +@RequestMapping("/api/shop/goods-service") +public class GoodsServiceController extends BaseController { + @Resource + private GoodsServiceService goodsServiceService; + + @PreAuthorize("hasAuthority('shop:goodsService:list')") + @OperationLog + @ApiOperation("分页查询商品服务与承诺记录表") + @GetMapping("/page") + public ApiResult> page(GoodsServiceParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time asc"); + return success(goodsServiceService.page(page, page.getWrapper())); + // 使用关联查询 + //return success(goodsServiceService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('shop:goodsService:list')") + @OperationLog + @ApiOperation("查询全部商品服务与承诺记录表") + @GetMapping() + public ApiResult> list(GoodsServiceParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(goodsServiceService.list(page.getOrderWrapper())); + // 使用关联查询 + //return success(goodsServiceService.listRel(param)); + } + + @PreAuthorize("hasAuthority('shop:goodsService:list')") + @OperationLog + @ApiOperation("根据id查询商品服务与承诺记录表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + return success(goodsServiceService.getById(id)); + // 使用关联查询 + //return success(goodsServiceService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('shop:goodsService:save')") + @OperationLog + @ApiOperation("添加商品服务与承诺记录表") + @PostMapping() + public ApiResult save(@RequestBody GoodsService goodsService) { + // 记录当前登录用户id、租户id + User loginUser = getLoginUser(); + if (loginUser != null) { + goodsService.setUserId(loginUser.getUserId()); + } + if (goodsServiceService.save(goodsService)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('shop:goodsService:update')") + @OperationLog + @ApiOperation("修改商品服务与承诺记录表") + @PutMapping() + public ApiResult update(@RequestBody GoodsService goodsService) { + if (goodsServiceService.updateById(goodsService)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('shop:goodsService:remove')") + @OperationLog + @ApiOperation("删除商品服务与承诺记录表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (goodsServiceService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('shop:goodsService:save')") + @OperationLog + @ApiOperation("批量添加商品服务与承诺记录表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (goodsServiceService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('shop:goodsService:update')") + @OperationLog + @ApiOperation("批量修改商品服务与承诺记录表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(goodsServiceService, "service_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('shop:goodsService:remove')") + @OperationLog + @ApiOperation("批量删除商品服务与承诺记录表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (goodsServiceService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/controller/MemberController.java b/src/main/java/com/gxwebsoft/shop/controller/MemberController.java new file mode 100644 index 0000000..ee4a847 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/controller/MemberController.java @@ -0,0 +1,139 @@ +package com.gxwebsoft.shop.controller; + +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.shop.service.MemberService; +import com.gxwebsoft.shop.entity.Member; +import com.gxwebsoft.shop.param.MemberParam; +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 2022-11-25 14:02:24 + */ +@Api(tags = "商城会员管理") +@RestController +@RequestMapping("/api/shop/member") +public class MemberController extends BaseController { + @Resource + private MemberService memberService; + + @PreAuthorize("hasAuthority('shop:member:list')") + @OperationLog + @ApiOperation("分页查询商城会员") + @GetMapping("/page") + public ApiResult> page(MemberParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); +// return success(memberService.page(page, page.getWrapper())); + // 使用关联查询 + return success(memberService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('shop:member:list')") + @OperationLog + @ApiOperation("查询全部商城会员") + @GetMapping() + public ApiResult> list(MemberParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); +// return success(memberService.list(page.getOrderWrapper())); + // 使用关联查询 + return success(memberService.listRel(param)); + } + + @PreAuthorize("hasAuthority('shop:member:list')") + @OperationLog + @ApiOperation("根据id查询商城会员") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + return success(memberService.getById(id)); + // 使用关联查询 + //return success(memberService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('shop:member:save')") + @OperationLog + @ApiOperation("添加商城会员") + @PostMapping() + public ApiResult save(@RequestBody Member member) { + // 记录当前登录用户id、租户id + User loginUser = getLoginUser(); + if (loginUser != null) { + member.setUserId(loginUser.getUserId()); + } + if (memberService.save(member)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('shop:member:update')") + @OperationLog + @ApiOperation("修改商城会员") + @PutMapping() + public ApiResult update(@RequestBody Member member) { + if (memberService.updateById(member)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('shop:member:remove')") + @OperationLog + @ApiOperation("删除商城会员") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (memberService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('shop:member:save')") + @OperationLog + @ApiOperation("批量添加商城会员") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (memberService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('shop:member:update')") + @OperationLog + @ApiOperation("批量修改商城会员") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(memberService, "member_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('shop:member:remove')") + @OperationLog + @ApiOperation("批量删除商城会员") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (memberService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/controller/MerchantClerkController.java b/src/main/java/com/gxwebsoft/shop/controller/MerchantClerkController.java new file mode 100644 index 0000000..bb694b7 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/controller/MerchantClerkController.java @@ -0,0 +1,147 @@ +package com.gxwebsoft.shop.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.UserService; +import com.gxwebsoft.shop.service.MerchantClerkService; +import com.gxwebsoft.shop.entity.MerchantClerk; +import com.gxwebsoft.shop.param.MerchantClerkParam; +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 2022-11-30 16:32:25 + */ +@Api(tags = "商家门店店员表管理") +@RestController +@RequestMapping("/api/shop/merchant-clerk") +public class MerchantClerkController extends BaseController { + @Resource + private MerchantClerkService merchantClerkService; + @Resource + private UserService userService; + + @PreAuthorize("hasAuthority('shop:merchantClerk:list')") + @OperationLog + @ApiOperation("分页查询商家门店店员表") + @GetMapping("/page") + public ApiResult> page(MerchantClerkParam param) { + PageParam page = new PageParam<>(param); +// page.setDefaultOrder("create_time desc"); +// return success(merchantClerkService.page(page, page.getWrapper())); + // 使用关联查询 + return success(merchantClerkService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('shop:merchantClerk:list')") + @OperationLog + @ApiOperation("查询全部商家门店店员表") + @GetMapping() + public ApiResult> list(MerchantClerkParam param) { + PageParam page = new PageParam<>(param); +// page.setDefaultOrder("create_time desc"); +// return success(merchantClerkService.list(page.getOrderWrapper())); + // 使用关联查询 + return success(merchantClerkService.listRel(param)); + } + + @PreAuthorize("hasAuthority('shop:merchantClerk:list')") + @OperationLog + @ApiOperation("根据id查询商家门店店员表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + return success(merchantClerkService.getById(id)); + // 使用关联查询 + //return success(merchantClerkService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('shop:merchantClerk:save')") + @OperationLog + @ApiOperation("添加商家门店店员表") + @PostMapping() + public ApiResult save(@RequestBody MerchantClerk merchantClerk) { + // 判断用户ID是否存在 + User user = userService.getById(merchantClerk.getUserId()); + if(user != null){ + // 防止重复 + if (merchantClerkService.count(new LambdaQueryWrapper() + .eq(MerchantClerk::getUserId, merchantClerk.getUserId())) > 0) { + return fail("该用户已被绑定"); + } + if (merchantClerkService.save(merchantClerk)) { + return success("添加成功"); + } + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('shop:merchantClerk:update')") + @OperationLog + @ApiOperation("修改商家门店店员表") + @PutMapping() + public ApiResult update(@RequestBody MerchantClerk merchantClerk) { + if (merchantClerkService.updateById(merchantClerk)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('shop:merchantClerk:remove')") + @OperationLog + @ApiOperation("删除商家门店店员表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (merchantClerkService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('shop:merchantClerk:save')") + @OperationLog + @ApiOperation("批量添加商家门店店员表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (merchantClerkService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('shop:merchantClerk:update')") + @OperationLog + @ApiOperation("批量修改商家门店店员表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(merchantClerkService, "clerk_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('shop:merchantClerk:remove')") + @OperationLog + @ApiOperation("批量删除商家门店店员表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (merchantClerkService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/controller/MerchantController.java b/src/main/java/com/gxwebsoft/shop/controller/MerchantController.java new file mode 100644 index 0000000..3ec330a --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/controller/MerchantController.java @@ -0,0 +1,214 @@ +package com.gxwebsoft.shop.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.gxwebsoft.common.core.utils.CacheClient; +import com.gxwebsoft.common.core.web.*; +import com.gxwebsoft.shop.entity.Merchant; +import com.gxwebsoft.shop.entity.MerchantWithdraw; +import com.gxwebsoft.shop.param.MerchantParam; +import com.gxwebsoft.shop.service.MerchantService; +import com.gxwebsoft.shop.service.MerchantWithdrawService; +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.RedisConstants.MERCHANT_GEO_KEY; +import static com.gxwebsoft.common.core.constants.RedisConstants.MERCHANT_KEY; + +/** + * 商户管理控制器 + * + * @author 科技小王子 + * @since 2022-11-30 15:10:54 + */ +@Api(tags = "商户管理管理") +@RestController +@RequestMapping("/api/shop/merchant") +public class MerchantController extends BaseController { + @Resource + private MerchantService merchantService; + @Resource + private CacheClient cacheClient; + @Resource + private MerchantWithdrawService merchantWithdrawService; + + @PreAuthorize("hasAuthority('shop:merchant:list')") + @ApiOperation("分页查询商户管理") + @GetMapping("/page") + public ApiResult> page(MerchantParam param) { + // 使用关联查询 + return success(merchantService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('shop:merchant:list')") + @ApiOperation("查询全部商户管理") + @GetMapping() + public ApiResult> list(MerchantParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + // 使用关联查询 + return success(merchantService.listRel(param)); + } + + @PreAuthorize("hasAuthority('shop:merchant:list')") + @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) { + if (merchantService.count(new LambdaQueryWrapper() + .eq(Merchant::getMerchantCode, merchant.getMerchantCode())) > 0) { + return fail("商户编号已存在"); + } + if (merchantService.save(merchant)) { + // 添加缓存 + String lngAndLat = merchant.getLngAndLat(); + String[] split = lngAndLat.split(","); + Double x = Double.parseDouble(split[0]); + Double y = Double.parseDouble(split[1]); + String id = merchant.getMerchantId().toString(); + cacheClient.geoAdd(MERCHANT_GEO_KEY,x,y,id); + cacheClient.set(MERCHANT_KEY.concat(":").concat(merchant.getMerchantId().toString()),merchant); + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('shop:merchant:update')") + @ApiOperation("修改商户管理") + @PutMapping() + public ApiResult update(@RequestBody Merchant merchant) { + // 超级管理员不能设为店主 + if(getLoginUser().getUserId().equals(merchant.getMerchantOwner())){ + return fail("超级管理员不能绑定为负责人！"); + } + if (merchantService.updateById(merchant)) { + // 添加缓存 + String lngAndLat = merchant.getLngAndLat(); + String[] split = lngAndLat.split(","); + Double x = Double.parseDouble(split[0]); + Double y = Double.parseDouble(split[1]); + String id = merchant.getMerchantId().toString(); + cacheClient.geoAdd(MERCHANT_GEO_KEY,x,y,id); + cacheClient.geoAdd(MERCHANT_GEO_KEY,x,y,id); + cacheClient.set(MERCHANT_KEY.concat(":").concat(merchant.getMerchantId().toString()),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)) { + list.forEach(d -> { + // 添加缓存 + String lngAndLat = d.getLngAndLat(); + String[] split = lngAndLat.split(","); + Double x = Double.parseDouble(split[0]); + Double y = Double.parseDouble(split[1]); + String id = d.getMerchantId().toString(); + cacheClient.geoAdd(MERCHANT_GEO_KEY,x,y,id); + cacheClient.geoAdd(MERCHANT_GEO_KEY,x,y,id); + cacheClient.set(MERCHANT_KEY.concat(":").concat(d.getMerchantId().toString()),d); + }); + 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)) { + // 删除缓存 + ids.forEach(id -> { + cacheClient.geoRemove(MERCHANT_GEO_KEY,id); + }); + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('shop:merchant:list')") + @ApiOperation("根据定位查询附近的商户列表") + @PostMapping("/getListByGeo") + public ApiResult> getListByGeo(@RequestBody MerchantParam param) { + return success(merchantService.listByGeo(param)); + } + + @PreAuthorize("hasAuthority('shop:merchant:list')") + @ApiOperation("提现申请") + @PostMapping("/addWithdraw") + public ApiResult addWithdraw(@RequestBody Merchant merchant) { + // 提现金额是否不足 + if(merchant.getAmount().compareTo(merchant.getMoney()) > 0){ + return fail("可提现金额不足"); + } + // 提现金额不能等于0 + if(merchant.getAmount().compareTo(BigDecimal.ZERO) == 0){ + return fail("提现金额不正确"); + } + + // 保存提现账号 + final Merchant data = new Merchant(); + data.setMerchantId(merchant.getMerchantId()); + data.setAlipayName(merchant.getAlipayName()); + data.setAlipayAccount(merchant.getAlipayAccount()); + data.setBankName(merchant.getBankName()); + data.setBankAccount(merchant.getBankAccount()); + data.setBankCard(merchant.getBankCard()); + // 扣除提现金额 + data.setMoney(merchant.getMoney().subtract(merchant.getAmount())); + // 冻结金额 + data.setFreezeMoney(merchant.getFreezeMoney().add(merchant.getAmount())); + merchantService.updateById(data); + // 记录明细 + final MerchantWithdraw withdraw = new MerchantWithdraw(); + withdraw.setUserId(merchant.getUserId()); + withdraw.setMoney(merchant.getAmount().subtract(merchant.getAmount().multiply(new BigDecimal("0.04")))); + withdraw.setPayType(merchant.getPayType()); + withdraw.setAlipayName(merchant.getAlipayName()); + withdraw.setAlipayAccount(merchant.getAlipayAccount()); + withdraw.setBankName(merchant.getBankName()); + withdraw.setBankAccount(merchant.getBankAccount()); + withdraw.setBankCard(merchant.getBankCard()); + merchantWithdrawService.save(withdraw); + + return success("已收到您的提交申请",null); + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/controller/MerchantWithdrawController.java b/src/main/java/com/gxwebsoft/shop/controller/MerchantWithdrawController.java new file mode 100644 index 0000000..045b69a --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/controller/MerchantWithdrawController.java @@ -0,0 +1,130 @@ +package com.gxwebsoft.shop.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.BatchParam; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.shop.entity.MerchantWithdraw; +import com.gxwebsoft.shop.param.MerchantWithdrawParam; +import com.gxwebsoft.shop.service.MerchantWithdrawService; +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 2022-12-02 00:41:09 + */ +@Api(tags = "商户提现记录管理") +@RestController +@RequestMapping("/api/shop/merchant-withdraw") +public class MerchantWithdrawController extends BaseController { + @Resource + private MerchantWithdrawService merchantWithdrawService; + + @PreAuthorize("hasAuthority('shop:merchantWithdraw:list')") + @OperationLog + @ApiOperation("分页查询商户提现记录") + @GetMapping("/page") + public ApiResult> page(MerchantWithdrawParam param) { + // 使用关联查询 + return success(merchantWithdrawService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('shop:merchantWithdraw:list')") + @OperationLog + @ApiOperation("查询全部商户提现记录") + @GetMapping() + public ApiResult> list(MerchantWithdrawParam param) { + return success(merchantWithdrawService.listRel(param)); + } + + @PreAuthorize("hasAuthority('shop:merchantWithdraw:list')") + @OperationLog + @ApiOperation("根据id查询商户提现记录") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + // 使用关联查询 + return success(merchantWithdrawService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('shop:merchantWithdraw:save')") + @OperationLog + @ApiOperation("添加商户提现记录") + @PostMapping() + public ApiResult save(@RequestBody MerchantWithdraw merchantWithdraw) { + // 记录当前登录用户id、租户id + User loginUser = getLoginUser(); + if (loginUser != null) { + merchantWithdraw.setUserId(loginUser.getUserId()); + } + if (merchantWithdrawService.save(merchantWithdraw)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('shop:merchantWithdraw:update')") + @OperationLog + @ApiOperation("修改商户提现记录") + @PutMapping() + public ApiResult update(@RequestBody MerchantWithdraw merchantWithdraw) { + if (merchantWithdrawService.updateById(merchantWithdraw)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('shop:merchantWithdraw:remove')") + @OperationLog + @ApiOperation("删除商户提现记录") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (merchantWithdrawService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('shop:merchantWithdraw:save')") + @OperationLog + @ApiOperation("批量添加商户提现记录") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (merchantWithdrawService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('shop:merchantWithdraw:update')") + @OperationLog + @ApiOperation("批量修改商户提现记录") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(merchantWithdrawService, "id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('shop:merchantWithdraw:remove')") + @OperationLog + @ApiOperation("批量删除商户提现记录") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (merchantWithdrawService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/controller/OrderAddressController.java b/src/main/java/com/gxwebsoft/shop/controller/OrderAddressController.java new file mode 100644 index 0000000..ff43f67 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/controller/OrderAddressController.java @@ -0,0 +1,140 @@ +package com.gxwebsoft.shop.controller; + +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.shop.service.OrderAddressService; +import com.gxwebsoft.shop.entity.OrderAddress; +import com.gxwebsoft.shop.param.OrderAddressParam; +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 2022-12-02 21:21:10 + */ +@Api(tags = "订单收货地址记录表管理") +@RestController +@RequestMapping("/api/shop/order-address") +public class OrderAddressController extends BaseController { + @Resource + private OrderAddressService orderAddressService; + + @PreAuthorize("hasAuthority('shop:orderAddress:list')") + @OperationLog + @ApiOperation("分页查询订单收货地址记录表") + @GetMapping("/page") + public ApiResult> page(OrderAddressParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(orderAddressService.page(page, page.getWrapper())); + // 使用关联查询 + //return success(orderAddressService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('shop:orderAddress:list')") + @OperationLog + @ApiOperation("查询全部订单收货地址记录表") + @GetMapping() + public ApiResult> list(OrderAddressParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(orderAddressService.list(page.getOrderWrapper())); + // 使用关联查询 + //return success(orderAddressService.listRel(param)); + } + + @PreAuthorize("hasAuthority('shop:orderAddress:list')") + @OperationLog + @ApiOperation("根据id查询订单收货地址记录表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + return success(orderAddressService.getById(id)); + // 使用关联查询 + //return success(orderAddressService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('shop:orderAddress:save')") + @OperationLog + @ApiOperation("添加订单收货地址记录表") + @PostMapping() + public ApiResult save(@RequestBody OrderAddress orderAddress) { + // 记录当前登录用户id、租户id、商户编号 + User loginUser = getLoginUser(); + if (loginUser != null) { + orderAddress.setUserId(loginUser.getUserId()); + orderAddress.setMerchantCode(getMerchantCode()); + } + if (orderAddressService.save(orderAddress)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('shop:orderAddress:update')") + @OperationLog + @ApiOperation("修改订单收货地址记录表") + @PutMapping() + public ApiResult update(@RequestBody OrderAddress orderAddress) { + if (orderAddressService.updateById(orderAddress)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('shop:orderAddress:remove')") + @OperationLog + @ApiOperation("删除订单收货地址记录表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (orderAddressService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('shop:orderAddress:save')") + @OperationLog + @ApiOperation("批量添加订单收货地址记录表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (orderAddressService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('shop:orderAddress:update')") + @OperationLog + @ApiOperation("批量修改订单收货地址记录表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(orderAddressService, "order_address_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('shop:orderAddress:remove')") + @OperationLog + @ApiOperation("批量删除订单收货地址记录表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (orderAddressService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/controller/OrderController.java b/src/main/java/com/gxwebsoft/shop/controller/OrderController.java new file mode 100644 index 0000000..985e7ba --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/controller/OrderController.java @@ -0,0 +1,360 @@ +package com.gxwebsoft.shop.controller; + +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 com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.gxwebsoft.apps.entity.BcAgent; +import com.gxwebsoft.apps.entity.EquipmentGoods; +import com.gxwebsoft.apps.entity.EquipmentOrderGoods; +import com.gxwebsoft.apps.param.BcAgentParam; +import com.gxwebsoft.apps.service.BcAgentService; +import com.gxwebsoft.apps.service.EquipmentGoodsService; +import com.gxwebsoft.apps.service.EquipmentOrderGoodsService; +import com.gxwebsoft.apps.service.EquipmentService; +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.service.UserService; +import com.gxwebsoft.shop.entity.Order; +import com.gxwebsoft.shop.entity.UserReferee; +import com.gxwebsoft.shop.param.OrderGoodsParam; +import com.gxwebsoft.shop.param.OrderParam; +import com.gxwebsoft.shop.service.OrderGoodsService; +import com.gxwebsoft.shop.service.OrderService; +import com.gxwebsoft.shop.service.UserRefereeService; +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.imageio.ImageIO; +import java.awt.image.BufferedImage; +import java.io.IOException; +import java.net.URL; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; + +import static com.gxwebsoft.common.core.constants.OrderConstants.ORDER_STATUS_DOING; +import static com.gxwebsoft.common.core.constants.OrderConstants.PAY_STATUS_SUCCESS; + +/** + * 订单记录表控制器 + * + * @author WebSoft + * @since 2022-11-16 11:25:58 + */ +@Api(tags = "订单记录表管理") +@RestController +@RequestMapping("/api/shop/order") +public class OrderController extends BaseController { + @Resource + private OrderService orderService; + @Resource + private EquipmentGoodsService equipmentGoodsService; + @Resource + private EquipmentService equipmentService; + @Resource + private OrderGoodsService orderGoodsService; + @Resource + private EquipmentOrderGoodsService equipmentOrderGoodsService; + @Resource + private UserRefereeService userRefereeService; + @Resource + private UserService userService; + @Resource + private BcAgentService bcAgentService; + + @PreAuthorize("hasAuthority('shop:order:list')") + @OperationLog + @ApiOperation("分页查询订单记录表") + @GetMapping("/page") + public ApiResult> page(OrderParam param) { + // 搜索条件 + if (getMerchantCode() != null) { + param.setMerchantCode(getMerchantCode()); + } + // 云芯威项目查询关联设备 + if(getTenantId().equals(6)){ + // 查询订单的关联商品 + List list = orderService.listRel(param); + // 查询订单的设备 + for (Order order : list) { + final OrderGoodsParam orderGoodsParam = new OrderGoodsParam(); + orderGoodsParam.setOrderId(order.getOrderId()); + order.setGoodsList(orderGoodsService.listRel(orderGoodsParam)); + order.setEquipmentGoods(equipmentOrderGoodsService.getOne(new LambdaQueryWrapper().eq(EquipmentOrderGoods::getOrderId,order.getOrderId()))); + order.setEquipment(equipmentService.getById(order.getEquipmentId())); + } + PageParam page = new PageParam<>(param); + return success(new PageResult<>(list, page.getTotal())); + } + // 贵港自然资源报餐 + if(getTenantId().equals(10048) && getAppId() != null){ + param.setUserId(getLoginUserId()); + final Boolean agent = param.getAgent(); + if (agent != null) { + final BcAgentParam bcAgentParam = new BcAgentParam(); + bcAgentParam.setParentId(getLoginUserId()); + bcAgentParam.setLimit(100L); + final PageResult result = bcAgentService.pageRel(bcAgentParam); + final Set collect = result.getList().stream().map(BcAgent::getUserId).collect(Collectors.toSet()); + param.setUserId(null); + param.setUserIds(collect); + } + return success(orderService.pageRel(param)); + } + + // 使用关联查询 + return success(orderService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('shop:order:list')") + @OperationLog + @ApiOperation("查询全部订单记录表") + @GetMapping() + public ApiResult> list(OrderParam param) { + // 使用关联查询 + return success(orderService.listRel(param)); + } + + @PreAuthorize("hasAuthority('shop:order:list')") + @OperationLog + @ApiOperation("按订单集查询") + @PostMapping("/listByIds") + public ApiResult> listByIds(@RequestBody List orderIds) { + System.out.println("按订单集查询 = " + orderIds); + if(orderIds.size() > 0){ + return success(orderService.listByIds(orderIds)); + } + return fail("订单不存在",null); + + +// +// +// Integer userId = getLoginUserId(); +// // 代报餐情况(未完成) +// final Order order = orderService.getById(orderIds.get(0)); +// // 订单不存在 +// if (order == null) { +// return fail("订单不存在",null); +// } +// +// if (!order.getUserId().equals(userId)) { +// userId = order.getUserId(); +// final List list1 = orderService.list(new LambdaQueryWrapper().in(Order::getOrderId,orderIds).eq(Order::getUserId, userId).eq(Order::getPayStatus,PAY_STATUS_NO_PAY)); +// final Set collect = list1.stream().map(Order::getOrderId).collect(Collectors.toSet()); +// return success(orderService.listByIds(collect)); +// } +// +// final List list1 = orderService.list(new LambdaQueryWrapper().eq(Order::getUserId, userId).eq(Order::getPayStatus,PAY_STATUS_NO_PAY)); +// final List collect = list1.stream().map(Order::getOrderId).collect(Collectors.toList()); +// if (CollectionUtils.isEmpty(collect)) { +// return fail("订单不存在2",null); +// } +// // 返回待支付订单 +// return success(orderService.listByIds(collect)); + } + + @PreAuthorize("hasAuthority('shop:order:list')") + @OperationLog + @ApiOperation("临时报餐订单") + @PostMapping("/getByTemporary") + public ApiResult> getByTemporary(@RequestBody OrderParam order) { + final List list = orderService.listRel(order); + + // 是否查询订单商品 + if(order.getShowGoodsList()){ + list.forEach(d->{ + final OrderGoodsParam ogp = new OrderGoodsParam(); + ogp.setOrderId(d.getOrderId()); + ogp.setTemporary(1); + d.setGoodsList(orderGoodsService.listRel(ogp)); + }); + } + // 返回待支付订单 + return success(list); + } + + @PreAuthorize("hasAuthority('shop:order:list')") + @OperationLog + @ApiOperation("根据id查询订单记录表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + // 使用关联查询 + Order order = orderService.getByIdRel(id); + // 云芯威关联设备查询 + if (!order.getGoodsId().equals(0) || !order.getEquipmentId().equals(0)) { + order.setEquipmentGoods(equipmentOrderGoodsService.getOne(new LambdaQueryWrapper().eq(EquipmentOrderGoods::getOrderId,order.getOrderId()))); + order.setEquipment(equipmentService.getById(order.getEquipmentId())); + } + return success(order); + } + + @PreAuthorize("hasAuthority('shop:order:save')") + @OperationLog + @ApiOperation("添加订单记录表") + @PostMapping() + public ApiResult save(@RequestBody Order order) { + // 记录当前登录用户id、租户id + User loginUser = getLoginUser(); + if (loginUser != null) { + order.setUserId(loginUser.getUserId()); + } + if (orderService.save(order)) { + // 云芯威BMS + if (order.getTenantId().equals(6)) { + final EquipmentGoods eg = equipmentGoodsService.getById(order.getOrderSourceId()); + eg.setOrderId(order.getOrderId()); + // 添加订单商品 + final EquipmentOrderGoods oeg = new EquipmentOrderGoods(); + oeg.setOrderId(order.getOrderId()); + oeg.setGoodsName(eg.getGoodsName()); + oeg.setEquipmentCategory(eg.getEquipmentCategory()); + oeg.setImage(eg.getImage()); + oeg.setCategoryId(eg.getCategoryId()); + oeg.setBatteryModel(eg.getBatteryModel()); + oeg.setSellingPoint(eg.getSellingPoint()); + oeg.setStockTotal(eg.getStockTotal()); + oeg.setContent(eg.getContent()); + oeg.setBatteryPrice(eg.getBatteryPrice()); + oeg.setBatteryRent(eg.getBatteryRent()); + oeg.setBatteryInsurance(eg.getBatteryInsurance()); + oeg.setBatteryDeposit(eg.getBatteryDeposit()); + oeg.setDownPayment(eg.getDownPayment()); + oeg.setPeriods(eg.getPeriods()); + oeg.setRepayment(eg.getRepayment()); + oeg.setServiceCharges(eg.getServiceCharges()); + oeg.setPeriodsType(eg.getPeriodsType()); + oeg.setUserId(eg.getUserId()); + oeg.setComments(eg.getComments()); + oeg.setStatus(eg.getStatus()); + oeg.setMerchantCode(eg.getMerchantCode()); + oeg.setTenantId(eg.getTenantId()); + + equipmentOrderGoodsService.saveOrUpdate(oeg); + + // 添加推荐人关系 + if (order.getDealerId() != null) { + final User dealer = userService.getById(order.getDealerId()); + if(dealer == null){ + return fail("推荐人的用户ID不存在"); + } + final UserReferee referee = new UserReferee(); + referee.setDealerId(order.getDealerId()); + referee.setUserId(getLoginUserId()); + userRefereeService.save(referee); + } + } + // 是否存入星期值(10048) + if(order.getDeliveryTime() != null){ + order.setWeek(DateUtil.dayOfWeek(order.getDeliveryTime()) - 1); + } + return success("添加成功",order); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('shop:order:update')") + @OperationLog + @ApiOperation("修改订单记录表") + @PutMapping() + public ApiResult update(@RequestBody Order order) { + if (orderService.updateById(order)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('shop:order:remove')") + @OperationLog + @ApiOperation("删除订单记录表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (orderService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('shop:order:save')") + @OperationLog + @ApiOperation("批量添加订单记录表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (orderService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('shop:order:update')") + @OperationLog + @ApiOperation("批量修改订单记录表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(orderService, "order_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('shop:order:remove')") + @OperationLog + @ApiOperation("批量删除订单记录表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (orderService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @ApiOperation("支付成功") + @PostMapping("/setPayStatus") + public ApiResult setPayStatus(@RequestBody Order order){ + if (orderService.updateById(order)) { + return success("设置成功"); + } + return fail("设置失败"); + } + + @PreAuthorize("hasAuthority('shop:order:list')") + @OperationLog + @ApiOperation("生成核销付款码（二维码）") + @GetMapping("/generateQrCode") + public ApiResult generateQrCode(OrderParam param) throws IOException { + // 查询当天的报餐信息 + param.setUserId(getLoginUserId()); + param.setDeliveryTime(DateUtil.beginOfDay(DateUtil.date()).toString()); + param.setOrderStatus(ORDER_STATUS_DOING); + param.setPayStatus(PAY_STATUS_SUCCESS); + param.setDeleted(0); + final List list = orderService.listRel(param); + if(list.size() == 0){ + return fail("今日无报餐记录"); + } + final Order order = list.get(0); + // LOGO URL地址 + String logoUrl = "https://file.wsdns.cn/20230430/6fa31aca3b0d47af98a149cf2dd26a4f.jpeg"; + // 二维码生成图片保存路径 + String filePath = "/www/wwwroot/file.ws/file/qrcode/" + getLoginUserId() + "/payQrCode.jpg"; + // 二维码访问路径 + String qrcodeUrl = "https://file.gxwebsoft.com/qrcode/" + getLoginUserId() + "/payQrCode.jpg" + "?v=" + DateUtil.current(); + // 二维码内容 + final String orderNo = order.getOrderNo().toString(); + // 将URL转为BufferedImage + BufferedImage bufferedImage = ImageIO.read(new URL(logoUrl)); + // 生成二维码 + QrConfig config = new QrConfig(300, 300); + // 设置边距，既二维码和背景之间的边距 + config.setMargin(1); + // 附带小logo + config.setImg(bufferedImage); + QrCodeUtil.generate(orderNo, config, FileUtil.file(filePath)); + return success("请求成功",qrcodeUrl); + } +} diff --git a/src/main/java/com/gxwebsoft/shop/controller/OrderGoodsController.java b/src/main/java/com/gxwebsoft/shop/controller/OrderGoodsController.java new file mode 100644 index 0000000..890f75d --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/controller/OrderGoodsController.java @@ -0,0 +1,133 @@ +package com.gxwebsoft.shop.controller; + +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.common.system.entity.User; +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.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 2022-12-09 17:15:31 + */ +@Api(tags = "订单商品记录表管理") +@RestController +@RequestMapping("/api/shop/order-goods") +public class OrderGoodsController extends BaseController { + @Resource + private OrderGoodsService orderGoodsService; + + @PreAuthorize("hasAuthority('shop:orderGoods:list')") + @OperationLog + @ApiOperation("分页查询订单商品记录表") + @GetMapping("/page") + public ApiResult> page(OrderGoodsParam param) { + // 使用关联查询 + return success(orderGoodsService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('shop:orderGoods:list')") + @OperationLog + @ApiOperation("查询全部订单商品记录表") + @GetMapping() + public ApiResult> list(OrderGoodsParam param) { + // 使用关联查询 + return success(orderGoodsService.listRel(param)); + } + + @PreAuthorize("hasAuthority('shop:orderGoods:list')") + @OperationLog + @ApiOperation("根据id查询订单商品记录表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + // 使用关联查询 + return success(orderGoodsService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('shop:orderGoods:save')") + @OperationLog + @ApiOperation("添加订单商品记录表") + @PostMapping() + public ApiResult save(@RequestBody OrderGoods orderGoods) { + // 记录当前登录用户id、租户id、商户编号 + User loginUser = getLoginUser(); + if (loginUser != null) { + orderGoods.setUserId(loginUser.getUserId()); + orderGoods.setMerchantCode(getMerchantCode()); + } + if (orderGoodsService.save(orderGoods)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('shop:orderGoods:update')") + @OperationLog + @ApiOperation("修改订单商品记录表") + @PutMapping() + public ApiResult update(@RequestBody OrderGoods orderGoods) { + if (orderGoodsService.updateById(orderGoods)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('shop:orderGoods:remove')") + @OperationLog + @ApiOperation("删除订单商品记录表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (orderGoodsService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('shop:orderGoods:save')") + @OperationLog + @ApiOperation("批量添加订单商品记录表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (orderGoodsService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('shop:orderGoods:update')") + @OperationLog + @ApiOperation("批量修改订单商品记录表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(orderGoodsService, "order_goods_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('shop:orderGoods:remove')") + @OperationLog + @ApiOperation("批量删除订单商品记录表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (orderGoodsService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/controller/OrderRefundAddressController.java b/src/main/java/com/gxwebsoft/shop/controller/OrderRefundAddressController.java new file mode 100644 index 0000000..aa72ff0 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/controller/OrderRefundAddressController.java @@ -0,0 +1,139 @@ +package com.gxwebsoft.shop.controller; + +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.shop.service.OrderRefundAddressService; +import com.gxwebsoft.shop.entity.OrderRefundAddress; +import com.gxwebsoft.shop.param.OrderRefundAddressParam; +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-05-18 13:09:51 + */ +@Api(tags = "售后单退货地址记录表管理") +@RestController +@RequestMapping("/api/shop/order-refund-address") +public class OrderRefundAddressController extends BaseController { + @Resource + private OrderRefundAddressService orderRefundAddressService; + + @PreAuthorize("hasAuthority('shop:orderRefundAddress:list')") + @OperationLog + @ApiOperation("分页查询售后单退货地址记录表") + @GetMapping("/page") + public ApiResult> page(OrderRefundAddressParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(orderRefundAddressService.page(page, page.getWrapper())); + // 使用关联查询 + //return success(orderRefundAddressService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('shop:orderRefundAddress:list')") + @OperationLog + @ApiOperation("查询全部售后单退货地址记录表") + @GetMapping() + public ApiResult> list(OrderRefundAddressParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(orderRefundAddressService.list(page.getOrderWrapper())); + // 使用关联查询 + //return success(orderRefundAddressService.listRel(param)); + } + + @PreAuthorize("hasAuthority('shop:orderRefundAddress:list')") + @OperationLog + @ApiOperation("根据id查询售后单退货地址记录表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + return success(orderRefundAddressService.getById(id)); + // 使用关联查询 + //return success(orderRefundAddressService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('shop:orderRefundAddress:save')") + @OperationLog + @ApiOperation("添加售后单退货地址记录表") + @PostMapping() + public ApiResult save(@RequestBody OrderRefundAddress orderRefundAddress) { + // 记录当前登录用户id + User loginUser = getLoginUser(); + if (loginUser != null) { + orderRefundAddress.setUserId(loginUser.getUserId()); + } + if (orderRefundAddressService.save(orderRefundAddress)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('shop:orderRefundAddress:update')") + @OperationLog + @ApiOperation("修改售后单退货地址记录表") + @PutMapping() + public ApiResult update(@RequestBody OrderRefundAddress orderRefundAddress) { + if (orderRefundAddressService.updateById(orderRefundAddress)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('shop:orderRefundAddress:remove')") + @OperationLog + @ApiOperation("删除售后单退货地址记录表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (orderRefundAddressService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('shop:orderRefundAddress:save')") + @OperationLog + @ApiOperation("批量添加售后单退货地址记录表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (orderRefundAddressService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('shop:orderRefundAddress:update')") + @OperationLog + @ApiOperation("批量修改售后单退货地址记录表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(orderRefundAddressService, "id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('shop:orderRefundAddress:remove')") + @OperationLog + @ApiOperation("批量删除售后单退货地址记录表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (orderRefundAddressService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/controller/OrderRefundController.java b/src/main/java/com/gxwebsoft/shop/controller/OrderRefundController.java new file mode 100644 index 0000000..fc66a55 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/controller/OrderRefundController.java @@ -0,0 +1,151 @@ +package com.gxwebsoft.shop.controller; + +import com.gxwebsoft.apps.entity.Equipment; +import com.gxwebsoft.apps.service.EquipmentService; +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.shop.entity.Order; +import com.gxwebsoft.shop.service.OrderRefundService; +import com.gxwebsoft.shop.entity.OrderRefund; +import com.gxwebsoft.shop.param.OrderRefundParam; +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.shop.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.util.List; + +import static com.gxwebsoft.common.core.constants.OrderConstants.RECEIPT_STATUS_RETURN; + +/** + * 售后单记录表控制器 + * + * @author 科技小王子 + * @since 2023-05-18 13:09:51 + */ +@Api(tags = "售后单记录表管理") +@RestController +@RequestMapping("/api/shop/order-refund") +public class OrderRefundController extends BaseController { + @Resource + private OrderRefundService orderRefundService; + @Resource + private OrderService orderService; + @Resource + private EquipmentService equipmentService; + + @PreAuthorize("hasAuthority('shop:orderRefund:list')") + @OperationLog + @ApiOperation("分页查询售后单记录表") + @GetMapping("/page") + public ApiResult> page(OrderRefundParam param) { + // 使用关联查询 + return success(orderRefundService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('shop:orderRefund:list')") + @OperationLog + @ApiOperation("查询全部售后单记录表") + @GetMapping() + public ApiResult> list(OrderRefundParam param) { + // 使用关联查询 + return success(orderRefundService.listRel(param)); + } + + @PreAuthorize("hasAuthority('shop:orderRefund:list')") + @OperationLog + @ApiOperation("根据id查询售后单记录表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + // 使用关联查询 + return success(orderRefundService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('shop:orderRefund:save')") + @OperationLog + @ApiOperation("添加售后单记录表") + @PostMapping() + public ApiResult save(@RequestBody OrderRefund orderRefund) { + // 记录当前登录用户id + User loginUser = getLoginUser(); + if (loginUser != null) { + orderRefund.setUserId(loginUser.getUserId()); + } + if (orderRefundService.save(orderRefund)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('shop:orderRefund:update')") + @OperationLog + @ApiOperation("修改售后单记录表") + @PutMapping() + public ApiResult update(@RequestBody OrderRefund orderRefund) { + if (orderRefundService.updateById(orderRefund)) { + if(orderRefund.getTenantId().equals(6)){ + final Integer orderId = orderRefund.getOrderId(); + final Order order = orderService.getById(orderId); + System.out.println("order = " + order); + order.setReceiptStatus(RECEIPT_STATUS_RETURN); + final Equipment equipment = equipmentService.getById(order.getEquipmentId()); + equipment.setUserId(0); + equipmentService.updateById(equipment); + } + return success("操作成功"); + } + return fail("退租失败"); + } + + @PreAuthorize("hasAuthority('shop:orderRefund:remove')") + @OperationLog + @ApiOperation("删除售后单记录表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (orderRefundService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('shop:orderRefund:save')") + @OperationLog + @ApiOperation("批量添加售后单记录表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (orderRefundService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('shop:orderRefund:update')") + @OperationLog + @ApiOperation("批量修改售后单记录表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(orderRefundService, "order_refund_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('shop:orderRefund:remove')") + @OperationLog + @ApiOperation("批量删除售后单记录表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (orderRefundService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/controller/OrderRenewController.java b/src/main/java/com/gxwebsoft/shop/controller/OrderRenewController.java new file mode 100644 index 0000000..b1372b8 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/controller/OrderRenewController.java @@ -0,0 +1,140 @@ +package com.gxwebsoft.shop.controller; + +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.shop.service.OrderRenewService; +import com.gxwebsoft.shop.entity.OrderRenew; +import com.gxwebsoft.shop.param.OrderRenewParam; +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-04-13 10:34:35 + */ +@Api(tags = "续费订单记录表管理") +@RestController +@RequestMapping("/api/shop/order-renew") +public class OrderRenewController extends BaseController { + @Resource + private OrderRenewService orderRenewService; + + @PreAuthorize("hasAuthority('shop:orderRenew:list')") + @OperationLog + @ApiOperation("分页查询续费订单记录表") + @GetMapping("/page") + public ApiResult> page(OrderRenewParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(orderRenewService.page(page, page.getWrapper())); + // 使用关联查询 + //return success(orderRenewService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('shop:orderRenew:list')") + @OperationLog + @ApiOperation("查询全部续费订单记录表") + @GetMapping() + public ApiResult> list(OrderRenewParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(orderRenewService.list(page.getOrderWrapper())); + // 使用关联查询 + //return success(orderRenewService.listRel(param)); + } + + @PreAuthorize("hasAuthority('shop:orderRenew:list')") + @OperationLog + @ApiOperation("根据id查询续费订单记录表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + return success(orderRenewService.getById(id)); + // 使用关联查询 + //return success(orderRenewService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('shop:orderRenew:save')") + @OperationLog + @ApiOperation("添加续费订单记录表") + @PostMapping() + public ApiResult save(@RequestBody OrderRenew orderRenew) { + // 记录当前登录用户id、租户id、商户编号 + User loginUser = getLoginUser(); + if (loginUser != null) { + orderRenew.setUserId(loginUser.getUserId()); + orderRenew.setMerchantCode(getMerchantCode()); + } + if (orderRenewService.save(orderRenew)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('shop:orderRenew:update')") + @OperationLog + @ApiOperation("修改续费订单记录表") + @PutMapping() + public ApiResult update(@RequestBody OrderRenew orderRenew) { + if (orderRenewService.updateById(orderRenew)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('shop:orderRenew:remove')") + @OperationLog + @ApiOperation("删除续费订单记录表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (orderRenewService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('shop:orderRenew:save')") + @OperationLog + @ApiOperation("批量添加续费订单记录表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (orderRenewService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('shop:orderRenew:update')") + @OperationLog + @ApiOperation("批量修改续费订单记录表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(orderRenewService, "order_renew_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('shop:orderRenew:remove')") + @OperationLog + @ApiOperation("批量删除续费订单记录表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (orderRenewService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/controller/PaymentController.java b/src/main/java/com/gxwebsoft/shop/controller/PaymentController.java new file mode 100644 index 0000000..8721f97 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/controller/PaymentController.java @@ -0,0 +1,539 @@ +package com.gxwebsoft.shop.controller; + +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; +import com.alibaba.fastjson.JSONObject; +import com.alipay.api.AlipayApiException; +import com.alipay.api.AlipayConstants; +import com.alipay.api.DefaultAlipayClient; +import com.alipay.api.internal.util.AlipayEncrypt; +import com.alipay.api.internal.util.AlipaySignature; +import com.alipay.api.request.AlipayTradeCreateRequest; +import com.alipay.api.request.AlipayTradeQueryRequest; +import com.alipay.api.response.AlipayTradeCreateResponse; +import com.alipay.api.response.AlipayTradeQueryResponse; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.gxwebsoft.apps.entity.BcTemporary; +import com.gxwebsoft.apps.param.BcTemporaryParam; +import com.gxwebsoft.apps.service.BcTemporaryService; +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.utils.AlipayConfigUtil; +import com.gxwebsoft.common.core.web.*; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.common.system.service.OperationRecordService; +import com.gxwebsoft.common.system.service.UserService; +import com.gxwebsoft.shop.entity.Order; +import com.gxwebsoft.shop.entity.Payment; +import com.gxwebsoft.shop.entity.UserBalanceLog; +import com.gxwebsoft.shop.param.PaymentParam; +import com.gxwebsoft.shop.service.OrderService; +import com.gxwebsoft.shop.service.PaymentService; +import com.gxwebsoft.shop.service.UserBalanceLogService; +import com.gxwebsoft.shop.service.UserOauthService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiOperation; +import org.springframework.core.env.Environment; +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.Date; +import java.util.List; +import java.util.Map; + +import static com.gxwebsoft.common.core.constants.BalanceConstants.BALANCE_USE; +import static com.gxwebsoft.common.core.constants.OrderConstants.*; + +/** + * 商城支付方式记录表控制器 + * + * @author 科技小王子 + * @since 2022-12-15 19:11:07 + */ +@Api(tags = "商城支付方式记录表管理") +@RestController +@RequestMapping("/api/shop/payment") +public class PaymentController extends BaseController { + @Resource + private PaymentService paymentService; + @Resource + private OrderService orderService; + @Resource + private Environment config; + @Resource + private ConfigProperties pathConfig; + @Resource + private OperationRecordService operationRecordService; + @Resource + private UserOauthService userOauthService; + @Resource + private AlipayConfigUtil alipayConfig; + @Resource + private UserService userService; + @Resource + private UserBalanceLogService userBalanceLogService; + @Resource + private BcTemporaryService bcTemporaryService; + + @PreAuthorize("hasAuthority('shop:payment:list')") + @ApiOperation("分页查询商城支付方式记录表") + @GetMapping("/page") + public ApiResult> page(PaymentParam param) { + PageParam page = new PageParam<>(param); + return success(paymentService.page(page, page.getWrapper())); + // 使用关联查询 + //return success(paymentService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('shop:payment:list')") + @ApiOperation("查询全部商城支付方式记录表") + @GetMapping() + public ApiResult> list(PaymentParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(paymentService.list(page.getOrderWrapper())); + // 使用关联查询 + //return success(paymentService.listRel(param)); + } + + @PreAuthorize("hasAuthority('shop:payment:list')") + @ApiOperation("根据id查询商城支付方式记录表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + return success(paymentService.getById(id)); + // 使用关联查询 + //return success(paymentService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('shop:payment:save')") + @ApiOperation("添加商城支付方式记录表") + @PostMapping() + public ApiResult save(@RequestBody Payment payment) { + if (paymentService.count(new LambdaQueryWrapper() + .eq(Payment::getMethod, payment.getMethod())) > 0) { + return fail("该支付方式已存在"); + } + if (paymentService.save(payment)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('shop:payment:update')") + @OperationLog + @ApiOperation("修改商城支付方式记录表") + @PutMapping() + public ApiResult update(@RequestBody Payment payment) { + if (paymentService.updateById(payment)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('shop:payment:remove')") + @OperationLog + @ApiOperation("删除商城支付方式记录表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (paymentService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('shop:payment:save')") + @OperationLog + @ApiOperation("批量添加商城支付方式记录表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (paymentService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('shop:payment:update')") + @OperationLog + @ApiOperation("批量修改商城支付方式记录表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(paymentService, "payment_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('shop:payment:remove')") + @OperationLog + @ApiOperation("批量删除商城支付方式记录表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (paymentService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @ApiOperation("支付宝手机号码") + @PostMapping("/getPhoneNumber") + public ApiResult getPhoneNumber(@RequestBody Map params) { + final String encryptedData = params.get("encryptedData"); + final String tenantId = params.get("tenantId"); + // 支付宝配置信息 + JSONObject config = alipayConfig.payment(Integer.valueOf(tenantId)); + + //1. 获取验签和解密所需要的参数 + JSONObject jsonObject =JSONObject.parseObject(encryptedData); + String content = jsonObject.getString("response"); + String sign = jsonObject.getString("sign"); + String signType = "RSA2"; + String charset = "UTF-8"; + String encryptType = "AES"; + String alipayCertPublicKey = pathConfig.getUploadPath() + "file" + config.getString("alipayCertPublicKey"); + boolean isDataEncrypted = !content.startsWith("{"); + boolean signVerified = false; + //2. 验签 + String signContent = content; + String signVeriKey = ""; // 支付宝公钥 + String decryptKey = config.getString("decryptKey"); // 加解密密钥 +// System.out.println("decryptKey = " + decryptKey); +// System.out.println(content); +// System.out.println(sign); +// System.out.println(alipayCertPublicKey); +// System.out.println(charset); +// System.out.println(signType); +// System.out.println(isDataEncrypted); + if (isDataEncrypted) { + signContent = "\"" + signContent + "\""; + } try { + //验签方法 + signVerified = AlipaySignature.rsaCertCheck(signContent, sign, alipayCertPublicKey, charset, signType); + } catch (AlipayApiException e) { + // 验签异常, 日志 + } if (!signVerified) { + //验签不通过（异常或者报文被篡改），终止流程（不需要做解密） + return fail("验签失败"); + } + //3. 解密 + String plainData = null; + if (isDataEncrypted) { + try { + plainData = AlipayEncrypt.decryptContent(content, encryptType, decryptKey, charset); + } catch (AlipayApiException e) { + //解密异常, 记录日志 + return fail("解密异常"); + }} else { + plainData = content; + } + return success("获取成功",plainData); + } + + @ApiModelProperty("支付宝小程序支付") + @GetMapping("/mp-alipay/{id}") + public ApiResult mpAlipay(@PathVariable("id") Integer id) throws AlipayApiException { + // 验证签名 + isCheckSign(); + // 订单数据 + Order order = orderService.getByIdRel(id); + // 实例化客户端 + DefaultAlipayClient alipayClient = alipayConfig.alipayClient(order.getTenantId()); + try { + AlipayTradeCreateRequest request = new AlipayTradeCreateRequest(); + // 配置公共请求参数 + request.setNotifyUrl(pathConfig.getServerUrl() + "/shop/payment/mp-alipay/notify"); +// request.setNotifyUrl("https://454k72r798.goho.co/api/shop/payment/mp-alipay/notify"); + request.setReturnUrl(null); + // 配置业务参数 + JSONObject bizContent = new JSONObject(); + System.out.println("bizContent = " + order); + bizContent.put("out_trade_no", order.getOrderNo()); + bizContent.put("total_amount", order.getPayPrice()); + bizContent.put("subject", order.getMerchantName()); + // 拿不到手机号码？？ + bizContent.put("buyer_id", userOauthService.getOauthIdByUserId(order.getUserId(), "MP-ALIPAY")); + request.setBizContent(bizContent.toString()); + //SDK 已经封装掉了公共参数，这里只需要传入业务参数。 + AlipayTradeCreateResponse response = alipayClient.certificateExecute(request); + String trade_no = response.getTradeNo();// 获取返回的tradeNO。 + return success("支付成功", trade_no); + } catch (AlipayApiException e) { + e.printStackTrace(); + throw new RuntimeException(); + } + } + + @ApiModelProperty("异步通知") + @OperationLog + @PostMapping("/mp-alipay/notify") + public String alipayNotify(@RequestParam Map params) throws AlipayApiException { + System.out.println("异步处理>>>>"); + System.out.println("params = " + params); + String outTradeNo = params.get("out_trade_no"); + Order order = orderService.getByOutTradeNo(outTradeNo); + if(order == null){ + throw new BusinessException("订单不存在"); + } + final JSONObject config = alipayConfig.payment(order.getTenantId()); + // 生成环境证书路径 + String alipayCertPublicKey = pathConfig.getUploadPath() + "file" + config.getString("alipayCertPublicKey"); + // TODO 验签成功后，按照支付结果异步通知中的描述，对支付结果中的业务内容进行二次校验，校验成功后在response中返回success并继续商户自身业务处理，校验失败返回failure + boolean flag = AlipaySignature.rsaCertCheckV1(params, alipayCertPublicKey, AlipayConstants.CHARSET_UTF8, AlipayConstants.SIGN_TYPE_RSA2); + System.out.println("flag>>>>>>>>>>>>>>>>>>>>>>>"); + System.out.println(flag); + // 处理订单业务 + if (flag) { + final String tradeStatus = params.get("trade_status"); + final String receipt_amount = params.get("receipt_amount"); + final String payPrice = order.getPayPrice().toString(); + final String trade_no = params.get("trade_no"); + final String subject = params.get("subject"); + + // 1. 验证appId是否一致 + final String app_id = params.get("app_id"); + if(!config.getString("alipayAppId").equals(app_id)){ + System.out.println("支付宝appId不一致 = " + app_id); + throw new BusinessException("支付宝appId不一致"); + } + // 2. 订单金额 + if(!payPrice.equals(receipt_amount)){ + System.out.println("订单金额是不一致 = " + receipt_amount); + throw new BusinessException("订单金额是不一致"); + } + // 3. 判断交易状态 + if(!"TRADE_SUCCESS".equals(tradeStatus)){ + System.out.println("支付失败 = " + tradeStatus); + throw new BusinessException("支付失败"); + } + // 4. 修改支付状态 + order.setPayStatus(PAY_STATUS_SUCCESS); + order.setPayMethod(PAY_METHOD_ALIPAY); + order.setReceiptAmount(new BigDecimal(receipt_amount)); + order.setPayTime(DateUtil.date()); + order.setTradeId(trade_no); + order.setSubject(subject); + System.out.println("order2 = " + order); + final boolean b = orderService.updateByIdRel(order); + System.out.println("bsss = " + b); + return "success"; + } + // TODO 验签失败则记录异常日志，并在response中返回failure. + return "failure"; + } + + @OperationLog + @ApiModelProperty("余额支付") + @GetMapping("/balance/{id}") + @Transactional(rollbackFor = {Exception.class}) + public ApiResult balance(@PathVariable("id") Integer id) throws AlipayApiException { + // 1. 验证签名 + isCheckSign(); + // 订单数据 + Order order = orderService.getByIdRel(id); + // 当前登录用户id + User user = new User(); + // 代付款情况 + if(!order.getUserId().equals(getLoginUserId())){ + user = userService.getById(order.getUserId()); + }else{ + user = getLoginUser(); + } + final Integer userId = user.getUserId(); + final BigDecimal balance = user.getBalance(); + final BigDecimal payPrice = order.getPayPrice(); + if(balance.compareTo(payPrice) < 0){ + return fail("余额不足 = " + balance.compareTo(payPrice)); + } + // 2. 扣除余额操作 + BigDecimal subtract = balance.subtract(payPrice); + user.setBalance(subtract); + userService.updateById(user); + // 3. 记录余额明细 + UserBalanceLog userBalanceLog = new UserBalanceLog(); + userBalanceLog.setUserId(userId); + userBalanceLog.setScene(BALANCE_USE); + userBalanceLog.setMoney(payPrice); + userBalanceLog.setBalance(subtract); + userBalanceLog.setComments(order.getOrderNo().toString()); + userBalanceLog.setMerchantCode(order.getMerchantCode()); + userBalanceLogService.save(userBalanceLog); + // 4. 修改支付状态 + order.setPayStatus(PAY_STATUS_SUCCESS); + order.setPayMethod(PAY_METHOD_BALANCE); + order.setReceiptAmount(payPrice); + order.setPayTime(DateUtil.date()); + order.setSubject(order.getMerchantName()); + orderService.updateByIdRel(order); + // 5. 续租订单 + if(order.getRentOrderId() > 0){ + // 主订单 + Order parentOrder = orderService.getById(order.getRentOrderId()); + // 更新过期时间延长一个月 + Date expirationTime = parentOrder.getExpirationTime(); + DateTime nextMonthTime = DateUtil.offsetMonth(expirationTime, 1); + parentOrder.setExpirationTime(nextMonthTime); + orderService.updateById(parentOrder); + // 保存续费订单状态 + order.setDeliveryStatus(DELIVERY_STATUS_YES); + order.setReceiptStatus(RECEIPT_STATUS_YES); + order.setOrderStatus(ORDER_STATUS_COMPLETED); + order.setStartTime(expirationTime); + order.setExpirationTime(nextMonthTime); + orderService.updateById(order); + } + // 6. 是否是临时报餐 + final BcTemporaryParam bcTemporaryParam = new BcTemporaryParam(); + bcTemporaryParam.setUserId(getLoginUserId()); + bcTemporaryParam.setApplyStatus(1); + final List bcTemporaries = bcTemporaryService.listRel(bcTemporaryParam); + bcTemporaries.forEach(b -> { + b.setStatus(1); + bcTemporaryService.updateById(b); + }); + return success("支付成功",user); + } + + @OperationLog + @ApiModelProperty("余额支付批量") + @PostMapping("/balanceBatch") + @Transactional(rollbackFor = {Exception.class}) + public ApiResult balanceBatch(@RequestBody List orderIds) throws AlipayApiException { + // 1. 验证签名 + isCheckSign(); + // 订单数据 + final List list = orderService.listByIds(orderIds); + final StringBuilder sb = new StringBuilder(); + + list.forEach(d -> { + // 当前登录用户id + User user = new User(); + // 代付款情况 + if(!d.getUserId().equals(getLoginUserId())){ + user = userService.getById(d.getUserId()); + }else{ + user = getLoginUser(); + } + final Integer userId = user.getUserId(); + final BigDecimal balance = user.getBalance(); + final BigDecimal payPrice = d.getPayPrice(); + if(balance.compareTo(payPrice) < 0){ + sb.append("下单失败：").append(user.getNickname()).append("余额不足"); + throw new BusinessException("余额不足"); + } + // 2. 扣除余额操作 + BigDecimal subtract = balance.subtract(payPrice); + user.setBalance(subtract); + userService.updateById(user); + // 3. 记录余额明细 + UserBalanceLog userBalanceLog = new UserBalanceLog(); + userBalanceLog.setUserId(userId); + userBalanceLog.setScene(BALANCE_USE); + userBalanceLog.setMoney(payPrice); + userBalanceLog.setBalance(subtract); + userBalanceLog.setComments(d.getOrderNo().toString()); + userBalanceLog.setMerchantCode(d.getMerchantCode()); + userBalanceLogService.save(userBalanceLog); + // 4. 修改支付状态 + d.setPayStatus(PAY_STATUS_SUCCESS); + d.setPayMethod(PAY_METHOD_BALANCE); + d.setReceiptAmount(payPrice); + d.setPayTime(DateUtil.date()); + d.setSubject(d.getMerchantName()); + orderService.updateByIdRel(d); + // 5. 续租订单 + if(d.getRentOrderId() > 0){ + // 主订单 + Order parentOrder = orderService.getById(d.getRentOrderId()); + // 更新过期时间延长一个月 + Date expirationTime = parentOrder.getExpirationTime(); + DateTime nextMonthTime = DateUtil.offsetMonth(expirationTime, 1); + parentOrder.setExpirationTime(nextMonthTime); + orderService.updateById(parentOrder); + // 保存续费订单状态 + d.setDeliveryStatus(DELIVERY_STATUS_YES); + d.setReceiptStatus(RECEIPT_STATUS_YES); + d.setOrderStatus(ORDER_STATUS_COMPLETED); + d.setStartTime(expirationTime); + d.setExpirationTime(nextMonthTime); + orderService.updateById(d); + } + // 6. 是否是临时报餐 + final BcTemporaryParam bcTemporaryParam = new BcTemporaryParam(); + bcTemporaryParam.setUserId(getLoginUserId()); + bcTemporaryParam.setApplyStatus(1); + final List bcTemporaries = bcTemporaryService.listRel(bcTemporaryParam); + bcTemporaries.forEach(b -> { + b.setStatus(1); + bcTemporaryService.updateById(b); + }); + }); + return success("支付成功",sb); + } + + @ApiModelProperty("统一收单交易查询") + @GetMapping("/mp-alipay/query/{id}") + public ApiResult query(@PathVariable("id") Integer id) throws AlipayApiException { + // 验证签名 + isCheckSign(); + // 订单数据 + Order order = orderService.getByIdRel(id); + // 实例化客户端 + DefaultAlipayClient alipayClient = alipayConfig.alipayClient(order.getTenantId()); + AlipayTradeQueryRequest request = new AlipayTradeQueryRequest(); + JSONObject bizContent = new JSONObject(); + bizContent.put("out_trade_no", order.getOrderNo()); + request.setBizContent(bizContent.toString()); + AlipayTradeQueryResponse response = alipayClient.certificateExecute(request); + if(response.isSuccess()){ + System.out.println("调用成功"); + orderService.paySuccess(response); + } else { + System.out.println("调用失败"); + } + return success("调用成功",response); + } + + @ApiModelProperty("测试") + @GetMapping("/mp-alipay/test") + public String test() { + System.out.println("开始>>>>>"); + Order order = orderService.getByOutTradeNo("2023213225911618"); + System.out.println("order = " + order); + order.setPayPrice(new BigDecimal("0.11")); + order.setTotalPrice(new BigDecimal("0.11")); + order.setPayStatus(PAY_STATUS_SUCCESS); + final boolean b = orderService.updateByIdRel(order); + System.out.println("b = " + b); + +// params.put("gmt_create", "2022-12-16 21:32:33"); +// params.put("charset", "UTF-8"); +// params.put("seller_email", "zhu115289@163.com"); +// params.put("subject", "测试商品"); +// params.put("buyer_id", "2088202959044205"); +// params.put("invoice_amount", "0.01"); +// params.put("notify_id", "2022121601222213308044201435873270"); +// params.put("fund_bill_list", ""); +// params.put("notify_type", "trade_status_sync"); +// params.put("trade_status", "TRADE_SUCCESS"); +// params.put("receipt_amount", "0.01"); +// params.put("buyer_pay_amount", "0.01"); +// params.put("app_id", "2021003156628508"); +// params.put("seller_id", "2088431805524422"); +// params.put("gmt_payment", "2022-12-16 21:33:07"); +// params.put("notify_time", "2022-12-16 21:33:09"); +// params.put("version", "1.0"); +// params.put("out_trade_no", "20221116205303366"); +// params.put("total_amount", "0.01"); +// params.put("trade_no", "2022121622001444201411215463"); +// params.put("auth_app_id", "2021003156628508"); +// params.put("buyer_logon_id", "ip1***@163.com"); +// params.put("point_amount", "0.00"); +// // 处理订单业务 +// orderService.paySuccess(params); + return "success"; + } +} diff --git a/src/main/java/com/gxwebsoft/shop/controller/PaymentTemplateController.java b/src/main/java/com/gxwebsoft/shop/controller/PaymentTemplateController.java new file mode 100644 index 0000000..a62c597 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/controller/PaymentTemplateController.java @@ -0,0 +1,134 @@ +package com.gxwebsoft.shop.controller; + +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.shop.service.PaymentTemplateService; +import com.gxwebsoft.shop.entity.PaymentTemplate; +import com.gxwebsoft.shop.param.PaymentTemplateParam; +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 2022-12-09 13:59:38 + */ +@Api(tags = "商城支付模板记录表管理") +@RestController +@RequestMapping("/api/shop/payment-template") +public class PaymentTemplateController extends BaseController { + @Resource + private PaymentTemplateService paymentTemplateService; + + @PreAuthorize("hasAuthority('shop:paymentTemplate:list')") + @OperationLog + @ApiOperation("分页查询商城支付模板记录表") + @GetMapping("/page") + public ApiResult> page(PaymentTemplateParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(paymentTemplateService.page(page, page.getWrapper())); + // 使用关联查询 + //return success(paymentTemplateService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('shop:paymentTemplate:list')") + @OperationLog + @ApiOperation("查询全部商城支付模板记录表") + @GetMapping() + public ApiResult> list(PaymentTemplateParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(paymentTemplateService.list(page.getOrderWrapper())); + // 使用关联查询 + //return success(paymentTemplateService.listRel(param)); + } + + @PreAuthorize("hasAuthority('shop:paymentTemplate:list')") + @OperationLog + @ApiOperation("根据id查询商城支付模板记录表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + return success(paymentTemplateService.getById(id)); + // 使用关联查询 + //return success(paymentTemplateService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('shop:paymentTemplate:save')") + @OperationLog + @ApiOperation("添加商城支付模板记录表") + @PostMapping() + public ApiResult save(@RequestBody PaymentTemplate paymentTemplate) { + if (paymentTemplateService.save(paymentTemplate)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('shop:paymentTemplate:update')") + @OperationLog + @ApiOperation("修改商城支付模板记录表") + @PutMapping() + public ApiResult update(@RequestBody PaymentTemplate paymentTemplate) { + if (paymentTemplateService.updateById(paymentTemplate)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('shop:paymentTemplate:remove')") + @OperationLog + @ApiOperation("删除商城支付模板记录表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (paymentTemplateService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('shop:paymentTemplate:save')") + @OperationLog + @ApiOperation("批量添加商城支付模板记录表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (paymentTemplateService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('shop:paymentTemplate:update')") + @OperationLog + @ApiOperation("批量修改商城支付模板记录表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(paymentTemplateService, "template_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('shop:paymentTemplate:remove')") + @OperationLog + @ApiOperation("批量删除商城支付模板记录表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (paymentTemplateService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/controller/PaymentTradeController.java b/src/main/java/com/gxwebsoft/shop/controller/PaymentTradeController.java new file mode 100644 index 0000000..b262031 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/controller/PaymentTradeController.java @@ -0,0 +1,140 @@ +package com.gxwebsoft.shop.controller; + +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.shop.service.PaymentTradeService; +import com.gxwebsoft.shop.entity.PaymentTrade; +import com.gxwebsoft.shop.param.PaymentTradeParam; +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 2022-12-09 13:59:38 + */ +@Api(tags = "第三方支付交易记录表管理") +@RestController +@RequestMapping("/api/shop/payment-trade") +public class PaymentTradeController extends BaseController { + @Resource + private PaymentTradeService paymentTradeService; + + @PreAuthorize("hasAuthority('shop:paymentTrade:list')") + @OperationLog + @ApiOperation("分页查询第三方支付交易记录表") + @GetMapping("/page") + public ApiResult> page(PaymentTradeParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(paymentTradeService.page(page, page.getWrapper())); + // 使用关联查询 + //return success(paymentTradeService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('shop:paymentTrade:list')") + @OperationLog + @ApiOperation("查询全部第三方支付交易记录表") + @GetMapping() + public ApiResult> list(PaymentTradeParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(paymentTradeService.list(page.getOrderWrapper())); + // 使用关联查询 + //return success(paymentTradeService.listRel(param)); + } + + @PreAuthorize("hasAuthority('shop:paymentTrade:list')") + @OperationLog + @ApiOperation("根据id查询第三方支付交易记录表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + return success(paymentTradeService.getById(id)); + // 使用关联查询 + //return success(paymentTradeService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('shop:paymentTrade:save')") + @OperationLog + @ApiOperation("添加第三方支付交易记录表") + @PostMapping() + public ApiResult save(@RequestBody PaymentTrade paymentTrade) { + // 记录当前登录用户id、租户id、商户编号 + User loginUser = getLoginUser(); + if (loginUser != null) { + paymentTrade.setUserId(loginUser.getUserId()); + paymentTrade.setMerchantCode(getMerchantCode()); + } + if (paymentTradeService.save(paymentTrade)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('shop:paymentTrade:update')") + @OperationLog + @ApiOperation("修改第三方支付交易记录表") + @PutMapping() + public ApiResult update(@RequestBody PaymentTrade paymentTrade) { + if (paymentTradeService.updateById(paymentTrade)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('shop:paymentTrade:remove')") + @OperationLog + @ApiOperation("删除第三方支付交易记录表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (paymentTradeService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('shop:paymentTrade:save')") + @OperationLog + @ApiOperation("批量添加第三方支付交易记录表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (paymentTradeService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('shop:paymentTrade:update')") + @OperationLog + @ApiOperation("批量修改第三方支付交易记录表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(paymentTradeService, "trade_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('shop:paymentTrade:remove')") + @OperationLog + @ApiOperation("批量删除第三方支付交易记录表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (paymentTradeService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/controller/RechargeOrderController.java b/src/main/java/com/gxwebsoft/shop/controller/RechargeOrderController.java new file mode 100644 index 0000000..dd4ae2f --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/controller/RechargeOrderController.java @@ -0,0 +1,200 @@ +package com.gxwebsoft.shop.controller; + +import cn.hutool.core.util.IdUtil; +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.User; +import com.gxwebsoft.common.system.service.UserService; +import com.gxwebsoft.shop.entity.RechargeOrder; +import com.gxwebsoft.shop.entity.UserBalanceLog; +import com.gxwebsoft.shop.param.RechargeOrderParam; +import com.gxwebsoft.shop.service.RechargeOrderService; +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 2023-04-20 20:36:24 + */ +@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')") + @OperationLog + @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(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')") + @OperationLog + @ApiOperation("分页查询会员充值订单表") + @GetMapping("/page") + public ApiResult> page(RechargeOrderParam param) { + // 使用关联查询 + return success(rechargeOrderService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('shop:rechargeOrder:list')") + @OperationLog + @ApiOperation("查询全部会员充值订单表") + @GetMapping() + public ApiResult> list(RechargeOrderParam param) { + // 使用关联查询 + return success(rechargeOrderService.listRel(param)); + } + + @PreAuthorize("hasAuthority('shop:rechargeOrder:list')") + @OperationLog + @ApiOperation("根据id查询会员充值订单表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + // 使用关联查询 + return success(rechargeOrderService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('shop:rechargeOrder:save')") + @OperationLog + @ApiOperation("添加会员充值订单表") + @PostMapping() + public ApiResult save(@RequestBody RechargeOrder rechargeOrder) { + // 记录当前登录用户id、租户id、商户编号 + User loginUser = getLoginUser(); + if (loginUser != null) { + rechargeOrder.setUserId(loginUser.getUserId()); + rechargeOrder.setMerchantCode(getMerchantCode()); + } + if (rechargeOrderService.save(rechargeOrder)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('shop:rechargeOrder:update')") + @OperationLog + @ApiOperation("修改会员充值订单表") + @PutMapping() + public ApiResult update(@RequestBody RechargeOrder rechargeOrder) { + if (rechargeOrderService.updateById(rechargeOrder)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('shop:rechargeOrder:remove')") + @OperationLog + @ApiOperation("删除会员充值订单表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (rechargeOrderService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('shop:rechargeOrder:save')") + @OperationLog + @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')") + @OperationLog + @ApiOperation("批量修改会员充值订单表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(rechargeOrderService, "order_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('shop:rechargeOrder:remove')") + @OperationLog + @ApiOperation("批量删除会员充值订单表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (rechargeOrderService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/controller/RechargeOrderPlanController.java b/src/main/java/com/gxwebsoft/shop/controller/RechargeOrderPlanController.java new file mode 100644 index 0000000..a069bac --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/controller/RechargeOrderPlanController.java @@ -0,0 +1,140 @@ +package com.gxwebsoft.shop.controller; + +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.shop.service.RechargeOrderPlanService; +import com.gxwebsoft.shop.entity.RechargeOrderPlan; +import com.gxwebsoft.shop.param.RechargeOrderPlanParam; +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-04-20 20:36:24 + */ +@Api(tags = "会员充值订单套餐快照表管理") +@RestController +@RequestMapping("/api/shop/recharge-order-plan") +public class RechargeOrderPlanController extends BaseController { + @Resource + private RechargeOrderPlanService rechargeOrderPlanService; + + @PreAuthorize("hasAuthority('shop:rechargeOrderPlan:list')") + @OperationLog + @ApiOperation("分页查询会员充值订单套餐快照表") + @GetMapping("/page") + public ApiResult> page(RechargeOrderPlanParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(rechargeOrderPlanService.page(page, page.getWrapper())); + // 使用关联查询 + //return success(rechargeOrderPlanService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('shop:rechargeOrderPlan:list')") + @OperationLog + @ApiOperation("查询全部会员充值订单套餐快照表") + @GetMapping() + public ApiResult> list(RechargeOrderPlanParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(rechargeOrderPlanService.list(page.getOrderWrapper())); + // 使用关联查询 + //return success(rechargeOrderPlanService.listRel(param)); + } + + @PreAuthorize("hasAuthority('shop:rechargeOrderPlan:list')") + @OperationLog + @ApiOperation("根据id查询会员充值订单套餐快照表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + return success(rechargeOrderPlanService.getById(id)); + // 使用关联查询 + //return success(rechargeOrderPlanService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('shop:rechargeOrderPlan:save')") + @OperationLog + @ApiOperation("添加会员充值订单套餐快照表") + @PostMapping() + public ApiResult save(@RequestBody RechargeOrderPlan rechargeOrderPlan) { + // 记录当前登录用户id、租户id、商户编号 + User loginUser = getLoginUser(); + if (loginUser != null) { + rechargeOrderPlan.setUserId(loginUser.getUserId()); + rechargeOrderPlan.setMerchantCode(getMerchantCode()); + } + if (rechargeOrderPlanService.save(rechargeOrderPlan)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('shop:rechargeOrderPlan:update')") + @OperationLog + @ApiOperation("修改会员充值订单套餐快照表") + @PutMapping() + public ApiResult update(@RequestBody RechargeOrderPlan rechargeOrderPlan) { + if (rechargeOrderPlanService.updateById(rechargeOrderPlan)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('shop:rechargeOrderPlan:remove')") + @OperationLog + @ApiOperation("删除会员充值订单套餐快照表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (rechargeOrderPlanService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('shop:rechargeOrderPlan:save')") + @OperationLog + @ApiOperation("批量添加会员充值订单套餐快照表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (rechargeOrderPlanService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('shop:rechargeOrderPlan:update')") + @OperationLog + @ApiOperation("批量修改会员充值订单套餐快照表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(rechargeOrderPlanService, "order_plan_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('shop:rechargeOrderPlan:remove')") + @OperationLog + @ApiOperation("批量删除会员充值订单套餐快照表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (rechargeOrderPlanService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/controller/RechargePlanController.java b/src/main/java/com/gxwebsoft/shop/controller/RechargePlanController.java new file mode 100644 index 0000000..ff9f941 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/controller/RechargePlanController.java @@ -0,0 +1,140 @@ +package com.gxwebsoft.shop.controller; + +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.shop.service.RechargePlanService; +import com.gxwebsoft.shop.entity.RechargePlan; +import com.gxwebsoft.shop.param.RechargePlanParam; +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-04-20 20:36:24 + */ +@Api(tags = "会员充值套餐表管理") +@RestController +@RequestMapping("/api/shop/recharge-plan") +public class RechargePlanController extends BaseController { + @Resource + private RechargePlanService rechargePlanService; + + @PreAuthorize("hasAuthority('shop:rechargePlan:list')") + @OperationLog + @ApiOperation("分页查询会员充值套餐表") + @GetMapping("/page") + public ApiResult> page(RechargePlanParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(rechargePlanService.page(page, page.getWrapper())); + // 使用关联查询 + //return success(rechargePlanService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('shop:rechargePlan:list')") + @OperationLog + @ApiOperation("查询全部会员充值套餐表") + @GetMapping() + public ApiResult> list(RechargePlanParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(rechargePlanService.list(page.getOrderWrapper())); + // 使用关联查询 + //return success(rechargePlanService.listRel(param)); + } + + @PreAuthorize("hasAuthority('shop:rechargePlan:list')") + @OperationLog + @ApiOperation("根据id查询会员充值套餐表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + return success(rechargePlanService.getById(id)); + // 使用关联查询 + //return success(rechargePlanService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('shop:rechargePlan:save')") + @OperationLog + @ApiOperation("添加会员充值套餐表") + @PostMapping() + public ApiResult save(@RequestBody RechargePlan rechargePlan) { + // 记录当前登录用户id、租户id、商户编号 + User loginUser = getLoginUser(); + if (loginUser != null) { + rechargePlan.setUserId(loginUser.getUserId()); + rechargePlan.setMerchantCode(getMerchantCode()); + } + if (rechargePlanService.save(rechargePlan)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('shop:rechargePlan:update')") + @OperationLog + @ApiOperation("修改会员充值套餐表") + @PutMapping() + public ApiResult update(@RequestBody RechargePlan rechargePlan) { + if (rechargePlanService.updateById(rechargePlan)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('shop:rechargePlan:remove')") + @OperationLog + @ApiOperation("删除会员充值套餐表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (rechargePlanService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('shop:rechargePlan:save')") + @OperationLog + @ApiOperation("批量添加会员充值套餐表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (rechargePlanService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('shop:rechargePlan:update')") + @OperationLog + @ApiOperation("批量修改会员充值套餐表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(rechargePlanService, "plan_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('shop:rechargePlan:remove')") + @OperationLog + @ApiOperation("批量删除会员充值套餐表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (rechargePlanService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/controller/SfExpressController.java b/src/main/java/com/gxwebsoft/shop/controller/SfExpressController.java new file mode 100644 index 0000000..65fd49f --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/controller/SfExpressController.java @@ -0,0 +1,21 @@ +package com.gxwebsoft.shop.controller; + +import com.gxwebsoft.common.core.web.ApiResult; +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.shop.config.ExpressConfig; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +@RestController +public class SfExpressController extends BaseController { + + @Resource + ExpressConfig expressConfig; + + public ApiResult createOrder(){ + String sign = ""; + String serverHost = expressConfig.getServerHost().concat("/open/api/external/createorder?sign=").concat(sign); + return success("成功",serverHost); + } +} diff --git a/src/main/java/com/gxwebsoft/shop/controller/TestController.java b/src/main/java/com/gxwebsoft/shop/controller/TestController.java new file mode 100644 index 0000000..fc3c8d0 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/controller/TestController.java @@ -0,0 +1,24 @@ +package com.gxwebsoft.shop.controller; + +import com.gxwebsoft.common.core.annotation.OperationLog; +import com.gxwebsoft.common.core.constants.RedisConstants; +import com.gxwebsoft.common.core.web.ApiResult; +import com.gxwebsoft.common.core.web.BaseController; +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; + +@RestController +@Api(tags = "测试控制器") +@RequestMapping("/api/shop/test") +public class TestController extends BaseController { + + @GetMapping() + @OperationLog + @ApiOperation("测试方法") + public ApiResult test(){ + return null; + } +} diff --git a/src/main/java/com/gxwebsoft/shop/controller/UserAddressController.java b/src/main/java/com/gxwebsoft/shop/controller/UserAddressController.java new file mode 100644 index 0000000..71b88e1 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/controller/UserAddressController.java @@ -0,0 +1,139 @@ +package com.gxwebsoft.shop.controller; + +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.common.system.entity.User; +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.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 2022-11-25 19:04:43 + */ +@Api(tags = "用户收货地址表管理") +@RestController +@RequestMapping("/api/shop/user-address") +public class UserAddressController extends BaseController { + @Resource + private UserAddressService userAddressService; + + @PreAuthorize("hasAuthority('shop:userAddress:list')") + @OperationLog + @ApiOperation("分页查询用户收货地址表") + @GetMapping("/page") + public ApiResult> page(UserAddressParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(userAddressService.page(page, page.getWrapper())); + // 使用关联查询 + //return success(userAddressService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('shop:userAddress:list')") + @OperationLog + @ApiOperation("查询全部用户收货地址表") + @GetMapping() + public ApiResult> list(UserAddressParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(userAddressService.list(page.getOrderWrapper())); + // 使用关联查询 + //return success(userAddressService.listRel(param)); + } + + @PreAuthorize("hasAuthority('shop:userAddress:list')") + @OperationLog + @ApiOperation("根据id查询用户收货地址表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + return success(userAddressService.getById(id)); + // 使用关联查询 + //return success(userAddressService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('shop:userAddress:save')") + @OperationLog + @ApiOperation("添加用户收货地址表") + @PostMapping() + public ApiResult save(@RequestBody UserAddress userAddress) { + // 记录当前登录用户id、租户id + User loginUser = getLoginUser(); + if (loginUser != null) { + userAddress.setUserId(loginUser.getUserId()); + } + if (userAddressService.save(userAddress)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('shop:userAddress:update')") + @OperationLog + @ApiOperation("修改用户收货地址表") + @PutMapping() + public ApiResult update(@RequestBody UserAddress userAddress) { + if (userAddressService.updateById(userAddress)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('shop:userAddress:remove')") + @OperationLog + @ApiOperation("删除用户收货地址表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (userAddressService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('shop:userAddress:save')") + @OperationLog + @ApiOperation("批量添加用户收货地址表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (userAddressService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('shop:userAddress:update')") + @OperationLog + @ApiOperation("批量修改用户收货地址表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(userAddressService, "address_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('shop:userAddress:remove')") + @OperationLog + @ApiOperation("批量删除用户收货地址表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (userAddressService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/controller/UserBalanceLogController.java b/src/main/java/com/gxwebsoft/shop/controller/UserBalanceLogController.java new file mode 100644 index 0000000..d828832 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/controller/UserBalanceLogController.java @@ -0,0 +1,137 @@ +package com.gxwebsoft.shop.controller; + +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.common.system.entity.User; +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.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-04-21 15:59:09 + */ +@Api(tags = "用户余额变动明细表管理") +@RestController +@RequestMapping("/api/shop/user-balance-log") +public class UserBalanceLogController extends BaseController { + @Resource + private UserBalanceLogService userBalanceLogService; + + @PreAuthorize("hasAuthority('shop:userBalanceLog:list')") + @OperationLog + @ApiOperation("分页查询用户余额变动明细表") + @GetMapping("/page") + public ApiResult> page(UserBalanceLogParam param) { + // 使用关联查询 + return success(userBalanceLogService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('shop: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('shop: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('shop:userBalanceLog:save')") + @OperationLog + @ApiOperation("添加用户余额变动明细表") + @PostMapping() + public ApiResult save(@RequestBody UserBalanceLog userBalanceLog) { + // 记录当前登录用户id、租户id、商户编号 + User loginUser = getLoginUser(); + if (loginUser != null) { + userBalanceLog.setUserId(loginUser.getUserId()); + userBalanceLog.setMerchantCode(getMerchantCode()); + } + if (userBalanceLogService.save(userBalanceLog)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('shop:userBalanceLog:update')") + @OperationLog + @ApiOperation("修改用户余额变动明细表") + @PutMapping() + public ApiResult update(@RequestBody UserBalanceLog userBalanceLog) { + if (userBalanceLogService.updateById(userBalanceLog)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('shop:userBalanceLog:remove')") + @OperationLog + @ApiOperation("删除用户余额变动明细表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (userBalanceLogService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('shop:userBalanceLog:save')") + @OperationLog + @ApiOperation("批量添加用户余额变动明细表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (userBalanceLogService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('shop:userBalanceLog:update')") + @OperationLog + @ApiOperation("批量修改用户余额变动明细表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(userBalanceLogService, "log_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('shop:userBalanceLog:remove')") + @OperationLog + @ApiOperation("批量删除用户余额变动明细表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (userBalanceLogService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/controller/UserCommentController.java b/src/main/java/com/gxwebsoft/shop/controller/UserCommentController.java new file mode 100644 index 0000000..b2dc4bc --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/controller/UserCommentController.java @@ -0,0 +1,136 @@ +package com.gxwebsoft.shop.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.service.UserService; +import com.gxwebsoft.shop.entity.UserComment; +import com.gxwebsoft.shop.param.UserCommentParam; +import com.gxwebsoft.shop.service.UserCommentService; +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-07-06 13:55:16 + */ +@Api(tags = "用户评价记录表管理") +@RestController +@RequestMapping("/api/shop/user-comment") +public class UserCommentController extends BaseController { + @Resource + private UserCommentService userCommentService; + @Resource + private UserService userService; + + @OperationLog + @ApiOperation("分页查询用户评价记录表") + @GetMapping("/page") + public ApiResult> page(UserCommentParam param) { + User loginUser = getLoginUser(); + // 使用关联查询 + if(loginUser != null){ + param.setLoginUserId(getLoginUserId()); + } + return success(userCommentService.pageRel(param)); + } + + @OperationLog + @ApiOperation("查询全部用户评价记录表") + @GetMapping() + public ApiResult> list(UserCommentParam param) { + // 使用关联查询 + return success(userCommentService.listRel(param)); + } + + @OperationLog + @ApiOperation("根据id查询用户评价记录表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + // 使用关联查询 + return success(userCommentService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('shop:userComment:save')") + @OperationLog + @ApiOperation("添加用户评价记录表") + @PostMapping() + public ApiResult save(@RequestBody UserComment userComment) { + // 记录当前登录用户id + User loginUser = getLoginUser(); + if (loginUser != null) { + userComment.setUserId(loginUser.getUserId()); + } + if (userCommentService.save(userComment)) { + // 追加评论数 + final User toUser = userService.getById(userComment.getToUserId()); + toUser.setCommentNumbers(toUser.getCommentNumbers() + 1); + userService.updateById(toUser); + return success("发表成功",toUser); + } + return fail("发表失败"); + } + + @PreAuthorize("hasAuthority('shop:userComment:update')") + @OperationLog + @ApiOperation("修改用户评价记录表") + @PutMapping() + public ApiResult update(@RequestBody UserComment userComment) { + if (userCommentService.updateById(userComment)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('shop:userComment:remove')") + @OperationLog + @ApiOperation("删除用户评价记录表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (userCommentService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('shop:userComment:save')") + @OperationLog + @ApiOperation("批量添加用户评价记录表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (userCommentService.saveBatch(list)) { + return success("发表成功"); + } + return fail("发表失败"); + } + + @PreAuthorize("hasAuthority('shop:userComment:update')") + @OperationLog + @ApiOperation("批量修改用户评价记录表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(userCommentService, "comment_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('shop:userComment:remove')") + @OperationLog + @ApiOperation("批量删除用户评价记录表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (userCommentService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/controller/UserCouponController.java b/src/main/java/com/gxwebsoft/shop/controller/UserCouponController.java new file mode 100644 index 0000000..a4cd739 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/controller/UserCouponController.java @@ -0,0 +1,139 @@ +package com.gxwebsoft.shop.controller; + +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.shop.service.UserCouponService; +import com.gxwebsoft.shop.entity.UserCoupon; +import com.gxwebsoft.shop.param.UserCouponParam; +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 2022-11-25 19:04:43 + */ +@Api(tags = "用户优惠券记录表管理") +@RestController +@RequestMapping("/api/shop/user-coupon") +public class UserCouponController extends BaseController { + @Resource + private UserCouponService userCouponService; + + @PreAuthorize("hasAuthority('shop:userCoupon:list')") + @OperationLog + @ApiOperation("分页查询用户优惠券记录表") + @GetMapping("/page") + public ApiResult> page(UserCouponParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(userCouponService.page(page, page.getWrapper())); + // 使用关联查询 + //return success(userCouponService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('shop:userCoupon:list')") + @OperationLog + @ApiOperation("查询全部用户优惠券记录表") + @GetMapping() + public ApiResult> list(UserCouponParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(userCouponService.list(page.getOrderWrapper())); + // 使用关联查询 + //return success(userCouponService.listRel(param)); + } + + @PreAuthorize("hasAuthority('shop:userCoupon:list')") + @OperationLog + @ApiOperation("根据id查询用户优惠券记录表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + return success(userCouponService.getById(id)); + // 使用关联查询 + //return success(userCouponService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('shop:userCoupon:save')") + @OperationLog + @ApiOperation("添加用户优惠券记录表") + @PostMapping() + public ApiResult save(@RequestBody UserCoupon userCoupon) { + // 记录当前登录用户id、租户id + User loginUser = getLoginUser(); + if (loginUser != null) { + userCoupon.setUserId(loginUser.getUserId()); + } + if (userCouponService.save(userCoupon)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('shop:userCoupon:update')") + @OperationLog + @ApiOperation("修改用户优惠券记录表") + @PutMapping() + public ApiResult update(@RequestBody UserCoupon userCoupon) { + if (userCouponService.updateById(userCoupon)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('shop:userCoupon:remove')") + @OperationLog + @ApiOperation("删除用户优惠券记录表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (userCouponService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('shop:userCoupon:save')") + @OperationLog + @ApiOperation("批量添加用户优惠券记录表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (userCouponService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('shop:userCoupon:update')") + @OperationLog + @ApiOperation("批量修改用户优惠券记录表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(userCouponService, "user_coupon_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('shop:userCoupon:remove')") + @OperationLog + @ApiOperation("批量删除用户优惠券记录表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (userCouponService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/controller/UserFeedbackController.java b/src/main/java/com/gxwebsoft/shop/controller/UserFeedbackController.java new file mode 100644 index 0000000..ba670eb --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/controller/UserFeedbackController.java @@ -0,0 +1,132 @@ +package com.gxwebsoft.shop.controller; + +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.shop.service.UserFeedbackService; +import com.gxwebsoft.shop.entity.UserFeedback; +import com.gxwebsoft.shop.param.UserFeedbackParam; +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-07-16 22:24:55 + */ +@Api(tags = "意见反馈记录表管理") +@RestController +@RequestMapping("/api/shop/user-feedback") +public class UserFeedbackController extends BaseController { + @Resource + private UserFeedbackService userFeedbackService; + + @PreAuthorize("hasAuthority('shop:userFeedback:list')") + @OperationLog + @ApiOperation("分页查询意见反馈记录表") + @GetMapping("/page") + public ApiResult> page(UserFeedbackParam param) { + // 使用关联查询 + return success(userFeedbackService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('shop:userFeedback:list')") + @OperationLog + @ApiOperation("查询全部意见反馈记录表") + @GetMapping() + public ApiResult> list(UserFeedbackParam param) { + // 使用关联查询 + return success(userFeedbackService.listRel(param)); + } + + @PreAuthorize("hasAuthority('shop:userFeedback:list')") + @OperationLog + @ApiOperation("根据id查询意见反馈记录表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + // 使用关联查询 + return success(userFeedbackService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('shop:userFeedback:save')") + @OperationLog + @ApiOperation("添加意见反馈记录表") + @PostMapping() + public ApiResult save(@RequestBody UserFeedback userFeedback) { + // 记录当前登录用户id + User loginUser = getLoginUser(); + if (loginUser != null) { + userFeedback.setUserId(loginUser.getUserId()); + } + if (userFeedbackService.save(userFeedback)) { + return success("已收到您的宝贵意见"); + } + return fail("提交失败"); + } + + @PreAuthorize("hasAuthority('shop:userFeedback:update')") + @OperationLog + @ApiOperation("修改意见反馈记录表") + @PutMapping() + public ApiResult update(@RequestBody UserFeedback userFeedback) { + if (userFeedbackService.updateById(userFeedback)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('shop:userFeedback:remove')") + @OperationLog + @ApiOperation("删除意见反馈记录表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (userFeedbackService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('shop:userFeedback:save')") + @OperationLog + @ApiOperation("批量添加意见反馈记录表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (userFeedbackService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('shop:userFeedback:update')") + @OperationLog + @ApiOperation("批量修改意见反馈记录表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(userFeedbackService, "id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('shop:userFeedback:remove')") + @OperationLog + @ApiOperation("批量删除意见反馈记录表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (userFeedbackService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/controller/UserFollowController.java b/src/main/java/com/gxwebsoft/shop/controller/UserFollowController.java new file mode 100644 index 0000000..e5b7c0d --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/controller/UserFollowController.java @@ -0,0 +1,180 @@ +package com.gxwebsoft.shop.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.User; +import com.gxwebsoft.common.system.service.UserService; +import com.gxwebsoft.shop.entity.UserFollow; +import com.gxwebsoft.shop.param.UserFollowParam; +import com.gxwebsoft.shop.service.UserFollowService; +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.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 关注记录表控制器 + * + * @author 科技小王子 + * @since 2022-11-25 19:04:43 + */ +@Api(tags = "关注记录表管理") +@RestController +@RequestMapping("/api/shop/user-follow") +public class UserFollowController extends BaseController { + @Resource + private UserService userService; + @Resource + private UserFollowService userFollowService; + @Resource + private StringRedisTemplate stringRedisTemplate; + + private static final String SPLIT = ":"; + private static final String PREFIX_ENTITY_LIKE = "follow:user"; + private static final String PREFIX_USER_LIKE = "like:user"; + private static final String PREFIX_FOLLOWEE = "followee"; + private static final String PREFIX_FOLLOWER = "follower"; + + @PreAuthorize("hasAuthority('shop:userFollow:list')") + @OperationLog + @ApiOperation("分页查询关注记录表") + @GetMapping("/page") + public ApiResult> page(UserFollowParam param) { + // 使用关联查询 + return success(userFollowService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('shop:userFollow:list')") + @OperationLog + @ApiOperation("查询全部关注记录表") + @GetMapping() + public ApiResult> list(UserFollowParam param) { + User loginUser = getLoginUser(); + if (loginUser != null) { + param.setLoginUserId(getLoginUserId()); + } + return success(userFollowService.listRel(param)); + } + + @PreAuthorize("hasAuthority('shop:userFollow:list')") + @OperationLog + @ApiOperation("根据id查询关注记录表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + return success(userFollowService.getById(id)); + // 使用关联查询 + //return success(userFollowService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('shop:userFollow:save')") + @Transactional(rollbackFor = {Exception.class}) + @ApiOperation("添加关注记录表") + @PostMapping() + public ApiResult save(@RequestBody UserFollow userFollow) { + User loginUser = getLoginUser(); + if (loginUser != null) { + User toUser = userService.getById(userFollow.getShopId()); + final Integer userId = loginUser.getUserId(); + userFollow.setUserId(userId); + // 取消关注 + if(userFollowService.count(new LambdaQueryWrapper().eq(UserFollow::getShopId,userFollow.getShopId()).eq(UserFollow::getUserId,userId)) > 0){ + userFollowService.remove(new LambdaQueryWrapper().eq(UserFollow::getShopId,userFollow.getShopId()).eq(UserFollow::getUserId,userId)); + // 从Redis集合中移除 + stringRedisTemplate.opsForZSet().remove(getFollowKey(userFollow.getShopId()),userId.toString()); + // 更新粉丝数 + if(toUser.getFans() > 0){ + toUser.setFans(toUser.getFans() - 1); + } + userService.updateById(toUser); + // 更新关注数 + if(loginUser.getFollowers() > 0){ + loginUser.setFollowers(loginUser.getFollowers() - 1); + } + userService.updateById(loginUser); + return success("已取消关注"); + } + userFollowService.save(userFollow); + // 更新粉丝数 + toUser.setFans(toUser.getFans() + 1); + userService.updateById(toUser); + // 更新关注数 + loginUser.setFollowers(toUser.getFollowers() + 1); + userService.updateById(loginUser); + // 放入redis的set集合 + stringRedisTemplate.opsForZSet().add(getFollowKey(userFollow.getShopId()),userId.toString(),1); + return success("关注成功"); + } + return fail("操作失败"); + } + + @PreAuthorize("hasAuthority('shop:userFollow:update')") + @OperationLog + @ApiOperation("修改关注记录表") + @PutMapping() + public ApiResult update(@RequestBody UserFollow userFollow) { + if (userFollowService.updateById(userFollow)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('shop:userFollow:remove')") + @OperationLog + @ApiOperation("删除关注记录表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (userFollowService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('shop:userFollow:save')") + @OperationLog + @ApiOperation("批量添加关注记录表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (userFollowService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('shop:userFollow:update')") + @OperationLog + @ApiOperation("批量修改关注记录表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(userFollowService, "log_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('shop:userFollow:remove')") + @OperationLog + @ApiOperation("批量删除关注记录表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (userFollowService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + /** + * 某个用户的关注数 + * @return like:entity:[entityId] ->set(userId) + */ + public static String getFollowKey(Integer userId) { + return PREFIX_ENTITY_LIKE + SPLIT + userId; + } + + +} diff --git a/src/main/java/com/gxwebsoft/shop/controller/UserGradeController.java b/src/main/java/com/gxwebsoft/shop/controller/UserGradeController.java new file mode 100644 index 0000000..134518e --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/controller/UserGradeController.java @@ -0,0 +1,125 @@ +package com.gxwebsoft.shop.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.BatchParam; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.shop.entity.UserGrade; +import com.gxwebsoft.shop.param.UserGradeParam; +import com.gxwebsoft.shop.service.UserGradeService; +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-06-20 16:33:06 + */ +@Api(tags = "用户会员等级表管理") +@RestController +@RequestMapping("/api/shop/user-grade") +public class UserGradeController extends BaseController { + @Resource + private UserGradeService userGradeService; + + @PreAuthorize("hasAuthority('shop:userGrade:list')") + @OperationLog + @ApiOperation("分页查询用户会员等级表") + @GetMapping("/page") + public ApiResult> page(UserGradeParam param) { + // 使用关联查询 + return success(userGradeService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('shop:userGrade:list')") + @OperationLog + @ApiOperation("查询全部用户会员等级表") + @GetMapping() + public ApiResult> list(UserGradeParam param) { + // 使用关联查询 + return success(userGradeService.listRel(param)); + } + + @PreAuthorize("hasAuthority('shop:userGrade:list')") + @OperationLog + @ApiOperation("根据id查询用户会员等级表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + // 使用关联查询 + return success(userGradeService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('shop:userGrade:save')") + @OperationLog + @ApiOperation("添加用户会员等级表") + @PostMapping() + public ApiResult save(@RequestBody UserGrade userGrade) { + if (userGradeService.save(userGrade)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('shop:userGrade:update')") + @OperationLog + @ApiOperation("修改用户会员等级表") + @PutMapping() + public ApiResult update(@RequestBody UserGrade userGrade) { + if (userGradeService.updateById(userGrade)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('shop:userGrade:remove')") + @OperationLog + @ApiOperation("删除用户会员等级表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (userGradeService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('shop:userGrade:save')") + @OperationLog + @ApiOperation("批量添加用户会员等级表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (userGradeService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('shop:userGrade:update')") + @OperationLog + @ApiOperation("批量修改用户会员等级表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(userGradeService, "grade_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('shop:userGrade:remove')") + @OperationLog + @ApiOperation("批量删除用户会员等级表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (userGradeService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/controller/UserGradeLogController.java b/src/main/java/com/gxwebsoft/shop/controller/UserGradeLogController.java new file mode 100644 index 0000000..d4b0450 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/controller/UserGradeLogController.java @@ -0,0 +1,122 @@ +package com.gxwebsoft.shop.controller; + +import com.gxwebsoft.common.core.annotation.OperationLog; +import com.gxwebsoft.common.core.web.*; +import com.gxwebsoft.shop.entity.UserGradeLog; +import com.gxwebsoft.shop.param.UserGradeLogParam; +import com.gxwebsoft.shop.service.UserGradeLogService; +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-06-20 16:33:06 + */ +@Api(tags = "用户会员等级变更记录表管理") +@RestController +@RequestMapping("/api/shop/user-grade-log") +public class UserGradeLogController extends BaseController { + @Resource + private UserGradeLogService userGradeLogService; + + @PreAuthorize("hasAuthority('shop:userGradeLog:list')") + @OperationLog + @ApiOperation("分页查询用户会员等级变更记录表") + @GetMapping("/page") + public ApiResult> page(UserGradeLogParam param) { + // 使用关联查询 + return success(userGradeLogService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('shop:userGradeLog:list')") + @OperationLog + @ApiOperation("查询全部用户会员等级变更记录表") + @GetMapping() + public ApiResult> list(UserGradeLogParam param) { + // 使用关联查询 + return success(userGradeLogService.listRel(param)); + } + + @PreAuthorize("hasAuthority('shop:userGradeLog:list')") + @OperationLog + @ApiOperation("根据id查询用户会员等级变更记录表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + // 使用关联查询 + return success(userGradeLogService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('shop:userGradeLog:save')") + @OperationLog + @ApiOperation("添加用户会员等级变更记录表") + @PostMapping() + public ApiResult save(@RequestBody UserGradeLog userGradeLog) { + if (userGradeLogService.save(userGradeLog)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('shop:userGradeLog:update')") + @OperationLog + @ApiOperation("修改用户会员等级变更记录表") + @PutMapping() + public ApiResult update(@RequestBody UserGradeLog userGradeLog) { + if (userGradeLogService.updateById(userGradeLog)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('shop:userGradeLog:remove')") + @OperationLog + @ApiOperation("删除用户会员等级变更记录表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (userGradeLogService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('shop:userGradeLog:save')") + @OperationLog + @ApiOperation("批量添加用户会员等级变更记录表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (userGradeLogService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('shop:userGradeLog:update')") + @OperationLog + @ApiOperation("批量修改用户会员等级变更记录表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(userGradeLogService, "log_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('shop:userGradeLog:remove')") + @OperationLog + @ApiOperation("批量删除用户会员等级变更记录表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (userGradeLogService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/controller/UserLikeController.java b/src/main/java/com/gxwebsoft/shop/controller/UserLikeController.java new file mode 100644 index 0000000..7f7a872 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/controller/UserLikeController.java @@ -0,0 +1,185 @@ +package com.gxwebsoft.shop.controller; + +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.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.love.socketio.cache.ClientCache; +import com.gxwebsoft.shop.entity.UserLike; +import com.gxwebsoft.shop.param.UserLikeParam; +import com.gxwebsoft.shop.service.UserLikeService; +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.util.CollectionUtils; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; + +/** + * 点赞记录表控制器 + * + * @author 科技小王子 + * @since 2023-07-06 17:51:04 + */ +@Api(tags = "点赞记录表管理") +@RestController +@RequestMapping("/api/shop/user-like") +public class UserLikeController extends BaseController { + @Resource + private UserLikeService userLikeService; + @Resource + private UserService userService; + + @Resource + private ClientCache clientCache; + + @PreAuthorize("hasAuthority('shop:userLike:list')") + @OperationLog + @ApiOperation("分页查询点赞记录表") + @GetMapping("/page") + public ApiResult> page(UserLikeParam param) { + User loginUser = getLoginUser(); + if(loginUser != null){ + param.setLoginUserId(getLoginUserId()); + } + + PageResult result = userLikeService.pageRel(param); + // 标记已读 + if(param.getToUserId() != null && param.getToUserId().equals(loginUser.getUserId())){ + Set logIds = result.getList().stream().map(UserLike::getLogId).collect(Collectors.toSet()); + if(!CollectionUtils.isEmpty(logIds)){ + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper() + .in(UserLike::getLogId, logIds) + .set(UserLike::getStatus, 1); + userLikeService.getBaseMapper().update(null, updateWrapper); + } + } + // 使用关联查询 + return success(result); + } + + @PreAuthorize("hasAuthority('shop:userLike:list')") + @OperationLog + @ApiOperation("查询全部点赞记录表") + @GetMapping() + public ApiResult> list(UserLikeParam param) { + // 使用关联查询 + return success(userLikeService.listRel(param)); + } + + @PreAuthorize("hasAuthority('shop:userLike:list')") + @OperationLog + @ApiOperation("根据id查询点赞记录表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + // 使用关联查询 + return success(userLikeService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('shop:userLike:save')") + @Transactional(rollbackFor = {Exception.class}) + @ApiOperation("添加点赞记录表") + @PostMapping() + public ApiResult save(@RequestBody UserLike userLike) { + // 记录当前登录用户id + User loginUser = getLoginUser(); + if (loginUser != null) { + userLike.setUserId(loginUser.getUserId()); + final UserLikeParam param = new UserLikeParam(); + param.setUserId(loginUser.getUserId()); + param.setToUserId(userLike.getToUserId()); + final List userLikes = userLikeService.listRel(param); + System.out.println("userLikes = " + userLikes.size()); + + // 点赞操作 + if (userLikes.size() == 0) { + final UserLike add = new UserLike(); + add.setUserId(loginUser.getUserId()); + add.setToUserId(userLike.getToUserId()); + userLikeService.save(add); + // 更新点赞数量 + final User modify = userService.getById(userLike.getToUserId()); + modify.setLikes(modify.getLikes() + 1); + userService.updateById(modify); + clientCache.sendUserEvent(userLike.getToUserId() + "","likeme", 1); + return success("已喜欢", modify.getLikes()); + } + + // 取消点赞 + final UserLike like = userLikes.get(0); + userLikeService.removeById(like.getLogId()); + // 更新点赞数量 + final User modify = userService.getById(userLike.getToUserId()); + modify.setLikes(modify.getLikes() - 1); + userService.updateById(modify); + clientCache.sendUserEvent(userLike.getToUserId() + "","likeme", -1); + return success("取消喜欢",modify.getLikes()); + } + return fail("操作失败"); + } + + @PreAuthorize("hasAuthority('shop:userLike:update')") + @OperationLog + @ApiOperation("修改点赞记录表") + @PutMapping() + public ApiResult update(@RequestBody UserLike userLike) { + if (userLikeService.updateById(userLike)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('shop:userLike:remove')") + @OperationLog + @ApiOperation("删除点赞记录表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (userLikeService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('shop:userLike:save')") + @OperationLog + @ApiOperation("批量添加点赞记录表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (userLikeService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('shop:userLike:update')") + @OperationLog + @ApiOperation("批量修改点赞记录表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(userLikeService, "log_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('shop:userLike:remove')") + @OperationLog + @ApiOperation("批量删除点赞记录表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (userLikeService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/controller/UserLookController.java b/src/main/java/com/gxwebsoft/shop/controller/UserLookController.java new file mode 100644 index 0000000..2665bd5 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/controller/UserLookController.java @@ -0,0 +1,161 @@ +package com.gxwebsoft.shop.controller; + +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.web.BatchParam; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.love.socketio.cache.ClientCache; +import com.gxwebsoft.shop.entity.UserLook; +import com.gxwebsoft.shop.param.UserLookParam; +import com.gxwebsoft.shop.service.UserLookService; +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; +import java.util.Set; +import java.util.stream.Collectors; + +/** + * 访客记录表控制器 + * + * @author 科技小王子 + * @since 2023-07-13 23:10:38 + */ +@Api(tags = "访客记录表管理") +@RestController +@RequestMapping("/api/shop/user-look") +public class UserLookController extends BaseController { + @Resource + private UserLookService userLookService; + + @Resource + private ClientCache clientCache; + + @PreAuthorize("hasAuthority('shop:userLook:list')") + @OperationLog + @ApiOperation("分页查询访客记录表") + @GetMapping("/page") + public ApiResult> page(UserLookParam param) { + User loginUser = getLoginUser(); + if(loginUser != null){ + param.setLoginUserId(getLoginUserId()); + } + PageResult result = userLookService.pageRel(param); + // 标记已读 + if(param.getToUserId() != null && param.getToUserId().equals(loginUser.getUserId())){ + Set logIds = result.getList().stream().map(UserLook::getLogId).collect(Collectors.toSet()); + if(!CollectionUtils.isEmpty(logIds)){ + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper() + .in(UserLook::getLogId, logIds) + .set(UserLook::getStatus, 1); + userLookService.getBaseMapper().update(null, updateWrapper); + + } + + } + // 使用关联查询 + return success(result); + } + + @PreAuthorize("hasAuthority('shop:userLook:list')") + @OperationLog + @ApiOperation("查询全部访客记录表") + @GetMapping() + public ApiResult> list(UserLookParam param) { + // 使用关联查询 + return success(userLookService.listRel(param)); + } + + @PreAuthorize("hasAuthority('shop:userLook:list')") + @OperationLog + @ApiOperation("根据id查询访客记录表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + // 使用关联查询 + return success(userLookService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('shop:userLook:list')") + @OperationLog + @ApiOperation("添加访客记录表") + @PostMapping() + public ApiResult save(@RequestBody UserLook userLook) { + // 记录当前登录用户id + User loginUser = getLoginUser(); + if (loginUser != null) { + userLook.setUserId(loginUser.getUserId()); + } + if(loginUser.getUserId().equals(userLook.getToUserId())){ + return success("无事发生"); + } + if (userLookService.save(userLook)) { + clientCache.sendUserEvent(userLook.getToUserId() + "","look", 1); + return success("添加成功"); + + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('shop:userLook:list')") + @OperationLog + @ApiOperation("修改访客记录表") + @PutMapping() + public ApiResult update(@RequestBody UserLook userLook) { + if (userLookService.updateById(userLook)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('shop:userLook:list')") + @OperationLog + @ApiOperation("删除访客记录表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (userLookService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('shop:userLook:list')") + @OperationLog + @ApiOperation("批量添加访客记录表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (userLookService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('shop:userLook:list')") + @OperationLog + @ApiOperation("批量修改访客记录表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(userLookService, "log_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('shop:userLook:list')") + @OperationLog + @ApiOperation("批量删除访客记录表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (userLookService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/controller/UserOauthController.java b/src/main/java/com/gxwebsoft/shop/controller/UserOauthController.java new file mode 100644 index 0000000..3fe907e --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/controller/UserOauthController.java @@ -0,0 +1,127 @@ +package com.gxwebsoft.shop.controller; + +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.shop.service.UserOauthService; +import com.gxwebsoft.shop.entity.UserOauth; +import com.gxwebsoft.shop.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 2022-12-15 08:33:13 + */ +@Api(tags = "第三方用户信息表管理") +@RestController +@RequestMapping("/api/shop/user-oauth") +public class UserOauthController extends BaseController { + @Resource + private UserOauthService userOauthService; + + @PreAuthorize("hasAuthority('shop:userOauth:list')") + @OperationLog + @ApiOperation("分页查询第三方用户信息表") + @GetMapping("/page") + public ApiResult> page(UserOauthParam param) { + // 使用关联查询 + return success(userOauthService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('shop:userOauth:list')") + @OperationLog + @ApiOperation("查询全部第三方用户信息表") + @GetMapping() + public ApiResult> list(UserOauthParam param) { + // 使用关联查询 + return success(userOauthService.listRel(param)); + } + + @PreAuthorize("hasAuthority('shop:userOauth:list')") + @OperationLog + @ApiOperation("根据id查询第三方用户信息表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + // 使用关联查询 + return success(userOauthService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('shop:userOauth:save')") + @OperationLog + @ApiOperation("添加第三方用户信息表") + @PostMapping() + public ApiResult save(@RequestBody UserOauth userOauth) { + if (userOauthService.save(userOauth)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('shop:userOauth:update')") + @OperationLog + @ApiOperation("修改第三方用户信息表") + @PutMapping() + public ApiResult update(@RequestBody UserOauth userOauth) { + if (userOauthService.updateById(userOauth)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('shop:userOauth:remove')") + @OperationLog + @ApiOperation("删除第三方用户信息表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (userOauthService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('shop:userOauth:save')") + @OperationLog + @ApiOperation("批量添加第三方用户信息表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (userOauthService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('shop:userOauth:update')") + @OperationLog + @ApiOperation("批量修改第三方用户信息表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(userOauthService, "id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('shop:userOauth:remove')") + @OperationLog + @ApiOperation("批量删除第三方用户信息表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (userOauthService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/controller/UserPointsLogController.java b/src/main/java/com/gxwebsoft/shop/controller/UserPointsLogController.java new file mode 100644 index 0000000..be25851 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/controller/UserPointsLogController.java @@ -0,0 +1,139 @@ +package com.gxwebsoft.shop.controller; + +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.shop.service.UserPointsLogService; +import com.gxwebsoft.shop.entity.UserPointsLog; +import com.gxwebsoft.shop.param.UserPointsLogParam; +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 2022-11-25 19:04:43 + */ +@Api(tags = "用户积分变动明细表管理") +@RestController +@RequestMapping("/api/shop/user-points-log") +public class UserPointsLogController extends BaseController { + @Resource + private UserPointsLogService userPointsLogService; + + @PreAuthorize("hasAuthority('shop:userPointsLog:list')") + @OperationLog + @ApiOperation("分页查询用户积分变动明细表") + @GetMapping("/page") + public ApiResult> page(UserPointsLogParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(userPointsLogService.page(page, page.getWrapper())); + // 使用关联查询 + //return success(userPointsLogService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('shop:userPointsLog:list')") + @OperationLog + @ApiOperation("查询全部用户积分变动明细表") + @GetMapping() + public ApiResult> list(UserPointsLogParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(userPointsLogService.list(page.getOrderWrapper())); + // 使用关联查询 + //return success(userPointsLogService.listRel(param)); + } + + @PreAuthorize("hasAuthority('shop:userPointsLog:list')") + @OperationLog + @ApiOperation("根据id查询用户积分变动明细表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + return success(userPointsLogService.getById(id)); + // 使用关联查询 + //return success(userPointsLogService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('shop:userPointsLog:save')") + @OperationLog + @ApiOperation("添加用户积分变动明细表") + @PostMapping() + public ApiResult save(@RequestBody UserPointsLog userPointsLog) { + // 记录当前登录用户id、租户id + User loginUser = getLoginUser(); + if (loginUser != null) { + userPointsLog.setUserId(loginUser.getUserId()); + } + if (userPointsLogService.save(userPointsLog)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('shop:userPointsLog:update')") + @OperationLog + @ApiOperation("修改用户积分变动明细表") + @PutMapping() + public ApiResult update(@RequestBody UserPointsLog userPointsLog) { + if (userPointsLogService.updateById(userPointsLog)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('shop:userPointsLog:remove')") + @OperationLog + @ApiOperation("删除用户积分变动明细表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (userPointsLogService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('shop:userPointsLog:save')") + @OperationLog + @ApiOperation("批量添加用户积分变动明细表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (userPointsLogService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('shop:userPointsLog:update')") + @OperationLog + @ApiOperation("批量修改用户积分变动明细表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(userPointsLogService, "log_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('shop:userPointsLog:remove')") + @OperationLog + @ApiOperation("批量删除用户积分变动明细表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (userPointsLogService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/controller/UserRefereeController.java b/src/main/java/com/gxwebsoft/shop/controller/UserRefereeController.java new file mode 100644 index 0000000..87ccdc1 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/controller/UserRefereeController.java @@ -0,0 +1,150 @@ +package com.gxwebsoft.shop.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.BatchParam; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.shop.entity.UserReferee; +import com.gxwebsoft.shop.param.UserRefereeParam; +import com.gxwebsoft.shop.service.UserRefereeService; +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-28 14:07:29 + */ +@Api(tags = "用户推荐关系表管理") +@RestController +@RequestMapping("/api/shop/user-referee") +public class UserRefereeController extends BaseController { + @Resource + private UserRefereeService userRefereeService; + + @PreAuthorize("hasAuthority('shop:userReferee:list')") + @OperationLog + @ApiOperation("分页查询用户推荐关系表") + @GetMapping("/page") + public ApiResult> page(UserRefereeParam param) { +// PageParam page = new PageParam<>(param); +// page.setDefaultOrder("create_time desc"); +// return success(userRefereeService.page(page, page.getWrapper())); + // 使用关联查询 + return success(userRefereeService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('shop:userReferee:list')") + @OperationLog + @ApiOperation("查询全部用户推荐关系表") + @GetMapping() + public ApiResult> list(UserRefereeParam param) { + // 贵港自然资源局定制 + if(getTenantId().equals(10048)){ + final List userRefereeList = userRefereeService.listRel(param); + final User user = getLoginUser(); + final UserReferee userReferee = new UserReferee(); + userReferee.setNickname(user.getNickname()); + userRefereeList.add(userReferee); + return success(userRefereeList); + } + // 使用关联查询 + return success(userRefereeService.listRel(param)); + } + + @PreAuthorize("hasAuthority('shop:userReferee:list')") + @OperationLog + @ApiOperation("根据id查询用户推荐关系表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { +// return success(userRefereeService.getById(id)); + // 使用关联查询 + return success(userRefereeService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('shop:userReferee:save')") + @OperationLog + @ApiOperation("添加用户推荐关系表") + @PostMapping() + public ApiResult save(@RequestBody UserReferee userReferee) { +// if(userReferee.getDealerId().equals(userReferee.getUserId())){ +// return fail("不能邀请自己"); +// } + final int count = userRefereeService.count(new LambdaQueryWrapper() + .eq(UserReferee::getUserId, userReferee.getUserId()) + .eq(UserReferee::getDealerId,userReferee.getDealerId()) + ); + if(count > 0){ + return fail("关系已存在"); + } + if (userRefereeService.save(userReferee)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('shop:userReferee:update')") + @OperationLog + @ApiOperation("修改用户推荐关系表") + @PutMapping() + public ApiResult update(@RequestBody UserReferee userReferee) { + if (userRefereeService.updateById(userReferee)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('shop:userReferee:remove')") + @OperationLog + @ApiOperation("删除用户推荐关系表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (userRefereeService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('shop:userReferee:save')") + @OperationLog + @ApiOperation("批量添加用户推荐关系表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (userRefereeService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('shop:userReferee:update')") + @OperationLog + @ApiOperation("批量修改用户推荐关系表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(userRefereeService, "id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('shop:userReferee:remove')") + @OperationLog + @ApiOperation("批量删除用户推荐关系表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (userRefereeService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/controller/WxPayController.java b/src/main/java/com/gxwebsoft/shop/controller/WxPayController.java new file mode 100644 index 0000000..32f0f1f --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/controller/WxPayController.java @@ -0,0 +1,25 @@ +package com.gxwebsoft.shop.controller; + +import com.gxwebsoft.common.core.web.ApiResult; +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.shop.service.OrderService; +import io.swagger.annotations.Api; +import lombok.extern.slf4j.Slf4j; +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; + +@RestController +@RequestMapping("/api/shop/wx-pay") +@Api(tags = "微信支付API") +public class WxPayController extends BaseController +{ + @Resource + private OrderService orderService; + + public ApiResult nativePay(@PathVariable String orderId){ + return success("支付成功"); + } +} diff --git a/src/main/java/com/gxwebsoft/shop/entity/Cart.java b/src/main/java/com/gxwebsoft/shop/entity/Cart.java new file mode 100644 index 0000000..a7c507f --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/entity/Cart.java @@ -0,0 +1,76 @@ +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.math.BigDecimal; +import java.util.Date; + +/** + * 购物车记录表 + * + * @author 科技小王子 + * @since 2022-11-25 19:04:43 + */ +@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 = "商品ID") + private Integer goodsId; + + @ApiModelProperty(value = "商品sku唯一标识") + private String goodsSkuId; + + @ApiModelProperty(value = "商品数量") + private Integer goodsNum; + + @ApiModelProperty(value = "商品价格") + private BigDecimal goodsPrice; + + @ApiModelProperty(value = "商品封面图") + private String image; + + @ApiModelProperty(value = "状态, 0正常, 1冻结") + private Integer status; + + @ApiModelProperty(value = "所属门店ID") + private Integer shopId; + + @ApiModelProperty(value = "用户ID") + private Integer userId; + + @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; + +} diff --git a/src/main/java/com/gxwebsoft/shop/entity/Category.java b/src/main/java/com/gxwebsoft/shop/entity/Category.java new file mode 100644 index 0000000..7e4c3a8 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/entity/Category.java @@ -0,0 +1,70 @@ +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 java.util.Date; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 商品分类表 + * + * @author 科技小王子 + * @since 2022-11-22 17:45:37 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "Category对象", description = "商品分类表") +@TableName("shop_category") +public class Category 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 title; + + @ApiModelProperty(value = "上级分类ID") + private Integer parentId; + + @ApiModelProperty(value = "分类索引图") + private String image; + + @ApiModelProperty(value = "用户ID") + private Integer userId; + + @ApiModelProperty(value = "所属商户") + private String merchantCode; + + @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/src/main/java/com/gxwebsoft/shop/entity/Comment.java b/src/main/java/com/gxwebsoft/shop/entity/Comment.java new file mode 100644 index 0000000..8722f2d --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/entity/Comment.java @@ -0,0 +1,76 @@ +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 java.util.Date; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 商品评价记录表 + * + * @author 科技小王子 + * @since 2022-11-23 21:18:56 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "Comment对象", description = "商品评价记录表") +@TableName("shop_comment") +public class Comment implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "评价ID") + @TableId(value = "comment_id", type = IdType.AUTO) + private Integer commentId; + + @ApiModelProperty(value = "评分 (10好评 20中评 30差评)") + private Integer score; + + @ApiModelProperty(value = "评价内容") + private String content; + + @ApiModelProperty(value = "是否为图片评价") + private Integer isPicture; + + @ApiModelProperty(value = "用户ID") + private Integer userId; + + @ApiModelProperty(value = "订单ID") + private Integer orderId; + + @ApiModelProperty(value = "商品ID") + private Integer goodsId; + + @ApiModelProperty(value = "订单商品ID") + private Integer orderGoodsId; + + @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/src/main/java/com/gxwebsoft/shop/entity/Coupon.java b/src/main/java/com/gxwebsoft/shop/entity/Coupon.java new file mode 100644 index 0000000..e9cf655 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/entity/Coupon.java @@ -0,0 +1,104 @@ +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 2022-11-28 18:26:05 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "Coupon对象", description = "优惠券记录表") +@TableName("shop_coupon") +public class Coupon implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "优惠券ID") + @TableId(value = "coupon_id", type = IdType.AUTO) + private Integer couponId; + + @ApiModelProperty(value = "优惠券名称") + private String name; + + @ApiModelProperty(value = "优惠券类型(10满减券 20折扣券)") + private Integer couponType; + + @ApiModelProperty(value = "满减券-减免金额") + private BigDecimal reducePrice; + + @ApiModelProperty(value = "折扣券-折扣率(0-100)") + private Integer discount; + + @ApiModelProperty(value = "最低消费金额") + private BigDecimal minPrice; + + @ApiModelProperty(value = "到期类型(10领取后生效 20固定时间)") + private Integer expireType; + + @ApiModelProperty(value = "领取后生效-有效天数") + private Integer expireDay; + + @ApiModelProperty(value = "固定时间-开始时间") + private Integer startTime; + + @ApiModelProperty(value = "固定时间-结束时间") + private Integer endTime; + + @ApiModelProperty(value = "适用范围(10全部商品 20指定商品 30排除商品)") + private Integer applyRange; + + @ApiModelProperty(value = "适用范围配置(json格式)") + private String applyRangeConfig; + + @ApiModelProperty(value = "发放总数量(-1为不限制)") + private Integer totalNum; + + @ApiModelProperty(value = "已领取数量") + private Integer receiveNum; + + @ApiModelProperty(value = "优惠券描述") + private String describe; + + @ApiModelProperty(value = "用户ID") + private Integer userId; + + @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 = "租户id") + private Integer tenantId; + + @ApiModelProperty(value = "注册时间") + private Date createTime; + + @ApiModelProperty(value = "修改时间") + private Date updateTime; + +} diff --git a/src/main/java/com/gxwebsoft/shop/entity/Express.java b/src/main/java/com/gxwebsoft/shop/entity/Express.java new file mode 100644 index 0000000..76e0bdf --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/entity/Express.java @@ -0,0 +1,70 @@ +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 java.util.Date; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 物流公司记录表 + * + * @author 科技小王子 + * @since 2022-11-22 00:21:07 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "Express对象", description = "物流公司记录表") +@TableName("shop_express") +public class Express implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "物流公司ID") + @TableId(value = "express_id", type = IdType.AUTO) + private Integer expressId; + + @ApiModelProperty(value = "物流公司名称") + private String expressName; + + @ApiModelProperty(value = "物流公司编码 (快递100)") + private String kuaidi100Code; + + @ApiModelProperty(value = "物流公司编码 (快递鸟)") + private String kdniaoCode; + + @ApiModelProperty(value = "用户ID") + private Integer userId; + + @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 = "租户id") + private Integer tenantId; + + @ApiModelProperty(value = "注册时间") + private Date createTime; + + @ApiModelProperty(value = "修改时间") + private Date updateTime; + +} diff --git a/src/main/java/com/gxwebsoft/shop/entity/Goods.java b/src/main/java/com/gxwebsoft/shop/entity/Goods.java new file mode 100644 index 0000000..690a73a --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/entity/Goods.java @@ -0,0 +1,195 @@ +package com.gxwebsoft.shop.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 2022-11-23 12:47:16 + */ +@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 = "商品名称") + private String goodsName; + + @ApiModelProperty(value = "商品编码") + private String goodsCode; + + @ApiModelProperty(value = "商品规格(10单规格 20多规格)") + private Integer goodsType; + + @ApiModelProperty(value = "商品分类ID") + private Integer categoryId; + + @ApiModelProperty(value = "分类名称") + @TableField(exist = false) + private String categoryName; + + @ApiModelProperty(value = "商品封面图") + private String image; + + @ApiModelProperty(value = "上传的文件") + private String files; + + @ApiModelProperty(value = "主图视频路径") + private String videoUrl; + + @ApiModelProperty(value = "商品卖点") + private String sellingPoint; + + @ApiModelProperty(value = "商品规格(10单规格 20多规格)") + private Integer specType; + + @ApiModelProperty(value = "商品价格(最低)") + private BigDecimal goodsPriceMin; + + @ApiModelProperty(value = "商品价格(最高)") + private BigDecimal goodsPriceMax; + + @ApiModelProperty(value = "划线价格(最低)") + private BigDecimal linePriceMin; + + @ApiModelProperty(value = "划线价格(最高)") + private BigDecimal linePriceMax; + + @ApiModelProperty(value = "库存总量(包含所有sku)") + private Integer stockTotal; + + @ApiModelProperty(value = "库存计算方式(10下单减库存 20付款减库存)") + private Integer deductStockType; + + @ApiModelProperty(value = "商品详情") + private String content; + + @ApiModelProperty(value = "初始销量") + private Integer salesInitial; + + @ApiModelProperty(value = "实际销量") + private Integer salesActual; + + @ApiModelProperty(value = "配送方式") + private Integer deliveryType; + + @ApiModelProperty(value = "配送模板ID") + private Integer deliveryId; + + @ApiModelProperty(value = "是否开启积分赠送(1开启 0关闭)") + private Integer isPointsGift; + + @ApiModelProperty(value = "是否允许使用积分抵扣(1允许 0不允许)") + private Integer isPointsDiscount; + + @ApiModelProperty(value = "积分抵扣设置(0默认抵扣 1单独设置抵扣)") + private Integer isAlonePointsDiscount; + + @ApiModelProperty(value = "单独设置积分抵扣的配置") + private String pointsDiscountConfig; + + @ApiModelProperty(value = "是否开启会员折扣(1开启 0关闭)") + private Integer isEnableGrade; + + @ApiModelProperty(value = "会员折扣设置(0默认等级折扣 1单独设置折扣)") + private Integer isAloneGrade; + + @ApiModelProperty(value = "单独设置折扣的配置") + private String aloneGradeEquity; + + @ApiModelProperty(value = "是否推荐") + private Integer isHot; + + @ApiModelProperty(value = "规格单位") + private String unit; + + @ApiModelProperty(value = "餐段") + private String period; + + @ApiModelProperty(value = "档口") + private Integer gear; + + @ApiModelProperty(value = "商品重量") + private Double goodsWeight; + + @ApiModelProperty(value = "商品优惠属性: 0无 1限时特惠 2特惠专区") + private Integer attribute; + + @ApiModelProperty(value = "是否开启单独分销(0关闭 1开启)") + private Integer isIndDealer; + + @ApiModelProperty(value = "是否开启限购") + private Integer purchaseLimit; + + @ApiModelProperty(value = "分销佣金类型(10百分比 20固定金额)") + private Integer dealerMoneyType; + + @ApiModelProperty(value = "分销佣金(一级)") + private BigDecimal firstMoney; + + @ApiModelProperty(value = "分销佣金(二级)") + private BigDecimal secondMoney; + + @ApiModelProperty(value = "分销佣金(三级)") + private BigDecimal thirdMoney; + + @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 = "商户编号") + private String merchantCode; + + @ApiModelProperty(value = "商户名称") + @TableField(exist = false) + private String merchantName; + + @ApiModelProperty(value = "租户id") + private Integer tenantId; + + @ApiModelProperty(value = "注册时间") + private Date createTime; + + @ApiModelProperty(value = "修改时间") + private Date updateTime; + + @ApiModelProperty(value = "购物车购买数量") + @TableField(exist = false) + private Integer totalNum; + + @ApiModelProperty(value = "已预定份数") + @TableField(exist = false) + private Integer deliveryTimes; + + @ApiModelProperty(value = "未领取份数") + @TableField(exist = false) + private Integer noDeliveryTimes; + +} diff --git a/src/main/java/com/gxwebsoft/shop/entity/GoodsService.java b/src/main/java/com/gxwebsoft/shop/entity/GoodsService.java new file mode 100644 index 0000000..6dcf75b --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/entity/GoodsService.java @@ -0,0 +1,71 @@ +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 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 2022-11-23 21:57:50 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "GoodsService对象", description = "商品服务与承诺记录表") +@TableName("shop_goods_service") +public class GoodsService implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "商品服务ID") + @TableId(value = "service_id", type = IdType.AUTO) + private Integer serviceId; + + @ApiModelProperty(value = "服务名称") + private String name; + + @ApiModelProperty(value = "概述") + private String summary; + + @ApiModelProperty(value = "是否默认(新增商品时)") + private Integer isDefault; + + @ApiModelProperty(value = "用户ID") + private Integer userId; + + @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 = "租户id") + private Integer tenantId; + + @ApiModelProperty(value = "注册时间") + private Date createTime; + + @ApiModelProperty(value = "修改时间") + private Date updateTime; + +} diff --git a/src/main/java/com/gxwebsoft/shop/entity/Member.java b/src/main/java/com/gxwebsoft/shop/entity/Member.java new file mode 100644 index 0000000..7dc3ec2 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/entity/Member.java @@ -0,0 +1,50 @@ +package com.gxwebsoft.shop.entity; + +import com.baomidou.mybatisplus.annotation.*; + +import java.time.LocalDateTime; +import java.io.Serializable; +import java.util.Date; + +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 2022-11-25 14:02:24 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "Member对象", description = "商城会员") +@TableName("shop_member") +public class Member implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键ID") + @TableId(value = "member_id", type = IdType.AUTO) + private Integer memberId; + + @ApiModelProperty(value = "用户ID") + private Integer userId; + + @ApiModelProperty("登录账号") + @TableField(exist = false) + private String username; + + @ApiModelProperty("用户昵称") + @TableField(exist = false) + private String nickname; + + @ApiModelProperty(value = "注册时间") + private Date createTime; + + @ApiModelProperty("用户信息") + @TableField(exist = false) + private User user; + +} diff --git a/src/main/java/com/gxwebsoft/shop/entity/Merchant.java b/src/main/java/com/gxwebsoft/shop/entity/Merchant.java new file mode 100644 index 0000000..b7402ee --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/entity/Merchant.java @@ -0,0 +1,216 @@ +package com.gxwebsoft.shop.entity; + +import cn.hutool.core.util.NumberUtil; +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 2022-11-30 15:10: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 merchantType; + + @ApiModelProperty(value = "当前可提现金额") + private BigDecimal money; + + @ApiModelProperty(value = "已冻结金额") + private BigDecimal freezeMoney; + + @ApiModelProperty(value = "累积提现金额") + private BigDecimal totalMoney; + + @ApiModelProperty(value = "今日收益") + private BigDecimal todayMoney; + + @ApiModelProperty(value = "本月收益") + private BigDecimal monthMoney; + + @ApiModelProperty(value = "推荐收益比率") + private BigDecimal firstRatio; + + @ApiModelProperty(value = "本月收益") + private BigDecimal secondRatio; + + @ApiModelProperty(value = "门店收益") + private BigDecimal shopRatio; + + @ApiModelProperty(value = "区县收益") + private BigDecimal regionRatio; + + @ApiModelProperty(value = "市级收益") + private BigDecimal cityRatio; + + @ApiModelProperty(value = "省级收益") + private BigDecimal provinceRatio; + + @ApiModelProperty(value = "线上会员收益") + private BigDecimal onlineRatio; + + @ApiModelProperty(value = "线下会员收益") + private BigDecimal offlineRatio; + + @ApiModelProperty(value = "服务费") + private BigDecimal serverRatio; + + @ApiModelProperty(value = "商户logo") + private String logo; + + @ApiModelProperty(value = "商户背景图片") + private String background; + + @ApiModelProperty(value = "营业时间") + private String merchantHours; + + @ApiModelProperty(value = "所在省份") + private String province; + + @ApiModelProperty(value = "所在城市") + private String city; + + @ApiModelProperty(value = "所在辖区") + private String region; + + @ApiModelProperty(value = "详细地址") + private String address; + + @ApiModelProperty(value = "商户详情") + private String content; + + @ApiModelProperty(value = "商户坐标经纬度") + private String lngAndLat; + + @ApiModelProperty(value = "geohash") + private String geohash; + + @ApiModelProperty(value = "商户简介") + private String summary; + + @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 = "是否可编辑 0 商户可编辑 1 管理员可编辑") + private Integer isEdit; + + @ApiModelProperty(value = "是否支持自提核销(0否 1支持)") + private Integer isCheck; + + @ApiModelProperty(value = "店主") + private Integer merchantOwner; + + @ApiModelProperty(value = "门店联系电话") + private String merchantPhone; + + @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 customerId; + + @ApiModelProperty(value = "租户id") + private Integer tenantId; + + @ApiModelProperty(value = "注册时间") + private Date createTime; + + @ApiModelProperty(value = "修改时间") + private Date updateTime; + + @ApiModelProperty("登录账号") + @TableField(exist = false) + private String username; + + @ApiModelProperty("用户昵称") + @TableField(exist = false) + private String nickname; + + @ApiModelProperty("用户等级") + @TableField(exist = false) + private Integer gradeId; + + @ApiModelProperty("用户等级") + @TableField(exist = false) + private String gradeName; + + @ApiModelProperty(value = "联系电话") + @TableField(exist = false) + private String phone; + + @ApiModelProperty(value = "距离") + @TableField(exist = false) + private Double distance; + + @ApiModelProperty(value = "店铺ID") + @TableField(exist = false) + private Long shopId; + + @ApiModelProperty(value = "哗啦啦店铺信息") + @TableField(exist = false) + private Object shopInfo; + + @ApiModelProperty(value = "提现金额") + @TableField(exist = false) + private BigDecimal amount; + + public Long getShopId(){ + if(NumberUtil.isLong(this.merchantCode)){ + return Long.parseLong(merchantCode); + } + return null; + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/entity/MerchantClerk.java b/src/main/java/com/gxwebsoft/shop/entity/MerchantClerk.java new file mode 100644 index 0000000..e215fc6 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/entity/MerchantClerk.java @@ -0,0 +1,57 @@ +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.time.LocalDateTime; +import java.io.Serializable; +import java.util.Date; + +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 2022-11-30 16:32:25 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "MerchantClerk对象", description = "商家门店店员表") +@TableName("shop_merchant_clerk") +public class MerchantClerk implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "商户人员ID") + @TableId(value = "clerk_id", type = IdType.AUTO) + private Integer clerkId; + + @ApiModelProperty(value = "关联商户编号") + private String merchantCode; + + @ApiModelProperty(value = "关联商户名称") + @TableField(exist = false) + private String merchantName; + + @ApiModelProperty(value = "用户ID") + private Integer userId; + + @ApiModelProperty(value = "是否为商户主") + private Integer isOwner; + + @ApiModelProperty(value = "租户id") + private Integer tenantId; + + @ApiModelProperty(value = "注册时间") + private Date createTime; + + @ApiModelProperty("用户信息") + @TableField(exist = false) + private User user; + +} diff --git a/src/main/java/com/gxwebsoft/shop/entity/MerchantWithdraw.java b/src/main/java/com/gxwebsoft/shop/entity/MerchantWithdraw.java new file mode 100644 index 0000000..4da10c1 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/entity/MerchantWithdraw.java @@ -0,0 +1,110 @@ +package com.gxwebsoft.shop.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 2022-12-02 00:41:09 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "MerchantWithdraw对象", description = "商户提现记录") +@TableName("shop_merchant_withdraw") +public class MerchantWithdraw implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键ID") + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + @ApiModelProperty(value = "提现单号") + private String withdrawCode; + + @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 String rejectReason; + + @ApiModelProperty(value = "来源客户端(APP、H5、小程序等)") + private String platform; + + @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 merchantName; + + @ApiModelProperty(value = "评论者昵称") + @TableField(exist = false) + private String nickname; + + @ApiModelProperty(value = "评论者头像") + @TableField(exist = false) + private String avatar; + + @ApiModelProperty(value = "真实姓名") + @TableField(exist = false) + private String realName; + +} diff --git a/src/main/java/com/gxwebsoft/shop/entity/Order.java b/src/main/java/com/gxwebsoft/shop/entity/Order.java new file mode 100644 index 0000000..77e2914 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/entity/Order.java @@ -0,0 +1,261 @@ +package com.gxwebsoft.shop.entity; + +import com.baomidou.mybatisplus.annotation.*; +import com.gxwebsoft.apps.entity.Equipment; +import com.gxwebsoft.apps.entity.EquipmentOrderGoods; +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 WebSoft + * @since 2022-11-16 11:25:58 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "Order对象", description = "订单记录表") +@TableName("shop_order") +public class Order 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 subject; + + @ApiModelProperty(value = "订单号") + private Long orderNo; + + @ApiModelProperty(value = "商品总金额(不含优惠折扣)") + private BigDecimal totalPrice; + + @ApiModelProperty(value = "订单金额(含优惠折扣)") + private BigDecimal orderPrice; + + @ApiModelProperty(value = "优惠券ID") + private Integer couponId; + + @ApiModelProperty(value = "优惠券抵扣金额") + private BigDecimal couponMoney; + + @ApiModelProperty(value = "积分抵扣金额") + private BigDecimal pointsMoney; + + @ApiModelProperty(value = "积分抵扣数量") + private Integer pointsNum; + + @ApiModelProperty(value = "实际付款金额(包含运费)") + private BigDecimal payPrice; + + @ApiModelProperty(value = "第三方支付实收金额") + private BigDecimal receiptAmount; + + @ApiModelProperty(value = "后台修改的订单金额(差价)") + private BigDecimal updatePrice; + + @ApiModelProperty(value = "买家留言") + private String buyerRemark; + + @ApiModelProperty(value = "支付方式(废弃)") + private Integer payType; + + @ApiModelProperty(value = "支付方式（余额/微信/支付宝）") + private String payMethod; + + @ApiModelProperty(value = "付款状态(10未付款 20已付款)") + private Integer payStatus; + + @ApiModelProperty(value = "付款时间") + private Date payTime; + + @ApiModelProperty(value = "服务开始时间") + private Date startTime; + + @ApiModelProperty(value = "服务到期时间") + private Date expirationTime; + + @ApiModelProperty(value = "购买月份数量") + private Integer month; + + @ApiModelProperty(value = "0星期日 1星期一 2星期二 3星期三 4星期四 5星期五 6星期六") + private Integer week; + + @ApiModelProperty(value = "第三方交易记录ID") + private String tradeId; + + @ApiModelProperty(value = "配送方式(10快递配送 20门店自提)") + private Integer deliveryType; + + @ApiModelProperty(value = "自提门店ID") + private Integer extractShopId; + + @ApiModelProperty(value = "核销店员ID") + private Integer extractClerkId; + + @ApiModelProperty(value = "运费金额") + private BigDecimal expressPrice; + + @ApiModelProperty(value = "物流公司ID (废弃)") + private Integer expressId; + + @ApiModelProperty(value = "物流单号 (废弃)") + private String expressNo; + + @ApiModelProperty(value = "发货状态(10未发货 20已发货 30部分发货)") + private Integer deliveryStatus; + + @ApiModelProperty(value = "发货时间") + private Date deliveryTime; + + @ApiModelProperty(value = "收货状态(10未收货 20已收货)") + private Integer receiptStatus; + + @ApiModelProperty(value = "收货时间") + private Date receiptTime; + + @ApiModelProperty(value = "订单状态(10进行中 20取消 21待取消 30已完成)") + private Integer orderStatus; + + @ApiModelProperty(value = "赠送的积分数量") + private Integer pointsBonus; + + @ApiModelProperty(value = "商家备注") + private String merchantRemark; + + @ApiModelProperty(value = "订单是否已结算(0未结算 1已结算)") + private Integer isSettled; + + @ApiModelProperty(value = "最后结算时间") + private Date settledTime; + + @ApiModelProperty(value = "续租订单的关联单号") + private Integer rentOrderId; + + @ApiModelProperty(value = "微信支付交易号(废弃)") + private String transactionId; + + @ApiModelProperty(value = "是否已评价(0否 1是)") + private Integer isComment; + + @ApiModelProperty(value = "订单来源(10普通订单 20砍价订单 30秒杀订单)") + private Integer orderSource; + + @ApiModelProperty(value = "来源记录ID") + private Integer orderSourceId; + + @ApiModelProperty(value = "来源记录的参数 (json格式)") + private String orderSourceData; + + @ApiModelProperty(value = "电池租金") + private BigDecimal batteryRent; + + @ApiModelProperty(value = "电池押金") + private BigDecimal batteryDeposit; + + @ApiModelProperty(value = "保险") + private BigDecimal batteryInsurance; + + @ApiModelProperty(value = "来源客户端 (APP、H5、小程序等)") + private String platform; + + @ApiModelProperty(value = "是否续费订单") + private Integer isRenew; + + @ApiModelProperty(value = "是否临时报餐") + private Integer isTemporary; + + @ApiModelProperty(value = "用户ID") + private Integer userId; + + @ApiModelProperty(value = "所属门店ID") + private Integer shopId; + + @ApiModelProperty(value = "商品ID") + private Integer goodsId; + + @ApiModelProperty(value = "设备ID") + private Integer equipmentId; + + @ApiModelProperty(value = "商户编号") + private String merchantCode; + + @ApiModelProperty(value = "商户名称") + @TableField(exist = false) + private String merchantName; + + @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("账号") + @TableField(exist = false) + private String username; + + @ApiModelProperty("用户别名") + @TableField(exist = false) + private String alias; + + @ApiModelProperty("用户昵称") + @TableField(exist = false) + private String nickname; + + @ApiModelProperty(value = "联系电话") + @TableField(exist = false) + private String phone; + + @ApiModelProperty(value = "头像") + @TableField(exist = false) + private String avatar; + + @ApiModelProperty(value = "所属部门") + @TableField(exist = false) + private Integer organizationId; + + @ApiModelProperty(value = "部门名称") + @TableField(exist = false) + private String organizationName; + + @ApiModelProperty("商品列表") + @TableField(exist = false) + private List goodsList; + + @ApiModelProperty("管理电池商品") + @TableField(exist = false) + private EquipmentOrderGoods equipmentGoods; + + @ApiModelProperty("设备") + @TableField(exist = false) + private Equipment equipment; + + @ApiModelProperty("推荐人ID") + @TableField(exist = false) + private Integer dealerId; +} diff --git a/src/main/java/com/gxwebsoft/shop/entity/OrderAddress.java b/src/main/java/com/gxwebsoft/shop/entity/OrderAddress.java new file mode 100644 index 0000000..68f1202 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/entity/OrderAddress.java @@ -0,0 +1,81 @@ +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 2022-12-02 21:21:10 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "OrderAddress对象", description = "订单收货地址记录表") +@TableName("shop_order_address") +public class OrderAddress implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "地址ID") + @TableId(value = "order_address_id", type = IdType.AUTO) + private Integer orderAddressId; + + @ApiModelProperty(value = "收货人姓名") + private String name; + + @ApiModelProperty(value = "联系电话") + private String phone; + + @ApiModelProperty(value = "省份ID") + private Integer provinceId; + + @ApiModelProperty(value = "城市ID") + private Integer cityId; + + @ApiModelProperty(value = "区/县ID") + private Integer regionId; + + @ApiModelProperty(value = "详细地址") + private String detail; + + @ApiModelProperty(value = "订单ID") + private Integer orderId; + + @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 = "关联商户编号") + private String merchantCode; + + @ApiModelProperty(value = "租户id") + private Integer tenantId; + + @ApiModelProperty(value = "注册时间") + private Date createTime; + + @ApiModelProperty(value = "修改时间") + private Date updateTime; + +} diff --git a/src/main/java/com/gxwebsoft/shop/entity/OrderGoods.java b/src/main/java/com/gxwebsoft/shop/entity/OrderGoods.java new file mode 100644 index 0000000..6163cd9 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/entity/OrderGoods.java @@ -0,0 +1,200 @@ +package com.gxwebsoft.shop.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 2022-12-09 17:15:31 + */ +@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 = "order_goods_id", type = IdType.AUTO) + private Integer orderGoodsId; + + @ApiModelProperty(value = "商品ID") + private Integer goodsId; + + @ApiModelProperty(value = "商品名称") + private String goodsName; + + @ApiModelProperty(value = "商品分类ID") + private Integer categoryId; + + @ApiModelProperty(value = "分类名称") + @TableField(exist = false) + private String categoryName; + + @ApiModelProperty(value = "商品封面图") + private String imageUrl; + + @ApiModelProperty(value = "商品封面图ID") + private Integer imageId; + + @ApiModelProperty(value = "库存计算方式(10下单减库存 20付款减库存)") + private Integer deductStockType; + + @ApiModelProperty(value = "规格类型(10单规格 20多规格)") + private Integer specType; + + @ApiModelProperty(value = "商品sku唯一标识") + private String goodsSkuId; + + @ApiModelProperty(value = "SKU的规格属性(json格式)") + private String goodsProps; + + @ApiModelProperty(value = "商品详情") + private String content; + + @ApiModelProperty(value = "商品编码") + private String goodsNo; + + @ApiModelProperty(value = "商品价格(单价)") + private BigDecimal goodsPrice; + + @ApiModelProperty(value = "商品划线价") + private BigDecimal linePrice; + + @ApiModelProperty(value = "商品重量(Kg)") + private Double goodsWeight; + + @ApiModelProperty(value = "是否存在会员等级折扣") + private Integer isUserGrade; + + @ApiModelProperty(value = "会员折扣比例(0-10)") + private Integer gradeRatio; + + @ApiModelProperty(value = "会员折扣的商品单价") + private BigDecimal gradeGoodsPrice; + + @ApiModelProperty(value = "会员折扣的总额差") + private BigDecimal gradeTotalMoney; + + @ApiModelProperty(value = "优惠券折扣金额") + private BigDecimal couponMoney; + + @ApiModelProperty(value = "积分金额") + private BigDecimal pointsMoney; + + @ApiModelProperty(value = "积分抵扣数量") + private Integer pointsNum; + + @ApiModelProperty(value = "赠送的积分数量") + private Integer pointsBonus; + + @ApiModelProperty(value = "付款状态(10未付款 20已付款)") + @TableField(exist = false) + private Integer payStatus; + + @ApiModelProperty(value = "购买数量") + private Integer totalNum; + + @ApiModelProperty(value = "商品总价(数量×单价)") + private BigDecimal totalPrice; + + @ApiModelProperty(value = "实际付款价(折扣和优惠后)") + private BigDecimal totalPayPrice; + + @ApiModelProperty(value = "发货状态(10未发货 20已发货 30部分发货)") + private Integer deliveryStatus; + + @ApiModelProperty(value = "发货时间") + @TableField(exist = false) + private Date deliveryTime; + + @ApiModelProperty(value = "0星期日 1星期一 2星期二 3星期三 4星期四 5星期五 6星期六") + @TableField(exist = false) + private Integer week; + + @ApiModelProperty(value = "已发货数量") + private Integer deliveryNum; + + @ApiModelProperty(value = "所属档口") + private Integer gear; + + @ApiModelProperty(value = "是否临时报餐") + private Integer temporary; + + @ApiModelProperty(value = "是否开启单独分销(0关闭 1开启)") + private Integer isIndDealer; + + @ApiModelProperty(value = "分销佣金类型(10百分比 20固定金额)") + private Integer dealerMoneyType; + + @ApiModelProperty(value = "分销佣金(一级)") + private BigDecimal firstMoney; + + @ApiModelProperty(value = "分销佣金(二级)") + private BigDecimal secondMoney; + + @ApiModelProperty(value = "分销佣金(三级)") + private BigDecimal thirdMoney; + + @ApiModelProperty(value = "是否已评价(0否 1是)") + private Integer isComment; + + @ApiModelProperty(value = "订单ID") + private Integer orderId; + + @ApiModelProperty(value = "用户ID") + private Integer userId; + + @ApiModelProperty(value = "来源记录ID") + private Integer goodsSourceId; + + @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 Integer orderStatus; + + @ApiModelProperty("是否允许取消") + @TableField(exist = false) + private Boolean isCancel; + + @ApiModelProperty("导出数据") + @TableField(exist = false) + private Object exportData; +} diff --git a/src/main/java/com/gxwebsoft/shop/entity/OrderRefund.java b/src/main/java/com/gxwebsoft/shop/entity/OrderRefund.java new file mode 100644 index 0000000..67400a9 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/entity/OrderRefund.java @@ -0,0 +1,117 @@ +package com.gxwebsoft.shop.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-05-18 13:09:51 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "OrderRefund对象", description = "售后单记录表") +@TableName("shop_order_refund") +public class OrderRefund implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "售后单ID") + @TableId(value = "order_refund_id", type = IdType.AUTO) + private Integer orderRefundId; + + @ApiModelProperty(value = "订单ID") + private Integer orderId; + + @ApiModelProperty(value = "订单商品ID") + private Integer orderGoodsId; + + @ApiModelProperty(value = "用户ID") + private Integer userId; + + @ApiModelProperty(value = "售后类型(10退货退款 20换货)") + private Integer type; + + @ApiModelProperty(value = "用户申请原因(说明)") + private String applyDesc; + + @ApiModelProperty(value = "商家审核状态(0待审核 10已同意 20已拒绝)") + private Integer auditStatus; + + @ApiModelProperty(value = "商家拒绝原因(说明)") + private String refuseDesc; + + @ApiModelProperty(value = "实际退款金额") + private BigDecimal refundMoney; + + @ApiModelProperty(value = "用户是否发货(0未发货 1已发货)") + private Integer isUserSend; + + @ApiModelProperty(value = "用户发货时间") + private Integer sendTime; + + @ApiModelProperty(value = "用户发货物流公司ID") + private String expressId; + + @ApiModelProperty(value = "用户发货物流单号") + private String expressNo; + + @ApiModelProperty(value = "商家收货状态(0未收货 1已收货)") + private Integer isReceipt; + + @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; + + @ApiModelProperty(value = "昵称") + @TableField(exist = false) + private String nickname; + + @ApiModelProperty(value = "头像") + @TableField(exist = false) + private String avatar; + + @ApiModelProperty(value = "设备编号") + @TableField(exist = false) + private String equipmentCode; + + @ApiModelProperty(value = "商户名称") + @TableField(exist = false) + private String merchantName; + + +} diff --git a/src/main/java/com/gxwebsoft/shop/entity/OrderRefundAddress.java b/src/main/java/com/gxwebsoft/shop/entity/OrderRefundAddress.java new file mode 100644 index 0000000..2bff36d --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/entity/OrderRefundAddress.java @@ -0,0 +1,82 @@ +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 java.util.Date; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 售后单退货地址记录表 + * + * @author 科技小王子 + * @since 2023-05-18 13:09:51 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "OrderRefundAddress对象", description = "售后单退货地址记录表") +@TableName("shop_order_refund_address") +public class OrderRefundAddress 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 orderRefundId; + + @ApiModelProperty(value = "收货人姓名") + private String name; + + @ApiModelProperty(value = "联系电话") + private String phone; + + @ApiModelProperty(value = "所在省份ID") + private Integer provinceId; + + @ApiModelProperty(value = "所在城市ID") + private Integer cityId; + + @ApiModelProperty(value = "所在区/县ID") + private Integer regionId; + + @ApiModelProperty(value = "详细地址") + private String detail; + + @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 = "商户编码") + private String merchantCode; + + @ApiModelProperty(value = "租户id") + private Integer tenantId; + + @ApiModelProperty(value = "注册时间") + private Date createTime; + + @ApiModelProperty(value = "修改时间") + private Date updateTime; + +} diff --git a/src/main/java/com/gxwebsoft/shop/entity/OrderRenew.java b/src/main/java/com/gxwebsoft/shop/entity/OrderRenew.java new file mode 100644 index 0000000..450572b --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/entity/OrderRenew.java @@ -0,0 +1,77 @@ +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 2023-04-13 10:34:35 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "OrderRenew对象", description = "续费订单记录表") +@TableName("shop_order_renew") +public class OrderRenew implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "续费单ID") + @TableId(value = "order_renew_id", type = IdType.AUTO) + private Integer orderRenewId; + + @ApiModelProperty(value = "订单ID") + private Integer orderId; + + @ApiModelProperty(value = "订单商品ID") + private Integer orderGoodsId; + + @ApiModelProperty(value = "用户ID") + private Integer userId; + + @ApiModelProperty(value = "类型(10续费订单)") + private Integer type; + + @ApiModelProperty(value = "实际续费金额") + private BigDecimal renewMoney; + + @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/src/main/java/com/gxwebsoft/shop/entity/Payment.java b/src/main/java/com/gxwebsoft/shop/entity/Payment.java new file mode 100644 index 0000000..3e21235 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/entity/Payment.java @@ -0,0 +1,72 @@ +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 2022-12-15 19:11:07 + */ +@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 = "payment_id", type = IdType.AUTO) + private Integer paymentId; + + @ApiModelProperty(value = "支付方式(微信、支付宝、余额)") + private String method; + + @ApiModelProperty(value = "编码") + private String paymentCode; + + @ApiModelProperty(value = "支付配置(json格式)") + private String config; + + @ApiModelProperty(value = "是否为默认支付方式") + private Integer isDefault; + + @ApiModelProperty(value = "是否启用") + private Integer isEnable; + + @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/src/main/java/com/gxwebsoft/shop/entity/PaymentTemplate.java b/src/main/java/com/gxwebsoft/shop/entity/PaymentTemplate.java new file mode 100644 index 0000000..64a9eb3 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/entity/PaymentTemplate.java @@ -0,0 +1,75 @@ +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 2022-12-09 13:59:38 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "PaymentTemplate对象", description = "商城支付模板记录表") +@TableName("shop_payment_template") +public class PaymentTemplate implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "支付模板ID") + @TableId(value = "template_id", type = IdType.AUTO) + private Integer templateId; + + @ApiModelProperty(value = "支付模板名称") + private String name; + + @ApiModelProperty(value = "支付方式(微信、支付宝、余额)") + private String method; + + @ApiModelProperty(value = "支付配置(json格式)") + private String config; + + @ApiModelProperty(value = "管理员备注") + private String remarks; + + @ApiModelProperty(value = "用户ID") + private Integer userId; + + @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/src/main/java/com/gxwebsoft/shop/entity/PaymentTrade.java b/src/main/java/com/gxwebsoft/shop/entity/PaymentTrade.java new file mode 100644 index 0000000..729eead --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/entity/PaymentTrade.java @@ -0,0 +1,91 @@ +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 java.util.Date; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 第三方支付交易记录表 + * + * @author 科技小王子 + * @since 2022-12-09 13:59:38 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "PaymentTrade对象", description = "第三方支付交易记录表") +@TableName("shop_payment_trade") +public class PaymentTrade implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "交易记录ID") + @TableId(value = "trade_id", type = IdType.AUTO) + private Integer tradeId; + + @ApiModelProperty(value = "交易订单号(全局唯一)") + private String outTradeNo; + + @ApiModelProperty(value = "发起客户端(H5、小程序、APP)") + private String client; + + @ApiModelProperty(value = "支付方式(微信、支付宝)") + private String payMethod; + + @ApiModelProperty(value = "订单类型(10商城订单 100余额充值订单)") + private Integer orderType; + + @ApiModelProperty(value = "订单ID(商城订单、充值订单)") + private Integer orderId; + + @ApiModelProperty(value = "商城订单号(商城订单、充值订单)") + private String orderNo; + + @ApiModelProperty(value = "第三方交易流水号") + private String tradeNo; + + @ApiModelProperty(value = "预支付交易会话ID(微信支付)") + private String prepayId; + + @ApiModelProperty(value = "交易状态") + private Integer tradeState; + + @ApiModelProperty(value = "用户ID") + private Integer userId; + + @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/src/main/java/com/gxwebsoft/shop/entity/RechargeOrder.java b/src/main/java/com/gxwebsoft/shop/entity/RechargeOrder.java new file mode 100644 index 0000000..3cb2268 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/entity/RechargeOrder.java @@ -0,0 +1,112 @@ +package com.gxwebsoft.shop.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-20 20:36:24 + */ +@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 Long orderNo; + + @ApiModelProperty(value = "用户ID") + private Integer userId; + + @ApiModelProperty(value = "部门ID") + private Integer organizationId; + + @ApiModelProperty(value = "部门名称") + @TableField(exist = false) + private String organizationName; + + @ApiModelProperty(value = "充值方式(10自定义金额 20套餐充值)") + private Integer rechargeType; + + @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; + + @ApiModelProperty(value = "昵称") + @TableField(exist = false) + private String nickname; + + @ApiModelProperty(value = "用户头像") + @TableField(exist = false) + private String avatar; + +} diff --git a/src/main/java/com/gxwebsoft/shop/entity/RechargeOrderPlan.java b/src/main/java/com/gxwebsoft/shop/entity/RechargeOrderPlan.java new file mode 100644 index 0000000..f042503 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/entity/RechargeOrderPlan.java @@ -0,0 +1,80 @@ +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 2023-04-20 20:36:24 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "RechargeOrderPlan对象", description = "会员充值订单套餐快照表") +@TableName("shop_recharge_order_plan") +public class RechargeOrderPlan implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键ID") + @TableId(value = "order_plan_id", type = IdType.AUTO) + private Integer orderPlanId; + + @ApiModelProperty(value = "订单ID") + private Integer orderId; + + @ApiModelProperty(value = "主键ID") + private Integer planId; + + @ApiModelProperty(value = "方案名称") + private String planName; + + @ApiModelProperty(value = "充值金额") + private BigDecimal money; + + @ApiModelProperty(value = "赠送金额") + private BigDecimal giftMoney; + + @ApiModelProperty(value = "用户ID") + private Integer userId; + + @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/src/main/java/com/gxwebsoft/shop/entity/RechargePlan.java b/src/main/java/com/gxwebsoft/shop/entity/RechargePlan.java new file mode 100644 index 0000000..b1992f2 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/entity/RechargePlan.java @@ -0,0 +1,74 @@ +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 2023-04-20 20:36:24 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "RechargePlan对象", description = "会员充值套餐表") +@TableName("shop_recharge_plan") +public class RechargePlan implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键ID") + @TableId(value = "plan_id", type = IdType.AUTO) + private Integer planId; + + @ApiModelProperty(value = "套餐名称") + private String planName; + + @ApiModelProperty(value = "充值金额") + private BigDecimal money; + + @ApiModelProperty(value = "赠送金额") + private BigDecimal giftMoney; + + @ApiModelProperty(value = "用户ID") + private Integer userId; + + @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/src/main/java/com/gxwebsoft/shop/entity/UserAddress.java b/src/main/java/com/gxwebsoft/shop/entity/UserAddress.java new file mode 100644 index 0000000..184b276 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/entity/UserAddress.java @@ -0,0 +1,76 @@ +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 java.util.Date; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 用户收货地址表 + * + * @author 科技小王子 + * @since 2022-11-25 19:04:43 + */ +@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 = "address_id", type = IdType.AUTO) + private Integer addressId; + + @ApiModelProperty(value = "收货人姓名") + private String name; + + @ApiModelProperty(value = "联系电话") + private String phone; + + @ApiModelProperty(value = "省份ID") + private Integer provinceId; + + @ApiModelProperty(value = "城市ID") + private Integer cityId; + + @ApiModelProperty(value = "区/县ID") + private Integer regionId; + + @ApiModelProperty(value = "详细地址") + private String detail; + + @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/src/main/java/com/gxwebsoft/shop/entity/UserBalanceLog.java b/src/main/java/com/gxwebsoft/shop/entity/UserBalanceLog.java new file mode 100644 index 0000000..792e3cd --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/entity/UserBalanceLog.java @@ -0,0 +1,81 @@ +package com.gxwebsoft.shop.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-04-21 15:59:09 + */ +@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 = "排序(数字越小越靠前)") + 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/src/main/java/com/gxwebsoft/shop/entity/UserComment.java b/src/main/java/com/gxwebsoft/shop/entity/UserComment.java new file mode 100644 index 0000000..3938ece --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/entity/UserComment.java @@ -0,0 +1,144 @@ +package com.gxwebsoft.shop.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-06 13:55:16 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "UserComment对象", description = "用户评价记录表") +@TableName("shop_user_comment") +public class UserComment implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "评价ID") + @TableId(value = "comment_id", type = IdType.AUTO) + private Integer commentId; + + @ApiModelProperty(value = "评分 (10好评 20中评 30差评)") + private Integer score; + + @ApiModelProperty(value = "评价内容") + private String content; + + @ApiModelProperty(value = "是否为图片评价") + private Integer isPicture; + + @ApiModelProperty(value = "用户ID") + private Integer userId; + + @ApiModelProperty(value = "被评论者ID") + private Integer toUserId; + + @ApiModelProperty(value = "回复的评论ID") + private Integer replyCommentId; + + @ApiModelProperty(value = "回复者ID") + private Integer replyUserId; + + @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 Integer fans; + + @ApiModelProperty(value = "是否已点赞") + @TableField(exist = false) + private Integer liked; + + @ApiModelProperty(value = "评论者获赞数") + @TableField(exist = false) + private Boolean likes; + + @ApiModelProperty(value = "评论者所在省份") + @TableField(exist = false) + private String province; + + @ApiModelProperty(value = "评论者所在城市") + @TableField(exist = false) + private String city; + + @ApiModelProperty(value = "被评论者昵称") + @TableField(exist = false) + private String toUserNickname; + + @ApiModelProperty(value = "被评论者头像") + @TableField(exist = false) + private String toUserAvatar; + + @ApiModelProperty(value = "被评论者粉丝数") + @TableField(exist = false) + private Integer toUserFans; + + @ApiModelProperty(value = "被评论者所在省份") + @TableField(exist = false) + private String toUserProvince; + + @ApiModelProperty(value = "被评论者所在城市") + @TableField(exist = false) + private String toUserCity; + + @ApiModelProperty(value = "被评论者获赞数") + @TableField(exist = false) + private Integer toUserLikes; + + @ApiModelProperty(value = "回复者昵称") + @TableField(exist = false) + private String replyNickname; + + @ApiModelProperty(value = "回复者头像") + @TableField(exist = false) + private String replyAvatar; + + @ApiModelProperty(value = "回复者粉丝数") + @TableField(exist = false) + private Integer replyFans; + + @ApiModelProperty(value = "子评论列表") + @TableField(exist = false) + private List children; + +} diff --git a/src/main/java/com/gxwebsoft/shop/entity/UserCoupon.java b/src/main/java/com/gxwebsoft/shop/entity/UserCoupon.java new file mode 100644 index 0000000..cf5ed0d --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/entity/UserCoupon.java @@ -0,0 +1,100 @@ +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.math.BigDecimal; +import java.util.Date; + +/** + * 用户优惠券记录表 + * + * @author 科技小王子 + * @since 2022-11-25 19:04:43 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "UserCoupon对象", description = "用户优惠券记录表") +@TableName("shop_user_coupon") +public class UserCoupon implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键ID") + @TableId(value = "user_coupon_id", type = IdType.AUTO) + private Integer userCouponId; + + @ApiModelProperty(value = "优惠券ID") + private Integer couponId; + + @ApiModelProperty(value = "优惠券名称") + private String name; + + @ApiModelProperty(value = "优惠券类型(10满减券 20折扣券)") + private Integer couponType; + + @ApiModelProperty(value = "满减券-减免金额") + private BigDecimal reducePrice; + + @ApiModelProperty(value = "折扣券-折扣率(0-100)") + private Integer discount; + + @ApiModelProperty(value = "最低消费金额") + private BigDecimal minPrice; + + @ApiModelProperty(value = "到期类型(10领取后生效 20固定时间)") + private Integer expireType; + + @ApiModelProperty(value = "领取后生效-有效天数") + private Integer expireDay; + + @ApiModelProperty(value = "有效期开始时间") + private Integer startTime; + + @ApiModelProperty(value = "有效期结束时间") + private Integer endTime; + + @ApiModelProperty(value = "适用范围(10全部商品 20指定商品)") + private Integer applyRange; + + @ApiModelProperty(value = "适用范围配置(json格式)") + private String applyRangeConfig; + + @ApiModelProperty(value = "是否过期(0未过期 1已过期)") + private Integer isExpire; + + @ApiModelProperty(value = "是否已使用(0未使用 1已使用)") + private Integer isUse; + + @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/src/main/java/com/gxwebsoft/shop/entity/UserFeedback.java b/src/main/java/com/gxwebsoft/shop/entity/UserFeedback.java new file mode 100644 index 0000000..78ec9b9 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/entity/UserFeedback.java @@ -0,0 +1,70 @@ +package com.gxwebsoft.shop.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-07-16 22:24:55 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "UserFeedback对象", description = "意见反馈记录表") +@TableName("shop_user_feedback") +public class UserFeedback 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 type; + + @ApiModelProperty(value = "内容") + private String content; + + @ApiModelProperty(value = "反馈图片") + private String images; + + @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 = "昵称") + @TableField(exist = false) + private String nickname; + + @ApiModelProperty(value = "用户头像") + @TableField(exist = false) + private String avatar; + +} diff --git a/src/main/java/com/gxwebsoft/shop/entity/UserFollow.java b/src/main/java/com/gxwebsoft/shop/entity/UserFollow.java new file mode 100644 index 0000000..8472f49 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/entity/UserFollow.java @@ -0,0 +1,91 @@ +package com.gxwebsoft.shop.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.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 2022-11-25 19:04:43 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "UserFollow对象", description = "关注记录表") +@TableName("shop_user_follow") +public class UserFollow 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 = "关注人") + @TableField(exist = false) + private User formUser; + + @ApiModelProperty(value = "被关注人") + @TableField(exist = false) + private User toUser; + + @ApiModelProperty(value = "商铺ID") + private Integer shopId; + + @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是") + 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 shopNickname; + + @ApiModelProperty(value = "被关注人头像") + @TableField(exist = false) + private String shopAvatar; + + @ApiModelProperty(value = "是否相互关注") + @TableField(exist = false) + private Boolean eachFollow; + +} diff --git a/src/main/java/com/gxwebsoft/shop/entity/UserGrade.java b/src/main/java/com/gxwebsoft/shop/entity/UserGrade.java new file mode 100644 index 0000000..e6a501d --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/entity/UserGrade.java @@ -0,0 +1,72 @@ +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 2023-06-20 16:33:06 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "UserGrade对象", description = "用户会员等级表") +@TableName("shop_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 = "商户编码") + private String merchantCode; + + @ApiModelProperty(value = "租户id") + private Integer tenantId; + + @ApiModelProperty(value = "注册时间") + private Date createTime; + + @ApiModelProperty(value = "修改时间") + private Date updateTime; + +} diff --git a/src/main/java/com/gxwebsoft/shop/entity/UserGradeLog.java b/src/main/java/com/gxwebsoft/shop/entity/UserGradeLog.java new file mode 100644 index 0000000..b6adcb5 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/entity/UserGradeLog.java @@ -0,0 +1,72 @@ +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 2023-06-20 16:33:06 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "UserGradeLog对象", description = "用户会员等级变更记录表") +@TableName("shop_user_grade_log") +public class UserGradeLog 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 = "变更前的等级ID") + private Integer oldGradeId; + + @ApiModelProperty(value = "变更后的等级ID") + private Integer newGradeId; + + @ApiModelProperty(value = "变更类型(10后台管理员设置 20自动升级)") + private Integer changeType; + + @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; + +} diff --git a/src/main/java/com/gxwebsoft/shop/entity/UserLike.java b/src/main/java/com/gxwebsoft/shop/entity/UserLike.java new file mode 100644 index 0000000..80f88f7 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/entity/UserLike.java @@ -0,0 +1,78 @@ +package com.gxwebsoft.shop.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-07-06 17:51:04 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "UserLike对象", description = "点赞记录表") +@TableName("shop_user_like") +public class UserLike 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 toUserId; + + @ApiModelProperty(value = "用户ID") + private Integer userId; + + @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是") + 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 toUserNickname; + + @ApiModelProperty(value = "被评论者头像") + @TableField(exist = false) + private String toUserAvatar; + +} diff --git a/src/main/java/com/gxwebsoft/shop/entity/UserLook.java b/src/main/java/com/gxwebsoft/shop/entity/UserLook.java new file mode 100644 index 0000000..1a67ea1 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/entity/UserLook.java @@ -0,0 +1,61 @@ +package com.gxwebsoft.shop.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-07-13 23:10:38 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "UserLook对象", description = "访客记录表") +@TableName("shop_user_look") +public class UserLook 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 toUserId; + + @ApiModelProperty(value = "用户ID") + private Integer userId; + + @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 = "访问者昵称") + @TableField(exist = false) + private String nickname; + + @ApiModelProperty(value = "访问者头像") + @TableField(exist = false) + private String avatar; + +} diff --git a/src/main/java/com/gxwebsoft/shop/entity/UserOauth.java b/src/main/java/com/gxwebsoft/shop/entity/UserOauth.java new file mode 100644 index 0000000..c3f4c28 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/entity/UserOauth.java @@ -0,0 +1,69 @@ +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 2022-12-15 08:33:13 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "UserOauth对象", description = "第三方用户信息表") +@TableName("shop_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是") + @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/src/main/java/com/gxwebsoft/shop/entity/UserPointsLog.java b/src/main/java/com/gxwebsoft/shop/entity/UserPointsLog.java new file mode 100644 index 0000000..bda4980 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/entity/UserPointsLog.java @@ -0,0 +1,66 @@ +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 2022-11-25 19:04:43 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "UserPointsLog对象", description = "用户积分变动明细表") +@TableName("shop_user_points_log") +public class UserPointsLog 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 = "变动数量") + private Integer value; + + @ApiModelProperty(value = "描述/说明") + private String describe; + + @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 = "租户id") + private Integer tenantId; + + @ApiModelProperty(value = "注册时间") + private Date createTime; + + @ApiModelProperty(value = "修改时间") + private Date updateTime; + +} diff --git a/src/main/java/com/gxwebsoft/shop/entity/UserReferee.java b/src/main/java/com/gxwebsoft/shop/entity/UserReferee.java new file mode 100644 index 0000000..6c9e45e --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/entity/UserReferee.java @@ -0,0 +1,107 @@ +package com.gxwebsoft.shop.entity; + +import com.baomidou.mybatisplus.annotation.*; +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; +import java.util.List; + +/** + * 用户推荐关系表 + * + * @author 科技小王子 + * @since 2023-04-28 14:07:29 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "UserReferee对象", description = "用户推荐关系表") +@TableName("shop_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; + + @ApiModelProperty(value = "推荐人") + @TableField(exist = false) + private User dealer; + + @ApiModelProperty(value = "被推荐人") + @TableField(exist = false) + private User user; + + @ApiModelProperty(value = "被推荐人的报餐信息") + @TableField(exist = false) + private List order; + + @ApiModelProperty(value = "被推荐人的报餐菜品") + @TableField(exist = false) + private List orderGoods; + + @ApiModelProperty(value = "被推荐人昵称") + @TableField(exist = false) + private String nickname; + + @ApiModelProperty(value = "被推荐人头像") + @TableField(exist = false) + private String avatar; + + @ApiModelProperty(value = "被推荐人等级ID") + @TableField(exist = false) + private Integer gradeId; + + @ApiModelProperty(value = "被推荐人等级") + @TableField(exist = false) + private String gradeName; + + @ApiModelProperty(value = "推荐人昵称") + @TableField(exist = false) + private String dealerName; + + @ApiModelProperty(value = "推荐人头像") + @TableField(exist = false) + private String dealerAvatar; + + @ApiModelProperty(value = "推荐人电话") + @TableField(exist = false) + private String dealerPhone; + + @ApiModelProperty(value = "用户所属门店") + private Integer merchantId; + + @ApiModelProperty(value = "所属门店") + @TableField(exist = false) + private Merchant merchant; + +} diff --git a/src/main/java/com/gxwebsoft/shop/mapper/CartMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/CartMapper.java new file mode 100644 index 0000000..8889fcd --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/CartMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.shop.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +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 2022-11-25 19:04:43 + */ +public interface CartMapper extends BaseMapper { + + /** + * 分页查询 + * + * @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/src/main/java/com/gxwebsoft/shop/mapper/CategoryMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/CategoryMapper.java new file mode 100644 index 0000000..bdf81ed --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/CategoryMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.shop.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.shop.entity.Category; +import com.gxwebsoft.shop.param.CategoryParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 商品分类表Mapper + * + * @author 科技小王子 + * @since 2022-11-22 17:45:37 + */ +public interface CategoryMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") CategoryParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") CategoryParam param); + +} diff --git a/src/main/java/com/gxwebsoft/shop/mapper/CommentMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/CommentMapper.java new file mode 100644 index 0000000..7ba9719 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/CommentMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.shop.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.shop.entity.Comment; +import com.gxwebsoft.shop.param.CommentParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 商品评价记录表Mapper + * + * @author 科技小王子 + * @since 2022-11-23 21:18:56 + */ +public interface CommentMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") CommentParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") CommentParam param); + +} diff --git a/src/main/java/com/gxwebsoft/shop/mapper/CouponMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/CouponMapper.java new file mode 100644 index 0000000..bd393cb --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/CouponMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.shop.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.shop.entity.Coupon; +import com.gxwebsoft.shop.param.CouponParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 优惠券记录表Mapper + * + * @author 科技小王子 + * @since 2022-11-28 18:26:05 + */ +public interface CouponMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") CouponParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") CouponParam param); + +} diff --git a/src/main/java/com/gxwebsoft/shop/mapper/ExpressMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/ExpressMapper.java new file mode 100644 index 0000000..80fa82a --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/ExpressMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.shop.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.shop.entity.Express; +import com.gxwebsoft.shop.param.ExpressParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 物流公司记录表Mapper + * + * @author 科技小王子 + * @since 2022-11-22 00:21:07 + */ +public interface ExpressMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") ExpressParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") ExpressParam param); + +} diff --git a/src/main/java/com/gxwebsoft/shop/mapper/GoodsMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/GoodsMapper.java new file mode 100644 index 0000000..bbecec7 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/GoodsMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.shop.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +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 2022-11-23 12:47:16 + */ +public interface GoodsMapper extends BaseMapper { + + /** + * 分页查询 + * + * @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/src/main/java/com/gxwebsoft/shop/mapper/GoodsServiceMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/GoodsServiceMapper.java new file mode 100644 index 0000000..821e516 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/GoodsServiceMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.shop.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.shop.entity.GoodsService; +import com.gxwebsoft.shop.param.GoodsServiceParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 商品服务与承诺记录表Mapper + * + * @author 科技小王子 + * @since 2022-11-23 21:57:50 + */ +public interface GoodsServiceMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") GoodsServiceParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") GoodsServiceParam param); + +} diff --git a/src/main/java/com/gxwebsoft/shop/mapper/MemberMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/MemberMapper.java new file mode 100644 index 0000000..5d8e4be --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/MemberMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.shop.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.shop.entity.Member; +import com.gxwebsoft.shop.param.MemberParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 商城会员Mapper + * + * @author 科技小王子 + * @since 2022-11-25 14:02:24 + */ +public interface MemberMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") MemberParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") MemberParam param); + +} diff --git a/src/main/java/com/gxwebsoft/shop/mapper/MerchantClerkMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/MerchantClerkMapper.java new file mode 100644 index 0000000..12d4754 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/MerchantClerkMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.shop.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.shop.entity.MerchantClerk; +import com.gxwebsoft.shop.param.MerchantClerkParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 商家门店店员表Mapper + * + * @author 科技小王子 + * @since 2022-11-30 16:32:25 + */ +public interface MerchantClerkMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") MerchantClerkParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") MerchantClerkParam param); + +} diff --git a/src/main/java/com/gxwebsoft/shop/mapper/MerchantMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/MerchantMapper.java new file mode 100644 index 0000000..aeaf966 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/MerchantMapper.java @@ -0,0 +1,37 @@ +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 2022-11-30 15:10: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/src/main/java/com/gxwebsoft/shop/mapper/MerchantWithdrawMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/MerchantWithdrawMapper.java new file mode 100644 index 0000000..b8d711c --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/MerchantWithdrawMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.shop.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.shop.entity.MerchantWithdraw; +import com.gxwebsoft.shop.param.MerchantWithdrawParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 商户提现记录Mapper + * + * @author 科技小王子 + * @since 2022-12-02 00:41:09 + */ +public interface MerchantWithdrawMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") MerchantWithdrawParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") MerchantWithdrawParam param); + +} diff --git a/src/main/java/com/gxwebsoft/shop/mapper/OrderAddressMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/OrderAddressMapper.java new file mode 100644 index 0000000..ac793d8 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/OrderAddressMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.shop.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.shop.entity.OrderAddress; +import com.gxwebsoft.shop.param.OrderAddressParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 订单收货地址记录表Mapper + * + * @author 科技小王子 + * @since 2022-12-02 21:21:10 + */ +public interface OrderAddressMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") OrderAddressParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") OrderAddressParam param); + +} diff --git a/src/main/java/com/gxwebsoft/shop/mapper/OrderGoodsMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/OrderGoodsMapper.java new file mode 100644 index 0000000..090562a --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/OrderGoodsMapper.java @@ -0,0 +1,48 @@ +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.OrderGoods; +import com.gxwebsoft.shop.param.OrderGoodsParam; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +/** + * 订单商品记录表Mapper + * + * @author 科技小王子 + * @since 2022-12-09 17:15:31 + */ +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); + + + List selectByOrderIds(List orderIds); + + @InterceptorIgnore(tenantLine = "true") + @Select("SELECT * FROM shop_order_goods WHERE order_id = #{param.orderId}") + List selectByOrderId(Integer orderId); + + @InterceptorIgnore(tenantLine = "true") + int selectCountBySettled(@Param("param") OrderGoodsParam param); +} diff --git a/src/main/java/com/gxwebsoft/shop/mapper/OrderMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/OrderMapper.java new file mode 100644 index 0000000..5fe85a1 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/OrderMapper.java @@ -0,0 +1,59 @@ +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.Order; +import com.gxwebsoft.shop.param.OrderParam; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +/** + * 订单记录表Mapper + * + * @author WebSoft + * @since 2022-11-16 11:25:58 + */ +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 getOne(@Param("param") OrderParam param); + + @InterceptorIgnore(tenantLine = "true") + boolean updatePayStatus(@Param("param") OrderParam param); + + @InterceptorIgnore(tenantLine = "true") + @Select("UPDATE shop_order SET pay_status = #{param.payStatus} where order_no = #{param.orderNo}") + List getAll(@Param("param") OrderParam param); + +// @InterceptorIgnore(tenantLine = "true") + boolean updateByIdRel(@Param("param") Order order); + + @InterceptorIgnore(tenantLine = "true") + List selectPageSettled(@Param("page") IPage page, + @Param("param") OrderParam param); + + @InterceptorIgnore(tenantLine = "true") + void updateByIdSettled(@Param("param") Order order); +} diff --git a/src/main/java/com/gxwebsoft/shop/mapper/OrderRefundAddressMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/OrderRefundAddressMapper.java new file mode 100644 index 0000000..363dd16 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/OrderRefundAddressMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.shop.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.shop.entity.OrderRefundAddress; +import com.gxwebsoft.shop.param.OrderRefundAddressParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 售后单退货地址记录表Mapper + * + * @author 科技小王子 + * @since 2023-05-18 13:09:51 + */ +public interface OrderRefundAddressMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") OrderRefundAddressParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") OrderRefundAddressParam param); + +} diff --git a/src/main/java/com/gxwebsoft/shop/mapper/OrderRefundMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/OrderRefundMapper.java new file mode 100644 index 0000000..2afaccd --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/OrderRefundMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.shop.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.shop.entity.OrderRefund; +import com.gxwebsoft.shop.param.OrderRefundParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 售后单记录表Mapper + * + * @author 科技小王子 + * @since 2023-05-18 13:09:51 + */ +public interface OrderRefundMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") OrderRefundParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") OrderRefundParam param); + +} diff --git a/src/main/java/com/gxwebsoft/shop/mapper/OrderRenewMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/OrderRenewMapper.java new file mode 100644 index 0000000..f82389d --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/OrderRenewMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.shop.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.shop.entity.OrderRenew; +import com.gxwebsoft.shop.param.OrderRenewParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 续费订单记录表Mapper + * + * @author 科技小王子 + * @since 2023-04-13 10:34:35 + */ +public interface OrderRenewMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") OrderRenewParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") OrderRenewParam param); + +} diff --git a/src/main/java/com/gxwebsoft/shop/mapper/PaymentMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/PaymentMapper.java new file mode 100644 index 0000000..2f2c331 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/PaymentMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.shop.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.shop.entity.Payment; +import com.gxwebsoft.shop.param.PaymentParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 商城支付方式记录表Mapper + * + * @author 科技小王子 + * @since 2022-12-15 19:11:07 + */ +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/src/main/java/com/gxwebsoft/shop/mapper/PaymentTemplateMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/PaymentTemplateMapper.java new file mode 100644 index 0000000..de133ec --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/PaymentTemplateMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.shop.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.shop.entity.PaymentTemplate; +import com.gxwebsoft.shop.param.PaymentTemplateParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 商城支付模板记录表Mapper + * + * @author 科技小王子 + * @since 2022-12-09 13:59:38 + */ +public interface PaymentTemplateMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") PaymentTemplateParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") PaymentTemplateParam param); + +} diff --git a/src/main/java/com/gxwebsoft/shop/mapper/PaymentTradeMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/PaymentTradeMapper.java new file mode 100644 index 0000000..b830756 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/PaymentTradeMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.shop.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.shop.entity.PaymentTrade; +import com.gxwebsoft.shop.param.PaymentTradeParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 第三方支付交易记录表Mapper + * + * @author 科技小王子 + * @since 2022-12-09 13:59:38 + */ +public interface PaymentTradeMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") PaymentTradeParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") PaymentTradeParam param); + +} diff --git a/src/main/java/com/gxwebsoft/shop/mapper/RechargeOrderMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/RechargeOrderMapper.java new file mode 100644 index 0000000..c4ee775 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/RechargeOrderMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.shop.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.shop.entity.RechargeOrder; +import com.gxwebsoft.shop.param.RechargeOrderParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 会员充值订单表Mapper + * + * @author 科技小王子 + * @since 2023-04-20 20:36:24 + */ +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/src/main/java/com/gxwebsoft/shop/mapper/RechargeOrderPlanMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/RechargeOrderPlanMapper.java new file mode 100644 index 0000000..5330632 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/RechargeOrderPlanMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.shop.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.shop.entity.RechargeOrderPlan; +import com.gxwebsoft.shop.param.RechargeOrderPlanParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 会员充值订单套餐快照表Mapper + * + * @author 科技小王子 + * @since 2023-04-20 20:36:24 + */ +public interface RechargeOrderPlanMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") RechargeOrderPlanParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") RechargeOrderPlanParam param); + +} diff --git a/src/main/java/com/gxwebsoft/shop/mapper/RechargePlanMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/RechargePlanMapper.java new file mode 100644 index 0000000..50b241f --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/RechargePlanMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.shop.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.shop.entity.RechargePlan; +import com.gxwebsoft.shop.param.RechargePlanParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 会员充值套餐表Mapper + * + * @author 科技小王子 + * @since 2023-04-20 20:36:24 + */ +public interface RechargePlanMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") RechargePlanParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") RechargePlanParam param); + +} diff --git a/src/main/java/com/gxwebsoft/shop/mapper/UserAddressMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/UserAddressMapper.java new file mode 100644 index 0000000..c2864e3 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/UserAddressMapper.java @@ -0,0 +1,37 @@ +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 2022-11-25 19:04:43 + */ +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/src/main/java/com/gxwebsoft/shop/mapper/UserBalanceLogMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/UserBalanceLogMapper.java new file mode 100644 index 0000000..0e01179 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/UserBalanceLogMapper.java @@ -0,0 +1,37 @@ +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 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/src/main/java/com/gxwebsoft/shop/mapper/UserCommentMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/UserCommentMapper.java new file mode 100644 index 0000000..41b5aab --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/UserCommentMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.shop.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.shop.entity.UserComment; +import com.gxwebsoft.shop.param.UserCommentParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 用户评价记录表Mapper + * + * @author 科技小王子 + * @since 2023-07-06 13:55:16 + */ +public interface UserCommentMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") UserCommentParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") UserCommentParam param); + +} diff --git a/src/main/java/com/gxwebsoft/shop/mapper/UserCouponMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/UserCouponMapper.java new file mode 100644 index 0000000..3f29906 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/UserCouponMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.shop.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.shop.entity.UserCoupon; +import com.gxwebsoft.shop.param.UserCouponParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 用户优惠券记录表Mapper + * + * @author 科技小王子 + * @since 2022-11-25 19:04:43 + */ +public interface UserCouponMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") UserCouponParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") UserCouponParam param); + +} diff --git a/src/main/java/com/gxwebsoft/shop/mapper/UserFeedbackMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/UserFeedbackMapper.java new file mode 100644 index 0000000..9a093c0 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/UserFeedbackMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.shop.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.shop.entity.UserFeedback; +import com.gxwebsoft.shop.param.UserFeedbackParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 意见反馈记录表Mapper + * + * @author 科技小王子 + * @since 2023-07-16 22:24:55 + */ +public interface UserFeedbackMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") UserFeedbackParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") UserFeedbackParam param); + +} diff --git a/src/main/java/com/gxwebsoft/shop/mapper/UserFollowMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/UserFollowMapper.java new file mode 100644 index 0000000..8ed7e5f --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/UserFollowMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.shop.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.shop.entity.UserFollow; +import com.gxwebsoft.shop.param.UserFollowParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 关注记录表Mapper + * + * @author 科技小王子 + * @since 2022-11-25 19:04:43 + */ +public interface UserFollowMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") UserFollowParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") UserFollowParam param); + +} diff --git a/src/main/java/com/gxwebsoft/shop/mapper/UserGradeLogMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/UserGradeLogMapper.java new file mode 100644 index 0000000..a16c6a2 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/UserGradeLogMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.shop.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.shop.entity.UserGradeLog; +import com.gxwebsoft.shop.param.UserGradeLogParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 用户会员等级变更记录表Mapper + * + * @author 科技小王子 + * @since 2023-06-20 16:33:06 + */ +public interface UserGradeLogMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") UserGradeLogParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") UserGradeLogParam param); + +} diff --git a/src/main/java/com/gxwebsoft/shop/mapper/UserGradeMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/UserGradeMapper.java new file mode 100644 index 0000000..bac98d8 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/UserGradeMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.shop.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.shop.entity.UserGrade; +import com.gxwebsoft.shop.param.UserGradeParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 用户会员等级表Mapper + * + * @author 科技小王子 + * @since 2023-06-20 16:33:06 + */ +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/src/main/java/com/gxwebsoft/shop/mapper/UserLikeMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/UserLikeMapper.java new file mode 100644 index 0000000..8b6bd23 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/UserLikeMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.shop.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.shop.entity.UserLike; +import com.gxwebsoft.shop.param.UserLikeParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 点赞记录表Mapper + * + * @author 科技小王子 + * @since 2023-07-06 17:51:04 + */ +public interface UserLikeMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") UserLikeParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") UserLikeParam param); + +} diff --git a/src/main/java/com/gxwebsoft/shop/mapper/UserLookMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/UserLookMapper.java new file mode 100644 index 0000000..66065cc --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/UserLookMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.shop.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.shop.entity.UserLook; +import com.gxwebsoft.shop.param.UserLookParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 访客记录表Mapper + * + * @author 科技小王子 + * @since 2023-07-13 23:10:38 + */ +public interface UserLookMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") UserLookParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") UserLookParam param); + +} diff --git a/src/main/java/com/gxwebsoft/shop/mapper/UserOauthMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/UserOauthMapper.java new file mode 100644 index 0000000..56e86d0 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/UserOauthMapper.java @@ -0,0 +1,47 @@ +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.Order; +import com.gxwebsoft.shop.entity.UserOauth; +import com.gxwebsoft.shop.param.OrderParam; +import com.gxwebsoft.shop.param.UserOauthParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 第三方用户信息表Mapper + * + * @author 科技小王子 + * @since 2022-12-15 08:33:13 + */ +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); + + @InterceptorIgnore(tenantLine = "true") + List getOne(@Param("param") UserOauthParam param); + + @InterceptorIgnore(tenantLine = "true") + List getByOauthId(@Param("param") UserOauthParam param); + + +} diff --git a/src/main/java/com/gxwebsoft/shop/mapper/UserPointsLogMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/UserPointsLogMapper.java new file mode 100644 index 0000000..c07ac82 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/UserPointsLogMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.shop.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.shop.entity.UserPointsLog; +import com.gxwebsoft.shop.param.UserPointsLogParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 用户积分变动明细表Mapper + * + * @author 科技小王子 + * @since 2022-11-25 19:04:43 + */ +public interface UserPointsLogMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") UserPointsLogParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") UserPointsLogParam param); + +} diff --git a/src/main/java/com/gxwebsoft/shop/mapper/UserRefereeMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/UserRefereeMapper.java new file mode 100644 index 0000000..ca09702 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/UserRefereeMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.shop.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.shop.entity.UserReferee; +import com.gxwebsoft.shop.param.UserRefereeParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 用户推荐关系表Mapper + * + * @author 科技小王子 + * @since 2023-04-28 14:07:29 + */ +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/src/main/java/com/gxwebsoft/shop/mapper/xml/CartMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/CartMapper.xml new file mode 100644 index 0000000..5f0bd18 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/CartMapper.xml @@ -0,0 +1,59 @@ + + + + + + + SELECT a.* + FROM shop_cart a + + + AND a.id = #{param.id} + + + AND a.goods_id = #{param.goodsId} + + + AND a.goods_sku_id LIKE CONCAT('%', #{param.goodsSkuId}, '%') + + + AND a.goods_num = #{param.goodsNum} + + + AND a.status = #{param.status} + + + AND a.user_id = #{param.userId} + + + AND a.sort_number = #{param.sortNumber} + + + 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/src/main/java/com/gxwebsoft/shop/mapper/xml/CategoryMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/CategoryMapper.xml new file mode 100644 index 0000000..0073a4b --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/CategoryMapper.xml @@ -0,0 +1,59 @@ + + + + + + + SELECT a.* + FROM shop_category a + + + AND a.category_id = #{param.categoryId} + + + AND a.name LIKE CONCAT('%', #{param.name}, '%') + + + AND a.parent_id = #{param.parentId} + + + AND a.user_id = #{param.userId} + + + AND a.shop_code = #{param.merchantCode} + + + 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/src/main/java/com/gxwebsoft/shop/mapper/xml/CommentMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/CommentMapper.xml new file mode 100644 index 0000000..e78cafe --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/CommentMapper.xml @@ -0,0 +1,68 @@ + + + + + + + SELECT a.* + FROM shop_comment a + + + AND a.comment_id = #{param.commentId} + + + AND a.score = #{param.score} + + + AND a.content LIKE CONCAT('%', #{param.content}, '%') + + + AND a.is_picture = #{param.isPicture} + + + AND a.user_id = #{param.userId} + + + AND a.order_id = #{param.orderId} + + + AND a.goods_id = #{param.goodsId} + + + AND a.order_goods_id = #{param.orderGoodsId} + + + 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/src/main/java/com/gxwebsoft/shop/mapper/xml/CouponMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/CouponMapper.xml new file mode 100644 index 0000000..a35abc5 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/CouponMapper.xml @@ -0,0 +1,95 @@ + + + + + + + SELECT a.* + FROM shop_coupon a + + + AND a.coupon_id = #{param.couponId} + + + AND a.name LIKE CONCAT('%', #{param.name}, '%') + + + AND a.coupon_type = #{param.couponType} + + + AND a.reduce_price = #{param.reducePrice} + + + AND a.discount = #{param.discount} + + + AND a.min_price = #{param.minPrice} + + + AND a.expire_type = #{param.expireType} + + + AND a.expire_day = #{param.expireDay} + + + AND a.start_time = #{param.startTime} + + + AND a.end_time = #{param.endTime} + + + AND a.apply_range = #{param.applyRange} + + + AND a.apply_range_config LIKE CONCAT('%', #{param.applyRangeConfig}, '%') + + + AND a.total_num = #{param.totalNum} + + + AND a.receive_num = #{param.receiveNum} + + + AND a.describe LIKE CONCAT('%', #{param.describe}, '%') + + + AND a.user_id = #{param.userId} + + + 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.create_time >= #{param.createTimeStart} + + + AND a.create_time <= #{param.createTimeEnd} + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/ExpressMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/ExpressMapper.xml new file mode 100644 index 0000000..46abc2a --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/ExpressMapper.xml @@ -0,0 +1,62 @@ + + + + + + + SELECT a.* + FROM shop_express a + + + AND a.express_id = #{param.expressId} + + + AND a.express_name LIKE CONCAT('%', #{param.expressName}, '%') + + + AND a.kuaidi100_code LIKE CONCAT('%', #{param.kuaidi100Code}, '%') + + + AND a.kdniao_code LIKE CONCAT('%', #{param.kdniaoCode}, '%') + + + AND a.user_id = #{param.userId} + + + 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.create_time >= #{param.createTimeStart} + + + AND a.create_time <= #{param.createTimeEnd} + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsMapper.xml new file mode 100644 index 0000000..03aaa5b --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsMapper.xml @@ -0,0 +1,168 @@ + + + + + + + SELECT a.*, + b.merchant_name,b.merchant_code, + c.title as categoryName,c.parent_id,c.category_id + FROM shop_goods a + LEFT JOIN shop_merchant b ON a.merchant_code = b.merchant_code + LEFT JOIN shop_category c ON a.category_id = c.category_id + + + AND a.goods_id = #{param.goodsId} + + + AND a.goods_name LIKE CONCAT('%', #{param.goodsName}, '%') + + + AND a.goods_code LIKE CONCAT('%', #{param.goodsCode}, '%') + + + AND a.goods_type = #{param.goodsType} + + + AND a.category_id = #{param.categoryId} + + + AND a.image LIKE CONCAT('%', #{param.image}, '%') + + + AND a.files LIKE CONCAT('%', #{param.files}, '%') + + + AND a.video_url LIKE CONCAT('%', #{param.videoUrl}, '%') + + + AND a.selling_point LIKE CONCAT('%', #{param.sellingPoint}, '%') + + + AND a.spec_type = #{param.specType} + + + AND a.goods_price_min = #{param.goodsPriceMin} + + + AND a.goods_price_max = #{param.goodsPriceMax} + + + AND a.line_price_min = #{param.linePriceMin} + + + AND a.line_price_max = #{param.linePriceMax} + + + AND a.stock_total = #{param.stockTotal} + + + AND a.deduct_stock_type = #{param.deductStockType} + + + AND a.content LIKE CONCAT('%', #{param.content}, '%') + + + AND a.sales_initial = #{param.salesInitial} + + + AND a.sales_actual = #{param.salesActual} + + + AND a.delivery_id = #{param.deliveryId} + + + AND a.is_points_gift = #{param.isPointsGift} + + + AND a.is_points_discount = #{param.isPointsDiscount} + + + AND a.is_alone_points_discount = #{param.isAlonePointsDiscount} + + + AND a.points_discount_config LIKE CONCAT('%', #{param.pointsDiscountConfig}, '%') + + + AND a.is_enable_grade = #{param.isEnableGrade} + + + AND a.is_alone_grade = #{param.isAloneGrade} + + + AND a.alone_grade_equity LIKE CONCAT('%', #{param.aloneGradeEquity}, '%') + + + AND a.is_hot = #{param.isHot} + + + AND a.unit LIKE CONCAT('%', #{param.unit}, '%') + + + AND a.attribute = #{param.attribute} + + + AND a.is_ind_dealer = #{param.isIndDealer} + + + AND a.dealer_money_type = #{param.dealerMoneyType} + + + AND a.first_money = #{param.firstMoney} + + + AND a.second_money = #{param.secondMoney} + + + AND a.third_money = #{param.thirdMoney} + + + 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.merchant_code = #{param.merchantCode} + + + AND b.merchant_name = #{param.merchantName} + + + AND a.period = #{param.period} + + + AND a.gear = #{param.gear} + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsServiceMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsServiceMapper.xml new file mode 100644 index 0000000..ae2f5da --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsServiceMapper.xml @@ -0,0 +1,62 @@ + + + + + + + SELECT a.* + FROM shop_goods_service a + + + AND a.service_id = #{param.serviceId} + + + AND a.name LIKE CONCAT('%', #{param.name}, '%') + + + AND a.summary LIKE CONCAT('%', #{param.summary}, '%') + + + AND a.is_default = #{param.isDefault} + + + AND a.user_id = #{param.userId} + + + 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.create_time >= #{param.createTimeStart} + + + AND a.create_time <= #{param.createTimeEnd} + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/MemberMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/MemberMapper.xml new file mode 100644 index 0000000..f285a73 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/MemberMapper.xml @@ -0,0 +1,61 @@ + + + + + + + SELECT a.user_id,a.member_id,a.create_time addTime, + b.* + FROM shop_member a + LEFT JOIN sys_user b ON a.user_id = b.user_id + + + AND a.member_id = #{param.memberId} + + + 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 b.username = #{param.username} + + + AND b.nickname LIKE CONCAT('%', #{param.nickname}, '%') + + + AND b.phone = #{param.phone} + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/MerchantClerkMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/MerchantClerkMapper.xml new file mode 100644 index 0000000..aaf3ec1 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/MerchantClerkMapper.xml @@ -0,0 +1,46 @@ + + + + + + + SELECT a.*, + b.merchant_name,b.merchant_code + FROM shop_merchant_clerk a + LEFT JOIN shop_merchant b ON a.merchant_code = b.merchant_code + + + AND a.clerk_id = #{param.clerkId} + + + AND a.merchant_code LIKE CONCAT('%', #{param.merchantCode}, '%') + + + AND a.user_id = #{param.userId} + + + AND a.is_owner = #{param.isOwner} + + + AND a.create_time >= #{param.createTimeStart} + + + AND a.create_time <= #{param.createTimeEnd} + + + AND b.merchant_name LIKE CONCAT('%', #{param.merchantName}, '%') + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/MerchantMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/MerchantMapper.xml new file mode 100644 index 0000000..dd2532d --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/MerchantMapper.xml @@ -0,0 +1,150 @@ + + + + + + + SELECT a.*, + b.username, b.nickname, b.phone, + c.grade_id,c.name as gradeName + FROM shop_merchant a + LEFT JOIN sys_user b ON a.merchant_owner = b.user_id + LEFT JOIN shop_user_grade c ON b.grade_id = c.grade_id + + + AND a.merchant_id = #{param.merchantId} + + + AND a.merchant_name LIKE CONCAT('%', #{param.merchantName}, '%') + + + AND a.merchant_code LIKE CONCAT('%', #{param.merchantCode}, '%') + + + AND a.money = #{param.money} + + + AND a.freeze_money = #{param.freezeMoney} + + + AND a.total_money = #{param.totalMoney} + + + AND a.logo LIKE CONCAT('%', #{param.logo}, '%') + + + AND a.background LIKE CONCAT('%', #{param.background}, '%') + + + AND a.merchant_hours LIKE CONCAT('%', #{param.merchantHours}, '%') + + + 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.content LIKE CONCAT('%', #{param.content}, '%') + + + AND a.lng_and_lat LIKE CONCAT('%', #{param.lngAndLat}, '%') + + + AND a.geohash LIKE CONCAT('%', #{param.geohash}, '%') + + + AND a.summary LIKE CONCAT('%', #{param.summary}, '%') + + + 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.is_edit = #{param.isEdit} + + + AND a.is_check = #{param.isCheck} + + + AND a.merchant_owner = #{param.merchantOwner} + + + 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.customer_id = #{param.customerId} + + + AND a.create_time >= #{param.createTimeStart} + + + AND a.create_time <= #{param.createTimeEnd} + + + AND b.username = #{param.username} + + + AND b.nickname LIKE CONCAT('%', #{param.nickname}, '%') + + + AND b.phone = #{param.phone} + + + AND a.tenant_id = #{param.tenantId} + + + AND c.grade_id = #{param.gradeId} + + + AND c.grade_id >= 7 + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/MerchantWithdrawMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/MerchantWithdrawMapper.xml new file mode 100644 index 0000000..168062a --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/MerchantWithdrawMapper.xml @@ -0,0 +1,100 @@ + + + + + + + SELECT a.*, + b.merchant_code,b.merchant_name, + c.nickname,c.avatar,c.real_name + FROM shop_merchant_withdraw a + LEFT JOIN shop_merchant b ON a.merchant_code = b.merchant_code + LEFT JOIN sys_user c ON a.user_id = c.user_id + + + AND a.id = #{param.id} + + + AND a.withdraw_code = #{param.withdrawCode} + + + + 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.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.merchant_name LIKE CONCAT('%', #{param.merchantName}, '%') + + + AND b.merchant_code = #{param.merchantCode} + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/OrderAddressMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/OrderAddressMapper.xml new file mode 100644 index 0000000..211ca19 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/OrderAddressMapper.xml @@ -0,0 +1,74 @@ + + + + + + + SELECT a.* + FROM shop_order_address a + + + AND a.order_address_id = #{param.orderAddressId} + + + AND a.name LIKE CONCAT('%', #{param.name}, '%') + + + AND a.phone LIKE CONCAT('%', #{param.phone}, '%') + + + AND a.province_id = #{param.provinceId} + + + AND a.city_id = #{param.cityId} + + + AND a.region_id = #{param.regionId} + + + AND a.detail LIKE CONCAT('%', #{param.detail}, '%') + + + AND a.order_id = #{param.orderId} + + + 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.merchant_code LIKE CONCAT('%', #{param.merchantCode}, '%') + + + AND a.create_time >= #{param.createTimeStart} + + + AND a.create_time <= #{param.createTimeEnd} + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/OrderGoodsMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/OrderGoodsMapper.xml new file mode 100644 index 0000000..6a57e30 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/OrderGoodsMapper.xml @@ -0,0 +1,219 @@ + + + + + + + SELECT a.*,b.nickname,c.order_status,c.pay_status,c.is_temporary,c.order_status,c.deleted,c.week,c.delivery_time as deliveryTime + FROM shop_order_goods a + LEFT JOIN sys_user b ON a.user_id = b.user_id + LEFT JOIN shop_order c ON a.order_id = c.order_id + + + AND a.order_goods_id = #{param.orderGoodsId} + + + AND a.goods_id = #{param.goodsId} + + + AND a.goods_name LIKE CONCAT('%', #{param.goodsName}, '%') + + + AND a.category_id LIKE CONCAT('%', #{param.categoryId}, '%') + + + AND a.temporary = #{param.temporary} + + + AND c.pay_status = #{param.payStatus} + + + AND a.image_id = #{param.imageId} + + + AND a.deduct_stock_type = #{param.deductStockType} + + + AND a.spec_type = #{param.specType} + + + AND a.goods_sku_id LIKE CONCAT('%', #{param.goodsSkuId}, '%') + + + AND a.goods_props LIKE CONCAT('%', #{param.goodsProps}, '%') + + + AND a.content LIKE CONCAT('%', #{param.content}, '%') + + + AND a.goods_no LIKE CONCAT('%', #{param.goodsNo}, '%') + + + AND a.goods_price = #{param.goodsPrice} + + + AND a.line_price = #{param.linePrice} + + + AND a.goods_weight LIKE CONCAT('%', #{param.goodsWeight}, '%') + + + AND a.is_user_grade = #{param.isUserGrade} + + + AND a.grade_ratio = #{param.gradeRatio} + + + AND a.grade_goods_price = #{param.gradeGoodsPrice} + + + AND a.grade_total_money = #{param.gradeTotalMoney} + + + AND a.coupon_money = #{param.couponMoney} + + + AND a.points_money = #{param.pointsMoney} + + + AND a.points_num = #{param.pointsNum} + + + AND a.points_bonus = #{param.pointsBonus} + + + AND a.total_num = #{param.totalNum} + + + AND a.total_num > 0 + + + AND a.total_price = #{param.totalPrice} + + + AND a.total_pay_price = #{param.totalPayPrice} + + + AND a.delivery_status = #{param.deliveryStatus} + + + AND c.delivery_time = #{param.deliveryTime} + + + AND a.delivery_num = #{param.deliveryNum} + + + AND a.is_ind_dealer = #{param.isIndDealer} + + + AND a.dealer_money_type = #{param.dealerMoneyType} + + + AND a.first_money = #{param.firstMoney} + + + AND a.second_money = #{param.secondMoney} + + + AND a.third_money = #{param.thirdMoney} + + + AND a.is_comment = #{param.isComment} + + + AND a.order_id = #{param.orderId} + + + AND a.user_id = #{param.userId} + + + AND a.goods_source_id = #{param.goodsSourceId} + + + 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 c.deleted = 0 + + + AND a.merchant_code LIKE CONCAT('%', #{param.merchantCode}, '%') + + + AND a.create_time >= #{param.createTimeStart} + + + AND a.create_time <= #{param.createTimeEnd} + + + AND c.delivery_time >= #{param.deliveryTimeStart} + + + AND c.delivery_time <= #{param.deliveryTimeEnd} + + + AND c.order_status = #{param.orderStatus} + + + AND a.gear = #{param.gear} + + + AND a.nickname LIKE CONCAT('%', #{param.nickname}, '%') + + + AND c.user_id IN (SELECT user_id FROM sys_user WHERE organization_id = #{param.organizationId}) + + + AND c.week = #{param.week} + + + AND ( + a.order_goods_id = #{param.keywords} + OR a.order_id = #{param.keywords} + OR b.nickname = #{param.keywords} + ) + + + + + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/OrderMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/OrderMapper.xml new file mode 100644 index 0000000..b9174db --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/OrderMapper.xml @@ -0,0 +1,224 @@ + + + + + + + SELECT a.*, + b.nickname,b.alias,b.username,b.user_id,b.avatar,b.phone,b.email, + c.equipment_name,c.equipment_code,c.equipment_category,c.equipment_avatar,c.battery_model,c.equipment_id, + d.merchant_name,d.merchant_code, + e.organization_id,e.organization_name + FROM shop_order a + LEFT JOIN sys_user b ON a.user_id = b.user_id + LEFT JOIN apps_equipment c ON a.equipment_id = c.equipment_id + LEFT JOIN shop_merchant d ON a.merchant_code = d.merchant_code + LEFT JOIN sys_organization e ON b.organization_id = e.organization_id + + + AND a.order_id = #{param.orderId} + + + AND a.order_no LIKE CONCAT('%', #{param.orderNo}, '%') + + + AND a.total_price = #{param.totalPrice} + + + AND a.order_price = #{param.orderPrice} + + + AND a.coupon_id = #{param.couponId} + + + AND a.coupon_money = #{param.couponMoney} + + + AND a.points_money = #{param.pointsMoney} + + + AND a.points_num = #{param.pointsNum} + + + AND a.pay_price = #{param.payPrice} + + + AND a.update_price = #{param.updatePrice} + + + AND a.buyer_remark LIKE CONCAT('%', #{param.buyerRemark}, '%') + + + AND a.pay_type = #{param.payType} + + + 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.delivery_type = #{param.deliveryType} + + + AND a.extract_shop_id = #{param.extractShopId} + + + AND a.extract_clerk_id = #{param.extractClerkId} + + + AND a.express_price = #{param.expressPrice} + + + AND a.express_id = #{param.expressId} + + + AND a.express_no LIKE CONCAT('%', #{param.expressNo}, '%') + + + AND a.delivery_status = #{param.deliveryStatus} + + + AND a.delivery_time = #{param.deliveryTime} + + + AND a.receipt_status = #{param.receiptStatus} + + + AND a.receipt_time = #{param.receiptTime} + + + AND a.order_status = #{param.orderStatus} + + + AND a.rent_order_id = #{param.rentOrderId} + + + AND a.points_bonus = #{param.pointsBonus} + + + AND a.merchant_remark LIKE CONCAT('%', #{param.merchantRemark}, '%') + + + AND a.is_settled = #{param.isSettled} + + + AND a.transaction_id LIKE CONCAT('%', #{param.transactionId}, '%') + + + AND a.is_comment = #{param.isComment} + + + AND a.order_source = #{param.orderSource} + + + AND a.order_source_id = #{param.orderSourceId} + + + AND a.order_source_data LIKE CONCAT('%', #{param.orderSourceData}, '%') + + + AND a.platform LIKE CONCAT('%', #{param.platform}, '%') + + + AND a.is_renew = #{param.isRenew} + + + AND a.week = #{param.week} + + + AND a.is_temporary = #{param.isTemporary} + + + AND a.user_id = #{param.userId} + + + AND a.user_id IN + + #{item} + + + + 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.create_time >= #{param.createTimeStart} + + + AND a.create_time <= #{param.createTimeEnd} + + + AND a.merchant_name LIKE CONCAT('%', #{param.merchantName}, '%') + + + AND a.merchant_code = #{param.merchantCode} + + + AND ( + a.order_no = #{param.keywords} + OR a.order_id = #{param.keywords} + OR a.user_id = #{param.keywords} + OR a.comments LIKE CONCAT('%', #{param.keywords}, '%') + OR b.nickname LIKE CONCAT('%', #{param.keywords}, '%') + OR b.phone = #{param.keywords} + OR c.equipment_code = #{param.keywords} + OR d.merchant_name LIKE CONCAT('%', #{param.keywords}, '%') + ) + + + + + + + + + + + + + + + + + UPDATE shop_order SET pay_status = #{param.payStatus},pay_method = #{param.payMethod},receipt_amount = #{param.receiptAmount},pay_time = #{param.payTime},trade_id = #{param.tradeId},subject = #{param.subject},expiration_time = #{param.expirationTime} WHERE order_id = #{param.orderId} + + + + + + UPDATE shop_order SET is_settled = #{param.isSettled},settled_time = #{param.settledTime} WHERE order_id = #{param.orderId} + + + + diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/OrderRefundAddressMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/OrderRefundAddressMapper.xml new file mode 100644 index 0000000..48436c7 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/OrderRefundAddressMapper.xml @@ -0,0 +1,74 @@ + + + + + + + SELECT a.* + FROM shop_order_refund_address a + + + AND a.id = #{param.id} + + + AND a.order_refund_id = #{param.orderRefundId} + + + AND a.name LIKE CONCAT('%', #{param.name}, '%') + + + AND a.phone LIKE CONCAT('%', #{param.phone}, '%') + + + AND a.province_id = #{param.provinceId} + + + AND a.city_id = #{param.cityId} + + + AND a.region_id = #{param.regionId} + + + AND a.detail LIKE CONCAT('%', #{param.detail}, '%') + + + 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.merchant_code LIKE CONCAT('%', #{param.merchantCode}, '%') + + + AND a.create_time >= #{param.createTimeStart} + + + AND a.create_time <= #{param.createTimeEnd} + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/OrderRefundMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/OrderRefundMapper.xml new file mode 100644 index 0000000..e578fea --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/OrderRefundMapper.xml @@ -0,0 +1,95 @@ + + + + + + + SELECT a.*,b.nickname,b.avatar,c.equipment_code,d.merchant_name + FROM shop_order_refund a + LEFT JOIN sys_user b ON a.user_id = b.user_id + LEFT JOIN apps_equipment c ON a.order_id = c.order_id + LEFT JOIN shop_merchant d ON a.merchant_code = d.merchant_code + + + AND a.order_refund_id = #{param.orderRefundId} + + + AND a.order_id = #{param.orderId} + + + AND a.order_goods_id = #{param.orderGoodsId} + + + AND a.user_id = #{param.userId} + + + AND a.type = #{param.type} + + + AND a.apply_desc LIKE CONCAT('%', #{param.applyDesc}, '%') + + + AND a.audit_status = #{param.auditStatus} + + + AND a.refuse_desc LIKE CONCAT('%', #{param.refuseDesc}, '%') + + + AND a.refund_money = #{param.refundMoney} + + + AND a.is_user_send = #{param.isUserSend} + + + AND a.send_time = #{param.sendTime} + + + AND a.express_id LIKE CONCAT('%', #{param.expressId}, '%') + + + AND a.express_no LIKE CONCAT('%', #{param.expressNo}, '%') + + + AND a.is_receipt = #{param.isReceipt} + + + 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} + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/OrderRenewMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/OrderRenewMapper.xml new file mode 100644 index 0000000..795becc --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/OrderRenewMapper.xml @@ -0,0 +1,68 @@ + + + + + + + SELECT a.* + FROM shop_order_renew a + + + AND a.order_renew_id = #{param.orderRenewId} + + + AND a.order_id = #{param.orderId} + + + AND a.order_goods_id = #{param.orderGoodsId} + + + AND a.user_id = #{param.userId} + + + AND a.type = #{param.type} + + + AND a.renew_money = #{param.renewMoney} + + + 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} + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/PaymentMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/PaymentMapper.xml new file mode 100644 index 0000000..89f1778 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/PaymentMapper.xml @@ -0,0 +1,62 @@ + + + + + + + SELECT a.* + FROM shop_payment a + + + AND a.payment_id = #{param.paymentId} + + + AND a.method = #{param.method} + + + AND a.payment_code LIKE CONCAT('%', #{param.paymentCode}, '%') + + + AND a.config LIKE CONCAT('%', #{param.config}, '%') + + + AND a.is_default = #{param.isDefault} + + + 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} + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/PaymentTemplateMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/PaymentTemplateMapper.xml new file mode 100644 index 0000000..df1fb84 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/PaymentTemplateMapper.xml @@ -0,0 +1,68 @@ + + + + + + + SELECT a.* + FROM shop_payment_template a + + + AND a.template_id = #{param.templateId} + + + AND a.name LIKE CONCAT('%', #{param.name}, '%') + + + AND a.method LIKE CONCAT('%', #{param.method}, '%') + + + AND a.config LIKE CONCAT('%', #{param.config}, '%') + + + AND a.remarks LIKE CONCAT('%', #{param.remarks}, '%') + + + AND a.user_id = #{param.userId} + + + 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} + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/PaymentTradeMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/PaymentTradeMapper.xml new file mode 100644 index 0000000..11fb792 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/PaymentTradeMapper.xml @@ -0,0 +1,83 @@ + + + + + + + SELECT a.* + FROM shop_payment_trade a + + + AND a.trade_id = #{param.tradeId} + + + AND a.out_trade_no LIKE CONCAT('%', #{param.outTradeNo}, '%') + + + AND a.client LIKE CONCAT('%', #{param.client}, '%') + + + AND a.pay_method LIKE CONCAT('%', #{param.payMethod}, '%') + + + AND a.order_type = #{param.orderType} + + + AND a.order_id = #{param.orderId} + + + AND a.order_no LIKE CONCAT('%', #{param.orderNo}, '%') + + + AND a.trade_no LIKE CONCAT('%', #{param.tradeNo}, '%') + + + AND a.prepay_id LIKE CONCAT('%', #{param.prepayId}, '%') + + + AND a.trade_state = #{param.tradeState} + + + AND a.user_id = #{param.userId} + + + 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} + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/RechargeOrderMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/RechargeOrderMapper.xml new file mode 100644 index 0000000..9b69f72 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/RechargeOrderMapper.xml @@ -0,0 +1,101 @@ + + + + + + + SELECT a.*,b.phone,b.nickname,b.user_id,b.avatar,c.organization_id,c.organization_name + FROM shop_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.plan_id = #{param.planId} + + + AND a.pay_price = #{param.payPrice} + + + AND a.gift_money = #{param.giftMoney} + + + AND a.actual_money = #{param.actualMoney} + + + 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 c.organization_id = #{param.organizationId} + + + AND a.create_time >= #{param.createTimeStart} + + + AND a.create_time <= #{param.createTimeEnd} + + + AND ( + b.nickname LIKE CONCAT('%', #{param.keywords}, '%') + OR b.alias LIKE CONCAT('%', #{param.keywords}, '%') + OR b.phone LIKE CONCAT('%', #{param.keywords}, '%') + ) + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/RechargeOrderPlanMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/RechargeOrderPlanMapper.xml new file mode 100644 index 0000000..99f185a --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/RechargeOrderPlanMapper.xml @@ -0,0 +1,71 @@ + + + + + + + SELECT a.* + FROM shop_recharge_order_plan a + + + AND a.order_plan_id = #{param.orderPlanId} + + + AND a.order_id = #{param.orderId} + + + AND a.plan_id = #{param.planId} + + + AND a.plan_name LIKE CONCAT('%', #{param.planName}, '%') + + + AND a.money = #{param.money} + + + AND a.gift_money = #{param.giftMoney} + + + AND a.user_id = #{param.userId} + + + 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} + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/RechargePlanMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/RechargePlanMapper.xml new file mode 100644 index 0000000..b408b92 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/RechargePlanMapper.xml @@ -0,0 +1,65 @@ + + + + + + + SELECT a.* + FROM shop_recharge_plan a + + + AND a.plan_id = #{param.planId} + + + AND a.plan_name LIKE CONCAT('%', #{param.planName}, '%') + + + AND a.money = #{param.money} + + + AND a.gift_money = #{param.giftMoney} + + + AND a.user_id = #{param.userId} + + + 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} + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/UserAddressMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/UserAddressMapper.xml new file mode 100644 index 0000000..6d27ce6 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/UserAddressMapper.xml @@ -0,0 +1,68 @@ + + + + + + + SELECT a.* + FROM shop_user_address a + + + AND a.address_id = #{param.addressId} + + + AND a.name LIKE CONCAT('%', #{param.name}, '%') + + + AND a.phone LIKE CONCAT('%', #{param.phone}, '%') + + + AND a.province_id = #{param.provinceId} + + + AND a.city_id = #{param.cityId} + + + AND a.region_id = #{param.regionId} + + + AND a.detail LIKE CONCAT('%', #{param.detail}, '%') + + + 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/src/main/java/com/gxwebsoft/shop/mapper/xml/UserBalanceLogMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/UserBalanceLogMapper.xml new file mode 100644 index 0000000..8be7e4f --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/UserBalanceLogMapper.xml @@ -0,0 +1,84 @@ + + + + + + + SELECT a.*, + b.nickname,b.avatar,b.phone + FROM shop_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/src/main/java/com/gxwebsoft/shop/mapper/xml/UserCommentMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/UserCommentMapper.xml new file mode 100644 index 0000000..0a2b3cc --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/UserCommentMapper.xml @@ -0,0 +1,71 @@ + + + + + + + SELECT a.*, + b.nickname as toUserNickname, b.avatar as toUserAvatar,b.fans as toUserFans,b.province as toUserProvince,b.city as toUserCity,b.likes as toUserLikes, + c.nickname,c.avatar,c.fans,c.province,c.city,c.likes, + d.nickname as replyNickname,d.avatar as replyAvatar,d.fans as replyFans + FROM shop_user_comment a + LEFT JOIN sys_user b ON a.to_user_id = b.user_id + LEFT JOIN sys_user c ON a.user_id = c.user_id + LEFT JOIN sys_user d ON a.reply_user_id = d.user_id + + + AND a.comment_id = #{param.commentId} + + + AND a.score = #{param.score} + + + AND a.content LIKE CONCAT('%', #{param.content}, '%') + + + AND a.is_picture = #{param.isPicture} + + + AND a.user_id = #{param.userId} + + + AND a.to_user_id = #{param.toUserId} + + + 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} + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/UserCouponMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/UserCouponMapper.xml new file mode 100644 index 0000000..59fad13 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/UserCouponMapper.xml @@ -0,0 +1,92 @@ + + + + + + + SELECT a.* + FROM shop_user_coupon a + + + AND a.user_coupon_id = #{param.userCouponId} + + + AND a.coupon_id = #{param.couponId} + + + AND a.name LIKE CONCAT('%', #{param.name}, '%') + + + AND a.coupon_type = #{param.couponType} + + + AND a.reduce_price = #{param.reducePrice} + + + AND a.discount = #{param.discount} + + + AND a.min_price = #{param.minPrice} + + + AND a.expire_type = #{param.expireType} + + + AND a.expire_day = #{param.expireDay} + + + AND a.start_time = #{param.startTime} + + + AND a.end_time = #{param.endTime} + + + AND a.apply_range = #{param.applyRange} + + + AND a.apply_range_config LIKE CONCAT('%', #{param.applyRangeConfig}, '%') + + + AND a.is_expire = #{param.isExpire} + + + AND a.is_use = #{param.isUse} + + + 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/src/main/java/com/gxwebsoft/shop/mapper/xml/UserFeedbackMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/UserFeedbackMapper.xml new file mode 100644 index 0000000..df3e8bf --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/UserFeedbackMapper.xml @@ -0,0 +1,66 @@ + + + + + + + SELECT a.*, + b.nickname,b.avatar,b.phone + FROM shop_user_feedback 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.content LIKE CONCAT('%', #{param.content}, '%') + + + AND a.images LIKE CONCAT('%', #{param.images}, '%') + + + 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.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/src/main/java/com/gxwebsoft/shop/mapper/xml/UserFollowMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/UserFollowMapper.xml new file mode 100644 index 0000000..c9717e1 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/UserFollowMapper.xml @@ -0,0 +1,60 @@ + + + + + + + SELECT a.*, + b.nickname as shopNickname,b.avatar as shopAvatar, + c.nickname,c.avatar + FROM shop_user_follow a + LEFT JOIN sys_user b ON a.shop_id = b.user_id + LEFT JOIN sys_user c ON a.user_id = c.user_id + + + AND a.log_id = #{param.logId} + + + AND a.user_id = #{param.userId} + + + AND a.shop_id = #{param.shopId} + + + 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.create_time >= #{param.createTimeStart} + + + AND a.create_time <= #{param.createTimeEnd} + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/UserGradeLogMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/UserGradeLogMapper.xml new file mode 100644 index 0000000..405a097 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/UserGradeLogMapper.xml @@ -0,0 +1,65 @@ + + + + + + + SELECT a.* + FROM shop_user_grade_log a + + + AND a.log_id = #{param.logId} + + + AND a.user_id = #{param.userId} + + + AND a.old_grade_id = #{param.oldGradeId} + + + AND a.new_grade_id = #{param.newGradeId} + + + AND a.change_type = #{param.changeType} + + + 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} + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/UserGradeMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/UserGradeMapper.xml new file mode 100644 index 0000000..c8827e4 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/UserGradeMapper.xml @@ -0,0 +1,69 @@ + + + + + + + SELECT a.* + FROM shop_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.merchant_code LIKE CONCAT('%', #{param.merchantCode}, '%') + + + AND a.create_time >= #{param.createTimeStart} + + + AND a.create_time <= #{param.createTimeEnd} + + + AND (a.name LIKE CONCAT('%', #{param.keywords}, '%') + ) + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/UserLikeMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/UserLikeMapper.xml new file mode 100644 index 0000000..fdff5ad --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/UserLikeMapper.xml @@ -0,0 +1,73 @@ + + + + + + + SELECT a.*, + b.nickname as toUserNickname, b.avatar as toUserAvatar, + c.nickname,c.avatar + FROM shop_user_like a + LEFT JOIN sys_user b ON a.to_user_id = b.user_id + LEFT JOIN sys_user c ON a.user_id = c.user_id + + + AND a.log_id = #{param.logId} + + + AND a.to_user_id = #{param.toUserId} + + + AND a.user_id = #{param.userId} + + + 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.status = 0 + AND (a.user_id = #{param.loginUserId}) + + + + AND a.status = 0 + AND (a.to_user_id = #{param.loginUserId}) + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/UserLookMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/UserLookMapper.xml new file mode 100644 index 0000000..9a55247 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/UserLookMapper.xml @@ -0,0 +1,57 @@ + + + + + + + SELECT a.*, + b.nickname,b.avatar + FROM shop_user_look a + LEFT JOIN sys_user b ON a.user_id = b.user_id + + + AND a.log_id = #{param.logId} + + + AND a.to_user_id = #{param.toUserId} + + + AND a.user_id = #{param.userId} + + + 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.status = 0 + AND (a.to_user_id = #{param.loginUserId}) + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/UserOauthMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/UserOauthMapper.xml new file mode 100644 index 0000000..005ba55 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/UserOauthMapper.xml @@ -0,0 +1,75 @@ + + + + + + + SELECT a.* + FROM shop_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.tenant_id LIKE CONCAT('%', #{param.tenantId}, '%') + + + 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} + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/UserPointsLogMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/UserPointsLogMapper.xml new file mode 100644 index 0000000..8b4cd8b --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/UserPointsLogMapper.xml @@ -0,0 +1,59 @@ + + + + + + + SELECT a.* + FROM shop_user_points_log a + + + AND a.log_id = #{param.logId} + + + AND a.user_id = #{param.userId} + + + AND a.value = #{param.value} + + + 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.create_time >= #{param.createTimeStart} + + + AND a.create_time <= #{param.createTimeEnd} + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/UserRefereeMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/UserRefereeMapper.xml new file mode 100644 index 0000000..68e0e37 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/UserRefereeMapper.xml @@ -0,0 +1,78 @@ + + + + + + + SELECT a.*, + b.nickname,b.avatar,b.sex,b.grade_id,b.offline, + c.nickname as dealerName,c.avatar as dealerAvatar,c.phone as dealerPhone, + d.name as gradeName + FROM shop_user_referee a + LEFT JOIN sys_user b ON a.user_id = b.user_id + LEFT JOIN sys_user c ON a.dealer_id = c.user_id + LEFT JOIN shop_user_grade d ON b.grade_id = d.grade_id + + + AND a.id = #{param.id} + + + AND a.dealer_id = #{param.dealerId} + + + AND a.user_id = #{param.userId} + + + AND a.level = #{param.level} + + + AND b.sex = #{param.sex} + + + 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} + + + AND b.grade_id = #{param.gradeId} + + + AND b.offline = #{param.offline} + + + AND b.grade_id >= #{param.gradeStart} + + + AND b.grade_id <= #{param.gradeEnd} + + + AND ( + a.nickname LIKE CONCAT('%', #{param.keywords}, '%') + OR b.nickname = #{param.keywords} + OR c.nickname LIKE CONCAT('%', #{param.keywords}, '%') + ) + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/shop/param/CartParam.java b/src/main/java/com/gxwebsoft/shop/param/CartParam.java new file mode 100644 index 0000000..9165881 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/param/CartParam.java @@ -0,0 +1,107 @@ +package com.gxwebsoft.shop.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.math.BigDecimal; + +/** + * 购物车记录表查询参数 + * + * @author 科技小王子 + * @since 2022-11-25 19:04:43 + */ +@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 = "商品ID") + @QueryField(type = QueryType.EQ) + private Integer goodsId; + + @ApiModelProperty(value = "商品sku唯一标识") + private String goodsSkuId; + + @ApiModelProperty(value = "商品数量") + @QueryField(type = QueryType.EQ) + private Integer goodsNum; + + @ApiModelProperty(value = "商品价格") + private BigDecimal goodsPrice; + + @ApiModelProperty(value = "商品封面图") + private String image; + + @ApiModelProperty(value = "状态, 0正常, 1冻结") + @QueryField(type = QueryType.EQ) + private Integer status; + + @ApiModelProperty(value = "所属门店ID") + @QueryField(type = QueryType.EQ) + private Integer shopId; + + @ApiModelProperty(value = "用户ID") + @QueryField(type = QueryType.EQ) + private Integer userId; + + @ApiModelProperty(value = "排序(数字越小越靠前)") + @QueryField(type = QueryType.EQ) + private Integer sortNumber; + + @ApiModelProperty(value = "是否临时报餐") + private Integer isTemporary; + + @ApiModelProperty(value = "备注") + private String comments; + + @ApiModelProperty(value = "是否删除, 0否, 1是") + @QueryField(type = QueryType.EQ) + private Integer deleted; + + @ApiModelProperty(value = "商品总数量") + @TableField(exist = false) + private Integer totalNum; + + @ApiModelProperty(value = "订单总金额") + @TableField(exist = false) + private BigDecimal totalPrice; + + @ApiModelProperty(value = "发货时间") + @TableField(exist = false) + private String deliveryTime; + + @ApiModelProperty(value = "代报餐方式") + @TableField(exist = false) + private Integer agentUserId; + + @ApiModelProperty(value = "代取餐人") + @TableField(exist = false) + private Integer dealerId; + + @ApiModelProperty(value = "是否按餐段查询") + @TableField(exist = false) + private Boolean isPeriod; + + @ApiModelProperty(value = "查询是否已经下过单") + @QueryField(type = QueryType.EQ) + private Boolean hasTemporary; + + @ApiModelProperty(value = "当前餐段") + @QueryField(type = QueryType.EQ) + private Integer categoryId; + +} diff --git a/src/main/java/com/gxwebsoft/shop/param/CategoryParam.java b/src/main/java/com/gxwebsoft/shop/param/CategoryParam.java new file mode 100644 index 0000000..9819625 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/param/CategoryParam.java @@ -0,0 +1,63 @@ +package com.gxwebsoft.shop.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 2022-11-22 17:45:37 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "CategoryParam对象", description = "商品分类表查询参数") +public class CategoryParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "商品分类ID") + @QueryField(type = QueryType.EQ) + private Integer categoryId; + + @ApiModelProperty(value = "分类名称") + private String title; + + @ApiModelProperty(value = "上级分类ID") + @QueryField(type = QueryType.EQ) + private Integer parentId; + + @ApiModelProperty(value = "分类图片") + @QueryField(type = QueryType.EQ) + private Integer image; + + @ApiModelProperty(value = "用户ID") + @QueryField(type = QueryType.EQ) + private Integer userId; + + @ApiModelProperty(value = "所属商户") + @QueryField(type = QueryType.EQ) + private String merchantCode; + + @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/src/main/java/com/gxwebsoft/shop/param/CommentParam.java b/src/main/java/com/gxwebsoft/shop/param/CommentParam.java new file mode 100644 index 0000000..5e1dea5 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/param/CommentParam.java @@ -0,0 +1,71 @@ +package com.gxwebsoft.shop.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 2022-11-23 21:18:56 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "CommentParam对象", description = "商品评价记录表查询参数") +public class CommentParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "评价ID") + @QueryField(type = QueryType.EQ) + private Integer commentId; + + @ApiModelProperty(value = "评分 (10好评 20中评 30差评)") + @QueryField(type = QueryType.EQ) + private Integer score; + + @ApiModelProperty(value = "评价内容") + private String content; + + @ApiModelProperty(value = "是否为图片评价") + @QueryField(type = QueryType.EQ) + private Integer isPicture; + + @ApiModelProperty(value = "用户ID") + @QueryField(type = QueryType.EQ) + private Integer userId; + + @ApiModelProperty(value = "订单ID") + @QueryField(type = QueryType.EQ) + private Integer orderId; + + @ApiModelProperty(value = "商品ID") + @QueryField(type = QueryType.EQ) + private Integer goodsId; + + @ApiModelProperty(value = "订单商品ID") + @QueryField(type = QueryType.EQ) + private Integer orderGoodsId; + + @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/src/main/java/com/gxwebsoft/shop/param/CouponParam.java b/src/main/java/com/gxwebsoft/shop/param/CouponParam.java new file mode 100644 index 0000000..4a5431e --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/param/CouponParam.java @@ -0,0 +1,107 @@ +package com.gxwebsoft.shop.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; + +import java.math.BigDecimal; + +/** + * 优惠券记录表查询参数 + * + * @author 科技小王子 + * @since 2022-11-28 18:26:05 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "CouponParam对象", description = "优惠券记录表查询参数") +public class CouponParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "优惠券ID") + @QueryField(type = QueryType.EQ) + private Integer couponId; + + @ApiModelProperty(value = "优惠券名称") + private String name; + + @ApiModelProperty(value = "优惠券类型(10满减券 20折扣券)") + @QueryField(type = QueryType.EQ) + private Integer couponType; + + @ApiModelProperty(value = "满减券-减免金额") + @QueryField(type = QueryType.EQ) + private BigDecimal reducePrice; + + @ApiModelProperty(value = "折扣券-折扣率(0-100)") + @QueryField(type = QueryType.EQ) + private Integer discount; + + @ApiModelProperty(value = "最低消费金额") + @QueryField(type = QueryType.EQ) + private BigDecimal minPrice; + + @ApiModelProperty(value = "到期类型(10领取后生效 20固定时间)") + @QueryField(type = QueryType.EQ) + private Integer expireType; + + @ApiModelProperty(value = "领取后生效-有效天数") + @QueryField(type = QueryType.EQ) + private Integer expireDay; + + @ApiModelProperty(value = "固定时间-开始时间") + @QueryField(type = QueryType.EQ) + private Integer startTime; + + @ApiModelProperty(value = "固定时间-结束时间") + @QueryField(type = QueryType.EQ) + private Integer endTime; + + @ApiModelProperty(value = "适用范围(10全部商品 20指定商品 30排除商品)") + @QueryField(type = QueryType.EQ) + private Integer applyRange; + + @ApiModelProperty(value = "适用范围配置(json格式)") + private String applyRangeConfig; + + @ApiModelProperty(value = "发放总数量(-1为不限制)") + @QueryField(type = QueryType.EQ) + private Integer totalNum; + + @ApiModelProperty(value = "已领取数量") + @QueryField(type = QueryType.EQ) + private Integer receiveNum; + + @ApiModelProperty(value = "优惠券描述") + private String describe; + + @ApiModelProperty(value = "用户ID") + @QueryField(type = QueryType.EQ) + private Integer userId; + + @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; + +} diff --git a/src/main/java/com/gxwebsoft/shop/param/ExpressParam.java b/src/main/java/com/gxwebsoft/shop/param/ExpressParam.java new file mode 100644 index 0000000..480914d --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/param/ExpressParam.java @@ -0,0 +1,61 @@ +package com.gxwebsoft.shop.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 2022-11-22 00:21:07 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "ExpressParam对象", description = "物流公司记录表查询参数") +public class ExpressParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "物流公司ID") + @QueryField(type = QueryType.EQ) + private Integer expressId; + + @ApiModelProperty(value = "物流公司名称") + private String expressName; + + @ApiModelProperty(value = "物流公司编码 (快递100)") + private String kuaidi100Code; + + @ApiModelProperty(value = "物流公司编码 (快递鸟)") + private String kdniaoCode; + + @ApiModelProperty(value = "用户ID") + @QueryField(type = QueryType.EQ) + private Integer userId; + + @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; + +} diff --git a/src/main/java/com/gxwebsoft/shop/param/GoodsParam.java b/src/main/java/com/gxwebsoft/shop/param/GoodsParam.java new file mode 100644 index 0000000..8c50d55 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/param/GoodsParam.java @@ -0,0 +1,200 @@ +package com.gxwebsoft.shop.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 2022-11-23 12:47:16 + */ +@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 = "商品名称") + private String goodsName; + + @ApiModelProperty(value = "商品编码") + private String goodsCode; + + @ApiModelProperty(value = "商品规格(10单规格 20多规格)") + @QueryField(type = QueryType.EQ) + private Integer goodsType; + + @ApiModelProperty(value = "商品分类ID") + @QueryField(type = QueryType.EQ) + private Integer categoryId; + + @ApiModelProperty(value = "商品封面图") + private String image; + + @ApiModelProperty(value = "上传的文件") + private String files; + + @ApiModelProperty(value = "主图视频路径") + private String videoUrl; + + @ApiModelProperty(value = "商品卖点") + private String sellingPoint; + + @ApiModelProperty(value = "商品规格(10单规格 20多规格)") + @QueryField(type = QueryType.EQ) + private Integer specType; + + @ApiModelProperty(value = "商品价格(最低)") + @QueryField(type = QueryType.EQ) + private BigDecimal goodsPriceMin; + + @ApiModelProperty(value = "商品价格(最高)") + @QueryField(type = QueryType.EQ) + private BigDecimal goodsPriceMax; + + @ApiModelProperty(value = "划线价格(最低)") + @QueryField(type = QueryType.EQ) + private BigDecimal linePriceMin; + + @ApiModelProperty(value = "划线价格(最高)") + @QueryField(type = QueryType.EQ) + private BigDecimal linePriceMax; + + @ApiModelProperty(value = "库存总量(包含所有sku)") + @QueryField(type = QueryType.EQ) + private Integer stockTotal; + + @ApiModelProperty(value = "库存计算方式(10下单减库存 20付款减库存)") + @QueryField(type = QueryType.EQ) + private Integer deductStockType; + + @ApiModelProperty(value = "商品详情") + private String content; + + @ApiModelProperty(value = "初始销量") + @QueryField(type = QueryType.EQ) + private Integer salesInitial; + + @ApiModelProperty(value = "实际销量") + @QueryField(type = QueryType.EQ) + private Integer salesActual; + + @ApiModelProperty(value = "配送方式") + @QueryField(type = QueryType.EQ) + private Integer deliveryType; + + @ApiModelProperty(value = "配送模板ID") + @QueryField(type = QueryType.EQ) + private Integer deliveryId; + + @ApiModelProperty(value = "是否开启积分赠送(1开启 0关闭)") + @QueryField(type = QueryType.EQ) + private Integer isPointsGift; + + @ApiModelProperty(value = "是否允许使用积分抵扣(1允许 0不允许)") + @QueryField(type = QueryType.EQ) + private Integer isPointsDiscount; + + @ApiModelProperty(value = "积分抵扣设置(0默认抵扣 1单独设置抵扣)") + @QueryField(type = QueryType.EQ) + private Integer isAlonePointsDiscount; + + @ApiModelProperty(value = "单独设置积分抵扣的配置") + private String pointsDiscountConfig; + + @ApiModelProperty(value = "是否开启会员折扣(1开启 0关闭)") + @QueryField(type = QueryType.EQ) + private Integer isEnableGrade; + + @ApiModelProperty(value = "会员折扣设置(0默认等级折扣 1单独设置折扣)") + @QueryField(type = QueryType.EQ) + private Integer isAloneGrade; + + @ApiModelProperty(value = "单独设置折扣的配置") + private String aloneGradeEquity; + + @ApiModelProperty(value = "是否推荐") + @QueryField(type = QueryType.EQ) + private Integer isHot; + + @ApiModelProperty(value = "规格单位") + private String unit; + + @ApiModelProperty(value = "餐段") + private String period; + + @ApiModelProperty(value = "档口") + private Integer gear; + + @ApiModelProperty(value = "商品重量") + private Double goodsWeight; + + @ApiModelProperty(value = "商品优惠属性: 0无 1限时特惠 2特惠专区") + @QueryField(type = QueryType.EQ) + private Integer attribute; + + @ApiModelProperty(value = "是否开启单独分销(0关闭 1开启)") + @QueryField(type = QueryType.EQ) + private Integer isIndDealer; + + @ApiModelProperty(value = "是否开启限购(0关闭 1开启)") + @QueryField(type = QueryType.EQ) + private Integer purchaseLimit; + + @ApiModelProperty(value = "分销佣金类型(10百分比 20固定金额)") + @QueryField(type = QueryType.EQ) + private Integer dealerMoneyType; + + @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 = "用户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; + + @ApiModelProperty(value = "商户编号") + @QueryField(type = QueryType.EQ) + private String merchantCode; + + @ApiModelProperty(value = "商户名称") + @QueryField(type = QueryType.EQ) + private String merchantName; +} diff --git a/src/main/java/com/gxwebsoft/shop/param/GoodsServiceParam.java b/src/main/java/com/gxwebsoft/shop/param/GoodsServiceParam.java new file mode 100644 index 0000000..abaad85 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/param/GoodsServiceParam.java @@ -0,0 +1,62 @@ +package com.gxwebsoft.shop.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 2022-11-23 21:57:50 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "GoodsServiceParam对象", description = "商品服务与承诺记录表查询参数") +public class GoodsServiceParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "商品服务ID") + @QueryField(type = QueryType.EQ) + private Integer serviceId; + + @ApiModelProperty(value = "服务名称") + private String name; + + @ApiModelProperty(value = "概述") + private String summary; + + @ApiModelProperty(value = "是否默认(新增商品时)") + @QueryField(type = QueryType.EQ) + private Integer isDefault; + + @ApiModelProperty(value = "用户ID") + @QueryField(type = QueryType.EQ) + private Integer userId; + + @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; + +} diff --git a/src/main/java/com/gxwebsoft/shop/param/MemberParam.java b/src/main/java/com/gxwebsoft/shop/param/MemberParam.java new file mode 100644 index 0000000..1552009 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/param/MemberParam.java @@ -0,0 +1,61 @@ +package com.gxwebsoft.shop.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 2022-11-25 14:02:24 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "MemberParam对象", description = "商城会员查询参数") +public class MemberParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键ID") + @QueryField(type = QueryType.EQ) + private Integer memberId; + + @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; + + @ApiModelProperty("登录账号") + @QueryField(type = QueryType.EQ) + private String username; + + @ApiModelProperty("用户昵称") + @QueryField(type = QueryType.LIKE) + private String nickname; + + @ApiModelProperty("手机号码") + @QueryField(type = QueryType.EQ) + private String phone; + +} diff --git a/src/main/java/com/gxwebsoft/shop/param/MerchantClerkParam.java b/src/main/java/com/gxwebsoft/shop/param/MerchantClerkParam.java new file mode 100644 index 0000000..7a7e1b4 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/param/MerchantClerkParam.java @@ -0,0 +1,44 @@ +package com.gxwebsoft.shop.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 2022-11-30 16:32:25 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "MerchantClerkParam对象", description = "商家门店店员表查询参数") +public class MerchantClerkParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "商户人员ID") + @QueryField(type = QueryType.EQ) + private Integer clerkId; + + @ApiModelProperty(value = "关联商户编号") + private String merchantCode; + + @ApiModelProperty(value = "关联商户编号") + @QueryField(type = QueryType.LIKE) + private String merchantName; + + @ApiModelProperty(value = "用户ID") + @QueryField(type = QueryType.EQ) + private Integer userId; + + @ApiModelProperty(value = "是否为商户主") + @QueryField(type = QueryType.EQ) + private Integer isOwner; + +} diff --git a/src/main/java/com/gxwebsoft/shop/param/MerchantParam.java b/src/main/java/com/gxwebsoft/shop/param/MerchantParam.java new file mode 100644 index 0000000..4752c75 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/param/MerchantParam.java @@ -0,0 +1,163 @@ +package com.gxwebsoft.shop.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; + +/** + * 商户管理查询参数 + * + * @author 科技小王子 + * @since 2022-11-30 15:10: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 merchantType; + + @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 = "商户logo") + private String logo; + + @ApiModelProperty(value = "商户背景图片") + private String background; + + @ApiModelProperty(value = "营业时间") + private String merchantHours; + + @ApiModelProperty(value = "所在省份") + private String province; + + @ApiModelProperty(value = "所在城市") + private String city; + + @ApiModelProperty(value = "所在辖区") + private String region; + + @ApiModelProperty(value = "详细地址") + private String address; + + @ApiModelProperty(value = "商户详情") + private String content; + + @ApiModelProperty(value = "商户坐标经纬度") + private String lngAndLat; + + @ApiModelProperty(value = "geohash") + private String geohash; + + @ApiModelProperty(value = "商户简介") + private String summary; + + @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 = "是否可编辑 0 商户可编辑 1 管理员可编辑") + @QueryField(type = QueryType.EQ) + private Integer isEdit; + + @ApiModelProperty(value = "是否支持自提核销(0否 1支持)") + @QueryField(type = QueryType.EQ) + private Integer isCheck; + + @ApiModelProperty(value = "商户主") + @QueryField(type = QueryType.EQ) + private Integer merchantOwner; + + @ApiModelProperty(value = "门店联系电话") + @QueryField(type = QueryType.EQ) + private String merchantPhone; + + @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; + + @ApiModelProperty(value = "客户ID") + @QueryField(type = QueryType.EQ) + private Integer customerId; + + @ApiModelProperty("登录账号") + @TableField(exist = false) + private String username; + + @ApiModelProperty("用户昵称") + @TableField(exist = false) + private String nickname; + + @ApiModelProperty(value = "联系电话") + @TableField(exist = false) + private String phone; + + @ApiModelProperty(value = "租户ID") + private Integer tenantId; + + @ApiModelProperty(value = "会元等级ID") + @QueryField(type = QueryType.EQ) + private Integer gradeId; + +} diff --git a/src/main/java/com/gxwebsoft/shop/param/MerchantWithdrawParam.java b/src/main/java/com/gxwebsoft/shop/param/MerchantWithdrawParam.java new file mode 100644 index 0000000..fb878cf --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/param/MerchantWithdrawParam.java @@ -0,0 +1,100 @@ +package com.gxwebsoft.shop.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.Date; + +/** + * 商户提现记录查询参数 + * + * @author 科技小王子 + * @since 2022-12-02 00:41:09 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "MerchantWithdrawParam对象", description = "商户提现记录查询参数") +public class MerchantWithdrawParam 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 withdrawCode; + + @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; + + @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 = "商户名称") + @QueryField(type = QueryType.LIKE) + private String merchantName; + +} diff --git a/src/main/java/com/gxwebsoft/shop/param/OrderAddressParam.java b/src/main/java/com/gxwebsoft/shop/param/OrderAddressParam.java new file mode 100644 index 0000000..07c426f --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/param/OrderAddressParam.java @@ -0,0 +1,76 @@ +package com.gxwebsoft.shop.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 2022-12-02 21:21:10 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "OrderAddressParam对象", description = "订单收货地址记录表查询参数") +public class OrderAddressParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "地址ID") + @QueryField(type = QueryType.EQ) + private Integer orderAddressId; + + @ApiModelProperty(value = "收货人姓名") + private String name; + + @ApiModelProperty(value = "联系电话") + private String phone; + + @ApiModelProperty(value = "省份ID") + @QueryField(type = QueryType.EQ) + private Integer provinceId; + + @ApiModelProperty(value = "城市ID") + @QueryField(type = QueryType.EQ) + private Integer cityId; + + @ApiModelProperty(value = "区/县ID") + @QueryField(type = QueryType.EQ) + private Integer regionId; + + @ApiModelProperty(value = "详细地址") + private String detail; + + @ApiModelProperty(value = "订单ID") + @QueryField(type = QueryType.EQ) + private Integer orderId; + + @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; + + @ApiModelProperty(value = "关联商户编号") + private String merchantCode; + +} diff --git a/src/main/java/com/gxwebsoft/shop/param/OrderGoodsParam.java b/src/main/java/com/gxwebsoft/shop/param/OrderGoodsParam.java new file mode 100644 index 0000000..4742555 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/param/OrderGoodsParam.java @@ -0,0 +1,228 @@ +package com.gxwebsoft.shop.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.math.BigDecimal; + +/** + * 订单商品记录表查询参数 + * + * @author 科技小王子 + * @since 2022-12-09 17:15:31 + */ +@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 orderGoodsId; + + @ApiModelProperty(value = "商品分类") + private Integer categoryId; + + @ApiModelProperty(value = "商品ID") + @QueryField(type = QueryType.EQ) + private Integer goodsId; + + @ApiModelProperty(value = "商品名称") + private String goodsName; + + @ApiModelProperty(value = "商品封面图ID") + @QueryField(type = QueryType.EQ) + private Integer imageId; + + @ApiModelProperty(value = "库存计算方式(10下单减库存 20付款减库存)") + @QueryField(type = QueryType.EQ) + private Integer deductStockType; + + @ApiModelProperty(value = "规格类型(10单规格 20多规格)") + @QueryField(type = QueryType.EQ) + private Integer specType; + + @ApiModelProperty(value = "商品sku唯一标识") + private String goodsSkuId; + + @ApiModelProperty(value = "SKU的规格属性(json格式)") + private String goodsProps; + + @ApiModelProperty(value = "商品详情") + private String content; + + @ApiModelProperty(value = "商品编码") + private String goodsNo; + + @ApiModelProperty(value = "商品价格(单价)") + @QueryField(type = QueryType.EQ) + private BigDecimal goodsPrice; + + @ApiModelProperty(value = "商品划线价") + @QueryField(type = QueryType.EQ) + private BigDecimal linePrice; + + @ApiModelProperty(value = "商品重量(Kg)") + private Double goodsWeight; + + @ApiModelProperty(value = "所属档口") + private Integer gear; + + @ApiModelProperty(value = "是否存在会员等级折扣") + @QueryField(type = QueryType.EQ) + private Integer isUserGrade; + + @ApiModelProperty(value = "会员折扣比例(0-10)") + @QueryField(type = QueryType.EQ) + private Integer gradeRatio; + + @ApiModelProperty(value = "会员折扣的商品单价") + @QueryField(type = QueryType.EQ) + private BigDecimal gradeGoodsPrice; + + @ApiModelProperty(value = "会员折扣的总额差") + @QueryField(type = QueryType.EQ) + private BigDecimal gradeTotalMoney; + + @ApiModelProperty(value = "优惠券折扣金额") + @QueryField(type = QueryType.EQ) + private BigDecimal couponMoney; + + @ApiModelProperty(value = "积分金额") + @QueryField(type = QueryType.EQ) + private BigDecimal pointsMoney; + + @ApiModelProperty(value = "积分抵扣数量") + @QueryField(type = QueryType.EQ) + private Integer pointsNum; + + @ApiModelProperty(value = "赠送的积分数量") + @QueryField(type = QueryType.EQ) + private Integer pointsBonus; + + @ApiModelProperty(value = "付款状态(10未付款 20已付款)") + @QueryField(type = QueryType.EQ) + private Integer payStatus; + + @ApiModelProperty(value = "购买数量") + @QueryField(type = QueryType.EQ) + private Integer totalNum; + + @ApiModelProperty(value = "商品总价(数量×单价)") + @QueryField(type = QueryType.EQ) + private BigDecimal totalPrice; + + @ApiModelProperty(value = "实际付款价(折扣和优惠后)") + @QueryField(type = QueryType.EQ) + private BigDecimal totalPayPrice; + + @ApiModelProperty(value = "发货状态(10未发货 20已发货 30部分发货)") + @QueryField(type = QueryType.EQ) + private Integer deliveryStatus; + + @ApiModelProperty(value = "已发货数量") + @QueryField(type = QueryType.EQ) + private Integer deliveryNum; + + @ApiModelProperty(value = "发货时间") + @TableField(exist = false) + private String deliveryTime; + + @ApiModelProperty(value = "星期几") + @QueryField(type = QueryType.EQ) + private Integer week; + + @ApiModelProperty(value = "是否开启单独分销(0关闭 1开启)") + @QueryField(type = QueryType.EQ) + private Integer isIndDealer; + + @ApiModelProperty(value = "是否临时报餐") + @QueryField(type = QueryType.EQ) + private Integer temporary; + + @ApiModelProperty(value = "分销佣金类型(10百分比 20固定金额)") + @QueryField(type = QueryType.EQ) + private Integer dealerMoneyType; + + @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 isComment; + + @ApiModelProperty(value = "订单ID") + @QueryField(type = QueryType.EQ) + private Integer orderId; + + @ApiModelProperty(value = "用户ID") + @QueryField(type = QueryType.EQ) + private Integer userId; + + @ApiModelProperty(value = "来源记录ID") + @QueryField(type = QueryType.EQ) + private Integer goodsSourceId; + + @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 = "用户昵称") + @TableField(exist = false) + private String nickname; + + @ApiModelProperty(value = "订购份数是否大于0") + @TableField(exist = false) + private Boolean hasNum; + + @ApiModelProperty(value = "订单状态") + @TableField(exist = false) + private Integer orderStatus; + + @QueryField(value = "delivery_time", type = QueryType.GE) + @TableField(exist = false) + @ApiModelProperty("报餐时间起始值") + private String deliveryTimeStart; + + @QueryField(value = "delivery_time", type = QueryType.LE) + @TableField(exist = false) + @ApiModelProperty("报餐时间结束值") + private String deliveryTimeEnd; + + @ApiModelProperty(value = "按部门查询") + @TableField(exist = false) + private Integer organizationId; + +} diff --git a/src/main/java/com/gxwebsoft/shop/param/OrderParam.java b/src/main/java/com/gxwebsoft/shop/param/OrderParam.java new file mode 100644 index 0000000..0f8e13e --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/param/OrderParam.java @@ -0,0 +1,244 @@ +package com.gxwebsoft.shop.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.math.BigDecimal; +import java.util.Date; +import java.util.Set; + +/** + * 订单记录表查询参数 + * + * @author WebSoft + * @since 2022-11-16 11:25:58 + */ +@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 BigDecimal totalPrice; + + @ApiModelProperty(value = "订单金额(含优惠折扣)") + @QueryField(type = QueryType.EQ) + private BigDecimal orderPrice; + + @ApiModelProperty(value = "优惠券ID") + @QueryField(type = QueryType.EQ) + private Integer couponId; + + @ApiModelProperty(value = "优惠券抵扣金额") + @QueryField(type = QueryType.EQ) + private BigDecimal couponMoney; + + @ApiModelProperty(value = "积分抵扣金额") + @QueryField(type = QueryType.EQ) + private BigDecimal pointsMoney; + + @ApiModelProperty(value = "积分抵扣数量") + @QueryField(type = QueryType.EQ) + private Integer pointsNum; + + @ApiModelProperty(value = "实际付款金额(包含运费)") + @QueryField(type = QueryType.EQ) + private BigDecimal payPrice; + + @ApiModelProperty(value = "后台修改的订单金额(差价)") + @QueryField(type = QueryType.EQ) + private BigDecimal updatePrice; + + @ApiModelProperty(value = "买家留言") + private String buyerRemark; + + @ApiModelProperty(value = "支付方式(废弃)") + @QueryField(type = QueryType.EQ) + private Integer payType; + + @ApiModelProperty(value = "支付方式（余额/微信/支付宝）") + private String payMethod; + + @ApiModelProperty(value = "付款状态(10未付款 20已付款)") + @QueryField(type = QueryType.EQ) + private Integer payStatus; + + @ApiModelProperty(value = "付款时间") + @QueryField(type = QueryType.EQ) + private Date payTime; + + @ApiModelProperty("购买月份数量") + @QueryField(type = QueryType.EQ) + private Integer month; + + @ApiModelProperty(value = "星期几") + @QueryField(type = QueryType.EQ) + private Integer week; + + @ApiModelProperty(value = "第三方交易记录ID") + @QueryField(type = QueryType.EQ) + private Integer tradeId; + + @ApiModelProperty(value = "配送方式(10快递配送 20门店自提)") + @QueryField(type = QueryType.EQ) + private Integer deliveryType; + + @ApiModelProperty(value = "自提门店ID") + @QueryField(type = QueryType.EQ) + private Integer extractShopId; + + @ApiModelProperty(value = "核销店员ID") + @QueryField(type = QueryType.EQ) + private Integer extractClerkId; + + @ApiModelProperty(value = "运费金额") + @QueryField(type = QueryType.EQ) + private BigDecimal expressPrice; + + @ApiModelProperty(value = "物流公司ID (废弃)") + @QueryField(type = QueryType.EQ) + private Integer expressId; + + @ApiModelProperty(value = "物流单号 (废弃)") + private String expressNo; + + @ApiModelProperty(value = "发货状态(10未发货 20已发货 30部分发货)") + @QueryField(type = QueryType.EQ) + private Integer deliveryStatus; + + @ApiModelProperty(value = "发货时间") + @QueryField(type = QueryType.EQ) + private String deliveryTime; + + @ApiModelProperty(value = "收货状态(10未收货 20已收货)") + @QueryField(type = QueryType.EQ) + private Integer receiptStatus; + + @ApiModelProperty(value = "收货时间") + @QueryField(type = QueryType.EQ) + private Date receiptTime; + + @ApiModelProperty(value = "订单状态(10进行中 20取消 21待取消 30已完成)") + @QueryField(type = QueryType.EQ) + private Integer orderStatus; + + @ApiModelProperty(value = "赠送的积分数量") + @QueryField(type = QueryType.EQ) + private Integer pointsBonus; + + @ApiModelProperty(value = "商家备注") + private String merchantRemark; + + @ApiModelProperty(value = "订单是否已结算(0未结算 1已结算)") + @QueryField(type = QueryType.EQ) + private Integer isSettled; + + @ApiModelProperty(value = "续租订单原单号") + private Integer rentOrderId; + + @ApiModelProperty(value = "微信支付交易号(废弃)") + private String transactionId; + + @ApiModelProperty(value = "是否已评价(0否 1是)") + @QueryField(type = QueryType.EQ) + private Integer isComment; + + @ApiModelProperty(value = "订单来源(10普通订单 20砍价订单 30秒杀订单)") + @QueryField(type = QueryType.EQ) + private Integer orderSource; + + @ApiModelProperty(value = "来源记录ID") + @QueryField(type = QueryType.EQ) + private Integer orderSourceId; + + @ApiModelProperty(value = "来源记录的参数 (json格式)") + private String orderSourceData; + + @ApiModelProperty(value = "来源客户端 (APP、H5、小程序等)") + private String platform; + + @ApiModelProperty(value = "是否续费订单") + private Integer isRenew; + + @ApiModelProperty(value = "是否临时报餐") + private Integer isTemporary; + + @ApiModelProperty(value = "用户ID") + @QueryField(type = QueryType.EQ) + private Integer userId; + + @ApiModelProperty(value = "所属门店ID") + @QueryField(type = QueryType.EQ) + private Integer shopId; + + @ApiModelProperty(value = "商品ID") + private Integer goodsId; + + @ApiModelProperty(value = "设备ID") + private Integer equipmentId; + + @ApiModelProperty(value = "商户编号") + @QueryField(type = QueryType.EQ) + private String merchantCode; + + @ApiModelProperty(value = "商户名称") + @QueryField(type = QueryType.LIKE) + private String merchantName; + + @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 = "是否按代报餐查询") + @TableField(exist = false) + private Boolean agent; + + @ApiModelProperty(value = "租户ID") + @QueryField(type = QueryType.EQ) + private Integer tenantId; + + @ApiModelProperty("搜索关键字") + @TableField(exist = false) + private String keywords; + + @ApiModelProperty(value = "签名") + @TableField(exist = false) + private String sign; + + @ApiModelProperty(value = "是否查询订单商品") + @TableField(exist = false) + private Boolean showGoodsList; + + @ApiModelProperty(value = "用户id集合") + @TableField(exist = false) + private Set userIds; + +} diff --git a/src/main/java/com/gxwebsoft/shop/param/OrderRefundAddressParam.java b/src/main/java/com/gxwebsoft/shop/param/OrderRefundAddressParam.java new file mode 100644 index 0000000..f9cfe77 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/param/OrderRefundAddressParam.java @@ -0,0 +1,76 @@ +package com.gxwebsoft.shop.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-05-18 13:09:51 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "OrderRefundAddressParam对象", description = "售后单退货地址记录表查询参数") +public class OrderRefundAddressParam 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 orderRefundId; + + @ApiModelProperty(value = "收货人姓名") + private String name; + + @ApiModelProperty(value = "联系电话") + private String phone; + + @ApiModelProperty(value = "所在省份ID") + @QueryField(type = QueryType.EQ) + private Integer provinceId; + + @ApiModelProperty(value = "所在城市ID") + @QueryField(type = QueryType.EQ) + private Integer cityId; + + @ApiModelProperty(value = "所在区/县ID") + @QueryField(type = QueryType.EQ) + private Integer regionId; + + @ApiModelProperty(value = "详细地址") + private String detail; + + @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; + + @ApiModelProperty(value = "商户编码") + private String merchantCode; + +} diff --git a/src/main/java/com/gxwebsoft/shop/param/OrderRefundParam.java b/src/main/java/com/gxwebsoft/shop/param/OrderRefundParam.java new file mode 100644 index 0000000..35bf31c --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/param/OrderRefundParam.java @@ -0,0 +1,101 @@ +package com.gxwebsoft.shop.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; + +import java.math.BigDecimal; + +/** + * 售后单记录表查询参数 + * + * @author 科技小王子 + * @since 2023-05-18 13:09:51 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "OrderRefundParam对象", description = "售后单记录表查询参数") +public class OrderRefundParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "售后单ID") + @QueryField(type = QueryType.EQ) + private Integer orderRefundId; + + @ApiModelProperty(value = "订单ID") + @QueryField(type = QueryType.EQ) + private Integer orderId; + + @ApiModelProperty(value = "订单商品ID") + @QueryField(type = QueryType.EQ) + private Integer orderGoodsId; + + @ApiModelProperty(value = "用户ID") + @QueryField(type = QueryType.EQ) + private Integer userId; + + @ApiModelProperty(value = "售后类型(10退货退款 20换货)") + @QueryField(type = QueryType.EQ) + private Integer type; + + @ApiModelProperty(value = "用户申请原因(说明)") + private String applyDesc; + + @ApiModelProperty(value = "商家审核状态(0待审核 10已同意 20已拒绝)") + @QueryField(type = QueryType.EQ) + private Integer auditStatus; + + @ApiModelProperty(value = "商家拒绝原因(说明)") + private String refuseDesc; + + @ApiModelProperty(value = "实际退款金额") + @QueryField(type = QueryType.EQ) + private BigDecimal refundMoney; + + @ApiModelProperty(value = "用户是否发货(0未发货 1已发货)") + @QueryField(type = QueryType.EQ) + private Integer isUserSend; + + @ApiModelProperty(value = "用户发货时间") + @QueryField(type = QueryType.EQ) + private Integer sendTime; + + @ApiModelProperty(value = "用户发货物流公司ID") + private String expressId; + + @ApiModelProperty(value = "用户发货物流单号") + private String expressNo; + + @ApiModelProperty(value = "商家收货状态(0未收货 1已收货)") + @QueryField(type = QueryType.EQ) + private Integer isReceipt; + + @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/src/main/java/com/gxwebsoft/shop/param/OrderRenewParam.java b/src/main/java/com/gxwebsoft/shop/param/OrderRenewParam.java new file mode 100644 index 0000000..1c99574 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/param/OrderRenewParam.java @@ -0,0 +1,73 @@ +package com.gxwebsoft.shop.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; + +import java.math.BigDecimal; + +/** + * 续费订单记录表查询参数 + * + * @author 科技小王子 + * @since 2023-04-13 10:34:35 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "OrderRenewParam对象", description = "续费订单记录表查询参数") +public class OrderRenewParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "售后单ID") + @QueryField(type = QueryType.EQ) + private Integer orderRenewId; + + @ApiModelProperty(value = "订单ID") + @QueryField(type = QueryType.EQ) + private Integer orderId; + + @ApiModelProperty(value = "订单商品ID") + @QueryField(type = QueryType.EQ) + private Integer orderGoodsId; + + @ApiModelProperty(value = "用户ID") + @QueryField(type = QueryType.EQ) + private Integer userId; + + @ApiModelProperty(value = "类型(10续费订单)") + @QueryField(type = QueryType.EQ) + private Integer type; + + @ApiModelProperty(value = "实际续费金额") + @QueryField(type = QueryType.EQ) + private BigDecimal renewMoney; + + @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/src/main/java/com/gxwebsoft/shop/param/PaymentParam.java b/src/main/java/com/gxwebsoft/shop/param/PaymentParam.java new file mode 100644 index 0000000..d3cca62 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/param/PaymentParam.java @@ -0,0 +1,64 @@ +package com.gxwebsoft.shop.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 2022-12-15 19:11:07 + */ +@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 paymentId; + + @ApiModelProperty(value = "支付方式(微信、支付宝、余额)") + @QueryField(type = QueryType.EQ) + private String method; + + @ApiModelProperty(value = "编码") + private String paymentCode; + + @ApiModelProperty(value = "支付配置(json格式)") + private String config; + + @ApiModelProperty(value = "是否为默认支付方式") + @QueryField(type = QueryType.EQ) + private Integer isDefault; + + @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 = "租户ID") + private Integer tenantId; + +} diff --git a/src/main/java/com/gxwebsoft/shop/param/PaymentTemplateParam.java b/src/main/java/com/gxwebsoft/shop/param/PaymentTemplateParam.java new file mode 100644 index 0000000..45ff883 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/param/PaymentTemplateParam.java @@ -0,0 +1,67 @@ +package com.gxwebsoft.shop.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 2022-12-09 13:59:38 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "PaymentTemplateParam对象", description = "商城支付模板记录表查询参数") +public class PaymentTemplateParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "支付模板ID") + @QueryField(type = QueryType.EQ) + private Integer templateId; + + @ApiModelProperty(value = "支付模板名称") + private String name; + + @ApiModelProperty(value = "支付方式(微信、支付宝、余额)") + private String method; + + @ApiModelProperty(value = "支付配置(json格式)") + private String config; + + @ApiModelProperty(value = "管理员备注") + private String remarks; + + @ApiModelProperty(value = "用户ID") + @QueryField(type = QueryType.EQ) + private Integer userId; + + @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/src/main/java/com/gxwebsoft/shop/param/PaymentTradeParam.java b/src/main/java/com/gxwebsoft/shop/param/PaymentTradeParam.java new file mode 100644 index 0000000..12a9f0e --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/param/PaymentTradeParam.java @@ -0,0 +1,85 @@ +package com.gxwebsoft.shop.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 2022-12-09 13:59:38 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "PaymentTradeParam对象", description = "第三方支付交易记录表查询参数") +public class PaymentTradeParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "交易记录ID") + @QueryField(type = QueryType.EQ) + private Integer tradeId; + + @ApiModelProperty(value = "交易订单号(全局唯一)") + private String outTradeNo; + + @ApiModelProperty(value = "发起客户端(H5、小程序、APP)") + private String client; + + @ApiModelProperty(value = "支付方式(微信、支付宝)") + private String payMethod; + + @ApiModelProperty(value = "订单类型(10商城订单 100余额充值订单)") + @QueryField(type = QueryType.EQ) + private Integer orderType; + + @ApiModelProperty(value = "订单ID(商城订单、充值订单)") + @QueryField(type = QueryType.EQ) + private Integer orderId; + + @ApiModelProperty(value = "商城订单号(商城订单、充值订单)") + private String orderNo; + + @ApiModelProperty(value = "第三方交易流水号") + private String tradeNo; + + @ApiModelProperty(value = "预支付交易会话ID(微信支付)") + private String prepayId; + + @ApiModelProperty(value = "交易状态") + @QueryField(type = QueryType.EQ) + private Integer tradeState; + + @ApiModelProperty(value = "用户ID") + @QueryField(type = QueryType.EQ) + private Integer userId; + + @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/src/main/java/com/gxwebsoft/shop/param/RechargeOrderParam.java b/src/main/java/com/gxwebsoft/shop/param/RechargeOrderParam.java new file mode 100644 index 0000000..2674017 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/param/RechargeOrderParam.java @@ -0,0 +1,114 @@ +package com.gxwebsoft.shop.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; + +/** + * 会员充值订单表查询参数 + * + * @author 科技小王子 + * @since 2023-04-20 20:36:24 + */ +@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 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 = "支付方式（微信/支付宝）") + 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; + + @ApiModelProperty(value = "手机号码") + @TableField(exist = false) + private String phone; + + @ApiModelProperty(value = "昵称") + @TableField(exist = false) + private String nickname; + + @ApiModelProperty(value = "机构ID") + private Integer organizationId; + + @ApiModelProperty(value = "部门名称") + @TableField(exist = false) + private String organizationName; + +} diff --git a/src/main/java/com/gxwebsoft/shop/param/RechargeOrderPlanParam.java b/src/main/java/com/gxwebsoft/shop/param/RechargeOrderPlanParam.java new file mode 100644 index 0000000..51ab9a7 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/param/RechargeOrderPlanParam.java @@ -0,0 +1,76 @@ +package com.gxwebsoft.shop.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; + +import java.math.BigDecimal; + +/** + * 会员充值订单套餐快照表查询参数 + * + * @author 科技小王子 + * @since 2023-04-20 20:36:24 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "RechargeOrderPlanParam对象", description = "会员充值订单套餐快照表查询参数") +public class RechargeOrderPlanParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键ID") + @QueryField(type = QueryType.EQ) + private Integer orderPlanId; + + @ApiModelProperty(value = "订单ID") + @QueryField(type = QueryType.EQ) + private Integer orderId; + + @ApiModelProperty(value = "主键ID") + @QueryField(type = QueryType.EQ) + private Integer planId; + + @ApiModelProperty(value = "方案名称") + private String planName; + + @ApiModelProperty(value = "充值金额") + @QueryField(type = QueryType.EQ) + private BigDecimal money; + + @ApiModelProperty(value = "赠送金额") + @QueryField(type = QueryType.EQ) + private BigDecimal giftMoney; + + @ApiModelProperty(value = "用户ID") + @QueryField(type = QueryType.EQ) + private Integer userId; + + @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/src/main/java/com/gxwebsoft/shop/param/RechargePlanParam.java b/src/main/java/com/gxwebsoft/shop/param/RechargePlanParam.java new file mode 100644 index 0000000..0bb9b25 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/param/RechargePlanParam.java @@ -0,0 +1,68 @@ +package com.gxwebsoft.shop.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; + +import java.math.BigDecimal; + +/** + * 会员充值套餐表查询参数 + * + * @author 科技小王子 + * @since 2023-04-20 20:36:24 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "RechargePlanParam对象", description = "会员充值套餐表查询参数") +public class RechargePlanParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键ID") + @QueryField(type = QueryType.EQ) + private Integer planId; + + @ApiModelProperty(value = "套餐名称") + private String planName; + + @ApiModelProperty(value = "充值金额") + @QueryField(type = QueryType.EQ) + private BigDecimal money; + + @ApiModelProperty(value = "赠送金额") + @QueryField(type = QueryType.EQ) + private BigDecimal giftMoney; + + @ApiModelProperty(value = "用户ID") + @QueryField(type = QueryType.EQ) + private Integer userId; + + @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/src/main/java/com/gxwebsoft/shop/param/UserAddressParam.java b/src/main/java/com/gxwebsoft/shop/param/UserAddressParam.java new file mode 100644 index 0000000..252b940 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/param/UserAddressParam.java @@ -0,0 +1,69 @@ +package com.gxwebsoft.shop.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 2022-11-25 19:04:43 + */ +@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 addressId; + + @ApiModelProperty(value = "收货人姓名") + private String name; + + @ApiModelProperty(value = "联系电话") + private String phone; + + @ApiModelProperty(value = "省份ID") + @QueryField(type = QueryType.EQ) + private Integer provinceId; + + @ApiModelProperty(value = "城市ID") + @QueryField(type = QueryType.EQ) + private Integer cityId; + + @ApiModelProperty(value = "区/县ID") + @QueryField(type = QueryType.EQ) + private Integer regionId; + + @ApiModelProperty(value = "详细地址") + private String detail; + + @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/src/main/java/com/gxwebsoft/shop/param/UserBalanceLogParam.java b/src/main/java/com/gxwebsoft/shop/param/UserBalanceLogParam.java new file mode 100644 index 0000000..456e6e9 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/param/UserBalanceLogParam.java @@ -0,0 +1,77 @@ +package com.gxwebsoft.shop.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; + +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/src/main/java/com/gxwebsoft/shop/param/UserCommentParam.java b/src/main/java/com/gxwebsoft/shop/param/UserCommentParam.java new file mode 100644 index 0000000..60be4df --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/param/UserCommentParam.java @@ -0,0 +1,79 @@ +package com.gxwebsoft.shop.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-07-06 13:55:16 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "UserCommentParam对象", description = "用户评价记录表查询参数") +public class UserCommentParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "评价ID") + @QueryField(type = QueryType.EQ) + private Integer commentId; + + @ApiModelProperty(value = "评分 (10好评 20中评 30差评)") + @QueryField(type = QueryType.EQ) + private Integer score; + + @ApiModelProperty(value = "评价内容") + private String content; + + @ApiModelProperty(value = "是否为图片评价") + @QueryField(type = QueryType.EQ) + private Integer isPicture; + + @ApiModelProperty(value = "用户ID") + @QueryField(type = QueryType.EQ) + private Integer userId; + + @ApiModelProperty(value = "被评价者ID") + @QueryField(type = QueryType.EQ) + private Integer toUserId; + + @ApiModelProperty(value = "回复的评论ID") + @TableField(exist = false) + private Integer replyCommentId; + + @ApiModelProperty(value = "回复者ID") + @TableField(exist = false) + private Integer replyUserId; + + @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 = "当前登录用户ID") + @TableField(exist = false) + private Integer loginUserId; + +} diff --git a/src/main/java/com/gxwebsoft/shop/param/UserCouponParam.java b/src/main/java/com/gxwebsoft/shop/param/UserCouponParam.java new file mode 100644 index 0000000..e0ad943 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/param/UserCouponParam.java @@ -0,0 +1,104 @@ +package com.gxwebsoft.shop.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; + +import java.math.BigDecimal; + +/** + * 用户优惠券记录表查询参数 + * + * @author 科技小王子 + * @since 2022-11-25 19:04:43 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "UserCouponParam对象", description = "用户优惠券记录表查询参数") +public class UserCouponParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键ID") + @QueryField(type = QueryType.EQ) + private Integer userCouponId; + + @ApiModelProperty(value = "优惠券ID") + @QueryField(type = QueryType.EQ) + private Integer couponId; + + @ApiModelProperty(value = "优惠券名称") + private String name; + + @ApiModelProperty(value = "优惠券类型(10满减券 20折扣券)") + @QueryField(type = QueryType.EQ) + private Integer couponType; + + @ApiModelProperty(value = "满减券-减免金额") + @QueryField(type = QueryType.EQ) + private BigDecimal reducePrice; + + @ApiModelProperty(value = "折扣券-折扣率(0-100)") + @QueryField(type = QueryType.EQ) + private Integer discount; + + @ApiModelProperty(value = "最低消费金额") + @QueryField(type = QueryType.EQ) + private BigDecimal minPrice; + + @ApiModelProperty(value = "到期类型(10领取后生效 20固定时间)") + @QueryField(type = QueryType.EQ) + private Integer expireType; + + @ApiModelProperty(value = "领取后生效-有效天数") + @QueryField(type = QueryType.EQ) + private Integer expireDay; + + @ApiModelProperty(value = "有效期开始时间") + @QueryField(type = QueryType.EQ) + private Integer startTime; + + @ApiModelProperty(value = "有效期结束时间") + @QueryField(type = QueryType.EQ) + private Integer endTime; + + @ApiModelProperty(value = "适用范围(10全部商品 20指定商品)") + @QueryField(type = QueryType.EQ) + private Integer applyRange; + + @ApiModelProperty(value = "适用范围配置(json格式)") + private String applyRangeConfig; + + @ApiModelProperty(value = "是否过期(0未过期 1已过期)") + @QueryField(type = QueryType.EQ) + private Integer isExpire; + + @ApiModelProperty(value = "是否已使用(0未使用 1已使用)") + @QueryField(type = QueryType.EQ) + private Integer isUse; + + @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/src/main/java/com/gxwebsoft/shop/param/UserFeedbackParam.java b/src/main/java/com/gxwebsoft/shop/param/UserFeedbackParam.java new file mode 100644 index 0000000..8cc35ec --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/param/UserFeedbackParam.java @@ -0,0 +1,54 @@ +package com.gxwebsoft.shop.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-07-16 22:24:55 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "UserFeedbackParam对象", description = "意见反馈记录表查询参数") +public class UserFeedbackParam 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 content; + + @ApiModelProperty(value = "反馈图片") + private String images; + + @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/src/main/java/com/gxwebsoft/shop/param/UserFollowParam.java b/src/main/java/com/gxwebsoft/shop/param/UserFollowParam.java new file mode 100644 index 0000000..76de479 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/param/UserFollowParam.java @@ -0,0 +1,59 @@ +package com.gxwebsoft.shop.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 2022-11-25 19:04:43 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "UserFollowParam对象", description = "关注记录表查询参数") +public class UserFollowParam 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 = "商铺ID") + @QueryField(type = QueryType.EQ) + private Integer shopId; + + @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 = "当期登录用户ID") + @QueryField(type = QueryType.EQ) + private Integer loginUserId; + +} diff --git a/src/main/java/com/gxwebsoft/shop/param/UserGradeLogParam.java b/src/main/java/com/gxwebsoft/shop/param/UserGradeLogParam.java new file mode 100644 index 0000000..c812a09 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/param/UserGradeLogParam.java @@ -0,0 +1,66 @@ +package com.gxwebsoft.shop.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-06-20 16:33:06 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "UserGradeLogParam对象", description = "用户会员等级变更记录表查询参数") +public class UserGradeLogParam 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 = "变更前的等级ID") + @QueryField(type = QueryType.EQ) + private Integer oldGradeId; + + @ApiModelProperty(value = "变更后的等级ID") + @QueryField(type = QueryType.EQ) + private Integer newGradeId; + + @ApiModelProperty(value = "变更类型(10后台管理员设置 20自动升级)") + @QueryField(type = QueryType.EQ) + private Integer changeType; + + @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/src/main/java/com/gxwebsoft/shop/param/UserGradeParam.java b/src/main/java/com/gxwebsoft/shop/param/UserGradeParam.java new file mode 100644 index 0000000..42dcb80 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/param/UserGradeParam.java @@ -0,0 +1,63 @@ +package com.gxwebsoft.shop.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-06-20 16:33:06 + */ +@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; + + @ApiModelProperty(value = "商户编码") + private String merchantCode; + +} diff --git a/src/main/java/com/gxwebsoft/shop/param/UserLikeParam.java b/src/main/java/com/gxwebsoft/shop/param/UserLikeParam.java new file mode 100644 index 0000000..e668924 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/param/UserLikeParam.java @@ -0,0 +1,62 @@ +package com.gxwebsoft.shop.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-07-06 17:51:03 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "UserLikeParam对象", description = "点赞记录表查询参数") +public class UserLikeParam 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 toUserId; + + @ApiModelProperty(value = "用户ID") + @QueryField(type = QueryType.EQ) + private Integer userId; + + @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 = "登录用户ID") + @QueryField(type = QueryType.EQ) + private Integer loginUserId; + +} diff --git a/src/main/java/com/gxwebsoft/shop/param/UserLookParam.java b/src/main/java/com/gxwebsoft/shop/param/UserLookParam.java new file mode 100644 index 0000000..a4e72e0 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/param/UserLookParam.java @@ -0,0 +1,52 @@ +package com.gxwebsoft.shop.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-07-13 23:10:38 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "UserLookParam对象", description = "访客记录表查询参数") +public class UserLookParam 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 toUserId; + + @ApiModelProperty(value = "用户ID") + @QueryField(type = QueryType.EQ) + private Integer userId; + + @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 = "登录用户ID") + @QueryField(type = QueryType.EQ) + private Integer loginUserId; + +} diff --git a/src/main/java/com/gxwebsoft/shop/param/UserOauthParam.java b/src/main/java/com/gxwebsoft/shop/param/UserOauthParam.java new file mode 100644 index 0000000..02c441d --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/param/UserOauthParam.java @@ -0,0 +1,63 @@ +package com.gxwebsoft.shop.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 2022-12-15 08:33:13 + */ +@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; + + @ApiModelProperty(value = "商户编码") + private String merchantCode; + + @ApiModelProperty(value = "租户ID") + private Integer tenantId; + +} diff --git a/src/main/java/com/gxwebsoft/shop/param/UserPointsLogParam.java b/src/main/java/com/gxwebsoft/shop/param/UserPointsLogParam.java new file mode 100644 index 0000000..bc4e843 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/param/UserPointsLogParam.java @@ -0,0 +1,58 @@ +package com.gxwebsoft.shop.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 2022-11-25 19:04:43 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "UserPointsLogParam对象", description = "用户积分变动明细表查询参数") +public class UserPointsLogParam 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 = "变动数量") + @QueryField(type = QueryType.EQ) + private Integer value; + + @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; + +} diff --git a/src/main/java/com/gxwebsoft/shop/param/UserRefereeParam.java b/src/main/java/com/gxwebsoft/shop/param/UserRefereeParam.java new file mode 100644 index 0000000..adfb251 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/param/UserRefereeParam.java @@ -0,0 +1,80 @@ +package com.gxwebsoft.shop.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-04-28 14:07:29 + */ +@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; + + @ApiModelProperty(value = "被推荐人昵称") + @QueryField(type = QueryType.LIKE) + private String nickname; + + @ApiModelProperty(value = "推荐人昵称") + @QueryField(type = QueryType.LIKE) + private String dealerName; + + @ApiModelProperty(value = "性别") + @QueryField(type = QueryType.EQ) + private Integer sex; + + @ApiModelProperty(value = "下级的会员等级") + @QueryField(type = QueryType.EQ) + private Integer gradeId; + + @ApiModelProperty(value = "是否线下会员") + @QueryField(type = QueryType.EQ) + private Integer offline; + + @QueryField(value = "grade_id", type = QueryType.GE) + @TableField(exist = false) + @ApiModelProperty("会员等级起始值") + private String gradeStart; + + @QueryField(value = "grade_id", type = QueryType.LE) + @TableField(exist = false) + @ApiModelProperty("会员等级结束值") + private String gradeEnd; + + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/CartService.java b/src/main/java/com/gxwebsoft/shop/service/CartService.java new file mode 100644 index 0000000..6aa40c3 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/CartService.java @@ -0,0 +1,42 @@ +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 java.util.List; + +/** + * 购物车记录表Service + * + * @author 科技小王子 + * @since 2022-11-25 19:04:43 + */ +public interface CartService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(CartParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(CartParam param); + + /** + * 根据id查询 + * + * @param id 主键ID + * @return Cart + */ + Cart getByIdRel(Integer id); + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/CategoryService.java b/src/main/java/com/gxwebsoft/shop/service/CategoryService.java new file mode 100644 index 0000000..6127c99 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/CategoryService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.shop.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.shop.entity.Category; +import com.gxwebsoft.shop.param.CategoryParam; + +import java.util.List; + +/** + * 商品分类表Service + * + * @author 科技小王子 + * @since 2022-11-22 17:45:37 + */ +public interface CategoryService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(CategoryParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(CategoryParam param); + + /** + * 根据id查询 + * + * @param categoryId 商品分类ID + * @return Category + */ + Category getByIdRel(Integer categoryId); + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/CommentService.java b/src/main/java/com/gxwebsoft/shop/service/CommentService.java new file mode 100644 index 0000000..9663fac --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/CommentService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.shop.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.shop.entity.Comment; +import com.gxwebsoft.shop.param.CommentParam; + +import java.util.List; + +/** + * 商品评价记录表Service + * + * @author 科技小王子 + * @since 2022-11-23 21:18:56 + */ +public interface CommentService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(CommentParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(CommentParam param); + + /** + * 根据id查询 + * + * @param commentId 评价ID + * @return Comment + */ + Comment getByIdRel(Integer commentId); + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/CouponService.java b/src/main/java/com/gxwebsoft/shop/service/CouponService.java new file mode 100644 index 0000000..328b8c0 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/CouponService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.shop.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.shop.entity.Coupon; +import com.gxwebsoft.shop.param.CouponParam; + +import java.util.List; + +/** + * 优惠券记录表Service + * + * @author 科技小王子 + * @since 2022-11-28 18:26:05 + */ +public interface CouponService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(CouponParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(CouponParam param); + + /** + * 根据id查询 + * + * @param couponId 优惠券ID + * @return Coupon + */ + Coupon getByIdRel(Integer couponId); + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/ExpressService.java b/src/main/java/com/gxwebsoft/shop/service/ExpressService.java new file mode 100644 index 0000000..db9d993 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/ExpressService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.shop.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.shop.entity.Express; +import com.gxwebsoft.shop.param.ExpressParam; + +import java.util.List; + +/** + * 物流公司记录表Service + * + * @author 科技小王子 + * @since 2022-11-22 00:21:07 + */ +public interface ExpressService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(ExpressParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(ExpressParam param); + + /** + * 根据id查询 + * + * @param expressId 物流公司ID + * @return Express + */ + Express getByIdRel(Integer expressId); + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/GoodsService.java b/src/main/java/com/gxwebsoft/shop/service/GoodsService.java new file mode 100644 index 0000000..98e8c64 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/GoodsService.java @@ -0,0 +1,42 @@ +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.GoodsParam; + +import java.util.List; + +/** + * 商品记录表Service + * + * @author 科技小王子 + * @since 2022-11-23 12:47:16 + */ +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); + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/GoodsServiceService.java b/src/main/java/com/gxwebsoft/shop/service/GoodsServiceService.java new file mode 100644 index 0000000..c2f2212 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/GoodsServiceService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.shop.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.shop.entity.GoodsService; +import com.gxwebsoft.shop.param.GoodsServiceParam; + +import java.util.List; + +/** + * 商品服务与承诺记录表Service + * + * @author 科技小王子 + * @since 2022-11-23 21:57:50 + */ +public interface GoodsServiceService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(GoodsServiceParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(GoodsServiceParam param); + + /** + * 根据id查询 + * + * @param serviceId 商品服务ID + * @return GoodsService + */ + GoodsService getByIdRel(Integer serviceId); + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/MemberService.java b/src/main/java/com/gxwebsoft/shop/service/MemberService.java new file mode 100644 index 0000000..3e006a9 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/MemberService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.shop.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.shop.entity.Member; +import com.gxwebsoft.shop.param.MemberParam; + +import java.util.List; + +/** + * 商城会员Service + * + * @author 科技小王子 + * @since 2022-11-25 14:02:24 + */ +public interface MemberService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(MemberParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(MemberParam param); + + /** + * 根据id查询 + * + * @param memberId 主键ID + * @return Member + */ + Member getByIdRel(Integer memberId); + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/MerchantClerkService.java b/src/main/java/com/gxwebsoft/shop/service/MerchantClerkService.java new file mode 100644 index 0000000..9e6b1be --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/MerchantClerkService.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.shop.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.shop.entity.MerchantClerk; +import com.gxwebsoft.shop.param.MerchantClerkParam; + +import java.util.List; + +/** + * 商家门店店员表Service + * + * @author 科技小王子 + * @since 2022-11-30 16:32:25 + */ +public interface MerchantClerkService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(MerchantClerkParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(MerchantClerkParam param); + + /** + * 根据id查询 + * @param clerkId 商户人员ID + * @return MerchantClerk + */ + MerchantClerk getByIdRel(Integer clerkId); + + /** + * 根据当前登录用户的userId查询所属的商户编号 + * @param loginUserId 商户人员ID + * @return MerchantClerk + */ + String getMerchantCodeByClerk(Integer loginUserId); +} diff --git a/src/main/java/com/gxwebsoft/shop/service/MerchantService.java b/src/main/java/com/gxwebsoft/shop/service/MerchantService.java new file mode 100644 index 0000000..dfe3c1f --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/MerchantService.java @@ -0,0 +1,54 @@ +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 2022-11-30 15:10: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); + + /** + * + * @param merchantOwner 店主绑定的userId + * @return 商户编号 + */ + String getMerchantCodeByOwner(Integer merchantOwner); + + Merchant getMerchantByCode(String merchantCode); + + List listByGeo(MerchantParam param); + + void saveGeoPointToRedis(); +} diff --git a/src/main/java/com/gxwebsoft/shop/service/MerchantWithdrawService.java b/src/main/java/com/gxwebsoft/shop/service/MerchantWithdrawService.java new file mode 100644 index 0000000..a3c5227 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/MerchantWithdrawService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.shop.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.shop.entity.MerchantWithdraw; +import com.gxwebsoft.shop.param.MerchantWithdrawParam; + +import java.util.List; + +/** + * 商户提现记录Service + * + * @author 科技小王子 + * @since 2022-12-02 00:41:09 + */ +public interface MerchantWithdrawService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(MerchantWithdrawParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(MerchantWithdrawParam param); + + /** + * 根据id查询 + * + * @param id 主键ID + * @return MerchantWithdraw + */ + MerchantWithdraw getByIdRel(Integer id); + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/OrderAddressService.java b/src/main/java/com/gxwebsoft/shop/service/OrderAddressService.java new file mode 100644 index 0000000..4f2680a --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/OrderAddressService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.shop.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.shop.entity.OrderAddress; +import com.gxwebsoft.shop.param.OrderAddressParam; + +import java.util.List; + +/** + * 订单收货地址记录表Service + * + * @author 科技小王子 + * @since 2022-12-02 21:21:10 + */ +public interface OrderAddressService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(OrderAddressParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(OrderAddressParam param); + + /** + * 根据id查询 + * + * @param orderAddressId 地址ID + * @return OrderAddress + */ + OrderAddress getByIdRel(Integer orderAddressId); + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/OrderGoodsService.java b/src/main/java/com/gxwebsoft/shop/service/OrderGoodsService.java new file mode 100644 index 0000000..8d116da --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/OrderGoodsService.java @@ -0,0 +1,45 @@ +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 2022-12-09 17:15:31 + */ +public interface OrderGoodsService extends IService { + + List listByOrderIds(List orderIds); + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(OrderGoodsParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(OrderGoodsParam param); + + /** + * 根据id查询 + * + * @param orderGoodsId 订单商品ID + * @return OrderGoods + */ + OrderGoods getByIdRel(Integer orderGoodsId); + + int countBySettled(OrderGoodsParam param); +} diff --git a/src/main/java/com/gxwebsoft/shop/service/OrderRefundAddressService.java b/src/main/java/com/gxwebsoft/shop/service/OrderRefundAddressService.java new file mode 100644 index 0000000..4af1443 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/OrderRefundAddressService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.shop.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.shop.entity.OrderRefundAddress; +import com.gxwebsoft.shop.param.OrderRefundAddressParam; + +import java.util.List; + +/** + * 售后单退货地址记录表Service + * + * @author 科技小王子 + * @since 2023-05-18 13:09:51 + */ +public interface OrderRefundAddressService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(OrderRefundAddressParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(OrderRefundAddressParam param); + + /** + * 根据id查询 + * + * @param id 主键ID + * @return OrderRefundAddress + */ + OrderRefundAddress getByIdRel(Integer id); + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/OrderRefundService.java b/src/main/java/com/gxwebsoft/shop/service/OrderRefundService.java new file mode 100644 index 0000000..8f5a2cb --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/OrderRefundService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.shop.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.shop.entity.OrderRefund; +import com.gxwebsoft.shop.param.OrderRefundParam; + +import java.util.List; + +/** + * 售后单记录表Service + * + * @author 科技小王子 + * @since 2023-05-18 13:09:51 + */ +public interface OrderRefundService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(OrderRefundParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(OrderRefundParam param); + + /** + * 根据id查询 + * + * @param orderRefundId 售后单ID + * @return OrderRefund + */ + OrderRefund getByIdRel(Integer orderRefundId); + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/OrderRenewService.java b/src/main/java/com/gxwebsoft/shop/service/OrderRenewService.java new file mode 100644 index 0000000..f5137e3 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/OrderRenewService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.shop.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.shop.entity.OrderRenew; +import com.gxwebsoft.shop.param.OrderRenewParam; + +import java.util.List; + +/** + * 续费订单记录表Service + * + * @author 科技小王子 + * @since 2023-04-13 10:34:35 + */ +public interface OrderRenewService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(OrderRenewParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(OrderRenewParam param); + + /** + * 根据id查询 + * + * @param orderRenewId 售后单ID + * @return OrderRenew + */ + OrderRenew getByIdRel(Integer orderRenewId); + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/OrderService.java b/src/main/java/com/gxwebsoft/shop/service/OrderService.java new file mode 100644 index 0000000..a6efb9b --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/OrderService.java @@ -0,0 +1,62 @@ +package com.gxwebsoft.shop.service; + +import com.alipay.api.response.AlipayTradeQueryResponse; +import com.baomidou.mybatisplus.annotation.InterceptorIgnore; +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; +import java.util.Map; + +/** + * 订单记录表Service + * + * @author WebSoft + * @since 2022-11-16 11:25:58 + */ +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); + + Order getByOutTradeNo(String outTradeNo); + + @InterceptorIgnore(tenantLine = "true") + void paySuccess(AlipayTradeQueryResponse params); + + boolean allinPay(Map params); + + @InterceptorIgnore(tenantLine = "true") + void removeOrderByTimeOut(); + + @InterceptorIgnore(tenantLine = "true") + boolean updateByIdRel(Order order); + + PageResult selectPageSettled(OrderParam param); + + void updateByIdSettled(Order order); + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/PaymentService.java b/src/main/java/com/gxwebsoft/shop/service/PaymentService.java new file mode 100644 index 0000000..eea8d25 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/PaymentService.java @@ -0,0 +1,50 @@ +package com.gxwebsoft.shop.service; + +import com.alipay.api.AlipayApiException; +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.common.system.param.UserParam; +import com.gxwebsoft.shop.entity.Payment; +import com.gxwebsoft.shop.param.PaymentParam; + +import java.util.List; + +/** + * 商城支付方式记录表Service + * + * @author 科技小王子 + * @since 2022-12-15 19:11:07 + */ +public interface PaymentService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(PaymentParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(PaymentParam param); + + /** + * 根据id查询 + * + * @param paymentId 支付方式ID + * @return Payment + */ + Payment getByIdRel(Integer paymentId); + + /** + * 查询支付方式 + * @param method + * @return + */ + Payment getPaymentByMethod(String method); +} diff --git a/src/main/java/com/gxwebsoft/shop/service/PaymentTemplateService.java b/src/main/java/com/gxwebsoft/shop/service/PaymentTemplateService.java new file mode 100644 index 0000000..a37c20c --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/PaymentTemplateService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.shop.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.shop.entity.PaymentTemplate; +import com.gxwebsoft.shop.param.PaymentTemplateParam; + +import java.util.List; + +/** + * 商城支付模板记录表Service + * + * @author 科技小王子 + * @since 2022-12-09 13:59:38 + */ +public interface PaymentTemplateService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(PaymentTemplateParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(PaymentTemplateParam param); + + /** + * 根据id查询 + * + * @param templateId 支付模板ID + * @return PaymentTemplate + */ + PaymentTemplate getByIdRel(Integer templateId); + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/PaymentTradeService.java b/src/main/java/com/gxwebsoft/shop/service/PaymentTradeService.java new file mode 100644 index 0000000..0c1efdf --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/PaymentTradeService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.shop.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.shop.entity.PaymentTrade; +import com.gxwebsoft.shop.param.PaymentTradeParam; + +import java.util.List; + +/** + * 第三方支付交易记录表Service + * + * @author 科技小王子 + * @since 2022-12-09 13:59:38 + */ +public interface PaymentTradeService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(PaymentTradeParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(PaymentTradeParam param); + + /** + * 根据id查询 + * + * @param tradeId 交易记录ID + * @return PaymentTrade + */ + PaymentTrade getByIdRel(Integer tradeId); + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/RechargeOrderPlanService.java b/src/main/java/com/gxwebsoft/shop/service/RechargeOrderPlanService.java new file mode 100644 index 0000000..ba26b1f --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/RechargeOrderPlanService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.shop.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.shop.entity.RechargeOrderPlan; +import com.gxwebsoft.shop.param.RechargeOrderPlanParam; + +import java.util.List; + +/** + * 会员充值订单套餐快照表Service + * + * @author 科技小王子 + * @since 2023-04-20 20:36:24 + */ +public interface RechargeOrderPlanService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(RechargeOrderPlanParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(RechargeOrderPlanParam param); + + /** + * 根据id查询 + * + * @param orderPlanId 主键ID + * @return RechargeOrderPlan + */ + RechargeOrderPlan getByIdRel(Integer orderPlanId); + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/RechargeOrderService.java b/src/main/java/com/gxwebsoft/shop/service/RechargeOrderService.java new file mode 100644 index 0000000..697cb17 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/RechargeOrderService.java @@ -0,0 +1,43 @@ +package com.gxwebsoft.shop.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.shop.entity.RechargeOrder; +import com.gxwebsoft.shop.param.RechargeOrderParam; + +import java.util.List; + +/** + * 会员充值订单表Service + * + * @author 科技小王子 + * @since 2023-04-20 20:36:24 + */ +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/src/main/java/com/gxwebsoft/shop/service/RechargePlanService.java b/src/main/java/com/gxwebsoft/shop/service/RechargePlanService.java new file mode 100644 index 0000000..b5e9690 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/RechargePlanService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.shop.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.shop.entity.RechargePlan; +import com.gxwebsoft.shop.param.RechargePlanParam; + +import java.util.List; + +/** + * 会员充值套餐表Service + * + * @author 科技小王子 + * @since 2023-04-20 20:36:24 + */ +public interface RechargePlanService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(RechargePlanParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(RechargePlanParam param); + + /** + * 根据id查询 + * + * @param planId 主键ID + * @return RechargePlan + */ + RechargePlan getByIdRel(Integer planId); + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/TestService.java b/src/main/java/com/gxwebsoft/shop/service/TestService.java new file mode 100644 index 0000000..8bee3da --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/TestService.java @@ -0,0 +1,7 @@ +package com.gxwebsoft.shop.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.shop.entity.Order; + +public interface TestService extends IService { +} diff --git a/src/main/java/com/gxwebsoft/shop/service/UserAddressService.java b/src/main/java/com/gxwebsoft/shop/service/UserAddressService.java new file mode 100644 index 0000000..2d0ed35 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/UserAddressService.java @@ -0,0 +1,42 @@ +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 2022-11-25 19:04:43 + */ +public interface UserAddressService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(UserAddressParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(UserAddressParam param); + + /** + * 根据id查询 + * + * @param addressId 主键ID + * @return UserAddress + */ + UserAddress getByIdRel(Integer addressId); + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/UserBalanceLogService.java b/src/main/java/com/gxwebsoft/shop/service/UserBalanceLogService.java new file mode 100644 index 0000000..ba488f5 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/UserBalanceLogService.java @@ -0,0 +1,42 @@ +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 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/src/main/java/com/gxwebsoft/shop/service/UserCommentService.java b/src/main/java/com/gxwebsoft/shop/service/UserCommentService.java new file mode 100644 index 0000000..e8cdfa7 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/UserCommentService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.shop.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.shop.entity.UserComment; +import com.gxwebsoft.shop.param.UserCommentParam; + +import java.util.List; + +/** + * 用户评价记录表Service + * + * @author 科技小王子 + * @since 2023-07-06 13:55:16 + */ +public interface UserCommentService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(UserCommentParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(UserCommentParam param); + + /** + * 根据id查询 + * + * @param commentId 评价ID + * @return UserComment + */ + UserComment getByIdRel(Integer commentId); + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/UserCouponService.java b/src/main/java/com/gxwebsoft/shop/service/UserCouponService.java new file mode 100644 index 0000000..49766e7 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/UserCouponService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.shop.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.shop.entity.UserCoupon; +import com.gxwebsoft.shop.param.UserCouponParam; + +import java.util.List; + +/** + * 用户优惠券记录表Service + * + * @author 科技小王子 + * @since 2022-11-25 19:04:43 + */ +public interface UserCouponService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(UserCouponParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(UserCouponParam param); + + /** + * 根据id查询 + * + * @param userCouponId 主键ID + * @return UserCoupon + */ + UserCoupon getByIdRel(Integer userCouponId); + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/UserFeedbackService.java b/src/main/java/com/gxwebsoft/shop/service/UserFeedbackService.java new file mode 100644 index 0000000..6b71d8a --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/UserFeedbackService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.shop.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.shop.entity.UserFeedback; +import com.gxwebsoft.shop.param.UserFeedbackParam; + +import java.util.List; + +/** + * 意见反馈记录表Service + * + * @author 科技小王子 + * @since 2023-07-16 22:24:55 + */ +public interface UserFeedbackService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(UserFeedbackParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(UserFeedbackParam param); + + /** + * 根据id查询 + * + * @param id ID + * @return UserFeedback + */ + UserFeedback getByIdRel(Integer id); + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/UserFollowService.java b/src/main/java/com/gxwebsoft/shop/service/UserFollowService.java new file mode 100644 index 0000000..4b78313 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/UserFollowService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.shop.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.shop.entity.UserFollow; +import com.gxwebsoft.shop.param.UserFollowParam; + +import java.util.List; + +/** + * 关注记录表Service + * + * @author 科技小王子 + * @since 2022-11-25 19:04:43 + */ +public interface UserFollowService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(UserFollowParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(UserFollowParam param); + + /** + * 根据id查询 + * + * @param logId 主键ID + * @return UserFollow + */ + UserFollow getByIdRel(Integer logId); + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/UserGradeLogService.java b/src/main/java/com/gxwebsoft/shop/service/UserGradeLogService.java new file mode 100644 index 0000000..b4dd600 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/UserGradeLogService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.shop.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.shop.entity.UserGradeLog; +import com.gxwebsoft.shop.param.UserGradeLogParam; + +import java.util.List; + +/** + * 用户会员等级变更记录表Service + * + * @author 科技小王子 + * @since 2023-06-20 16:33:06 + */ +public interface UserGradeLogService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(UserGradeLogParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(UserGradeLogParam param); + + /** + * 根据id查询 + * + * @param logId 主键ID + * @return UserGradeLog + */ + UserGradeLog getByIdRel(Integer logId); + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/UserGradeService.java b/src/main/java/com/gxwebsoft/shop/service/UserGradeService.java new file mode 100644 index 0000000..a8e578c --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/UserGradeService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.shop.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.shop.entity.UserGrade; +import com.gxwebsoft.shop.param.UserGradeParam; + +import java.util.List; + +/** + * 用户会员等级表Service + * + * @author 科技小王子 + * @since 2023-06-20 16:33:06 + */ +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/src/main/java/com/gxwebsoft/shop/service/UserLikeService.java b/src/main/java/com/gxwebsoft/shop/service/UserLikeService.java new file mode 100644 index 0000000..204e18c --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/UserLikeService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.shop.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.shop.entity.UserLike; +import com.gxwebsoft.shop.param.UserLikeParam; + +import java.util.List; + +/** + * 点赞记录表Service + * + * @author 科技小王子 + * @since 2023-07-06 17:51:04 + */ +public interface UserLikeService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(UserLikeParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(UserLikeParam param); + + /** + * 根据id查询 + * + * @param logId 主键ID + * @return UserLike + */ + UserLike getByIdRel(Integer logId); + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/UserLookService.java b/src/main/java/com/gxwebsoft/shop/service/UserLookService.java new file mode 100644 index 0000000..0a2fd27 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/UserLookService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.shop.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.shop.entity.UserLook; +import com.gxwebsoft.shop.param.UserLookParam; + +import java.util.List; + +/** + * 访客记录表Service + * + * @author 科技小王子 + * @since 2023-07-13 23:10:38 + */ +public interface UserLookService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(UserLookParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(UserLookParam param); + + /** + * 根据id查询 + * + * @param logId 主键ID + * @return UserLook + */ + UserLook getByIdRel(Integer logId); + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/UserOauthService.java b/src/main/java/com/gxwebsoft/shop/service/UserOauthService.java new file mode 100644 index 0000000..d98d3de --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/UserOauthService.java @@ -0,0 +1,60 @@ +package com.gxwebsoft.shop.service; + +import com.baomidou.mybatisplus.annotation.InterceptorIgnore; +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.shop.entity.UserOauth; +import com.gxwebsoft.shop.param.OrderParam; +import com.gxwebsoft.shop.param.UserOauthParam; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +/** + * 第三方用户信息表Service + * + * @author 科技小王子 + * @since 2022-12-15 08:33:13 + */ +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); + + /** + * 获取第三方用户唯一标识 + * @param userId + * @param platform + * @return + */ + String getOauthIdByUserId(Integer userId,String platform); + + // 根据openId获取用户信息 + User getByOauthId(String openid); + + // 跟进unionId获取用户信息 + UserOauth getByUnionId(UserOauthParam param); +} diff --git a/src/main/java/com/gxwebsoft/shop/service/UserPointsLogService.java b/src/main/java/com/gxwebsoft/shop/service/UserPointsLogService.java new file mode 100644 index 0000000..7a66a27 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/UserPointsLogService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.shop.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.shop.entity.UserPointsLog; +import com.gxwebsoft.shop.param.UserPointsLogParam; + +import java.util.List; + +/** + * 用户积分变动明细表Service + * + * @author 科技小王子 + * @since 2022-11-25 19:04:43 + */ +public interface UserPointsLogService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(UserPointsLogParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(UserPointsLogParam param); + + /** + * 根据id查询 + * + * @param logId 主键ID + * @return UserPointsLog + */ + UserPointsLog getByIdRel(Integer logId); + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/UserRefereeService.java b/src/main/java/com/gxwebsoft/shop/service/UserRefereeService.java new file mode 100644 index 0000000..e4caff8 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/UserRefereeService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.shop.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.shop.entity.UserReferee; +import com.gxwebsoft.shop.param.UserRefereeParam; + +import java.util.List; + +/** + * 用户推荐关系表Service + * + * @author 科技小王子 + * @since 2023-04-28 14:07:29 + */ +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/src/main/java/com/gxwebsoft/shop/service/impl/CartServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/CartServiceImpl.java new file mode 100644 index 0000000..9f8cb47 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/impl/CartServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.shop.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +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 org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 购物车记录表Service实现 + * + * @author 科技小王子 + * @since 2022-11-25 19:04:43 + */ +@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 + public List listRel(CartParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + //page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public Cart getByIdRel(Integer id) { + CartParam param = new CartParam(); + param.setId(id); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/CategoryServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/CategoryServiceImpl.java new file mode 100644 index 0000000..1055110 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/impl/CategoryServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.shop.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.shop.mapper.CategoryMapper; +import com.gxwebsoft.shop.service.CategoryService; +import com.gxwebsoft.shop.entity.Category; +import com.gxwebsoft.shop.param.CategoryParam; +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 2022-11-22 17:45:37 + */ +@Service +public class CategoryServiceImpl extends ServiceImpl implements CategoryService { + + @Override + public PageResult pageRel(CategoryParam 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(CategoryParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + //page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public Category getByIdRel(Integer categoryId) { + CategoryParam param = new CategoryParam(); + param.setCategoryId(categoryId); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/CommentServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/CommentServiceImpl.java new file mode 100644 index 0000000..7e4f444 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/impl/CommentServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.shop.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.shop.mapper.CommentMapper; +import com.gxwebsoft.shop.service.CommentService; +import com.gxwebsoft.shop.entity.Comment; +import com.gxwebsoft.shop.param.CommentParam; +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 2022-11-23 21:18:56 + */ +@Service +public class CommentServiceImpl extends ServiceImpl implements CommentService { + + @Override + public PageResult pageRel(CommentParam 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(CommentParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + //page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public Comment getByIdRel(Integer commentId) { + CommentParam param = new CommentParam(); + param.setCommentId(commentId); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/CouponServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/CouponServiceImpl.java new file mode 100644 index 0000000..76bf727 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/impl/CouponServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.shop.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.shop.mapper.CouponMapper; +import com.gxwebsoft.shop.service.CouponService; +import com.gxwebsoft.shop.entity.Coupon; +import com.gxwebsoft.shop.param.CouponParam; +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 2022-11-28 18:26:05 + */ +@Service +public class CouponServiceImpl extends ServiceImpl implements CouponService { + + @Override + public PageResult pageRel(CouponParam 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(CouponParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + //page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public Coupon getByIdRel(Integer couponId) { + CouponParam param = new CouponParam(); + param.setCouponId(couponId); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/ExpressServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/ExpressServiceImpl.java new file mode 100644 index 0000000..3b451df --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/impl/ExpressServiceImpl.java @@ -0,0 +1,48 @@ +package com.gxwebsoft.shop.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.shop.mapper.ExpressMapper; +import com.gxwebsoft.shop.service.ExpressService; +import com.gxwebsoft.shop.entity.Express; +import com.gxwebsoft.shop.param.ExpressParam; +import com.gxwebsoft.common.core.web.PageParam; +import com.gxwebsoft.common.core.web.PageResult; +import lombok.val; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 物流公司记录表Service实现 + * + * @author 科技小王子 + * @since 2022-11-22 00:21:07 + */ +@Service +public class ExpressServiceImpl extends ServiceImpl implements ExpressService { + + @Override + public PageResult pageRel(ExpressParam 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(ExpressParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + //page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public Express getByIdRel(Integer expressId) { + ExpressParam param = new ExpressParam(); + param.setExpressId(expressId); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/GoodsServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/GoodsServiceImpl.java new file mode 100644 index 0000000..c7408e5 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/impl/GoodsServiceImpl.java @@ -0,0 +1,47 @@ +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.Goods; +import com.gxwebsoft.shop.mapper.GoodsMapper; +import com.gxwebsoft.shop.param.GoodsParam; +import com.gxwebsoft.shop.service.GoodsService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 商品记录表Service实现 + * + * @author 科技小王子 + * @since 2022-11-23 12:47:16 + */ +@Service +public class GoodsServiceImpl extends ServiceImpl implements GoodsService { + + @Override + public PageResult pageRel(GoodsParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("gear asc,sort_number asc,create_time desc"); + List list = baseMapper.selectPageRel(page, param); + return new PageResult<>(list, page.getTotal()); + } + + @Override + public List listRel(GoodsParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + page.setDefaultOrder("gear asc,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)); + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/GoodsServiceServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/GoodsServiceServiceImpl.java new file mode 100644 index 0000000..f0e33cf --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/impl/GoodsServiceServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.shop.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.shop.mapper.GoodsServiceMapper; +import com.gxwebsoft.shop.service.GoodsServiceService; +import com.gxwebsoft.shop.entity.GoodsService; +import com.gxwebsoft.shop.param.GoodsServiceParam; +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 2022-11-23 21:57:50 + */ +@Service +public class GoodsServiceServiceImpl extends ServiceImpl implements GoodsServiceService { + + @Override + public PageResult pageRel(GoodsServiceParam 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(GoodsServiceParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + //page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public GoodsService getByIdRel(Integer serviceId) { + GoodsServiceParam param = new GoodsServiceParam(); + param.setServiceId(serviceId); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/MemberServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/MemberServiceImpl.java new file mode 100644 index 0000000..fa8d39b --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/impl/MemberServiceImpl.java @@ -0,0 +1,72 @@ +package com.gxwebsoft.shop.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.common.system.entity.Role; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.common.system.service.UserService; +import com.gxwebsoft.shop.mapper.MemberMapper; +import com.gxwebsoft.shop.service.MemberService; +import com.gxwebsoft.shop.entity.Member; +import com.gxwebsoft.shop.param.MemberParam; +import com.gxwebsoft.common.core.web.PageParam; +import com.gxwebsoft.common.core.web.PageResult; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; +import java.util.stream.Collectors; + +/** + * 商城会员Service实现 + * + * @author 科技小王子 + * @since 2022-11-25 14:02:24 + */ +@Service +public class MemberServiceImpl extends ServiceImpl implements MemberService { + + @Resource + private UserService userService; + + @Override + public PageResult pageRel(MemberParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + List list = baseMapper.selectPageRel(page, param); + // 查询会员的关联信息 + selectUser(list); + return new PageResult<>(list, page.getTotal()); + } + + @Override + public List listRel(MemberParam param) { + List list = baseMapper.selectListRel(param); + // 查询会员的关联信息 + selectUser(list); + // 排序 + PageParam page = new PageParam<>(); + //page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public Member getByIdRel(Integer memberId) { + MemberParam param = new MemberParam(); + param.setMemberId(memberId); + return param.getOne(baseMapper.selectListRel(param)); + } + + /** + * 批量查询会员的关联信息 + * + * @param members 会员集合 + */ + private void selectUser(List members) { + if (members != null && members.size() > 0) { + for (Member member : members) { + member.setUser(userService.getById(member.getUserId())); + } + } + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/MerchantClerkServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/MerchantClerkServiceImpl.java new file mode 100644 index 0000000..74208e3 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/impl/MerchantClerkServiceImpl.java @@ -0,0 +1,75 @@ +package com.gxwebsoft.shop.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.common.system.service.UserService; +import com.gxwebsoft.shop.mapper.MerchantClerkMapper; +import com.gxwebsoft.shop.service.MerchantClerkService; +import com.gxwebsoft.shop.entity.MerchantClerk; +import com.gxwebsoft.shop.param.MerchantClerkParam; +import com.gxwebsoft.common.core.web.PageParam; +import com.gxwebsoft.common.core.web.PageResult; +import lombok.val; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 商家门店店员表Service实现 + * + * @author 科技小王子 + * @since 2022-11-30 16:32:25 + */ +@Service +public class MerchantClerkServiceImpl extends ServiceImpl implements MerchantClerkService { + @Resource + private UserService userService; + + @Override + public PageResult pageRel(MerchantClerkParam param) { + PageParam page = new PageParam<>(param); + //page.setDefaultOrder("create_time desc"); + List list = baseMapper.selectPageRel(page, param); + // 查询会员的关联信息 + selectUser(list); + return new PageResult<>(list, page.getTotal()); + } + + @Override + public List listRel(MerchantClerkParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + //page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public MerchantClerk getByIdRel(Integer clerkId) { + MerchantClerkParam param = new MerchantClerkParam(); + param.setClerkId(clerkId); + return param.getOne(baseMapper.selectListRel(param)); + } + + @Override + public String getMerchantCodeByClerk(Integer loginUserId) { + MerchantClerk merchantClerk = query().eq("user_id", loginUserId).one(); + if(merchantClerk != null){ + return merchantClerk.getMerchantCode(); + } + return null; + } + + /** + * 批量查询会员的关联信息 + * + * @param clerks 会员集合 + */ + private void selectUser(List clerks) { + if (clerks != null && clerks.size() > 0) { + for (MerchantClerk clerk : clerks) { + clerk.setUser(userService.getById(clerk.getUserId())); + } + } + } +} diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/MerchantServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/MerchantServiceImpl.java new file mode 100644 index 0000000..ea35961 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/impl/MerchantServiceImpl.java @@ -0,0 +1,145 @@ +package com.gxwebsoft.shop.service.impl; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.common.core.utils.CacheClient; +import com.gxwebsoft.common.core.web.PageParam; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.shop.entity.Merchant; +import com.gxwebsoft.shop.mapper.MerchantMapper; +import com.gxwebsoft.shop.param.MerchantParam; +import com.gxwebsoft.shop.service.MerchantService; +import org.springframework.data.geo.*; +import org.springframework.data.redis.connection.RedisGeoCommands; +import org.springframework.data.redis.core.StringRedisTemplate; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +import static com.gxwebsoft.common.core.constants.RedisConstants.MERCHANT_GEO_KEY; + +/** + * 商户管理Service实现 + * + * @author 科技小王子 + * @since 2022-11-30 15:10:54 + */ +@Service +public class MerchantServiceImpl extends ServiceImpl implements MerchantService { + @Resource + private StringRedisTemplate stringRedisTemplate; + @Resource + private CacheClient cacheClient; + + @Override + public PageResult pageRel(MerchantParam 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(MerchantParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + page.setDefaultOrder("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)); + } + + @Override + public String getMerchantCodeByOwner(Integer merchantOwner) { + Merchant merchant = query().eq("merchant_owner", merchantOwner).one(); + if (merchant == null) { + return null; + } + return merchant.getMerchantCode(); + } + + @Override + public Merchant getMerchantByCode(String merchantCode) { + return query().eq("merchant_code", merchantCode).one(); + } + + @Override + public List listByGeo(MerchantParam param) { + System.out.println("param = " + param); + // 1. 是否按距离排序 + if (param.getLngAndLat() == null) { + // 无定位信息 + return list(); + } + // 2. 查询10公里内的10家店铺 + final String lngAndLat = param.getLngAndLat(); + final String[] split = lngAndLat.split(","); + final Point point = new Point(Double.parseDouble(split[0]), Double.parseDouble(split[1])); + RedisGeoCommands.GeoRadiusCommandArgs geoRadiusCommandArgs = RedisGeoCommands.GeoRadiusCommandArgs.newGeoRadiusArgs(); +// final Distance distance1 = new Distance(5, Metrics.KILOMETERS); + GeoResults> results = stringRedisTemplate.opsForGeo().radius(MERCHANT_GEO_KEY, new Circle(point, 10000), geoRadiusCommandArgs.includeDistance().limit(10)); + + assert results != null; + final List>> list = results.getContent(); + if (list.size() == 0) { + return null; + } + List ids = new ArrayList<>(list.size()); + Map distanceMap = new HashMap<>(list.size()); + list.forEach(d -> { + // 获取店铺ID + String merchantId = d.getContent().getName(); + ids.add(merchantId); + // 获取距离 + Distance distance = d.getDistance(); +// System.out.println("distance = " + distance); + distanceMap.put(merchantId, distance); + }); +// System.out.println("ids = " + ids); +// System.out.println("distanceMap = " + distanceMap); + final List merchants = query().in("merchant_id", ids).last("ORDER BY FIELD(merchant_id," + StrUtil.join(",", ids) + ")").list(); + for (Merchant shop : merchants) { + shop.setDistance(distanceMap.get(StrUtil.toString(shop.getMerchantId())).getValue()); + } +// System.out.println("merchants = " + merchants); + // 定时更新geo商户点位信息 +// this.saveGeoPointToRedis(); + return merchants; + } + + /** + * 更新所有商户点位信息 + */ + @Override + public void saveGeoPointToRedis() { + // 1.查询所有商户 + final List list = list(); + // 2.然后按品牌分组，把品牌id一致的放到一个集合 + final Map> map = list.stream().collect(Collectors.groupingBy(Merchant::getMerchantId)); + // 3.分批完成写入Redis + for (Map.Entry> entry : map.entrySet()) { + // 3.1 获取商户的集合 + List value = entry.getValue(); + List> locatioins = new ArrayList<>(value.size()); + // 3.2 写入redis GEOADD key 经度 维度 member + for (Merchant merchant : value) { + String lngAndLat = merchant.getLngAndLat(); + final String[] split = lngAndLat.split(","); + locatioins.add(new RedisGeoCommands.GeoLocation<>(merchant.getMerchantId().toString(), new Point(Double.parseDouble(split[0]), Double.parseDouble(split[1])))); + } +// System.out.println("locatioins = " + locatioins); + stringRedisTemplate.opsForGeo().add(MERCHANT_GEO_KEY, locatioins); + } + } +} diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/MerchantWithdrawServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/MerchantWithdrawServiceImpl.java new file mode 100644 index 0000000..41b08c6 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/impl/MerchantWithdrawServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.shop.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.shop.mapper.MerchantWithdrawMapper; +import com.gxwebsoft.shop.service.MerchantWithdrawService; +import com.gxwebsoft.shop.entity.MerchantWithdraw; +import com.gxwebsoft.shop.param.MerchantWithdrawParam; +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 2022-12-02 00:41:09 + */ +@Service +public class MerchantWithdrawServiceImpl extends ServiceImpl implements MerchantWithdrawService { + + @Override + public PageResult pageRel(MerchantWithdrawParam 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(MerchantWithdrawParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + //page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public MerchantWithdraw getByIdRel(Integer id) { + MerchantWithdrawParam param = new MerchantWithdrawParam(); + param.setId(id); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/OrderAddressServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/OrderAddressServiceImpl.java new file mode 100644 index 0000000..438897e --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/impl/OrderAddressServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.shop.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.shop.mapper.OrderAddressMapper; +import com.gxwebsoft.shop.service.OrderAddressService; +import com.gxwebsoft.shop.entity.OrderAddress; +import com.gxwebsoft.shop.param.OrderAddressParam; +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 2022-12-02 21:21:10 + */ +@Service +public class OrderAddressServiceImpl extends ServiceImpl implements OrderAddressService { + + @Override + public PageResult pageRel(OrderAddressParam 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(OrderAddressParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + //page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public OrderAddress getByIdRel(Integer orderAddressId) { + OrderAddressParam param = new OrderAddressParam(); + param.setOrderAddressId(orderAddressId); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/OrderGoodsServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/OrderGoodsServiceImpl.java new file mode 100644 index 0000000..6b555de --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/impl/OrderGoodsServiceImpl.java @@ -0,0 +1,56 @@ +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 2022-12-09 17:15:31 + */ +@Service +public class OrderGoodsServiceImpl extends ServiceImpl implements OrderGoodsService { + + @Override + public List listByOrderIds(List orderIds) { + return baseMapper.selectByOrderIds(orderIds); + } + + @Override + public PageResult pageRel(OrderGoodsParam 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(OrderGoodsParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public OrderGoods getByIdRel(Integer orderGoodsId) { + OrderGoodsParam param = new OrderGoodsParam(); + param.setOrderGoodsId(orderGoodsId); + return param.getOne(baseMapper.selectListRel(param)); + } + + @Override + public int countBySettled(OrderGoodsParam param) { + return baseMapper.selectCountBySettled(param); + } +} diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/OrderRefundAddressServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/OrderRefundAddressServiceImpl.java new file mode 100644 index 0000000..28b2455 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/impl/OrderRefundAddressServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.shop.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.shop.mapper.OrderRefundAddressMapper; +import com.gxwebsoft.shop.service.OrderRefundAddressService; +import com.gxwebsoft.shop.entity.OrderRefundAddress; +import com.gxwebsoft.shop.param.OrderRefundAddressParam; +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-18 13:09:51 + */ +@Service +public class OrderRefundAddressServiceImpl extends ServiceImpl implements OrderRefundAddressService { + + @Override + public PageResult pageRel(OrderRefundAddressParam 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(OrderRefundAddressParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + //page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public OrderRefundAddress getByIdRel(Integer id) { + OrderRefundAddressParam param = new OrderRefundAddressParam(); + param.setId(id); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/OrderRefundServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/OrderRefundServiceImpl.java new file mode 100644 index 0000000..8ea3545 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/impl/OrderRefundServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.shop.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.shop.mapper.OrderRefundMapper; +import com.gxwebsoft.shop.service.OrderRefundService; +import com.gxwebsoft.shop.entity.OrderRefund; +import com.gxwebsoft.shop.param.OrderRefundParam; +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-18 13:09:51 + */ +@Service +public class OrderRefundServiceImpl extends ServiceImpl implements OrderRefundService { + + @Override + public PageResult pageRel(OrderRefundParam 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(OrderRefundParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public OrderRefund getByIdRel(Integer orderRefundId) { + OrderRefundParam param = new OrderRefundParam(); + param.setOrderRefundId(orderRefundId); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/OrderRenewServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/OrderRenewServiceImpl.java new file mode 100644 index 0000000..7aaa9ec --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/impl/OrderRenewServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.shop.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.shop.mapper.OrderRenewMapper; +import com.gxwebsoft.shop.service.OrderRenewService; +import com.gxwebsoft.shop.entity.OrderRenew; +import com.gxwebsoft.shop.param.OrderRenewParam; +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-04-13 10:34:35 + */ +@Service +public class OrderRenewServiceImpl extends ServiceImpl implements OrderRenewService { + + @Override + public PageResult pageRel(OrderRenewParam 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(OrderRenewParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + //page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public OrderRenew getByIdRel(Integer orderRenewId) { + OrderRenewParam param = new OrderRenewParam(); + param.setOrderRenewId(orderRenewId); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/OrderServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/OrderServiceImpl.java new file mode 100644 index 0000000..d3f7826 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/impl/OrderServiceImpl.java @@ -0,0 +1,249 @@ +package com.gxwebsoft.shop.service.impl; + +import cn.hutool.core.date.DateField; +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; +import com.alipay.api.response.AlipayTradeQueryResponse; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.apps.service.EquipmentGoodsService; +import com.gxwebsoft.apps.service.EquipmentService; +import com.gxwebsoft.common.core.utils.CacheClient; +import com.gxwebsoft.common.core.web.PageParam; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.shop.entity.Order; +import com.gxwebsoft.shop.entity.OrderGoods; +import com.gxwebsoft.shop.mapper.OrderMapper; +import com.gxwebsoft.shop.param.OrderParam; +import com.gxwebsoft.shop.service.OrderGoodsService; +import com.gxwebsoft.shop.service.OrderService; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.math.BigDecimal; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +import static com.gxwebsoft.common.core.constants.OrderConstants.*; + +/** + * 订单记录表Service实现 + * + * @author WebSoft + * @since 2022-11-16 11:25:58 + */ +@Service +public class OrderServiceImpl extends ServiceImpl implements OrderService { + @Resource + private EquipmentService equipmentService; + @Resource + private EquipmentGoodsService equipmentGoodsService; + @Resource + private OrderService orderService; + @Resource + private OrderGoodsService orderGoodsService; + @Resource + private CacheClient cacheClient; + + @Override + public PageResult pageRel(OrderParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("delivery_time desc,create_time desc"); + List list = baseMapper.selectPageRel(page, param); + // 是否查询订单商品 + if(param.getShowGoodsList() != null){ + list.forEach(d -> { + final List goodsList = orderGoodsService.list(new LambdaQueryWrapper().eq(OrderGoods::getOrderId, d.getOrderId()).gt(OrderGoods::getTotalNum, 0)); + goodsList.forEach(g -> { + // 比较时间前后判断是否允许取消报餐 + SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + Date newDate = DateUtil.offset(d.getDeliveryTime(), DateField.HOUR, -3); + try { + Date date1 = df.parse(newDate.toString()); + Date date2 = df.parse(DateUtil.now()); + g.setIsCancel(date1.after(date2)); + final boolean before = date1.after(date2); + System.out.println("是否允许取消报餐 = " + before); + } catch (ParseException e) { + e.printStackTrace(); + } + }); + d.setGoodsList(goodsList); + }); + } + return new PageResult<>(list, page.getTotal()); + } + + @Override + public List listRel(OrderParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + page.setDefaultOrder("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)); + } + + @Override + public Order getByOutTradeNo(String outTradeNo) { + OrderParam param = new OrderParam(); + param.setOrderNo(outTradeNo); + return param.getOne(baseMapper.getOne(param)); + } + + /** + * 支付成功后处理的业务(通联支付) + */ + @Override + public boolean allinPay(Map params) { + cacheClient.set(":payInfo", params.toString()); + final String outTradeNo = params.get("merchantOrderNo"); + final String trxamt = params.get("trxamt"); + final String merchantNo = params.get("merchantNo"); + final String chnltrxid = params.get("chnltrxid"); + final String payTime = params.get("payTime"); + final String fee = params.get("fee"); + final String trxStatus = params.get("trxstatus"); + + // 1.是否为商城订单 + Order order = orderService.getByOutTradeNo(outTradeNo); + if (order == null) { + return false; + } + + // 2.订单金额是否一致 + final BigDecimal payPrice = new BigDecimal(trxamt).divide(new BigDecimal(100)); + + // 3.订单商户是否一致 +// if (!merchantNo.equals(order.getMerchantCode())) { +// return false; +// } + + // 4.验证appId是否一致 +// String appId = params.get("app_id"); +// System.out.println("验证appId是否一致"+appId); +// String appIdPro = "2021003156628508"; +// if (!appId.equals(appIdPro)) { +// System.out.println("验证appId校验失败"); +// return false; +// } + // 5.判断交易状态 + if (!"2".equals(trxStatus)) { + return false; + } + // 6.修改订单状态 + OrderParam orderParam = new OrderParam(); + orderParam.setOrderNo(outTradeNo); + orderParam.setPayStatus(PAY_STATUS_SUCCESS); + orderParam.setPayPrice(payPrice); + // + return baseMapper.updatePayStatus(orderParam); + } + + @Override + public void removeOrderByTimeOut() { + final Integer pay_status = query().eq("order_no", "2023121205993791").count(); + System.out.println("处理过期订单 = " + pay_status); + } + + @Override + public boolean updateByIdRel(Order order) { + return baseMapper.updateByIdRel(order); + } + + @Override + public PageResult selectPageSettled(OrderParam param) { + PageParam page = new PageParam<>(param); + //page.setDefaultOrder("create_time desc"); + List list = baseMapper.selectPageSettled(page, param); + return new PageResult<>(list, page.getTotal()); + } + + @Override + public void updateByIdSettled(Order order) { + baseMapper.updateByIdSettled(order); + } + + + /** + * 支付成功后处理的业务 + */ + @Transactional(rollbackFor = {Exception.class}) + @Override + public void paySuccess(AlipayTradeQueryResponse params) { + System.out.println("支付成功后处理的业务"); + String outTradeNo = params.getOutTradeNo(); + String totalAmount = params.getTotalAmount(); + String receiptAmount = params.getReceiptAmount(); + // 1.是否为商城订单 + Order order = orderService.getByOutTradeNo(outTradeNo); + if (order == null) { + System.out.println("订单不存在！"); + return; + } + // 2.订单金额是否一致 + // 3.订单商户是否一致 + // 4.验证appId是否一致 + // 5.判断交易状态 + String tradeStatus = params.getTradeStatus(); + if (!"TRADE_SUCCESS".equals(tradeStatus)) { + System.out.println("支付未成功"); + return; + } + + // 6.修改订单状态 + order.setPayStatus(PAY_STATUS_SUCCESS); + order.setPayMethod(PAY_METHOD_ALIPAY); + order.setReceiptAmount(new BigDecimal(receiptAmount)); + order.setPayTime(DateUtil.date()); + order.setExpirationTime(DateUtil.nextMonth()); + orderService.updateById(order); + + // 6. 续租订单 + if (order.getRentOrderId() > 0) { + // 主订单 + Order parentOrder = orderService.getById(order.getRentOrderId()); + // 更新过期时间延长一个月 + Date expirationTime = parentOrder.getExpirationTime(); + DateTime nextMonthTime = DateUtil.offsetMonth(expirationTime, 1); + parentOrder.setExpirationTime(nextMonthTime); + orderService.updateById(parentOrder); + // 保存续费订单状态 + order.setDeliveryStatus(DELIVERY_STATUS_YES); + order.setReceiptStatus(RECEIPT_STATUS_YES); + order.setOrderStatus(ORDER_STATUS_COMPLETED); + order.setStartTime(expirationTime); + order.setExpirationTime(nextMonthTime); + orderService.updateById(order); + } + } + + /** + * 批量查询订单的关联商品 + * + * @param orders 商品集合 + */ + private void selectOrderGoods(List orders) { + if (orders != null && orders.size() > 0) { + List orderIds = orders.stream().map(Order::getOrderId).collect(Collectors.toList()); + List orderGoods = orderGoodsService.listByOrderIds(orderIds); + for (Order order : orders) { + List goodsList = orderGoods.stream().filter(d -> order.getOrderId().equals(d.getOrderId())) + .collect(Collectors.toList()); + order.setGoodsList(goodsList); + } + } + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/PaymentServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/PaymentServiceImpl.java new file mode 100644 index 0000000..9fee559 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/impl/PaymentServiceImpl.java @@ -0,0 +1,65 @@ +package com.gxwebsoft.shop.service.impl; + +import com.alipay.api.AlipayApiException; +import com.alipay.api.AlipayClient; +import com.alipay.api.request.AlipaySystemOauthTokenRequest; +import com.alipay.api.response.AlipaySystemOauthTokenResponse; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.common.system.param.UserParam; +import com.gxwebsoft.shop.mapper.PaymentMapper; +import com.gxwebsoft.shop.service.PaymentService; +import com.gxwebsoft.shop.entity.Payment; +import com.gxwebsoft.shop.param.PaymentParam; +import com.gxwebsoft.common.core.web.PageParam; +import com.gxwebsoft.common.core.web.PageResult; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 商城支付方式记录表Service实现 + * + * @author 科技小王子 + * @since 2022-12-15 19:11:07 + */ +@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 paymentId) { + PaymentParam param = new PaymentParam(); + param.setPaymentId(paymentId); + return param.getOne(baseMapper.selectListRel(param)); + } + + @Override + public Payment getPaymentByMethod(String method){ + System.out.println(method+"......."); + PaymentParam param = new PaymentParam(); + param.setMethod(method); + param.setTenantId(6); + System.out.println(param); +// System.out.println(param.getOne(baseMapper.selectListRel(param))); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/PaymentTemplateServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/PaymentTemplateServiceImpl.java new file mode 100644 index 0000000..4650ff2 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/impl/PaymentTemplateServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.shop.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.shop.mapper.PaymentTemplateMapper; +import com.gxwebsoft.shop.service.PaymentTemplateService; +import com.gxwebsoft.shop.entity.PaymentTemplate; +import com.gxwebsoft.shop.param.PaymentTemplateParam; +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 2022-12-09 13:59:38 + */ +@Service +public class PaymentTemplateServiceImpl extends ServiceImpl implements PaymentTemplateService { + + @Override + public PageResult pageRel(PaymentTemplateParam 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(PaymentTemplateParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + //page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public PaymentTemplate getByIdRel(Integer templateId) { + PaymentTemplateParam param = new PaymentTemplateParam(); + param.setTemplateId(templateId); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/PaymentTradeServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/PaymentTradeServiceImpl.java new file mode 100644 index 0000000..7c64f9c --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/impl/PaymentTradeServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.shop.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.shop.mapper.PaymentTradeMapper; +import com.gxwebsoft.shop.service.PaymentTradeService; +import com.gxwebsoft.shop.entity.PaymentTrade; +import com.gxwebsoft.shop.param.PaymentTradeParam; +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 2022-12-09 13:59:38 + */ +@Service +public class PaymentTradeServiceImpl extends ServiceImpl implements PaymentTradeService { + + @Override + public PageResult pageRel(PaymentTradeParam 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(PaymentTradeParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + //page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public PaymentTrade getByIdRel(Integer tradeId) { + PaymentTradeParam param = new PaymentTradeParam(); + param.setTradeId(tradeId); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/RechargeOrderPlanServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/RechargeOrderPlanServiceImpl.java new file mode 100644 index 0000000..ad20509 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/impl/RechargeOrderPlanServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.shop.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.shop.mapper.RechargeOrderPlanMapper; +import com.gxwebsoft.shop.service.RechargeOrderPlanService; +import com.gxwebsoft.shop.entity.RechargeOrderPlan; +import com.gxwebsoft.shop.param.RechargeOrderPlanParam; +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-04-20 20:36:24 + */ +@Service +public class RechargeOrderPlanServiceImpl extends ServiceImpl implements RechargeOrderPlanService { + + @Override + public PageResult pageRel(RechargeOrderPlanParam 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(RechargeOrderPlanParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + //page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public RechargeOrderPlan getByIdRel(Integer orderPlanId) { + RechargeOrderPlanParam param = new RechargeOrderPlanParam(); + param.setOrderPlanId(orderPlanId); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/RechargeOrderServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/RechargeOrderServiceImpl.java new file mode 100644 index 0000000..4893379 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/impl/RechargeOrderServiceImpl.java @@ -0,0 +1,52 @@ +package com.gxwebsoft.shop.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.common.system.service.UserService; +import com.gxwebsoft.shop.mapper.RechargeOrderMapper; +import com.gxwebsoft.shop.service.RechargeOrderService; +import com.gxwebsoft.shop.entity.RechargeOrder; +import com.gxwebsoft.shop.param.RechargeOrderParam; +import com.gxwebsoft.common.core.web.PageParam; +import com.gxwebsoft.common.core.web.PageResult; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 会员充值订单表Service实现 + * + * @author 科技小王子 + * @since 2023-04-20 20:36:24 + */ +@Service +public class RechargeOrderServiceImpl extends ServiceImpl implements RechargeOrderService { + @Resource + private UserService userService; + + @Override + public PageResult pageRel(RechargeOrderParam 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(RechargeOrderParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + //page.setDefaultOrder("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/src/main/java/com/gxwebsoft/shop/service/impl/RechargePlanServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/RechargePlanServiceImpl.java new file mode 100644 index 0000000..261d76a --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/impl/RechargePlanServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.shop.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.shop.mapper.RechargePlanMapper; +import com.gxwebsoft.shop.service.RechargePlanService; +import com.gxwebsoft.shop.entity.RechargePlan; +import com.gxwebsoft.shop.param.RechargePlanParam; +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-04-20 20:36:24 + */ +@Service +public class RechargePlanServiceImpl extends ServiceImpl implements RechargePlanService { + + @Override + public PageResult pageRel(RechargePlanParam 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(RechargePlanParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + //page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public RechargePlan getByIdRel(Integer planId) { + RechargePlanParam param = new RechargePlanParam(); + param.setPlanId(planId); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/TestServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/TestServiceImpl.java new file mode 100644 index 0000000..0f870d0 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/impl/TestServiceImpl.java @@ -0,0 +1,12 @@ +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.OrderMapper; +import com.gxwebsoft.shop.service.TestService; +import org.springframework.stereotype.Service; + +@Service +public class TestServiceImpl extends ServiceImpl implements TestService { + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/UserAddressServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/UserAddressServiceImpl.java new file mode 100644 index 0000000..ab187ca --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/impl/UserAddressServiceImpl.java @@ -0,0 +1,47 @@ +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 2022-11-25 19:04:43 + */ +@Service +public class UserAddressServiceImpl extends ServiceImpl implements UserAddressService { + + @Override + public PageResult pageRel(UserAddressParam 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(UserAddressParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + //page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public UserAddress getByIdRel(Integer addressId) { + UserAddressParam param = new UserAddressParam(); + param.setAddressId(addressId); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/UserBalanceLogServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/UserBalanceLogServiceImpl.java new file mode 100644 index 0000000..ed533ce --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/impl/UserBalanceLogServiceImpl.java @@ -0,0 +1,47 @@ +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 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/src/main/java/com/gxwebsoft/shop/service/impl/UserCommentServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/UserCommentServiceImpl.java new file mode 100644 index 0000000..8fe11cb --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/impl/UserCommentServiceImpl.java @@ -0,0 +1,65 @@ +package com.gxwebsoft.shop.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.core.web.PageParam; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.shop.entity.UserComment; +import com.gxwebsoft.shop.entity.UserLike; +import com.gxwebsoft.shop.mapper.UserCommentMapper; +import com.gxwebsoft.shop.param.UserCommentParam; +import com.gxwebsoft.shop.service.UserCommentService; +import com.gxwebsoft.shop.service.UserLikeService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 用户评价记录表Service实现 + * + * @author 科技小王子 + * @since 2023-07-06 13:55:16 + */ +@Service +public class UserCommentServiceImpl extends ServiceImpl implements UserCommentService { + @Resource + private UserLikeService userLikeService; + + @Override + public PageResult pageRel(UserCommentParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + List list = baseMapper.selectPageRel(page, param); + if (param.getLoginUserId() != null) { + // 我点赞的人 + final List myLikes = userLikeService.list(new LambdaQueryWrapper().eq(UserLike::getUserId, param.getLoginUserId())); + System.out.println("myLikes = " + myLikes); + list.forEach(d -> { + final boolean isLike = myLikes.stream().anyMatch(f -> f.getToUserId().equals(param.getLoginUserId())); + d.setLikes(isLike); + }); + } + // List转为树形结构 + final List userComments = CommonUtil.toTreeData(list, 0, UserComment::getReplyCommentId, UserComment::getCommentId, UserComment::setChildren); + return new PageResult<>(userComments, page.getTotal()); + } + + @Override + public List listRel(UserCommentParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public UserComment getByIdRel(Integer commentId) { + UserCommentParam param = new UserCommentParam(); + param.setCommentId(commentId); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/UserCouponServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/UserCouponServiceImpl.java new file mode 100644 index 0000000..3c4239a --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/impl/UserCouponServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.shop.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.shop.mapper.UserCouponMapper; +import com.gxwebsoft.shop.service.UserCouponService; +import com.gxwebsoft.shop.entity.UserCoupon; +import com.gxwebsoft.shop.param.UserCouponParam; +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 2022-11-25 19:04:43 + */ +@Service +public class UserCouponServiceImpl extends ServiceImpl implements UserCouponService { + + @Override + public PageResult pageRel(UserCouponParam 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(UserCouponParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + //page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public UserCoupon getByIdRel(Integer userCouponId) { + UserCouponParam param = new UserCouponParam(); + param.setUserCouponId(userCouponId); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/UserFeedbackServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/UserFeedbackServiceImpl.java new file mode 100644 index 0000000..238ba47 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/impl/UserFeedbackServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.shop.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.shop.mapper.UserFeedbackMapper; +import com.gxwebsoft.shop.service.UserFeedbackService; +import com.gxwebsoft.shop.entity.UserFeedback; +import com.gxwebsoft.shop.param.UserFeedbackParam; +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-07-16 22:24:55 + */ +@Service +public class UserFeedbackServiceImpl extends ServiceImpl implements UserFeedbackService { + + @Override + public PageResult pageRel(UserFeedbackParam 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(UserFeedbackParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + //page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public UserFeedback getByIdRel(Integer id) { + UserFeedbackParam param = new UserFeedbackParam(); + param.setId(id); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/UserFollowServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/UserFollowServiceImpl.java new file mode 100644 index 0000000..f4ea116 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/impl/UserFollowServiceImpl.java @@ -0,0 +1,66 @@ +package com.gxwebsoft.shop.service.impl; + +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.shop.entity.UserFollow; +import com.gxwebsoft.shop.mapper.UserFollowMapper; +import com.gxwebsoft.shop.param.UserFollowParam; +import com.gxwebsoft.shop.service.UserFollowService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; +import java.util.Objects; +import java.util.Set; +import java.util.stream.Collectors; + +/** + * 关注记录表Service实现 + * + * @author 科技小王子 + * @since 2022-11-25 19:04:43 + */ +@Service +public class UserFollowServiceImpl extends ServiceImpl implements UserFollowService { + @Resource + UserFollowService userFollowService; + + @Override + public PageResult pageRel(UserFollowParam 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(UserFollowParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + page.setDefaultOrder("create_time desc"); + // 我关注的人 + final List follows = userFollowService.list(new LambdaQueryWrapper().eq(UserFollow::getUserId, param.getLoginUserId())); + final Set collect = follows.stream().map(UserFollow::getShopId).collect(Collectors.toSet()); + System.out.println("collect = " + collect); + list.forEach(d -> { + d.setEachFollow(false); + for (Integer shopId : collect) { + if(Objects.equals(shopId, d.getUserId())){ + d.setEachFollow(true); + } + } + }); + return page.sortRecords(list); + } + + @Override + public UserFollow getByIdRel(Integer logId) { + UserFollowParam param = new UserFollowParam(); + param.setLogId(logId); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/UserGradeLogServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/UserGradeLogServiceImpl.java new file mode 100644 index 0000000..bccb1cf --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/impl/UserGradeLogServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.shop.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.shop.mapper.UserGradeLogMapper; +import com.gxwebsoft.shop.service.UserGradeLogService; +import com.gxwebsoft.shop.entity.UserGradeLog; +import com.gxwebsoft.shop.param.UserGradeLogParam; +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-06-20 16:33:06 + */ +@Service +public class UserGradeLogServiceImpl extends ServiceImpl implements UserGradeLogService { + + @Override + public PageResult pageRel(UserGradeLogParam 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(UserGradeLogParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public UserGradeLog getByIdRel(Integer logId) { + UserGradeLogParam param = new UserGradeLogParam(); + param.setLogId(logId); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/UserGradeServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/UserGradeServiceImpl.java new file mode 100644 index 0000000..9847414 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/impl/UserGradeServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.shop.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.shop.mapper.UserGradeMapper; +import com.gxwebsoft.shop.service.UserGradeService; +import com.gxwebsoft.shop.entity.UserGrade; +import com.gxwebsoft.shop.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-06-20 16:33:06 + */ +@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/src/main/java/com/gxwebsoft/shop/service/impl/UserLikeServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/UserLikeServiceImpl.java new file mode 100644 index 0000000..34622f6 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/impl/UserLikeServiceImpl.java @@ -0,0 +1,48 @@ +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.UserLike; +import com.gxwebsoft.shop.mapper.UserLikeMapper; +import com.gxwebsoft.shop.param.UserLikeParam; +import com.gxwebsoft.shop.service.UserLikeService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 点赞记录表Service实现 + * + * @author 科技小王子 + * @since 2023-07-06 17:51:04 + */ +@Service +public class UserLikeServiceImpl extends ServiceImpl implements UserLikeService { + + @Override + public PageResult pageRel(UserLikeParam 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(UserLikeParam param) { + List list = baseMapper.selectListRel(param); + + // 排序 + PageParam page = new PageParam<>(); + page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public UserLike getByIdRel(Integer logId) { + UserLikeParam param = new UserLikeParam(); + param.setLogId(logId); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/UserLookServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/UserLookServiceImpl.java new file mode 100644 index 0000000..b67bb06 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/impl/UserLookServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.shop.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.shop.mapper.UserLookMapper; +import com.gxwebsoft.shop.service.UserLookService; +import com.gxwebsoft.shop.entity.UserLook; +import com.gxwebsoft.shop.param.UserLookParam; +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-07-13 23:10:38 + */ +@Service +public class UserLookServiceImpl extends ServiceImpl implements UserLookService { + + @Override + public PageResult pageRel(UserLookParam 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(UserLookParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + //page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public UserLook getByIdRel(Integer logId) { + UserLookParam param = new UserLookParam(); + param.setLogId(logId); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/UserOauthServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/UserOauthServiceImpl.java new file mode 100644 index 0000000..e32cec3 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/impl/UserOauthServiceImpl.java @@ -0,0 +1,90 @@ +package com.gxwebsoft.shop.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.common.system.service.UserService; +import com.gxwebsoft.shop.entity.Order; +import com.gxwebsoft.shop.mapper.UserOauthMapper; +import com.gxwebsoft.shop.param.OrderParam; +import com.gxwebsoft.shop.service.UserOauthService; +import com.gxwebsoft.shop.entity.UserOauth; +import com.gxwebsoft.shop.param.UserOauthParam; +import com.gxwebsoft.common.core.web.PageParam; +import com.gxwebsoft.common.core.web.PageResult; +import lombok.val; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 第三方用户信息表Service实现 + * + * @author 科技小王子 + * @since 2022-12-15 08:33:13 + */ +@Service +public class UserOauthServiceImpl extends ServiceImpl implements UserOauthService { + @Resource + private UserService userService; + @Resource + private UserOauthService 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)); + } + + @Override + public String getOauthIdByUserId(Integer userId, String platform) { + UserOauthParam param = new UserOauthParam(); + param.setUserId(userId); + param.setOauthType(platform); + return param.getOne(baseMapper.selectListRel(param)).getOauthId(); + } + + @Override + public User getByOauthId(String openid) { + UserOauth userOauth = query().eq("oauth_id", openid).one(); + if(userOauth == null){ + return null; + } + // 查询用户 + User user = userService.getById(userOauth.getUserId()); + if(user == null){ + // 如果用户不存在，则清理第三方信息 + userOauth.setDeleted(1); + userOauthService.save(userOauth); + } + return user; + } + + @Override + public UserOauth getByUnionId(UserOauthParam param) { + UserOauth userOauth = param.getOne(baseMapper.getOne(param)); + System.out.println("userOauth0 = " + userOauth); + if(userOauth == null){ + return null; + } + return userOauth; + } +} diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/UserPointsLogServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/UserPointsLogServiceImpl.java new file mode 100644 index 0000000..6186d05 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/impl/UserPointsLogServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.shop.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.shop.mapper.UserPointsLogMapper; +import com.gxwebsoft.shop.service.UserPointsLogService; +import com.gxwebsoft.shop.entity.UserPointsLog; +import com.gxwebsoft.shop.param.UserPointsLogParam; +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 2022-11-25 19:04:43 + */ +@Service +public class UserPointsLogServiceImpl extends ServiceImpl implements UserPointsLogService { + + @Override + public PageResult pageRel(UserPointsLogParam 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(UserPointsLogParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + //page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public UserPointsLog getByIdRel(Integer logId) { + UserPointsLogParam param = new UserPointsLogParam(); + param.setLogId(logId); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/UserRefereeServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/UserRefereeServiceImpl.java new file mode 100644 index 0000000..49cdcf3 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/service/impl/UserRefereeServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.shop.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.shop.mapper.UserRefereeMapper; +import com.gxwebsoft.shop.service.UserRefereeService; +import com.gxwebsoft.shop.entity.UserReferee; +import com.gxwebsoft.shop.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-04-28 14:07:29 + */ +@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/src/main/java/com/gxwebsoft/tower/controller/TowerAccessoryController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerAccessoryController.java new file mode 100644 index 0000000..831beba --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/controller/TowerAccessoryController.java @@ -0,0 +1,132 @@ +package com.gxwebsoft.tower.controller; + +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.tower.service.TowerAccessoryService; +import com.gxwebsoft.tower.entity.TowerAccessory; +import com.gxwebsoft.tower.param.TowerAccessoryParam; +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-05-22 11:53:48 + */ +@Api(tags = "配件管理管理") +@RestController +@RequestMapping("/api/tower/tower-accessory") +public class TowerAccessoryController extends BaseController { + @Resource + private TowerAccessoryService towerAccessoryService; + + @PreAuthorize("hasAuthority('tower:towerAccessory:list')") + @OperationLog + @ApiOperation("分页查询配件管理") + @GetMapping("/page") + public ApiResult> page(TowerAccessoryParam param) { + // 使用关联查询 + return success(towerAccessoryService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('tower:towerAccessory:list')") + @OperationLog + @ApiOperation("查询全部配件管理") + @GetMapping() + public ApiResult> list(TowerAccessoryParam param) { + // 使用关联查询 + return success(towerAccessoryService.listRel(param)); + } + + @PreAuthorize("hasAuthority('tower:towerAccessory:list')") + @OperationLog + @ApiOperation("根据id查询配件管理") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + // 使用关联查询 + return success(towerAccessoryService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('tower:towerAccessory:save')") + @OperationLog + @ApiOperation("添加配件管理") + @PostMapping() + public ApiResult save(@RequestBody TowerAccessory towerAccessory) { + // 记录当前登录用户id + User loginUser = getLoginUser(); + if (loginUser != null) { + towerAccessory.setUserId(loginUser.getUserId()); + } + if (towerAccessoryService.save(towerAccessory)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('tower:towerAccessory:update')") + @OperationLog + @ApiOperation("修改配件管理") + @PutMapping() + public ApiResult update(@RequestBody TowerAccessory towerAccessory) { + if (towerAccessoryService.updateById(towerAccessory)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('tower:towerAccessory:remove')") + @OperationLog + @ApiOperation("删除配件管理") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (towerAccessoryService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('tower:towerAccessory:save')") + @OperationLog + @ApiOperation("批量添加配件管理") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (towerAccessoryService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('tower:towerAccessory:update')") + @OperationLog + @ApiOperation("批量修改配件管理") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(towerAccessoryService, "accessory_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('tower:towerAccessory:remove')") + @OperationLog + @ApiOperation("批量删除配件管理") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (towerAccessoryService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerEquipmentController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerEquipmentController.java new file mode 100644 index 0000000..0830015 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/controller/TowerEquipmentController.java @@ -0,0 +1,141 @@ +package com.gxwebsoft.tower.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.BatchParam; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.tower.entity.TowerEquipment; +import com.gxwebsoft.tower.param.TowerEquipmentParam; +import com.gxwebsoft.tower.service.TowerEquipmentService; +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-20 15:06:43 + */ +@Api(tags = "塔吊设备管理管理") +@RestController +@RequestMapping("/api/tower/tower-equipment") +public class TowerEquipmentController extends BaseController { + @Resource + private TowerEquipmentService towerEquipmentService; + + @PreAuthorize("hasAuthority('tower:towerEquipment:list')") + @OperationLog + @ApiOperation("分页查询塔吊设备管理") + @GetMapping("/page") + public ApiResult> page(TowerEquipmentParam param) { + // 使用关联查询 + return success(towerEquipmentService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('tower:towerEquipment:list')") + @OperationLog + @ApiOperation("查询全部塔吊设备管理") + @GetMapping() + public ApiResult> list(TowerEquipmentParam param) { + // 使用关联查询 + return success(towerEquipmentService.listRel(param)); + } + + @PreAuthorize("hasAuthority('tower:towerEquipment:list')") + @OperationLog + @ApiOperation("根据id查询塔吊设备管理") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + // 使用关联查询 + return success(towerEquipmentService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('tower:towerEquipment:save')") + @OperationLog + @ApiOperation("添加塔吊设备管理") + @PostMapping() + public ApiResult save(@RequestBody TowerEquipment towerEquipment) { + // 记录当前登录用户id + User loginUser = getLoginUser(); + if (loginUser != null) { + towerEquipment.setUserId(loginUser.getUserId()); + } + if (towerEquipmentService.save(towerEquipment)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('tower:towerEquipment:update')") + @OperationLog + @ApiOperation("修改塔吊设备管理") + @PutMapping() + public ApiResult update(@RequestBody TowerEquipment towerEquipment) { + if (towerEquipmentService.updateById(towerEquipment)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('tower:towerEquipment:remove')") + @OperationLog + @ApiOperation("删除塔吊设备管理") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (towerEquipmentService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('tower:towerEquipment:save')") + @OperationLog + @ApiOperation("批量添加塔吊设备管理") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (towerEquipmentService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('tower:towerEquipment:update')") + @OperationLog + @ApiOperation("批量修改塔吊设备管理") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(towerEquipmentService, "equipment_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('tower:towerEquipment:remove')") + @OperationLog + @ApiOperation("批量删除塔吊设备管理") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (towerEquipmentService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('tower:towerEquipment:update')") + @OperationLog + @ApiOperation("批量修改塔吊设备状态") + @PutMapping("/status") + public ApiResult statusBatch(@RequestBody List batchParam) { + if (towerEquipmentService.updateBatchById(batchParam)) { + return success("修改成功"); + } + return fail("修改失败"); + } +} diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerModelController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerModelController.java new file mode 100644 index 0000000..caea15d --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/controller/TowerModelController.java @@ -0,0 +1,128 @@ +package com.gxwebsoft.tower.controller; + +import com.gxwebsoft.common.core.annotation.OperationLog; +import com.gxwebsoft.common.core.web.*; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.tower.entity.TowerModel; +import com.gxwebsoft.tower.param.TowerModelParam; +import com.gxwebsoft.tower.service.TowerModelService; +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-29 14:07:46 + */ +@Api(tags = "设备型号管理表管理") +@RestController +@RequestMapping("/api/tower/tower-model") +public class TowerModelController extends BaseController { + @Resource + private TowerModelService towerModelService; + + @PreAuthorize("hasAuthority('tower:towerModel:list')") + @OperationLog + @ApiOperation("分页查询设备型号管理表") + @GetMapping("/page") + public ApiResult> page(TowerModelParam param) { + // 使用关联查询 + return success(towerModelService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('tower:towerModel:list')") + @OperationLog + @ApiOperation("查询全部设备型号管理表") + @GetMapping() + public ApiResult> list(TowerModelParam param) { + // 使用关联查询 + return success(towerModelService.listRel(param)); + } + + @PreAuthorize("hasAuthority('tower:towerModel:list')") + @OperationLog + @ApiOperation("根据id查询设备型号管理表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + // 使用关联查询 + return success(towerModelService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('tower:towerModel:save')") + @OperationLog + @ApiOperation("添加设备型号管理表") + @PostMapping() + public ApiResult save(@RequestBody TowerModel towerModel) { + // 记录当前登录用户id + User loginUser = getLoginUser(); + if (loginUser != null) { + towerModel.setUserId(loginUser.getUserId()); + } + if (towerModelService.save(towerModel)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('tower:towerModel:update')") + @OperationLog + @ApiOperation("修改设备型号管理表") + @PutMapping() + public ApiResult update(@RequestBody TowerModel towerModel) { + if (towerModelService.updateById(towerModel)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('tower:towerModel:remove')") + @OperationLog + @ApiOperation("删除设备型号管理表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (towerModelService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('tower:towerModel:save')") + @OperationLog + @ApiOperation("批量添加设备型号管理表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (towerModelService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('tower:towerModel:update')") + @OperationLog + @ApiOperation("批量修改设备型号管理表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(towerModelService, "category_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('tower:towerModel:remove')") + @OperationLog + @ApiOperation("批量删除设备型号管理表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (towerModelService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerPlaceController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerPlaceController.java new file mode 100644 index 0000000..033aa73 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/controller/TowerPlaceController.java @@ -0,0 +1,157 @@ +package com.gxwebsoft.tower.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.User; +import com.gxwebsoft.tower.entity.TowerPlace; +import com.gxwebsoft.tower.entity.TowerPlaceStandard; +import com.gxwebsoft.tower.param.TowerPlaceParam; +import com.gxwebsoft.tower.service.TowerPlaceService; +import com.gxwebsoft.tower.service.TowerPlaceStandardService; +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-06-08 11:00:17 + */ +@Api(tags = "检查/保养部位记录表管理") +@RestController +@RequestMapping("/api/tower/tower-place") +public class TowerPlaceController extends BaseController { + @Resource + private TowerPlaceService towerPlaceService; + @Resource + private TowerPlaceStandardService towerPlaceStandardService; + + @PreAuthorize("hasAuthority('tower:towerPlace:list')") + @OperationLog + @ApiOperation("分页查询检查/保养部位记录表") + @GetMapping("/page") + public ApiResult> page(TowerPlaceParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(towerPlaceService.page(page, page.getWrapper())); + // 使用关联查询 +// return success(towerPlaceService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('tower:towerPlace:list')") + @OperationLog + @ApiOperation("查询全部检查/保养部位记录表") + @GetMapping() + public ApiResult> list(TowerPlaceParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(towerPlaceService.list(page.getOrderWrapper())); + // 使用关联查询 + //return success(towerPlaceService.listRel(param)); + } + + @PreAuthorize("hasAuthority('tower:towerPlace:list')") + @OperationLog + @ApiOperation("根据id查询检查/保养部位记录表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + return success(towerPlaceService.getById(id)); + // 使用关联查询 + //return success(towerPlaceService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('tower:towerPlace:save')") + @OperationLog + @ApiOperation("添加检查/保养部位记录表") + @PostMapping() + public ApiResult save(@RequestBody TowerPlace towerPlace) { + // 记录当前登录用户id + User loginUser = getLoginUser(); + if (loginUser != null) { + towerPlace.setUserId(loginUser.getUserId()); + } + if (towerPlaceService.save(towerPlace)) { + // 保存检查标准 + if (!towerPlace.getStandard().isEmpty()) { + final List standards = towerPlace.getStandard(); + standards.forEach(d->{ + d.setPlaceId(towerPlace.getPlaceId()); + }); + towerPlaceStandardService.saveBatch(standards); + } + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('tower:towerPlace:update')") + @OperationLog + @ApiOperation("修改检查/保养部位记录表") + @PutMapping() + public ApiResult update(@RequestBody TowerPlace towerPlace) { + if (towerPlaceService.updateById(towerPlace)) { + // 更新检查标准 + if (!towerPlace.getStandard().isEmpty()) { + final List standards = towerPlace.getStandard(); + towerPlaceStandardService.saveOrUpdateBatch(standards); + } + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('tower:towerPlace:remove')") + @OperationLog + @ApiOperation("删除检查/保养部位记录表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (towerPlaceService.removeById(id)) { + towerPlaceStandardService.remove(new LambdaQueryWrapper().eq(TowerPlaceStandard::getPlaceId,id)); + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('tower:towerPlace:save')") + @OperationLog + @ApiOperation("批量添加检查/保养部位记录表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (towerPlaceService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('tower:towerPlace:update')") + @OperationLog + @ApiOperation("批量修改检查/保养部位记录表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(towerPlaceService, "place_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('tower:towerPlace:remove')") + @OperationLog + @ApiOperation("批量删除检查/保养部位记录表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (towerPlaceService.removeByIds(ids)) { + for (Integer id: ids){ + towerPlaceStandardService.remove(new LambdaQueryWrapper().eq(TowerPlaceStandard::getPlaceId,id)); + } + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerPlaceSafetyController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerPlaceSafetyController.java new file mode 100644 index 0000000..c2e01dc --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/controller/TowerPlaceSafetyController.java @@ -0,0 +1,135 @@ +package com.gxwebsoft.tower.controller; + +import com.gxwebsoft.common.core.annotation.OperationLog; +import com.gxwebsoft.common.core.web.*; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.tower.entity.TowerPlaceSafety; +import com.gxwebsoft.tower.param.TowerPlaceSafetyParam; +import com.gxwebsoft.tower.service.TowerPlaceSafetyService; +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-06-08 11:00:17 + */ +@Api(tags = "安全巡检部位管理表管理") +@RestController +@RequestMapping("/api/tower/tower-place-safety") +public class TowerPlaceSafetyController extends BaseController { + @Resource + private TowerPlaceSafetyService towerPlaceSafetyService; + + @PreAuthorize("hasAuthority('tower:towerPlaceSafety:list')") + @OperationLog + @ApiOperation("分页查询安全巡检部位管理表") + @GetMapping("/page") + public ApiResult> page(TowerPlaceSafetyParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(towerPlaceSafetyService.page(page, page.getWrapper())); + // 使用关联查询 + //return success(towerPlaceSafetyService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('tower:towerPlaceSafety:list')") + @OperationLog + @ApiOperation("查询全部安全巡检部位管理表") + @GetMapping() + public ApiResult> list(TowerPlaceSafetyParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(towerPlaceSafetyService.list(page.getOrderWrapper())); + // 使用关联查询 + //return success(towerPlaceSafetyService.listRel(param)); + } + + @PreAuthorize("hasAuthority('tower:towerPlaceSafety:list')") + @OperationLog + @ApiOperation("根据id查询安全巡检部位管理表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + return success(towerPlaceSafetyService.getById(id)); + // 使用关联查询 + //return success(towerPlaceSafetyService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('tower:towerPlaceSafety:save')") + @OperationLog + @ApiOperation("添加安全巡检部位管理表") + @PostMapping() + public ApiResult save(@RequestBody TowerPlaceSafety towerPlaceSafety) { + // 记录当前登录用户id + User loginUser = getLoginUser(); + if (loginUser != null) { + towerPlaceSafety.setUserId(loginUser.getUserId()); + } + if (towerPlaceSafetyService.save(towerPlaceSafety)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('tower:towerPlaceSafety:update')") + @OperationLog + @ApiOperation("修改安全巡检部位管理表") + @PutMapping() + public ApiResult update(@RequestBody TowerPlaceSafety towerPlaceSafety) { + if (towerPlaceSafetyService.updateById(towerPlaceSafety)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('tower:towerPlaceSafety:remove')") + @OperationLog + @ApiOperation("删除安全巡检部位管理表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (towerPlaceSafetyService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('tower:towerPlaceSafety:save')") + @OperationLog + @ApiOperation("批量添加安全巡检部位管理表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (towerPlaceSafetyService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('tower:towerPlaceSafety:update')") + @OperationLog + @ApiOperation("批量修改安全巡检部位管理表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(towerPlaceSafetyService, "place_safety_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('tower:towerPlaceSafety:remove')") + @OperationLog + @ApiOperation("批量删除安全巡检部位管理表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (towerPlaceSafetyService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerPlaceStandardController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerPlaceStandardController.java new file mode 100644 index 0000000..62397ba --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/controller/TowerPlaceStandardController.java @@ -0,0 +1,129 @@ +package com.gxwebsoft.tower.controller; + +import com.gxwebsoft.common.core.annotation.OperationLog; +import com.gxwebsoft.common.core.web.*; +import com.gxwebsoft.tower.entity.TowerPlaceStandard; +import com.gxwebsoft.tower.param.TowerPlaceStandardParam; +import com.gxwebsoft.tower.service.TowerPlaceStandardService; +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-06-08 15:37:00 + */ +@Api(tags = "检查标准附件表管理") +@RestController +@RequestMapping("/api/tower/tower-place-standard") +public class TowerPlaceStandardController extends BaseController { + @Resource + private TowerPlaceStandardService towerPlaceStandardService; + + @PreAuthorize("hasAuthority('tower:towerPlaceStandard:list')") + @OperationLog + @ApiOperation("分页查询检查标准附件表") + @GetMapping("/page") + public ApiResult> page(TowerPlaceStandardParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(towerPlaceStandardService.page(page, page.getWrapper())); + // 使用关联查询 + //return success(towerPlaceStandardService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('tower:towerPlaceStandard:list')") + @OperationLog + @ApiOperation("查询全部检查标准附件表") + @GetMapping() + public ApiResult> list(TowerPlaceStandardParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(towerPlaceStandardService.list(page.getOrderWrapper())); + // 使用关联查询 + //return success(towerPlaceStandardService.listRel(param)); + } + + @PreAuthorize("hasAuthority('tower:towerPlaceStandard:list')") + @OperationLog + @ApiOperation("根据id查询检查标准附件表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + return success(towerPlaceStandardService.getById(id)); + // 使用关联查询 + //return success(towerPlaceStandardService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('tower:towerPlaceStandard:save')") + @OperationLog + @ApiOperation("添加检查标准附件表") + @PostMapping() + public ApiResult save(@RequestBody TowerPlaceStandard towerPlaceStandard) { + if (towerPlaceStandardService.save(towerPlaceStandard)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('tower:towerPlaceStandard:update')") + @OperationLog + @ApiOperation("修改检查标准附件表") + @PutMapping() + public ApiResult update(@RequestBody TowerPlaceStandard towerPlaceStandard) { + if (towerPlaceStandardService.updateById(towerPlaceStandard)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('tower:towerPlaceStandard:remove')") + @OperationLog + @ApiOperation("删除检查标准附件表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (towerPlaceStandardService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('tower:towerPlaceStandard:save')") + @OperationLog + @ApiOperation("批量添加检查标准附件表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (towerPlaceStandardService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('tower:towerPlaceStandard:update')") + @OperationLog + @ApiOperation("批量修改检查标准附件表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(towerPlaceStandardService, "id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('tower:towerPlaceStandard:remove')") + @OperationLog + @ApiOperation("批量删除检查标准附件表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (towerPlaceStandardService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerProjectController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerProjectController.java new file mode 100644 index 0000000..6bfe7bf --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/controller/TowerProjectController.java @@ -0,0 +1,180 @@ +package com.gxwebsoft.tower.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.BatchParam; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.tower.entity.TowerProject; +import com.gxwebsoft.tower.entity.TowerProjectOrder; +import com.gxwebsoft.tower.entity.TowerProjectPlace; +import com.gxwebsoft.tower.entity.TowerProjectUser; +import com.gxwebsoft.tower.param.TowerProjectParam; +import com.gxwebsoft.tower.service.TowerProjectOrderService; +import com.gxwebsoft.tower.service.TowerProjectPlaceService; +import com.gxwebsoft.tower.service.TowerProjectService; +import com.gxwebsoft.tower.service.TowerProjectUserService; +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.List; +import java.util.Set; + +/** + * 项目管理控制器 + * + * @author 科技小王子 + * @since 2023-05-22 13:30:39 + */ +@Api(tags = "项目管理管理") +@RestController +@RequestMapping("/api/tower/tower-project") +public class TowerProjectController extends BaseController { + @Resource + private TowerProjectService towerProjectService; + @Resource + private TowerProjectOrderService towerProjectOrderService; + @Resource + private TowerProjectUserService towerProjectUserService; + @Resource + private TowerProjectPlaceService towerProjectPlaceService; + + @PreAuthorize("hasAuthority('tower:towerProject:list')") + @ApiOperation("分页查询项目管理") + @GetMapping("/page") + public ApiResult> page(TowerProjectParam param) { + // 使用关联查询 + return success(towerProjectService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('tower:towerProject:list')") + @ApiOperation("查询全部项目管理") + @GetMapping() + public ApiResult> list(TowerProjectParam param) { + // 使用关联查询 + return success(towerProjectService.listRel(param)); + } + + @PreAuthorize("hasAuthority('tower:towerProject:list')") + @ApiOperation("根据id查询项目管理") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + // 使用关联查询 + return success(towerProjectService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('tower:towerProject:save')") + @Transactional(rollbackFor = {Exception.class}) + @ApiOperation("添加项目管理") + @PostMapping() + public ApiResult save(@RequestBody TowerProject towerProject) { + // 记录当前登录用户id + User loginUser = getLoginUser(); + if (loginUser != null) { + towerProject.setUserId(loginUser.getUserId()); + } + System.out.println("towerProject = " + towerProject.getPlaces2()); + if (towerProjectService.save(towerProject)) { + final Integer projectId = towerProject.getProjectId(); + // 批量添加项目成员 + if (!towerProject.getUsers().isEmpty()) { + final Set users = towerProject.getUsers(); + users.forEach(d->{ + d.setProjectId(projectId); + }); + towerProjectUserService.saveBatch(users); + } + // 批量添加项目订单 + if (!towerProject.getOrders().isEmpty()) { + final Set orders = towerProject.getOrders(); + orders.forEach(d->{ + d.setProjectId(projectId); + }); + towerProjectOrderService.saveBatch(orders); + } + // 批量添加检查部位配置 + if (!towerProject.getPlaces1().isEmpty()) { + final Set places1 = towerProject.getPlaces1(); + places1.forEach(d->{ + d.setProjectId(projectId); + }); + towerProjectPlaceService.saveBatch(places1); + } + // 批量添加保养部位配置 + if (!towerProject.getPlaces2().isEmpty()) { + final Set places2 = towerProject.getPlaces2(); + places2.forEach(d->{ + d.setProjectId(projectId); + }); + towerProjectPlaceService.saveBatch(places2); + } + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('tower:towerProject:update')") + @Transactional(rollbackFor = {Exception.class}) + @ApiOperation("修改项目管理") + @PutMapping() + public ApiResult update(@RequestBody TowerProject towerProject) { + if (towerProjectService.updateById(towerProject)) { + // 批量修改项目成员 + towerProjectUserService.saveOrUpdateBatch(towerProject.getUsers()); + // 批量修改项目订单 + towerProjectOrderService.saveOrUpdateBatch(towerProject.getOrders()); + // 批量修改检查/保养部位配置 + towerProjectPlaceService.saveOrUpdateBatch(towerProject.getPlaces1()); + towerProjectPlaceService.saveOrUpdateBatch(towerProject.getPlaces2()); + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('tower:towerProject:remove')") + @ApiOperation("删除项目管理") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (towerProjectService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('tower:towerProject:save')") + @ApiOperation("批量添加项目管理") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (towerProjectService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('tower:towerProject:update')") + @ApiOperation("批量修改项目管理") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(towerProjectService, "project_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('tower:towerProject:remove')") + @OperationLog + @ApiOperation("批量删除项目管理") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (towerProjectService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerProjectOrderController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerProjectOrderController.java new file mode 100644 index 0000000..870010d --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/controller/TowerProjectOrderController.java @@ -0,0 +1,128 @@ +package com.gxwebsoft.tower.controller; + +import com.gxwebsoft.common.core.annotation.OperationLog; +import com.gxwebsoft.common.core.web.*; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.tower.entity.TowerProjectOrder; +import com.gxwebsoft.tower.param.TowerProjectOrderParam; +import com.gxwebsoft.tower.service.TowerProjectOrderService; +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-06-07 18:48:56 + */ +@Api(tags = "合同签订设备清单管理") +@RestController +@RequestMapping("/api/tower/tower-project-order") +public class TowerProjectOrderController extends BaseController { + @Resource + private TowerProjectOrderService towerProjectOrderService; + + @PreAuthorize("hasAuthority('tower:towerProjectOrder:list')") + @OperationLog + @ApiOperation("分页查询合同签订设备清单") + @GetMapping("/page") + public ApiResult> page(TowerProjectOrderParam param) { + // 使用关联查询 + return success(towerProjectOrderService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('tower:towerProjectOrder:list')") + @OperationLog + @ApiOperation("查询全部合同签订设备清单") + @GetMapping() + public ApiResult> list(TowerProjectOrderParam param) { + // 使用关联查询 + return success(towerProjectOrderService.listRel(param)); + } + + @PreAuthorize("hasAuthority('tower:towerProjectOrder:list')") + @OperationLog + @ApiOperation("根据id查询合同签订设备清单") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + // 使用关联查询 + return success(towerProjectOrderService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('tower:towerProjectOrder:save')") + @OperationLog + @ApiOperation("添加合同签订设备清单") + @PostMapping() + public ApiResult save(@RequestBody TowerProjectOrder towerProjectOrder) { + // 记录当前登录用户id + User loginUser = getLoginUser(); + if (loginUser != null) { + towerProjectOrder.setUserId(loginUser.getUserId()); + } + if (towerProjectOrderService.save(towerProjectOrder)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('tower:towerProjectOrder:update')") + @OperationLog + @ApiOperation("修改合同签订设备清单") + @PutMapping() + public ApiResult update(@RequestBody TowerProjectOrder towerProjectOrder) { + if (towerProjectOrderService.updateById(towerProjectOrder)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('tower:towerProjectOrder:remove')") + @OperationLog + @ApiOperation("删除合同签订设备清单") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (towerProjectOrderService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('tower:towerProjectOrder:save')") + @OperationLog + @ApiOperation("批量添加合同签订设备清单") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (towerProjectOrderService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('tower:towerProjectOrder:update')") + @OperationLog + @ApiOperation("批量修改合同签订设备清单") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(towerProjectOrderService, "project_order_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('tower:towerProjectOrder:remove')") + @OperationLog + @ApiOperation("批量删除合同签订设备清单") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (towerProjectOrderService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerProjectPlaceController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerProjectPlaceController.java new file mode 100644 index 0000000..f634be0 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/controller/TowerProjectPlaceController.java @@ -0,0 +1,130 @@ +package com.gxwebsoft.tower.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.BatchParam; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.tower.entity.TowerProjectPlace; +import com.gxwebsoft.tower.param.TowerProjectPlaceParam; +import com.gxwebsoft.tower.service.TowerProjectPlaceService; +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-06-08 17:22:55 + */ +@Api(tags = "检查/保养部位配置表管理") +@RestController +@RequestMapping("/api/tower/tower-project-place") +public class TowerProjectPlaceController extends BaseController { + @Resource + private TowerProjectPlaceService towerProjectPlaceService; + + @PreAuthorize("hasAuthority('tower:towerProjectPlace:list')") + @OperationLog + @ApiOperation("分页查询检查/保养部位配置表") + @GetMapping("/page") + public ApiResult> page(TowerProjectPlaceParam param) { + // 使用关联查询 + return success(towerProjectPlaceService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('tower:towerProjectPlace:list')") + @OperationLog + @ApiOperation("查询全部检查/保养部位配置表") + @GetMapping() + public ApiResult> list(TowerProjectPlaceParam param) { + // 使用关联查询 + return success(towerProjectPlaceService.listRel(param)); + } + + @PreAuthorize("hasAuthority('tower:towerProjectPlace:list')") + @OperationLog + @ApiOperation("根据id查询检查/保养部位配置表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + // 使用关联查询 + return success(towerProjectPlaceService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('tower:towerProjectPlace:save')") + @OperationLog + @ApiOperation("添加检查/保养部位配置表") + @PostMapping() + public ApiResult save(@RequestBody TowerProjectPlace towerProjectPlace) { + if (towerProjectPlaceService.count(new LambdaQueryWrapper() + .eq(TowerProjectPlace::getProjectId, towerProjectPlace.getProjectId()).eq(TowerProjectPlace::getPlaceId,towerProjectPlace.getPlaceId())) > 0) { + return fail("该部位已存在"); + } + if (towerProjectPlaceService.save(towerProjectPlace)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('tower:towerProjectPlace:update')") + @OperationLog + @ApiOperation("修改检查/保养部位配置表") + @PutMapping() + public ApiResult update(@RequestBody TowerProjectPlace towerProjectPlace) { + if (towerProjectPlaceService.updateById(towerProjectPlace)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('tower:towerProjectPlace:remove')") + @OperationLog + @ApiOperation("删除检查/保养部位配置表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (towerProjectPlaceService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('tower:towerProjectPlace:save')") + @OperationLog + @ApiOperation("批量添加检查/保养部位配置表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (towerProjectPlaceService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('tower:towerProjectPlace:update')") + @OperationLog + @ApiOperation("批量修改检查/保养部位配置表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(towerProjectPlaceService, "id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('tower:towerProjectPlace:remove')") + @OperationLog + @ApiOperation("批量删除检查/保养部位配置表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (towerProjectPlaceService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerProjectUserController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerProjectUserController.java new file mode 100644 index 0000000..6eaafde --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/controller/TowerProjectUserController.java @@ -0,0 +1,130 @@ +package com.gxwebsoft.tower.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.BatchParam; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.tower.entity.TowerProjectUser; +import com.gxwebsoft.tower.param.TowerProjectUserParam; +import com.gxwebsoft.tower.service.TowerProjectUserService; +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-06-07 15:00:32 + */ +@Api(tags = "项目成员管理") +@RestController +@RequestMapping("/api/tower/tower-project-user") +public class TowerProjectUserController extends BaseController { + @Resource + private TowerProjectUserService towerProjectUserService; + + @PreAuthorize("hasAuthority('tower:towerProjectUser:list')") + @OperationLog + @ApiOperation("分页查询项目成员") + @GetMapping("/page") + public ApiResult> page(TowerProjectUserParam param) { + // 使用关联查询 + return success(towerProjectUserService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('tower:towerProjectUser:list')") + @OperationLog + @ApiOperation("查询全部项目成员") + @GetMapping() + public ApiResult> list(TowerProjectUserParam param) { + // 使用关联查询 + return success(towerProjectUserService.listRel(param)); + } + + @PreAuthorize("hasAuthority('tower:towerProjectUser:list')") + @OperationLog + @ApiOperation("根据id查询项目成员") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + // 使用关联查询 + return success(towerProjectUserService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('tower:towerProjectUser:save')") + @OperationLog + @ApiOperation("添加项目成员") + @PostMapping() + public ApiResult save(@RequestBody TowerProjectUser towerProjectUser) { + if (towerProjectUserService.count(new LambdaQueryWrapper() + .eq(TowerProjectUser::getUserId, towerProjectUser.getUserId()).eq(TowerProjectUser::getProjectId,towerProjectUser.getProjectId())) > 0) { + return fail("该成员已存在"); + } + if (towerProjectUserService.save(towerProjectUser)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('tower:towerProjectUser:update')") + @OperationLog + @ApiOperation("修改项目成员") + @PutMapping() + public ApiResult update(@RequestBody TowerProjectUser towerProjectUser) { + if (towerProjectUserService.updateById(towerProjectUser)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('tower:towerProjectUser:remove')") + @OperationLog + @ApiOperation("删除项目成员") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (towerProjectUserService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('tower:towerProjectUser:save')") + @OperationLog + @ApiOperation("批量添加项目成员") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (towerProjectUserService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('tower:towerProjectUser:update')") + @OperationLog + @ApiOperation("批量修改项目成员") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(towerProjectUserService, "id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('tower:towerProjectUser:remove')") + @OperationLog + @ApiOperation("批量删除项目成员") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (towerProjectUserService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerWarehouseController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerWarehouseController.java new file mode 100644 index 0000000..c2db02b --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/controller/TowerWarehouseController.java @@ -0,0 +1,132 @@ +package com.gxwebsoft.tower.controller; + +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.tower.service.TowerWarehouseService; +import com.gxwebsoft.tower.entity.TowerWarehouse; +import com.gxwebsoft.tower.param.TowerWarehouseParam; +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-05-20 15:06:43 + */ +@Api(tags = "仓库管理管理") +@RestController +@RequestMapping("/api/tower/tower-warehouse") +public class TowerWarehouseController extends BaseController { + @Resource + private TowerWarehouseService towerWarehouseService; + + @PreAuthorize("hasAuthority('tower:towerWarehouse:list')") + @OperationLog + @ApiOperation("分页查询仓库管理") + @GetMapping("/page") + public ApiResult> page(TowerWarehouseParam param) { + // 使用关联查询 + return success(towerWarehouseService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('tower:towerWarehouse:list')") + @OperationLog + @ApiOperation("查询全部仓库管理") + @GetMapping() + public ApiResult> list(TowerWarehouseParam param) { + // 使用关联查询 + return success(towerWarehouseService.listRel(param)); + } + + @PreAuthorize("hasAuthority('tower:towerWarehouse:list')") + @OperationLog + @ApiOperation("根据id查询仓库管理") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + // 使用关联查询 + return success(towerWarehouseService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('tower:towerWarehouse:save')") + @OperationLog + @ApiOperation("添加仓库管理") + @PostMapping() + public ApiResult save(@RequestBody TowerWarehouse towerWarehouse) { + // 记录当前登录用户id + User loginUser = getLoginUser(); + if (loginUser != null) { + towerWarehouse.setUserId(loginUser.getUserId()); + } + if (towerWarehouseService.save(towerWarehouse)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('tower:towerWarehouse:update')") + @OperationLog + @ApiOperation("修改仓库管理") + @PutMapping() + public ApiResult update(@RequestBody TowerWarehouse towerWarehouse) { + if (towerWarehouseService.updateById(towerWarehouse)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('tower:towerWarehouse:remove')") + @OperationLog + @ApiOperation("删除仓库管理") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (towerWarehouseService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('tower:towerWarehouse:save')") + @OperationLog + @ApiOperation("批量添加仓库管理") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (towerWarehouseService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('tower:towerWarehouse:update')") + @OperationLog + @ApiOperation("批量修改仓库管理") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(towerWarehouseService, "warehouse_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('tower:towerWarehouse:remove')") + @OperationLog + @ApiOperation("批量删除仓库管理") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (towerWarehouseService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/tower/entity/TowerAccessory.java b/src/main/java/com/gxwebsoft/tower/entity/TowerAccessory.java new file mode 100644 index 0000000..6c15a05 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/entity/TowerAccessory.java @@ -0,0 +1,110 @@ +package com.gxwebsoft.tower.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +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-05-22 11:53:48 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "TowerAccessory对象", description = "配件管理") +public class TowerAccessory implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "自增ID") + @TableId(value = "accessory_id", type = IdType.AUTO) + private Integer accessoryId; + + @ApiModelProperty(value = "配件名称") + private String accessoryName; + + @ApiModelProperty(value = "配件编号") + private String accessoryNo; + + @ApiModelProperty(value = "配件分类") + private String accessoryCategory; + + @ApiModelProperty(value = "适用设备型号") + private String accessoryModel; + + @ApiModelProperty(value = "适用设备型号(多选)") + private String accessoryModelMultiple; + + @ApiModelProperty(value = "配件规格") + private String accessorySpecs; + + @ApiModelProperty(value = "单价") + private BigDecimal accessoryPrice; + + @ApiModelProperty(value = "配件单位") + private String accessoryUnit; + + @ApiModelProperty(value = "重量") + private String accessoryWeight; + + @ApiModelProperty(value = "库存总量") + private Integer accessoryStock; + + @ApiModelProperty(value = "产权单位名称") + private String companyName; + + @ApiModelProperty(value = "产权单位编号") + private String companyNo; + + @ApiModelProperty(value = "制造厂商") + private String manufactor; + + @ApiModelProperty(value = "制造厂商编号") + private String manufactorNo; + + @ApiModelProperty(value = "使用年限") + private String lifeYear; + + @ApiModelProperty(value = "出厂日期") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date factoryDate; + + @ApiModelProperty(value = "报废日期") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date scrapDate; + + @ApiModelProperty(value = "状态, 0待发布, 1已发布") + private Integer status; + + @ApiModelProperty(value = "备注") + private String comments; + + @ApiModelProperty(value = "排序号") + private Integer sortNumber; + + @ApiModelProperty(value = "所有人") + 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/src/main/java/com/gxwebsoft/tower/entity/TowerEquipment.java b/src/main/java/com/gxwebsoft/tower/entity/TowerEquipment.java new file mode 100644 index 0000000..e0845ff --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/entity/TowerEquipment.java @@ -0,0 +1,160 @@ +package com.gxwebsoft.tower.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +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.util.Date; + +/** + * 塔吊设备管理 + * + * @author 科技小王子 + * @since 2023-05-20 15:06:43 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "TowerEquipment对象", description = "塔吊设备管理") +public class TowerEquipment implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "自增ID") + @TableId(value = "equipment_id", type = IdType.AUTO) + private Integer equipmentId; + + @ApiModelProperty(value = "设备名称") + private String name; + + @ApiModelProperty(value = "设备型号") + private String model; + + @ApiModelProperty(value = "设备编号") + private String equipmentNo; + + @ApiModelProperty(value = "出厂编号") + private String factoryNo; + + @ApiModelProperty(value = "出厂日期") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date factoryDate; + + @ApiModelProperty(value = "制造厂商") + private String manufactor; + + @ApiModelProperty(value = "使用年限") + private String lifeYear; + + @ApiModelProperty(value = "报废日期") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date scrapDate; + + @ApiModelProperty(value = "备案编号") + private String filingNo; + + @ApiModelProperty(value = "机号") + private String machineNo; + + @ApiModelProperty(value = "备案许可证号") + private String licenceNo; + + @ApiModelProperty(value = "产权单位") + private String company; + + @ApiModelProperty(value = "所属部门") + private String organization; + + @ApiModelProperty(value = "所属仓库") + private String warehouse; + + @ApiModelProperty(value = "设备来源") + private String source; + + @ApiModelProperty(value = "采购日期") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date buyDate; + + @ApiModelProperty(value = "当前位置") + private String currentLocation; + + @ApiModelProperty(value = "设计高度") + private String designHeight; + + @ApiModelProperty(value = "独立高度") + private String height; + + @ApiModelProperty(value = "额定载重") + private String ratedLoad; + + @ApiModelProperty(value = "最大幅度处额定载重") + private String maxRatedLoad; + + @ApiModelProperty(value = "最大起升高度") + private String maxLiftingHeight; + + @ApiModelProperty(value = "臂长") + private String armLength; + + @ApiModelProperty(value = "附件1") + private String file1; + + @ApiModelProperty(value = "附件2") + private String file2; + + @ApiModelProperty(value = "附件3") + private String file3; + + @ApiModelProperty(value = "附件4") + private String file4; + + @ApiModelProperty(value = "附件5") + private String file5; + + @ApiModelProperty(value = "附件6") + private String file6; + + @ApiModelProperty(value = "附件7") + private String file7; + + @ApiModelProperty(value = "当前位置") + private String address; + + @ApiModelProperty(value = "是否外协标识") + @TableField(exist = false) + private Boolean isOutOrg; + + @ApiModelProperty(value = "所属人员") + private String users; + + @ApiModelProperty(value = "状态, 0待发布, 1已发布") + private Integer status; + + @ApiModelProperty(value = "备注") + private String comments; + + @ApiModelProperty(value = "所有人") + private Integer userId; + + @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/src/main/java/com/gxwebsoft/tower/entity/TowerModel.java b/src/main/java/com/gxwebsoft/tower/entity/TowerModel.java new file mode 100644 index 0000000..6db1559 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/entity/TowerModel.java @@ -0,0 +1,70 @@ +package com.gxwebsoft.tower.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +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-29 14:07:46 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "TowerModel对象", description = "设备型号管理表") +public class TowerModel implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "型号ID") + @TableId(value = "model_id", type = IdType.AUTO) + private Integer modelId; + + @ApiModelProperty(value = "设备名称") + private String name; + + @ApiModelProperty(value = "设备型号") + private String model; + + @ApiModelProperty(value = "上级分类ID") + private Integer parentId; + + @ApiModelProperty(value = "分类图片") + private String image; + + @ApiModelProperty(value = "用户ID") + private Integer userId; + + @ApiModelProperty(value = "使用年限") + private Integer yearLife; + + @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/src/main/java/com/gxwebsoft/tower/entity/TowerPlace.java b/src/main/java/com/gxwebsoft/tower/entity/TowerPlace.java new file mode 100644 index 0000000..f73da0b --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/entity/TowerPlace.java @@ -0,0 +1,85 @@ +package com.gxwebsoft.tower.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +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-06-08 11:00:17 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "TowerPlace对象", description = "检查/保养部位记录表") +public class TowerPlace implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "参数ID") + @TableId(value = "place_id", type = IdType.AUTO) + private Integer placeId; + + @ApiModelProperty(value = "部位编码") + private String placeCode; + + @ApiModelProperty(value = "设备类型") + private String equipmentType; + + @ApiModelProperty(value = "部位名称") + private String name; + + @ApiModelProperty(value = "检查/保养标准") + @TableField(exist = false) + private List standard; + + @ApiModelProperty(value = "部位类型") + private String type; + + @ApiModelProperty(value = "推送目标系统") + private String pushSystem; + + @ApiModelProperty(value = "其它项目对应值") + private String otherParam; + + @ApiModelProperty(value = "附件") + private String files; + + @ApiModelProperty(value = "是否默认显示") + private Integer isShow; + + @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/src/main/java/com/gxwebsoft/tower/entity/TowerPlaceSafety.java b/src/main/java/com/gxwebsoft/tower/entity/TowerPlaceSafety.java new file mode 100644 index 0000000..770406a --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/entity/TowerPlaceSafety.java @@ -0,0 +1,82 @@ +package com.gxwebsoft.tower.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +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-06-08 11:00:17 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "TowerPlaceSafety对象", description = "安全巡检部位管理表") +public class TowerPlaceSafety implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "参数ID") + @TableId(value = "place_safety_id", type = IdType.AUTO) + private Integer placeSafetyId; + + @ApiModelProperty(value = "部位编码") + private String placeCode; + + @ApiModelProperty(value = "设备类型") + private String equipmentType; + + @ApiModelProperty(value = "安全巡检部位名称") + private String name; + + @ApiModelProperty(value = "检查标准") + private String checkStandard; + + @ApiModelProperty(value = "部位类型") + private String type; + + @ApiModelProperty(value = "推送目标系统") + private String pushSystem; + + @ApiModelProperty(value = "其它项目对应值") + private String otherParam; + + @ApiModelProperty(value = "附件") + private String files; + + @ApiModelProperty(value = "是否默认显示") + private Integer isShow; + + @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/src/main/java/com/gxwebsoft/tower/entity/TowerPlaceStandard.java b/src/main/java/com/gxwebsoft/tower/entity/TowerPlaceStandard.java new file mode 100644 index 0000000..cca3230 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/entity/TowerPlaceStandard.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.tower.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +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-06-08 15:37:00 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "TowerPlaceStandard对象", description = "检查标准附件表") +public class TowerPlaceStandard 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 placeId; + + @ApiModelProperty(value = "检查标准") + private String standard; + + @ApiModelProperty(value = "附件") + private String files; + + @ApiModelProperty(value = "备注") + private String comments; + + @ApiModelProperty(value = "租户id") + private Integer tenantId; + + @ApiModelProperty(value = "注册时间") + private Date createTime; + +} diff --git a/src/main/java/com/gxwebsoft/tower/entity/TowerProject.java b/src/main/java/com/gxwebsoft/tower/entity/TowerProject.java new file mode 100644 index 0000000..ddfb3e6 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/entity/TowerProject.java @@ -0,0 +1,130 @@ +package com.gxwebsoft.tower.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +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.Set; + +/** + * 项目管理 + * + * @author 科技小王子 + * @since 2023-05-22 13:30:39 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "TowerProject对象", description = "项目管理") +public class TowerProject implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "自增ID") + @TableId(value = "project_id", type = IdType.AUTO) + private Integer projectId; + + @ApiModelProperty(value = "项目名称") + private String projectName; + + @ApiModelProperty(value = "项目图片") + private String projectImage; + + @ApiModelProperty(value = "租赁单位") + private String companyName; + + @ApiModelProperty(value = "承租单位") + private String customerName; + + @ApiModelProperty(value = "项目地址") + private String projectRegion; + + @ApiModelProperty(value = "详细地址") + private String projectAddress; + + @ApiModelProperty(value = "经度") + private String longitude; + + @ApiModelProperty(value = "纬度") + private String latitude; + + @ApiModelProperty(value = "报监编号") + private String superviseNo; + + @ApiModelProperty(value = "施工许可证") + private String licenceNo; + + @ApiModelProperty(value = "安全状态") + private String securityStatus; + + @ApiModelProperty(value = "主管部门") + private String competentDepartment; + + @ApiModelProperty(value = "安拆单位") + private String dismantlingCompany; + + @ApiModelProperty(value = "汽吊规格") + private String truckCraneSpecs; + + @ApiModelProperty(value = "合同其他说明") + private String contract; + + @ApiModelProperty(value = "项目负责人") + private String director; + + @ApiModelProperty(value = "项目经理") + private String projectDirector; + + @ApiModelProperty(value = "项目状态") + private String projectStatus; + + @ApiModelProperty(value = "业务员") + private String salesman; + + @ApiModelProperty(value = "状态, 0待发布, 1已发布") + private Integer status; + + @ApiModelProperty(value = "备注") + private String comments; + + @ApiModelProperty(value = "排序号") + private Integer sortNumber; + + @ApiModelProperty(value = "所有人") + 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 Set users; + + @ApiModelProperty(value = "合同预定设备清单") + @TableField(exist = false) + private Set orders; + + @ApiModelProperty(value = "检查部位配置") + @TableField(exist = false) + private Set places1; + + @ApiModelProperty(value = "保养部位配置") + @TableField(exist = false) + private Set places2; + +} diff --git a/src/main/java/com/gxwebsoft/tower/entity/TowerProjectOrder.java b/src/main/java/com/gxwebsoft/tower/entity/TowerProjectOrder.java new file mode 100644 index 0000000..3a09d0e --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/entity/TowerProjectOrder.java @@ -0,0 +1,87 @@ +package com.gxwebsoft.tower.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +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.util.Date; + +/** + * 合同签订设备清单 + * + * @author 科技小王子 + * @since 2023-06-07 18:48:56 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "TowerProjectOrder对象", description = "合同签订设备清单") +public class TowerProjectOrder implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "自增ID") + @TableId(value = "project_order_id", type = IdType.AUTO) + private Integer projectOrderId; + + @ApiModelProperty(value = "key") + @TableField(exist = false) + private String key; + + @ApiModelProperty(value = "项目ID") + private Integer projectId; + + @ApiModelProperty(value = "设备名称") + private String equipmentName; + + @ApiModelProperty(value = "规格型号") + private String equipmentModel; + + @ApiModelProperty(value = "签订数量") + private Integer equipmentNum; + + @ApiModelProperty(value = "单位") + private String unit; + + @ApiModelProperty(value = "预计进场时间") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date startTime; + + @ApiModelProperty(value = "预计退场时间") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date endTime; + + @ApiModelProperty(value = "出厂年限") + private String year; + + @ApiModelProperty(value = "对应资料员") + private String documenter; + + @ApiModelProperty(value = "状态") + 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; + +} diff --git a/src/main/java/com/gxwebsoft/tower/entity/TowerProjectPlace.java b/src/main/java/com/gxwebsoft/tower/entity/TowerProjectPlace.java new file mode 100644 index 0000000..c79412f --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/entity/TowerProjectPlace.java @@ -0,0 +1,60 @@ +package com.gxwebsoft.tower.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +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-06-08 17:22:55 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "TowerProjectPlace对象", description = "检查/保养部位配置表") +public class TowerProjectPlace 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 projectId; + + @ApiModelProperty(value = "部位ID") + private Integer placeId; + + @ApiModelProperty(value = "排序号") + private Integer sortNumber; + + @ApiModelProperty(value = "租户id") + private Integer tenantId; + + @ApiModelProperty(value = "创建时间") + private Date createTime; + + @ApiModelProperty(value = "部位编码") + @TableField(exist = false) + private String placeCode; + + @ApiModelProperty(value = "设备名称") + @TableField(exist = false) + private String equipmentType; + + @ApiModelProperty(value = "检查部位") + @TableField(exist = false) + private String name; + + @ApiModelProperty(value = "部位类型") + @TableField(exist = false) + private String type; +} diff --git a/src/main/java/com/gxwebsoft/tower/entity/TowerProjectUser.java b/src/main/java/com/gxwebsoft/tower/entity/TowerProjectUser.java new file mode 100644 index 0000000..129b289 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/entity/TowerProjectUser.java @@ -0,0 +1,72 @@ +package com.gxwebsoft.tower.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +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-06-07 15:00:32 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "TowerProjectUser对象", description = "项目成员") +public class TowerProjectUser 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 projectId; + + @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; + + @ApiModelProperty(value = "所在部门") + @TableField(exist = false) + private String organizationName; + +} diff --git a/src/main/java/com/gxwebsoft/tower/entity/TowerWarehouse.java b/src/main/java/com/gxwebsoft/tower/entity/TowerWarehouse.java new file mode 100644 index 0000000..b4a15ca --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/entity/TowerWarehouse.java @@ -0,0 +1,88 @@ +package com.gxwebsoft.tower.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +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-20 15:06:43 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "TowerWarehouse对象", description = "仓库管理") +public class TowerWarehouse implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "自增ID") + @TableId(value = "warehouse_id", type = IdType.AUTO) + private Integer warehouseId; + + @ApiModelProperty(value = "仓库名称") + private String warehouseName; + + @ApiModelProperty(value = "负责人") + private String warehouseKeeper; + + @ApiModelProperty(value = "联系电话") + private String warehousePhone; + + @ApiModelProperty(value = "经度") + private String longitude; + + @ApiModelProperty(value = "纬度") + private String latitude; + + @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 regionName; + + @ApiModelProperty(value = "状态, 0待发布, 1已发布") + private Integer status; + + @ApiModelProperty(value = "备注") + private String comments; + + @ApiModelProperty(value = "排序(数字越小越靠前)") + private Integer sortNumber; + + @ApiModelProperty(value = "所有人") + 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/src/main/java/com/gxwebsoft/tower/mapper/TowerAccessoryMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerAccessoryMapper.java new file mode 100644 index 0000000..b57c669 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/mapper/TowerAccessoryMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.tower.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.tower.entity.TowerAccessory; +import com.gxwebsoft.tower.param.TowerAccessoryParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 配件管理Mapper + * + * @author 科技小王子 + * @since 2023-05-22 11:53:48 + */ +public interface TowerAccessoryMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") TowerAccessoryParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") TowerAccessoryParam param); + +} diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerEquipmentMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerEquipmentMapper.java new file mode 100644 index 0000000..6ca0886 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/mapper/TowerEquipmentMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.tower.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.tower.entity.TowerEquipment; +import com.gxwebsoft.tower.param.TowerEquipmentParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 塔吊设备管理Mapper + * + * @author 科技小王子 + * @since 2023-05-20 15:06:43 + */ +public interface TowerEquipmentMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") TowerEquipmentParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") TowerEquipmentParam param); + +} diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerModelMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerModelMapper.java new file mode 100644 index 0000000..d483b6c --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/mapper/TowerModelMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.tower.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.tower.entity.TowerModel; +import com.gxwebsoft.tower.param.TowerModelParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 设备型号管理表Mapper + * + * @author 科技小王子 + * @since 2023-05-29 14:07:46 + */ +public interface TowerModelMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") TowerModelParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") TowerModelParam param); + +} diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerPlaceMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerPlaceMapper.java new file mode 100644 index 0000000..df44d63 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/mapper/TowerPlaceMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.tower.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.tower.entity.TowerPlace; +import com.gxwebsoft.tower.param.TowerPlaceParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 检查/保养部位记录表Mapper + * + * @author 科技小王子 + * @since 2023-06-08 11:00:17 + */ +public interface TowerPlaceMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") TowerPlaceParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") TowerPlaceParam param); + +} diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerPlaceSafetyMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerPlaceSafetyMapper.java new file mode 100644 index 0000000..bd1fd3c --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/mapper/TowerPlaceSafetyMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.tower.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.tower.entity.TowerPlaceSafety; +import com.gxwebsoft.tower.param.TowerPlaceSafetyParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 安全巡检部位管理表Mapper + * + * @author 科技小王子 + * @since 2023-06-08 11:00:17 + */ +public interface TowerPlaceSafetyMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") TowerPlaceSafetyParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") TowerPlaceSafetyParam param); + +} diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerPlaceStandardMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerPlaceStandardMapper.java new file mode 100644 index 0000000..df9460f --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/mapper/TowerPlaceStandardMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.tower.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.tower.entity.TowerPlaceStandard; +import com.gxwebsoft.tower.param.TowerPlaceStandardParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 检查标准附件表Mapper + * + * @author 科技小王子 + * @since 2023-06-08 15:37:00 + */ +public interface TowerPlaceStandardMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") TowerPlaceStandardParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") TowerPlaceStandardParam param); + +} diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerProjectMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerProjectMapper.java new file mode 100644 index 0000000..b1002e6 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/mapper/TowerProjectMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.tower.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.tower.entity.TowerProject; +import com.gxwebsoft.tower.param.TowerProjectParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 项目管理Mapper + * + * @author 科技小王子 + * @since 2023-05-22 13:30:39 + */ +public interface TowerProjectMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") TowerProjectParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") TowerProjectParam param); + +} diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerProjectOrderMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerProjectOrderMapper.java new file mode 100644 index 0000000..c942a9a --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/mapper/TowerProjectOrderMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.tower.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.tower.entity.TowerProjectOrder; +import com.gxwebsoft.tower.param.TowerProjectOrderParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 合同签订设备清单Mapper + * + * @author 科技小王子 + * @since 2023-06-07 18:48:56 + */ +public interface TowerProjectOrderMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") TowerProjectOrderParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") TowerProjectOrderParam param); + +} diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerProjectPlaceMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerProjectPlaceMapper.java new file mode 100644 index 0000000..6cd19d0 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/mapper/TowerProjectPlaceMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.tower.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.tower.entity.TowerProjectPlace; +import com.gxwebsoft.tower.param.TowerProjectPlaceParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 检查/保养部位配置表Mapper + * + * @author 科技小王子 + * @since 2023-06-08 17:22:55 + */ +public interface TowerProjectPlaceMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") TowerProjectPlaceParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") TowerProjectPlaceParam param); + +} diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerProjectUserMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerProjectUserMapper.java new file mode 100644 index 0000000..1adb753 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/mapper/TowerProjectUserMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.tower.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.tower.entity.TowerProjectUser; +import com.gxwebsoft.tower.param.TowerProjectUserParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 项目成员Mapper + * + * @author 科技小王子 + * @since 2023-06-07 15:00:32 + */ +public interface TowerProjectUserMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") TowerProjectUserParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") TowerProjectUserParam param); + +} diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerWarehouseMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerWarehouseMapper.java new file mode 100644 index 0000000..6a92b52 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/mapper/TowerWarehouseMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.tower.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.tower.entity.TowerWarehouse; +import com.gxwebsoft.tower.param.TowerWarehouseParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 仓库管理Mapper + * + * @author 科技小王子 + * @since 2023-05-20 15:06:43 + */ +public interface TowerWarehouseMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") TowerWarehouseParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") TowerWarehouseParam param); + +} diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerAccessoryMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerAccessoryMapper.xml new file mode 100644 index 0000000..6c49f5e --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerAccessoryMapper.xml @@ -0,0 +1,96 @@ + + + + + + + SELECT a.* + FROM tower_accessory a + + + AND a.accessory_id = #{param.accessoryId} + + + AND a.accessory_name LIKE CONCAT('%', #{param.accessoryName}, '%') + + + AND a.accessory_category LIKE CONCAT('%', #{param.accessoryCategory}, '%') + + + AND a.accessory_model LIKE CONCAT('%', #{param.accessoryModel}, '%') + + + AND a.accessory_specs LIKE CONCAT('%', #{param.accessorySpecs}, '%') + + + AND a.accessory_price = #{param.accessoryPrice} + + + AND a.accessory_unit LIKE CONCAT('%', #{param.accessoryUnit}, '%') + + + AND a.accessory_stock LIKE CONCAT('%', #{param.accessoryStock}, '%') + + + AND a.company_name LIKE CONCAT('%', #{param.companyName}, '%') + + + AND a.manufactor LIKE CONCAT('%', #{param.manufactor}, '%') + + + AND a.manufactor_no LIKE CONCAT('%', #{param.manufactorNo}, '%') + + + AND a.life_year LIKE CONCAT('%', #{param.lifeYear}, '%') + + + AND a.factory_date LIKE CONCAT('%', #{param.factoryDate}, '%') + + + AND a.scrap_date LIKE CONCAT('%', #{param.scrapDate}, '%') + + + 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} + + + AND ( + a.accessory_name LIKE CONCAT('%', #{param.keywords}, '%') + OR a.accessory_no LIKE CONCAT('%', #{param.keywords}, '%') + OR a.company_name LIKE CONCAT('%', #{param.keywords}, '%') + ) + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerEquipmentMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerEquipmentMapper.xml new file mode 100644 index 0000000..c7a2c93 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerEquipmentMapper.xml @@ -0,0 +1,115 @@ + + + + + + + SELECT a.* + FROM tower_equipment a + + + AND a.equipment_id = #{param.equipmentId} + + + AND a.name LIKE CONCAT('%', #{param.name}, '%') + + + AND a.model LIKE CONCAT('%', #{param.model}, '%') + + + AND a.equipment_no LIKE CONCAT('%', #{param.equipmentNo}, '%') + + + AND a.factory_no LIKE CONCAT('%', #{param.factoryNo}, '%') + + + AND a.factory_date LIKE CONCAT('%', #{param.factoryDate}, '%') + + + AND a.manufactor LIKE CONCAT('%', #{param.manufactor}, '%') + + + AND a.life_year LIKE CONCAT('%', #{param.lifeYear}, '%') + + + AND a.scrap_date LIKE CONCAT('%', #{param.scrapDate}, '%') + + + AND a.licence_no LIKE CONCAT('%', #{param.licenceNo}, '%') + + + AND a.company = #{param.company} + + + AND a.organization = #{param.organization} + + + AND a.warehouse = #{param.warehouse} + + + AND a.source LIKE CONCAT('%', #{param.source}, '%') + + + AND a.buy_date LIKE CONCAT('%', #{param.buyDate}, '%') + + + AND a.current_location LIKE CONCAT('%', #{param.currentLocation}, '%') + + + AND a.design_height LIKE CONCAT('%', #{param.designHeight}, '%') + + + AND a.height LIKE CONCAT('%', #{param.height}, '%') + + + AND a.rated_load LIKE CONCAT('%', #{param.ratedLoad}, '%') + + + AND a.max_rated_load LIKE CONCAT('%', #{param.maxRatedLoad}, '%') + + + AND a.files LIKE CONCAT('%', #{param.files}, '%') + + + AND a.status = #{param.status} + + + AND a.comments LIKE CONCAT('%', #{param.comments}, '%') + + + 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.name LIKE CONCAT('%', #{param.keywords}, '%') + OR a.model LIKE CONCAT('%', #{param.keywords}, '%') + OR a.equipment_no LIKE CONCAT('%', #{param.keywords}, '%') + OR a.company LIKE CONCAT('%', #{param.keywords}, '%') + ) + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerModelMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerModelMapper.xml new file mode 100644 index 0000000..ee0ae23 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerModelMapper.xml @@ -0,0 +1,71 @@ + + + + + + + SELECT a.* + FROM tower_model a + + + AND a.model_id = #{param.modelId} + + + AND a.name LIKE CONCAT('%', #{param.name}, '%') + + + AND a.model LIKE CONCAT('%', #{param.model}, '%') + + + AND a.parent_id = #{param.parentId} + + + AND a.image LIKE CONCAT('%', #{param.image}, '%') + + + AND a.user_id = #{param.userId} + + + AND a.year_life = #{param.yearLife} + + + 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.name LIKE CONCAT('%', #{param.keywords}, '%') + OR a.model LIKE CONCAT('%', #{param.keywords}, '%') + ) + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerPlaceMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerPlaceMapper.xml new file mode 100644 index 0000000..6fed629 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerPlaceMapper.xml @@ -0,0 +1,83 @@ + + + + + + + SELECT a.* + FROM tower_place a + + + AND a.place_id = #{param.placeId} + + + AND a.place_code LIKE CONCAT('%', #{param.placeCode}, '%') + + + AND a.equipment_type LIKE CONCAT('%', #{param.equipmentType}, '%') + + + AND a.name LIKE CONCAT('%', #{param.name}, '%') + + + AND a.standard LIKE CONCAT('%', #{param.standard}, '%') + + + AND a.type LIKE CONCAT('%', #{param.type}, '%') + + + AND a.push_system LIKE CONCAT('%', #{param.pushSystem}, '%') + + + AND a.other_param LIKE CONCAT('%', #{param.otherParam}, '%') + + + AND a.files LIKE CONCAT('%', #{param.files}, '%') + + + AND a.is_show = #{param.isShow} + + + 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.equipment_type LIKE CONCAT('%', #{param.keywords}, '%') + OR a.place_code = #{param.keywords} + OR a.name #{param.keywords} + ) + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerPlaceSafetyMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerPlaceSafetyMapper.xml new file mode 100644 index 0000000..82e35d1 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerPlaceSafetyMapper.xml @@ -0,0 +1,77 @@ + + + + + + + SELECT a.* + FROM tower_place_safety a + + + AND a.place_safety_id = #{param.placeSafetyId} + + + AND a.place_code LIKE CONCAT('%', #{param.placeCode}, '%') + + + AND a.equipment_type LIKE CONCAT('%', #{param.equipmentType}, '%') + + + AND a.name LIKE CONCAT('%', #{param.name}, '%') + + + AND a.check_standard LIKE CONCAT('%', #{param.checkStandard}, '%') + + + AND a.type LIKE CONCAT('%', #{param.type}, '%') + + + AND a.push_system LIKE CONCAT('%', #{param.pushSystem}, '%') + + + AND a.other_param LIKE CONCAT('%', #{param.otherParam}, '%') + + + AND a.files LIKE CONCAT('%', #{param.files}, '%') + + + AND a.is_show = #{param.isShow} + + + 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/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerPlaceStandardMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerPlaceStandardMapper.xml new file mode 100644 index 0000000..51988a5 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerPlaceStandardMapper.xml @@ -0,0 +1,44 @@ + + + + + + + SELECT a.* + FROM tower_place_standard a + + + AND a.id = #{param.id} + + + AND a.place_id = #{param.placeId} + + + AND a.standard LIKE CONCAT('%', #{param.standard}, '%') + + + AND a.files LIKE CONCAT('%', #{param.files}, '%') + + + AND a.comments LIKE CONCAT('%', #{param.comments}, '%') + + + AND a.create_time >= #{param.createTimeStart} + + + AND a.create_time <= #{param.createTimeEnd} + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerProjectMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerProjectMapper.xml new file mode 100644 index 0000000..6819f21 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerProjectMapper.xml @@ -0,0 +1,104 @@ + + + + + + + SELECT a.* + FROM tower_project a + + + AND a.project_id = #{param.projectId} + + + AND a.project_name LIKE CONCAT('%', #{param.projectName}, '%') + + + AND a.company_name LIKE CONCAT('%', #{param.companyName}, '%') + + + AND a.customer_name LIKE CONCAT('%', #{param.customerName}, '%') + + + AND a.project_region LIKE CONCAT('%', #{param.projectRegion}, '%') + + + AND a.project_address LIKE CONCAT('%', #{param.projectAddress}, '%') + + + AND a.longitude LIKE CONCAT('%', #{param.longitude}, '%') + + + AND a.latitude LIKE CONCAT('%', #{param.latitude}, '%') + + + AND a.supervise_no LIKE CONCAT('%', #{param.superviseNo}, '%') + + + AND a.licence_no LIKE CONCAT('%', #{param.licenceNo}, '%') + + + AND a.security_status LIKE CONCAT('%', #{param.securityStatus}, '%') + + + AND a.competent_department LIKE CONCAT('%', #{param.competentDepartment}, '%') + + + AND a.dismantling_company LIKE CONCAT('%', #{param.dismantlingCompany}, '%') + + + AND a.truck_crane_specs LIKE CONCAT('%', #{param.truckCraneSpecs}, '%') + + + AND a.contract LIKE CONCAT('%', #{param.contract}, '%') + + + AND a.director = #{param.director} + + + AND a.project_director LIKE CONCAT('%', #{param.projectDirector}, '%') + + + AND a.project_status LIKE CONCAT('%', #{param.projectStatus}, '%') + + + AND a.salesman LIKE CONCAT('%', #{param.salesman}, '%') + + + 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/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerProjectOrderMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerProjectOrderMapper.xml new file mode 100644 index 0000000..7549e71 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerProjectOrderMapper.xml @@ -0,0 +1,77 @@ + + + + + + + SELECT a.* + FROM tower_project_order a + + + AND a.project_order_id = #{param.projectOrderId} + + + AND a.project_id = #{param.projectId} + + + AND a.equipment_name LIKE CONCAT('%', #{param.equipmentName}, '%') + + + AND a.equipment_model LIKE CONCAT('%', #{param.equipmentModel}, '%') + + + AND a.equipment_num = #{param.equipmentNum} + + + AND a.unit LIKE CONCAT('%', #{param.unit}, '%') + + + AND a.start_time LIKE CONCAT('%', #{param.startTime}, '%') + + + AND a.end_time LIKE CONCAT('%', #{param.endTime}, '%') + + + AND a.year LIKE CONCAT('%', #{param.year}, '%') + + + AND a.documenter LIKE CONCAT('%', #{param.documenter}, '%') + + + 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/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerProjectPlaceMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerProjectPlaceMapper.xml new file mode 100644 index 0000000..dc461fe --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerProjectPlaceMapper.xml @@ -0,0 +1,50 @@ + + + + + + + SELECT a.*,b.name,b.place_code,b.place_id,b.equipment_type,b.type + FROM tower_project_place a + LEFT JOIN tower_place b ON a.place_id = b.place_id + + + AND a.id = #{param.id} + + + AND a.project_id = #{param.projectId} + + + AND a.place_id = #{param.placeId} + + + AND a.sort_number = #{param.sortNumber} + + + AND a.create_time >= #{param.createTimeStart} + + + AND a.create_time <= #{param.createTimeEnd} + + + AND ( + b.name LIKE CONCAT('%', #{param.keywords}, '%') + OR b.place_code LIKE CONCAT('%', #{param.keywords}, '%') + OR b.type LIKE CONCAT('%', #{param.keywords}, '%') + OR b.equipment_type LIKE CONCAT('%', #{param.keywords}, '%') + ) + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerProjectUserMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerProjectUserMapper.xml new file mode 100644 index 0000000..d74c770 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerProjectUserMapper.xml @@ -0,0 +1,53 @@ + + + + + + + SELECT a.*, b.nickname,b.email,b.phone,b.avatar,c.organization_name + FROM tower_project_user a + LEFT JOIN sys_user b ON a.user_id = b.user_id + LEFT JOIN sys_organization c ON b.organization_id = c.organization_id + + + AND a.id = #{param.id} + + + AND a.role = #{param.role} + + + AND a.user_id = #{param.userId} + + + AND a.project_id = #{param.projectId} + + + 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/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerWarehouseMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerWarehouseMapper.xml new file mode 100644 index 0000000..08b47b3 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerWarehouseMapper.xml @@ -0,0 +1,87 @@ + + + + + + + SELECT a.* + FROM tower_warehouse a + + + AND a.warehouse_id = #{param.warehouseId} + + + AND a.warehouse_name LIKE CONCAT('%', #{param.warehouseName}, '%') + + + AND a.warehouse_keeper LIKE CONCAT('%', #{param.warehouseKeeper}, '%') + + + AND a.warehouse_phone LIKE CONCAT('%', #{param.warehousePhone}, '%') + + + AND a.longitude LIKE CONCAT('%', #{param.longitude}, '%') + + + AND a.latitude LIKE CONCAT('%', #{param.latitude}, '%') + + + 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.region_name LIKE CONCAT('%', #{param.regionName}, '%') + + + AND a.status = #{param.status} + + + AND a.comments LIKE CONCAT('%', #{param.comments}, '%') + + + AND a.username = #{param.username} + + + AND a.deleted = #{param.deleted} + + + AND a.deleted = 0 + + + AND a.create_time >= #{param.createTimeStart} + + + AND a.create_time <= #{param.createTimeEnd} + + + AND (a.title LIKE CONCAT('%', #{param.keywords}, '%') + OR a.warehouse_name = #{param.keywords + OR a.warehouse_keeper = #{param.keywords} + OR a.warehouse_phone = #{param.keywords} + ) + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/tower/param/TowerAccessoryParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerAccessoryParam.java new file mode 100644 index 0000000..c8326ac --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/param/TowerAccessoryParam.java @@ -0,0 +1,90 @@ +package com.gxwebsoft.tower.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; + +import java.math.BigDecimal; + +/** + * 配件管理查询参数 + * + * @author 科技小王子 + * @since 2023-05-22 11:53:48 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "TowerAccessoryParam对象", description = "配件管理查询参数") +public class TowerAccessoryParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "自增ID") + @QueryField(type = QueryType.EQ) + private Integer accessoryId; + + @ApiModelProperty(value = "配件名称") + private String accessoryName; + + @ApiModelProperty(value = "配件分类") + private String accessoryCategory; + + @ApiModelProperty(value = "适用设备型号") + private String accessoryModel; + + @ApiModelProperty(value = "配件规格") + private String accessorySpecs; + + @ApiModelProperty(value = "单价") + @QueryField(type = QueryType.EQ) + private BigDecimal accessoryPrice; + + @ApiModelProperty(value = "配件单位") + private String accessoryUnit; + + @ApiModelProperty(value = "库存总量") + private String accessoryStock; + + @ApiModelProperty(value = "产权单位名称") + private String companyName; + + @ApiModelProperty(value = "制造厂商") + private String manufactor; + + @ApiModelProperty(value = "制造厂商编号") + private String manufactorNo; + + @ApiModelProperty(value = "使用年限") + private String lifeYear; + + @ApiModelProperty(value = "出厂日期") + private String factoryDate; + + @ApiModelProperty(value = "报废日期") + private String scrapDate; + + @ApiModelProperty(value = "状态, 0待发布, 1已发布") + @QueryField(type = QueryType.EQ) + private Integer status; + + @ApiModelProperty(value = "备注") + private String comments; + + @ApiModelProperty(value = "排序号") + @QueryField(type = QueryType.EQ) + private Integer sortNumber; + + @ApiModelProperty(value = "所有人") + @QueryField(type = QueryType.EQ) + private Integer userId; + + @ApiModelProperty(value = "是否删除, 0否, 1是") + @QueryField(type = QueryType.EQ) + private Integer deleted; + +} diff --git a/src/main/java/com/gxwebsoft/tower/param/TowerEquipmentParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerEquipmentParam.java new file mode 100644 index 0000000..b3df3fe --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/param/TowerEquipmentParam.java @@ -0,0 +1,110 @@ +package com.gxwebsoft.tower.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-05-20 15:06:43 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "TowerEquipmentParam对象", description = "塔吊设备管理查询参数") +public class TowerEquipmentParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "自增ID") + @QueryField(type = QueryType.EQ) + private Integer equipmentId; + + @ApiModelProperty(value = "设备名称") + private String name; + + @ApiModelProperty(value = "设备型号") + private String model; + + @ApiModelProperty(value = "设备编号") + private String equipmentNo; + + @ApiModelProperty(value = "出厂编号") + private String factoryNo; + + @ApiModelProperty(value = "出厂日期") + private String factoryDate; + + @ApiModelProperty(value = "制造厂商") + private String manufactor; + + @ApiModelProperty(value = "使用年限") + private String lifeYear; + + @ApiModelProperty(value = "报废日期") + private String scrapDate; + + @ApiModelProperty(value = "备案许可证号") + private String licenceNo; + + @ApiModelProperty(value = "产权单位") + @QueryField(type = QueryType.EQ) + private String company; + + @ApiModelProperty(value = "产权单位名称") + private String propertyCompany; + + @ApiModelProperty(value = "所属部门") + @QueryField(type = QueryType.EQ) + private String organization; + + @ApiModelProperty(value = "所属仓库") + @QueryField(type = QueryType.EQ) + private String warehouse; + + @ApiModelProperty(value = "设备来源") + private String source; + + @ApiModelProperty(value = "采购日期") + private String buyDate; + + @ApiModelProperty(value = "当前位置") + private String currentLocation; + + @ApiModelProperty(value = "设计高度") + private String designHeight; + + @ApiModelProperty(value = "独立高度") + private String height; + + @ApiModelProperty(value = "额定载重") + private String ratedLoad; + + @ApiModelProperty(value = "最大幅度处额定载重") + private String maxRatedLoad; + + @ApiModelProperty(value = "附件信息") + private String files; + + @ApiModelProperty(value = "状态, 0待发布, 1已发布") + @QueryField(type = QueryType.EQ) + private Integer status; + + @ApiModelProperty(value = "备注") + private String comments; + + @ApiModelProperty(value = "所有人") + @QueryField(type = QueryType.EQ) + private Integer userId; + + @ApiModelProperty(value = "是否删除, 0否, 1是") + @QueryField(type = QueryType.EQ) + private Integer deleted; + +} diff --git a/src/main/java/com/gxwebsoft/tower/param/TowerModelParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerModelParam.java new file mode 100644 index 0000000..970767e --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/param/TowerModelParam.java @@ -0,0 +1,64 @@ +package com.gxwebsoft.tower.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-05-29 14:07:46 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "TowerModelParam对象", description = "设备型号管理表查询参数") +public class TowerModelParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "型号ID") + @QueryField(type = QueryType.EQ) + private Integer modelId; + + @ApiModelProperty(value = "设备名称") + private String name; + + @ApiModelProperty(value = "设备型号") + private String model; + + @ApiModelProperty(value = "上级分类ID") + @QueryField(type = QueryType.EQ) + private Integer parentId; + + @ApiModelProperty(value = "分类图片") + private String image; + + @ApiModelProperty(value = "用户ID") + @QueryField(type = QueryType.EQ) + private Integer userId; + + @ApiModelProperty(value = "使用年限") + private Integer yearLife; + + @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/src/main/java/com/gxwebsoft/tower/param/TowerPlaceParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerPlaceParam.java new file mode 100644 index 0000000..3800102 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/param/TowerPlaceParam.java @@ -0,0 +1,81 @@ +package com.gxwebsoft.tower.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 com.gxwebsoft.tower.entity.TowerPlaceStandard; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.List; + +/** + * 检查/保养部位记录表查询参数 + * + * @author 科技小王子 + * @since 2023-06-08 11:00:17 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "TowerPlaceParam对象", description = "检查/保养部位记录表查询参数") +public class TowerPlaceParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "参数ID") + @QueryField(type = QueryType.EQ) + private Integer placeId; + + @ApiModelProperty(value = "部位编码") + private String placeCode; + + @ApiModelProperty(value = "设备类型") + private String equipmentType; + + @ApiModelProperty(value = "部位名称") + private String name; + + @ApiModelProperty(value = "检查/保养标准") + @TableField(exist = false) + private List standard; + + @ApiModelProperty(value = "部位类型") + private String type; + + @ApiModelProperty(value = "推送目标系统") + private String pushSystem; + + @ApiModelProperty(value = "其它项目对应值") + private String otherParam; + + @ApiModelProperty(value = "附件") + private String files; + + @ApiModelProperty(value = "是否默认显示") + @QueryField(type = QueryType.EQ) + private Integer isShow; + + @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/src/main/java/com/gxwebsoft/tower/param/TowerPlaceSafetyParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerPlaceSafetyParam.java new file mode 100644 index 0000000..0385285 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/param/TowerPlaceSafetyParam.java @@ -0,0 +1,76 @@ +package com.gxwebsoft.tower.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-06-08 11:00:17 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "TowerPlaceSafetyParam对象", description = "安全巡检部位管理表查询参数") +public class TowerPlaceSafetyParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "参数ID") + @QueryField(type = QueryType.EQ) + private Integer placeSafetyId; + + @ApiModelProperty(value = "部位编码") + private String placeCode; + + @ApiModelProperty(value = "设备类型") + private String equipmentType; + + @ApiModelProperty(value = "安全巡检部位名称") + private String name; + + @ApiModelProperty(value = "检查标准") + private String checkStandard; + + @ApiModelProperty(value = "部位类型") + private String type; + + @ApiModelProperty(value = "推送目标系统") + private String pushSystem; + + @ApiModelProperty(value = "其它项目对应值") + private String otherParam; + + @ApiModelProperty(value = "附件") + private String files; + + @ApiModelProperty(value = "是否默认显示") + @QueryField(type = QueryType.EQ) + private Integer isShow; + + @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/src/main/java/com/gxwebsoft/tower/param/TowerPlaceStandardParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerPlaceStandardParam.java new file mode 100644 index 0000000..8e13943 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/param/TowerPlaceStandardParam.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.tower.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-06-08 15:37:00 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "TowerPlaceStandardParam对象", description = "检查标准附件表查询参数") +public class TowerPlaceStandardParam 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 placeId; + + @ApiModelProperty(value = "检查标准") + private String standard; + + @ApiModelProperty(value = "附件") + private String files; + + @ApiModelProperty(value = "备注") + private String comments; + +} diff --git a/src/main/java/com/gxwebsoft/tower/param/TowerProjectOrderParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerProjectOrderParam.java new file mode 100644 index 0000000..2864a5c --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/param/TowerProjectOrderParam.java @@ -0,0 +1,87 @@ +package com.gxwebsoft.tower.param; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; +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 com.gxwebsoft.tower.entity.TowerProjectOrder; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.List; + +/** + * 合同签订设备清单查询参数 + * + * @author 科技小王子 + * @since 2023-06-07 18:48:56 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "TowerProjectOrderParam对象", description = "合同签订设备清单查询参数") +public class TowerProjectOrderParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "自增ID") + @QueryField(type = QueryType.EQ) + private Integer projectOrderId; + + @ApiModelProperty(value = "项目ID") + private Integer projectId; + + @ApiModelProperty(value = "设备名称") + private String equipmentName; + + @ApiModelProperty(value = "规格型号") + private String equipmentModel; + + @ApiModelProperty(value = "签订数量") + @QueryField(type = QueryType.EQ) + private Integer equipmentNum; + + @ApiModelProperty(value = "单位") + private String unit; + + @ApiModelProperty(value = "预计进场时间") + @JsonFormat(pattern = "yyyy-MM-dd") + private String startTime; + + @ApiModelProperty(value = "预计退场时间") + @JsonFormat(pattern = "yyyy-MM-dd") + private String endTime; + + @ApiModelProperty(value = "出厂年限") + private String year; + + @ApiModelProperty(value = "对应资料员") + private String documenter; + + @ApiModelProperty(value = "状态") + @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 = "合同预定设备清单") + @TableField(exist = false) + private List orders; + +} diff --git a/src/main/java/com/gxwebsoft/tower/param/TowerProjectParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerProjectParam.java new file mode 100644 index 0000000..46a8268 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/param/TowerProjectParam.java @@ -0,0 +1,128 @@ +package com.gxwebsoft.tower.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 com.gxwebsoft.tower.entity.TowerProjectOrder; +import com.gxwebsoft.tower.entity.TowerProjectPlace; +import com.gxwebsoft.tower.entity.TowerProjectUser; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Set; + +/** + * 项目管理查询参数 + * + * @author 科技小王子 + * @since 2023-05-22 13:30:39 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "TowerProjectParam对象", description = "项目管理查询参数") +public class TowerProjectParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "自增ID") + @QueryField(type = QueryType.EQ) + private Integer projectId; + + @ApiModelProperty(value = "配件名称") + private String projectName; + + @ApiModelProperty(value = "项目图片") + private String projectImage; + + @ApiModelProperty(value = "租赁单位") + private String companyName; + + @ApiModelProperty(value = "承租单位") + private String customerName; + + @ApiModelProperty(value = "项目地址") + private String projectRegion; + + @ApiModelProperty(value = "详细地址") + private String projectAddress; + + @ApiModelProperty(value = "经度") + private String longitude; + + @ApiModelProperty(value = "纬度") + private String latitude; + + @ApiModelProperty(value = "报监编号") + private String superviseNo; + + @ApiModelProperty(value = "施工许可证") + private String licenceNo; + + @ApiModelProperty(value = "安全状态") + private String securityStatus; + + @ApiModelProperty(value = "主管部门") + private String competentDepartment; + + @ApiModelProperty(value = "安拆单位") + private String dismantlingCompany; + + @ApiModelProperty(value = "汽吊规格") + private String truckCraneSpecs; + + @ApiModelProperty(value = "合同其他说明") + private String contract; + + @ApiModelProperty(value = "项目负责人") + @QueryField(type = QueryType.EQ) + private Integer director; + + @ApiModelProperty(value = "项目经理") + private String projectDirector; + + @ApiModelProperty(value = "项目状态") + private String projectStatus; + + @ApiModelProperty(value = "业务员") + private String salesman; + + @ApiModelProperty(value = "状态, 0待发布, 1已发布") + @QueryField(type = QueryType.EQ) + private Integer status; + + @ApiModelProperty(value = "备注") + private String comments; + + @ApiModelProperty(value = "排序号") + @QueryField(type = QueryType.EQ) + private Integer sortNumber; + + @ApiModelProperty(value = "所有人") + @QueryField(type = QueryType.EQ) + private Integer userId; + + @ApiModelProperty(value = "是否删除, 0否, 1是") + @QueryField(type = QueryType.EQ) + private Integer deleted; + + @ApiModelProperty(value = "项目成员") + @TableField(exist = false) + private Set users; + + @ApiModelProperty(value = "合同预定设备清单") + @TableField(exist = false) + private Set orders; + + @ApiModelProperty(value = "检查部位配置") + @TableField(exist = false) + private Set places1; + + @ApiModelProperty(value = "保养部位配置") + @TableField(exist = false) + private Set places2; + +} diff --git a/src/main/java/com/gxwebsoft/tower/param/TowerProjectPlaceParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerProjectPlaceParam.java new file mode 100644 index 0000000..86607ed --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/param/TowerProjectPlaceParam.java @@ -0,0 +1,54 @@ +package com.gxwebsoft.tower.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-06-08 17:22:55 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "TowerProjectPlaceParam对象", description = "检查/保养部位配置表查询参数") +public class TowerProjectPlaceParam 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 projectId; + + @ApiModelProperty(value = "部位ID") + @QueryField(type = QueryType.EQ) + private Integer placeId; + + @ApiModelProperty(value = "排序号") + @QueryField(type = QueryType.EQ) + private Integer sortNumber; + + @ApiModelProperty(value = "部位编码") + @TableField(exist = false) + private String placeCode; + + @ApiModelProperty(value = "设备名称") + @TableField(exist = false) + private String name; + + @ApiModelProperty(value = "部位类型") + @TableField(exist = false) + private String type; + +} diff --git a/src/main/java/com/gxwebsoft/tower/param/TowerProjectUserParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerProjectUserParam.java new file mode 100644 index 0000000..0e0ad28 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/param/TowerProjectUserParam.java @@ -0,0 +1,66 @@ +package com.gxwebsoft.tower.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-06-07 15:00:32 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "TowerProjectUserParam对象", description = "项目成员查询参数") +public class TowerProjectUserParam 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 projectId; + + @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/src/main/java/com/gxwebsoft/tower/param/TowerWarehouseParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerWarehouseParam.java new file mode 100644 index 0000000..2a1d29d --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/param/TowerWarehouseParam.java @@ -0,0 +1,77 @@ +package com.gxwebsoft.tower.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-05-20 15:06:43 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "TowerWarehouseParam对象", description = "仓库管理查询参数") +public class TowerWarehouseParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "自增ID") + @QueryField(type = QueryType.EQ) + private Integer warehouseId; + + @ApiModelProperty(value = "仓库名称") + private String warehouseName; + + @ApiModelProperty(value = "负责人") + private String warehouseKeeper; + + @ApiModelProperty(value = "联系电话") + private String warehousePhone; + + @ApiModelProperty(value = "经度") + private String longitude; + + @ApiModelProperty(value = "纬度") + private String latitude; + + @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 regionName; + + @ApiModelProperty(value = "状态, 0待发布, 1已发布") + @QueryField(type = QueryType.EQ) + private Integer status; + + @ApiModelProperty(value = "备注") + private String comments; + + @ApiModelProperty(value = "所有人") + @QueryField(type = QueryType.EQ) + private Integer userId; + + @ApiModelProperty(value = "是否删除, 0否, 1是") + @QueryField(type = QueryType.EQ) + private Integer deleted; + +} diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerAccessoryService.java b/src/main/java/com/gxwebsoft/tower/service/TowerAccessoryService.java new file mode 100644 index 0000000..2224bf0 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/service/TowerAccessoryService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.tower.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.tower.entity.TowerAccessory; +import com.gxwebsoft.tower.param.TowerAccessoryParam; + +import java.util.List; + +/** + * 配件管理Service + * + * @author 科技小王子 + * @since 2023-05-22 11:53:48 + */ +public interface TowerAccessoryService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(TowerAccessoryParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(TowerAccessoryParam param); + + /** + * 根据id查询 + * + * @param accessoryId 自增ID + * @return TowerAccessory + */ + TowerAccessory getByIdRel(Integer accessoryId); + +} diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerEquipmentService.java b/src/main/java/com/gxwebsoft/tower/service/TowerEquipmentService.java new file mode 100644 index 0000000..de1a69b --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/service/TowerEquipmentService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.tower.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.tower.entity.TowerEquipment; +import com.gxwebsoft.tower.param.TowerEquipmentParam; + +import java.util.List; + +/** + * 塔吊设备管理Service + * + * @author 科技小王子 + * @since 2023-05-20 15:06:43 + */ +public interface TowerEquipmentService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(TowerEquipmentParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(TowerEquipmentParam param); + + /** + * 根据id查询 + * + * @param equipmentId 自增ID + * @return TowerEquipment + */ + TowerEquipment getByIdRel(Integer equipmentId); + +} diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerModelService.java b/src/main/java/com/gxwebsoft/tower/service/TowerModelService.java new file mode 100644 index 0000000..8811eb7 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/service/TowerModelService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.tower.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.tower.entity.TowerModel; +import com.gxwebsoft.tower.param.TowerModelParam; + +import java.util.List; + +/** + * 设备型号管理表Service + * + * @author 科技小王子 + * @since 2023-05-29 14:07:46 + */ +public interface TowerModelService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(TowerModelParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(TowerModelParam param); + + /** + * 根据id查询 + * + * @param categoryId 型号ID + * @return TowerModel + */ + TowerModel getByIdRel(Integer categoryId); + +} diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerPlaceSafetyService.java b/src/main/java/com/gxwebsoft/tower/service/TowerPlaceSafetyService.java new file mode 100644 index 0000000..846b7a1 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/service/TowerPlaceSafetyService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.tower.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.tower.entity.TowerPlaceSafety; +import com.gxwebsoft.tower.param.TowerPlaceSafetyParam; + +import java.util.List; + +/** + * 安全巡检部位管理表Service + * + * @author 科技小王子 + * @since 2023-06-08 11:00:17 + */ +public interface TowerPlaceSafetyService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(TowerPlaceSafetyParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(TowerPlaceSafetyParam param); + + /** + * 根据id查询 + * + * @param placeSafetyId 参数ID + * @return TowerPlaceSafety + */ + TowerPlaceSafety getByIdRel(Integer placeSafetyId); + +} diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerPlaceService.java b/src/main/java/com/gxwebsoft/tower/service/TowerPlaceService.java new file mode 100644 index 0000000..c047181 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/service/TowerPlaceService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.tower.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.tower.entity.TowerPlace; +import com.gxwebsoft.tower.param.TowerPlaceParam; + +import java.util.List; + +/** + * 检查/保养部位记录表Service + * + * @author 科技小王子 + * @since 2023-06-08 11:00:17 + */ +public interface TowerPlaceService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(TowerPlaceParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(TowerPlaceParam param); + + /** + * 根据id查询 + * + * @param placeId 参数ID + * @return TowerPlace + */ + TowerPlace getByIdRel(Integer placeId); + +} diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerPlaceStandardService.java b/src/main/java/com/gxwebsoft/tower/service/TowerPlaceStandardService.java new file mode 100644 index 0000000..bce6671 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/service/TowerPlaceStandardService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.tower.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.tower.entity.TowerPlaceStandard; +import com.gxwebsoft.tower.param.TowerPlaceStandardParam; + +import java.util.List; + +/** + * 检查标准附件表Service + * + * @author 科技小王子 + * @since 2023-06-08 15:37:00 + */ +public interface TowerPlaceStandardService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(TowerPlaceStandardParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(TowerPlaceStandardParam param); + + /** + * 根据id查询 + * + * @param id 参数ID + * @return TowerPlaceStandard + */ + TowerPlaceStandard getByIdRel(Integer id); + +} diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerProjectOrderService.java b/src/main/java/com/gxwebsoft/tower/service/TowerProjectOrderService.java new file mode 100644 index 0000000..db761c7 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/service/TowerProjectOrderService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.tower.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.tower.entity.TowerProjectOrder; +import com.gxwebsoft.tower.param.TowerProjectOrderParam; + +import java.util.List; + +/** + * 合同签订设备清单Service + * + * @author 科技小王子 + * @since 2023-06-07 18:48:56 + */ +public interface TowerProjectOrderService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(TowerProjectOrderParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(TowerProjectOrderParam param); + + /** + * 根据id查询 + * + * @param projectOrderId 自增ID + * @return TowerProjectOrder + */ + TowerProjectOrder getByIdRel(Integer projectOrderId); + +} diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerProjectPlaceService.java b/src/main/java/com/gxwebsoft/tower/service/TowerProjectPlaceService.java new file mode 100644 index 0000000..950ea42 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/service/TowerProjectPlaceService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.tower.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.tower.entity.TowerProjectPlace; +import com.gxwebsoft.tower.param.TowerProjectPlaceParam; + +import java.util.List; + +/** + * 检查/保养部位配置表Service + * + * @author 科技小王子 + * @since 2023-06-08 17:22:55 + */ +public interface TowerProjectPlaceService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(TowerProjectPlaceParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(TowerProjectPlaceParam param); + + /** + * 根据id查询 + * + * @param id 自增ID + * @return TowerProjectPlace + */ + TowerProjectPlace getByIdRel(Integer id); + +} diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerProjectService.java b/src/main/java/com/gxwebsoft/tower/service/TowerProjectService.java new file mode 100644 index 0000000..84114fd --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/service/TowerProjectService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.tower.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.tower.entity.TowerProject; +import com.gxwebsoft.tower.param.TowerProjectParam; + +import java.util.List; + +/** + * 项目管理Service + * + * @author 科技小王子 + * @since 2023-05-22 13:30:39 + */ +public interface TowerProjectService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(TowerProjectParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(TowerProjectParam param); + + /** + * 根据id查询 + * + * @param projectId 自增ID + * @return TowerProject + */ + TowerProject getByIdRel(Integer projectId); + +} diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerProjectUserService.java b/src/main/java/com/gxwebsoft/tower/service/TowerProjectUserService.java new file mode 100644 index 0000000..4a844d8 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/service/TowerProjectUserService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.tower.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.tower.entity.TowerProjectUser; +import com.gxwebsoft.tower.param.TowerProjectUserParam; + +import java.util.List; + +/** + * 项目成员Service + * + * @author 科技小王子 + * @since 2023-06-07 15:00:32 + */ +public interface TowerProjectUserService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(TowerProjectUserParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(TowerProjectUserParam param); + + /** + * 根据id查询 + * + * @param id 自增ID + * @return TowerProjectUser + */ + TowerProjectUser getByIdRel(Integer id); + +} diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerWarehouseService.java b/src/main/java/com/gxwebsoft/tower/service/TowerWarehouseService.java new file mode 100644 index 0000000..c9095c4 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/service/TowerWarehouseService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.tower.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.tower.entity.TowerWarehouse; +import com.gxwebsoft.tower.param.TowerWarehouseParam; + +import java.util.List; + +/** + * 仓库管理Service + * + * @author 科技小王子 + * @since 2023-05-20 15:06:43 + */ +public interface TowerWarehouseService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(TowerWarehouseParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(TowerWarehouseParam param); + + /** + * 根据id查询 + * + * @param warehouseId 自增ID + * @return TowerWarehouse + */ + TowerWarehouse getByIdRel(Integer warehouseId); + +} diff --git a/src/main/java/com/gxwebsoft/tower/service/impl/TowerAccessoryServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerAccessoryServiceImpl.java new file mode 100644 index 0000000..a48aa07 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/service/impl/TowerAccessoryServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.tower.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.tower.mapper.TowerAccessoryMapper; +import com.gxwebsoft.tower.service.TowerAccessoryService; +import com.gxwebsoft.tower.entity.TowerAccessory; +import com.gxwebsoft.tower.param.TowerAccessoryParam; +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-22 11:53:48 + */ +@Service +public class TowerAccessoryServiceImpl extends ServiceImpl implements TowerAccessoryService { + + @Override + public PageResult pageRel(TowerAccessoryParam 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(TowerAccessoryParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public TowerAccessory getByIdRel(Integer accessoryId) { + TowerAccessoryParam param = new TowerAccessoryParam(); + param.setAccessoryId(accessoryId); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/tower/service/impl/TowerEquipmentServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerEquipmentServiceImpl.java new file mode 100644 index 0000000..6555537 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/service/impl/TowerEquipmentServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.tower.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.tower.mapper.TowerEquipmentMapper; +import com.gxwebsoft.tower.service.TowerEquipmentService; +import com.gxwebsoft.tower.entity.TowerEquipment; +import com.gxwebsoft.tower.param.TowerEquipmentParam; +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-20 15:06:43 + */ +@Service +public class TowerEquipmentServiceImpl extends ServiceImpl implements TowerEquipmentService { + + @Override + public PageResult pageRel(TowerEquipmentParam 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(TowerEquipmentParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public TowerEquipment getByIdRel(Integer equipmentId) { + TowerEquipmentParam param = new TowerEquipmentParam(); + param.setEquipmentId(equipmentId); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/tower/service/impl/TowerModelServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerModelServiceImpl.java new file mode 100644 index 0000000..3bd109f --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/service/impl/TowerModelServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.tower.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.tower.mapper.TowerModelMapper; +import com.gxwebsoft.tower.service.TowerModelService; +import com.gxwebsoft.tower.entity.TowerModel; +import com.gxwebsoft.tower.param.TowerModelParam; +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-29 14:07:46 + */ +@Service +public class TowerModelServiceImpl extends ServiceImpl implements TowerModelService { + + @Override + public PageResult pageRel(TowerModelParam 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(TowerModelParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public TowerModel getByIdRel(Integer modelId) { + TowerModelParam param = new TowerModelParam(); + param.setModelId(modelId); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/tower/service/impl/TowerPlaceSafetyServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerPlaceSafetyServiceImpl.java new file mode 100644 index 0000000..481fd4a --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/service/impl/TowerPlaceSafetyServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.tower.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.tower.mapper.TowerPlaceSafetyMapper; +import com.gxwebsoft.tower.service.TowerPlaceSafetyService; +import com.gxwebsoft.tower.entity.TowerPlaceSafety; +import com.gxwebsoft.tower.param.TowerPlaceSafetyParam; +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-06-08 11:00:17 + */ +@Service +public class TowerPlaceSafetyServiceImpl extends ServiceImpl implements TowerPlaceSafetyService { + + @Override + public PageResult pageRel(TowerPlaceSafetyParam 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(TowerPlaceSafetyParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + //page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public TowerPlaceSafety getByIdRel(Integer placeSafetyId) { + TowerPlaceSafetyParam param = new TowerPlaceSafetyParam(); + param.setPlaceSafetyId(placeSafetyId); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/tower/service/impl/TowerPlaceServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerPlaceServiceImpl.java new file mode 100644 index 0000000..61ea96d --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/service/impl/TowerPlaceServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.tower.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.tower.mapper.TowerPlaceMapper; +import com.gxwebsoft.tower.service.TowerPlaceService; +import com.gxwebsoft.tower.entity.TowerPlace; +import com.gxwebsoft.tower.param.TowerPlaceParam; +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-06-08 11:00:17 + */ +@Service +public class TowerPlaceServiceImpl extends ServiceImpl implements TowerPlaceService { + + @Override + public PageResult pageRel(TowerPlaceParam 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(TowerPlaceParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + //page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public TowerPlace getByIdRel(Integer placeId) { + TowerPlaceParam param = new TowerPlaceParam(); + param.setPlaceId(placeId); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/tower/service/impl/TowerPlaceStandardServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerPlaceStandardServiceImpl.java new file mode 100644 index 0000000..9607273 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/service/impl/TowerPlaceStandardServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.tower.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.tower.mapper.TowerPlaceStandardMapper; +import com.gxwebsoft.tower.service.TowerPlaceStandardService; +import com.gxwebsoft.tower.entity.TowerPlaceStandard; +import com.gxwebsoft.tower.param.TowerPlaceStandardParam; +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-06-08 15:37:00 + */ +@Service +public class TowerPlaceStandardServiceImpl extends ServiceImpl implements TowerPlaceStandardService { + + @Override + public PageResult pageRel(TowerPlaceStandardParam 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(TowerPlaceStandardParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + //page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public TowerPlaceStandard getByIdRel(Integer id) { + TowerPlaceStandardParam param = new TowerPlaceStandardParam(); + param.setId(id); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/tower/service/impl/TowerProjectOrderServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerProjectOrderServiceImpl.java new file mode 100644 index 0000000..bcc29f4 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/service/impl/TowerProjectOrderServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.tower.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.tower.mapper.TowerProjectOrderMapper; +import com.gxwebsoft.tower.service.TowerProjectOrderService; +import com.gxwebsoft.tower.entity.TowerProjectOrder; +import com.gxwebsoft.tower.param.TowerProjectOrderParam; +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-06-07 18:48:56 + */ +@Service +public class TowerProjectOrderServiceImpl extends ServiceImpl implements TowerProjectOrderService { + + @Override + public PageResult pageRel(TowerProjectOrderParam 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(TowerProjectOrderParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + //page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public TowerProjectOrder getByIdRel(Integer projectOrderId) { + TowerProjectOrderParam param = new TowerProjectOrderParam(); + param.setProjectOrderId(projectOrderId); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/tower/service/impl/TowerProjectPlaceServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerProjectPlaceServiceImpl.java new file mode 100644 index 0000000..4555a61 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/service/impl/TowerProjectPlaceServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.tower.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.tower.mapper.TowerProjectPlaceMapper; +import com.gxwebsoft.tower.service.TowerProjectPlaceService; +import com.gxwebsoft.tower.entity.TowerProjectPlace; +import com.gxwebsoft.tower.param.TowerProjectPlaceParam; +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-06-08 17:22:55 + */ +@Service +public class TowerProjectPlaceServiceImpl extends ServiceImpl implements TowerProjectPlaceService { + + @Override + public PageResult pageRel(TowerProjectPlaceParam 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(TowerProjectPlaceParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public TowerProjectPlace getByIdRel(Integer id) { + TowerProjectPlaceParam param = new TowerProjectPlaceParam(); + param.setId(id); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/tower/service/impl/TowerProjectServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerProjectServiceImpl.java new file mode 100644 index 0000000..e2d4680 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/service/impl/TowerProjectServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.tower.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.tower.mapper.TowerProjectMapper; +import com.gxwebsoft.tower.service.TowerProjectService; +import com.gxwebsoft.tower.entity.TowerProject; +import com.gxwebsoft.tower.param.TowerProjectParam; +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-22 13:30:39 + */ +@Service +public class TowerProjectServiceImpl extends ServiceImpl implements TowerProjectService { + + @Override + public PageResult pageRel(TowerProjectParam 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(TowerProjectParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public TowerProject getByIdRel(Integer projectId) { + TowerProjectParam param = new TowerProjectParam(); + param.setProjectId(projectId); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/tower/service/impl/TowerProjectUserServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerProjectUserServiceImpl.java new file mode 100644 index 0000000..548f7ef --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/service/impl/TowerProjectUserServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.tower.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.tower.mapper.TowerProjectUserMapper; +import com.gxwebsoft.tower.service.TowerProjectUserService; +import com.gxwebsoft.tower.entity.TowerProjectUser; +import com.gxwebsoft.tower.param.TowerProjectUserParam; +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-06-07 15:00:32 + */ +@Service +public class TowerProjectUserServiceImpl extends ServiceImpl implements TowerProjectUserService { + + @Override + public PageResult pageRel(TowerProjectUserParam 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(TowerProjectUserParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public TowerProjectUser getByIdRel(Integer id) { + TowerProjectUserParam param = new TowerProjectUserParam(); + param.setId(id); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/tower/service/impl/TowerWarehouseServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerWarehouseServiceImpl.java new file mode 100644 index 0000000..984ffc9 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/service/impl/TowerWarehouseServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.tower.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.tower.mapper.TowerWarehouseMapper; +import com.gxwebsoft.tower.service.TowerWarehouseService; +import com.gxwebsoft.tower.entity.TowerWarehouse; +import com.gxwebsoft.tower.param.TowerWarehouseParam; +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-20 15:06:43 + */ +@Service +public class TowerWarehouseServiceImpl extends ServiceImpl implements TowerWarehouseService { + + @Override + public PageResult pageRel(TowerWarehouseParam 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(TowerWarehouseParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public TowerWarehouse getByIdRel(Integer warehouseId) { + TowerWarehouseParam param = new TowerWarehouseParam(); + param.setWarehouseId(warehouseId); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/qq/weixin/mp/aes/AesException.java b/src/main/java/com/qq/weixin/mp/aes/AesException.java new file mode 100644 index 0000000..868637e --- /dev/null +++ b/src/main/java/com/qq/weixin/mp/aes/AesException.java @@ -0,0 +1,59 @@ +package com.qq.weixin.mp.aes; + +@SuppressWarnings("serial") +public class AesException extends Exception { + + public final static int OK = 0; + public final static int ValidateSignatureError = -40001; + public final static int ParseJsonError = -40002; + public final static int ComputeSignatureError = -40003; + public final static int IllegalAesKey = -40004; + public final static int ValidateCorpidError = -40005; + public final static int EncryptAESError = -40006; + public final static int DecryptAESError = -40007; + public final static int IllegalBuffer = -40008; + public final static int EncodeBase64Error = -40009; + public final static int DecodeBase64Error = -40010; + public final static int GenReturnJsonError = -40011; + + private int code; + + private static String getMessage(int code) { + switch (code) { + case ValidateSignatureError: + return "签名验证错误"; + case ParseJsonError: + return "json解析失败"; + case ComputeSignatureError: + return "sha加密生成签名失败"; + case IllegalAesKey: + return "SymmetricKey非法"; + case ValidateCorpidError: + return "corpid校验失败"; + case EncryptAESError: + return "aes加密失败"; + case DecryptAESError: + return "aes解密失败"; + case IllegalBuffer: + return "解密后得到的buffer非法"; + case EncodeBase64Error: + return "base64加密错误"; + case DecodeBase64Error: + return "base64解密错误"; + case GenReturnJsonError: + return "josn生成失败"; + default: + return null; // cannot be + } + } + + public int getCode() { + return code; + } + + AesException(int code) { + super(getMessage(code)); + this.code = code; + } + +} diff --git a/src/main/java/com/qq/weixin/mp/aes/ByteGroup.java b/src/main/java/com/qq/weixin/mp/aes/ByteGroup.java new file mode 100644 index 0000000..6ba4330 --- /dev/null +++ b/src/main/java/com/qq/weixin/mp/aes/ByteGroup.java @@ -0,0 +1,26 @@ +package com.qq.weixin.mp.aes; + +import java.util.ArrayList; + +class ByteGroup { + ArrayList byteContainer = new ArrayList(); + + public byte[] toBytes() { + byte[] bytes = new byte[byteContainer.size()]; + for (int i = 0; i < byteContainer.size(); i++) { + bytes[i] = byteContainer.get(i); + } + return bytes; + } + + public ByteGroup addBytes(byte[] bytes) { + for (byte b : bytes) { + byteContainer.add(b); + } + return this; + } + + public int size() { + return byteContainer.size(); + } +} diff --git a/src/main/java/com/qq/weixin/mp/aes/JsonParse.java b/src/main/java/com/qq/weixin/mp/aes/JsonParse.java new file mode 100644 index 0000000..4a0f4ec --- /dev/null +++ b/src/main/java/com/qq/weixin/mp/aes/JsonParse.java @@ -0,0 +1,65 @@ +/** + * 对企业微信发送给企业后台的消息加解密示例代码. + * + * @copyright Copyright (c) 1998-2020 Tencent Inc. + */ + +// ------------------------------------------------------------------------ + +package com.qq.weixin.mp.aes; + +/** + * 针对 org.json.JSONObject, + * 要编译打包架包json + * 官方源码下载地址 : https://github.com/stleary/JSON-java, jar包下载地址 : https://mvnrepository.com/artifact/org.json/json + */ +import org.json.JSONObject; + + +/** + * JsonParse class + * + * 提供提取消息格式中的密文及生成回复消息格式的接口. + */ +class JsonParse { + + /** + * 提取出 JSON 包中的加密消息 + * @param jsontext 待提取的json字符串 + * @return 提取出的加密消息字符串 + * @throws AesException + */ + public static Object[] extract(String jsontext) throws AesException { + Object[] result = new Object[3]; + try { + + JSONObject json = new JSONObject(jsontext); + String encrypt_msg = json.getString("encrypt"); + String tousername = json.getString("tousername"); + String agentid = json.getString("agentid"); + + result[0] = tousername; + result[1] = encrypt_msg; + result[2] = agentid; + return result; + } catch (Exception e) { + e.printStackTrace(); + throw new AesException(AesException.ParseJsonError); + } + } + + /** + * 生成json消息 + * @param encrypt 加密后的消息密文 + * @param signature 安全签名 + * @param timestamp 时间戳 + * @param nonce 随机字符串 + * @return 生成的json字符串 + */ + public static String generate(String encrypt, String signature, String timestamp, String nonce) { + + String format = "{\"encrypt\":\"%1$s\",\"msgsignature\":\"%2$s\",\"timestamp\":\"%3$s\",\"nonce\":\"%4$s\"}"; + return String.format(format, encrypt, signature, timestamp, nonce); + + } +} diff --git a/src/main/java/com/qq/weixin/mp/aes/PKCS7Encoder.java b/src/main/java/com/qq/weixin/mp/aes/PKCS7Encoder.java new file mode 100644 index 0000000..f7ad49f --- /dev/null +++ b/src/main/java/com/qq/weixin/mp/aes/PKCS7Encoder.java @@ -0,0 +1,67 @@ +/** + * 对企业微信发送给企业后台的消息加解密示例代码. + * + * @copyright Copyright (c) 1998-2014 Tencent Inc. + */ + +// ------------------------------------------------------------------------ + +package com.qq.weixin.mp.aes; + +import java.nio.charset.Charset; +import java.util.Arrays; + +/** + * 提供基于PKCS7算法的加解密接口. + */ +class PKCS7Encoder { + static Charset CHARSET = Charset.forName("utf-8"); + static int BLOCK_SIZE = 32; + + /** + * 获得对明文进行补位填充的字节. + * + * @param count 需要进行填充补位操作的明文字节个数 + * @return 补齐用的字节数组 + */ + static byte[] encode(int count) { + // 计算需要填充的位数 + int amountToPad = BLOCK_SIZE - (count % BLOCK_SIZE); + if (amountToPad == 0) { + amountToPad = BLOCK_SIZE; + } + // 获得补位所用的字符 + char padChr = chr(amountToPad); + String tmp = new String(); + for (int index = 0; index < amountToPad; index++) { + tmp += padChr; + } + return tmp.getBytes(CHARSET); + } + + /** + * 删除解密后明文的补位字符 + * + * @param decrypted 解密后的明文 + * @return 删除补位字符后的明文 + */ + static byte[] decode(byte[] decrypted) { + int pad = (int) decrypted[decrypted.length - 1]; + if (pad < 1 || pad > 32) { + pad = 0; + } + return Arrays.copyOfRange(decrypted, 0, decrypted.length - pad); + } + + /** + * 将数字转化成ASCII码对应的字符，用于对明文进行补码 + * + * @param a 需要转化的数字 + * @return 转化得到的字符 + */ + static char chr(int a) { + byte target = (byte) (a & 0xFF); + return (char) target; + } + +} diff --git a/src/main/java/com/qq/weixin/mp/aes/SHA1.java b/src/main/java/com/qq/weixin/mp/aes/SHA1.java new file mode 100644 index 0000000..a6af45d --- /dev/null +++ b/src/main/java/com/qq/weixin/mp/aes/SHA1.java @@ -0,0 +1,61 @@ +/** + * 对企业微信发送给企业后台的消息加解密示例代码. + * + * @copyright Copyright (c) 1998-2014 Tencent Inc. + */ + +// ------------------------------------------------------------------------ + +package com.qq.weixin.mp.aes; + +import java.security.MessageDigest; +import java.util.Arrays; + +/** + * SHA1 class + * + * 计算消息签名接口. + */ +class SHA1 { + + /** + * 用SHA1算法生成安全签名 + * @param token 票据 + * @param timestamp 时间戳 + * @param nonce 随机字符串 + * @param encrypt 密文 + * @return 安全签名 + * @throws AesException + */ + public static String getSHA1(String token, String timestamp, String nonce, String encrypt) throws AesException + { + try { + String[] array = new String[] { token, timestamp, nonce, encrypt }; + StringBuffer sb = new StringBuffer(); + // 字符串排序 + Arrays.sort(array); + for (int i = 0; i < 4; i++) { + sb.append(array[i]); + } + String str = sb.toString(); + // SHA1签名生成 + MessageDigest md = MessageDigest.getInstance("SHA-1"); + md.update(str.getBytes()); + byte[] digest = md.digest(); + + StringBuffer hexstr = new StringBuffer(); + String shaHex = ""; + for (int i = 0; i < digest.length; i++) { + shaHex = Integer.toHexString(digest[i] & 0xFF); + if (shaHex.length() < 2) { + hexstr.append(0); + } + hexstr.append(shaHex); + } + return hexstr.toString(); + } catch (Exception e) { + e.printStackTrace(); + throw new AesException(AesException.ComputeSignatureError); + } + } +} diff --git a/src/main/java/com/qq/weixin/mp/aes/WXBizJsonMsgCrypt.java b/src/main/java/com/qq/weixin/mp/aes/WXBizJsonMsgCrypt.java new file mode 100644 index 0000000..74ef144 --- /dev/null +++ b/src/main/java/com/qq/weixin/mp/aes/WXBizJsonMsgCrypt.java @@ -0,0 +1,289 @@ +/** + * 对企业微信发送给企业后台的消息加解密示例代码. + * + * @copyright Copyright (c) 1998-2014 Tencent Inc. + */ + +// ------------------------------------------------------------------------ + +/** + * 针对org.apache.commons.codec.binary.Base64， + * 需要导入架包commons-codec-1.9（或commons-codec-1.8等其他版本） + * 官方下载地址：http://commons.apache.org/proper/commons-codec/download_codec.cgi + */ +package com.qq.weixin.mp.aes; + +import java.nio.charset.Charset; +import java.util.Arrays; +import java.util.Random; + +import javax.crypto.Cipher; +import javax.crypto.spec.IvParameterSpec; +import javax.crypto.spec.SecretKeySpec; + +import org.apache.commons.codec.binary.Base64; + +/** + * 提供接收和推送给企业微信消息的加解密接口(UTF8编码的字符串). + *
    + *
  1. 第三方回复加密消息给企业微信
    2. + *
  2. 第三方收到企业微信发送的消息，验证消息的安全性，并对消息进行解密。
    3. + *
+ * 说明：异常java.security.InvalidKeyException:illegal Key Size的解决方案 + *
    + *
  1. 在官方网站下载JCE无限制权限策略文件（JDK7的下载地址： + * http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html
    2. + *
  2. 下载后解压，可以看到local_policy.jar和US_export_policy.jar以及readme.txt
    3. + *
  3. 如果安装了JRE，将两个jar文件放到%JRE_HOME%\lib\security目录下覆盖原来的文件
    4. + *
  4. 如果安装了JDK，将两个jar文件放到%JDK_HOME%\jre\lib\security目录下覆盖原来文件
    5. + *
+ */ +public class WXBizJsonMsgCrypt { + static Charset CHARSET = Charset.forName("utf-8"); + Base64 base64 = new Base64(); + byte[] aesKey; + String token; + String receiveid; + + /** + * 构造函数 + * @param token 企业微信后台，开发者设置的token + * @param encodingAesKey 企业微信后台，开发者设置的EncodingAESKey + * @param receiveid, 不同场景含义不同，详见文档 + * + * @throws AesException 执行失败，请查看该异常的错误码和具体的错误信息 + */ + public WXBizJsonMsgCrypt(String token, String encodingAesKey, String receiveid) throws AesException { + if (encodingAesKey.length() != 43) { + throw new AesException(AesException.IllegalAesKey); + } + + this.token = token; + this.receiveid = receiveid; + aesKey = Base64.decodeBase64(encodingAesKey + "="); + } + + // 生成4个字节的网络字节序 + byte[] getNetworkBytesOrder(int sourceNumber) { + byte[] orderBytes = new byte[4]; + orderBytes[3] = (byte) (sourceNumber & 0xFF); + orderBytes[2] = (byte) (sourceNumber >> 8 & 0xFF); + orderBytes[1] = (byte) (sourceNumber >> 16 & 0xFF); + orderBytes[0] = (byte) (sourceNumber >> 24 & 0xFF); + return orderBytes; + } + + // 还原4个字节的网络字节序 + int recoverNetworkBytesOrder(byte[] orderBytes) { + int sourceNumber = 0; + for (int i = 0; i < 4; i++) { + sourceNumber <<= 8; + sourceNumber |= orderBytes[i] & 0xff; + } + return sourceNumber; + } + + // 随机生成16位字符串 + String getRandomStr() { + String base = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"; + Random random = new Random(); + StringBuffer sb = new StringBuffer(); + for (int i = 0; i < 16; i++) { + int number = random.nextInt(base.length()); + sb.append(base.charAt(number)); + } + return sb.toString(); + } + + /** + * 对明文进行加密. + * + * @param text 需要加密的明文 + * @return 加密后base64编码的字符串 + * @throws AesException aes加密失败 + */ + String encrypt(String randomStr, String text) throws AesException { + ByteGroup byteCollector = new ByteGroup(); + byte[] randomStrBytes = randomStr.getBytes(CHARSET); + byte[] textBytes = text.getBytes(CHARSET); + byte[] networkBytesOrder = getNetworkBytesOrder(textBytes.length); + byte[] receiveidBytes = receiveid.getBytes(CHARSET); + + // randomStr + networkBytesOrder + text + receiveid + byteCollector.addBytes(randomStrBytes); + byteCollector.addBytes(networkBytesOrder); + byteCollector.addBytes(textBytes); + byteCollector.addBytes(receiveidBytes); + + // ... + pad: 使用自定义的填充方式对明文进行补位填充 + byte[] padBytes = PKCS7Encoder.encode(byteCollector.size()); + byteCollector.addBytes(padBytes); + + // 获得最终的字节流, 未加密 + byte[] unencrypted = byteCollector.toBytes(); + + try { + // 设置加密模式为AES的CBC模式 + Cipher cipher = Cipher.getInstance("AES/CBC/NoPadding"); + SecretKeySpec keySpec = new SecretKeySpec(aesKey, "AES"); + IvParameterSpec iv = new IvParameterSpec(aesKey, 0, 16); + cipher.init(Cipher.ENCRYPT_MODE, keySpec, iv); + + // 加密 + byte[] encrypted = cipher.doFinal(unencrypted); + + // 使用BASE64对加密后的字符串进行编码 + String base64Encrypted = base64.encodeToString(encrypted); + + return base64Encrypted; + } catch (Exception e) { + e.printStackTrace(); + throw new AesException(AesException.EncryptAESError); + } + } + + /** + * 对密文进行解密. + * + * @param text 需要解密的密文 + * @return 解密得到的明文 + * @throws AesException aes解密失败 + */ + String decrypt(String text) throws AesException { + byte[] original; + try { + // 设置解密模式为AES的CBC模式 + Cipher cipher = Cipher.getInstance("AES/CBC/NoPadding"); + SecretKeySpec key_spec = new SecretKeySpec(aesKey, "AES"); + IvParameterSpec iv = new IvParameterSpec(Arrays.copyOfRange(aesKey, 0, 16)); + cipher.init(Cipher.DECRYPT_MODE, key_spec, iv); + + // 使用BASE64对密文进行解码 + byte[] encrypted = Base64.decodeBase64(text); + + // 解密 + original = cipher.doFinal(encrypted); + } catch (Exception e) { + e.printStackTrace(); + throw new AesException(AesException.DecryptAESError); + } + + String jsonContent, from_receiveid; + try { + // 去除补位字符 + byte[] bytes = PKCS7Encoder.decode(original); + + // 分离16位随机字符串,网络字节序和receiveid + byte[] networkOrder = Arrays.copyOfRange(bytes, 16, 20); + + int jsonLength = recoverNetworkBytesOrder(networkOrder); + + jsonContent = new String(Arrays.copyOfRange(bytes, 20, 20 + jsonLength), CHARSET); + from_receiveid = new String(Arrays.copyOfRange(bytes, 20 + jsonLength, bytes.length), + CHARSET); + } catch (Exception e) { + e.printStackTrace(); + throw new AesException(AesException.IllegalBuffer); + } + + // receiveid不相同的情况 + if (!from_receiveid.equals(receiveid)) { + throw new AesException(AesException.ValidateCorpidError); + } + return jsonContent; + + } + + /** + * 将企业微信回复用户的消息加密打包. + *
    + *
  1. 对要发送的消息进行AES-CBC加密
    2. + *
  2. 生成安全签名
    3. + *
  3. 将消息密文和安全签名打包成json格式
    4. + *
+ * + * @param replyMsg 企业微信待回复用户的消息，json格式的字符串 + * @param timeStamp 时间戳，可以自己生成，也可以用URL参数的timestamp + * @param nonce 随机串，可以自己生成，也可以用URL参数的nonce + * + * @return 加密后的可以直接回复用户的密文，包括msg_signature, timestamp, nonce, encrypt的json格式的字符串 + * @throws AesException 执行失败，请查看该异常的错误码和具体的错误信息 + */ + public String EncryptMsg(String replyMsg, String timeStamp, String nonce) throws AesException { + // 加密 + String encrypt = encrypt(getRandomStr(), replyMsg); + + // 生成安全签名 + if (timeStamp == "") { + timeStamp = Long.toString(System.currentTimeMillis()); + } + + String signature = SHA1.getSHA1(token, timeStamp, nonce, encrypt); + + // System.out.println("发送给平台的签名是: " + signature[1].toString()); + // 生成发送的json + String result = JsonParse.generate(encrypt, signature, timeStamp, nonce); + return result; + } + + /** + * 检验消息的真实性，并且获取解密后的明文. + *
    + *
  1. 利用收到的密文生成安全签名，进行签名验证
    2. + *
  2. 若验证通过，则提取json中的加密消息
    3. + *
  3. 对消息进行解密
    4. + *
+ * + * @param msgSignature 签名串，对应URL参数的msg_signature + * @param timeStamp 时间戳，对应URL参数的timestamp + * @param nonce 随机串，对应URL参数的nonce + * @param postData 密文，对应POST请求的数据 + * + * @return 解密后的原文 + * @throws AesException 执行失败，请查看该异常的错误码和具体的错误信息 + */ + public String DecryptMsg(String msgSignature, String timeStamp, String nonce, String postData) + throws AesException { + + // 密钥，公众账号的app secret + // 提取密文 + Object[] encrypt = JsonParse.extract(postData); + + // 验证安全签名 + String signature = SHA1.getSHA1(token, timeStamp, nonce, encrypt[1].toString()); + + // 和URL中的签名比较是否相等 + // System.out.println("第三方收到URL中的签名：" + msg_sign); + // System.out.println("第三方校验签名：" + signature); + if (!signature.equals(msgSignature)) { + throw new AesException(AesException.ValidateSignatureError); + } + + // 解密 + String result = decrypt(encrypt[1].toString()); + return result; + } + + /** + * 验证URL + * @param msgSignature 签名串，对应URL参数的msg_signature + * @param timeStamp 时间戳，对应URL参数的timestamp + * @param nonce 随机串，对应URL参数的nonce + * @param echoStr 随机串，对应URL参数的echostr + * + * @return 解密之后的echostr + * @throws AesException 执行失败，请查看该异常的错误码和具体的错误信息 + */ + public String VerifyURL(String msgSignature, String timeStamp, String nonce, String echoStr) + throws AesException { + String signature = SHA1.getSHA1(token, timeStamp, nonce, echoStr); + + if (!signature.equals(msgSignature)) { + throw new AesException(AesException.ValidateSignatureError); + } + + String result = decrypt(echoStr); + return result; + } + +} diff --git a/src/main/java/lib/commons-codec-1.9.jar b/src/main/java/lib/commons-codec-1.9.jar new file mode 100644 index 0000000000000000000000000000000000000000..ef35f1c50d7c41278bc31f4b9fcfc8fbd708d55d GIT binary patch literal 263965 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 literal 0 HcmV?d00001 diff --git a/src/main/java/lib/json-20200518.jar b/src/main/java/lib/json-20200518.jar new file mode 100644 index 0000000000000000000000000000000000000000..0b85b0ee713f85785239da640579469c15b16277 GIT binary patch literal 65966 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 map = new HashMap<>(); +// map.put("name","李四"); +// map.put("phone","13800138001"); +// HashMap map2 = new HashMap<>(); +// map2.put("name","赵六"); +// map2.put("phone","13800138001"); +// HashMap map3 = new HashMap<>(); +// map3.put("name","张三"); +// map3.put("phone","13800138001"); +// stringRedisTemplate.opsForSet().add("test:set:2", JSONUtil.toJSONString(map),JSONUtil.toJSONString(map2),JSONUtil.toJSONString(map3)); +// } +} diff --git a/src/test/java/com/gxwebsoft/TestMain.java b/src/test/java/com/gxwebsoft/TestMain.java new file mode 100644 index 0000000..4bed4ab --- /dev/null +++ b/src/test/java/com/gxwebsoft/TestMain.java @@ -0,0 +1,283 @@ +package com.gxwebsoft; + +import com.gxwebsoft.apps.service.HualalaService; +import com.gxwebsoft.apps.service.TestDataService; +import com.gxwebsoft.common.system.mapper.RoleMapper; +import com.gxwebsoft.common.system.mapper.UserMapper; +import com.gxwebsoft.common.system.service.SettingService; +import com.gxwebsoft.common.system.service.UserService; +import com.gxwebsoft.love.service.CertificateService; +import com.gxwebsoft.shop.mapper.OrderGoodsMapper; +import com.gxwebsoft.shop.mapper.OrderMapper; +import com.gxwebsoft.shop.service.OrderService; +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.data.redis.core.StringRedisTemplate; + +import javax.annotation.Resource; +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; + +/** + * Created by WebSoft on 2020-03-23 23:37 + */ +@SpringBootTest +public class TestMain { + @Resource + private StringRedisTemplate stringRedisTemplate; + @Resource + private OrderService orderService; + @Resource + private OrderGoodsMapper orderGoodsMapper; + @Resource + private OrderMapper orderMapper; + @Resource + private TestDataService testDataService; + @Resource + private HualalaService hualalaService; + @Resource + private SettingService settingService; + @Resource + private UserService userService; + @Resource + private UserMapper userMapper; + @Resource + private RoleMapper roleMapper; + + @Resource + private CertificateService certificateService; + + /** + * 生成唯一的key用于jwt工具类 + */ +// @Test +// public void testGenJwtKey() { +// System.out.println(JwtUtil.encodeKey(JwtUtil.randomKey())); +// } + + /** + * 生成加密后的登录密码 + * @return + */ + @Test + public void testEncodePassword() throws UnsupportedEncodingException { +// DateTime date = DateUtil.date(); +// System.out.println("date = " + date); +// final String today = DateUtil.today(); +// System.out.println("today = " + today); +// final DateTime dateTime = DateUtil.beginOfDay(date); +// System.out.println("dateTime = " + dateTime); +// System.out.println(new BCryptPasswordEncoder().encode("admin")); + String encodedReturnUrl = URLEncoder.encode("https://server.gxwebsoft.com/api/open/wx-work/saveAccessToken","UTF-8"); +// System.out.println("encodedReturnUrl = " + encodedReturnUrl); +// System.out.println("encodedReturnUrl = " + encodedReturnUrl); +// log.info("生成加密后的登录密码:" + encodedReturnUrl); + } + +// @Test +// public void test3() { +// String key = "test:user:10"; +// HashMap map = new HashMap<>(); +// map.put("name", "科技小王子"); +// map.put("sex", "男"); +// map.put("phone", "13737128880"); +// map.put("money", "238585.215"); +// stringRedisTemplate.opsForHash().putAll(key, map); +// } + +// OrderParam param = new OrderParam(); +// param.setPayStatus(30); +// param.setOrderNo("202303118310602"); +// final List all = orderMapper.getAll(param); +// System.out.println("all = " + all); +// OrderParam param = new OrderParam(); +// param.setOrderNo("2023031181184283"); +// param.setPayStatus(20); +// boolean b = orderMapper.updatePayStatus(param); +// System.out.println("b = " + b); + +// Order order = orderService.getByOutTradeNo("20230301761610059"); +// OrderParam orderParam = new OrderParam(); +// orderParam.setPayStatus(20); +// orderParam.setOrderNo("20230301761610059"); +// orderMapper.updatePayStatus(orderParam); +// System.out.println("order = " + order); +// Order order = new Order(); +// order.setOrderId(400); +// order.setComments("sdfsdfsdfs"); +// +// boolean update = orderService.lambdaUpdate() +// .eq(Order::getOrderId, order.getOrderId()) +// .update(order); +// System.out.println("update = " + update); + +// OrderParam param = new OrderParam(); +// param.setOrderNo("20230301761610059"); +// Order order = orderService.getByOutTradeNo("20230301761610059"); +// System.out.println("order = " + order); +// final int i = orderMapper.updateById(order); +// System.out.println("i = " + i); + + +// final Order one = param.getOne(orderMapper.getOne(param)); +// one.setTotalPrice(new BigDecimal("2.22")); +// one.setPayStatus(20); +// orderMapper.updateById(one); +// System.out.println("one = " + one); +// Order order = orderService.getByOutTradeNo("20230301761610059"); +// order.setPayStatus(20); +// order.setTotalPrice(new BigDecimal("1.11")); +// if (orderService.updateById(order)) { +// System.out.println("成功"); +// } + +// @Test +// public void test() { +// final TestData testData = new TestData(); +// testData.setTitle("测试"); +// testData.setContent("内容..."); +// testData.setTenantId(10); +// testDataService.save(testData); + +// final boolean b = testDataService.removeById(2496); + +// } + +// @Test +// public void query() { +// HashMap params = new HashMap<>(); +// params.put("shopID", Long.valueOf("76230180")); +// JSONObject response = hualalaService.doPost("/doc/getPaySubject", params); +// System.out.println("response = " + response); +// } + + // 推送订单到哗啦啦 +// @Test +// public void pushOrder(){ +// Order orderInfo = orderService.getByOutTradeNo("202303118345835"); +// final List goodsInfo = orderGoodsMapper.selectByOrderId(orderInfo.getOrderId()); +// System.out.println("orderInfo = " + orderInfo); +// System.out.println("goodsInfo = " + goodsInfo); +// // 菜品信息 +// ArrayList orderItem = new ArrayList<>(); +// JSONObject item = new JSONObject(); +// item.put("foodID",603798638); +// item.put("foodName","肉汁煲霜打萝卜."); +// item.put("foodUnit","份"); +// item.put("foodUnitID","1748099318"); +// item.put("isSetFood",0); +// item.put("isBatching",0); +// item.put("foodCount",1); +// item.put("originPrice","100"); +// item.put("takeoutPackagingFee","1"); +// item.put("isDiscount",0); +// item.put("duePrice","1"); +// orderItem.add(item); +// // 支付信息 +// ArrayList payInfo = new ArrayList<>(); +// JSONObject payItem = new JSONObject(); +// payItem.put("paymentSubjectID",Long.valueOf("51010440")); +// payItem.put("paymentSubjectName","微信小程序实收"); +// payItem.put("dueAmount","1"); +// payItem.put("paymentStatus",20); +// payItem.put("payWay",70); +// payInfo.add(payItem); +// +// // 订单信息 +// JSONObject order = new JSONObject(); +// order.put("orderSubType",20); +// order.put("orderStatus",20); +// order.put("discountTotalAmount","1"); +// order.put("dinners",1); +// // 期望送达时间 +// SimpleDateFormat sdf1 = new SimpleDateFormat("yyyyMMddHHmm"); +// order.put("orderTime",sdf1.format(orderInfo.getCreateTime())); +// order.put("orderItem",orderItem); +// order.put("takeoutAddress","外送地址:"); +// order.put("deliveryAmount","0"); +// order.put("serviceAmount","0"); +// order.put("channelKey","399_weixin"); +// order.put("isAlreadyPaid","1"); +// order.put("orderMode",1); +// order.put("OrderRemark",""); +// order.put("payment",payInfo); +// +// HashMap params = new HashMap<>(); +// params.put("shopID",Long.valueOf("76230180")); +// params.put("isCheackOut",0); +// params.put("isThirdPay",2); +// params.put("bankCode","weChat"); +// params.put("order",order); +// params.put("isSentMsg",1); +// params.put("msgType",120); +// params.put("thirdOrderID",orderInfo.getOrderNo()); +// +//// JSONObject response = hualalaService.doPost("/order/submitordernew", params); +//// System.out.println("response = " + response); +// } + + +// @Test +// public void chat() { +// +// String endpoint = "https://api.openai.com/v1/engines/davinci-codex/completions"; +// String apiKey = "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"; +// +// +// // 构建请求 +// HttpRequest request = HttpRequest.get("https://api.openai.com/v1/engines/davinci-codex/completions") +// .header("Authorization", "Bearer ".concat(apiKey)); +// +// // 发送请求并获取响应 +// HttpResponse response = request.execute(); +// +// // 处理响应结果 +// int statusCode = response.getStatus(); +// String body = response.body(); +// System.out.println("body = " + body); +// } + + +// @Test +// public void chatGPT() { +// String abc = "{\"finish_reason\":\"stop\",\"index\":0,\"message\":{\"role\":\"assistant\",\"content\":\"您好！有什么我能为您效劳的吗？\"}}"; +// final JSONObject jsonObject = JSONObject.parseObject(abc); +// final String message = jsonObject.getString("message"); +// System.out.println("message = " + message); +// final JSONObject jsonObject1 = JSONObject.parseObject(message); +// final String content = jsonObject1.getString("content"); +// System.out.println("content = " + content); +// } + + +// 自定义参数，这部分是Hutool工具封装的 +// @Test +// public void initQrConfig() { +// // 生成指定url对应的二维码到文件，宽和高都是300像素 +// QrCodeUtil.generate("https://hutool.cn/", 300, 300, FileUtil.file("/Users/gxwebsoft/Documents/uploads/qrcode.jpg")); +// } + + + @Test + public void allIdCard() { +// List users = userService.list(new QueryWrapper<>()); +// System.out.println(users.size()); +// List certificateList = new ArrayList<>(); +// for (User user : users) { +// Certificate certificate = new Certificate(); +// certificate.setFullName("xxx"); +// certificate.setCertificateCode("XXX"); +// certificate.setCertificateType("idCard"); +// certificate.setExpirationTime(LocalDateTime.now()); +// certificate.setAuthentication(1); +// certificate.setUserId(user.getUserId()); +// certificate.setTenantId(10053); +// certificateService.save(certificate); +// } + + } + + + public void setProfile(){ + } +} diff --git a/src/test/java/com/gxwebsoft/WebSoftApplicationTests.java b/src/test/java/com/gxwebsoft/WebSoftApplicationTests.java new file mode 100644 index 0000000..5a024f5 --- /dev/null +++ b/src/test/java/com/gxwebsoft/WebSoftApplicationTests.java @@ -0,0 +1,13 @@ +package com.gxwebsoft; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +public class WebSoftApplicationTests { + + @Test + public void contextLoads() { + } + +} diff --git a/src/test/java/com/gxwebsoft/generator/AppsGenerator.java b/src/test/java/com/gxwebsoft/generator/AppsGenerator.java new file mode 100644 index 0000000..d120443 --- /dev/null +++ b/src/test/java/com/gxwebsoft/generator/AppsGenerator.java @@ -0,0 +1,189 @@ +package com.gxwebsoft.generator; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.core.toolkit.StringPool; +import com.baomidou.mybatisplus.generator.AutoGenerator; +import com.baomidou.mybatisplus.generator.InjectionConfig; +import com.baomidou.mybatisplus.generator.config.*; +import com.baomidou.mybatisplus.generator.config.po.TableInfo; +import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy; +import com.gxwebsoft.generator.engine.BeetlTemplateEnginePlus; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * 代码生成工具 + * + * @author WebSoft + * @since 2021-09-05 00:31:14 + */ +public class AppsGenerator { + // 输出位置 + private static final String OUTPUT_LOCATION = System.getProperty("user.dir"); + //private static final String OUTPUT_LOCATION = "D:/codegen"; // 不想生成到项目中可以写磁盘路径 + // 输出目录 + private static final String OUTPUT_DIR = "/src/main/java"; + // 作者名称 + private static final String AUTHOR = "科技小王子"; + // 是否在xml中添加二级缓存配置 + private static final boolean ENABLE_CACHE = false; + // 数据库连接配置 + private static final String DB_URL = "jdbc:mysql://47.119.165.234:3308/com_gxwebsoft_oa?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8"; + private static final String DB_DRIVER = "com.mysql.cj.jdbc.Driver"; + private static final String DB_USERNAME = "com_gxwebsoft_oa"; + private static final String DB_PASSWORD = "EZfW2R4YiWfbLHLw"; + // 包名 + private static final String PACKAGE_NAME = "com.gxwebsoft"; + // 模块名 + private static final String MODULE_NAME = "apps"; + // 需要生成的表 + private static final String[] TABLE_NAMES = new String[]{ +// "apps_equipment", +// "apps_equipment_fault", +// "apps_equipment_alarm", +// "apps_equipment_record" +// "apps_equipment_order" +// "apps_cashier", +// "apps_hualala_card", +// "apps_hualala_card_benefits", +// "apps_hualala_food", +// "apps_hualala_shop", +// "apps_hualala_cart_food", +// "apps_hualala_food_category", +// "apps_test_data", +// "apps_link", +// "apps_bc_agent", +// "apps_bc_temporary", +// "apps_link", +// "apps_bc_plan", +// "apps_bc_food", +// "apps_bc_equipment", +// "apps_bc_cookbook" + "apps_bc_export" +// "apps_equipment_order_goods" + + }; + // 需要去除的表前缀 + private static final String[] TABLE_PREFIX = new String[]{ + "apps_", + "tb_" + }; + // 不需要作为查询参数的字段 + private static final String[] PARAM_EXCLUDE_FIELDS = new String[]{ + "tenant_id", + "create_time", + "update_time" + }; + // 查询参数使用String的类型 + private static final String[] PARAM_TO_STRING_TYPE = new String[]{ + "Date", + "LocalDate", + "LocalTime", + "LocalDateTime" + }; + // 查询参数使用EQ的类型 + private static final String[] PARAM_EQ_TYPE = new String[]{ + "Integer", + "Boolean", + "BigDecimal" + }; + // 是否添加权限注解 + private static final boolean AUTH_ANNOTATION = true; + // 是否添加日志注解 + private static final boolean LOG_ANNOTATION = true; + // controller的mapping前缀 + private static final String CONTROLLER_MAPPING_PREFIX = "/api"; + // 模板所在位置 + private static final String TEMPLATES_DIR = "/src/test/java/com/gxwebsoft/generator/templates"; + + public static void main(String[] args) { + // 代码生成器 + AutoGenerator mpg = new AutoGenerator(); + + // 全局配置 + GlobalConfig gc = new GlobalConfig(); + gc.setOutputDir(OUTPUT_LOCATION + OUTPUT_DIR); + gc.setAuthor(AUTHOR); + gc.setOpen(false); + gc.setFileOverride(true); + gc.setEnableCache(ENABLE_CACHE); + gc.setSwagger2(true); + gc.setIdType(IdType.AUTO); + gc.setServiceName("%sService"); + mpg.setGlobalConfig(gc); + + // 数据源配置 + DataSourceConfig dsc = new DataSourceConfig(); + dsc.setUrl(DB_URL); + // dsc.setSchemaName("public"); + dsc.setDriverName(DB_DRIVER); + dsc.setUsername(DB_USERNAME); + dsc.setPassword(DB_PASSWORD); + mpg.setDataSource(dsc); + + // 包配置 + PackageConfig pc = new PackageConfig(); + pc.setModuleName(MODULE_NAME); + pc.setParent(PACKAGE_NAME); + mpg.setPackageInfo(pc); + + // 策略配置 + StrategyConfig strategy = new StrategyConfig(); + strategy.setNaming(NamingStrategy.underline_to_camel); + strategy.setColumnNaming(NamingStrategy.underline_to_camel); + strategy.setInclude(TABLE_NAMES); + strategy.setTablePrefix(TABLE_PREFIX); + strategy.setSuperControllerClass(PACKAGE_NAME + ".common.core.web.BaseController"); + strategy.setEntityLombokModel(true); + strategy.setRestControllerStyle(true); + strategy.setControllerMappingHyphenStyle(true); + strategy.setLogicDeleteFieldName("deleted"); + mpg.setStrategy(strategy); + + // 模板配置 + TemplateConfig templateConfig = new TemplateConfig(); + templateConfig.setController(TEMPLATES_DIR + "/controller.java"); + templateConfig.setEntity(TEMPLATES_DIR + "/entity.java"); + templateConfig.setMapper(TEMPLATES_DIR + "/mapper.java"); + templateConfig.setXml(TEMPLATES_DIR + "/mapper.xml"); + templateConfig.setService(TEMPLATES_DIR + "/service.java"); + templateConfig.setServiceImpl(TEMPLATES_DIR + "/serviceImpl.java"); + mpg.setTemplate(templateConfig); + mpg.setTemplateEngine(new BeetlTemplateEnginePlus()); + + // 自定义模板配置 + InjectionConfig cfg = new InjectionConfig() { + @Override + public void initMap() { + Map map = new HashMap<>(); + map.put("packageName", PACKAGE_NAME); + map.put("paramExcludeFields", PARAM_EXCLUDE_FIELDS); + map.put("paramToStringType", PARAM_TO_STRING_TYPE); + map.put("paramEqType", PARAM_EQ_TYPE); + map.put("authAnnotation", AUTH_ANNOTATION); + map.put("logAnnotation", LOG_ANNOTATION); + map.put("controllerMappingPrefix", CONTROLLER_MAPPING_PREFIX); + this.setMap(map); + } + }; + String templatePath = TEMPLATES_DIR + "/param.java.btl"; + List focList = new ArrayList<>(); + focList.add(new FileOutConfig(templatePath) { + @Override + public String outputFile(TableInfo tableInfo) { + return OUTPUT_LOCATION + OUTPUT_DIR + "/" + + PACKAGE_NAME.replace(".", "/") + + "/" + pc.getModuleName() + "/param/" + + tableInfo.getEntityName() + "Param" + StringPool.DOT_JAVA; + } + }); + cfg.setFileOutConfigList(focList); + mpg.setCfg(cfg); + + mpg.execute(); + } + +} diff --git a/src/test/java/com/gxwebsoft/generator/CmsGenerator.java b/src/test/java/com/gxwebsoft/generator/CmsGenerator.java new file mode 100644 index 0000000..0aad1da0 --- /dev/null +++ b/src/test/java/com/gxwebsoft/generator/CmsGenerator.java @@ -0,0 +1,178 @@ +package com.gxwebsoft.generator; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.core.toolkit.StringPool; +import com.baomidou.mybatisplus.generator.AutoGenerator; +import com.baomidou.mybatisplus.generator.InjectionConfig; +import com.baomidou.mybatisplus.generator.config.*; +import com.baomidou.mybatisplus.generator.config.po.TableInfo; +import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy; +import com.gxwebsoft.generator.engine.BeetlTemplateEnginePlus; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * 代码生成工具 + * + * @author WebSoft + * @since 2021-09-05 00:31:14 + */ +public class CmsGenerator { + // 输出位置 + private static final String OUTPUT_LOCATION = System.getProperty("user.dir"); + //private static final String OUTPUT_LOCATION = "D:/codegen"; // 不想生成到项目中可以写磁盘路径 + // 输出目录 + private static final String OUTPUT_DIR = "/src/main/java"; + // 作者名称 + private static final String AUTHOR = "科技小王子"; + // 是否在xml中添加二级缓存配置 + private static final boolean ENABLE_CACHE = false; + // 数据库连接配置 + private static final String DB_URL = "jdbc:mysql://47.119.165.234:3308/com_gxwebsoft_oa?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8"; + private static final String DB_DRIVER = "com.mysql.cj.jdbc.Driver"; + private static final String DB_USERNAME = "com_gxwebsoft_oa"; + private static final String DB_PASSWORD = "EZfW2R4YiWfbLHLw"; + // 包名 + private static final String PACKAGE_NAME = "com.gxwebsoft"; + // 模块名 + private static final String MODULE_NAME = "cms"; + // 需要生成的表 + private static final String[] TABLE_NAMES = new String[]{ +// "cms_article", +// "cms_article_category", +// "cms_article_like", + "cms_article_comment", +// "cms_docs", +// "cms_docs", +// "cms_docs", +// "cms_docs", +// "cms_docs", +// "cms_docs", +// "cms_docs", +// "cms_docs", +// "cms_docs", + }; + // 需要去除的表前缀 + private static final String[] TABLE_PREFIX = new String[]{ + "cms_", + "tb_" + }; + // 不需要作为查询参数的字段 + private static final String[] PARAM_EXCLUDE_FIELDS = new String[]{ + "tenant_id", + "create_time", + "update_time" + }; + // 查询参数使用String的类型 + private static final String[] PARAM_TO_STRING_TYPE = new String[]{ + "Date", + "LocalDate", + "LocalTime", + "LocalDateTime" + }; + // 查询参数使用EQ的类型 + private static final String[] PARAM_EQ_TYPE = new String[]{ + "Integer", + "Boolean", + "BigDecimal" + }; + // 是否添加权限注解 + private static final boolean AUTH_ANNOTATION = true; + // 是否添加日志注解 + private static final boolean LOG_ANNOTATION = true; + // controller的mapping前缀 + private static final String CONTROLLER_MAPPING_PREFIX = "/api"; + // 模板所在位置 + private static final String TEMPLATES_DIR = "/src/test/java/com/gxwebsoft/generator/templates"; + + public static void main(String[] args) { + // 代码生成器 + AutoGenerator mpg = new AutoGenerator(); + + // 全局配置 + GlobalConfig gc = new GlobalConfig(); + gc.setOutputDir(OUTPUT_LOCATION + OUTPUT_DIR); + gc.setAuthor(AUTHOR); + gc.setOpen(false); + gc.setFileOverride(true); + gc.setEnableCache(ENABLE_CACHE); + gc.setSwagger2(true); + gc.setIdType(IdType.AUTO); + gc.setServiceName("%sService"); + mpg.setGlobalConfig(gc); + + // 数据源配置 + DataSourceConfig dsc = new DataSourceConfig(); + dsc.setUrl(DB_URL); + // dsc.setSchemaName("public"); + dsc.setDriverName(DB_DRIVER); + dsc.setUsername(DB_USERNAME); + dsc.setPassword(DB_PASSWORD); + mpg.setDataSource(dsc); + + // 包配置 + PackageConfig pc = new PackageConfig(); + pc.setModuleName(MODULE_NAME); + pc.setParent(PACKAGE_NAME); + mpg.setPackageInfo(pc); + + // 策略配置 + StrategyConfig strategy = new StrategyConfig(); + strategy.setNaming(NamingStrategy.underline_to_camel); + strategy.setColumnNaming(NamingStrategy.underline_to_camel); + strategy.setInclude(TABLE_NAMES); + strategy.setTablePrefix(TABLE_PREFIX); + strategy.setSuperControllerClass(PACKAGE_NAME + ".common.core.web.BaseController"); + strategy.setEntityLombokModel(true); + strategy.setRestControllerStyle(true); + strategy.setControllerMappingHyphenStyle(true); + strategy.setLogicDeleteFieldName("deleted"); + mpg.setStrategy(strategy); + + // 模板配置 + TemplateConfig templateConfig = new TemplateConfig(); + templateConfig.setController(TEMPLATES_DIR + "/controller.java"); + templateConfig.setEntity(TEMPLATES_DIR + "/entity.java"); + templateConfig.setMapper(TEMPLATES_DIR + "/mapper.java"); + templateConfig.setXml(TEMPLATES_DIR + "/mapper.xml"); + templateConfig.setService(TEMPLATES_DIR + "/service.java"); + templateConfig.setServiceImpl(TEMPLATES_DIR + "/serviceImpl.java"); + mpg.setTemplate(templateConfig); + mpg.setTemplateEngine(new BeetlTemplateEnginePlus()); + + // 自定义模板配置 + InjectionConfig cfg = new InjectionConfig() { + @Override + public void initMap() { + Map map = new HashMap<>(); + map.put("packageName", PACKAGE_NAME); + map.put("paramExcludeFields", PARAM_EXCLUDE_FIELDS); + map.put("paramToStringType", PARAM_TO_STRING_TYPE); + map.put("paramEqType", PARAM_EQ_TYPE); + map.put("authAnnotation", AUTH_ANNOTATION); + map.put("logAnnotation", LOG_ANNOTATION); + map.put("controllerMappingPrefix", CONTROLLER_MAPPING_PREFIX); + this.setMap(map); + } + }; + String templatePath = TEMPLATES_DIR + "/param.java.btl"; + List focList = new ArrayList<>(); + focList.add(new FileOutConfig(templatePath) { + @Override + public String outputFile(TableInfo tableInfo) { + return OUTPUT_LOCATION + OUTPUT_DIR + "/" + + PACKAGE_NAME.replace(".", "/") + + "/" + pc.getModuleName() + "/param/" + + tableInfo.getEntityName() + "Param" + StringPool.DOT_JAVA; + } + }); + cfg.setFileOutConfigList(focList); + mpg.setCfg(cfg); + + mpg.execute(); + } + +} diff --git a/src/test/java/com/gxwebsoft/generator/CodeGenerator.java b/src/test/java/com/gxwebsoft/generator/CodeGenerator.java new file mode 100644 index 0000000..c3cc75a --- /dev/null +++ b/src/test/java/com/gxwebsoft/generator/CodeGenerator.java @@ -0,0 +1,167 @@ +package com.gxwebsoft.generator; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.core.toolkit.StringPool; +import com.baomidou.mybatisplus.generator.AutoGenerator; +import com.baomidou.mybatisplus.generator.InjectionConfig; +import com.baomidou.mybatisplus.generator.config.*; +import com.baomidou.mybatisplus.generator.config.po.TableInfo; +import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy; +import com.gxwebsoft.generator.engine.BeetlTemplateEnginePlus; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * 代码生成工具 + * + * @author WebSoft + * @since 2021-09-05 00:31:14 + */ +public class CodeGenerator { + // 输出位置 + private static final String OUTPUT_LOCATION = System.getProperty("user.dir"); + //private static final String OUTPUT_LOCATION = "D:/codegen"; // 不想生成到项目中可以写磁盘路径 + // 输出目录 + private static final String OUTPUT_DIR = "/src/main/java"; + // 作者名称 + private static final String AUTHOR = "WebSoft"; + // 是否在xml中添加二级缓存配置 + private static final boolean ENABLE_CACHE = false; + // 数据库连接配置 + private static final String DB_URL = "jdbc:mysql://localhost:3306/websoft-api?useUnicode=true&useSSL=false&characterEncoding=utf8"; + private static final String DB_DRIVER = "com.mysql.cj.jdbc.Driver"; + private static final String DB_USERNAME = "root"; + private static final String DB_PASSWORD = "123456"; + // 包名 + private static final String PACKAGE_NAME = "com.gxwebsoft"; + // 模块名 + private static final String MODULE_NAME = "test"; + // 需要生成的表 + private static final String[] TABLE_NAMES = new String[]{ + "sys_user", + "sys_role" + }; + // 需要去除的表前缀 + private static final String[] TABLE_PREFIX = new String[]{ + "sys_", + "tb_" + }; + // 不需要作为查询参数的字段 + private static final String[] PARAM_EXCLUDE_FIELDS = new String[]{ + "tenant_id", + "create_time", + "update_time" + }; + // 查询参数使用String的类型 + private static final String[] PARAM_TO_STRING_TYPE = new String[]{ + "Date", + "LocalDate", + "LocalTime", + "LocalDateTime" + }; + // 查询参数使用EQ的类型 + private static final String[] PARAM_EQ_TYPE = new String[]{ + "Integer", + "Boolean", + "BigDecimal" + }; + // 是否添加权限注解 + private static final boolean AUTH_ANNOTATION = true; + // 是否添加日志注解 + private static final boolean LOG_ANNOTATION = true; + // controller的mapping前缀 + private static final String CONTROLLER_MAPPING_PREFIX = "/api"; + // 模板所在位置 + private static final String TEMPLATES_DIR = "/src/test/java/com/gxwebsoft/generator/templates"; + + public static void main(String[] args) { + // 代码生成器 + AutoGenerator mpg = new AutoGenerator(); + + // 全局配置 + GlobalConfig gc = new GlobalConfig(); + gc.setOutputDir(OUTPUT_LOCATION + OUTPUT_DIR); + gc.setAuthor(AUTHOR); + gc.setOpen(false); + gc.setFileOverride(true); + gc.setEnableCache(ENABLE_CACHE); + gc.setSwagger2(true); + gc.setIdType(IdType.AUTO); + gc.setServiceName("%sService"); + mpg.setGlobalConfig(gc); + + // 数据源配置 + DataSourceConfig dsc = new DataSourceConfig(); + dsc.setUrl(DB_URL); + // dsc.setSchemaName("public"); + dsc.setDriverName(DB_DRIVER); + dsc.setUsername(DB_USERNAME); + dsc.setPassword(DB_PASSWORD); + mpg.setDataSource(dsc); + + // 包配置 + PackageConfig pc = new PackageConfig(); + pc.setModuleName(MODULE_NAME); + pc.setParent(PACKAGE_NAME); + mpg.setPackageInfo(pc); + + // 策略配置 + StrategyConfig strategy = new StrategyConfig(); + strategy.setNaming(NamingStrategy.underline_to_camel); + strategy.setColumnNaming(NamingStrategy.underline_to_camel); + strategy.setInclude(TABLE_NAMES); + strategy.setTablePrefix(TABLE_PREFIX); + strategy.setSuperControllerClass(PACKAGE_NAME + ".common.core.web.BaseController"); + strategy.setEntityLombokModel(true); + strategy.setRestControllerStyle(true); + strategy.setControllerMappingHyphenStyle(true); + strategy.setLogicDeleteFieldName("deleted"); + mpg.setStrategy(strategy); + + // 模板配置 + TemplateConfig templateConfig = new TemplateConfig(); + templateConfig.setController(TEMPLATES_DIR + "/controller.java"); + templateConfig.setEntity(TEMPLATES_DIR + "/entity.java"); + templateConfig.setMapper(TEMPLATES_DIR + "/mapper.java"); + templateConfig.setXml(TEMPLATES_DIR + "/mapper.xml"); + templateConfig.setService(TEMPLATES_DIR + "/service.java"); + templateConfig.setServiceImpl(TEMPLATES_DIR + "/serviceImpl.java"); + mpg.setTemplate(templateConfig); + mpg.setTemplateEngine(new BeetlTemplateEnginePlus()); + + // 自定义模板配置 + InjectionConfig cfg = new InjectionConfig() { + @Override + public void initMap() { + Map map = new HashMap<>(); + map.put("packageName", PACKAGE_NAME); + map.put("paramExcludeFields", PARAM_EXCLUDE_FIELDS); + map.put("paramToStringType", PARAM_TO_STRING_TYPE); + map.put("paramEqType", PARAM_EQ_TYPE); + map.put("authAnnotation", AUTH_ANNOTATION); + map.put("logAnnotation", LOG_ANNOTATION); + map.put("controllerMappingPrefix", CONTROLLER_MAPPING_PREFIX); + this.setMap(map); + } + }; + String templatePath = TEMPLATES_DIR + "/param.java.btl"; + List focList = new ArrayList<>(); + focList.add(new FileOutConfig(templatePath) { + @Override + public String outputFile(TableInfo tableInfo) { + return OUTPUT_LOCATION + OUTPUT_DIR + "/" + + PACKAGE_NAME.replace(".", "/") + + "/" + pc.getModuleName() + "/param/" + + tableInfo.getEntityName() + "Param" + StringPool.DOT_JAVA; + } + }); + cfg.setFileOutConfigList(focList); + mpg.setCfg(cfg); + + mpg.execute(); + } + +} diff --git a/src/test/java/com/gxwebsoft/generator/HouseGenerator.java b/src/test/java/com/gxwebsoft/generator/HouseGenerator.java new file mode 100644 index 0000000..cc30971 --- /dev/null +++ b/src/test/java/com/gxwebsoft/generator/HouseGenerator.java @@ -0,0 +1,166 @@ +package com.gxwebsoft.generator; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.core.toolkit.StringPool; +import com.baomidou.mybatisplus.generator.AutoGenerator; +import com.baomidou.mybatisplus.generator.InjectionConfig; +import com.baomidou.mybatisplus.generator.config.*; +import com.baomidou.mybatisplus.generator.config.po.TableInfo; +import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy; +import com.gxwebsoft.generator.engine.BeetlTemplateEnginePlus; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * 代码生成工具 + * + * @author WebSoft + * @since 2021-09-05 00:31:14 + */ +public class HouseGenerator { + // 输出位置 + private static final String OUTPUT_LOCATION = System.getProperty("user.dir"); + //private static final String OUTPUT_LOCATION = "D:/codegen"; // 不想生成到项目中可以写磁盘路径 + // 输出目录 + private static final String OUTPUT_DIR = "/src/main/java"; + // 作者名称 + private static final String AUTHOR = "科技小王子"; + // 是否在xml中添加二级缓存配置 + private static final boolean ENABLE_CACHE = false; + // 数据库连接配置 + private static final String DB_URL = "jdbc:mysql://47.119.165.234:3308/com_gxwebsoft_oa?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8"; + private static final String DB_DRIVER = "com.mysql.cj.jdbc.Driver"; + private static final String DB_USERNAME = "com_gxwebsoft_oa"; + private static final String DB_PASSWORD = "EZfW2R4YiWfbLHLw"; + // 包名 + private static final String PACKAGE_NAME = "com.gxwebsoft"; + // 模块名 + private static final String MODULE_NAME = "house"; + // 需要生成的表 + private static final String[] TABLE_NAMES = new String[]{ + "house_info" + }; + // 需要去除的表前缀 + private static final String[] TABLE_PREFIX = new String[]{ + "house_", + "tb_" + }; + // 不需要作为查询参数的字段 + private static final String[] PARAM_EXCLUDE_FIELDS = new String[]{ + "tenant_id", + "create_time", + "update_time" + }; + // 查询参数使用String的类型 + private static final String[] PARAM_TO_STRING_TYPE = new String[]{ + "Date", + "LocalDate", + "LocalTime", + "LocalDateTime" + }; + // 查询参数使用EQ的类型 + private static final String[] PARAM_EQ_TYPE = new String[]{ + "Integer", + "Boolean", + "BigDecimal" + }; + // 是否添加权限注解 + private static final boolean AUTH_ANNOTATION = true; + // 是否添加日志注解 + private static final boolean LOG_ANNOTATION = true; + // controller的mapping前缀 + private static final String CONTROLLER_MAPPING_PREFIX = "/api"; + // 模板所在位置 + private static final String TEMPLATES_DIR = "/src/test/java/com/gxwebsoft/generator/templates"; + + public static void main(String[] args) { + // 代码生成器 + AutoGenerator mpg = new AutoGenerator(); + + // 全局配置 + GlobalConfig gc = new GlobalConfig(); + gc.setOutputDir(OUTPUT_LOCATION + OUTPUT_DIR); + gc.setAuthor(AUTHOR); + gc.setOpen(false); + gc.setFileOverride(true); + gc.setEnableCache(ENABLE_CACHE); + gc.setSwagger2(true); + gc.setIdType(IdType.AUTO); + gc.setServiceName("%sService"); + mpg.setGlobalConfig(gc); + + // 数据源配置 + DataSourceConfig dsc = new DataSourceConfig(); + dsc.setUrl(DB_URL); + // dsc.setSchemaName("public"); + dsc.setDriverName(DB_DRIVER); + dsc.setUsername(DB_USERNAME); + dsc.setPassword(DB_PASSWORD); + mpg.setDataSource(dsc); + + // 包配置 + PackageConfig pc = new PackageConfig(); + pc.setModuleName(MODULE_NAME); + pc.setParent(PACKAGE_NAME); + mpg.setPackageInfo(pc); + + // 策略配置 + StrategyConfig strategy = new StrategyConfig(); + strategy.setNaming(NamingStrategy.underline_to_camel); + strategy.setColumnNaming(NamingStrategy.underline_to_camel); + strategy.setInclude(TABLE_NAMES); + strategy.setTablePrefix(TABLE_PREFIX); + strategy.setSuperControllerClass(PACKAGE_NAME + ".common.core.web.BaseController"); + strategy.setEntityLombokModel(true); + strategy.setRestControllerStyle(true); + strategy.setControllerMappingHyphenStyle(true); + strategy.setLogicDeleteFieldName("deleted"); + mpg.setStrategy(strategy); + + // 模板配置 + TemplateConfig templateConfig = new TemplateConfig(); + templateConfig.setController(TEMPLATES_DIR + "/controller.java"); + templateConfig.setEntity(TEMPLATES_DIR + "/entity.java"); + templateConfig.setMapper(TEMPLATES_DIR + "/mapper.java"); + templateConfig.setXml(TEMPLATES_DIR + "/mapper.xml"); + templateConfig.setService(TEMPLATES_DIR + "/service.java"); + templateConfig.setServiceImpl(TEMPLATES_DIR + "/serviceImpl.java"); + mpg.setTemplate(templateConfig); + mpg.setTemplateEngine(new BeetlTemplateEnginePlus()); + + // 自定义模板配置 + InjectionConfig cfg = new InjectionConfig() { + @Override + public void initMap() { + Map map = new HashMap<>(); + map.put("packageName", PACKAGE_NAME); + map.put("paramExcludeFields", PARAM_EXCLUDE_FIELDS); + map.put("paramToStringType", PARAM_TO_STRING_TYPE); + map.put("paramEqType", PARAM_EQ_TYPE); + map.put("authAnnotation", AUTH_ANNOTATION); + map.put("logAnnotation", LOG_ANNOTATION); + map.put("controllerMappingPrefix", CONTROLLER_MAPPING_PREFIX); + this.setMap(map); + } + }; + String templatePath = TEMPLATES_DIR + "/param.java.btl"; + List focList = new ArrayList<>(); + focList.add(new FileOutConfig(templatePath) { + @Override + public String outputFile(TableInfo tableInfo) { + return OUTPUT_LOCATION + OUTPUT_DIR + "/" + + PACKAGE_NAME.replace(".", "/") + + "/" + pc.getModuleName() + "/param/" + + tableInfo.getEntityName() + "Param" + StringPool.DOT_JAVA; + } + }); + cfg.setFileOutConfigList(focList); + mpg.setCfg(cfg); + + mpg.execute(); + } + +} diff --git a/src/test/java/com/gxwebsoft/generator/LoveGenerator.java b/src/test/java/com/gxwebsoft/generator/LoveGenerator.java new file mode 100644 index 0000000..a321d3f --- /dev/null +++ b/src/test/java/com/gxwebsoft/generator/LoveGenerator.java @@ -0,0 +1,173 @@ +package com.gxwebsoft.generator; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.core.toolkit.StringPool; +import com.baomidou.mybatisplus.generator.AutoGenerator; +import com.baomidou.mybatisplus.generator.InjectionConfig; +import com.baomidou.mybatisplus.generator.config.*; +import com.baomidou.mybatisplus.generator.config.po.TableInfo; +import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy; +import com.gxwebsoft.generator.engine.BeetlTemplateEnginePlus; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * 代码生成工具 + * + * @author WebSoft + * @since 2021-09-05 00:31:14 + */ +public class LoveGenerator { + // 输出位置 + private static final String OUTPUT_LOCATION = System.getProperty("user.dir"); + //private static final String OUTPUT_LOCATION = "D:/codegen"; // 不想生成到项目中可以写磁盘路径 + // 输出目录 + private static final String OUTPUT_DIR = "/src/main/java"; + // 作者名称 + private static final String AUTHOR = "科技小王子"; + // 是否在xml中添加二级缓存配置 + private static final boolean ENABLE_CACHE = false; + // 数据库连接配置 + private static final String DB_URL = "jdbc:mysql://47.119.165.234:3308/com_gxwebsoft_oa?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8"; + private static final String DB_DRIVER = "com.mysql.cj.jdbc.Driver"; + private static final String DB_USERNAME = "com_gxwebsoft_oa"; + private static final String DB_PASSWORD = "EZfW2R4YiWfbLHLw"; + // 包名 + private static final String PACKAGE_NAME = "com.gxwebsoft"; + // 模块名 + private static final String MODULE_NAME = "love"; + // 需要生成的表 + private static final String[] TABLE_NAMES = new String[]{ +// "love_user_profile", +// "love_user_plan", +// "love_user_plan_price", +// "love_user_plan_log", +// "love_user_plan_icon", +// "love_user_plan_equity", +// "love_certificate", + "love_profit" + }; + // 需要去除的表前缀 + private static final String[] TABLE_PREFIX = new String[]{ + "love_", + "tb_" + }; + // 不需要作为查询参数的字段 + private static final String[] PARAM_EXCLUDE_FIELDS = new String[]{ + "tenant_id", + "create_time", + "update_time" + }; + // 查询参数使用String的类型 + private static final String[] PARAM_TO_STRING_TYPE = new String[]{ + "Date", + "LocalDate", + "LocalTime", + "LocalDateTime" + }; + // 查询参数使用EQ的类型 + private static final String[] PARAM_EQ_TYPE = new String[]{ + "Integer", + "Boolean", + "BigDecimal" + }; + // 是否添加权限注解 + private static final boolean AUTH_ANNOTATION = true; + // 是否添加日志注解 + private static final boolean LOG_ANNOTATION = true; + // controller的mapping前缀 + private static final String CONTROLLER_MAPPING_PREFIX = "/api"; + // 模板所在位置 + private static final String TEMPLATES_DIR = "/src/test/java/com/gxwebsoft/generator/templates"; + + public static void main(String[] args) { + // 代码生成器 + AutoGenerator mpg = new AutoGenerator(); + + // 全局配置 + GlobalConfig gc = new GlobalConfig(); + gc.setOutputDir(OUTPUT_LOCATION + OUTPUT_DIR); + gc.setAuthor(AUTHOR); + gc.setOpen(false); + gc.setFileOverride(true); + gc.setEnableCache(ENABLE_CACHE); + gc.setSwagger2(true); + gc.setIdType(IdType.AUTO); + gc.setServiceName("%sService"); + mpg.setGlobalConfig(gc); + + // 数据源配置 + DataSourceConfig dsc = new DataSourceConfig(); + dsc.setUrl(DB_URL); + // dsc.setSchemaName("public"); + dsc.setDriverName(DB_DRIVER); + dsc.setUsername(DB_USERNAME); + dsc.setPassword(DB_PASSWORD); + mpg.setDataSource(dsc); + + // 包配置 + PackageConfig pc = new PackageConfig(); + pc.setModuleName(MODULE_NAME); + pc.setParent(PACKAGE_NAME); + mpg.setPackageInfo(pc); + + // 策略配置 + StrategyConfig strategy = new StrategyConfig(); + strategy.setNaming(NamingStrategy.underline_to_camel); + strategy.setColumnNaming(NamingStrategy.underline_to_camel); + strategy.setInclude(TABLE_NAMES); + strategy.setTablePrefix(TABLE_PREFIX); + strategy.setSuperControllerClass(PACKAGE_NAME + ".common.core.web.BaseController"); + strategy.setEntityLombokModel(true); + strategy.setRestControllerStyle(true); + strategy.setControllerMappingHyphenStyle(true); + strategy.setLogicDeleteFieldName("deleted"); + mpg.setStrategy(strategy); + + // 模板配置 + TemplateConfig templateConfig = new TemplateConfig(); + templateConfig.setController(TEMPLATES_DIR + "/controller.java"); + templateConfig.setEntity(TEMPLATES_DIR + "/entity.java"); + templateConfig.setMapper(TEMPLATES_DIR + "/mapper.java"); + templateConfig.setXml(TEMPLATES_DIR + "/mapper.xml"); + templateConfig.setService(TEMPLATES_DIR + "/service.java"); + templateConfig.setServiceImpl(TEMPLATES_DIR + "/serviceImpl.java"); + mpg.setTemplate(templateConfig); + mpg.setTemplateEngine(new BeetlTemplateEnginePlus()); + + // 自定义模板配置 + InjectionConfig cfg = new InjectionConfig() { + @Override + public void initMap() { + Map map = new HashMap<>(); + map.put("packageName", PACKAGE_NAME); + map.put("paramExcludeFields", PARAM_EXCLUDE_FIELDS); + map.put("paramToStringType", PARAM_TO_STRING_TYPE); + map.put("paramEqType", PARAM_EQ_TYPE); + map.put("authAnnotation", AUTH_ANNOTATION); + map.put("logAnnotation", LOG_ANNOTATION); + map.put("controllerMappingPrefix", CONTROLLER_MAPPING_PREFIX); + this.setMap(map); + } + }; + String templatePath = TEMPLATES_DIR + "/param.java.btl"; + List focList = new ArrayList<>(); + focList.add(new FileOutConfig(templatePath) { + @Override + public String outputFile(TableInfo tableInfo) { + return OUTPUT_LOCATION + OUTPUT_DIR + "/" + + PACKAGE_NAME.replace(".", "/") + + "/" + pc.getModuleName() + "/param/" + + tableInfo.getEntityName() + "Param" + StringPool.DOT_JAVA; + } + }); + cfg.setFileOutConfigList(focList); + mpg.setCfg(cfg); + + mpg.execute(); + } + +} diff --git a/src/test/java/com/gxwebsoft/generator/OaGenerator.java b/src/test/java/com/gxwebsoft/generator/OaGenerator.java new file mode 100644 index 0000000..5eb7c05 --- /dev/null +++ b/src/test/java/com/gxwebsoft/generator/OaGenerator.java @@ -0,0 +1,180 @@ +package com.gxwebsoft.generator; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.core.toolkit.StringPool; +import com.baomidou.mybatisplus.generator.AutoGenerator; +import com.baomidou.mybatisplus.generator.InjectionConfig; +import com.baomidou.mybatisplus.generator.config.*; +import com.baomidou.mybatisplus.generator.config.po.TableInfo; +import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy; +import com.gxwebsoft.generator.engine.BeetlTemplateEnginePlus; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * 代码生成工具 + * + * @author WebSoft + * @since 2021-09-05 00:31:14 + */ +public class OaGenerator { + // 输出位置 + private static final String OUTPUT_LOCATION = System.getProperty("user.dir"); + //private static final String OUTPUT_LOCATION = "D:/codegen"; // 不想生成到项目中可以写磁盘路径 + // 输出目录 + private static final String OUTPUT_DIR = "/src/main/java"; + // 作者名称 + private static final String AUTHOR = "科技小王子"; + // 是否在xml中添加二级缓存配置 + private static final boolean ENABLE_CACHE = false; + // 数据库连接配置 + private static final String DB_URL = "jdbc:mysql://47.119.165.234:3308/com_gxwebsoft_oa?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8"; + private static final String DB_DRIVER = "com.mysql.cj.jdbc.Driver"; + private static final String DB_USERNAME = "com_gxwebsoft_oa"; + private static final String DB_PASSWORD = "EZfW2R4YiWfbLHLw"; + // 包名 + private static final String PACKAGE_NAME = "com.gxwebsoft"; + // 模块名 + private static final String MODULE_NAME = "oa"; + // 需要生成的表 + private static final String[] TABLE_NAMES = new String[]{ +// "oa_project", +// "oa_link", +// "oa_assets", +// "oa_customer", +// "oa_task", +// "oa_task_record", +// "oa_task_user", +// "sys_tenant", +// "oa_app", +// "oa_setting", +// "oa_assets", +// "oa_app_user", +// "oa_notice" + "oa_assets_user", + + }; + // 需要去除的表前缀 + private static final String[] TABLE_PREFIX = new String[]{ + "oa_", + "tb_" + }; + // 不需要作为查询参数的字段 + private static final String[] PARAM_EXCLUDE_FIELDS = new String[]{ + "tenant_id", + "create_time", + "update_time" + }; + // 查询参数使用String的类型 + private static final String[] PARAM_TO_STRING_TYPE = new String[]{ + "Date", + "LocalDate", + "LocalTime", + "LocalDateTime" + }; + // 查询参数使用EQ的类型 + private static final String[] PARAM_EQ_TYPE = new String[]{ + "Integer", + "Boolean", + "BigDecimal" + }; + // 是否添加权限注解 + private static final boolean AUTH_ANNOTATION = true; + // 是否添加日志注解 + private static final boolean LOG_ANNOTATION = true; + // controller的mapping前缀 + private static final String CONTROLLER_MAPPING_PREFIX = "/api"; + // 模板所在位置 + private static final String TEMPLATES_DIR = "/src/test/java/com/gxwebsoft/generator/templates"; + + public static void main(String[] args) { + // 代码生成器 + AutoGenerator mpg = new AutoGenerator(); + + // 全局配置 + GlobalConfig gc = new GlobalConfig(); + gc.setOutputDir(OUTPUT_LOCATION + OUTPUT_DIR); + gc.setAuthor(AUTHOR); + gc.setOpen(false); + gc.setFileOverride(true); + gc.setEnableCache(ENABLE_CACHE); + gc.setSwagger2(true); + gc.setIdType(IdType.AUTO); + gc.setServiceName("%sService"); + mpg.setGlobalConfig(gc); + + // 数据源配置 + DataSourceConfig dsc = new DataSourceConfig(); + dsc.setUrl(DB_URL); + // dsc.setSchemaName("public"); + dsc.setDriverName(DB_DRIVER); + dsc.setUsername(DB_USERNAME); + dsc.setPassword(DB_PASSWORD); + mpg.setDataSource(dsc); + + // 包配置 + PackageConfig pc = new PackageConfig(); + pc.setModuleName(MODULE_NAME); + pc.setParent(PACKAGE_NAME); + mpg.setPackageInfo(pc); + + // 策略配置 + StrategyConfig strategy = new StrategyConfig(); + strategy.setNaming(NamingStrategy.underline_to_camel); + strategy.setColumnNaming(NamingStrategy.underline_to_camel); + strategy.setInclude(TABLE_NAMES); + strategy.setTablePrefix(TABLE_PREFIX); + strategy.setSuperControllerClass(PACKAGE_NAME + ".common.core.web.BaseController"); + strategy.setEntityLombokModel(true); + strategy.setRestControllerStyle(true); + strategy.setControllerMappingHyphenStyle(true); + strategy.setLogicDeleteFieldName("deleted"); + mpg.setStrategy(strategy); + + // 模板配置 + TemplateConfig templateConfig = new TemplateConfig(); + templateConfig.setController(TEMPLATES_DIR + "/controller.java"); + templateConfig.setEntity(TEMPLATES_DIR + "/entity.java"); + templateConfig.setMapper(TEMPLATES_DIR + "/mapper.java"); + templateConfig.setXml(TEMPLATES_DIR + "/mapper.xml"); + templateConfig.setService(TEMPLATES_DIR + "/service.java"); + templateConfig.setServiceImpl(TEMPLATES_DIR + "/serviceImpl.java"); + mpg.setTemplate(templateConfig); + mpg.setTemplateEngine(new BeetlTemplateEnginePlus()); + + // 自定义模板配置 + InjectionConfig cfg = new InjectionConfig() { + @Override + public void initMap() { + Map map = new HashMap<>(); + map.put("packageName", PACKAGE_NAME); + map.put("paramExcludeFields", PARAM_EXCLUDE_FIELDS); + map.put("paramToStringType", PARAM_TO_STRING_TYPE); + map.put("paramEqType", PARAM_EQ_TYPE); + map.put("authAnnotation", AUTH_ANNOTATION); + map.put("logAnnotation", LOG_ANNOTATION); + map.put("controllerMappingPrefix", CONTROLLER_MAPPING_PREFIX); + this.setMap(map); + } + }; + String templatePath = TEMPLATES_DIR + "/param.java.btl"; + List focList = new ArrayList<>(); + focList.add(new FileOutConfig(templatePath) { + @Override + public String outputFile(TableInfo tableInfo) { + return OUTPUT_LOCATION + OUTPUT_DIR + "/" + + PACKAGE_NAME.replace(".", "/") + + "/" + pc.getModuleName() + "/param/" + + tableInfo.getEntityName() + "Param" + StringPool.DOT_JAVA; + } + }); + cfg.setFileOutConfigList(focList); + mpg.setCfg(cfg); + + mpg.execute(); + } + +} diff --git a/src/test/java/com/gxwebsoft/generator/ShopGenerator.java b/src/test/java/com/gxwebsoft/generator/ShopGenerator.java new file mode 100644 index 0000000..594729f --- /dev/null +++ b/src/test/java/com/gxwebsoft/generator/ShopGenerator.java @@ -0,0 +1,209 @@ +package com.gxwebsoft.generator; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.core.toolkit.StringPool; +import com.baomidou.mybatisplus.generator.AutoGenerator; +import com.baomidou.mybatisplus.generator.InjectionConfig; +import com.baomidou.mybatisplus.generator.config.*; +import com.baomidou.mybatisplus.generator.config.po.TableInfo; +import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy; +import com.gxwebsoft.generator.engine.BeetlTemplateEnginePlus; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * 代码生成工具 + * + * @author WebSoft + * @since 2021-09-05 00:31:14 + */ +public class ShopGenerator { + // 输出位置 + private static final String OUTPUT_LOCATION = System.getProperty("user.dir"); + //private static final String OUTPUT_LOCATION = "D:/codegen"; // 不想生成到项目中可以写磁盘路径 + // 输出目录 + private static final String OUTPUT_DIR = "/src/main/java"; + // 作者名称 + private static final String AUTHOR = "科技小王子"; + // 是否在xml中添加二级缓存配置 + private static final boolean ENABLE_CACHE = false; + // 数据库连接配置 + private static final String DB_URL = "jdbc:mysql://47.119.165.234:3308/com_gxwebsoft_oa?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8"; + private static final String DB_DRIVER = "com.mysql.cj.jdbc.Driver"; + private static final String DB_USERNAME = "com_gxwebsoft_oa"; + private static final String DB_PASSWORD = "EZfW2R4YiWfbLHLw"; + // 包名 + private static final String PACKAGE_NAME = "com.gxwebsoft"; + // 模块名 + private static final String MODULE_NAME = "shop"; + // 需要生成的表 + private static final String[] TABLE_NAMES = new String[]{ +// "shop_order", +// "shop_goods", +// "shop_store", +// "shop_cart", +// "shop_express", +// "shop_category", +// "shop_goods_image", +// "shop_comment", +// "shop_goods_service" +// "shop_member" +// "shop_user_balance_log", +// "shop_user_address", +// "shop_user_coupon", +// "shop_user_follow", +// "shop_user_oauth", +// "shop_user_points_log", +// "shop_cart" +// "shop_info" +// "shop_coupon" +// "shop_clerk" +// "shop_merchant", +// "shop_merchant_clerk" +// "shop_merchant_withdraw" +// "shop_order_address" +// "shop_payment", +// "shop_payment_template", +// "shop_payment_trade" +// "shop_order_goods" +// "shop_user_oauth" +// "shop_order_renew" +// "shop_recharge_order", +// "shop_recharge_order_plan", +// "shop_recharge_plan", +// "shop_user_balance_log" +// "shop_user_referee", +// "shop_order_refund", +// "shop_order_refund_address", +// "shop_user_grade", +// "shop_user_grade_log", +// "shop_user_comment", +// "shop_user_like", +// "shop_user_look" + "shop_user_feedback" + + }; + // 需要去除的表前缀 + private static final String[] TABLE_PREFIX = new String[]{ + "shop_", + "tb_" + }; + // 不需要作为查询参数的字段 + private static final String[] PARAM_EXCLUDE_FIELDS = new String[]{ + "tenant_id", + "create_time", + "update_time" + }; + // 查询参数使用String的类型 + private static final String[] PARAM_TO_STRING_TYPE = new String[]{ + "Date", + "LocalDate", + "LocalTime", + "LocalDateTime" + }; + // 查询参数使用EQ的类型 + private static final String[] PARAM_EQ_TYPE = new String[]{ + "Integer", + "Boolean", + "BigDecimal" + }; + // 是否添加权限注解 + private static final boolean AUTH_ANNOTATION = true; + // 是否添加日志注解 + private static final boolean LOG_ANNOTATION = true; + // controller的mapping前缀 + private static final String CONTROLLER_MAPPING_PREFIX = "/api"; + // 模板所在位置 + private static final String TEMPLATES_DIR = "/src/test/java/com/gxwebsoft/generator/templates"; + + public static void main(String[] args) { + // 代码生成器 + AutoGenerator mpg = new AutoGenerator(); + + // 全局配置 + GlobalConfig gc = new GlobalConfig(); + gc.setOutputDir(OUTPUT_LOCATION + OUTPUT_DIR); + gc.setAuthor(AUTHOR); + gc.setOpen(false); + gc.setFileOverride(true); + gc.setEnableCache(ENABLE_CACHE); + gc.setSwagger2(true); + gc.setIdType(IdType.AUTO); + gc.setServiceName("%sService"); + mpg.setGlobalConfig(gc); + + // 数据源配置 + DataSourceConfig dsc = new DataSourceConfig(); + dsc.setUrl(DB_URL); + // dsc.setSchemaName("public"); + dsc.setDriverName(DB_DRIVER); + dsc.setUsername(DB_USERNAME); + dsc.setPassword(DB_PASSWORD); + mpg.setDataSource(dsc); + + // 包配置 + PackageConfig pc = new PackageConfig(); + pc.setModuleName(MODULE_NAME); + pc.setParent(PACKAGE_NAME); + mpg.setPackageInfo(pc); + + // 策略配置 + StrategyConfig strategy = new StrategyConfig(); + strategy.setNaming(NamingStrategy.underline_to_camel); + strategy.setColumnNaming(NamingStrategy.underline_to_camel); + strategy.setInclude(TABLE_NAMES); + strategy.setTablePrefix(TABLE_PREFIX); + strategy.setSuperControllerClass(PACKAGE_NAME + ".common.core.web.BaseController"); + strategy.setEntityLombokModel(true); + strategy.setRestControllerStyle(true); + strategy.setControllerMappingHyphenStyle(true); + strategy.setLogicDeleteFieldName("deleted"); + mpg.setStrategy(strategy); + + // 模板配置 + TemplateConfig templateConfig = new TemplateConfig(); + templateConfig.setController(TEMPLATES_DIR + "/controller.java"); + templateConfig.setEntity(TEMPLATES_DIR + "/entity.java"); + templateConfig.setMapper(TEMPLATES_DIR + "/mapper.java"); + templateConfig.setXml(TEMPLATES_DIR + "/mapper.xml"); + templateConfig.setService(TEMPLATES_DIR + "/service.java"); + templateConfig.setServiceImpl(TEMPLATES_DIR + "/serviceImpl.java"); + mpg.setTemplate(templateConfig); + mpg.setTemplateEngine(new BeetlTemplateEnginePlus()); + + // 自定义模板配置 + InjectionConfig cfg = new InjectionConfig() { + @Override + public void initMap() { + Map map = new HashMap<>(); + map.put("packageName", PACKAGE_NAME); + map.put("paramExcludeFields", PARAM_EXCLUDE_FIELDS); + map.put("paramToStringType", PARAM_TO_STRING_TYPE); + map.put("paramEqType", PARAM_EQ_TYPE); + map.put("authAnnotation", AUTH_ANNOTATION); + map.put("logAnnotation", LOG_ANNOTATION); + map.put("controllerMappingPrefix", CONTROLLER_MAPPING_PREFIX); + this.setMap(map); + } + }; + String templatePath = TEMPLATES_DIR + "/param.java.btl"; + List focList = new ArrayList<>(); + focList.add(new FileOutConfig(templatePath) { + @Override + public String outputFile(TableInfo tableInfo) { + return OUTPUT_LOCATION + OUTPUT_DIR + "/" + + PACKAGE_NAME.replace(".", "/") + + "/" + pc.getModuleName() + "/param/" + + tableInfo.getEntityName() + "Param" + StringPool.DOT_JAVA; + } + }); + cfg.setFileOutConfigList(focList); + mpg.setCfg(cfg); + + mpg.execute(); + } + +} diff --git a/src/test/java/com/gxwebsoft/generator/SysGenerator.java b/src/test/java/com/gxwebsoft/generator/SysGenerator.java new file mode 100644 index 0000000..d1c2ed2 --- /dev/null +++ b/src/test/java/com/gxwebsoft/generator/SysGenerator.java @@ -0,0 +1,175 @@ +package com.gxwebsoft.generator; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.core.toolkit.StringPool; +import com.baomidou.mybatisplus.generator.AutoGenerator; +import com.baomidou.mybatisplus.generator.InjectionConfig; +import com.baomidou.mybatisplus.generator.config.*; +import com.baomidou.mybatisplus.generator.config.po.TableInfo; +import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy; +import com.gxwebsoft.generator.engine.BeetlTemplateEnginePlus; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * 代码生成工具 + * + * @author WebSoft + * @since 2021-09-05 00:31:14 + */ +public class SysGenerator { + // 输出位置 + private static final String OUTPUT_LOCATION = System.getProperty("user.dir"); + //private static final String OUTPUT_LOCATION = "D:/codegen"; // 不想生成到项目中可以写磁盘路径 + // 输出目录 + private static final String OUTPUT_DIR = "/src/main/java"; + // 作者名称 + private static final String AUTHOR = "科技小王子"; + // 是否在xml中添加二级缓存配置 + private static final boolean ENABLE_CACHE = false; + // 数据库连接配置 + private static final String DB_URL = "jdbc:mysql://47.119.165.234:3308/com_gxwebsoft_oa?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8"; + private static final String DB_DRIVER = "com.mysql.cj.jdbc.Driver"; + private static final String DB_USERNAME = "com_gxwebsoft_oa"; + private static final String DB_PASSWORD = "EZfW2R4YiWfbLHLw"; + // 包名 + private static final String PACKAGE_NAME = "com.gxwebsoft"; + // 模块名 + private static final String MODULE_NAME = "common.system"; + // 需要生成的表 + private static final String[] TABLE_NAMES = new String[]{ + +// "sys_user", + "sys_tenant", +// "sys_setting" +// "sys_access_key" +// "sys_company", +// "sys_industry" +// "sys_plug", +// "sys_company" + + }; + // 需要去除的表前缀 + private static final String[] TABLE_PREFIX = new String[]{ + "sys_", + "tb_" + }; + // 不需要作为查询参数的字段 + private static final String[] PARAM_EXCLUDE_FIELDS = new String[]{ + "tenant_id", + "create_time", + "update_time" + }; + // 查询参数使用String的类型 + private static final String[] PARAM_TO_STRING_TYPE = new String[]{ + "Date", + "LocalDate", + "LocalTime", + "LocalDateTime" + }; + // 查询参数使用EQ的类型 + private static final String[] PARAM_EQ_TYPE = new String[]{ + "Integer", + "Boolean", + "BigDecimal" + }; + // 是否添加权限注解 + private static final boolean AUTH_ANNOTATION = true; + // 是否添加日志注解 + private static final boolean LOG_ANNOTATION = true; + // controller的mapping前缀 + private static final String CONTROLLER_MAPPING_PREFIX = "/api"; + // 模板所在位置 + private static final String TEMPLATES_DIR = "/src/test/java/com/gxwebsoft/generator/templates"; + + public static void main(String[] args) { + // 代码生成器 + AutoGenerator mpg = new AutoGenerator(); + + // 全局配置 + GlobalConfig gc = new GlobalConfig(); + gc.setOutputDir(OUTPUT_LOCATION + OUTPUT_DIR); + gc.setAuthor(AUTHOR); + gc.setOpen(false); + gc.setFileOverride(true); + gc.setEnableCache(ENABLE_CACHE); + gc.setSwagger2(true); + gc.setIdType(IdType.AUTO); + gc.setServiceName("%sService"); + mpg.setGlobalConfig(gc); + + // 数据源配置 + DataSourceConfig dsc = new DataSourceConfig(); + dsc.setUrl(DB_URL); + // dsc.setSchemaName("public"); + dsc.setDriverName(DB_DRIVER); + dsc.setUsername(DB_USERNAME); + dsc.setPassword(DB_PASSWORD); + mpg.setDataSource(dsc); + + // 包配置 + PackageConfig pc = new PackageConfig(); + pc.setModuleName(MODULE_NAME); + pc.setParent(PACKAGE_NAME); + mpg.setPackageInfo(pc); + + // 策略配置 + StrategyConfig strategy = new StrategyConfig(); + strategy.setNaming(NamingStrategy.underline_to_camel); + strategy.setColumnNaming(NamingStrategy.underline_to_camel); + strategy.setInclude(TABLE_NAMES); + strategy.setTablePrefix(TABLE_PREFIX); + strategy.setSuperControllerClass(PACKAGE_NAME + ".common.core.web.BaseController"); + strategy.setEntityLombokModel(true); + strategy.setRestControllerStyle(true); + strategy.setControllerMappingHyphenStyle(true); + strategy.setLogicDeleteFieldName("deleted"); + mpg.setStrategy(strategy); + + // 模板配置 + TemplateConfig templateConfig = new TemplateConfig(); + templateConfig.setController(TEMPLATES_DIR + "/controller.java"); + templateConfig.setEntity(TEMPLATES_DIR + "/entity.java"); + templateConfig.setMapper(TEMPLATES_DIR + "/mapper.java"); + templateConfig.setXml(TEMPLATES_DIR + "/mapper.xml"); + templateConfig.setService(TEMPLATES_DIR + "/service.java"); + templateConfig.setServiceImpl(TEMPLATES_DIR + "/serviceImpl.java"); + mpg.setTemplate(templateConfig); + mpg.setTemplateEngine(new BeetlTemplateEnginePlus()); + + // 自定义模板配置 + InjectionConfig cfg = new InjectionConfig() { + @Override + public void initMap() { + Map map = new HashMap<>(); + map.put("packageName", PACKAGE_NAME); + map.put("paramExcludeFields", PARAM_EXCLUDE_FIELDS); + map.put("paramToStringType", PARAM_TO_STRING_TYPE); + map.put("paramEqType", PARAM_EQ_TYPE); + map.put("authAnnotation", AUTH_ANNOTATION); + map.put("logAnnotation", LOG_ANNOTATION); + map.put("controllerMappingPrefix", CONTROLLER_MAPPING_PREFIX); + this.setMap(map); + } + }; + String templatePath = TEMPLATES_DIR + "/param.java.btl"; + List focList = new ArrayList<>(); + focList.add(new FileOutConfig(templatePath) { + @Override + public String outputFile(TableInfo tableInfo) { + return OUTPUT_LOCATION + OUTPUT_DIR + "/" + + PACKAGE_NAME.replace(".", "/") + + "/" + pc.getModuleName() + "/param/" + + tableInfo.getEntityName() + "Param" + StringPool.DOT_JAVA; + } + }); + cfg.setFileOutConfigList(focList); + mpg.setCfg(cfg); + + mpg.execute(); + } + +} diff --git a/src/test/java/com/gxwebsoft/generator/TowerGenerator.java b/src/test/java/com/gxwebsoft/generator/TowerGenerator.java new file mode 100644 index 0000000..94134f9 --- /dev/null +++ b/src/test/java/com/gxwebsoft/generator/TowerGenerator.java @@ -0,0 +1,176 @@ +package com.gxwebsoft.generator; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.core.toolkit.StringPool; +import com.baomidou.mybatisplus.generator.AutoGenerator; +import com.baomidou.mybatisplus.generator.InjectionConfig; +import com.baomidou.mybatisplus.generator.config.*; +import com.baomidou.mybatisplus.generator.config.po.TableInfo; +import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy; +import com.gxwebsoft.generator.engine.BeetlTemplateEnginePlus; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * 代码生成工具 + * + * @author WebSoft + * @since 2021-09-05 00:31:14 + */ +public class TowerGenerator { + // 输出位置 + private static final String OUTPUT_LOCATION = System.getProperty("user.dir"); + //private static final String OUTPUT_LOCATION = "D:/codegen"; // 不想生成到项目中可以写磁盘路径 + // 输出目录 + private static final String OUTPUT_DIR = "/src/main/java"; + // 作者名称 + private static final String AUTHOR = "科技小王子"; + // 是否在xml中添加二级缓存配置 + private static final boolean ENABLE_CACHE = false; + // 数据库连接配置 + private static final String DB_URL = "jdbc:mysql://47.119.165.234:3308/com_gxwebsoft_oa?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8"; + private static final String DB_DRIVER = "com.mysql.cj.jdbc.Driver"; + private static final String DB_USERNAME = "com_gxwebsoft_oa"; + private static final String DB_PASSWORD = "EZfW2R4YiWfbLHLw"; + // 包名 + private static final String PACKAGE_NAME = "com.gxwebsoft"; + // 模块名 + private static final String MODULE_NAME = "tower"; + // 需要生成的表 + private static final String[] TABLE_NAMES = new String[]{ +// "tower_equipment", +// "tower_warehouse", +// "tower_accessory" +// "tower_project", +// "tower_model", +// "tower_project_user", +// "tower_project_order", +// "tower_place", +// "tower_place_safety", +// "tower_place_standard", + "tower_project_place" + }; + // 需要去除的表前缀 + private static final String[] TABLE_PREFIX = new String[]{ + "sys_", + "tb_" + }; + // 不需要作为查询参数的字段 + private static final String[] PARAM_EXCLUDE_FIELDS = new String[]{ + "tenant_id", + "create_time", + "update_time" + }; + // 查询参数使用String的类型 + private static final String[] PARAM_TO_STRING_TYPE = new String[]{ + "Date", + "LocalDate", + "LocalTime", + "LocalDateTime" + }; + // 查询参数使用EQ的类型 + private static final String[] PARAM_EQ_TYPE = new String[]{ + "Integer", + "Boolean", + "BigDecimal" + }; + // 是否添加权限注解 + private static final boolean AUTH_ANNOTATION = true; + // 是否添加日志注解 + private static final boolean LOG_ANNOTATION = true; + // controller的mapping前缀 + private static final String CONTROLLER_MAPPING_PREFIX = "/api"; + // 模板所在位置 + private static final String TEMPLATES_DIR = "/src/test/java/com/gxwebsoft/generator/templates"; + + public static void main(String[] args) { + // 代码生成器 + AutoGenerator mpg = new AutoGenerator(); + + // 全局配置 + GlobalConfig gc = new GlobalConfig(); + gc.setOutputDir(OUTPUT_LOCATION + OUTPUT_DIR); + gc.setAuthor(AUTHOR); + gc.setOpen(false); + gc.setFileOverride(true); + gc.setEnableCache(ENABLE_CACHE); + gc.setSwagger2(true); + gc.setIdType(IdType.AUTO); + gc.setServiceName("%sService"); + mpg.setGlobalConfig(gc); + + // 数据源配置 + DataSourceConfig dsc = new DataSourceConfig(); + dsc.setUrl(DB_URL); + // dsc.setSchemaName("public"); + dsc.setDriverName(DB_DRIVER); + dsc.setUsername(DB_USERNAME); + dsc.setPassword(DB_PASSWORD); + mpg.setDataSource(dsc); + + // 包配置 + PackageConfig pc = new PackageConfig(); + pc.setModuleName(MODULE_NAME); + pc.setParent(PACKAGE_NAME); + mpg.setPackageInfo(pc); + + // 策略配置 + StrategyConfig strategy = new StrategyConfig(); + strategy.setNaming(NamingStrategy.underline_to_camel); + strategy.setColumnNaming(NamingStrategy.underline_to_camel); + strategy.setInclude(TABLE_NAMES); + strategy.setTablePrefix(TABLE_PREFIX); + strategy.setSuperControllerClass(PACKAGE_NAME + ".common.core.web.BaseController"); + strategy.setEntityLombokModel(true); + strategy.setRestControllerStyle(true); + strategy.setControllerMappingHyphenStyle(true); + strategy.setLogicDeleteFieldName("deleted"); + mpg.setStrategy(strategy); + + // 模板配置 + TemplateConfig templateConfig = new TemplateConfig(); + templateConfig.setController(TEMPLATES_DIR + "/controller.java"); + templateConfig.setEntity(TEMPLATES_DIR + "/entity.java"); + templateConfig.setMapper(TEMPLATES_DIR + "/mapper.java"); + templateConfig.setXml(TEMPLATES_DIR + "/mapper.xml"); + templateConfig.setService(TEMPLATES_DIR + "/service.java"); + templateConfig.setServiceImpl(TEMPLATES_DIR + "/serviceImpl.java"); + mpg.setTemplate(templateConfig); + mpg.setTemplateEngine(new BeetlTemplateEnginePlus()); + + // 自定义模板配置 + InjectionConfig cfg = new InjectionConfig() { + @Override + public void initMap() { + Map map = new HashMap<>(); + map.put("packageName", PACKAGE_NAME); + map.put("paramExcludeFields", PARAM_EXCLUDE_FIELDS); + map.put("paramToStringType", PARAM_TO_STRING_TYPE); + map.put("paramEqType", PARAM_EQ_TYPE); + map.put("authAnnotation", AUTH_ANNOTATION); + map.put("logAnnotation", LOG_ANNOTATION); + map.put("controllerMappingPrefix", CONTROLLER_MAPPING_PREFIX); + this.setMap(map); + } + }; + String templatePath = TEMPLATES_DIR + "/param.java.btl"; + List focList = new ArrayList<>(); + focList.add(new FileOutConfig(templatePath) { + @Override + public String outputFile(TableInfo tableInfo) { + return OUTPUT_LOCATION + OUTPUT_DIR + "/" + + PACKAGE_NAME.replace(".", "/") + + "/" + pc.getModuleName() + "/param/" + + tableInfo.getEntityName() + "Param" + StringPool.DOT_JAVA; + } + }); + cfg.setFileOutConfigList(focList); + mpg.setCfg(cfg); + + mpg.execute(); + } + +} diff --git a/src/test/java/com/gxwebsoft/generator/engine/BeetlTemplateEnginePlus.java b/src/test/java/com/gxwebsoft/generator/engine/BeetlTemplateEnginePlus.java new file mode 100644 index 0000000..1a73826 --- /dev/null +++ b/src/test/java/com/gxwebsoft/generator/engine/BeetlTemplateEnginePlus.java @@ -0,0 +1,50 @@ +package com.gxwebsoft.generator.engine; + +import com.baomidou.mybatisplus.generator.config.builder.ConfigBuilder; +import com.baomidou.mybatisplus.generator.engine.AbstractTemplateEngine; +import org.beetl.core.Configuration; +import org.beetl.core.GroupTemplate; +import org.beetl.core.Template; +import org.beetl.core.resource.FileResourceLoader; + +import java.io.FileOutputStream; +import java.io.IOException; +import java.util.Map; + +/** + * Beetl模板引擎实现文件输出 + * + * @author WebSoft + * @since 2021-09-05 00:30:28 + */ +public class BeetlTemplateEnginePlus extends AbstractTemplateEngine { + private GroupTemplate groupTemplate; + + @Override + public AbstractTemplateEngine init(ConfigBuilder configBuilder) { + super.init(configBuilder); + try { + Configuration cfg = Configuration.defaultConfiguration(); + groupTemplate = new GroupTemplate(new FileResourceLoader(), cfg); + } catch (IOException e) { + logger.error(e.getMessage(), e); + } + return this; + } + + @Override + public void writer(Map objectMap, String templatePath, String outputFile) throws Exception { + Template template = groupTemplate.getTemplate(templatePath); + try (FileOutputStream fileOutputStream = new FileOutputStream(outputFile)) { + template.binding(objectMap); + template.renderTo(fileOutputStream); + } + logger.debug("模板:" + templatePath + "; 文件:" + outputFile); + } + + @Override + public String templateFilePath(String filePath) { + return filePath + ".btl"; + } + +} diff --git a/src/test/java/com/gxwebsoft/generator/templates/controller.java.btl b/src/test/java/com/gxwebsoft/generator/templates/controller.java.btl new file mode 100644 index 0000000..eb3f274 --- /dev/null +++ b/src/test/java/com/gxwebsoft/generator/templates/controller.java.btl @@ -0,0 +1,283 @@ +<% +var serviceIns = strutil.toLowerCase(strutil.subStringTo(table.serviceName, 0, 1)) + strutil.subString(table.serviceName, 1); +var authPre = package.ModuleName + ':' + table.entityPath; +var idFieldName, idPropertyName; +for(field in table.fields) { + if(field.keyFlag) { + idFieldName = field.name; + idPropertyName = field.propertyName; + } +} +%> +package ${package.Controller}; + +<% if(isNotEmpty(superControllerClassPackage)) { %> +import ${superControllerClassPackage}; +<% } %> +import ${cfg.packageName!}.${package.ModuleName}.service.${entity}Service; +import ${cfg.packageName!}.${package.ModuleName}.entity.${entity}; +import ${cfg.packageName!}.${package.ModuleName}.param.${entity}Param; +import ${cfg.packageName!}.common.core.web.ApiResult; +import ${cfg.packageName!}.common.core.web.PageResult; +import ${cfg.packageName!}.common.core.web.PageParam; +import ${cfg.packageName!}.common.core.web.BatchParam; +import ${cfg.packageName!}.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.*; +<% if(!restControllerStyle) { %> +import org.springframework.stereotype.Controller; +<% } %> + +import javax.annotation.Resource; +import java.util.List; + +/** + * ${table.comment!}控制器 + * + * @author ${author} + * @since ${date(), 'yyyy-MM-dd HH:mm:ss'} + */ +<% if(swagger2) { %> +@Api(tags = "${table.comment!}管理") +<% } %> +<% if(restControllerStyle) { %> +@RestController +<% } else { %> +@Controller +<% } %> +@RequestMapping("${cfg.controllerMappingPrefix!}<% if(isNotEmpty(package.ModuleName)){ %>/${package.ModuleName}<% } %>/<% if(isNotEmpty(controllerMappingHyphenStyle)){ %>${controllerMappingHyphen}<% }else{ %>${table.entityPath}<% } %>") +<% if(kotlin) { %> +class ${table.controllerName}<% if(isNotEmpty(superControllerClass)) { %> : ${superControllerClass}()<% } %> +<% } else if(isNotEmpty(superControllerClass)) { %> +public class ${table.controllerName} extends ${superControllerClass} { +<% } else { %> +public class ${table.controllerName} { +<% } %> + @Resource + private ${table.serviceName} ${serviceIns}; + + <% if(!swagger2) { %> + /** + * 分页查询${table.comment!} + */ + <% } %> + <% if(cfg.authAnnotation) { %> + @PreAuthorize("hasAuthority('${authPre}:list')") + <% } %> + <% if(cfg.logAnnotation) { %> + @OperationLog + <% } %> + <% if(swagger2) { %> + @ApiOperation("分页查询${table.comment!}") + <% } %> + <% if(!restControllerStyle) { %> + @ResponseBody + <% } %> + @GetMapping("/page") + public ApiResult> page(${entity}Param param) { + PageParam<${entity}, ${entity}Param> page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(${serviceIns}.page(page, page.getWrapper())); + // 使用关联查询 + //return success(${serviceIns}.pageRel(param)); + } + + <% if(!swagger2) { %> + /** + * 查询全部${table.comment!} + */ + <% } %> + <% if(cfg.authAnnotation) { %> + @PreAuthorize("hasAuthority('${authPre}:list')") + <% } %> + <% if(cfg.logAnnotation) { %> + @OperationLog + <% } %> + <% if(swagger2) { %> + @ApiOperation("查询全部${table.comment!}") + <% } %> + <% if(!restControllerStyle) { %> + @ResponseBody + <% } %> + @GetMapping() + public ApiResult> list(${entity}Param param) { + PageParam<${entity}, ${entity}Param> page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(${serviceIns}.list(page.getOrderWrapper())); + // 使用关联查询 + //return success(${serviceIns}.listRel(param)); + } + + <% if(!swagger2) { %> + /** + * 根据id查询${table.comment!} + */ + <% } %> + @PreAuthorize("hasAuthority('${authPre}:list')") + @OperationLog + @ApiOperation("根据id查询${table.comment!}") + @GetMapping("/{id}") + public ApiResult<${entity}> get(@PathVariable("id") Integer id) { + return success(${serviceIns}.getById(id)); + // 使用关联查询 + //return success(${serviceIns}.getByIdRel(id)); + } + + <% if(!swagger2) { %> + /** + * 添加${table.comment!} + */ + <% } %> + <% if(cfg.authAnnotation) { %> + @PreAuthorize("hasAuthority('${authPre}:save')") + <% } %> + <% if(cfg.logAnnotation) { %> + @OperationLog + <% } %> + <% if(swagger2) { %> + @ApiOperation("添加${table.comment!}") + <% } %> + <% if(!restControllerStyle) { %> + @ResponseBody + <% } %> + @PostMapping() + public ApiResult save(@RequestBody ${entity} ${table.entityPath}) { + // 记录当前登录用户id + User loginUser = getLoginUser(); + if (loginUser != null) { + ${table.entityPath}.setUserId(loginUser.getUserId()); + } + if (${serviceIns}.save(${table.entityPath})) { + return success("添加成功"); + } + return fail("添加失败"); + } + + <% if(!swagger2) { %> + /** + * 修改${table.comment!} + */ + <% } %> + <% if(cfg.authAnnotation) { %> + @PreAuthorize("hasAuthority('${authPre}:update')") + <% } %> + <% if(cfg.logAnnotation) { %> + @OperationLog + <% } %> + <% if(swagger2) { %> + @ApiOperation("修改${table.comment!}") + <% } %> + <% if(!restControllerStyle) { %> + @ResponseBody + <% } %> + @PutMapping() + public ApiResult update(@RequestBody ${entity} ${table.entityPath}) { + if (${serviceIns}.updateById(${table.entityPath})) { + return success("修改成功"); + } + return fail("修改失败"); + } + + <% if(!swagger2) { %> + /** + * 删除${table.comment!} + */ + <% } %> + <% if(cfg.authAnnotation) { %> + @PreAuthorize("hasAuthority('${authPre}:remove')") + <% } %> + <% if(cfg.logAnnotation) { %> + @OperationLog + <% } %> + <% if(swagger2) { %> + @ApiOperation("删除${table.comment!}") + <% } %> + <% if(!restControllerStyle) { %> + @ResponseBody + <% } %> + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (${serviceIns}.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + <% if(!swagger2) { %> + /** + * 批量添加${table.comment!} + */ + <% } %> + <% if(cfg.authAnnotation) { %> + @PreAuthorize("hasAuthority('${authPre}:save')") + <% } %> + <% if(cfg.logAnnotation) { %> + @OperationLog + <% } %> + <% if(swagger2) { %> + @ApiOperation("批量添加${table.comment!}") + <% } %> + <% if(!restControllerStyle) { %> + @ResponseBody + <% } %> + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List<${entity}> list) { + if (${serviceIns}.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + <% if(!swagger2) { %> + /** + * 批量修改${table.comment!} + */ + <% } %> + <% if(cfg.authAnnotation) { %> + @PreAuthorize("hasAuthority('${authPre}:update')") + <% } %> + <% if(cfg.logAnnotation) { %> + @OperationLog + <% } %> + <% if(swagger2) { %> + @ApiOperation("批量修改${table.comment!}") + <% } %> + <% if(!restControllerStyle) { %> + @ResponseBody + <% } %> + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam<${entity}> batchParam) { + if (batchParam.update(${serviceIns}, "${idFieldName!}")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + <% if(!swagger2) { %> + /** + * 批量删除${table.comment!} + */ + <% } %> + <% if(cfg.authAnnotation) { %> + @PreAuthorize("hasAuthority('${authPre}:remove')") + <% } %> + <% if(cfg.logAnnotation) { %> + @OperationLog + <% } %> + <% if(swagger2) { %> + @ApiOperation("批量删除${table.comment!}") + <% } %> + <% if(!restControllerStyle) { %> + @ResponseBody + <% } %> + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (${serviceIns}.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/test/java/com/gxwebsoft/generator/templates/entity.java.btl b/src/test/java/com/gxwebsoft/generator/templates/entity.java.btl new file mode 100644 index 0000000..44015ad --- /dev/null +++ b/src/test/java/com/gxwebsoft/generator/templates/entity.java.btl @@ -0,0 +1,158 @@ +package ${package.Entity}; + +<% for(pkg in table.importPackages) { %> +import ${pkg}; +<% } %> +<% if(swagger2) { %> +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +<% } %> +<% if(entityLombokModel) { %> +import lombok.Data; +import lombok.EqualsAndHashCode; + <% if(chainModel) { %> +import lombok.experimental.Accessors; + <% } %> +<% } %> + +/** + * ${table.comment!} + * + * @author ${author} + * @since ${date(), 'yyyy-MM-dd HH:mm:ss'} + */ +<% if(entityLombokModel) { %> +@Data + <% if(isNotEmpty(superEntityClass)) { %> +@EqualsAndHashCode(callSuper = true) + <% } else { %> +@EqualsAndHashCode(callSuper = false) + <% } %> + <% if(chainModel) { %> +@Accessors(chain = true) + <% } %> +<% } %> +<% if(swagger2) { %> +@ApiModel(value = "${entity}对象", description = "${table.comment!''}") +<% } %> +<% if(table.convert) { %> +@TableName("${table.name}") +<% } %> +<% if(isNotEmpty(superEntityClass)) { %> +public class ${entity} extends ${superEntityClass}<% if(activeRecord) { %><${entity}><% } %>{ +<% } else if(activeRecord) { %> +public class ${entity} extends Model<${entity}> { +<% } else { %> +public class ${entity} implements Serializable { +<% } %> +<% if(entitySerialVersionUID) { %> + private static final long serialVersionUID = 1L; +<% } %> +<% /** -----------BEGIN 字段循环遍历----------- **/ %> +<% for(field in table.fields) { %> + <% + var keyPropertyName; + if(field.keyFlag) { + keyPropertyName = field.propertyName; + } + %> + + <% if(isNotEmpty(field.comment)) { %> + <% if(swagger2) { %> + @ApiModelProperty(value = "${field.comment}") + <% }else{ %> + /** + * ${field.comment} + */ + <% } %> + <% } %> + <% /* 主键 */ %> + <% if(field.keyFlag) { %> + <% if(field.keyIdentityFlag) { %> + @TableId(value = "${field.annotationColumnName}", type = IdType.AUTO) + <% } else if(isNotEmpty(idType)) { %> + @TableId(value = "${field.annotationColumnName}", type = IdType.${idType}) + <% } else if(field.convert) { %> + @TableId("${field.annotationColumnName}") + <% } %> + <% /* 普通字段 */ %> + <% } else if(isNotEmpty(field.fill)) { %> + <% if(field.convert){ %> + @TableField(value = "${field.annotationColumnName}", fill = FieldFill.${field.fill}) + <% }else{ %> + @TableField(fill = FieldFill.${field.fill}) + <% } %> + <% } else if(field.convert) { %> + @TableField("${field.annotationColumnName}") + <% } %> + <% /* 乐观锁注解 */ %> + <% if(versionFieldName!'' == field.name) { %> + @Version + <% } %> + <% /* 逻辑删除注解 */ %> + <% if(logicDeleteFieldName!'' == field.name) { %> + @TableLogic + <% } %> + private ${field.propertyType} ${field.propertyName}; +<% } %> +<% /** -----------END 字段循环遍历----------- **/ %> + +<% if(!entityLombokModel) { %> + <% for(field in table.fields) { %> + <% + var getprefix = ''; + if(field.propertyType == 'boolean') { + getprefix = 'is'; + } else { + getprefix = 'get'; + } + %> + public ${field.propertyType} ${getprefix}${field.capitalName}() { + return ${field.propertyName}; + } + + <% if(chainModel) { %> + public ${entity} set${field.capitalName}(${field.propertyType} ${field.propertyName}) { + <% } else { %> + public void set${field.capitalName}(${field.propertyType} ${field.propertyName}) { + <% } %> + this.${field.propertyName} = ${field.propertyName}; + <% if(chainModel){ %> + return this; + <% } %> + } + + <% } %> +<% } %> +<% if(entityColumnConstant) { %> + <% for(field in table.fields) { %> + public static final String ${strutil.toUpperCase(field.name)} = "${field.name}"; + + <% } %> +<% } %> +<% if(activeRecord) { %> + @Override + protected Serializable pkVal() { + <% if(isNotEmpty(keyPropertyName)){ %> + return this.${keyPropertyName}; + <% }else{ %> + return null; + <% } %> + } + +<% } %> +<% if(!entityLombokModel){ %> + @Override + public String toString() { + return "${entity}{" + + <% for(field in table.fields){ %> + <% if(fieldLP.index==0){ %> + "${field.propertyName}=" + ${field.propertyName} + + <% }else{ %> + ", ${field.propertyName}=" + ${field.propertyName} + + <% } %> + <% } %> + "}"; + } +<% } %> +} diff --git a/src/test/java/com/gxwebsoft/generator/templates/mapper.java.btl b/src/test/java/com/gxwebsoft/generator/templates/mapper.java.btl new file mode 100644 index 0000000..54e41a9 --- /dev/null +++ b/src/test/java/com/gxwebsoft/generator/templates/mapper.java.btl @@ -0,0 +1,41 @@ +package ${package.Mapper}; + +import ${superMapperClassPackage}; +import com.baomidou.mybatisplus.core.metadata.IPage; +import ${package.Entity}.${entity}; +import ${cfg.packageName!}.${package.ModuleName}.param.${entity}Param; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * ${table.comment!}Mapper + * + * @author ${author} + * @since ${date(), 'yyyy-MM-dd HH:mm:ss'} + */ +<% if(kotlin){ %> +interface ${table.mapperName} : ${superMapperClass}<${entity}> +<% }else{ %> +public interface ${table.mapperName} extends ${superMapperClass}<${entity}> { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List<${entity}> + */ + List<${entity}> selectPageRel(@Param("page") IPage<${entity}> page, + @Param("param") ${entity}Param param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List<${entity}> selectListRel(@Param("param") ${entity}Param param); + +} +<% } %> diff --git a/src/test/java/com/gxwebsoft/generator/templates/mapper.xml.btl b/src/test/java/com/gxwebsoft/generator/templates/mapper.xml.btl new file mode 100644 index 0000000..6786c0d --- /dev/null +++ b/src/test/java/com/gxwebsoft/generator/templates/mapper.xml.btl @@ -0,0 +1,96 @@ + + + +<% if(enableCache) { %> + + + +<% } %> +<% if(baseResultMap) { %> + + + + <% /** 生成主键排在第一位 **/ %> + <% for(field in table.fields) { %> + <% if(field.keyFlag){ %> + + <% } %> + <% } %> + <% /** 生成公共字段 **/ %> + <% for(field in table.commonFields) { %> + + <% } %> + <% /** 生成普通字段 **/ %> + <% for(field in table.fields) { %> + <% if(!field.keyFlag) { %> + + <% } %> + <% } %> + +<% } %> +<% if(baseColumnList) { %> + + + + <% for(field in table.commonFields) { %> + ${field.columnName}, + <% } %> + ${table.fieldNames} + +<% } %> + + + + SELECT a.* + FROM ${table.name} a + +<% for(field in table.fields) { %> + <% if(field.keyFlag) { %> + <% /** 主键字段 **/ %> + + AND a.${field.name} = #{param.${field.propertyName}} + + <% } else if(field.name == logicDeleteFieldName) { %> + <% /** 逻辑删除字段 **/ %> + + AND a.deleted = #{param.deleted} + + + AND a.deleted = 0 + + <% } else if(field.name == 'create_time') { %> + <% /** 创建时间字段 **/ %> + + AND a.create_time >= #{param.createTimeStart} + + + AND a.create_time <= #{param.createTimeEnd} + + <% } else if(array.contain(cfg.paramExcludeFields, field.name)) { %> + <% /** 排除的字段 **/ %> + <% } else if(array.contain(cfg.paramEqType, field.propertyType)) { %> + <% /** 使用EQ的字段 **/ %> + + AND a.${field.name} = #{param.${field.propertyName}} + + <% } else { %> + <% /** 其它类型使用LIKE **/ %> + + AND a.${field.name} LIKE CONCAT('%', #{param.${field.propertyName}}, '%') + + <% } %> +<% } %> + + + + + + + + + + diff --git a/src/test/java/com/gxwebsoft/generator/templates/param.java.btl b/src/test/java/com/gxwebsoft/generator/templates/param.java.btl new file mode 100644 index 0000000..9c30504 --- /dev/null +++ b/src/test/java/com/gxwebsoft/generator/templates/param.java.btl @@ -0,0 +1,146 @@ +package ${cfg.packageName!}.${package.ModuleName}.param; + +import ${cfg.packageName!}.common.core.annotation.QueryField; +import ${cfg.packageName!}.common.core.annotation.QueryType; +import ${cfg.packageName!}.common.core.web.BaseParam; +import com.fasterxml.jackson.annotation.JsonInclude; +<% if(swagger2) { %> +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +<% } %> +<% if(entityLombokModel) { %> +import lombok.Data; +import lombok.EqualsAndHashCode; + <% if(chainModel) { %> +import lombok.experimental.Accessors; + <% } %> +<% } %> + +/** + * ${table.comment!}查询参数 + * + * @author ${author} + * @since ${date(), 'yyyy-MM-dd HH:mm:ss'} + */ +<% if(entityLombokModel) { %> +@Data + <% if(isNotEmpty(superEntityClass)) { %> +@EqualsAndHashCode(callSuper = true) + <% } else { %> +@EqualsAndHashCode(callSuper = false) + <% } %> + <% if(chainModel) { %> +@Accessors(chain = true) + <% } %> +<% } %> +@JsonInclude(JsonInclude.Include.NON_NULL) +<% if(swagger2) { %> +@ApiModel(value = "${entity}Param对象", description = "${table.comment!''}查询参数") +<% } %> +public class ${entity}Param extends BaseParam { +<% if(entitySerialVersionUID) { %> + private static final long serialVersionUID = 1L; +<% } %> +<% /** -----------BEGIN 字段循环遍历----------- **/ %> +<% for(field in table.fields) { %> + <% + var keyPropertyName; + if(field.keyFlag) { + keyPropertyName = field.propertyName; + } + // 排除的字段 + if(array.contain(cfg.paramExcludeFields, field.name)) { + continue; + } + %> + + <% if(isNotEmpty(field.comment)) { %> + <% if(swagger2) { %> + @ApiModelProperty(value = "${field.comment}") + <% }else{ %> + /** + * ${field.comment} + */ + <% } %> + <% } %> + <% /* 主键 */ %> + <% if(field.keyFlag) { %> + @QueryField(type = QueryType.EQ) + <% /* 使用EQ的字段 */ %> + <% } else if(array.contain(cfg.paramEqType, field.propertyType)) { %> + @QueryField(type = QueryType.EQ) + <% } %> + <% /* 使用String类型的字段 */ %> + <% if(array.contain(cfg.paramToStringType, field.propertyType)) { %> + private String ${field.propertyName}; + <% } else { %> + <% /* 普通字段 */ %> + private ${field.propertyType} ${field.propertyName}; + <% } %> +<% } %> +<% /** -----------END 字段循环遍历----------- **/ %> + +<% if(!entityLombokModel) { %> + <% for(field in table.fields) { %> + <% + var getprefix = ''; + if(field.propertyType == 'boolean') { + getprefix = 'is'; + } else { + getprefix = 'get'; + } + // 排除的字段 + if(array.contain(cfg.paramExcludeFields, field.name)) { + continue; + } + %> + <% if(array.contain(cfg.paramToStringType, field.propertyType)) { %> + public String ${getprefix}${field.capitalName}() { + <% } else { %> + public ${field.propertyType} ${getprefix}${field.capitalName}() { + <% } %> + return ${field.propertyName}; + } + + <% if(chainModel) { %> + <% if(array.contain(cfg.paramToStringType, field.propertyType)) { %> + public ${entity} set${field.capitalName}(String ${field.propertyName}) { + <% } else { %> + public ${entity} set${field.capitalName}(${field.propertyType} ${field.propertyName}) { + <% } %> + <% } else { %> + <% if(array.contain(cfg.paramToStringType, field.propertyType)) { %> + public void set${field.capitalName}(String ${field.propertyName}) { + <% } else { %> + public void set${field.capitalName}(${field.propertyType} ${field.propertyName}) { + <% } %> + <% } %> + this.${field.propertyName} = ${field.propertyName}; + <% if(chainModel){ %> + return this; + <% } %> + } + + <% } %> +<% } %> +<% if(!entityLombokModel) { %> + @Override + public String toString() { + return "${entity}{" + + <% for(field in table.fields) { %> + <% + // 排除的字段 + if(array.contain(cfg.paramExcludeFields, field.name)) { + continue; + } + %> + <% if(fieldLP.index == 0) { %> + "${field.propertyName}=" + ${field.propertyName} + + <% } else { %> + ", ${field.propertyName}=" + ${field.propertyName} + + <% } %> + <% } %> + "}"; + } +<% } %> +} diff --git a/src/test/java/com/gxwebsoft/generator/templates/service.java.btl b/src/test/java/com/gxwebsoft/generator/templates/service.java.btl new file mode 100644 index 0000000..67efe6a --- /dev/null +++ b/src/test/java/com/gxwebsoft/generator/templates/service.java.btl @@ -0,0 +1,55 @@ +<% +var idPropertyName, idComment; +for(field in table.fields) { + if(field.keyFlag) { + idPropertyName = field.propertyName; + idComment = field.comment; + } +} +%> +package ${package.Service}; + +import ${superServiceClassPackage}; +import ${cfg.packageName!}.common.core.web.PageResult; +import ${package.Entity}.${entity}; +import ${cfg.packageName!}.${package.ModuleName}.param.${entity}Param; + +import java.util.List; + +/** + * ${table.comment!}Service + * + * @author ${author} + * @since ${date(), 'yyyy-MM-dd HH:mm:ss'} + */ +<% if(kotlin){ %> +interface ${table.serviceName} : ${superServiceClass}<${entity}> +<% }else{ %> +public interface ${table.serviceName} extends ${superServiceClass}<${entity}> { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult<${entity}> + */ + PageResult<${entity}> pageRel(${entity}Param param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List<${entity}> + */ + List<${entity}> listRel(${entity}Param param); + + /** + * 根据id查询 + * + * @param ${idPropertyName!} ${idComment!} + * @return ${entity} + */ + ${entity} getByIdRel(Integer ${idPropertyName!}); + +} +<% } %> diff --git a/src/test/java/com/gxwebsoft/generator/templates/serviceImpl.java.btl b/src/test/java/com/gxwebsoft/generator/templates/serviceImpl.java.btl new file mode 100644 index 0000000..e63a0b9 --- /dev/null +++ b/src/test/java/com/gxwebsoft/generator/templates/serviceImpl.java.btl @@ -0,0 +1,62 @@ +<% +var idPropertyName, idCapitalName; +for(field in table.fields) { + if(field.keyFlag) { + idPropertyName = field.propertyName; + idCapitalName = field.capitalName; + } +} +%> +package ${package.ServiceImpl}; + +import ${superServiceImplClassPackage}; +import ${package.Mapper}.${table.mapperName}; +import ${package.Service}.${table.serviceName}; +import ${package.Entity}.${entity}; +import ${cfg.packageName!}.${package.ModuleName}.param.${entity}Param; +import ${cfg.packageName!}.common.core.web.PageParam; +import ${cfg.packageName!}.common.core.web.PageResult; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * ${table.comment!}Service实现 + * + * @author ${author} + * @since ${date(), 'yyyy-MM-dd HH:mm:ss'} + */ +@Service +<% if(kotlin){ %> +open class ${table.serviceImplName} : ${superServiceImplClass}<${table.mapperName}, ${entity}>(), ${table.serviceName} { + +} +<% }else{ %> +public class ${table.serviceImplName} extends ${superServiceImplClass}<${table.mapperName}, ${entity}> implements ${table.serviceName} { + + @Override + public PageResult<${entity}> pageRel(${entity}Param param) { + PageParam<${entity}, ${entity}Param> page = new PageParam<>(param); + //page.setDefaultOrder("create_time desc"); + List<${entity}> list = baseMapper.selectPageRel(page, param); + return new PageResult<>(list, page.getTotal()); + } + + @Override + public List<${entity}> listRel(${entity}Param param) { + List<${entity}> list = baseMapper.selectListRel(param); + // 排序 + PageParam<${entity}, ${entity}Param> page = new PageParam<>(); + //page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public ${entity} getByIdRel(Integer ${idPropertyName!}) { + ${entity}Param param = new ${entity}Param(); + param.set${idCapitalName!}(${idPropertyName!}); + return param.getOne(baseMapper.selectListRel(param)); + } + +} +<% } %>