From 74bc08d958b8f23dd8ac9dbb818a15c6c772de17 Mon Sep 17 00:00:00 2001
From: b2894lxlx <517289602@qq.com>
Date: Sat, 10 Oct 2026 21:34:36 +0800
Subject: [PATCH] 261010
---
mvnw | 0
pom.xml | 70 +-
.../controller/ArticleCollectController.java | 121 ++
.../controller/ArticleCommentController.java} | 56 +-
.../cms/controller/ArticleController.java | 16 +-
.../com/gxwebsoft/cms/entity/Article.java | 5 +
.../entity/ArticleCollect.java} | 26 +-
.../entity/ArticleComment.java} | 31 +-
.../cms/mapper/ArticleCollectMapper.java | 37 +
.../cms/mapper/ArticleCommentMapper.java | 37 +
.../mapper/xml/ArticleCollectMapper.xml} | 18 +-
.../mapper/xml/ArticleCommentMapper.xml} | 19 +-
.../cms/mapper/xml/ArticleMapper.xml | 2 +-
.../param/ArticleCollectParam.java} | 22 +-
.../param/ArticleCommentParam.java} | 20 +-
.../cms/service/ArticleCollectService.java | 43 +
.../cms/service/ArticleCommentService.java | 42 +
.../impl/ArticleCollectServiceImpl.java | 65 +
.../impl/ArticleCommentServiceImpl.java | 53 +
.../cms/service/impl/ArticleServiceImpl.java | 4 +-
.../common/core/config/ConfigProperties.java | 9 +
.../common/core/config/MybatisPlusConfig.java | 63 +-
.../common/core/security/SecurityConfig.java | 32 +-
.../common/core/utils/ExcelExportUtil.java | 91 ++
.../common/core/utils/SchedulingUtil.java | 32 +-
.../common/core/web/BaseController.java | 5 +-
.../gxwebsoft/common/core/web/BaseParam.java | 22 +
.../system/controller/AliOssController.java | 297 +++++
.../system/controller/AreaController.java | 11 +
.../system/controller/CacheController.java | 9 +-
.../system/controller/DictDataController.java | 12 +-
.../system/controller/FileController.java | 4 +-
.../system/controller/MainController.java | 18 +-
.../system/controller/UserController.java | 189 ++-
.../gxwebsoft/common/system/entity/Area.java | 2 +
.../gxwebsoft/common/system/entity/User.java | 42 +-
.../common/system/mapper/xml/UserMapper.xml | 6 +
.../common/system/param/UserParam.java | 5 +
.../common/system/service/AreaService.java | 4 +
.../common/system/service/UserService.java | 5 +
.../system/service/impl/AreaServiceImpl.java | 19 +
.../system/service/impl/UserServiceImpl.java | 36 +-
.../gxwebsoft/law/config/WebSocketConfig.java | 22 -
.../gxwebsoft/law/config/WebSocketServer.java | 87 --
.../law/controller/AiController.java | 138 ---
.../law/controller/LawLegalAidController.java | 207 ----
.../LawLegalAppraisalController.java | 115 --
.../LawLegalArbitrateController.java | 223 ----
.../LawLegalCalConfigController.java | 115 --
.../LawLegalCalContentController.java | 115 --
.../controller/LawLegalCalTypeController.java | 114 --
.../LawLegalDocConfigController.java | 203 ----
.../LawLegalDocContentController.java | 115 --
.../controller/LawLegalDocTypeController.java | 114 --
.../LawLegalOrgCheckConfigController.java | 115 --
...wLegalOrgCheckConfigSuggestController.java | 122 --
.../LawLegalOrgCheckContentController.java | 118 --
...LegalOrgCheckContentSuggestController.java | 114 --
.../LawLegalOrgCheckTypeController.java | 114 --
...LawLegalOrgCheckTypeSuggestController.java | 114 --
.../controller/LawNotaryConfigController.java | 115 --
.../controller/LawNotaryListController.java | 115 --
.../controller/LawOrgCheckLogController.java | 115 --
.../law/controller/LawOrgController.java | 150 ---
.../com/gxwebsoft/law/entity/ChatMessage.java | 50 -
.../gxwebsoft/law/entity/ChatResponse.java | 66 -
.../com/gxwebsoft/law/entity/LawFeedback.java | 59 -
.../law/entity/LawLegalAppraisal.java | 77 --
.../law/entity/LawLegalArbitrate.java | 87 --
.../law/entity/LawLegalCalConfig.java | 55 -
.../law/entity/LawLegalCalContent.java | 49 -
.../law/entity/LawLegalDocConfig.java | 61 -
.../law/entity/LawLegalDocContent.java | 49 -
.../law/entity/LawLegalOrgCheckConfig.java | 55 -
.../entity/LawLegalOrgCheckConfigSuggest.java | 60 -
.../LawLegalOrgCheckContentSuggest.java | 53 -
.../gxwebsoft/law/entity/LawNotaryList.java | 69 --
.../gxwebsoft/law/entity/LawOrgCheckLog.java | 61 -
.../law/mapper/LawFeedbackMapper.java | 37 -
.../law/mapper/LawLegalAidMapper.java | 37 -
.../law/mapper/LawLegalAppraisalMapper.java | 37 -
.../law/mapper/LawLegalArbitrateMapper.java | 37 -
.../law/mapper/LawLegalCalConfigMapper.java | 37 -
.../law/mapper/LawLegalCalContentMapper.java | 37 -
.../law/mapper/LawLegalCalTypeMapper.java | 37 -
.../law/mapper/LawLegalDocConfigMapper.java | 37 -
.../law/mapper/LawLegalDocContentMapper.java | 37 -
.../law/mapper/LawLegalDocTypeMapper.java | 37 -
.../mapper/LawLegalOrgCheckConfigMapper.java | 37 -
.../LawLegalOrgCheckConfigSuggestMapper.java | 37 -
.../mapper/LawLegalOrgCheckContentMapper.java | 37 -
.../LawLegalOrgCheckContentSuggestMapper.java | 37 -
.../mapper/LawLegalOrgCheckTypeMapper.java | 37 -
.../LawLegalOrgCheckTypeSuggestMapper.java | 37 -
.../law/mapper/LawNotaryConfigMapper.java | 37 -
.../law/mapper/LawNotaryListMapper.java | 37 -
.../law/mapper/LawOrgCheckLogMapper.java | 37 -
.../gxwebsoft/law/mapper/LawOrgMapper.java | 37 -
.../law/mapper/LawOrgPeopleMapper.java | 37 -
.../law/mapper/xml/LawFeedbackMapper.xml | 66 -
.../mapper/xml/LawLegalAppraisalMapper.xml | 76 --
.../mapper/xml/LawLegalArbitrateMapper.xml | 94 --
.../mapper/xml/LawLegalCalConfigMapper.xml | 57 -
.../xml/LawLegalOrgCheckConfigMapper.xml | 57 -
.../LawLegalOrgCheckConfigSuggestMapper.xml | 60 -
.../xml/LawLegalOrgCheckContentMapper.xml | 51 -
.../LawLegalOrgCheckContentSuggestMapper.xml | 51 -
.../law/mapper/xml/LawNotaryConfigMapper.xml | 51 -
.../law/mapper/xml/LawNotaryListMapper.xml | 67 --
.../law/mapper/xml/LawOrgCheckLogMapper.xml | 66 -
.../gxwebsoft/law/mapper/xml/LawOrgMapper.xml | 63 -
.../law/mapper/xml/LawOrgPeopleMapper.xml | 60 -
.../gxwebsoft/law/param/LawLegalAidParam.java | 56 -
.../law/param/LawLegalArbitrateParam.java | 77 --
.../law/param/LawLegalCalConfigParam.java | 47 -
.../law/param/LawLegalDocConfigParam.java | 47 -
.../law/param/LawLegalDocContentParam.java | 41 -
.../param/LawLegalOrgCheckConfigParam.java | 46 -
.../LawLegalOrgCheckConfigSuggestParam.java | 49 -
.../param/LawLegalOrgCheckContentParam.java | 41 -
.../LawLegalOrgCheckContentSuggestParam.java | 41 -
.../law/param/LawNotaryListParam.java | 56 -
.../law/param/LawOrgCheckLogParam.java | 53 -
.../law/service/LawFeedbackService.java | 42 -
.../law/service/LawLegalAidService.java | 42 -
.../law/service/LawLegalAppraisalService.java | 42 -
.../law/service/LawLegalArbitrateService.java | 42 -
.../law/service/LawLegalCalConfigService.java | 42 -
.../service/LawLegalCalContentService.java | 42 -
.../law/service/LawLegalCalTypeService.java | 42 -
.../law/service/LawLegalDocConfigService.java | 42 -
.../service/LawLegalDocContentService.java | 42 -
.../law/service/LawLegalDocTypeService.java | 42 -
.../LawLegalOrgCheckConfigService.java | 42 -
.../LawLegalOrgCheckConfigSuggestService.java | 43 -
.../LawLegalOrgCheckContentService.java | 42 -
...LawLegalOrgCheckContentSuggestService.java | 42 -
.../service/LawLegalOrgCheckTypeService.java | 42 -
.../LawLegalOrgCheckTypeSuggestService.java | 42 -
.../law/service/LawNotaryConfigService.java | 42 -
.../law/service/LawNotaryListService.java | 42 -
.../law/service/LawOrgCheckLogService.java | 42 -
.../law/service/LawOrgPeopleService.java | 42 -
.../gxwebsoft/law/service/LawOrgService.java | 42 -
.../service/impl/LawFeedbackServiceImpl.java | 47 -
.../service/impl/LawLegalAidServiceImpl.java | 47 -
.../impl/LawLegalAppraisalServiceImpl.java | 54 -
.../impl/LawLegalArbitrateServiceImpl.java | 47 -
.../impl/LawLegalCalConfigServiceImpl.java | 47 -
.../impl/LawLegalCalContentServiceImpl.java | 47 -
.../impl/LawLegalCalTypeServiceImpl.java | 47 -
.../impl/LawLegalDocConfigServiceImpl.java | 47 -
.../impl/LawLegalDocContentServiceImpl.java | 47 -
.../impl/LawLegalDocTypeServiceImpl.java | 47 -
.../LawLegalOrgCheckConfigServiceImpl.java | 47 -
...LegalOrgCheckConfigSuggestServiceImpl.java | 71 --
.../LawLegalOrgCheckContentServiceImpl.java | 56 -
...egalOrgCheckContentSuggestServiceImpl.java | 47 -
.../impl/LawLegalOrgCheckTypeServiceImpl.java | 47 -
...awLegalOrgCheckTypeSuggestServiceImpl.java | 47 -
.../impl/LawNotaryConfigServiceImpl.java | 45 -
.../impl/LawNotaryListServiceImpl.java | 53 -
.../impl/LawOrgCheckLogServiceImpl.java | 47 -
.../service/impl/LawOrgPeopleServiceImpl.java | 66 -
.../law/service/impl/LawOrgServiceImpl.java | 62 -
.../open/controller/OpenCartController.java | 137 ---
.../open/controller/OpenFileController.java | 2 +-
.../controller/OpenMerchantController.java | 70 +-
.../controller/OpenOrderGoodsController.java | 44 -
.../controller/OpenUserOrderController.java | 87 --
.../gxwebsoft/shop/config/WxPayConfig.java | 4 +
.../shop/controller/CartController.java | 92 +-
.../shop/controller/CategoryController.java | 12 +-
.../shop/controller/CouponController.java | 66 +-
.../controller/DealerWithdrawController.java | 279 +++++
.../shop/controller/GoodsController.java | 46 +-
.../controller/GoodsPhoneModelController.java | 134 ---
.../shop/controller/GoodsPriceController.java | 136 ---
.../controller/GoodsServiceController.java | 139 ---
.../shop/controller/MerchantController.java | 154 ++-
.../shop/controller/OrderController.java | 167 +++
.../shop/controller/OrderGoodsController.java | 32 +-
.../shop/controller/PaymentController.java | 295 -----
.../shop/controller/TestController.java | 24 -
.../controller/UserAddressController.java | 67 +-
.../controller/UserBalanceLogController.java | 152 +--
.../shop/controller/UserCouponController.java | 87 +-
.../controller/UserParentListController.java | 111 ++
.../controller/UserPointLogController.java | 123 ++
.../shop/controller/WxLoginController.java | 24 +-
.../shop/controller/WxPayController.java | 335 ++++--
.../java/com/gxwebsoft/shop/entity/Cart.java | 55 +-
.../com/gxwebsoft/shop/entity/Coupon.java | 85 +-
.../gxwebsoft/shop/entity/DealerWithdraw.java | 87 ++
.../java/com/gxwebsoft/shop/entity/Goods.java | 14 +-
.../com/gxwebsoft/shop/entity/GoodsPrice.java | 102 --
.../gxwebsoft/shop/entity/GoodsService.java | 71 --
.../com/gxwebsoft/shop/entity/Merchant.java | 153 +--
.../java/com/gxwebsoft/shop/entity/Order.java | 222 +---
.../com/gxwebsoft/shop/entity/OrderGoods.java | 159 +--
.../gxwebsoft/shop/entity/UserAddress.java | 66 +-
.../gxwebsoft/shop/entity/UserBalanceLog.java | 1 +
.../com/gxwebsoft/shop/entity/UserCoupon.java | 91 +-
.../entity/UserParentList.java} | 30 +-
.../entity/UserPointLog.java} | 37 +-
.../com/gxwebsoft/shop/mapper/CartMapper.java | 6 +-
.../gxwebsoft/shop/mapper/CouponMapper.java | 6 +-
.../shop/mapper/DealerWithdrawMapper.java | 37 +
.../shop/mapper/GoodsPhoneModelMapper.java | 37 -
.../shop/mapper/GoodsPriceMapper.java | 37 -
.../shop/mapper/GoodsServiceMapper.java | 37 -
.../gxwebsoft/shop/mapper/MerchantMapper.java | 6 +-
.../shop/mapper/OrderGoodsMapper.java | 15 +-
.../gxwebsoft/shop/mapper/OrderMapper.java | 29 +-
.../shop/mapper/UserAddressMapper.java | 6 +-
.../shop/mapper/UserCouponMapper.java | 6 +-
.../shop/mapper/UserParentListMapper.java | 37 +
.../shop/mapper/UserPointLogMapper.java | 37 +
.../gxwebsoft/shop/mapper/xml/CartMapper.xml | 24 +-
.../shop/mapper/xml/CouponMapper.xml | 71 +-
.../shop/mapper/xml/DealerWithdrawMapper.xml | 76 ++
.../gxwebsoft/shop/mapper/xml/GoodsMapper.xml | 15 +-
.../shop/mapper/xml/GoodsPriceMapper.xml | 59 -
.../shop/mapper/xml/MerchantMapper.xml | 117 +-
.../shop/mapper/xml/OrderGoodsMapper.xml | 177 +--
.../gxwebsoft/shop/mapper/xml/OrderMapper.xml | 214 ++--
.../shop/mapper/xml/UserAddressMapper.xml | 54 +-
.../shop/mapper/xml/UserCouponMapper.xml | 62 +-
.../mapper/xml/UserParentListMapper.xml} | 23 +-
...rviceMapper.xml => UserPointLogMapper.xml} | 32 +-
.../com/gxwebsoft/shop/param/CartParam.java | 74 +-
.../com/gxwebsoft/shop/param/CouponParam.java | 95 +-
.../shop/param/DealerWithdrawParam.java | 73 ++
.../com/gxwebsoft/shop/param/GoodsParam.java | 7 +
.../gxwebsoft/shop/param/MerchantParam.java | 129 +-
.../gxwebsoft/shop/param/OrderGoodsParam.java | 182 +--
.../com/gxwebsoft/shop/param/OrderParam.java | 209 ++--
.../shop/param/UserAddressParam.java | 64 +-
.../gxwebsoft/shop/param/UserCouponParam.java | 79 +-
.../param/UserParentListParam.java} | 25 +-
.../param/UserPointLogParam.java} | 26 +-
.../gxwebsoft/shop/service/CartService.java | 9 +-
.../gxwebsoft/shop/service/CouponService.java | 10 +-
.../shop/service/DealerWithdrawService.java | 43 +
.../shop/service/GoodsPhoneModelService.java | 46 -
.../shop/service/GoodsPriceService.java | 44 -
.../gxwebsoft/shop/service/GoodsService.java | 1 -
.../shop/service/GoodsServiceService.java | 42 -
.../shop/service/MerchantService.java | 24 +-
.../shop/service/OrderGoodsService.java | 12 +-
.../gxwebsoft/shop/service/OrderService.java | 32 +-
.../shop/service/UserAddressService.java | 10 +-
.../shop/service/UserCouponService.java | 11 +-
.../shop/service/UserParentListService.java | 43 +
.../shop/service/UserPointLogService.java | 42 +
.../shop/service/impl/CartServiceImpl.java | 40 +-
.../shop/service/impl/CouponServiceImpl.java | 14 +-
.../impl/DealerWithdrawServiceImpl.java | 62 +
.../impl/GoodsPhoneModelServiceImpl.java | 65 -
.../service/impl/GoodsPriceServiceImpl.java | 59 -
.../shop/service/impl/GoodsServiceImpl.java | 23 -
.../service/impl/GoodsServiceServiceImpl.java | 47 -
.../service/impl/MerchantServiceImpl.java | 206 ++--
.../service/impl/OrderGoodsServiceImpl.java | 34 +-
.../shop/service/impl/OrderServiceImpl.java | 261 +---
.../service/impl/UserAddressServiceImpl.java | 14 +-
.../service/impl/UserCouponServiceImpl.java | 40 +-
.../impl/UserParentListServiceImpl.java | 58 +
.../service/impl/UserPointLogServiceImpl.java | 47 +
.../sys/controller/SysAreaController.java | 110 ++
.../com/gxwebsoft/sys/entity/SysArea.java | 37 +
.../gxwebsoft/sys/mapper/SysAreaMapper.java | 37 +
.../sys/mapper/xml/SysAreaMapper.xml | 39 +
.../param/SysAreaParam.java} | 29 +-
.../gxwebsoft/sys/service/SysAreaService.java | 42 +
.../sys/service/impl/SysAreaServiceImpl.java | 47 +
.../controller/MaintenancePlanController.java | 134 +++
.../MaintenanceRecordController.java | 135 +++
.../transport/entity/MaintenancePlan.java | 103 ++
.../transport/entity/MaintenanceRecord.java | 103 ++
.../mapper/MaintenancePlanMapper.java | 24 +
.../mapper/MaintenanceRecordMapper.java | 37 +
.../mapper/xml/MaintenancePlanMapper.xml | 139 +++
.../mapper/xml/MaintenanceRecordMapper.xml | 136 +++
.../transport/param/MaintenancePlanParam.java | 110 ++
.../param/MaintenanceRecordParam.java | 107 ++
.../service/MaintenancePlanService.java | 24 +
.../service/MaintenanceRecordService.java | 42 +
.../impl/MaintenancePlanServiceImpl.java | 48 +
.../impl/MaintenanceRecordServiceImpl.java | 48 +
.../yxe/controller/AliAiController.java | 114 ++
.../yxe/controller/BaiduController.java | 50 +
...YxeChronicDiseaseCollectionController.java | 270 +++++
.../YxeChronicDiseaseProductController.java | 154 +++
.../yxe/controller/YxeGoodsController.java | 264 ++++
.../yxe/controller/YxeProductController.java | 493 ++++++++
.../YxeProductExtraIncomeController.java | 110 ++
...eProductMerchantExtraIncomeController.java | 110 ++
.../controller/YxeReimburseController.java | 211 ++++
.../controller/YxeSelfReportController.java | 450 +++++++
.../yxe/controller/YxeServiceController.java | 110 ++
.../yxe/controller/YxeShareController.java | 643 ++++++++++
.../controller/YxeShareDetailController.java | 110 ++
.../controller/YxeTaskCateController.java} | 52 +-
.../yxe/controller/YxeTaskController.java | 519 ++++++++
.../controller/YxeTaskProductController.java | 110 ++
.../yxe/controller/YxeUserTaskController.java | 1059 +++++++++++++++++
.../controller/YxeVisitListController.java | 215 ++++
.../entity/YxeChronicDiseaseCollection.java | 102 ++
.../entity/YxeChronicDiseaseProduct.java} | 65 +-
.../com/gxwebsoft/yxe/entity/YxeGoods.java | 84 ++
.../com/gxwebsoft/yxe/entity/YxeProduct.java | 103 ++
.../entity/YxeProductExtraIncome.java} | 28 +-
.../YxeProductMerchantExtraIncome.java} | 37 +-
.../gxwebsoft/yxe/entity/YxeReimburse.java | 82 ++
.../gxwebsoft/yxe/entity/YxeSelfReport.java | 103 ++
.../entity/YxeService.java} | 26 +-
.../com/gxwebsoft/yxe/entity/YxeShare.java | 98 ++
.../gxwebsoft/yxe/entity/YxeShareDetail.java | 80 ++
.../com/gxwebsoft/yxe/entity/YxeTask.java | 142 +++
.../entity/YxeTaskCate.java} | 31 +-
.../entity/YxeTaskProduct.java} | 42 +-
.../com/gxwebsoft/yxe/entity/YxeUserTask.java | 107 ++
.../gxwebsoft/yxe/entity/YxeVisitList.java | 79 ++
.../YxeChronicDiseaseCollectionMapper.java | 37 +
.../YxeChronicDiseaseProductMapper.java | 31 +
.../gxwebsoft/yxe/mapper/YxeGoodsMapper.java | 37 +
.../mapper/YxeProductExtraIncomeMapper.java | 37 +
.../yxe/mapper/YxeProductMapper.java | 37 +
.../YxeProductMerchantExtraIncomeMapper.java | 37 +
.../yxe/mapper/YxeReimburseMapper.java | 37 +
.../yxe/mapper/YxeSelfReportMapper.java | 26 +
.../yxe/mapper/YxeServiceMapper.java | 37 +
.../yxe/mapper/YxeShareDetailMapper.java | 37 +
.../gxwebsoft/yxe/mapper/YxeShareMapper.java | 37 +
.../yxe/mapper/YxeTaskCateMapper.java | 37 +
.../gxwebsoft/yxe/mapper/YxeTaskMapper.java | 45 +
.../yxe/mapper/YxeTaskProductMapper.java | 37 +
.../yxe/mapper/YxeUserTaskMapper.java | 37 +
.../yxe/mapper/YxeVisitListMapper.java | 37 +
.../YxeChronicDiseaseCollectionMapper.xml} | 42 +-
.../xml/YxeChronicDiseaseProductMapper.xml} | 29 +-
.../yxe/mapper/xml/YxeGoodsMapper.xml | 92 ++
.../xml/YxeProductExtraIncomeMapper.xml} | 26 +-
.../yxe/mapper/xml/YxeProductMapper.xml | 79 ++
.../YxeProductMerchantExtraIncomeMapper.xml | 63 +
.../yxe/mapper/xml/YxeReimburseMapper.xml | 80 ++
.../yxe/mapper/xml/YxeSelfReportMapper.xml | 101 ++
.../mapper/xml/YxeServiceMapper.xml} | 23 +-
.../yxe/mapper/xml/YxeShareDetailMapper.xml | 69 ++
.../yxe/mapper/xml/YxeShareMapper.xml | 82 ++
.../mapper/xml/YxeTaskCateMapper.xml} | 22 +-
.../yxe/mapper/xml/YxeTaskMapper.xml | 113 ++
.../mapper/xml/YxeTaskProductMapper.xml} | 20 +-
.../yxe/mapper/xml/YxeUserTaskMapper.xml | 100 ++
.../yxe/mapper/xml/YxeVisitListMapper.xml | 94 ++
.../YxeChronicDiseaseCollectionParam.java} | 46 +-
.../param/YxeChronicDiseaseProductParam.java} | 25 +-
.../gxwebsoft/yxe/param/YxeGoodsParam.java | 76 ++
.../param/YxeProductExtraIncomeParam.java} | 25 +-
.../YxeProductMerchantExtraIncomeParam.java | 54 +
.../gxwebsoft/yxe/param/YxeProductParam.java | 65 +
.../yxe/param/YxeReimburseParam.java | 71 ++
.../yxe/param/YxeSelfReportParam.java | 82 ++
.../param/YxeServiceParam.java} | 18 +-
.../param/YxeShareDetailParam.java} | 46 +-
.../param/YxeShareParam.java} | 57 +-
.../param/YxeTaskCateParam.java} | 29 +-
.../com/gxwebsoft/yxe/param/YxeTaskParam.java | 110 ++
.../param/YxeTaskProductParam.java} | 28 +-
.../gxwebsoft/yxe/param/YxeUserTaskParam.java | 97 ++
.../yxe/param/YxeVisitListParam.java | 80 ++
.../YxeChronicDiseaseCollectionService.java | 42 +
.../YxeChronicDiseaseProductService.java | 32 +
.../yxe/service/YxeGoodsService.java | 42 +
.../service/YxeProductExtraIncomeService.java | 45 +
.../YxeProductMerchantExtraIncomeService.java | 42 +
.../yxe/service/YxeProductService.java | 65 +
.../yxe/service/YxeReimburseService.java | 42 +
.../yxe/service/YxeSelfReportService.java | 25 +
.../yxe/service/YxeServiceService.java | 42 +
.../yxe/service/YxeShareDetailService.java | 49 +
.../yxe/service/YxeShareService.java | 61 +
.../yxe/service/YxeTaskCateService.java | 43 +
.../yxe/service/YxeTaskProductService.java | 52 +
.../gxwebsoft/yxe/service/YxeTaskService.java | 47 +
.../yxe/service/YxeUserTaskService.java | 65 +
.../yxe/service/YxeVisitListService.java | 42 +
...xeChronicDiseaseCollectionServiceImpl.java | 47 +
.../YxeChronicDiseaseProductServiceImpl.java | 47 +
.../yxe/service/impl/YxeGoodsServiceImpl.java | 48 +
.../YxeProductExtraIncomeServiceImpl.java | 64 +
...ProductMerchantExtraIncomeServiceImpl.java | 55 +
.../service/impl/YxeProductServiceImpl.java | 276 +++++
.../service/impl/YxeReimburseServiceImpl.java | 53 +
.../impl/YxeSelfReportServiceImpl.java | 135 +++
.../service/impl/YxeServiceServiceImpl.java | 47 +
.../impl/YxeShareDetailServiceImpl.java | 90 ++
.../yxe/service/impl/YxeShareServiceImpl.java | 269 +++++
.../service/impl/YxeTaskCateServiceImpl.java | 57 +
.../impl/YxeTaskProductServiceImpl.java | 170 +++
.../yxe/service/impl/YxeTaskServiceImpl.java | 253 ++++
.../service/impl/YxeUserTaskServiceImpl.java | 315 +++++
.../service/impl/YxeVisitListServiceImpl.java | 86 ++
.../yxe/utils/YxeSalesExportUtil.java | 240 ++++
.../com/gxwebsoft/yxe/vo/AuditLiteUserVO.java | 18 +
.../yxe/vo/AuditSelfReportSummaryVO.java | 37 +
.../gxwebsoft/yxe/vo/AuditShareSummaryVO.java | 39 +
.../gxwebsoft/yxe/vo/AuditTaskSummaryVO.java | 30 +
src/main/resources/application-dev.yml | 20 +-
src/main/resources/application-prod.yml | 24 +-
src/main/resources/application.yml | 21 +-
.../cert/44ad9c08a0ab46dd8fc555178df581c4.pem | 9 +
src/main/resources/cert/apiclient_cert.p12 | Bin 2718 -> 2774 bytes
src/main/resources/cert/apiclient_cert.pem | 41 +-
src/main/resources/cert/apiclient_key.pem | 52 +-
src/main/resources/cert/appPublicCert.crt | 19 -
.../resources/cert/backup/apiclient_cert.p12 | Bin 2774 -> 0 bytes
.../resources/cert/backup/apiclient_cert.pem | 25 -
.../resources/cert/backup/apiclient_key.pem | 28 -
...C92BA528729B58B39CC69E58D3855EACFF9DC4.pem | 24 -
...3231584E93B6AE77820074D07EADEACCB7E223.pem | 24 -
.../com/gxwebsoft/generator/CmsGenerator.java | 89 +-
.../gxwebsoft/generator/ShopGenerator.java | 115 +-
.../com/gxwebsoft/generator/SysGenerator.java | 10 +-
.../{LawGenerator.java => YxeGenerator.java} | 16 +-
sys_user_add_user_group.sql | 2 +
transport_maintenance_plan.sql | 34 +
transport_maintenance_record.sql | 34 +
yxe_chronic_disease_product.sql | 18 +
yxe_self_report.sql | 34 +
yxe_self_report_add_activity_time.sql | 2 +
yxe_self_report_add_reject_reason.sql | 2 +
yxe_user_task_add_income.sql | 2 +
434 files changed, 17723 insertions(+), 13168 deletions(-)
mode change 100644 => 100755 mvnw
create mode 100644 src/main/java/com/gxwebsoft/cms/controller/ArticleCollectController.java
rename src/main/java/com/gxwebsoft/{law/controller/LawFeedbackController.java => cms/controller/ArticleCommentController.java} (57%)
rename src/main/java/com/gxwebsoft/{shop/entity/GoodsPhoneModel.java => cms/entity/ArticleCollect.java} (62%)
rename src/main/java/com/gxwebsoft/{law/entity/LawOrgPeople.java => cms/entity/ArticleComment.java} (64%)
create mode 100644 src/main/java/com/gxwebsoft/cms/mapper/ArticleCollectMapper.java
create mode 100644 src/main/java/com/gxwebsoft/cms/mapper/ArticleCommentMapper.java
rename src/main/java/com/gxwebsoft/{law/mapper/xml/LawLegalCalContentMapper.xml => cms/mapper/xml/ArticleCollectMapper.xml} (72%)
rename src/main/java/com/gxwebsoft/{law/mapper/xml/LawLegalDocContentMapper.xml => cms/mapper/xml/ArticleCommentMapper.xml} (74%)
rename src/main/java/com/gxwebsoft/{law/param/LawOrgPeopleParam.java => cms/param/ArticleCollectParam.java} (71%)
rename src/main/java/com/gxwebsoft/{law/param/LawLegalCalContentParam.java => cms/param/ArticleCommentParam.java} (70%)
create mode 100644 src/main/java/com/gxwebsoft/cms/service/ArticleCollectService.java
create mode 100644 src/main/java/com/gxwebsoft/cms/service/ArticleCommentService.java
create mode 100644 src/main/java/com/gxwebsoft/cms/service/impl/ArticleCollectServiceImpl.java
create mode 100644 src/main/java/com/gxwebsoft/cms/service/impl/ArticleCommentServiceImpl.java
create mode 100644 src/main/java/com/gxwebsoft/common/core/utils/ExcelExportUtil.java
create mode 100644 src/main/java/com/gxwebsoft/common/system/controller/AliOssController.java
delete mode 100644 src/main/java/com/gxwebsoft/law/config/WebSocketConfig.java
delete mode 100644 src/main/java/com/gxwebsoft/law/config/WebSocketServer.java
delete mode 100644 src/main/java/com/gxwebsoft/law/controller/AiController.java
delete mode 100644 src/main/java/com/gxwebsoft/law/controller/LawLegalAidController.java
delete mode 100644 src/main/java/com/gxwebsoft/law/controller/LawLegalAppraisalController.java
delete mode 100644 src/main/java/com/gxwebsoft/law/controller/LawLegalArbitrateController.java
delete mode 100644 src/main/java/com/gxwebsoft/law/controller/LawLegalCalConfigController.java
delete mode 100644 src/main/java/com/gxwebsoft/law/controller/LawLegalCalContentController.java
delete mode 100644 src/main/java/com/gxwebsoft/law/controller/LawLegalCalTypeController.java
delete mode 100644 src/main/java/com/gxwebsoft/law/controller/LawLegalDocConfigController.java
delete mode 100644 src/main/java/com/gxwebsoft/law/controller/LawLegalDocContentController.java
delete mode 100644 src/main/java/com/gxwebsoft/law/controller/LawLegalDocTypeController.java
delete mode 100644 src/main/java/com/gxwebsoft/law/controller/LawLegalOrgCheckConfigController.java
delete mode 100644 src/main/java/com/gxwebsoft/law/controller/LawLegalOrgCheckConfigSuggestController.java
delete mode 100644 src/main/java/com/gxwebsoft/law/controller/LawLegalOrgCheckContentController.java
delete mode 100644 src/main/java/com/gxwebsoft/law/controller/LawLegalOrgCheckContentSuggestController.java
delete mode 100644 src/main/java/com/gxwebsoft/law/controller/LawLegalOrgCheckTypeController.java
delete mode 100644 src/main/java/com/gxwebsoft/law/controller/LawLegalOrgCheckTypeSuggestController.java
delete mode 100644 src/main/java/com/gxwebsoft/law/controller/LawNotaryConfigController.java
delete mode 100644 src/main/java/com/gxwebsoft/law/controller/LawNotaryListController.java
delete mode 100644 src/main/java/com/gxwebsoft/law/controller/LawOrgCheckLogController.java
delete mode 100644 src/main/java/com/gxwebsoft/law/controller/LawOrgController.java
delete mode 100644 src/main/java/com/gxwebsoft/law/entity/ChatMessage.java
delete mode 100644 src/main/java/com/gxwebsoft/law/entity/ChatResponse.java
delete mode 100644 src/main/java/com/gxwebsoft/law/entity/LawFeedback.java
delete mode 100644 src/main/java/com/gxwebsoft/law/entity/LawLegalAppraisal.java
delete mode 100644 src/main/java/com/gxwebsoft/law/entity/LawLegalArbitrate.java
delete mode 100644 src/main/java/com/gxwebsoft/law/entity/LawLegalCalConfig.java
delete mode 100644 src/main/java/com/gxwebsoft/law/entity/LawLegalCalContent.java
delete mode 100644 src/main/java/com/gxwebsoft/law/entity/LawLegalDocConfig.java
delete mode 100644 src/main/java/com/gxwebsoft/law/entity/LawLegalDocContent.java
delete mode 100644 src/main/java/com/gxwebsoft/law/entity/LawLegalOrgCheckConfig.java
delete mode 100644 src/main/java/com/gxwebsoft/law/entity/LawLegalOrgCheckConfigSuggest.java
delete mode 100644 src/main/java/com/gxwebsoft/law/entity/LawLegalOrgCheckContentSuggest.java
delete mode 100644 src/main/java/com/gxwebsoft/law/entity/LawNotaryList.java
delete mode 100644 src/main/java/com/gxwebsoft/law/entity/LawOrgCheckLog.java
delete mode 100644 src/main/java/com/gxwebsoft/law/mapper/LawFeedbackMapper.java
delete mode 100644 src/main/java/com/gxwebsoft/law/mapper/LawLegalAidMapper.java
delete mode 100644 src/main/java/com/gxwebsoft/law/mapper/LawLegalAppraisalMapper.java
delete mode 100644 src/main/java/com/gxwebsoft/law/mapper/LawLegalArbitrateMapper.java
delete mode 100644 src/main/java/com/gxwebsoft/law/mapper/LawLegalCalConfigMapper.java
delete mode 100644 src/main/java/com/gxwebsoft/law/mapper/LawLegalCalContentMapper.java
delete mode 100644 src/main/java/com/gxwebsoft/law/mapper/LawLegalCalTypeMapper.java
delete mode 100644 src/main/java/com/gxwebsoft/law/mapper/LawLegalDocConfigMapper.java
delete mode 100644 src/main/java/com/gxwebsoft/law/mapper/LawLegalDocContentMapper.java
delete mode 100644 src/main/java/com/gxwebsoft/law/mapper/LawLegalDocTypeMapper.java
delete mode 100644 src/main/java/com/gxwebsoft/law/mapper/LawLegalOrgCheckConfigMapper.java
delete mode 100644 src/main/java/com/gxwebsoft/law/mapper/LawLegalOrgCheckConfigSuggestMapper.java
delete mode 100644 src/main/java/com/gxwebsoft/law/mapper/LawLegalOrgCheckContentMapper.java
delete mode 100644 src/main/java/com/gxwebsoft/law/mapper/LawLegalOrgCheckContentSuggestMapper.java
delete mode 100644 src/main/java/com/gxwebsoft/law/mapper/LawLegalOrgCheckTypeMapper.java
delete mode 100644 src/main/java/com/gxwebsoft/law/mapper/LawLegalOrgCheckTypeSuggestMapper.java
delete mode 100644 src/main/java/com/gxwebsoft/law/mapper/LawNotaryConfigMapper.java
delete mode 100644 src/main/java/com/gxwebsoft/law/mapper/LawNotaryListMapper.java
delete mode 100644 src/main/java/com/gxwebsoft/law/mapper/LawOrgCheckLogMapper.java
delete mode 100644 src/main/java/com/gxwebsoft/law/mapper/LawOrgMapper.java
delete mode 100644 src/main/java/com/gxwebsoft/law/mapper/LawOrgPeopleMapper.java
delete mode 100644 src/main/java/com/gxwebsoft/law/mapper/xml/LawFeedbackMapper.xml
delete mode 100644 src/main/java/com/gxwebsoft/law/mapper/xml/LawLegalAppraisalMapper.xml
delete mode 100644 src/main/java/com/gxwebsoft/law/mapper/xml/LawLegalArbitrateMapper.xml
delete mode 100644 src/main/java/com/gxwebsoft/law/mapper/xml/LawLegalCalConfigMapper.xml
delete mode 100644 src/main/java/com/gxwebsoft/law/mapper/xml/LawLegalOrgCheckConfigMapper.xml
delete mode 100644 src/main/java/com/gxwebsoft/law/mapper/xml/LawLegalOrgCheckConfigSuggestMapper.xml
delete mode 100644 src/main/java/com/gxwebsoft/law/mapper/xml/LawLegalOrgCheckContentMapper.xml
delete mode 100644 src/main/java/com/gxwebsoft/law/mapper/xml/LawLegalOrgCheckContentSuggestMapper.xml
delete mode 100644 src/main/java/com/gxwebsoft/law/mapper/xml/LawNotaryConfigMapper.xml
delete mode 100644 src/main/java/com/gxwebsoft/law/mapper/xml/LawNotaryListMapper.xml
delete mode 100644 src/main/java/com/gxwebsoft/law/mapper/xml/LawOrgCheckLogMapper.xml
delete mode 100644 src/main/java/com/gxwebsoft/law/mapper/xml/LawOrgMapper.xml
delete mode 100644 src/main/java/com/gxwebsoft/law/mapper/xml/LawOrgPeopleMapper.xml
delete mode 100644 src/main/java/com/gxwebsoft/law/param/LawLegalAidParam.java
delete mode 100644 src/main/java/com/gxwebsoft/law/param/LawLegalArbitrateParam.java
delete mode 100644 src/main/java/com/gxwebsoft/law/param/LawLegalCalConfigParam.java
delete mode 100644 src/main/java/com/gxwebsoft/law/param/LawLegalDocConfigParam.java
delete mode 100644 src/main/java/com/gxwebsoft/law/param/LawLegalDocContentParam.java
delete mode 100644 src/main/java/com/gxwebsoft/law/param/LawLegalOrgCheckConfigParam.java
delete mode 100644 src/main/java/com/gxwebsoft/law/param/LawLegalOrgCheckConfigSuggestParam.java
delete mode 100644 src/main/java/com/gxwebsoft/law/param/LawLegalOrgCheckContentParam.java
delete mode 100644 src/main/java/com/gxwebsoft/law/param/LawLegalOrgCheckContentSuggestParam.java
delete mode 100644 src/main/java/com/gxwebsoft/law/param/LawNotaryListParam.java
delete mode 100644 src/main/java/com/gxwebsoft/law/param/LawOrgCheckLogParam.java
delete mode 100644 src/main/java/com/gxwebsoft/law/service/LawFeedbackService.java
delete mode 100644 src/main/java/com/gxwebsoft/law/service/LawLegalAidService.java
delete mode 100644 src/main/java/com/gxwebsoft/law/service/LawLegalAppraisalService.java
delete mode 100644 src/main/java/com/gxwebsoft/law/service/LawLegalArbitrateService.java
delete mode 100644 src/main/java/com/gxwebsoft/law/service/LawLegalCalConfigService.java
delete mode 100644 src/main/java/com/gxwebsoft/law/service/LawLegalCalContentService.java
delete mode 100644 src/main/java/com/gxwebsoft/law/service/LawLegalCalTypeService.java
delete mode 100644 src/main/java/com/gxwebsoft/law/service/LawLegalDocConfigService.java
delete mode 100644 src/main/java/com/gxwebsoft/law/service/LawLegalDocContentService.java
delete mode 100644 src/main/java/com/gxwebsoft/law/service/LawLegalDocTypeService.java
delete mode 100644 src/main/java/com/gxwebsoft/law/service/LawLegalOrgCheckConfigService.java
delete mode 100644 src/main/java/com/gxwebsoft/law/service/LawLegalOrgCheckConfigSuggestService.java
delete mode 100644 src/main/java/com/gxwebsoft/law/service/LawLegalOrgCheckContentService.java
delete mode 100644 src/main/java/com/gxwebsoft/law/service/LawLegalOrgCheckContentSuggestService.java
delete mode 100644 src/main/java/com/gxwebsoft/law/service/LawLegalOrgCheckTypeService.java
delete mode 100644 src/main/java/com/gxwebsoft/law/service/LawLegalOrgCheckTypeSuggestService.java
delete mode 100644 src/main/java/com/gxwebsoft/law/service/LawNotaryConfigService.java
delete mode 100644 src/main/java/com/gxwebsoft/law/service/LawNotaryListService.java
delete mode 100644 src/main/java/com/gxwebsoft/law/service/LawOrgCheckLogService.java
delete mode 100644 src/main/java/com/gxwebsoft/law/service/LawOrgPeopleService.java
delete mode 100644 src/main/java/com/gxwebsoft/law/service/LawOrgService.java
delete mode 100644 src/main/java/com/gxwebsoft/law/service/impl/LawFeedbackServiceImpl.java
delete mode 100644 src/main/java/com/gxwebsoft/law/service/impl/LawLegalAidServiceImpl.java
delete mode 100644 src/main/java/com/gxwebsoft/law/service/impl/LawLegalAppraisalServiceImpl.java
delete mode 100644 src/main/java/com/gxwebsoft/law/service/impl/LawLegalArbitrateServiceImpl.java
delete mode 100644 src/main/java/com/gxwebsoft/law/service/impl/LawLegalCalConfigServiceImpl.java
delete mode 100644 src/main/java/com/gxwebsoft/law/service/impl/LawLegalCalContentServiceImpl.java
delete mode 100644 src/main/java/com/gxwebsoft/law/service/impl/LawLegalCalTypeServiceImpl.java
delete mode 100644 src/main/java/com/gxwebsoft/law/service/impl/LawLegalDocConfigServiceImpl.java
delete mode 100644 src/main/java/com/gxwebsoft/law/service/impl/LawLegalDocContentServiceImpl.java
delete mode 100644 src/main/java/com/gxwebsoft/law/service/impl/LawLegalDocTypeServiceImpl.java
delete mode 100644 src/main/java/com/gxwebsoft/law/service/impl/LawLegalOrgCheckConfigServiceImpl.java
delete mode 100644 src/main/java/com/gxwebsoft/law/service/impl/LawLegalOrgCheckConfigSuggestServiceImpl.java
delete mode 100644 src/main/java/com/gxwebsoft/law/service/impl/LawLegalOrgCheckContentServiceImpl.java
delete mode 100644 src/main/java/com/gxwebsoft/law/service/impl/LawLegalOrgCheckContentSuggestServiceImpl.java
delete mode 100644 src/main/java/com/gxwebsoft/law/service/impl/LawLegalOrgCheckTypeServiceImpl.java
delete mode 100644 src/main/java/com/gxwebsoft/law/service/impl/LawLegalOrgCheckTypeSuggestServiceImpl.java
delete mode 100644 src/main/java/com/gxwebsoft/law/service/impl/LawNotaryConfigServiceImpl.java
delete mode 100644 src/main/java/com/gxwebsoft/law/service/impl/LawNotaryListServiceImpl.java
delete mode 100644 src/main/java/com/gxwebsoft/law/service/impl/LawOrgCheckLogServiceImpl.java
delete mode 100644 src/main/java/com/gxwebsoft/law/service/impl/LawOrgPeopleServiceImpl.java
delete mode 100644 src/main/java/com/gxwebsoft/law/service/impl/LawOrgServiceImpl.java
delete mode 100644 src/main/java/com/gxwebsoft/open/controller/OpenCartController.java
delete mode 100644 src/main/java/com/gxwebsoft/open/controller/OpenUserOrderController.java
create mode 100644 src/main/java/com/gxwebsoft/shop/controller/DealerWithdrawController.java
delete mode 100644 src/main/java/com/gxwebsoft/shop/controller/GoodsPhoneModelController.java
delete mode 100644 src/main/java/com/gxwebsoft/shop/controller/GoodsPriceController.java
delete mode 100644 src/main/java/com/gxwebsoft/shop/controller/GoodsServiceController.java
create mode 100644 src/main/java/com/gxwebsoft/shop/controller/OrderController.java
delete mode 100644 src/main/java/com/gxwebsoft/shop/controller/PaymentController.java
delete mode 100644 src/main/java/com/gxwebsoft/shop/controller/TestController.java
create mode 100644 src/main/java/com/gxwebsoft/shop/controller/UserParentListController.java
create mode 100644 src/main/java/com/gxwebsoft/shop/controller/UserPointLogController.java
create mode 100644 src/main/java/com/gxwebsoft/shop/entity/DealerWithdraw.java
delete mode 100644 src/main/java/com/gxwebsoft/shop/entity/GoodsPrice.java
delete mode 100644 src/main/java/com/gxwebsoft/shop/entity/GoodsService.java
rename src/main/java/com/gxwebsoft/{law/entity/LawLegalDocType.java => shop/entity/UserParentList.java} (64%)
rename src/main/java/com/gxwebsoft/{law/entity/LawLegalOrgCheckTypeSuggest.java => shop/entity/UserPointLog.java} (61%)
create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/DealerWithdrawMapper.java
delete mode 100644 src/main/java/com/gxwebsoft/shop/mapper/GoodsPhoneModelMapper.java
delete mode 100644 src/main/java/com/gxwebsoft/shop/mapper/GoodsPriceMapper.java
delete mode 100644 src/main/java/com/gxwebsoft/shop/mapper/GoodsServiceMapper.java
create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/UserParentListMapper.java
create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/UserPointLogMapper.java
create mode 100644 src/main/java/com/gxwebsoft/shop/mapper/xml/DealerWithdrawMapper.xml
delete mode 100644 src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsPriceMapper.xml
rename src/main/java/com/gxwebsoft/{law/mapper/xml/LawLegalDocTypeMapper.xml => shop/mapper/xml/UserParentListMapper.xml} (65%)
rename src/main/java/com/gxwebsoft/shop/mapper/xml/{GoodsServiceMapper.xml => UserPointLogMapper.xml} (69%)
create mode 100644 src/main/java/com/gxwebsoft/shop/param/DealerWithdrawParam.java
rename src/main/java/com/gxwebsoft/{law/param/LawLegalDocTypeParam.java => shop/param/UserParentListParam.java} (62%)
rename src/main/java/com/gxwebsoft/{law/param/LawLegalOrgCheckTypeSuggestParam.java => shop/param/UserPointLogParam.java} (60%)
create mode 100644 src/main/java/com/gxwebsoft/shop/service/DealerWithdrawService.java
delete mode 100644 src/main/java/com/gxwebsoft/shop/service/GoodsPhoneModelService.java
delete mode 100644 src/main/java/com/gxwebsoft/shop/service/GoodsPriceService.java
delete mode 100644 src/main/java/com/gxwebsoft/shop/service/GoodsServiceService.java
create mode 100644 src/main/java/com/gxwebsoft/shop/service/UserParentListService.java
create mode 100644 src/main/java/com/gxwebsoft/shop/service/UserPointLogService.java
create mode 100644 src/main/java/com/gxwebsoft/shop/service/impl/DealerWithdrawServiceImpl.java
delete mode 100644 src/main/java/com/gxwebsoft/shop/service/impl/GoodsPhoneModelServiceImpl.java
delete mode 100644 src/main/java/com/gxwebsoft/shop/service/impl/GoodsPriceServiceImpl.java
delete mode 100644 src/main/java/com/gxwebsoft/shop/service/impl/GoodsServiceServiceImpl.java
create mode 100644 src/main/java/com/gxwebsoft/shop/service/impl/UserParentListServiceImpl.java
create mode 100644 src/main/java/com/gxwebsoft/shop/service/impl/UserPointLogServiceImpl.java
create mode 100644 src/main/java/com/gxwebsoft/sys/controller/SysAreaController.java
create mode 100644 src/main/java/com/gxwebsoft/sys/entity/SysArea.java
create mode 100644 src/main/java/com/gxwebsoft/sys/mapper/SysAreaMapper.java
create mode 100644 src/main/java/com/gxwebsoft/sys/mapper/xml/SysAreaMapper.xml
rename src/main/java/com/gxwebsoft/{law/param/LawFeedbackParam.java => sys/param/SysAreaParam.java} (58%)
create mode 100644 src/main/java/com/gxwebsoft/sys/service/SysAreaService.java
create mode 100644 src/main/java/com/gxwebsoft/sys/service/impl/SysAreaServiceImpl.java
create mode 100644 src/main/java/com/gxwebsoft/transport/controller/MaintenancePlanController.java
create mode 100644 src/main/java/com/gxwebsoft/transport/controller/MaintenanceRecordController.java
create mode 100644 src/main/java/com/gxwebsoft/transport/entity/MaintenancePlan.java
create mode 100644 src/main/java/com/gxwebsoft/transport/entity/MaintenanceRecord.java
create mode 100644 src/main/java/com/gxwebsoft/transport/mapper/MaintenancePlanMapper.java
create mode 100644 src/main/java/com/gxwebsoft/transport/mapper/MaintenanceRecordMapper.java
create mode 100644 src/main/java/com/gxwebsoft/transport/mapper/xml/MaintenancePlanMapper.xml
create mode 100644 src/main/java/com/gxwebsoft/transport/mapper/xml/MaintenanceRecordMapper.xml
create mode 100644 src/main/java/com/gxwebsoft/transport/param/MaintenancePlanParam.java
create mode 100644 src/main/java/com/gxwebsoft/transport/param/MaintenanceRecordParam.java
create mode 100644 src/main/java/com/gxwebsoft/transport/service/MaintenancePlanService.java
create mode 100644 src/main/java/com/gxwebsoft/transport/service/MaintenanceRecordService.java
create mode 100644 src/main/java/com/gxwebsoft/transport/service/impl/MaintenancePlanServiceImpl.java
create mode 100644 src/main/java/com/gxwebsoft/transport/service/impl/MaintenanceRecordServiceImpl.java
create mode 100644 src/main/java/com/gxwebsoft/yxe/controller/AliAiController.java
create mode 100644 src/main/java/com/gxwebsoft/yxe/controller/BaiduController.java
create mode 100644 src/main/java/com/gxwebsoft/yxe/controller/YxeChronicDiseaseCollectionController.java
create mode 100644 src/main/java/com/gxwebsoft/yxe/controller/YxeChronicDiseaseProductController.java
create mode 100644 src/main/java/com/gxwebsoft/yxe/controller/YxeGoodsController.java
create mode 100644 src/main/java/com/gxwebsoft/yxe/controller/YxeProductController.java
create mode 100644 src/main/java/com/gxwebsoft/yxe/controller/YxeProductExtraIncomeController.java
create mode 100644 src/main/java/com/gxwebsoft/yxe/controller/YxeProductMerchantExtraIncomeController.java
create mode 100644 src/main/java/com/gxwebsoft/yxe/controller/YxeReimburseController.java
create mode 100644 src/main/java/com/gxwebsoft/yxe/controller/YxeSelfReportController.java
create mode 100644 src/main/java/com/gxwebsoft/yxe/controller/YxeServiceController.java
create mode 100644 src/main/java/com/gxwebsoft/yxe/controller/YxeShareController.java
create mode 100644 src/main/java/com/gxwebsoft/yxe/controller/YxeShareDetailController.java
rename src/main/java/com/gxwebsoft/{law/controller/LawOrgPeopleController.java => yxe/controller/YxeTaskCateController.java} (58%)
create mode 100644 src/main/java/com/gxwebsoft/yxe/controller/YxeTaskController.java
create mode 100644 src/main/java/com/gxwebsoft/yxe/controller/YxeTaskProductController.java
create mode 100644 src/main/java/com/gxwebsoft/yxe/controller/YxeUserTaskController.java
create mode 100644 src/main/java/com/gxwebsoft/yxe/controller/YxeVisitListController.java
create mode 100644 src/main/java/com/gxwebsoft/yxe/entity/YxeChronicDiseaseCollection.java
rename src/main/java/com/gxwebsoft/{law/entity/LawLegalAid.java => yxe/entity/YxeChronicDiseaseProduct.java} (51%)
create mode 100644 src/main/java/com/gxwebsoft/yxe/entity/YxeGoods.java
create mode 100644 src/main/java/com/gxwebsoft/yxe/entity/YxeProduct.java
rename src/main/java/com/gxwebsoft/{law/entity/LawLegalCalType.java => yxe/entity/YxeProductExtraIncome.java} (62%)
rename src/main/java/com/gxwebsoft/{law/entity/LawLegalOrgCheckContent.java => yxe/entity/YxeProductMerchantExtraIncome.java} (53%)
create mode 100644 src/main/java/com/gxwebsoft/yxe/entity/YxeReimburse.java
create mode 100644 src/main/java/com/gxwebsoft/yxe/entity/YxeSelfReport.java
rename src/main/java/com/gxwebsoft/{law/entity/LawNotaryConfig.java => yxe/entity/YxeService.java} (71%)
create mode 100644 src/main/java/com/gxwebsoft/yxe/entity/YxeShare.java
create mode 100644 src/main/java/com/gxwebsoft/yxe/entity/YxeShareDetail.java
create mode 100644 src/main/java/com/gxwebsoft/yxe/entity/YxeTask.java
rename src/main/java/com/gxwebsoft/{law/entity/LawLegalOrgCheckType.java => yxe/entity/YxeTaskCate.java} (65%)
rename src/main/java/com/gxwebsoft/{law/entity/LawOrg.java => yxe/entity/YxeTaskProduct.java} (55%)
create mode 100644 src/main/java/com/gxwebsoft/yxe/entity/YxeUserTask.java
create mode 100644 src/main/java/com/gxwebsoft/yxe/entity/YxeVisitList.java
create mode 100644 src/main/java/com/gxwebsoft/yxe/mapper/YxeChronicDiseaseCollectionMapper.java
create mode 100644 src/main/java/com/gxwebsoft/yxe/mapper/YxeChronicDiseaseProductMapper.java
create mode 100644 src/main/java/com/gxwebsoft/yxe/mapper/YxeGoodsMapper.java
create mode 100644 src/main/java/com/gxwebsoft/yxe/mapper/YxeProductExtraIncomeMapper.java
create mode 100644 src/main/java/com/gxwebsoft/yxe/mapper/YxeProductMapper.java
create mode 100644 src/main/java/com/gxwebsoft/yxe/mapper/YxeProductMerchantExtraIncomeMapper.java
create mode 100644 src/main/java/com/gxwebsoft/yxe/mapper/YxeReimburseMapper.java
create mode 100644 src/main/java/com/gxwebsoft/yxe/mapper/YxeSelfReportMapper.java
create mode 100644 src/main/java/com/gxwebsoft/yxe/mapper/YxeServiceMapper.java
create mode 100644 src/main/java/com/gxwebsoft/yxe/mapper/YxeShareDetailMapper.java
create mode 100644 src/main/java/com/gxwebsoft/yxe/mapper/YxeShareMapper.java
create mode 100644 src/main/java/com/gxwebsoft/yxe/mapper/YxeTaskCateMapper.java
create mode 100644 src/main/java/com/gxwebsoft/yxe/mapper/YxeTaskMapper.java
create mode 100644 src/main/java/com/gxwebsoft/yxe/mapper/YxeTaskProductMapper.java
create mode 100644 src/main/java/com/gxwebsoft/yxe/mapper/YxeUserTaskMapper.java
create mode 100644 src/main/java/com/gxwebsoft/yxe/mapper/YxeVisitListMapper.java
rename src/main/java/com/gxwebsoft/{law/mapper/xml/LawLegalAidMapper.xml => yxe/mapper/xml/YxeChronicDiseaseCollectionMapper.xml} (60%)
rename src/main/java/com/gxwebsoft/{shop/mapper/xml/GoodsPhoneModelMapper.xml => yxe/mapper/xml/YxeChronicDiseaseProductMapper.xml} (55%)
create mode 100644 src/main/java/com/gxwebsoft/yxe/mapper/xml/YxeGoodsMapper.xml
rename src/main/java/com/gxwebsoft/{law/mapper/xml/LawLegalOrgCheckTypeSuggestMapper.xml => yxe/mapper/xml/YxeProductExtraIncomeMapper.xml} (61%)
create mode 100644 src/main/java/com/gxwebsoft/yxe/mapper/xml/YxeProductMapper.xml
create mode 100644 src/main/java/com/gxwebsoft/yxe/mapper/xml/YxeProductMerchantExtraIncomeMapper.xml
create mode 100644 src/main/java/com/gxwebsoft/yxe/mapper/xml/YxeReimburseMapper.xml
create mode 100644 src/main/java/com/gxwebsoft/yxe/mapper/xml/YxeSelfReportMapper.xml
rename src/main/java/com/gxwebsoft/{law/mapper/xml/LawLegalDocConfigMapper.xml => yxe/mapper/xml/YxeServiceMapper.xml} (71%)
create mode 100644 src/main/java/com/gxwebsoft/yxe/mapper/xml/YxeShareDetailMapper.xml
create mode 100644 src/main/java/com/gxwebsoft/yxe/mapper/xml/YxeShareMapper.xml
rename src/main/java/com/gxwebsoft/{law/mapper/xml/LawLegalOrgCheckTypeMapper.xml => yxe/mapper/xml/YxeTaskCateMapper.xml} (72%)
create mode 100644 src/main/java/com/gxwebsoft/yxe/mapper/xml/YxeTaskMapper.xml
rename src/main/java/com/gxwebsoft/{law/mapper/xml/LawLegalCalTypeMapper.xml => yxe/mapper/xml/YxeTaskProductMapper.xml} (70%)
create mode 100644 src/main/java/com/gxwebsoft/yxe/mapper/xml/YxeUserTaskMapper.xml
create mode 100644 src/main/java/com/gxwebsoft/yxe/mapper/xml/YxeVisitListMapper.xml
rename src/main/java/com/gxwebsoft/{law/param/LawLegalAppraisalParam.java => yxe/param/YxeChronicDiseaseCollectionParam.java} (52%)
rename src/main/java/com/gxwebsoft/{shop/param/GoodsPhoneModelParam.java => yxe/param/YxeChronicDiseaseProductParam.java} (62%)
create mode 100644 src/main/java/com/gxwebsoft/yxe/param/YxeGoodsParam.java
rename src/main/java/com/gxwebsoft/{law/param/LawLegalOrgCheckTypeParam.java => yxe/param/YxeProductExtraIncomeParam.java} (59%)
create mode 100644 src/main/java/com/gxwebsoft/yxe/param/YxeProductMerchantExtraIncomeParam.java
create mode 100644 src/main/java/com/gxwebsoft/yxe/param/YxeProductParam.java
create mode 100644 src/main/java/com/gxwebsoft/yxe/param/YxeReimburseParam.java
create mode 100644 src/main/java/com/gxwebsoft/yxe/param/YxeSelfReportParam.java
rename src/main/java/com/gxwebsoft/{law/param/LawNotaryConfigParam.java => yxe/param/YxeServiceParam.java} (69%)
rename src/main/java/com/gxwebsoft/{shop/param/GoodsPriceParam.java => yxe/param/YxeShareDetailParam.java} (61%)
rename src/main/java/com/gxwebsoft/{shop/param/GoodsServiceParam.java => yxe/param/YxeShareParam.java} (57%)
rename src/main/java/com/gxwebsoft/{law/param/LawLegalCalTypeParam.java => yxe/param/YxeTaskCateParam.java} (58%)
create mode 100644 src/main/java/com/gxwebsoft/yxe/param/YxeTaskParam.java
rename src/main/java/com/gxwebsoft/{law/param/LawOrgParam.java => yxe/param/YxeTaskProductParam.java} (66%)
create mode 100644 src/main/java/com/gxwebsoft/yxe/param/YxeUserTaskParam.java
create mode 100644 src/main/java/com/gxwebsoft/yxe/param/YxeVisitListParam.java
create mode 100644 src/main/java/com/gxwebsoft/yxe/service/YxeChronicDiseaseCollectionService.java
create mode 100644 src/main/java/com/gxwebsoft/yxe/service/YxeChronicDiseaseProductService.java
create mode 100644 src/main/java/com/gxwebsoft/yxe/service/YxeGoodsService.java
create mode 100644 src/main/java/com/gxwebsoft/yxe/service/YxeProductExtraIncomeService.java
create mode 100644 src/main/java/com/gxwebsoft/yxe/service/YxeProductMerchantExtraIncomeService.java
create mode 100644 src/main/java/com/gxwebsoft/yxe/service/YxeProductService.java
create mode 100644 src/main/java/com/gxwebsoft/yxe/service/YxeReimburseService.java
create mode 100644 src/main/java/com/gxwebsoft/yxe/service/YxeSelfReportService.java
create mode 100644 src/main/java/com/gxwebsoft/yxe/service/YxeServiceService.java
create mode 100644 src/main/java/com/gxwebsoft/yxe/service/YxeShareDetailService.java
create mode 100644 src/main/java/com/gxwebsoft/yxe/service/YxeShareService.java
create mode 100644 src/main/java/com/gxwebsoft/yxe/service/YxeTaskCateService.java
create mode 100644 src/main/java/com/gxwebsoft/yxe/service/YxeTaskProductService.java
create mode 100644 src/main/java/com/gxwebsoft/yxe/service/YxeTaskService.java
create mode 100644 src/main/java/com/gxwebsoft/yxe/service/YxeUserTaskService.java
create mode 100644 src/main/java/com/gxwebsoft/yxe/service/YxeVisitListService.java
create mode 100644 src/main/java/com/gxwebsoft/yxe/service/impl/YxeChronicDiseaseCollectionServiceImpl.java
create mode 100644 src/main/java/com/gxwebsoft/yxe/service/impl/YxeChronicDiseaseProductServiceImpl.java
create mode 100644 src/main/java/com/gxwebsoft/yxe/service/impl/YxeGoodsServiceImpl.java
create mode 100644 src/main/java/com/gxwebsoft/yxe/service/impl/YxeProductExtraIncomeServiceImpl.java
create mode 100644 src/main/java/com/gxwebsoft/yxe/service/impl/YxeProductMerchantExtraIncomeServiceImpl.java
create mode 100644 src/main/java/com/gxwebsoft/yxe/service/impl/YxeProductServiceImpl.java
create mode 100644 src/main/java/com/gxwebsoft/yxe/service/impl/YxeReimburseServiceImpl.java
create mode 100644 src/main/java/com/gxwebsoft/yxe/service/impl/YxeSelfReportServiceImpl.java
create mode 100644 src/main/java/com/gxwebsoft/yxe/service/impl/YxeServiceServiceImpl.java
create mode 100644 src/main/java/com/gxwebsoft/yxe/service/impl/YxeShareDetailServiceImpl.java
create mode 100644 src/main/java/com/gxwebsoft/yxe/service/impl/YxeShareServiceImpl.java
create mode 100644 src/main/java/com/gxwebsoft/yxe/service/impl/YxeTaskCateServiceImpl.java
create mode 100644 src/main/java/com/gxwebsoft/yxe/service/impl/YxeTaskProductServiceImpl.java
create mode 100644 src/main/java/com/gxwebsoft/yxe/service/impl/YxeTaskServiceImpl.java
create mode 100644 src/main/java/com/gxwebsoft/yxe/service/impl/YxeUserTaskServiceImpl.java
create mode 100644 src/main/java/com/gxwebsoft/yxe/service/impl/YxeVisitListServiceImpl.java
create mode 100644 src/main/java/com/gxwebsoft/yxe/utils/YxeSalesExportUtil.java
create mode 100644 src/main/java/com/gxwebsoft/yxe/vo/AuditLiteUserVO.java
create mode 100644 src/main/java/com/gxwebsoft/yxe/vo/AuditSelfReportSummaryVO.java
create mode 100644 src/main/java/com/gxwebsoft/yxe/vo/AuditShareSummaryVO.java
create mode 100644 src/main/java/com/gxwebsoft/yxe/vo/AuditTaskSummaryVO.java
create mode 100644 src/main/resources/cert/44ad9c08a0ab46dd8fc555178df581c4.pem
delete mode 100644 src/main/resources/cert/appPublicCert.crt
delete mode 100755 src/main/resources/cert/backup/apiclient_cert.p12
delete mode 100755 src/main/resources/cert/backup/apiclient_cert.pem
delete mode 100755 src/main/resources/cert/backup/apiclient_key.pem
delete mode 100644 src/main/resources/cert/wechatpay_0BC92BA528729B58B39CC69E58D3855EACFF9DC4.pem
delete mode 100644 src/main/resources/cert/wechatpay_4A3231584E93B6AE77820074D07EADEACCB7E223.pem
rename src/test/java/com/gxwebsoft/generator/{LawGenerator.java => YxeGenerator.java} (95%)
create mode 100644 sys_user_add_user_group.sql
create mode 100644 transport_maintenance_plan.sql
create mode 100644 transport_maintenance_record.sql
create mode 100644 yxe_chronic_disease_product.sql
create mode 100644 yxe_self_report.sql
create mode 100644 yxe_self_report_add_activity_time.sql
create mode 100644 yxe_self_report_add_reject_reason.sql
create mode 100644 yxe_user_task_add_income.sql
diff --git a/mvnw b/mvnw
old mode 100644
new mode 100755
diff --git a/pom.xml b/pom.xml
index 18470f3..0458eee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
4.0.0
com.gxwebsoft
- com-gxwebsoft-server
+ yaoxiaoer-java
1.5.2
com-gxwebsoft-api
@@ -21,6 +21,7 @@
1.8
UTF-8
UTF-8
+ 2.13.5
@@ -256,13 +257,12 @@
com.google.code.gson
gson
- 2.8.0
+ 2.10.1
- com.vaadin.external.google
- android-json
- 0.0.20131108.vaadin1
- compile
+ org.json
+ json
+ 20170516
@@ -275,7 +275,63 @@
com.github.wechatpay-apiv3
wechatpay-java
- 0.2.12
+ 0.2.17
+
+
+ com.alibaba.nls
+ nls-sdk-tts
+ 2.2.19
+
+
+ javax.xml.bind
+ jaxb-api
+ 2.3.0
+
+
+ com.sun.xml.bind
+ jaxb-impl
+ 2.3.0
+
+
+ com.sun.xml.bind
+ jaxb-core
+ 2.3.0
+
+
+ javax.activation
+ activation
+ 1.1.1
+
+
+ com.aliyun
+ aliyun-java-sdk-core
+ 3.7.1
+
+
+ com.alibaba
+ dashscope-sdk-java
+
+
+ org.slf4j
+ slf4j-simple
+
+
+ 2.22.5
+
+
+ com.aliyun.oss
+ aliyun-sdk-oss
+ 3.18.4
+
+
+ com.aliyun
+ sts20150401
+ 1.1.6
+
+
+ com.aliyun
+ ocr_api20210707
+ 3.1.2
diff --git a/src/main/java/com/gxwebsoft/cms/controller/ArticleCollectController.java b/src/main/java/com/gxwebsoft/cms/controller/ArticleCollectController.java
new file mode 100644
index 0000000..c2ac511
--- /dev/null
+++ b/src/main/java/com/gxwebsoft/cms/controller/ArticleCollectController.java
@@ -0,0 +1,121 @@
+package com.gxwebsoft.cms.controller;
+
+import com.gxwebsoft.common.core.web.BaseController;
+import com.gxwebsoft.cms.service.ArticleCollectService;
+import com.gxwebsoft.cms.entity.ArticleCollect;
+import com.gxwebsoft.cms.param.ArticleCollectParam;
+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 LX
+ * @since 2025-11-23 14:05:18
+ */
+@Api(tags = "管理")
+@RestController
+@RequestMapping("/api/cms/article-collect")
+public class ArticleCollectController extends BaseController {
+ @Resource
+ private ArticleCollectService articleCollectService;
+
+ @ApiOperation("分页查询")
+ @GetMapping("/page")
+ public ApiResult> page(ArticleCollectParam param) {
+ // 使用关联查询
+ return success(articleCollectService.pageRel(param));
+ }
+
+ @ApiOperation("查询全部")
+ @GetMapping()
+ public ApiResult> list(ArticleCollectParam param) {
+ // 使用关联查询
+ param.setUserId(getLoginUserId());
+ return success(articleCollectService.listRel(param));
+ }
+
+ @ApiOperation("根据id查询")
+ @GetMapping("/{id}")
+ public ApiResult get(@PathVariable("id") Integer id) {
+ // 使用关联查询
+ return success(articleCollectService.getByIdRel(id));
+ }
+
+ @ApiOperation("添加")
+ @PostMapping()
+ public ApiResult save(@RequestBody ArticleCollect articleCollect) {
+ // 记录当前登录用户id
+ User loginUser = getLoginUser();
+ if (loginUser != null) {
+ articleCollect.setUserId(loginUser.getUserId());
+ }
+ ArticleCollect check = articleCollectService.check(getLoginUserId(), articleCollect.getArticleId());
+ if (check == null) {
+ if (articleCollectService.save(articleCollect)) {
+ return success("添加成功");
+ }
+ }else {
+ articleCollectService.removeById(check.getId());
+ return success("取消成功");
+ }
+ return fail("添加失败");
+ }
+
+ @ApiOperation("修改")
+ @PutMapping()
+ public ApiResult update(@RequestBody ArticleCollect articleCollect) {
+ if (articleCollectService.updateById(articleCollect)) {
+ return success("修改成功");
+ }
+ return fail("修改失败");
+ }
+
+ @ApiOperation("删除")
+ @DeleteMapping("/{id}")
+ public ApiResult remove(@PathVariable("id") Integer id) {
+ if (articleCollectService.removeById(id)) {
+ return success("删除成功");
+ }
+ return fail("删除失败");
+ }
+
+ @ApiOperation("批量添加")
+ @PostMapping("/batch")
+ public ApiResult saveBatch(@RequestBody List list) {
+ if (articleCollectService.saveBatch(list)) {
+ return success("添加成功");
+ }
+ return fail("添加失败");
+ }
+
+ @ApiOperation("批量修改")
+ @PutMapping("/batch")
+ public ApiResult updateBatch(@RequestBody BatchParam batchParam) {
+ if (batchParam.update(articleCollectService, "id")) {
+ return success("修改成功");
+ }
+ return fail("修改失败");
+ }
+
+ @ApiOperation("批量删除")
+ @DeleteMapping("/batch")
+ public ApiResult removeBatch(@RequestBody List ids) {
+ if (articleCollectService.removeByIds(ids)) {
+ return success("删除成功");
+ }
+ return fail("删除失败");
+ }
+
+}
diff --git a/src/main/java/com/gxwebsoft/law/controller/LawFeedbackController.java b/src/main/java/com/gxwebsoft/cms/controller/ArticleCommentController.java
similarity index 57%
rename from src/main/java/com/gxwebsoft/law/controller/LawFeedbackController.java
rename to src/main/java/com/gxwebsoft/cms/controller/ArticleCommentController.java
index 4b79316..29d2ed5 100644
--- a/src/main/java/com/gxwebsoft/law/controller/LawFeedbackController.java
+++ b/src/main/java/com/gxwebsoft/cms/controller/ArticleCommentController.java
@@ -1,9 +1,9 @@
-package com.gxwebsoft.law.controller;
+package com.gxwebsoft.cms.controller;
import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.law.service.LawFeedbackService;
-import com.gxwebsoft.law.entity.LawFeedback;
-import com.gxwebsoft.law.param.LawFeedbackParam;
+import com.gxwebsoft.cms.service.ArticleCommentService;
+import com.gxwebsoft.cms.entity.ArticleComment;
+import com.gxwebsoft.cms.param.ArticleCommentParam;
import com.gxwebsoft.common.core.web.ApiResult;
import com.gxwebsoft.common.core.web.PageResult;
import com.gxwebsoft.common.core.web.PageParam;
@@ -22,50 +22,46 @@ import java.util.List;
* 控制器
*
* @author LX
- * @since 2025-05-06 10:27:16
+ * @since 2025-12-02 16:56:51
*/
@Api(tags = "管理")
@RestController
-@RequestMapping("/api/law/law-feedback")
-public class LawFeedbackController extends BaseController {
+@RequestMapping("/api/cms/article-comment")
+public class ArticleCommentController extends BaseController {
@Resource
- private LawFeedbackService lawFeedbackService;
+ private ArticleCommentService articleCommentService;
@ApiOperation("分页查询")
@GetMapping("/page")
- public ApiResult> page(LawFeedbackParam param) {
+ public ApiResult> page(ArticleCommentParam param) {
// 使用关联查询
- return success(lawFeedbackService.pageRel(param));
+ return success(articleCommentService.pageRel(param));
}
@ApiOperation("查询全部")
@GetMapping()
- public ApiResult> list(LawFeedbackParam param) {
- User loginUser = getLoginUser();
- if (loginUser != null) {
- param.setUserId(loginUser.getUserId());
- }
+ public ApiResult> list(ArticleCommentParam param) {
// 使用关联查询
- return success(lawFeedbackService.listRel(param));
+ return success(articleCommentService.listRel(param));
}
- @PreAuthorize("hasAuthority('law:lawFeedback:list')")
+ @PreAuthorize("hasAuthority('cms:articleComment:list')")
@ApiOperation("根据id查询")
@GetMapping("/{id}")
- public ApiResult get(@PathVariable("id") Integer id) {
+ public ApiResult get(@PathVariable("id") Integer id) {
// 使用关联查询
- return success(lawFeedbackService.getByIdRel(id));
+ return success(articleCommentService.getByIdRel(id));
}
@ApiOperation("添加")
@PostMapping()
- public ApiResult save(@RequestBody LawFeedback lawFeedback) {
+ public ApiResult save(@RequestBody ArticleComment articleComment) {
// 记录当前登录用户id
User loginUser = getLoginUser();
if (loginUser != null) {
- lawFeedback.setUserId(loginUser.getUserId());
+ articleComment.setUserId(loginUser.getUserId());
}
- if (lawFeedbackService.save(lawFeedback)) {
+ if (articleCommentService.save(articleComment)) {
return success("添加成功");
}
return fail("添加失败");
@@ -73,8 +69,8 @@ public class LawFeedbackController extends BaseController {
@ApiOperation("修改")
@PutMapping()
- public ApiResult update(@RequestBody LawFeedback lawFeedback) {
- if (lawFeedbackService.updateById(lawFeedback)) {
+ public ApiResult update(@RequestBody ArticleComment articleComment) {
+ if (articleCommentService.updateById(articleComment)) {
return success("修改成功");
}
return fail("修改失败");
@@ -83,7 +79,7 @@ public class LawFeedbackController extends BaseController {
@ApiOperation("删除")
@DeleteMapping("/{id}")
public ApiResult remove(@PathVariable("id") Integer id) {
- if (lawFeedbackService.removeById(id)) {
+ if (articleCommentService.removeById(id)) {
return success("删除成功");
}
return fail("删除失败");
@@ -91,8 +87,8 @@ public class LawFeedbackController extends BaseController {
@ApiOperation("批量添加")
@PostMapping("/batch")
- public ApiResult saveBatch(@RequestBody List list) {
- if (lawFeedbackService.saveBatch(list)) {
+ public ApiResult saveBatch(@RequestBody List list) {
+ if (articleCommentService.saveBatch(list)) {
return success("添加成功");
}
return fail("添加失败");
@@ -100,8 +96,8 @@ public class LawFeedbackController extends BaseController {
@ApiOperation("批量修改")
@PutMapping("/batch")
- public ApiResult updateBatch(@RequestBody BatchParam batchParam) {
- if (batchParam.update(lawFeedbackService, "id")) {
+ public ApiResult updateBatch(@RequestBody BatchParam batchParam) {
+ if (batchParam.update(articleCommentService, "id")) {
return success("修改成功");
}
return fail("修改失败");
@@ -110,7 +106,7 @@ public class LawFeedbackController extends BaseController {
@ApiOperation("批量删除")
@DeleteMapping("/batch")
public ApiResult removeBatch(@RequestBody List ids) {
- if (lawFeedbackService.removeByIds(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
index 6d127c7..5675ecf 100644
--- a/src/main/java/com/gxwebsoft/cms/controller/ArticleController.java
+++ b/src/main/java/com/gxwebsoft/cms/controller/ArticleController.java
@@ -2,7 +2,9 @@ package com.gxwebsoft.cms.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.gxwebsoft.cms.entity.ArticleCategory;
+import com.gxwebsoft.cms.entity.ArticleCollect;
import com.gxwebsoft.cms.service.ArticleCategoryService;
+import com.gxwebsoft.cms.service.ArticleCollectService;
import com.gxwebsoft.common.core.web.BaseController;
import com.gxwebsoft.cms.service.ArticleService;
import com.gxwebsoft.cms.entity.Article;
@@ -35,6 +37,8 @@ public class ArticleController extends BaseController {
@Resource
private ArticleService articleService;
@Resource
+ private ArticleCollectService articleCollectService;
+ @Resource
private ArticleCategoryService articleCategoryService;
@ApiOperation("根据id查询文章记录表")
@@ -45,7 +49,6 @@ public class ArticleController extends BaseController {
}
- @PreAuthorize("hasAuthority('cms:article:list')")
@OperationLog
@ApiOperation("分页查询文章记录表")
@GetMapping("/page")
@@ -74,11 +77,13 @@ public class ArticleController extends BaseController {
if (!categoryIds.isEmpty()) {
queryWrapper.in(Article::getCategoryId, categoryIds);
}
+ if (param.getTitle() != null) {
+ queryWrapper.like(Article::getTitle, param.getTitle());
+ }
List articleList = articleService.list(queryWrapper);
return success(articleList);
}
- @PreAuthorize("hasAuthority('cms:article:list')")
@OperationLog
@ApiOperation("根据id查询文章记录表")
@GetMapping("/{id}")
@@ -89,6 +94,13 @@ public class ArticleController extends BaseController {
article.setArticleId(id);
article.setVirtualViews(article.getVirtualViews() + 1);
articleService.saveOrUpdate(article);
+ ArticleCategory category = articleCategoryService.getByIdRel(article.getCategoryId());
+ if (category != null) article.setCategory(category.getTitle());
+ article.setHasCollect(false);
+ if (getLoginUser() != null) {
+ ArticleCollect articleCollect = articleCollectService.check(getLoginUserId(), id);
+ article.setHasCollect(articleCollect != null);
+ }
return success(article);
}
diff --git a/src/main/java/com/gxwebsoft/cms/entity/Article.java b/src/main/java/com/gxwebsoft/cms/entity/Article.java
index 58ccd04..54b9c8f 100644
--- a/src/main/java/com/gxwebsoft/cms/entity/Article.java
+++ b/src/main/java/com/gxwebsoft/cms/entity/Article.java
@@ -37,6 +37,9 @@ public class Article implements Serializable {
@ApiModelProperty(value = "文章分类ID")
private Integer categoryId;
+ @TableField(exist = false)
+ private String category;
+
@ApiModelProperty(value = "封面图")
private String image;
@@ -88,4 +91,6 @@ public class Article implements Serializable {
@TableField(exist = false)
private String userAvatar;
+ @TableField(exist = false)
+ private Boolean hasCollect;
}
diff --git a/src/main/java/com/gxwebsoft/shop/entity/GoodsPhoneModel.java b/src/main/java/com/gxwebsoft/cms/entity/ArticleCollect.java
similarity index 62%
rename from src/main/java/com/gxwebsoft/shop/entity/GoodsPhoneModel.java
rename to src/main/java/com/gxwebsoft/cms/entity/ArticleCollect.java
index d14aff6..4cbe2b8 100644
--- a/src/main/java/com/gxwebsoft/shop/entity/GoodsPhoneModel.java
+++ b/src/main/java/com/gxwebsoft/cms/entity/ArticleCollect.java
@@ -1,4 +1,4 @@
-package com.gxwebsoft.shop.entity;
+package com.gxwebsoft.cms.entity;
import com.baomidou.mybatisplus.annotation.*;
@@ -10,26 +10,26 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
/**
- * 商品匹配机型
+ *
*
- * @author 科技小王子
- * @since 2024-03-12 01:30:55
+ * @author LX
+ * @since 2025-11-23 14:05:18
*/
@Data
@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "GoodsPhoneModel对象", description = "商品匹配机型")
-@TableName("shop_goods_phone_model")
-public class GoodsPhoneModel implements Serializable {
+@ApiModel(value = "ArticleCollect对象", description = "")
+@TableName("cms_article_collect")
+public class ArticleCollect implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
- private Integer goodsId;
+ private Integer articleId;
- private Integer modelId;
+ private Integer userId;
- @ApiModelProperty(value = "状态, 0上架, 1下架")
+ @ApiModelProperty(value = "状态, 0正常, 1冻结")
private Integer status;
@ApiModelProperty(value = "是否删除, 0否, 1是")
@@ -46,9 +46,5 @@ public class GoodsPhoneModel implements Serializable {
private LocalDateTime updateTime;
@TableField(exist = false)
- private String phoneModelName;
-
- @TableField(exist = false)
- private String phoneModelCode;
-
+ private Article article;
}
diff --git a/src/main/java/com/gxwebsoft/law/entity/LawOrgPeople.java b/src/main/java/com/gxwebsoft/cms/entity/ArticleComment.java
similarity index 64%
rename from src/main/java/com/gxwebsoft/law/entity/LawOrgPeople.java
rename to src/main/java/com/gxwebsoft/cms/entity/ArticleComment.java
index f027bfd..80f918c 100644
--- a/src/main/java/com/gxwebsoft/law/entity/LawOrgPeople.java
+++ b/src/main/java/com/gxwebsoft/cms/entity/ArticleComment.java
@@ -1,4 +1,4 @@
-package com.gxwebsoft.law.entity;
+package com.gxwebsoft.cms.entity;
import com.baomidou.mybatisplus.annotation.*;
@@ -13,32 +13,27 @@ import lombok.EqualsAndHashCode;
*
*
* @author LX
- * @since 2025-04-14 01:31:54
+ * @since 2025-12-02 16:56:51
*/
@Data
@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "LawOrgPeople对象", description = "")
-@TableName("law_org_people")
-public class LawOrgPeople implements Serializable {
+@ApiModel(value = "ArticleComment对象", description = "")
+@TableName("cms_article_comment")
+public class ArticleComment implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
- private Integer orgId;
-
- private String name;
-
- private String phone;
-
- private String position;
-
- private String type;
-
- private String positionType;
+ private Integer articleId;
private Integer userId;
+ private String content;
+
+ @ApiModelProperty(value = "状态, 0正常, 1冻结")
+ private Integer status;
+
@ApiModelProperty(value = "是否删除, 0否, 1是")
@TableLogic
private Integer deleted;
@@ -46,12 +41,12 @@ public class LawOrgPeople implements Serializable {
@ApiModelProperty(value = "租户id")
private Integer tenantId;
- @ApiModelProperty(value = "创建时间")
+ @ApiModelProperty(value = "注册时间")
private LocalDateTime createTime;
@ApiModelProperty(value = "修改时间")
private LocalDateTime updateTime;
@TableField(exist = false)
- private LawOrg lawOrg;
+ private Article article;
}
diff --git a/src/main/java/com/gxwebsoft/cms/mapper/ArticleCollectMapper.java b/src/main/java/com/gxwebsoft/cms/mapper/ArticleCollectMapper.java
new file mode 100644
index 0000000..495d489
--- /dev/null
+++ b/src/main/java/com/gxwebsoft/cms/mapper/ArticleCollectMapper.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.ArticleCollect;
+import com.gxwebsoft.cms.param.ArticleCollectParam;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * Mapper
+ *
+ * @author LX
+ * @since 2025-11-23 14:05:18
+ */
+public interface ArticleCollectMapper extends BaseMapper {
+
+ /**
+ * 分页查询
+ *
+ * @param page 分页对象
+ * @param param 查询参数
+ * @return List
+ */
+ List selectPageRel(@Param("page") IPage page,
+ @Param("param") ArticleCollectParam param);
+
+ /**
+ * 查询全部
+ *
+ * @param param 查询参数
+ * @return List
+ */
+ List selectListRel(@Param("param") ArticleCollectParam 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..1362a4b
--- /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 LX
+ * @since 2025-12-02 16:56:51
+ */
+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/law/mapper/xml/LawLegalCalContentMapper.xml b/src/main/java/com/gxwebsoft/cms/mapper/xml/ArticleCollectMapper.xml
similarity index 72%
rename from src/main/java/com/gxwebsoft/law/mapper/xml/LawLegalCalContentMapper.xml
rename to src/main/java/com/gxwebsoft/cms/mapper/xml/ArticleCollectMapper.xml
index e9a9b40..36cb9e4 100644
--- a/src/main/java/com/gxwebsoft/law/mapper/xml/LawLegalCalContentMapper.xml
+++ b/src/main/java/com/gxwebsoft/cms/mapper/xml/ArticleCollectMapper.xml
@@ -1,24 +1,24 @@
-
+
SELECT a.*
- FROM law_legal_cal_content a
+ FROM cms_article_collect a
AND a.id = #{param.id}
-
- AND a.group_id = #{param.groupId}
-
-
- AND a.content LIKE CONCAT('%', #{param.content}, '%')
+
+ AND a.article_id = #{param.articleId}
AND a.user_id = #{param.userId}
+
+ AND a.status = #{param.status}
+
AND a.deleted = #{param.deleted}
@@ -39,12 +39,12 @@
-